[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

simon.fraser at apple.com simon.fraser at apple.com
Thu Apr 8 01:05:01 UTC 2010


The following commit has been merged in the webkit-1.2 branch:
commit c05c55d2b5accf521704e71666ed4feb520a65f5
Author: simon.fraser at apple.com <simon.fraser at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 14 05:00:23 2010 +0000

    2010-01-13  Simon Fraser  <simon.fraser at apple.com>
    
            Fix Windows build.
    
            * platform/graphics/cg/GraphicsContextCG.cpp:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53237 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 240595e..5af6909 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,11 @@
 2010-01-13  Simon Fraser  <simon.fraser at apple.com>
 
+        Fix Windows build.
+
+        * platform/graphics/cg/GraphicsContextCG.cpp:
+
+2010-01-13  Simon Fraser  <simon.fraser at apple.com>
+
         Reviewed by Darin Adler.
 
         Transition followed by animation fails to run the animation sometimes
diff --git a/WebCore/platform/graphics/cg/GraphicsContextCG.cpp b/WebCore/platform/graphics/cg/GraphicsContextCG.cpp
index b147676..b3ccaa6 100644
--- a/WebCore/platform/graphics/cg/GraphicsContextCG.cpp
+++ b/WebCore/platform/graphics/cg/GraphicsContextCG.cpp
@@ -36,7 +36,6 @@
 #include "Path.h"
 #include "Pattern.h"
 #include "TransformationMatrix.h"
-#include "WebCoreSystemInterface.h"
 
 #include <CoreGraphics/CGBitmapContext.h>
 #include <CoreGraphics/CGPDFContext.h>
@@ -44,6 +43,14 @@
 #include <wtf/OwnArrayPtr.h>
 #include <wtf/RetainPtr.h>
 
+#if PLATFORM(MAC) || PLATFORM(CHROMIUM)
+#include "WebCoreSystemInterface.h"
+#endif
+
+#if PLATFORM(WIN)
+#include <WebKitSystemInterface/WebKitSystemInterface.h>
+#endif
+
 #if PLATFORM(MAC) || (PLATFORM(CHROMIUM) && OS(DARWIN))
 
 #if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list