From a9048cccf881504edcb4039160069dd870e1905d Mon Sep 17 00:00:00 2001
From: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Date: Wed, 11 Dec 2013 17:24:08 +0100
Subject: Fix a crash when opening a window.

RenderWidgetHostViewQt::GetViewBounds gets called early than
RenderWidgetHostViewQt::setAdapterClient when a new window is created
by Chromium.

Change-Id: I5ad61fc54ae773200403b222110a1d0ad541f941
Reviewed-by: Arvid Nilsson <anilsson@blackberry.com>
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
---
 src/core/render_widget_host_view_qt.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/core/render_widget_host_view_qt.cpp')

diff --git a/src/core/render_widget_host_view_qt.cpp b/src/core/render_widget_host_view_qt.cpp
index 20c1dc4fe..e8d38d761 100644
--- a/src/core/render_widget_host_view_qt.cpp
+++ b/src/core/render_widget_host_view_qt.cpp
@@ -822,7 +822,7 @@ void RenderWidgetHostViewQt::RemoveExpiredMappings(QTouchEvent *ev)
 
 float RenderWidgetHostViewQt::dpiScale() const
 {
-    return m_adapterClient->dpiScale();
+    return m_adapterClient ? m_adapterClient->dpiScale() : 1.0;
 }
 
 bool RenderWidgetHostViewQt::IsPopup() const
-- 
cgit v1.2.3