Remove QuartzCoreInterface from the build
authorcmarrin@apple.com <cmarrin@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 8 Apr 2010 00:38:40 +0000 (00:38 +0000)
committercmarrin@apple.com <cmarrin@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 8 Apr 2010 00:38:40 +0000 (00:38 +0000)
        No longer needed since QuartzCore.dll is now included in  the latest Safari release (4.0.5).

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

WebCore/ChangeLog
WebCore/platform/graphics/win/GraphicsLayerCACF.cpp
WebCore/platform/graphics/win/WKCACFLayer.cpp
WebCore/platform/graphics/win/WKCACFLayerRenderer.cpp
WebKit/win/ChangeLog
WebKit/win/WebKit.vcproj/WebKit.vcproj
WebKitLibraries/ChangeLog
WebKitLibraries/win/bin/QuartzCoreInterface.dll [deleted file]
WebKitLibraries/win/include/QuartzCoreInterface/QuartzCoreInterface.h [deleted file]
WebKitLibraries/win/lib/QuartzCoreInterface.lib [deleted file]

index e82dd28..db7cbca 100644 (file)
@@ -1,3 +1,24 @@
+2010-04-07  Chris Marrin  <cmarrin@apple.com>
+
+        Reviewed by Steve Falkenburg.
+
+        Remove QuartzCoreInterface from the build
+        
+        No longer needed since QuartzCore.dll is now included in  the latest Safari release (4.0.5).
+        This gets rid of all the function shims from the clients of QuartzCore.dll.
+
+        * platform/graphics/win/GraphicsLayerCACF.cpp:
+        (WebCore::GraphicsLayerCACF::updateLayerPreserves3D):
+        * platform/graphics/win/WKCACFLayer.cpp:
+        (WebCore::toCACFLayerType):
+        (WebCore::toCACFContentsGravityType):
+        (WebCore::fromCACFContentsGravityType):
+        (WebCore::toCACFFilterType):
+        (WebCore::fromCACFFilterType):
+        (WebCore::WKCACFLayer::isTransformLayer):
+        * platform/graphics/win/WKCACFLayerRenderer.cpp:
+        (WebCore::WKCACFLayerRenderer::createRenderer):
+
 2010-04-07  Sheriff Bot  <webkit.review.bot@gmail.com>
 
         Unreviewed, rolling out r57178.
index edaf6a0..0065191 100644 (file)
@@ -37,7 +37,6 @@
 #include "PlatformString.h"
 #include "SystemTime.h"
 #include "WKCACFLayer.h"
-#include <QuartzCoreInterface/QuartzCoreInterface.h>
 #include <wtf/CurrentTime.h>
 #include <wtf/StringExtras.h>
 #include <wtf/text/CString.h>
@@ -667,7 +666,7 @@ void GraphicsLayerCACF::updateLayerPreserves3D()
         m_layer->setPosition(point);
 
         m_layer->setAnchorPoint(CGPointMake(0.5f, 0.5f));
-        m_layer->setTransform(wkqcCATransform3DIdentity());
+        m_layer->setTransform(CATransform3DIdentity);
         
         // Set the old layer to opacity of 1. Further down we will set the opacity on the transform layer.
         m_layer->setOpacity(1);
index a489b47..4a0461d 100644 (file)
 #include <stdio.h>
 #include <QuartzCore/CACFContext.h>
 #include <QuartzCore/CARender.h>
-#include <QuartzCoreInterface/QuartzCoreInterface.h>
 
 #ifndef NDEBUG
 #include <wtf/CurrentTime.h>
 #endif
 
-#ifdef DEBUG_ALL
-#pragma comment(lib, "QuartzCore_debug")
-#pragma comment(lib, "QuartzCoreInterface_debug")
-#else
-#pragma comment(lib, "QuartzCore")
-#pragma comment(lib, "QuartzCoreInterface")
-#endif
-
 namespace WebCore {
 
 using namespace std;
@@ -60,37 +51,11 @@ static void displayCallback(CACFLayerRef layer, CGContextRef context)
     WKCACFLayer::layer(layer)->drawInContext(context);
 }
 
