Changeset 94476 in webkit


Ignore:
Timestamp:
Sep 2, 2011, 6:20:49 PM (14 years ago)
Author:
commit-queue@webkit.org
Message:

Unreviewed, rolling out r94473.
​http://trac.webkit.org/changeset/94473
​https://bugs.webkit.org/show_bug.cgi?id=67547

Putting ​http://trac.webkit.org/changeset/94454 back in as
​http://trac.webkit.org/changeset/94472 fixed the problem
(Requested by msaboff on #webkit).

Patch by Sheriff Bot <​webkit.review.bot@gmail.com> on 2011-09-02

  • UIProcess/API/C/WKContext.cpp:

(WKContextGarbageCollectJavaScriptObjects):

  • UIProcess/API/C/WKContext.h:
  • UIProcess/WebContext.cpp:

(WebKit::WebContext::garbageCollectJavaScriptObjects):

  • UIProcess/WebContext.h:
  • WebProcess/WebProcess.cpp:

(WebKit::WebProcess::garbageCollectJavaScriptObjects):

  • WebProcess/WebProcess.h:
  • WebProcess/WebProcess.messages.in:
Location:
trunk/Source/WebKit2
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit2/ChangeLog

    r94473 r94476  
     12011-09-02  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r94473.
     4        http://trac.webkit.org/changeset/94473
     5        https://bugs.webkit.org/show_bug.cgi?id=67547
     6
     7        Putting http://trac.webkit.org/changeset/94454 back in as
     8        http://trac.webkit.org/changeset/94472 fixed the problem
     9        (Requested by msaboff on #webkit).
     10
     11        * UIProcess/API/C/WKContext.cpp:
     12        (WKContextGarbageCollectJavaScriptObjects):
     13        * UIProcess/API/C/WKContext.h:
     14        * UIProcess/WebContext.cpp:
     15        (WebKit::WebContext::garbageCollectJavaScriptObjects):
     16        * UIProcess/WebContext.h:
     17        * WebProcess/WebProcess.cpp:
     18        (WebKit::WebProcess::garbageCollectJavaScriptObjects):
     19        * WebProcess/WebProcess.h:
     20        * WebProcess/WebProcess.messages.in:
     21
    1222011-09-02  Sheriff Bot  <webkit.review.bot@gmail.com>
    223

  • trunk/Source/WebKit2/UIProcess/API/C/WKContext.cpp

    r94473 r94476  
    238238}
    239239
     240void WKContextGarbageCollectJavaScriptObjects(WKContextRef contextRef)
     241{
     242    toImpl(contextRef)->garbageCollectJavaScriptObjects();
     243}
     244

  • trunk/Source/WebKit2/UIProcess/API/C/WKContext.h

    r94473 r94476  
    141141typedef void (*WKContextGetStatisticsFunction)(WKDictionaryRef statistics, WKErrorRef error, void* functionContext);
    142142WK_EXPORT void WKContextGetStatistics(WKContextRef context, void* functionContext, WKContextGetStatisticsFunction function);
     143   
     144WK_EXPORT void WKContextGarbageCollectJavaScriptObjects(WKContextRef context);
    143145
    144146#ifdef __cplusplus

  • trunk/Source/WebKit2/UIProcess/WebContext.cpp

    r94473 r94476  
    830830}
    831831   
     832void WebContext::garbageCollectJavaScriptObjects()
     833{
     834    process()->send(Messages::WebProcess::GarbageCollectJavaScriptObjects(), 0);
     835}
     836
    832837} // namespace WebKit

  • trunk/Source/WebKit2/UIProcess/WebContext.h

    r94473 r94476  
    182182   
    183183    void getWebCoreStatistics(PassRefPtr<DictionaryCallback>);
     184    void garbageCollectJavaScriptObjects();
    184185
    185186private:

  • trunk/Source/WebKit2/WebProcess/WebProcess.cpp

    r94473 r94476  
    932932}
    933933
     934void WebProcess::garbageCollectJavaScriptObjects()
     935{
     936    gcController().garbageCollectNow();
     937}
     938
    934939#if ENABLE(PLUGIN_PROCESS)
    935940void WebProcess::pluginProcessCrashed(const String& pluginPath)

  • trunk/Source/WebKit2/WebProcess/WebProcess.h

    r94473 r94476  
    179179   
    180180    void getWebCoreStatistics(uint64_t callbackID);
     181    void garbageCollectJavaScriptObjects();
    181182
    182183    // ChildProcess

  • trunk/Source/WebKit2/WebProcess/WebProcess.messages.in

    r94473 r94476  
    7070
    7171    GetWebCoreStatistics(uint64_t callbackID)
     72    GarbageCollectJavaScriptObjects()
    7273}
Note: See TracChangeset for help on using the changeset viewer.