[webkit-changes] [143846] trunk/Source/WebKit/chromium

[pilgrim]

Title: [143846] trunk/Source/WebKit/chromium

Revision

143846

Author

pilg...@chromium.org

Date

2013-02-23 11:57:05 -0800 (Sat, 23 Feb 2013)

Log Message

[Chromium] WebKit::initialize should take a Platform* now that WebKitPlatformSupport is empty
https://bugs.webkit.org/show_bug.cgi?id=110605

Reviewed by Adam Barth.

Part of a larger refactoring series; see tracking bug 82948.

* public/WebKit.h:
(WebKit):
* src/WebKit.cpp:
(WebKit::initialize):
(WebKit::initializeWithoutV8):
(WebKit::webKitPlatformSupport):

Modified Paths

• trunk/Source/WebKit/chromium/ChangeLog
• trunk/Source/WebKit/chromium/public/WebKit.h
• trunk/Source/WebKit/chromium/src/WebKit.cpp

Diff

Modified: trunk/Source/WebKit/chromium/ChangeLog (143845 => 143846)

--- trunk/Source/WebKit/chromium/ChangeLog	2013-02-23 18:37:50 UTC (rev 143845)
+++ trunk/Source/WebKit/chromium/ChangeLog	2013-02-23 19:57:05 UTC (rev 143846)
@@ -1,3 +1,19 @@
+2013-02-23  Mark Pilgrim  <pilg...@chromium.org>
+
+        [Chromium] WebKit::initialize should take a Platform* now that WebKitPlatformSupport is empty
+        https://bugs.webkit.org/show_bug.cgi?id=110605
+
+        Reviewed by Adam Barth.
+
+        Part of a larger refactoring series; see tracking bug 82948.
+
+        * public/WebKit.h:
+        (WebKit):
+        * src/WebKit.cpp:
+        (WebKit::initialize):
+        (WebKit::initializeWithoutV8):
+        (WebKit::webKitPlatformSupport):
+
 2013-02-22  David Dorwin  <ddor...@chromium.org>
 
         [chromium] Remove call to detach WebHelperPluginImpl's frame since it is never attached

Modified: trunk/Source/WebKit/chromium/public/WebKit.h (143845 => 143846)

--- trunk/Source/WebKit/chromium/public/WebKit.h	2013-02-23 18:37:50 UTC (rev 143845)
+++ trunk/Source/WebKit/chromium/public/WebKit.h	2013-02-23 19:57:05 UTC (rev 143846)
@@ -31,32 +31,30 @@
 #ifndef WebKit_h
 #define WebKit_h
 
-#include "../../../Platform/chromium/public/WebCommon.h"
+#include "../../../Platform/chromium/public/Platform.h"
 
 namespace WebKit {
 
-class WebKitPlatformSupport;
-
 // Must be called on the thread that will be the main WebKit thread before
-// using any other WebKit APIs. The provided WebKitPlatformSupport; must be
+// using any other WebKit APIs. The provided Platform; must be
 // non-null and must remain valid until the current thread calls shutdown.
-WEBKIT_EXPORT void initialize(WebKitPlatformSupport*);
+WEBKIT_EXPORT void initialize(Platform*);
 
 // Must be called on the thread that will be the main WebKit thread before
-// using any other WebKit APIs. The provided WebKitPlatformSupport; must be
+// using any other WebKit APIs. The provided Platform; must be
 // non-null and must remain valid until the current thread calls shutdown.
 //
 // This is a special variant of initialize that does not intitialize V8.
-WEBKIT_EXPORT void initializeWithoutV8(WebKitPlatformSupport*);
+WEBKIT_EXPORT void initializeWithoutV8(Platform*);
 
-// Once shutdown, the WebKitPlatformSupport passed to initialize will no longer
+// Once shutdown, the Platform passed to initialize will no longer
 // be accessed. No other WebKit objects should be in use when this function is
 // called. Any background threads created by WebKit are promised to be
 // terminated by the time this function returns.
 WEBKIT_EXPORT void shutdown();
 
-// Returns the WebKitPlatformSupport instance passed to initialize.
-WEBKIT_EXPORT WebKitPlatformSupport* webKitPlatformSupport();
+// Returns the Platform instance passed to initialize.
+WEBKIT_EXPORT Platform* webKitPlatformSupport();
 
 // Alters the rendering of content to conform to a fixed set of rules.
 WEBKIT_EXPORT void setLayoutTestMode(bool);

Modified: trunk/Source/WebKit/chromium/src/WebKit.cpp (143845 => 143846)

--- trunk/Source/WebKit/chromium/src/WebKit.cpp	2013-02-23 18:37:50 UTC (rev 143845)
+++ trunk/Source/WebKit/chromium/src/WebKit.cpp	2013-02-23 19:57:05 UTC (rev 143846)
@@ -91,7 +91,7 @@
 // Doing so may cause hard to reproduce crashes.
 static bool s_webKitInitialized = false;
 
-static WebKitPlatformSupport* s_webKitPlatformSupport = 0;
+static Platform* s_webKitPlatformSupport = 0;
 
 static bool generateEntropy(unsigned char* buffer, size_t length)
 {
@@ -109,7 +109,7 @@
 }
 #endif
 
-void initialize(WebKitPlatformSupport* webKitPlatformSupport)
+void initialize(Platform* webKitPlatformSupport)
 {
     initializeWithoutV8(webKitPlatformSupport);
 
@@ -128,7 +128,7 @@
     }
 }
 
-void initializeWithoutV8(WebKitPlatformSupport* webKitPlatformSupport)
+void initializeWithoutV8(Platform* webKitPlatformSupport)
 {
     ASSERT(!s_webKitInitialized);
     s_webKitInitialized = true;
@@ -189,7 +189,7 @@
     WebPrerenderingSupport::shutdown();
 }
 
-WebKitPlatformSupport* webKitPlatformSupport()
+Platform* webKitPlatformSupport()
 {
     return s_webKitPlatformSupport;
 }

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes