Title: [170213] trunk/Source/WebKit2
- Revision
- 170213
- Author
- [email protected]
- Date
- 2014-06-20 15:06:11 -0700 (Fri, 20 Jun 2014)
Log Message
Fix lots of WK2 test crashes.
We don't always have a ScrollingCoordinator.
* WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm:
(WebKit::TiledCoreAnimationDrawingArea::flushLayers):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (170212 => 170213)
--- trunk/Source/WebKit2/ChangeLog 2014-06-20 22:05:04 UTC (rev 170212)
+++ trunk/Source/WebKit2/ChangeLog 2014-06-20 22:06:11 UTC (rev 170213)
@@ -1,3 +1,12 @@
+2014-06-20 Simon Fraser <[email protected]>
+
+ Fix lots of WK2 test crashes.
+
+ We don't always have a ScrollingCoordinator.
+
+ * WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm:
+ (WebKit::TiledCoreAnimationDrawingArea::flushLayers):
+
2014-06-20 Anders Carlsson <[email protected]>
Always use XPC on iOS
Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm (170212 => 170213)
--- trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm 2014-06-20 22:05:04 UTC (rev 170212)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm 2014-06-20 22:06:11 UTC (rev 170213)
@@ -280,7 +280,10 @@
m_webPage->pageOverlayController().flushPageOverlayLayers(visibleRect);
bool returnValue = m_webPage->corePage()->mainFrame().view()->flushCompositingStateIncludingSubframes();
- m_webPage->corePage()->scrollingCoordinator()->commitTreeStateIfNeeded();
+#if ENABLE(ASYNC_SCROLLING)
+ if (ScrollingCoordinator* scrollingCoordinator = m_webPage->corePage()->scrollingCoordinator())
+ scrollingCoordinator->commitTreeStateIfNeeded();
+#endif
// If we have an active transient zoom, we want the zoom to win over any changes
// that WebCore makes to the relevant layers, so re-apply our changes after flushing.
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
