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

morrita at google.com morrita at google.com
Wed Dec 22 14:00:29 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 6c12340d92b2e6463362e3e6422ce215816b1f68
Author: morrita at google.com <morrita at google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Oct 1 10:41:28 2010 +0000

    2010-10-01  MORITA Hajime  <morrita at google.com>
    
            Unreviewed build fix.
    
            * platform/graphics/skia/PlatformContextSkia.cpp:
            (WebCore::PlatformContextSkia::PlatformContextSkia):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68875 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 2d4040b..43eb724 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,10 @@
+2010-10-01  MORITA Hajime  <morrita at google.com>
+
+        Unreviewed build fix.
+
+        * platform/graphics/skia/PlatformContextSkia.cpp:
+        (WebCore::PlatformContextSkia::PlatformContextSkia):
+
 2010-10-01  Nikolas Zimmermann  <nzimmermann at rim.com>
 
         Reviewed by Andreas Kling.
diff --git a/WebCore/platform/graphics/skia/PlatformContextSkia.cpp b/WebCore/platform/graphics/skia/PlatformContextSkia.cpp
index 887314f..fee8e7e 100644
--- a/WebCore/platform/graphics/skia/PlatformContextSkia.cpp
+++ b/WebCore/platform/graphics/skia/PlatformContextSkia.cpp
@@ -210,7 +210,9 @@ PlatformContextSkia::PlatformContextSkia(skia::PlatformCanvas* canvas)
     : m_canvas(canvas)
     , m_drawingToImageBuffer(false)
     , m_useGPU(false)
+#if ENABLE(ACCELERATED_2D_CANVAS)
     , m_gpuCanvas(0)
+#endif
     , m_backingStoreState(None)
 {
     m_stateStack.append(State());

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list