[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 694681ba3852f1c283e220a44a7b7eb3ecaa772f
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Oct 5 11:16:41 2010 +0000

    2010-10-05  Kwang Yul Seo  <skyul at company100.net>
    
            Reviewed by Csaba Osztrogonác.
    
            Add ENABLE(ACCELERATED_2D_CANVAS) guard to LoopBlinnLocalTriangulator.cpp
            https://bugs.webkit.org/show_bug.cgi?id=47115
    
            LoopBlinnLocalTriangulator.cpp depends on LoopBlinnMathUtils.cpp which is guarded by
            ENABLE(ACCELERATED_2D_CANVAS).
    
            * platform/graphics/gpu/LoopBlinnLocalTriangulator.cpp:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69101 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 9f5158c..33c9cf1 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-10-05  Kwang Yul Seo  <skyul at company100.net>
+
+        Reviewed by Csaba Osztrogonác.
+
+        Add ENABLE(ACCELERATED_2D_CANVAS) guard to LoopBlinnLocalTriangulator.cpp
+        https://bugs.webkit.org/show_bug.cgi?id=47115
+
+        LoopBlinnLocalTriangulator.cpp depends on LoopBlinnMathUtils.cpp which is guarded by
+        ENABLE(ACCELERATED_2D_CANVAS).
+
+        * platform/graphics/gpu/LoopBlinnLocalTriangulator.cpp:
+
 2010-10-05  Satish Sampath  <satish at chromium.org>
 
         Reviewed by Kent Tamura.
diff --git a/WebCore/platform/graphics/gpu/LoopBlinnLocalTriangulator.cpp b/WebCore/platform/graphics/gpu/LoopBlinnLocalTriangulator.cpp
index 3b73ff6..1517a67 100644
--- a/WebCore/platform/graphics/gpu/LoopBlinnLocalTriangulator.cpp
+++ b/WebCore/platform/graphics/gpu/LoopBlinnLocalTriangulator.cpp
@@ -25,6 +25,8 @@
 
 #include "config.h"
 
+#if ENABLE(ACCELERATED_2D_CANVAS)
+
 #include "LoopBlinnLocalTriangulator.h"
 
 #include "LoopBlinnMathUtils.h"
@@ -273,3 +275,5 @@ bool LoopBlinnLocalTriangulator::isSharedEdge(Vertex* v0, Vertex* v1)
 }
 
 } // namespace WebCore
+
+#endif

-- 
WebKit Debian packaging