From 206acf7607e01d8ddb4d2957406846b7bdae5cd1 Mon Sep 17 00:00:00 2001
From: "bfulgham@webkit.org"
 <bfulgham@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri, 3 Jul 2009 00:37:04 +0000
Subject: [PATCH] 2009-07-02  Brent Fulgham  <bfulgham@webkit.org>

        Windows build fix, no review.


        Reverting PixelDumpSupportWin.cpp change to avoid strange
        error on the build-bot.

        * DumpRenderTree/win/PixelDumpSupportWin.cpp:
        (createBitmapContextFromWebView):



git-svn-id: http://svn.webkit.org/repository/webkit/trunk@45512 268f45cc-cd09-0410-ab3c-d52691b4dbfc
---
 WebKitTools/ChangeLog                                  | 11 +++++++++++
 WebKitTools/DumpRenderTree/win/PixelDumpSupportWin.cpp | 18 +-----------------
 2 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index b839786697..5b4aab20a4 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,5 +1,16 @@
 2009-07-02  Brent Fulgham  <bfulgham@webkit.org>
 
+        Windows build fix, no review.
+
+
+        Reverting PixelDumpSupportWin.cpp change to avoid strange
+        error on the build-bot.
+ 
+        * DumpRenderTree/win/PixelDumpSupportWin.cpp:
+        (createBitmapContextFromWebView):
+
+2009-07-02  Brent Fulgham  <bfulgham@webkit.org>
+
         Build fix, no review.
 
         * DumpRenderTree/config.h:
diff --git a/WebKitTools/DumpRenderTree/win/PixelDumpSupportWin.cpp b/WebKitTools/DumpRenderTree/win/PixelDumpSupportWin.cpp
index 5bf03e4173..bcc79c622f 100644
--- a/WebKitTools/DumpRenderTree/win/PixelDumpSupportWin.cpp
+++ b/WebKitTools/DumpRenderTree/win/PixelDumpSupportWin.cpp
@@ -27,15 +27,9 @@
  */
 
 #include "config.h"
-#if PLATFORM(CG)
-#include <CoreGraphics/CGBitmapContext.h>
 #include "PixelDumpSupportCG.h"
-#else
-#include <cairo-win32.h>
-#include "PixelDumpSupportCairo.h"
-#endif
-
 #include "DumpRenderTree.h"
+#include <CoreGraphics/CGBitmapContext.h>
 #include <wtf/Assertions.h>
 #include <wtf/RetainPtr.h>
 
@@ -65,19 +59,9 @@ PassRefPtr<BitmapContext> createBitmapContextFromWebView(bool onscreen, bool inc
     GetObject(bitmap, sizeof(info), &info);
     ASSERT(info.bmBitsPixel == 32);
 
-#if PLATFORM(CG)
     RetainPtr<CGColorSpaceRef> colorSpace(AdoptCF, CGColorSpaceCreateDeviceRGB());
     CGContextRef context = CGBitmapContextCreate(info.bmBits, info.bmWidth, info.bmHeight, 8,
                                                 info.bmWidthBytes, colorSpace.get(), kCGBitmapByteOrder32Little | kCGImageAlphaPremultipliedFirst);
-#elif PLATFORM(CAIRO)
-    cairo_surface_t* image = cairo_image_surface_create_for_data((unsigned char*)info.bmBits,
-                                               CAIRO_FORMAT_ARGB32,
-                                               info.bmWidth,
-                                               info.bmHeight,
-                                               info.bmWidthBytes);
-    cairo_t* context = cairo_create(image);
-    cairo_surface_destroy(image);
-#endif
 
     return BitmapContext::createByAdoptingBitmapAndContext(bitmap, context);
 }
-- 
2.11.4.GIT