Imported WebKit commit 3a8c29f35d00659d2ce7a0ccdfa8304f14e82327 (http://svn.webkit.org/repository/webkit/trunk@120813)

New snapshot with Windows build fixes

1 files changed, 33 insertions, 1 deletions

diff --git a/Source/WebKit2/UIProcess/WebLayerTreeRenderer.cpp b/Source/WebKit2/UIProcess/WebLayerTreeRenderer.cpp
index c6c0fadf8..c3e573923 100644
--- a/Source/WebKit2/UIProcess/WebLayerTreeRenderer.cpp
+++ b/Source/WebKit2/UIProcess/WebLayerTreeRenderer.cpp
@@ -30,6 +30,7 @@
 #include "ShareableBitmap.h"
 #include "TextureMapper.h"
 #include "TextureMapperBackingStore.h"
+#include "TextureMapperGL.h"
 #include "TextureMapperLayer.h"
 #include "UpdateInfo.h"
 #include <OpenGLShims.h>
@@ -85,7 +86,8 @@ static IntPoint boundedScrollPosition(const IntPoint& scrollPosition, const IntR
 }
 
 WebLayerTreeRenderer::WebLayerTreeRenderer(LayerTreeHostProxy* layerTreeHostProxy)
-    : m_layerTreeHostProxy(layerTreeHostProxy)
+    : m_contentsScale(1)
+    , m_layerTreeHostProxy(layerTreeHostProxy)
     , m_rootLayerID(InvalidWebLayerID)
     , m_isActive(false)
 {
@@ -194,6 +196,28 @@ void WebLayerTreeRenderer::didChangeScrollPosition(const IntPoint& position)
     m_pendingRenderedContentsScrollPosition = boundedScrollPosition(position, m_visibleContentsRect, m_contentsSize);
 }
 
+void WebLayerTreeRenderer::syncCanvas(WebLayerID id, const WebCore::IntSize& canvasSize, uint32_t graphicsSurfaceToken)
+{
+    if (canvasSize.isEmpty() || !m_textureMapper)
+        return;
+
+#if USE(GRAPHICS_SURFACE)
+    ensureLayer(id);
+    GraphicsLayer* layer = layerByID(id);
+
+    RefPtr<TextureMapperSurfaceBackingStore> canvasBackingStore;
+    SurfaceBackingStoreMap::iterator it = m_surfaceBackingStores.find(id);
+    if (it == m_surfaceBackingStores.end()) {
+        canvasBackingStore = TextureMapperSurfaceBackingStore::create();
+        m_surfaceBackingStores.set(id, canvasBackingStore);
+    } else
+        canvasBackingStore = it->second;
+
+    canvasBackingStore->setGraphicsSurface(graphicsSurfaceToken, canvasSize);
+    layer->setContentsToMedia(canvasBackingStore.get());
+#endif
+}
+
 void WebLayerTreeRenderer::setLayerChildren(WebLayerID id, const Vector<WebLayerID>& childIDs)
 {
     ensureLayer(id);
@@ -271,6 +295,9 @@ void WebLayerTreeRenderer::deleteLayer(WebLayerID layerID)
     layer->removeFromParent();
     m_layers.remove(layerID);
     m_fixedLayers.remove(layerID);
+#if USE(GRAPHICS_SURFACE)
+    m_surfaceBackingStores.remove(layerID);
+#endif
     delete layer;
 }
 
@@ -419,6 +446,9 @@ void WebLayerTreeRenderer::purgeGLResources()
         layer->clearBackingStoresRecursive();
 
     m_directlyCompositedImages.clear();
+#if USE(GRAPHICS_SURFACE)
+    m_surfaceBackingStores.clear();
+#endif
 
     m_rootLayer->removeAllChildren();
     m_rootLayer.clear();
@@ -428,6 +458,8 @@ void WebLayerTreeRenderer::purgeGLResources()
     m_textureMapper.clear();
     m_backingStoresWithPendingBuffers.clear();
 
+    setActive(false);
+
     callOnMainThread(bind(&WebLayerTreeRenderer::purgeBackingStores, this));
 }