-#define STATIC_CACF_STRING(name) \
-    static CFStringRef name() \
-    { \
-        static CFStringRef name = wkqcCFStringRef(wkqc##name); \
-        return name; \
-    }
-
-STATIC_CACF_STRING(kCACFLayer)
-STATIC_CACF_STRING(kCACFTransformLayer)
-STATIC_CACF_STRING(kCACFGravityCenter)
-STATIC_CACF_STRING(kCACFGravityTop)
-STATIC_CACF_STRING(kCACFGravityBottom)
-STATIC_CACF_STRING(kCACFGravityLeft)
-STATIC_CACF_STRING(kCACFGravityRight)
-STATIC_CACF_STRING(kCACFGravityTopLeft)
-STATIC_CACF_STRING(kCACFGravityTopRight)
-STATIC_CACF_STRING(kCACFGravityBottomLeft)
-STATIC_CACF_STRING(kCACFGravityBottomRight)
-STATIC_CACF_STRING(kCACFGravityResize)
-STATIC_CACF_STRING(kCACFGravityResizeAspect)
-STATIC_CACF_STRING(kCACFGravityResizeAspectFill)
-STATIC_CACF_STRING(kCACFFilterLinear)
-STATIC_CACF_STRING(kCACFFilterNearest)
-STATIC_CACF_STRING(kCACFFilterTrilinear)
-STATIC_CACF_STRING(kCACFFilterLanczos)
-
 static CFStringRef toCACFLayerType(WKCACFLayer::LayerType type)
 {
     switch (type) {
-    case WKCACFLayer::Layer: return kCACFLayer();
-    case WKCACFLayer::TransformLayer: return kCACFTransformLayer();
+    case WKCACFLayer::Layer: return kCACFLayer;
+    case WKCACFLayer::TransformLayer: return kCACFTransformLayer;
     default: return 0;
     }
 }
@@ -98,55 +63,55 @@ static CFStringRef toCACFLayerType(WKCACFLayer::LayerType type)
 static CFStringRef toCACFContentsGravityType(WKCACFLayer::ContentsGravityType type)
 {
     switch (type) {
-    case WKCACFLayer::Center: return kCACFGravityCenter();
-    case WKCACFLayer::Top: return kCACFGravityTop();
-    case WKCACFLayer::Bottom: return kCACFGravityBottom();
-    case WKCACFLayer::Left: return kCACFGravityLeft();
-    case WKCACFLayer::Right: return kCACFGravityRight();
-    case WKCACFLayer::TopLeft: return kCACFGravityTopLeft();
-    case WKCACFLayer::TopRight: return kCACFGravityTopRight();
-    case WKCACFLayer::BottomLeft: return kCACFGravityBottomLeft();
-    case WKCACFLayer::BottomRight: return kCACFGravityBottomRight();
-    case WKCACFLayer::Resize: return kCACFGravityResize();
-    case WKCACFLayer::ResizeAspect: return kCACFGravityResizeAspect();
-    case WKCACFLayer::ResizeAspectFill: return kCACFGravityResizeAspectFill();
+    case WKCACFLayer::Center: return kCACFGravityCenter;
+    case WKCACFLayer::Top: return kCACFGravityTop;
+    case WKCACFLayer::Bottom: return kCACFGravityBottom;
+    case WKCACFLayer::Left: return kCACFGravityLeft;
+    case WKCACFLayer::Right: return kCACFGravityRight;
+    case WKCACFLayer::TopLeft: return kCACFGravityTopLeft;
+    case WKCACFLayer::TopRight: return kCACFGravityTopRight;
+    case WKCACFLayer::BottomLeft: return kCACFGravityBottomLeft;
+    case WKCACFLayer::BottomRight: return kCACFGravityBottomRight;
+    case WKCACFLayer::Resize: return kCACFGravityResize;
+    case WKCACFLayer::ResizeAspect: return kCACFGravityResizeAspect;
+    case WKCACFLayer::ResizeAspectFill: return kCACFGravityResizeAspectFill;
     default: return 0;
     }
 }
 
 static WKCACFLayer::ContentsGravityType fromCACFContentsGravityType(CFStringRef string)
 {
-    if (CFEqual(string, kCACFGravityTop()))
+    if (CFEqual(string, kCACFGravityTop))
         return WKCACFLayer::Top;
 
-    if (CFEqual(string, kCACFGravityBottom()))
+    if (CFEqual(string, kCACFGravityBottom))
         return WKCACFLayer::Bottom;
 
-    if (CFEqual(string, kCACFGravityLeft()))
+    if (CFEqual(string, kCACFGravityLeft))
         return WKCACFLayer::Left;
 
-    if (CFEqual(string, kCACFGravityRight()))
+    if (CFEqual(string, kCACFGravityRight))
         return WKCACFLayer::Right;
 
-    if (CFEqual(string, kCACFGravityTopLeft()))
+    if (CFEqual(string, kCACFGravityTopLeft))
         return WKCACFLayer::TopLeft;
 
-    if (CFEqual(string, kCACFGravityTopRight()))
+    if (CFEqual(string, kCACFGravityTopRight))
         return WKCACFLayer::TopRight;
 
-    if (CFEqual(string, kCACFGravityBottomLeft()))
+    if (CFEqual(string, kCACFGravityBottomLeft))
         return WKCACFLayer::BottomLeft;
 
-    if (CFEqual(string, kCACFGravityBottomRight()))
+    if (CFEqual(string, kCACFGravityBottomRight))
         return WKCACFLayer::BottomRight;
 
-    if (CFEqual(string, kCACFGravityResize()))
+    if (CFEqual(string, kCACFGravityResize))
         return WKCACFLayer::Resize;
 
-    if (CFEqual(string, kCACFGravityResizeAspect()))
+    if (CFEqual(string, kCACFGravityResizeAspect))
         return WKCACFLayer::ResizeAspect;
 
-    if (CFEqual(string, kCACFGravityResizeAspectFill()))
+    if (CFEqual(string, kCACFGravityResizeAspectFill))
         return WKCACFLayer::ResizeAspectFill;
 
     return WKCACFLayer::Center;
@@ -155,23 +120,23 @@ static WKCACFLayer::ContentsGravityType fromCACFContentsGravityType(CFStringRef
 static CFStringRef toCACFFilterType(WKCACFLayer::FilterType type)
 {
     switch (type) {
-    case WKCACFLayer::Linear: return kCACFFilterLinear();
-    case WKCACFLayer::Nearest: return kCACFFilterNearest();
-    case WKCACFLayer::Trilinear: return kCACFFilterTrilinear();
-    case WKCACFLayer::Lanczos: return kCACFFilterLanczos();
+    case WKCACFLayer::Linear: return kCACFFilterLinear;
+    case WKCACFLayer::Nearest: return kCACFFilterNearest;
+    case WKCACFLayer::Trilinear: return kCACFFilterTrilinear;
+    case WKCACFLayer::Lanczos: return kCACFFilterLanczos;
     default: return 0;
     }
 }
 
 static WKCACFLayer::FilterType fromCACFFilterType(CFStringRef string)
 {
-    if (CFEqual(string, kCACFFilterNearest()))
+    if (CFEqual(string, kCACFFilterNearest))
         return WKCACFLayer::Nearest;
 
-    if (CFEqual(string, kCACFFilterTrilinear()))
+    if (CFEqual(string, kCACFFilterTrilinear))
         return WKCACFLayer::Trilinear;
 
-    if (CFEqual(string, kCACFFilterLanczos()))
+    if (CFEqual(string, kCACFFilterLanczos))
         return WKCACFLayer::Lanczos;
 
     return WKCACFLayer::Linear;
@@ -230,7 +195,7 @@ void WKCACFLayer::setNeedsCommit()
 
 bool WKCACFLayer::isTransformLayer() const
 {
-    return CACFLayerGetClass(layer()) == kCACFTransformLayer();
+    return CACFLayerGetClass(layer()) == kCACFTransformLayer;
 }
 
 void WKCACFLayer::addSublayer(PassRefPtr<WKCACFLayer> sublayer)
index dbf8e84..1b14846 100644 (file)
@@ -39,7 +39,6 @@
 #include <CoreGraphics/CGSRegion.h>
 #include <QuartzCore/CACFContext.h>
 #include <QuartzCore/CARenderOGL.h>
-#include <QuartzCoreInterface/QuartzCoreInterface.h>
 #include <wtf/HashMap.h>
 #include <wtf/OwnArrayPtr.h>
 #include <wtf/OwnPtr.h>
@@ -346,7 +345,7 @@ bool WKCACFLayerRenderer::createRenderer()
     windowsForContexts().set(m_context.get(), this);
 
     m_renderContext = static_cast<CARenderContext*>(CACFContextGetRenderContext(m_context.get()));
-    m_renderer = CARenderOGLNew(wkqcCARenderOGLCallbacks(wkqckCARenderDX9Callbacks), m_d3dDevice.get(), 0);
+    m_renderer = CARenderOGLNew(&kCARenderDX9Callbacks, m_d3dDevice.get(), 0);
 
     // Create the root hierarchy.
     // Under the root layer, we have a clipping layer to clip the content,
index 3cda55e..ac3885d 100644 (file)
@@ -1,3 +1,13 @@
+2010-04-07  Chris Marrin  <cmarrin@apple.com>
+
+        Reviewed by Steve Falkenburg.
+
+        Remove QuartzCoreInterface from the build
+        
+        No longer needed since QuartzCore.dll is now included in  the latest Safari release (4.0.5).
+
+        * WebKit.vcproj/WebKit.vcproj:Removed delay load for QuartzCore and QuartzCoreInterface
+
 2010-04-07  Andrey Kosyakov  <caseq@chromium.org>
 
         Reviewed by Yury Semikhatsky.
index 57d1da2..a8ae236 100644 (file)
                                OutputFile="$(OutDir)\$(ProjectName)$(WebKitDLLConfigSuffix).dll"\r
                                AdditionalLibraryDirectories="$(DXSDK_DIR)\Lib\x86"\r
                                ModuleDefinitionFile="WebKit$(WebKitDLLConfigSuffix).def"\r
-                               DelayLoadDLLs="comdlg32.dll;usp10.dll;comctl32.dll;version.dll;libxslt$(LibraryConfigSuffix).dll;SQLite3$(LibraryConfigSuffix).dll;msimg32.dll;QTMovieWin$(WebKitConfigSuffix).dll;iphlpapi.dll;rpcrt4.dll;QuartzCore.dll;QuartzCoreInterface.dll"\r
+                               DelayLoadDLLs="comdlg32.dll;usp10.dll;comctl32.dll;version.dll;libxslt$(LibraryConfigSuffix).dll;SQLite3$(LibraryConfigSuffix).dll;msimg32.dll;QTMovieWin$(WebKitConfigSuffix).dll;iphlpapi.dll;rpcrt4.dll"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
index aa25b81..9b9d4ab 100644 (file)
@@ -1,3 +1,16 @@
+2010-04-07  Chris Marrin  <cmarrin@apple.com>
+
+        Reviewed by Steve Falkenburg.
+
+        Remove QuartzCoreInterface from the build
+        
+        No longer needed since QuartzCore.dll is now included in  the latest Safari release (4.0.5).
+
+        * win/bin/QuartzCoreInterface.dll: Removed.
+        * win/include/QuartzCoreInterface: Removed.
+        * win/include/QuartzCoreInterface/QuartzCoreInterface.h: Removed.
+        * win/lib/QuartzCoreInterface.lib: Removed.
+
 2010-04-02  Jer Noble  <jer.noble@apple.com>
 
         Reviewed by Eric Carlson.
diff --git a/WebKitLibraries/win/bin/QuartzCoreInterface.dll b/WebKitLibraries/win/bin/QuartzCoreInterface.dll
deleted file mode 100755 (executable)
index 0b64349..0000000
Binary files a/WebKitLibraries/win/bin/QuartzCoreInterface.dll and /dev/null differ
diff --git a/WebKitLibraries/win/include/QuartzCoreInterface/QuartzCoreInterface.h b/WebKitLibraries/win/include/QuartzCoreInterface/QuartzCoreInterface.h
deleted file mode 100644 (file)
index b3cef10..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (C) 2009 Apple Inc. All rights reserved.
- */
-
-#ifndef QuartzCoreInterface_h
-#define QuartzCoreInterface_h
-
-#ifdef QUARTZCOREINTERFACE_EXPORTS
-#define QUARTZCOREINTERFACE_API __declspec(dllexport)
-#else
-#define QUARTZCOREINTERFACE_API __declspec(dllimport)
-#endif
-
-// Interface to give access to QuartzCore data symbols.
-enum WKQCStringRefType { wkqckCACFLayer, wkqckCACFTransformLayer, wkqckCACFFilterLinear, wkqckCACFFilterNearest,
-                         wkqckCACFFilterTrilinear, wkqckCACFFilterLanczos, wkqckCACFGravityCenter, wkqckCACFGravityTop, 
-                         wkqckCACFGravityBottom, wkqckCACFGravityLeft, wkqckCACFGravityRight, wkqckCACFGravityTopLeft, 
-                         wkqckCACFGravityTopRight, wkqckCACFGravityBottomLeft, wkqckCACFGravityBottomRight, 
-                         wkqckCACFGravityResize, wkqckCACFGravityResizeAspect, wkqckCACFGravityResizeAspectFill };
-
-enum WKQCCARenderOGLCallbacksType { wkqckCARenderDX9Callbacks };
-
-typedef const struct __CFString * CFStringRef;
-typedef struct _CARenderOGLCallbacks CARenderOGLCallbacks;
-typedef struct CATransform3D CATransform3D;
-
-extern "C" {
-QUARTZCOREINTERFACE_API CFStringRef wkqcCFStringRef(WKQCStringRefType);
-QUARTZCOREINTERFACE_API const CARenderOGLCallbacks* wkqcCARenderOGLCallbacks(WKQCCARenderOGLCallbacksType);
-QUARTZCOREINTERFACE_API const CATransform3D& wkqcCATransform3DIdentity();
-}
-
-#endif // QuartzCoreInterface_h
diff --git a/WebKitLibraries/win/lib/QuartzCoreInterface.lib b/WebKitLibraries/win/lib/QuartzCoreInterface.lib
deleted file mode 100755 (executable)
index 0a556d3..0000000
Binary files a/WebKitLibraries/win/lib/QuartzCoreInterface.lib and /dev/null differ