Title: [143741] trunk/Source/WebKit/chromium
- Revision
- 143741
- Author
- commit-qu...@webkit.org
- Date
- 2013-02-22 09:28:33 -0800 (Fri, 22 Feb 2013)
Log Message
Unreviewed, rolling out r143734.
http://trac.webkit.org/changeset/143734
https://bugs.webkit.org/show_bug.cgi?id=110615
Causes linux build failures. (Requested by vollick on
#webkit).
Patch by Sheriff Bot <webkit.review....@gmail.com> on 2013-02-22
* public/WebKit.h:
(WebKit):
* src/WebKit.cpp:
(WebKit::initialize):
(WebKit::initializeWithoutV8):
(WebKit::webKitPlatformSupport):
Modified Paths
Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (143740 => 143741)
--- trunk/Source/WebKit/chromium/ChangeLog 2013-02-22 17:26:04 UTC (rev 143740)
+++ trunk/Source/WebKit/chromium/ChangeLog 2013-02-22 17:28:33 UTC (rev 143741)
@@ -1,3 +1,19 @@
+2013-02-22 Sheriff Bot <webkit.review....@gmail.com>
+
+ Unreviewed, rolling out r143734.
+ http://trac.webkit.org/changeset/143734
+ https://bugs.webkit.org/show_bug.cgi?id=110615
+
+ Causes linux build failures. (Requested by vollick on
+ #webkit).
+
+ * public/WebKit.h:
+ (WebKit):
+ * src/WebKit.cpp:
+ (WebKit::initialize):
+ (WebKit::initializeWithoutV8):
+ (WebKit::webKitPlatformSupport):
+
2013-02-22 Mikhail Naganov <mnaga...@chromium.org>
[Chromium] Add support for emulating legacy Android WebView 'setInitialScale' method
Modified: trunk/Source/WebKit/chromium/public/WebKit.h (143740 => 143741)
--- trunk/Source/WebKit/chromium/public/WebKit.h 2013-02-22 17:26:04 UTC (rev 143740)
+++ trunk/Source/WebKit/chromium/public/WebKit.h 2013-02-22 17:28:33 UTC (rev 143741)
@@ -35,28 +35,28 @@
namespace WebKit {
-class Platform;
+class WebKitPlatformSupport;
// Must be called on the thread that will be the main WebKit thread before
-// using any other WebKit APIs. The provided Platform; must be
+// using any other WebKit APIs. The provided WebKitPlatformSupport; must be
// non-null and must remain valid until the current thread calls shutdown.
-WEBKIT_EXPORT void initialize(Platform*);
+WEBKIT_EXPORT void initialize(WebKitPlatformSupport*);
// Must be called on the thread that will be the main WebKit thread before
-// using any other WebKit APIs. The provided Platform; must be
+// using any other WebKit APIs. The provided WebKitPlatformSupport; 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(Platform*);
+WEBKIT_EXPORT void initializeWithoutV8(WebKitPlatformSupport*);
-// Once shutdown, the Platform passed to initialize will no longer
+// Once shutdown, the WebKitPlatformSupport 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 Platform instance passed to initialize.
-WEBKIT_EXPORT Platform* webKitPlatformSupport();
+// Returns the WebKitPlatformSupport instance passed to initialize.
+WEBKIT_EXPORT WebKitPlatformSupport* 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 (143740 => 143741)
--- trunk/Source/WebKit/chromium/src/WebKit.cpp 2013-02-22 17:26:04 UTC (rev 143740)
+++ trunk/Source/WebKit/chromium/src/WebKit.cpp 2013-02-22 17:28:33 UTC (rev 143741)
@@ -91,7 +91,7 @@
// Doing so may cause hard to reproduce crashes.
static bool s_webKitInitialized = false;
-static Platform* s_webKitPlatformSupport = 0;
+static WebKitPlatformSupport* s_webKitPlatformSupport = 0;
static bool generateEntropy(unsigned char* buffer, size_t length)
{
@@ -109,7 +109,7 @@
}
#endif
-void initialize(Platform* webKitPlatformSupport)
+void initialize(WebKitPlatformSupport* webKitPlatformSupport)
{
initializeWithoutV8(webKitPlatformSupport);
@@ -128,7 +128,7 @@
}
}
-void initializeWithoutV8(Platform* webKitPlatformSupport)
+void initializeWithoutV8(WebKitPlatformSupport* webKitPlatformSupport)
{
ASSERT(!s_webKitInitialized);
s_webKitInitialized = true;
@@ -189,7 +189,7 @@
WebPrerenderingSupport::shutdown();
}
-Platform* webKitPlatformSupport()
+WebKitPlatformSupport* webKitPlatformSupport()
{
return s_webKitPlatformSupport;
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
