Merge WebKit at r80534: Intial merge by Git

Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61

1 files changed, 15 insertions, 26 deletions

diff --git a/Source/WebCore/platform/graphics/chromium/ContentLayerChromium.h b/Source/WebCore/platform/graphics/chromium/ContentLayerChromium.h
index 3363518..6f070c2 100644
--- a/Source/WebCore/platform/graphics/chromium/ContentLayerChromium.h
+++ b/Source/WebCore/platform/graphics/chromium/ContentLayerChromium.h
@@ -35,6 +35,7 @@
 #if USE(ACCELERATED_COMPOSITING)
 
 #include "LayerChromium.h"
+#include "PlatformCanvas.h"
 #include "TextureManager.h"
 
 namespace WebCore {
@@ -54,43 +55,31 @@ public:
     virtual void bindContentsTexture();
 
     virtual void draw();
-    virtual bool drawsContent() { return m_owner && m_owner->drawsContent(); }
-
-    // Stores values that are shared between instances of this class that are
-    // associated with the same LayerRendererChromium (and hence the same GL
-    // context).
-    class SharedValues {
-    public:
-        explicit SharedValues(GraphicsContext3D*);
-        ~SharedValues();
-
-        unsigned contentShaderProgram() const { return m_contentShaderProgram; }
-        int shaderSamplerLocation() const { return m_shaderSamplerLocation; }
-        int shaderMatrixLocation() const { return m_shaderMatrixLocation; }
-        int shaderAlphaLocation() const { return m_shaderAlphaLocation; }
-        int initialized() const { return m_initialized; }
-
-    private:
-        GraphicsContext3D* m_context;
-        unsigned m_contentShaderProgram;
-        int m_shaderSamplerLocation;
-        int m_shaderMatrixLocation;
-        int m_shaderAlphaLocation;
-        int m_initialized;
-    };
+    virtual bool drawsContent() const { return m_owner && m_owner->drawsContent(); }
+
+    typedef ProgramBinding<VertexShaderPosTex, FragmentShaderTexAlpha> Program;
 
 protected:
     explicit ContentLayerChromium(GraphicsLayerChromium* owner);
 
-    void updateTextureRect(void* pixels, const IntSize& requiredTextureSize, const IntRect& updateRect);
-
     virtual void cleanupResources();
     bool requiresClippedUpdateRect() const;
+    void resizeUploadBuffer(const IntSize&);
+
+    virtual const char* layerTypeAsString() const { return "ContentLayer"; }
+    virtual void dumpLayerProperties(TextStream&, int indent) const;
 
     OwnPtr<LayerTexture> m_contentsTexture;
     bool m_skipsDraw;
 
+    // The portion of the upload buffer that has a pending update, in the coordinates of the texture.
+    IntRect m_uploadUpdateRect;
+
+    virtual void updateTextureIfNeeded();
+    void updateTexture(const uint8_t* pixels, const IntSize&);
+
 private:
+    PlatformCanvas m_canvas;
 
     IntRect m_visibleRectInLayerCoords;
     FloatPoint m_layerCenterInSurfaceCoords;