Title: [186159] trunk/Source
- Revision
- 186159
- Author
- [email protected]
- Date
- 2015-06-30 18:46:52 -0700 (Tue, 30 Jun 2015)
Log Message
Fix Mac and Windows builds.
Source/WebKit/win:
* WebCoreSupport/AcceleratedCompositingContext.cpp:
(AcceleratedCompositingContext::flushPendingLayerChanges):
* WebView.cpp:
(WebView::flushPendingGraphicsLayerChanges):
Source/WebKit2:
* WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm:
(WebKit::TiledCoreAnimationDrawingArea::flushLayers):
Modified Paths
Diff
Modified: trunk/Source/WebKit/win/ChangeLog (186158 => 186159)
--- trunk/Source/WebKit/win/ChangeLog 2015-07-01 01:33:04 UTC (rev 186158)
+++ trunk/Source/WebKit/win/ChangeLog 2015-07-01 01:46:52 UTC (rev 186159)
@@ -1,3 +1,12 @@
+2015-06-30 Simon Fraser <[email protected]>
+
+ Fix Mac and Windows builds.
+
+ * WebCoreSupport/AcceleratedCompositingContext.cpp:
+ (AcceleratedCompositingContext::flushPendingLayerChanges):
+ * WebView.cpp:
+ (WebView::flushPendingGraphicsLayerChanges):
+
2015-06-30 Brent Fulgham <[email protected]>
[Win] webViewAddMessageToConsole always gets 1 for isError
Modified: trunk/Source/WebKit/win/WebCoreSupport/AcceleratedCompositingContext.cpp (186158 => 186159)
--- trunk/Source/WebKit/win/WebCoreSupport/AcceleratedCompositingContext.cpp 2015-07-01 01:33:04 UTC (rev 186158)
+++ trunk/Source/WebKit/win/WebCoreSupport/AcceleratedCompositingContext.cpp 2015-07-01 01:46:52 UTC (rev 186159)
@@ -329,9 +329,10 @@
bool AcceleratedCompositingContext::flushPendingLayerChanges()
{
- m_rootLayer->flushCompositingStateForThisLayerOnly();
- m_nonCompositedContentLayer->flushCompositingStateForThisLayerOnly();
- if (!core(&m_webView)->mainFrame().view()->flushCompositingStateIncludingSubframes())
+ FrameView* frameView = core(&m_webView)->mainFrame().view();
+ m_rootLayer->flushCompositingStateForThisLayerOnly(frameView->viewportIsStable());
+ m_nonCompositedContentLayer->flushCompositingStateForThisLayerOnly(frameView->viewportIsStable());
+ if (!frameView->flushCompositingStateIncludingSubframes())
return false;
downcast<GraphicsLayerTextureMapper>(*m_rootLayer).updateBackingStoreIncludingSubLayers();
Modified: trunk/Source/WebKit/win/WebView.cpp (186158 => 186159)
--- trunk/Source/WebKit/win/WebView.cpp 2015-07-01 01:33:04 UTC (rev 186158)
+++ trunk/Source/WebKit/win/WebView.cpp 2015-07-01 01:46:52 UTC (rev 186159)
@@ -6789,7 +6789,7 @@
#if USE(CA)
// Updating layout might have taken us out of compositing mode.
if (m_backingLayer)
- m_backingLayer->flushCompositingStateForThisLayerOnly();
+ m_backingLayer->flushCompositingStateForThisLayerOnly(view->viewportIsStable());
view->flushCompositingStateIncludingSubframes();
#elif USE(TEXTURE_MAPPER_GL)
Modified: trunk/Source/WebKit2/ChangeLog (186158 => 186159)
--- trunk/Source/WebKit2/ChangeLog 2015-07-01 01:33:04 UTC (rev 186158)
+++ trunk/Source/WebKit2/ChangeLog 2015-07-01 01:46:52 UTC (rev 186159)
@@ -1,5 +1,12 @@
2015-06-30 Simon Fraser <[email protected]>
+ Fix Mac and Windows builds.
+
+ * WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm:
+ (WebKit::TiledCoreAnimationDrawingArea::flushLayers):
+
+2015-06-30 Simon Fraser <[email protected]>
+
[iOS] Missing tiles inside position:fixed on scrolling
https://bugs.webkit.org/show_bug.cgi?id=146485
rdar://problem/21226861
Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm (186158 => 186159)
--- trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm 2015-07-01 01:33:04 UTC (rev 186158)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm 2015-07-01 01:46:52 UTC (rev 186159)
@@ -388,7 +388,7 @@
// Because our view-relative overlay root layer is not attached to the main GraphicsLayer tree, we need to flush it manually.
if (m_viewOverlayRootLayer)
- m_viewOverlayRootLayer->flushCompositingState(visibleRect);
+ m_viewOverlayRootLayer->flushCompositingState(visibleRect, m_webPage.mainFrameView()->viewportIsStable());
#if (TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
[CATransaction addCommitHandler:^{
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
