Diff
Modified: trunk/Source/WebKit2/ChangeLog (94472 => 94473)
--- trunk/Source/WebKit2/ChangeLog 2011-09-03 01:01:35 UTC (rev 94472)
+++ trunk/Source/WebKit2/ChangeLog 2011-09-03 01:02:36 UTC (rev 94473)
@@ -1,3 +1,20 @@
+2011-09-02 Sheriff Bot <webkit.review....@gmail.com>
+
+ Unreviewed, rolling out r94454.
+ http://trac.webkit.org/changeset/94454
+ https://bugs.webkit.org/show_bug.cgi?id=67546
+
+ "Broke Windows and SnowLeopard, also no reply on the bug."
+ (Requested by jchaffraix on #webkit).
+
+ * UIProcess/API/C/WKContext.cpp:
+ * UIProcess/API/C/WKContext.h:
+ * UIProcess/WebContext.cpp:
+ * UIProcess/WebContext.h:
+ * WebProcess/WebProcess.cpp:
+ * WebProcess/WebProcess.h:
+ * WebProcess/WebProcess.messages.in:
+
2011-09-02 Michael Saboff <msab...@apple.com>
Fixed release build by removing #ifndef NDEBUG to
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKContext.cpp (94472 => 94473)
--- trunk/Source/WebKit2/UIProcess/API/C/WKContext.cpp 2011-09-03 01:01:35 UTC (rev 94472)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKContext.cpp 2011-09-03 01:02:36 UTC (rev 94473)
@@ -237,8 +237,3 @@
toImpl(contextRef)->getWebCoreStatistics(DictionaryCallback::create(context, callback));
}
-void WKContextGarbageCollectJavaScriptObjects(WKContextRef contextRef)
-{
- toImpl(contextRef)->garbageCollectJavaScriptObjects();
-}
-
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKContext.h (94472 => 94473)
--- trunk/Source/WebKit2/UIProcess/API/C/WKContext.h 2011-09-03 01:01:35 UTC (rev 94472)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKContext.h 2011-09-03 01:02:36 UTC (rev 94473)
@@ -140,8 +140,6 @@
typedef void (*WKContextGetStatisticsFunction)(WKDictionaryRef statistics, WKErrorRef error, void* functionContext);
WK_EXPORT void WKContextGetStatistics(WKContextRef context, void* functionContext, WKContextGetStatisticsFunction function);
-
-WK_EXPORT void WKContextGarbageCollectJavaScriptObjects(WKContextRef context);
#ifdef __cplusplus
}
Modified: trunk/Source/WebKit2/UIProcess/WebContext.cpp (94472 => 94473)
--- trunk/Source/WebKit2/UIProcess/WebContext.cpp 2011-09-03 01:01:35 UTC (rev 94472)
+++ trunk/Source/WebKit2/UIProcess/WebContext.cpp 2011-09-03 01:02:36 UTC (rev 94473)
@@ -829,9 +829,4 @@
callback->performCallbackWithReturnValue(statistics.get());
}
-void WebContext::garbageCollectJavaScriptObjects()
-{
- process()->send(Messages::WebProcess::GarbageCollectJavaScriptObjects(), 0);
-}
-
} // namespace WebKit
Modified: trunk/Source/WebKit2/UIProcess/WebContext.h (94472 => 94473)
--- trunk/Source/WebKit2/UIProcess/WebContext.h 2011-09-03 01:01:35 UTC (rev 94472)
+++ trunk/Source/WebKit2/UIProcess/WebContext.h 2011-09-03 01:02:36 UTC (rev 94473)
@@ -181,7 +181,6 @@
bool httpPipeliningEnabled();
void getWebCoreStatistics(PassRefPtr<DictionaryCallback>);
- void garbageCollectJavaScriptObjects();
private:
WebContext(ProcessModel, const String& injectedBundlePath);
Modified: trunk/Source/WebKit2/WebProcess/WebProcess.cpp (94472 => 94473)
--- trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2011-09-03 01:01:35 UTC (rev 94472)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2011-09-03 01:02:36 UTC (rev 94473)
@@ -931,11 +931,6 @@
m_connection->send(Messages::WebContext::DidGetWebCoreStatistics(data, callbackID), 0);
}
-void WebProcess::garbageCollectJavaScriptObjects()
-{
- gcController().garbageCollectNow();
-}
-
#if ENABLE(PLUGIN_PROCESS)
void WebProcess::pluginProcessCrashed(const String& pluginPath)
{
Modified: trunk/Source/WebKit2/WebProcess/WebProcess.h (94472 => 94473)
--- trunk/Source/WebKit2/WebProcess/WebProcess.h 2011-09-03 01:01:35 UTC (rev 94472)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.h 2011-09-03 01:02:36 UTC (rev 94473)
@@ -178,7 +178,6 @@
void setTextCheckerState(const TextCheckerState&);
void getWebCoreStatistics(uint64_t callbackID);
- void garbageCollectJavaScriptObjects();
// ChildProcess
virtual bool shouldTerminate();
Modified: trunk/Source/WebKit2/WebProcess/WebProcess.messages.in (94472 => 94473)
--- trunk/Source/WebKit2/WebProcess/WebProcess.messages.in 2011-09-03 01:01:35 UTC (rev 94472)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.messages.in 2011-09-03 01:02:36 UTC (rev 94473)
@@ -69,5 +69,4 @@
SetEnhancedAccessibility(bool flag)
GetWebCoreStatistics(uint64_t callbackID)
- GarbageCollectJavaScriptObjects()
}
