Changeset 143077 in webkit

Timestamp:

Feb 15, 2013 5:42:13 PM (11 years ago)

Author:

commit-queue@webkit.org

Message:

[Qt][WK2] Crash on window resize if WebProcess is closed/crashed
​https://bugs.webkit.org/show_bug.cgi?id=109216

Patch by Adenilson Cavalcanti <​cavalcantii@gmail.com> on 2013-02-15
Reviewed by Benjamin Poulain.

Only make calls into DrawingAreaProxy pointer after checking its state.

When the WebProcess was closed or crashed, WebKit::WebPageProxy will set
its DrawingAreaProxy pointer to null. Resize events on UIProcess/client will
try to access the object to update the geometry and forward this information
into the WebProcess. This would create a crash scenario that is fixed by this patch.

• UIProcess/API/qt/qquickwebview.cpp:

(QQuickWebViewPrivate::didRelaunchProcess):
(QQuickWebViewLegacyPrivate::updateViewportSize):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/qt/qquickwebview.cpp (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-02-15  Adenilson Cavalcanti  <cavalcantii@gmail.com>
+
+        [Qt][WK2] Crash on window resize if WebProcess is closed/crashed
+        https://bugs.webkit.org/show_bug.cgi?id=109216
+
+        Reviewed by Benjamin Poulain.
+
+        Only make calls into DrawingAreaProxy pointer after checking its state.
+
+        When the WebProcess was closed or crashed, WebKit::WebPageProxy will set
+        its DrawingAreaProxy pointer to null. Resize events on UIProcess/client will
+        try to access the object to update the geometry and forward this information
+        into the WebProcess. This would create a crash scenario that is fixed by this patch.
+
+        * UIProcess/API/qt/qquickwebview.cpp:
+        (QQuickWebViewPrivate::didRelaunchProcess):
+        (QQuickWebViewLegacyPrivate::updateViewportSize):
+
 2013-02-15  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp

@@ -586 +586 @@
     qWarning("WARNING: The web process has been successfully restarted.");
 
-    webPageProxy->drawingArea()->setSize(viewSize(), IntSize());
-
-    updateViewportSize();
-    updateUserScripts();
-    updateSchemeDelegates();
+    if (DrawingAreaProxy *drawingArea = webPageProxy->drawingArea()) {
+        drawingArea->setSize(viewSize(), IntSize());
+
+        updateViewportSize();
+        updateUserScripts();
+        updateSchemeDelegates();
+    }
 }
 
@@ -939 +941 @@
     pageView->setContentsSize(viewportSize);
 
-    // The fixed layout is handled by the FrameView and the drawing area doesn't behave differently
-    // whether its fixed or not. We still need to tell the drawing area which part of it
-    // has to be rendered on tiles, and in desktop mode it's all of it.
-    webPageProxy->drawingArea()->setSize(viewportSize.toSize(), IntSize());
-    // The backing store scale factor should already be set to the device pixel ratio
-    // of the underlying window, thus we set the effective scale to 1 here.
-    webPageProxy->drawingArea()->setVisibleContentsRect(FloatRect(FloatPoint(), FloatSize(viewportSize)), FloatPoint());
+    if (DrawingAreaProxy *drawingArea = webPageProxy->drawingArea()) {
+        // The fixed layout is handled by the FrameView and the drawing area doesn't behave differently
+        // whether its fixed or not. We still need to tell the drawing area which part of it
+        // has to be rendered on tiles, and in desktop mode it's all of it.
+        drawingArea->setSize(viewportSize.toSize(), IntSize());
+        // The backing store scale factor should already be set to the device pixel ratio
+        // of the underlying window, thus we set the effective scale to 1 here.
+        drawingArea->setVisibleContentsRect(FloatRect(FloatPoint(), FloatSize(viewportSize)), FloatPoint());
+    }
 }