From ac5cdf7600948a3e403ca3262d7597dc198a0755 Mon Sep 17 00:00:00 2001 From: Jocelyn Turcotte Date: Wed, 7 May 2014 16:40:26 +0200 Subject: 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 --- src/core/core_gyp_generator.pro | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/core/core_gyp_generator.pro') diff --git a/src/core/core_gyp_generator.pro b/src/core/core_gyp_generator.pro index c76c707a5..2f58664f4 100644 --- a/src/core/core_gyp_generator.pro +++ b/src/core/core_gyp_generator.pro @@ -40,6 +40,7 @@ SOURCES = \ content_browser_client_qt.cpp \ content_main_delegate_qt.cpp \ delegated_frame_node.cpp \ + desktop_screen_qt.cpp \ dev_tools_http_handler_delegate_qt.cpp \ download_manager_delegate_qt.cpp \ gl_context_qt.cpp \ @@ -79,6 +80,7 @@ HEADERS = \ content_browser_client_qt.h \ content_main_delegate_qt.h \ delegated_frame_node.h \ + desktop_screen_qt.h \ dev_tools_http_handler_delegate_qt.h \ download_manager_delegate_qt.h \ chromium_gpu_helper.h \ -- cgit v1.2.3