Get rid of WebCoreSystemInterface on Windows

 WebCore:

         Get rid of WebCoreSystemInterface on Windows

         The one function defined in that file is now in WebKitSystemInterface.

         Reviewed by Tim.

         * WebCore.vcproj/WebCore.vcproj: Removed
         WebCoreSystemInterface.{cpp,h}.
         * platform/graphics/cg/ImageCG.cpp: Made #include of
         WebCoreSystemInterface.h Mac-only.
         * platform/win/GraphicsContextWin.cpp: Ditto.
         * platform/win/WebCoreSystemInterface.cpp: Removed.
         * platform/win/WebCoreSystemInterface.h: Removed.

 WebKitLibraries:

         Add wkSetPatternPhaseInUserSpace to WebKitSystemInterface on Windows

         Reviewed by Tim.

         * win/include/WebKitSystemInterface/WebKitSystemInterface.h: Added
         declaration.
         * win/lib/WebKitSystemInterface.lib: Updated.
         * win/lib/WebKitSystemInterface_debug.lib: Updated.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@28005 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 41dce0c59f529fbc2ce34c7760e5b62e19a5292e..1920c4009a53e2a36aec4b9e8818ae359b0684ba 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,19 @@
+2007-11-23  Adam Roben  <aroben@apple.com>
+
+        Get rid of WebCoreSystemInterface on Windows
+
+        The one function defined in that file is now in WebKitSystemInterface.
+
+        Reviewed by Tim.
+
+        * WebCore.vcproj/WebCore.vcproj: Removed
+        WebCoreSystemInterface.{cpp,h}.
+        * platform/graphics/cg/ImageCG.cpp: Made #include of
+        WebCoreSystemInterface.h Mac-only.
+        * platform/win/GraphicsContextWin.cpp: Ditto.
+        * platform/win/WebCoreSystemInterface.cpp: Removed.
+        * platform/win/WebCoreSystemInterface.h: Removed.
+
 2007-11-24  Adam Roben  <aroben@apple.com>
 
         Replace uses of %@ with %s in the inspector

diff --git a/WebCore/WebCore.vcproj/WebCore.vcproj b/WebCore/WebCore.vcproj/WebCore.vcproj
index cc7221991e9887c1a4f4f129599052f41e866041..f692f96aaceb84bc7f82061d22dab01b065b5e8f 100644 (file)
--- a/WebCore/WebCore.vcproj/WebCore.vcproj
+++ b/WebCore/WebCore.vcproj/WebCore.vcproj
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="windows-1251"?>\r
+<?xml version="1.0" encoding="Windows-1252"?>\r
 <VisualStudioProject\r
        ProjectType="Visual C++"\r
-       Version="8,00"\r
+       Version="8.00"\r
        Name="WebCore"\r
        ProjectGUID="{1C16337B-ACF3-4D03-AA90-851C5B5EADA6}"\r
        RootNamespace="WebCore"\r
@@ -3864,14 +3864,6 @@
                                        RelativePath="..\platform\win\WebCoreHistory.h"\r
                                        >\r
                                </File>\r
-                               <File\r
-                                       RelativePath="..\platform\win\WebCoreSystemInterface.cpp"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\platform\win\WebCoreSystemInterface.h"\r
-                                       >\r
-                               </File>\r
                                <File\r
                                        RelativePath="..\platform\win\WebCoreTextRenderer.cpp"\r
                                        >\r

diff --git a/WebCore/platform/graphics/cg/ImageCG.cpp b/WebCore/platform/graphics/cg/ImageCG.cpp
index 8bfb1a6dc411168a3d0ea0a5f0f381506511b91f..5958d86233bb0b39077c166ac0cef94f9be6c3a1 100644 (file)
--- a/WebCore/platform/graphics/cg/ImageCG.cpp
+++ b/WebCore/platform/graphics/cg/ImageCG.cpp
@@ -36,7 +36,10 @@
 #include "PDFDocumentImage.h"
 #include "PlatformString.h"
 #include <ApplicationServices/ApplicationServices.h>
+
+#if PLATFORM(MAC)
 #include "WebCoreSystemInterface.h"
+#endif
 
 #if PLATFORM(WIN)
 #include <WebKitSystemInterface/WebKitSystemInterface.h>

diff --git a/WebCore/platform/win/GraphicsContextWin.cpp b/WebCore/platform/win/GraphicsContextWin.cpp
index 180138cef0faa1ae302e3f7adbb1b9126a6f4c55..076e18d20a2f1d038ad329e8089d45c5e312e16d 100644 (file)
--- a/WebCore/platform/win/GraphicsContextWin.cpp
+++ b/WebCore/platform/win/GraphicsContextWin.cpp
@@ -29,11 +29,11 @@
 #include "AffineTransform.h"
 #include "NotImplemented.h"
 #include "Path.h"
