diff options
author | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2014-05-07 16:40:26 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-05-08 18:46:56 +0200 |
commit | ac5cdf7600948a3e403ca3262d7597dc198a0755 (patch) | |
tree | 555aeb2793b43ea49e6f305aec0093d6aab868e2 /src/core/render_widget_host_view_qt.cpp | |
parent | 1ca3a574117bdd8e67381b178a823e7d695f4bfd (diff) |
Fix a crash when attempting to drag
Q_UNREACHABLE in RenderWidgetHostViewQt::GetNativeView is now called
through RenderViewHostImpl::OnStartDragging since the last Chromium
update.
Even after removing this, OnStartDragging will now also try fetching
the device pixel ratio through gfx::Screen::GetNativeScreen().
Provide a dummy implementation of gfx::Screen only to avoid the crash,
the class still doesn't do anything and is filled with Q_UNREACHABLEs
to catch if any of those methods are reached in a future Chromium
update.
Change-Id: I2e9dafab5e4622df97100dd7a859523067635118
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Diffstat (limited to 'src/core/render_widget_host_view_qt.cpp')
-rw-r--r-- | src/core/render_widget_host_view_qt.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/core/render_widget_host_view_qt.cpp b/src/core/render_widget_host_view_qt.cpp index f02729cd2..44dce6308 100644 --- a/src/core/render_widget_host_view_qt.cpp +++ b/src/core/render_widget_host_view_qt.cpp @@ -246,9 +246,8 @@ gfx::NativeView RenderWidgetHostViewQt::GetNativeView() const // pointer (HWND, NSView*, GtkWidget*) and other ports use // this function in the renderer_host layer when setting up // the view hierarchy and for generating snapshots in tests. - // Since we manage the view hierarchy in Qt we can possibly - // avoid calls to this. - QT_NOT_USED + // Since we manage the view hierarchy in Qt its value hasn't + // been meaningful. return gfx::NativeView(); } |