[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[eric at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 3888611b3e41ae4657f83651d4d2950504e89b7b
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Aug 9 18:22:33 2010 +0000

    2010-08-09  Sheriff Bot  <webkit.review.bot at gmail.com>
    
            Unreviewed, rolling out r64993.
            http://trac.webkit.org/changeset/64993
            https://bugs.webkit.org/show_bug.cgi?id=43734
    
            broke chromium compile (Requested by jamesr on #webkit).
    
            * platform/graphics/chromium/CanvasLayerChromium.cpp:
            (WebCore::CanvasLayerChromium::updateTextureContents):
            * platform/graphics/chromium/CanvasLayerChromium.h:
            * platform/graphics/skia/PlatformContextSkia.cpp:
            (WebCore::PlatformContextSkia::~PlatformContextSkia):
            (WebCore::PlatformContextSkia::setGraphicsContext3D):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64994 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 6ce41db..de9f788 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,18 @@
+2010-08-09  Sheriff Bot  <webkit.review.bot at gmail.com>
+
+        Unreviewed, rolling out r64993.
+        http://trac.webkit.org/changeset/64993
+        https://bugs.webkit.org/show_bug.cgi?id=43734
+
+        broke chromium compile (Requested by jamesr on #webkit).
+
+        * platform/graphics/chromium/CanvasLayerChromium.cpp:
+        (WebCore::CanvasLayerChromium::updateTextureContents):
+        * platform/graphics/chromium/CanvasLayerChromium.h:
+        * platform/graphics/skia/PlatformContextSkia.cpp:
+        (WebCore::PlatformContextSkia::~PlatformContextSkia):
+        (WebCore::PlatformContextSkia::setGraphicsContext3D):
+
 2010-08-09  James Robinson  <jamesr at chromium.org>
 
         Reviewed by Dimitri Glazkov.
diff --git a/WebCore/platform/graphics/chromium/CanvasLayerChromium.cpp b/WebCore/platform/graphics/chromium/CanvasLayerChromium.cpp
index 7e732d1..f290e68 100644
--- a/WebCore/platform/graphics/chromium/CanvasLayerChromium.cpp
+++ b/WebCore/platform/graphics/chromium/CanvasLayerChromium.cpp
@@ -75,8 +75,6 @@ void CanvasLayerChromium::updateTextureContents(unsigned textureId)
     }
     // Update the contents of the texture used by the compositor.
     if (m_contentsDirty) {
-        if (m_prepareTextureCallback)
-            m_prepareTextureCallback->willPrepareTexture();
         m_context->prepareTexture();
         m_contentsDirty = false;
     }
diff --git a/WebCore/platform/graphics/chromium/CanvasLayerChromium.h b/WebCore/platform/graphics/chromium/CanvasLayerChromium.h
index 98be270..a0025a4 100644
--- a/WebCore/platform/graphics/chromium/CanvasLayerChromium.h
+++ b/WebCore/platform/graphics/chromium/CanvasLayerChromium.h
@@ -54,18 +54,11 @@ public:
 
     static void setShaderProgramId(unsigned shaderProgramId) { m_shaderProgramId = shaderProgramId; }
 
-    class PrepareTextureCallback : public Noncopyable {
-    public:
-        virtual void willPrepareTexture() = 0;
-    };
-    void setPrepareTextureCallback(PassOwnPtr<PrepareTextureCallback> callback) { m_prepareTextureCallback = callback; }
-
 private:
     explicit CanvasLayerChromium(GraphicsLayerChromium* owner);
     GraphicsContext3D* m_context;
     unsigned m_textureId;
     bool m_textureChanged;
-    OwnPtr<PrepareTextureCallback> m_prepareTextureCallback;
 
     static unsigned m_shaderProgramId;
 };
diff --git a/WebCore/platform/graphics/skia/PlatformContextSkia.cpp b/WebCore/platform/graphics/skia/PlatformContextSkia.cpp
index 0dfe494..b14c6cd 100644
--- a/WebCore/platform/graphics/skia/PlatformContextSkia.cpp
+++ b/WebCore/platform/graphics/skia/PlatformContextSkia.cpp
@@ -33,7 +33,6 @@
 #include "PlatformContextSkia.h"
 
 #include "AffineTransform.h"
-#include "CanvasLayerChromium.h"
 #include "GraphicsContext.h"
 #include "ImageBuffer.h"
 #include "NativeImageSkia.h"
@@ -221,12 +220,6 @@ PlatformContextSkia::PlatformContextSkia(skia::PlatformCanvas* canvas)
 
 PlatformContextSkia::~PlatformContextSkia()
 {
-#if USE(GLES2_RENDERING)
-    if (m_gpuCanvas) {
-        CanvasLayerChromium* layer = static_cast<CanvasLayerChromium*>(m_gpuCanvas->context()->platformLayer());
-        layer->setPrepareTextureCallback(0);
-    }
-#endif
 }
 
 void PlatformContextSkia::setCanvas(skia::PlatformCanvas* canvas)
@@ -685,28 +678,10 @@ void PlatformContextSkia::applyAntiAliasedClipPaths(WTF::Vector<SkPath>& paths)
 
 #if USE(GLES2_RENDERING)
 
-class PrepareTextureCallbackImpl : public CanvasLayerChromium::PrepareTextureCallback {
-public:
-    static PassOwnPtr<PrepareTextureCallbackImpl> create(PlatformContextSkia* pcs)
-    {
-        return new PrepareTextureCallbackImpl(pcs);
-    }
-
-    virtual void willPrepareTexture()
-    {
-        m_pcs->prepareForHardwareDraw();
-    }
-private:
-    explicit PrepareTextureCallbackImpl(PlatformContextSkia* pcs) : m_pcs(pcs) {}
-    PlatformContextSkia* m_pcs;
-};
-
 void PlatformContextSkia::setGraphicsContext3D(GraphicsContext3D* context, const WebCore::IntSize& size)
 {
     m_useGPU = true;
     m_gpuCanvas = new GLES2Canvas(context, size);
-    CanvasLayerChromium* layer = static_cast<CanvasLayerChromium*>(context->platformLayer());
-    layer->setPrepareTextureCallback(PrepareTextureCallbackImpl::create(this));
 }
 
 void PlatformContextSkia::prepareForSoftwareDraw() const

-- 
WebKit Debian packaging