+#include <CoreGraphics/CGBitmapContext.h>
 #include <WebKitSystemInterface/WebKitSystemInterface.h>
 #include <wtf/MathExtras.h>
 
 #include "GraphicsContextPlatformPrivate.h"
-#include "WebCoreSystemInterface.h"
 
 using namespace std;
 

diff --git a/WebCore/platform/win/WebCoreSystemInterface.cpp b/WebCore/platform/win/WebCoreSystemInterface.cpp
deleted file mode 100644 (file)
index 6a938bc..0000000
--- a/WebCore/platform/win/WebCoreSystemInterface.cpp
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (C) 2006, 2007 Apple Inc.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
- */
-
-#include "config.h"
-#include "WebCoreSystemInterface.h"
-
-extern "C" CGAffineTransform CGContextGetBaseCTM(CGContextRef c);
-
-void wkSetPatternPhaseInUserSpace(CGContextRef context, CGPoint phasePoint)
-{
-    CGAffineTransform userToBase = CGAffineTransformConcat(CGContextGetCTM(context),
-        CGAffineTransformInvert(CGContextGetBaseCTM(context)));
-    CGPoint phase = CGPointApplyAffineTransform(phasePoint, userToBase);
-            
-    CGContextSetPatternPhase(context, CGSizeMake(phase.x, phase.y));
-}

diff --git a/WebCore/platform/win/WebCoreSystemInterface.h b/WebCore/platform/win/WebCoreSystemInterface.h
deleted file mode 100644 (file)
index 8fbf16c..0000000
--- a/WebCore/platform/win/WebCoreSystemInterface.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (C) 2006, 2007 Apple Inc.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
- */
-
-#include <ApplicationServices/ApplicationServices.h>
-
-void wkSetPatternPhaseInUserSpace(CGContextRef context, CGPoint phasePoint);

diff --git a/WebKitLibraries/ChangeLog b/WebKitLibraries/ChangeLog
index 24fcc5961458a197b444b4a0787e0308e8fa8b98..e5ac49c7de3f4917a2786ae7ce0afe882474eeb2 100644 (file)
--- a/WebKitLibraries/ChangeLog
+++ b/WebKitLibraries/ChangeLog
@@ -1,3 +1,14 @@
+2007-11-23  Adam Roben  <aroben@apple.com>
+
+        Add wkSetPatternPhaseInUserSpace to WebKitSystemInterface on Windows
+
+        Reviewed by Tim.
+
+        * win/include/WebKitSystemInterface/WebKitSystemInterface.h: Added
+        declaration.
+        * win/lib/WebKitSystemInterface.lib: Updated.
+        * win/lib/WebKitSystemInterface_debug.lib: Updated.
+
 2007-11-16  Anders Carlsson  <andersca@apple.com>
 
         Reviewed by Adam.

diff --git a/WebKitLibraries/win/include/WebKitSystemInterface/WebKitSystemInterface.h b/WebKitLibraries/win/include/WebKitSystemInterface/WebKitSystemInterface.h
index 932d8aee32e1e925c9cc88aaac87f9927d5b57f0..377f45bdeeea4b74924e27807e9f8b194751908f 100644 (file)
--- a/WebKitLibraries/win/include/WebKitSystemInterface/WebKitSystemInterface.h
+++ b/WebKitLibraries/win/include/WebKitSystemInterface/WebKitSystemInterface.h
@@ -27,6 +27,7 @@
 #define WebKitSystemInterface_h
 
 struct CGAffineTransform;
+struct CGPoint;
 struct CGSize;
 
 typedef const struct __CFData* CFDataRef;
@@ -54,6 +55,7 @@ void wkAddFontsFromPlistRepresentation(CFDataRef);
 CFDataRef wkCreateFontsPlistRepresentation();
 
 void wkSetPatternBaseCTM(CGContextRef, CGAffineTransform);
+void wkSetPatternPhaseInUserSpace(CGContextRef, CGPoint phasePoint);
 
 void wkDrawFocusRing(CGContextRef, CGColorRef, float radius);
 

diff --git a/WebKitLibraries/win/lib/WebKitSystemInterface.lib b/WebKitLibraries/win/lib/WebKitSystemInterface.lib
index 839b0901773292614a2272400804e63993789976..33bda61ee204391fa26b6c3759a9dc9e7aae907e 100644 (file)
Binary files a/WebKitLibraries/win/lib/WebKitSystemInterface.lib and b/WebKitLibraries/win/lib/WebKitSystemInterface.lib differ

diff --git a/WebKitLibraries/win/lib/WebKitSystemInterface_debug.lib b/WebKitLibraries/win/lib/WebKitSystemInterface_debug.lib
index 76e1cb9cbe75bf39315707875eeb2dcb88911139..a292706fbc31d96408f8100ed8f830c8d41f1dce 100644 (file)
Binary files a/WebKitLibraries/win/lib/WebKitSystemInterface_debug.lib and b/WebKitLibraries/win/lib/WebKitSystemInterface_debug.lib differ