Get rid of unused WKSI functions
authorandersca@apple.com <andersca@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 30 Jun 2015 17:12:00 +0000 (17:12 +0000)
committerandersca@apple.com <andersca@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 30 Jun 2015 17:12:00 +0000 (17:12 +0000)
https://bugs.webkit.org/show_bug.cgi?id=146443

Reviewed by Tim Horton.

Source/WebCore:

* platform/graphics/cg/PathCG.cpp:
(WebCore::Path::platformAddPathForRoundedRect):
Just call CGPathAddRoundedRect directly.

* platform/ios/WebCoreSystemInterfaceIOS.mm:
* platform/mac/WebCoreSystemInterface.h:
* platform/mac/WebCoreSystemInterface.mm:

Source/WebKit/mac:

* WebCoreSupport/WebSystemInterface.mm:
(InitWebCoreSystemInterface): Deleted.

Source/WebKit2:

* UIProcess/API/Cocoa/WKWebView.mm:
* WebProcess/WebCoreSupport/mac/WebSystemInterface.mm:
(InitWebCoreSystemInterface): Deleted.
* WebProcess/WebProcess.cpp:
(WebKit::WebProcess::nonVisibleProcessCleanupTimerFired):
* WebProcess/WebProcess.h:
* WebProcess/cocoa/WebProcessCocoa.mm:
(WebKit::WebProcess::destroyRenderingResources):

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

13 files changed:
Source/WebCore/ChangeLog
Source/WebCore/platform/graphics/cg/PathCG.cpp
Source/WebCore/platform/ios/WebCoreSystemInterfaceIOS.mm
Source/WebCore/platform/mac/WebCoreSystemInterface.h
Source/WebCore/platform/mac/WebCoreSystemInterface.mm
Source/WebKit/mac/ChangeLog
Source/WebKit/mac/WebCoreSupport/WebSystemInterface.mm
Source/WebKit2/ChangeLog
Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm
Source/WebKit2/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm
Source/WebKit2/WebProcess/WebProcess.cpp
Source/WebKit2/WebProcess/WebProcess.h
Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm

index 6f6b10a..dd82b89 100644 (file)
@@ -1,3 +1,18 @@
+2015-06-29  Anders Carlsson  <andersca@apple.com>
+
+        Get rid of unused WKSI functions
+        https://bugs.webkit.org/show_bug.cgi?id=146443
+
+        Reviewed by Tim Horton.
+
+        * platform/graphics/cg/PathCG.cpp:
+        (WebCore::Path::platformAddPathForRoundedRect):
+        Just call CGPathAddRoundedRect directly.
+
+        * platform/ios/WebCoreSystemInterfaceIOS.mm:
+        * platform/mac/WebCoreSystemInterface.h:
+        * platform/mac/WebCoreSystemInterface.mm:
+
 2015-06-30  Youenn Fablet  <youenn.fablet@crf.canon.fr> and Xabier Rodriguez Calvar  <calvaris@igalia.com>
 
         [Streams API] Finish pulling must always be done asynchronously as it is the expected promise behavior (according to the spec)
index e25a470..3a3e0fd 100644 (file)
@@ -275,7 +275,7 @@ void Path::platformAddPathForRoundedRect(const FloatRect& rect, const FloatSize&
             radiusWidth = rectWidth / 2 - std::numeric_limits<CGFloat>::epsilon();
         if (rectHeight < 2 * radiusHeight)
             radiusHeight = rectHeight / 2 - std::numeric_limits<CGFloat>::epsilon();
-        wkCGPathAddRoundedRect(ensurePlatformPath(), 0, rectToDraw, radiusWidth, radiusHeight);
+        CGPathAddRoundedRect(ensurePlatformPath(), nullptr, rectToDraw, radiusWidth, radiusHeight);
         return;
     }
 #endif
index e1e9d92..8936605 100644 (file)
@@ -58,7 +58,6 @@ WEBCORE_EXPORT CGSize (*wkGetAvailableScreenSize)(void);
 WEBCORE_EXPORT void (*wkSetLayerContentsScale)(CALayer *);
 WEBCORE_EXPORT float (*wkGetScreenScaleFactor)(void);
 WEBCORE_EXPORT bool (*wkIsGB18030ComplianceRequired)(void);
