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

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 9d33f0da6bc61d111f99c43867733deeda71bad9
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Oct 9 18:11:14 2010 +0000

    2010-10-09  Kwang Yul Seo  <skyul at company100.net>
    
            Reviewed by Andreas Kling.
    
            Add ENABLE(ACCELERATED_2D_CANVAS) guard for m_uploadTexture
            https://bugs.webkit.org/show_bug.cgi?id=47114
    
            PlatformContextSkia's m_uploadTexture is used only in code guarded with ENABLE(ACCELERATED_2D_CANVAS).
    
            * platform/graphics/skia/PlatformContextSkia.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69450 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 2cb2e3c..f20cefa 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2010-10-09  Kwang Yul Seo  <skyul at company100.net>
+
+        Reviewed by Andreas Kling.
+
+        Add ENABLE(ACCELERATED_2D_CANVAS) guard for m_uploadTexture
+        https://bugs.webkit.org/show_bug.cgi?id=47114
+
+        PlatformContextSkia's m_uploadTexture is used only in code guarded with ENABLE(ACCELERATED_2D_CANVAS).
+
+        * platform/graphics/skia/PlatformContextSkia.h:
+
 2010-10-09  Patrick Gansterer  <paroga at webkit.org>
 
         Reviewed by Adam Barth.
diff --git a/WebCore/platform/graphics/skia/PlatformContextSkia.h b/WebCore/platform/graphics/skia/PlatformContextSkia.h
index 71d96c2..84e5d78 100644
--- a/WebCore/platform/graphics/skia/PlatformContextSkia.h
+++ b/WebCore/platform/graphics/skia/PlatformContextSkia.h
@@ -229,9 +229,9 @@ private:
     bool m_useGPU;
 #if ENABLE(ACCELERATED_2D_CANVAS)
     OwnPtr<GLES2Canvas> m_gpuCanvas;
+    mutable RefPtr<Texture> m_uploadTexture;
 #endif
     mutable enum { None, Software, Mixed, Hardware } m_backingStoreState;
-    mutable RefPtr<Texture> m_uploadTexture;
     mutable IntRect m_softwareDirtyRect;
 };
 

-- 
WebKit Debian packaging