Diff
Modified: trunk/Source/WebCore/ChangeLog (186155 => 186156)
--- trunk/Source/WebCore/ChangeLog 2015-07-01 01:08:41 UTC (rev 186155)
+++ trunk/Source/WebCore/ChangeLog 2015-07-01 01:15:53 UTC (rev 186156)
@@ -1,5 +1,20 @@
2015-06-30 Simon Fraser <[email protected]>
+ Try to fix Gtk and EFL builds.
+
+ * platform/graphics/texmap/GraphicsLayerTextureMapper.cpp:
+ (WebCore::GraphicsLayerTextureMapper::flushCompositingStateForThisLayerOnly):
+ (WebCore::GraphicsLayerTextureMapper::flushCompositingState):
+ * platform/graphics/texmap/GraphicsLayerTextureMapper.h:
+ * platform/graphics/texmap/coordinated/CompositingCoordinator.cpp:
+ (WebCore::CompositingCoordinator::flushPendingLayerChanges):
+ * platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp:
+ (WebCore::CoordinatedGraphicsLayer::flushCompositingState):
+ (WebCore::CoordinatedGraphicsLayer::flushCompositingStateForThisLayerOnly):
+ * platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.h:
+
+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/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.cpp (186155 => 186156)
--- trunk/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.cpp 2015-07-01 01:08:41 UTC (rev 186155)
+++ trunk/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.cpp 2015-07-01 01:15:53 UTC (rev 186156)
@@ -363,7 +363,7 @@
notifyChange(IsScrollableChange);
}
-void GraphicsLayerTextureMapper::flushCompositingStateForThisLayerOnly()
+void GraphicsLayerTextureMapper::flushCompositingStateForThisLayerOnly(bool)
{
prepareBackingStoreIfNeeded();
commitLayerChanges();
@@ -496,19 +496,19 @@
m_changeMask = NoChanges;
}
-void GraphicsLayerTextureMapper::flushCompositingState(const FloatRect& rect)
+void GraphicsLayerTextureMapper::flushCompositingState(const FloatRect& rect, bool viewportIsStable)
{
if (!m_layer.textureMapper())
return;
- flushCompositingStateForThisLayerOnly();
+ flushCompositingStateForThisLayerOnly(viewportIsStable);
if (maskLayer())
- maskLayer()->flushCompositingState(rect);
+ maskLayer()->flushCompositingState(rect, viewportIsStable);
if (replicaLayer())
- replicaLayer()->flushCompositingState(rect);
+ replicaLayer()->flushCompositingState(rect, viewportIsStable);
for (auto* child : children())
- child->flushCompositingState(rect);
+ child->flushCompositingState(rect, viewportIsStable);
}
void GraphicsLayerTextureMapper::updateBackingStoreIncludingSubLayers()
Modified: trunk/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.h (186155 => 186156)
--- trunk/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.h 2015-07-01 01:08:41 UTC (rev 186155)
+++ trunk/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.h 2015-07-01 01:15:53 UTC (rev 186156)
@@ -83,8 +83,8 @@
virtual void setDebugBorder(const Color&, float width) override;
virtual void setShowRepaintCounter(bool) override;
- virtual void flushCompositingState(const FloatRect&) override;
- virtual void flushCompositingStateForThisLayerOnly() override;
+ virtual void flushCompositingState(const FloatRect&, bool) override;
+ virtual void flushCompositingStateForThisLayerOnly(bool) override;
void updateBackingStoreIncludingSubLayers();
Modified: trunk/Source/WebCore/platform/graphics/texmap/coordinated/CompositingCoordinator.cpp (186155 => 186156)
--- trunk/Source/WebCore/platform/graphics/texmap/coordinated/CompositingCoordinator.cpp 2015-07-01 01:08:41 UTC (rev 186155)
+++ trunk/Source/WebCore/platform/graphics/texmap/coordinated/CompositingCoordinator.cpp 2015-07-01 01:15:53 UTC (rev 186156)
@@ -92,7 +92,7 @@
initializeRootCompositingLayerIfNeeded();
- m_rootLayer->flushCompositingStateForThisLayerOnly();
+ m_rootLayer->flushCompositingStateForThisLayerOnly(m_page->mainFrame().view()->viewportIsStable());
m_client->didFlushRootLayer(m_visibleContentsRect);
bool didSync = m_page->mainFrame().view()->flushCompositingStateIncludingSubframes();
Modified: trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp (186155 => 186156)
--- trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp 2015-07-01 01:08:41 UTC (rev 186155)
+++ trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp 2015-07-01 01:15:53 UTC (rev 186156)
@@ -577,21 +577,21 @@
didChangeLayerState();
}
-void CoordinatedGraphicsLayer::flushCompositingState(const FloatRect& rect)
+void CoordinatedGraphicsLayer::flushCompositingState(const FloatRect& rect, bool viewportIsStable)
{
if (notifyFlushRequired())
return;
if (CoordinatedGraphicsLayer* mask = toCoordinatedGraphicsLayer(maskLayer()))
- mask->flushCompositingStateForThisLayerOnly();
+ mask->flushCompositingStateForThisLayerOnly(viewportIsStable);
if (CoordinatedGraphicsLayer* replica = toCoordinatedGraphicsLayer(replicaLayer()))
- replica->flushCompositingStateForThisLayerOnly();
+ replica->flushCompositingStateForThisLayerOnly(viewportIsStable);
- flushCompositingStateForThisLayerOnly();
+ flushCompositingStateForThisLayerOnly(viewportIsStable);
for (auto& child : children())
- child->flushCompositingState(rect);
+ child->flushCompositingState(rect, viewportIsStable);
}
CoordinatedGraphicsLayer* toCoordinatedGraphicsLayer(GraphicsLayer* layer)
@@ -757,7 +757,7 @@
}
#endif
-void CoordinatedGraphicsLayer::flushCompositingStateForThisLayerOnly()
+void CoordinatedGraphicsLayer::flushCompositingStateForThisLayerOnly(bool)
{
ASSERT(m_coordinator->isFlushingLayerChanges());
Modified: trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.h (186155 => 186156)
--- trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.h 2015-07-01 01:08:41 UTC (rev 186155)
+++ trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.h 2015-07-01 01:15:53 UTC (rev 186156)
@@ -97,8 +97,8 @@
virtual void setNeedsDisplayInRect(const FloatRect&, ShouldClipToLayer = ClipToLayer) override;
virtual void setContentsNeedsDisplay() override;
virtual void deviceOrPageScaleFactorChanged() override;
- virtual void flushCompositingState(const FloatRect&) override;
- virtual void flushCompositingStateForThisLayerOnly() override;
+ virtual void flushCompositingState(const FloatRect&, bool) override;
+ virtual void flushCompositingStateForThisLayerOnly(bool) override;
virtual bool setFilters(const FilterOperations&) override;
virtual bool addAnimation(const KeyframeValueList&, const FloatSize&, const Animation*, const String&, double) override;
virtual void pauseAnimation(const String&, double) override;
