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

[jamesr at google.com]

The following commit has been merged in the debian/experimental branch:
commit ac139654b6875b7d31d1844b6a2990b85f0454f7
Author: jamesr at google.com <jamesr at google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Aug 9 21:12:26 2010 +0000

    2010-08-09  James Robinson  <jamesr at chromium.org>
    
            Chromium compile fix, unreviewed.
    
            * platform/graphics/skia/PlatformContextSkia.cpp:
            (WebCore::PlatformContextSkia::~PlatformContextSkia):
            (WebCore::PlatformContextSkia::setGraphicsContext3D):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65002 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 282d7ff..4adec2a 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,13 @@
 2010-08-09  James Robinson  <jamesr at chromium.org>
 
+        Chromium compile fix, unreviewed.
+
+        * platform/graphics/skia/PlatformContextSkia.cpp:
+        (WebCore::PlatformContextSkia::~PlatformContextSkia):
+        (WebCore::PlatformContextSkia::setGraphicsContext3D):
+
+2010-08-09  James Robinson  <jamesr at chromium.org>
+
         Reviewed by Dimitri Glazkov.
 
         [chromium] Add a PrepareTextureCallback to the chromium canvas layer compositor to upload mixed-mode results before compositing
diff --git a/WebCore/platform/graphics/skia/PlatformContextSkia.cpp b/WebCore/platform/graphics/skia/PlatformContextSkia.cpp
index 0dfe494..abf04f9 100644
--- a/WebCore/platform/graphics/skia/PlatformContextSkia.cpp
+++ b/WebCore/platform/graphics/skia/PlatformContextSkia.cpp
@@ -221,7 +221,7 @@ PlatformContextSkia::PlatformContextSkia(skia::PlatformCanvas* canvas)
 
 PlatformContextSkia::~PlatformContextSkia()
 {
-#if USE(GLES2_RENDERING)
+#if USE(GLES2_RENDERING) && USE(ACCELERATED_COMPOSITING)
     if (m_gpuCanvas) {
         CanvasLayerChromium* layer = static_cast<CanvasLayerChromium*>(m_gpuCanvas->context()->platformLayer());
         layer->setPrepareTextureCallback(0);
@@ -684,7 +684,7 @@ void PlatformContextSkia::applyAntiAliasedClipPaths(WTF::Vector<SkPath>& paths)
 }
 
 #if USE(GLES2_RENDERING)
-
+#if USE(ACCELERATED_COMPOSITING)
 class PrepareTextureCallbackImpl : public CanvasLayerChromium::PrepareTextureCallback {
 public:
     static PassOwnPtr<PrepareTextureCallbackImpl> create(PlatformContextSkia* pcs)
@@ -700,13 +700,16 @@ private:
     explicit PrepareTextureCallbackImpl(PlatformContextSkia* pcs) : m_pcs(pcs) {}
     PlatformContextSkia* m_pcs;
 };
+#endif
 
 void PlatformContextSkia::setGraphicsContext3D(GraphicsContext3D* context, const WebCore::IntSize& size)
 {
     m_useGPU = true;
     m_gpuCanvas = new GLES2Canvas(context, size);
+#if USE(ACCELERATED_COMPOSITING)
     CanvasLayerChromium* layer = static_cast<CanvasLayerChromium*>(context->platformLayer());
     layer->setPrepareTextureCallback(PrepareTextureCallbackImpl::create(this));
+#endif
 }
 
 void PlatformContextSkia::prepareForSoftwareDraw() const

-- 
WebKit Debian packaging