-WEBCORE_EXPORT void (*wkCGPathAddRoundedRect)(CGMutablePathRef path, const CGAffineTransform* matrix, CGRect rect, CGFloat cornerWidth, CGFloat cornerHeight);
 WEBCORE_EXPORT void (*wkCFURLRequestAllowAllPostCaching)(CFURLRequestRef);
 WEBCORE_EXPORT CFArrayRef (*wkCopyNSURLResponseCertificateChain)(NSURLResponse*);
 WEBCORE_EXPORT CFStringEncoding (*wkGetWebDefaultCFStringEncoding)(void);
index 5a538fc..5e07e54 100644 (file)
@@ -222,8 +222,6 @@ extern void* wkGetHyphenationLocationBeforeIndex;
 #endif
 
 #if !PLATFORM(IOS)
-extern int (*wkRecommendedScrollerStyle)(void);
-
 extern bool (*wkExecutableWasLinkedOnOrBeforeSnowLeopard)(void);
 
 extern CFStringRef (*wkCopyDefaultSearchProviderDisplayName)(void);
@@ -274,8 +272,6 @@ extern CFHTTPMessageRef (*wkGetCFURLResponseHTTPResponse)(CFURLResponseRef);
 extern CFStringRef (*wkCopyCFURLResponseSuggestedFilename)(CFURLResponseRef);
 extern void (*wkSetCFURLResponseMIMEType)(CFURLResponseRef, CFStringRef mimeType);
 
-extern void(*wkDestroyRenderingResources)(void);
-
 #if USE(CFNETWORK)
 extern CFHTTPCookieStorageRef (*wkGetDefaultHTTPCookieStorage)();
 extern WKCFURLCredentialRef (*wkCopyCredentialFromCFPersistentStorage)(CFURLProtectionSpaceRef protectionSpace);
