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

[darin at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 7d6117fbc67eeed979c8359a1eeba5a14f722059
Author: darin at apple.com <darin at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Oct 7 00:34:56 2010 +0000

    Try to fix Windows build.
    
    * platform/graphics/cg/ColorCG.cpp:
    (WebCore::cachedCGColor): Put in braces to make the Windows compiler
    happy with this file.
    
    * platform/graphics/cg/ImageCG.cpp: Added include of RetainPtr.h.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69261 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 6aff4a7..1871964 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,15 @@
 2010-10-06  Darin Adler  <darin at apple.com>
 
+        Try to fix Windows build.
+
+        * platform/graphics/cg/ColorCG.cpp:
+        (WebCore::cachedCGColor): Put in braces to make the Windows compiler
+        happy with this file.
+
+        * platform/graphics/cg/ImageCG.cpp: Added include of RetainPtr.h.
+
+2010-10-06  Darin Adler  <darin at apple.com>
+
         Reviewed by Alexey Proskuryakov.
 
         Cache CGColor as we do NSColor
diff --git a/WebCore/platform/graphics/cg/ColorCG.cpp b/WebCore/platform/graphics/cg/ColorCG.cpp
index 57971dd..9c8bac6 100644
--- a/WebCore/platform/graphics/cg/ColorCG.cpp
+++ b/WebCore/platform/graphics/cg/ColorCG.cpp
@@ -92,16 +92,19 @@ static CGColorRef leakCGColor(const Color& color, ColorSpace colorSpace)
 template<ColorSpace colorSpace> static CGColorRef cachedCGColor(const Color& color)
 {
     switch (color.rgb()) {
-    case Color::transparent:
+    case Color::transparent: {
         static CGColorRef transparentCGColor = leakCGColor(color, colorSpace);
         return transparentCGColor;
-    case Color::black:
+    }
+    case Color::black: {
         static CGColorRef blackCGColor = leakCGColor(color, colorSpace);
         return blackCGColor;
-    case Color::white:
+    }
+    case Color::white: {
         static CGColorRef whiteCGColor = leakCGColor(color, colorSpace);
         return whiteCGColor;
     }
+    }
 
     ASSERT(color.rgb());
 
diff --git a/WebCore/platform/graphics/cg/ImageCG.cpp b/WebCore/platform/graphics/cg/ImageCG.cpp
index 9de516e..fd9751f 100644
--- a/WebCore/platform/graphics/cg/ImageCG.cpp
+++ b/WebCore/platform/graphics/cg/ImageCG.cpp
@@ -36,6 +36,7 @@
 #include "PDFDocumentImage.h"
 #include "PlatformString.h"
 #include <ApplicationServices/ApplicationServices.h>
+#include <wtf/RetainPtr.h>
 
 #if PLATFORM(MAC) || PLATFORM(CHROMIUM)
 #include "WebCoreSystemInterface.h"

-- 
WebKit Debian packaging