Changeset 163001 in webkit

Timestamp:

Jan 28, 2014 9:22:38 PM (10 years ago)

Author:

commit-queue@webkit.org

Message:

[iOS] UI process crashes whenever web process crashes
​https://bugs.webkit.org/show_bug.cgi?id=127826

Patch by Ian Henderson <​ianh@apple.com> on 2014-01-28
Reviewed by Tim Horton.

• UIProcess/API/ios/WKContentView.mm:

(-[WKContentView _updateFixedPositionRect]): Null-check the drawing
area before calling size() on it.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/ios/WKContentView.mm (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-01-28  Ian Henderson  <ianh@apple.com>
+
+        [iOS] UI process crashes whenever web process crashes
+        https://bugs.webkit.org/show_bug.cgi?id=127826
+
+        Reviewed by Tim Horton.
+
+        * UIProcess/API/ios/WKContentView.mm:
+        (-[WKContentView _updateFixedPositionRect]): Null-check the drawing
+        area before calling size() on it.
+
 2014-01-28  Ian Henderson  <ianh@apple.com>
 

trunk/Source/WebKit2/UIProcess/API/ios/WKContentView.mm

@@ -196 +196 @@
 - (void)_updateFixedPositionRect
 {
-    FloatRect exposedRect(_currentExposedRectPosition, _page->drawingArea()->size());
+    auto drawingArea = _page->drawingArea();
+    if (!drawingArea)
+        return;
+    FloatRect exposedRect(_currentExposedRectPosition, drawingArea->size());
     FloatRect fixedPosRect = [self fixedPositionRectFromExposedRect:exposedRect scale:_page->pageScaleFactor()];
-
-    if (auto drawingArea = _page->drawingArea())
-        drawingArea->setCustomFixedPositionRect(fixedPosRect);
+    drawingArea->setCustomFixedPositionRect(fixedPosRect);
 }