@@ -286,12 +282,6 @@ extern void (*wkSetRequestStorageSession)(CFURLStorageSessionRef, CFMutableURLRe
 extern void (*wkSetMetadataURL)(NSString *urlString, NSString *referrer, NSString *path);
 #endif
 
-#if !PLATFORM(IOS)
-extern bool (*wkExecutableWasLinkedOnOrBeforeLion)(void);
-#endif
-
-extern void (*wkCGPathAddRoundedRect)(CGMutablePathRef path, const CGAffineTransform* matrix, CGRect rect, CGFloat cornerWidth, CGFloat cornerHeight);
-
 extern void (*wkCFURLRequestAllowAllPostCaching)(CFURLRequestRef);
 
 #if !PLATFORM(IOS)
index 2942621..29e63a1 100644 (file)
@@ -102,8 +102,6 @@ void (*wkSetRequestStorageSession)(CFURLStorageSessionRef, CFMutableURLRequestRe
 
 void* wkGetHyphenationLocationBeforeIndex;
 
-int (*wkRecommendedScrollerStyle)(void);
-
 bool (*wkExecutableWasLinkedOnOrBeforeSnowLeopard)(void);
 
 CFStringRef (*wkCopyDefaultSearchProviderDisplayName)(void);
@@ -142,18 +140,6 @@ CFStringRef (*wkCopyCFURLResponseSuggestedFilename)(CFURLResponseRef);
 void (*wkSetCFURLResponseMIMEType)(CFURLResponseRef, CFStringRef mimeType);
 void (*wkSetMetadataURL)(NSString *urlString, NSString *referrer, NSString *path);
 
-void(*wkDestroyRenderingResources)(void);
-
-dispatch_source_t (*wkCreateVMPressureDispatchOnMainQueue)(void);
-
-#if PLATFORM(MAC)
-dispatch_source_t (*wkCreateMemoryStatusPressureCriticalDispatchOnMainQueue)(void);
-#endif
-
-bool (*wkExecutableWasLinkedOnOrBeforeLion)(void);
-
-void (*wkCGPathAddRoundedRect)(CGMutablePathRef path, const CGAffineTransform* matrix, CGRect rect, CGFloat cornerWidth, CGFloat cornerHeight);
-
 void (*wkCFURLRequestAllowAllPostCaching)(CFURLRequestRef);
 
 #if !PLATFORM(IOS)
index 7293600..b765597 100644 (file)
@@ -1,3 +1,13 @@
+2015-06-29  Anders Carlsson  <andersca@apple.com>
+
+        Get rid of unused WKSI functions
+        https://bugs.webkit.org/show_bug.cgi?id=146443
+
+        Reviewed by Tim Horton.
+
+        * WebCoreSupport/WebSystemInterface.mm:
+        (InitWebCoreSystemInterface): Deleted.
+
 2015-06-29  Dean Jackson  <dino@apple.com>
 
         Temporarily disable PICTURE_SIZES
index 7ca489b..329cbf7 100644 (file)
@@ -128,7 +128,6 @@ void InitWebCoreSystemInterface(void)
 #endif
 
 #if !PLATFORM(IOS)
-    INIT(RecommendedScrollerStyle);
     INIT(ExecutableWasLinkedOnOrBeforeSnowLeopard);
     INIT(CopyDefaultSearchProviderDisplayName);
     INIT(Cursor);
@@ -175,14 +174,6 @@ void InitWebCoreSystemInterface(void)
     INIT(SetMetadataURL);
 #endif
 
-    INIT(DestroyRenderingResources);
-
-#if !PLATFORM(IOS)
-    INIT(ExecutableWasLinkedOnOrBeforeLion);
-#endif
-
-    INIT(CGPathAddRoundedRect);
-
     INIT(CFURLRequestAllowAllPostCaching);
 
 #if PLATFORM(IOS)
index 6aae3dd..0865d6e 100644 (file)
@@ -1,3 +1,19 @@
+2015-06-29  Anders Carlsson  <andersca@apple.com>
+
+        Get rid of unused WKSI functions
+        https://bugs.webkit.org/show_bug.cgi?id=146443
+
+        Reviewed by Tim Horton.
+
+        * UIProcess/API/Cocoa/WKWebView.mm:
+        * WebProcess/WebCoreSupport/mac/WebSystemInterface.mm:
+        (InitWebCoreSystemInterface): Deleted.
+        * WebProcess/WebProcess.cpp:
+        (WebKit::WebProcess::nonVisibleProcessCleanupTimerFired):
+        * WebProcess/WebProcess.h:
+        * WebProcess/cocoa/WebProcessCocoa.mm:
+        (WebKit::WebProcess::destroyRenderingResources):
+
 2015-06-29  Gyuyoung Kim  <gyuyoung.kim@webkit.org>
 
         [GTK] Unreviewed GTK build fix since r186088 and r186095.
index a6b60e2..b3214fd 100644 (file)
@@ -79,7 +79,6 @@
 #import <JavaScriptCore/JSContext.h>
 #import <JavaScriptCore/JSValue.h>
 #import <WebCore/IOSurface.h>
-#import <WebCore/WebCoreSystemInterface.h>
 #import <wtf/HashMap.h>
 #import <wtf/MathExtras.h>
 #import <wtf/NeverDestroyed.h>
index fef0604..64b8a79 100644 (file)
@@ -120,7 +120,6 @@ void InitWebCoreSystemInterface(void)
 #endif // !PLATFORM(IOS)
 
 #if !PLATFORM(IOS)
-        INIT(RecommendedScrollerStyle);
         INIT(ExecutableWasLinkedOnOrBeforeSnowLeopard);
         INIT(CopyDefaultSearchProviderDisplayName);
         INIT(Cursor);
@@ -156,13 +155,6 @@ void InitWebCoreSystemInterface(void)
         INIT(CopyCFURLResponseSuggestedFilename);
         INIT(SetCFURLResponseMIMEType);
 
-        INIT(DestroyRenderingResources);
-
-#if PLATFORM(MAC)
-        INIT(ExecutableWasLinkedOnOrBeforeLion);
-#endif
-
-        INIT(CGPathAddRoundedRect);
         INIT(CFURLRequestAllowAllPostCaching);
 
 #if PLATFORM(IOS)
index 9c589b1..b2eedd0 100644 (file)
@@ -1311,9 +1311,7 @@ void WebProcess::nonVisibleProcessCleanupTimerFired()
     if (!m_pagesInWindows.isEmpty())
         return;
 
-#if PLATFORM(COCOA)
-    wkDestroyRenderingResources();
-#endif
+    destroyRenderingResources();
 }
 
 RefPtr<API::Object> WebProcess::transformHandlesToObjects(API::Object* object)
index 0f8f7fb..1de484a 100644 (file)
@@ -177,6 +177,7 @@ public:
     void pageWillLeaveWindow(uint64_t pageID);
 
     void nonVisibleProcessCleanupTimerFired();
+    void destroyRenderingResources();
 
     void updateActivePages();
 
index bf4f4ff..287b48a 100644 (file)
@@ -335,4 +335,9 @@ RefPtr<ObjCObjectGraph> WebProcess::transformObjectsToHandles(ObjCObjectGraph& o
     return ObjCObjectGraph::create(ObjCObjectGraph::transform(objectGraph.rootObject(), Transformer()).get());
 }
 
+void WebProcess::destroyRenderingResources()
+{
+    WKDestroyRenderingResources();
+}
+
 } // namespace WebKit