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

[darin at apple.com]

The following commit has been merged in the debian/experimental branch:
commit f6c073ee3bb7bb75417ed5c8d1004de30867050b
Author: darin at apple.com <darin at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Dec 1 19:54:27 2010 +0000

    Fixed warning seen on buildbot.
    
    * platform/graphics/chromium/ContentLayerChromium.cpp:
    (WebCore::ContentLayerChromium::SharedValues::SharedValues): Added #if.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73053 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 38d4690..898fea1 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,10 @@
+2010-12-01  Darin Adler  <darin at apple.com>
+
+        Fixed warning seen on buildbot.
+
+        * platform/graphics/chromium/ContentLayerChromium.cpp:
+        (WebCore::ContentLayerChromium::SharedValues::SharedValues): Added #if.
+
 2010-12-01  Ryosuke Niwa  <rniwa at webkit.org>
 
         Reviewed by Darin Adler, Tony Chang, and unofficially by Enrica Casucci.
diff --git a/WebCore/platform/graphics/chromium/ContentLayerChromium.cpp b/WebCore/platform/graphics/chromium/ContentLayerChromium.cpp
index 48e639d..7dab01f 100644
--- a/WebCore/platform/graphics/chromium/ContentLayerChromium.cpp
+++ b/WebCore/platform/graphics/chromium/ContentLayerChromium.cpp
@@ -69,6 +69,7 @@ ContentLayerChromium::SharedValues::SharedValues(GraphicsContext3D* context)
         "  v_texCoord = a_texCoord;   \n"
         "}                            \n";
 
+#if PLATFORM(SKIA)
     // Color is in RGBA order.
     char rgbaFragmentShaderString[] =
         "precision mediump float;                            \n"
@@ -80,6 +81,7 @@ ContentLayerChromium::SharedValues::SharedValues(GraphicsContext3D* context)
         "  vec4 texColor = texture2D(s_texture, v_texCoord); \n"
         "  gl_FragColor = texColor * alpha; \n"
         "}                                                   \n";
+#endif
 
     // Color is in BGRA order.
     char bgraFragmentShaderString[] =

-- 
WebKit Debian packaging