Title: [111202] trunk/Source/WebKit2
- Revision
- 111202
- Author
- [email protected]
- Date
- 2012-03-19 10:37:18 -0700 (Mon, 19 Mar 2012)
Log Message
Crash when closing an inspected web page with tiled drawing enabled
https://bugs.webkit.org/show_bug.cgi?id=81524
<rdar://problem/11062396>
Reviewed by Sam Weinig.
Guard against the WebPage's underlying WebCore Page being null, which can happen
when the inspector highlight overlay is uninstalled by the inspector when the inspected
page goes away.
* WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm:
(WebKit::TiledCoreAnimationDrawingArea::didUninstallPageOverlay):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (111201 => 111202)
--- trunk/Source/WebKit2/ChangeLog 2012-03-19 17:37:01 UTC (rev 111201)
+++ trunk/Source/WebKit2/ChangeLog 2012-03-19 17:37:18 UTC (rev 111202)
@@ -1,3 +1,18 @@
+2012-03-19 Anders Carlsson <[email protected]>
+
+ Crash when closing an inspected web page with tiled drawing enabled
+ https://bugs.webkit.org/show_bug.cgi?id=81524
+ <rdar://problem/11062396>
+
+ Reviewed by Sam Weinig.
+
+ Guard against the WebPage's underlying WebCore Page being null, which can happen
+ when the inspector highlight overlay is uninstalled by the inspector when the inspected
+ page goes away.
+
+ * WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm:
+ (WebKit::TiledCoreAnimationDrawingArea::didUninstallPageOverlay):
+
2012-03-19 Kenneth Rohde Christiansen <[email protected]>
Merge _q_commitScaleChange and _q_commitPositionChange
Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm (111201 => 111202)
--- trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm 2012-03-19 17:37:01 UTC (rev 111201)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm 2012-03-19 17:37:18 UTC (rev 111202)
@@ -193,7 +193,8 @@
void TiledCoreAnimationDrawingArea::didUninstallPageOverlay()
{
#if ENABLE(THREADED_SCROLLING)
- m_webPage->corePage()->scrollingCoordinator()->setForceMainThreadScrollLayerPositionUpdates(false);
+ if (Page* page = m_webPage->corePage())
+ page->scrollingCoordinator()->setForceMainThreadScrollLayerPositionUpdates(false);
#endif
destroyPageOverlayLayer();
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
