Imported WebKit commit cf4f8fc6f19b0629f51860cb2d4b25e139d07e00 (http://svn.webkit.org/repository/webkit/trunk@131592)

New snapshot that includes the build fixes for Mac OS X 10.6 and earlier as well
as the previously cherry-picked changes

1 files changed, 12 insertions, 12 deletions

diff --git a/Source/WebKit2/UIProcess/CoordinatedGraphics/LayerTreeRenderer.cpp b/Source/WebKit2/UIProcess/CoordinatedGraphics/LayerTreeRenderer.cpp
index b94c66b9d..f053a57a6 100644
--- a/Source/WebKit2/UIProcess/CoordinatedGraphics/LayerTreeRenderer.cpp
+++ b/Source/WebKit2/UIProcess/CoordinatedGraphics/LayerTreeRenderer.cpp
@@ -126,7 +126,7 @@ void LayerTreeRenderer::paintToCurrentGLContext(const TransformationMatrix& matr
     if (currentRootLayer->opacity() != opacity || currentRootLayer->transform() != matrix) {
         currentRootLayer->setOpacity(opacity);
         currentRootLayer->setTransform(matrix);
-        currentRootLayer->syncCompositingStateForThisLayerOnly();
+        currentRootLayer->flushCompositingStateForThisLayerOnly();
     }
 
     layer->paint();
@@ -183,7 +183,7 @@ void LayerTreeRenderer::adjustPositionForFixedLayers()
 
     LayerMap::iterator end = m_fixedLayers.end();
     for (LayerMap::iterator it = m_fixedLayers.begin(); it != end; ++it)
-        toTextureMapperLayer(it->second)->setScrollPositionDeltaIfNeeded(delta);
+        toTextureMapperLayer(it->value)->setScrollPositionDeltaIfNeeded(delta);
 }
 
 void LayerTreeRenderer::didChangeScrollPosition(const IntPoint& position)
@@ -191,12 +191,12 @@ void LayerTreeRenderer::didChangeScrollPosition(const IntPoint& position)
     m_pendingRenderedContentsScrollPosition = position;
 }
 
-void LayerTreeRenderer::syncCanvas(WebLayerID id, const WebCore::IntSize& canvasSize, uint64_t graphicsSurfaceToken, uint32_t frontBuffer)
+#if USE(GRAPHICS_SURFACE)
+void LayerTreeRenderer::syncCanvas(WebLayerID id, const WebCore::IntSize& canvasSize, const GraphicsSurfaceToken& token, uint32_t frontBuffer)
 {
     if (canvasSize.isEmpty() || !m_textureMapper)
         return;
 
-#if USE(GRAPHICS_SURFACE)
     ensureLayer(id);
     GraphicsLayer* layer = layerByID(id);
 
@@ -206,18 +206,18 @@ void LayerTreeRenderer::syncCanvas(WebLayerID id, const WebCore::IntSize& canvas
         canvasBackingStore = TextureMapperSurfaceBackingStore::create();
         m_surfaceBackingStores.set(id, canvasBackingStore);
     } else
-        canvasBackingStore = it->second;
+        canvasBackingStore = it->value;
 
-    canvasBackingStore->setGraphicsSurface(graphicsSurfaceToken, canvasSize, frontBuffer);
+    canvasBackingStore->setGraphicsSurface(token, canvasSize, frontBuffer);
     layer->setContentsToMedia(canvasBackingStore.get());
-#endif
 }
+#endif
 
 void LayerTreeRenderer::setLayerChildren(WebLayerID id, const Vector<WebLayerID>& childIDs)
 {
     ensureLayer(id);
     LayerMap::iterator it = m_layers.find(id);
-    GraphicsLayer* layer = it->second;
+    GraphicsLayer* layer = it->value;
     Vector<GraphicsLayer*> children;
 
     for (size_t i = 0; i < childIDs.size(); ++i) {
@@ -239,7 +239,7 @@ void LayerTreeRenderer::setLayerFilters(WebLayerID id, const FilterOperations& f
     LayerMap::iterator it = m_layers.find(id);
     ASSERT(it != m_layers.end());
 
-    GraphicsLayer* layer = it->second;
+    GraphicsLayer* layer = it->value;
     layer->setFilters(filters);
 }
 #endif
@@ -250,7 +250,7 @@ void LayerTreeRenderer::setLayerState(WebLayerID id, const WebLayerInfo& layerIn
     LayerMap::iterator it = m_layers.find(id);
     ASSERT(it != m_layers.end());
 
-    GraphicsLayer* layer = it->second;
+    GraphicsLayer* layer = it->value;
 
     layer->setReplicatedByLayer(layerByID(layerInfo.replica));
     layer->setMaskLayer(layerByID(layerInfo.mask));
@@ -377,7 +377,7 @@ void LayerTreeRenderer::assignImageToLayer(GraphicsLayer* layer, int64_t imageID
 
     HashMap<int64_t, RefPtr<TextureMapperBackingStore> >::iterator it = m_directlyCompositedImages.find(imageID);
     ASSERT(it != m_directlyCompositedImages.end());
-    layer->setContentsToMedia(it->second.get());
+    layer->setContentsToMedia(it->value.get());
 }
 
 void LayerTreeRenderer::commitTileOperations()
@@ -393,7 +393,7 @@ void LayerTreeRenderer::flushLayerChanges()
 {
     m_renderedContentsScrollPosition = m_pendingRenderedContentsScrollPosition;
 
-    m_rootLayer->syncCompositingState(FloatRect());
+    m_rootLayer->flushCompositingState(FloatRect());
     commitTileOperations();
 
     // The pending tiles state is on its way for the screen, tell the web process to render the next one.