Changeset 73527 in webkit


Ignore:
Timestamp:
Dec 8, 2010 9:47:49 AM (13 years ago)
Author:
tonikitoo@webkit.org
Message:

2010-12-08 Antonio Gomes <agomes@rim.com>

Reviewed by Martin Robinson.

[Gtk] Populate DumpRenderTreeSupportGtk (part III)
https://bugs.webkit.org/show_bug.cgi?id=48429

WebKit/gtk:

Adjusted some call sites of previously internal API declared
webkitprivate.h that have moved to DumpRenderTreeSupportGtk.

  • WebCoreSupport/DumpRenderTreeSupportGtk.cpp: (DumpRenderTreeSupportGtk::gcCollectJavascriptObjects): (DumpRenderTreeSupportGtk::gcCollectJavascriptObjectsOnAlternateThread): (DumpRenderTreeSupportGtk::gcCountJavascriptObjects): (DumpRenderTreeSupportGtk::layoutFrame):
  • WebCoreSupport/DumpRenderTreeSupportGtk.h:
  • webkit/webkitprivate.h:
  • webkit/webkitwebframe.cpp:

WebKitTools:

Moved the following methods from webkitprivate.h to DumpRenderTreeSupportGtk.cpp|h:

  • webkit_gc_collect_javascript_objects;
  • webkit_gc_collect_javascript_objects_on_alternate_thread;
  • webkit_gc_count_javascript_objects;
  • webkit_web_frame_layout.

These were all only used by GTK+ DRT.

  • DumpRenderTree/gtk/EventSender.cpp: (dispatchEvent):
  • DumpRenderTree/gtk/GCControllerGtk.cpp: (GCController::collect): (GCController::collectOnAlternateThread): (GCController::getJSObjectCount):
Location:
trunk
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • trunk/WebKit/gtk/ChangeLog

    r73507 r73527  
     12010-12-08  Antonio Gomes  <agomes@rim.com>
     2
     3        Reviewed by Martin Robinson.
     4
     5        [Gtk] Populate DumpRenderTreeSupportGtk (part III)
     6        https://bugs.webkit.org/show_bug.cgi?id=48429
     7
     8        Adjusted some call sites of previously internal API declared
     9        webkitprivate.h that have moved to DumpRenderTreeSupportGtk.
     10
     11        * WebCoreSupport/DumpRenderTreeSupportGtk.cpp:
     12        (DumpRenderTreeSupportGtk::gcCollectJavascriptObjects):
     13        (DumpRenderTreeSupportGtk::gcCollectJavascriptObjectsOnAlternateThread):
     14        (DumpRenderTreeSupportGtk::gcCountJavascriptObjects):
     15        (DumpRenderTreeSupportGtk::layoutFrame):
     16        * WebCoreSupport/DumpRenderTreeSupportGtk.h:
     17        * webkit/webkitprivate.h:
     18        * webkit/webkitwebframe.cpp:
     19
    1202010-12-08  Gustavo Noronha Silva  <gustavo.noronha@collabora.co.uk>
    221
  • trunk/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.cpp

    r73348 r73527  
    2929#include "FrameView.h"
    3030#include "FrameTree.h"
     31#include "GCController.h"
    3132#include "GraphicsContext.h"
     33#include "JSDOMWindow.h"
    3234#include "JSDocument.h"
    3335#include "JSElement.h"
     
    378380}
    379381
     382void DumpRenderTreeSupportGtk::gcCollectJavascriptObjects()
     383{
     384    gcController().garbageCollectNow();
     385}
     386
     387void DumpRenderTreeSupportGtk::gcCollectJavascriptObjectsOnAlternateThread(bool waitUntilDone)
     388{
     389    gcController().garbageCollectOnAlternateThreadForDebugging(waitUntilDone);
     390}
     391
     392unsigned long DumpRenderTreeSupportGtk::gcCountJavascriptObjects()
     393{
     394    JSC::JSLock lock(JSC::SilenceAssertionsOnly);
     395    return JSDOMWindow::commonJSGlobalData()->heap.objectCount();
     396}
     397
     398void DumpRenderTreeSupportGtk::layoutFrame(WebKitWebFrame* frame)
     399{
     400    Frame* coreFrame = core(frame);
     401    if (!coreFrame)
     402        return;
     403
     404    FrameView* view = coreFrame->view();
     405    if (!view)
     406        return;
     407
     408    view->layout();
     409}
  • trunk/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.h

    r73348 r73527  
    5959    static void clearMainFrameName(WebKitWebFrame* frame);
    6060    static AtkObject* getFocusedAccessibleElement(WebKitWebFrame* frame);
     61    static void layoutFrame(WebKitWebFrame*);
    6162
    6263    // WebKitWebView
    6364    static void executeCoreCommandByName(WebKitWebView* webView, const gchar* name, const gchar* value);
    6465    static bool isCommandEnabled(WebKitWebView* webView, const gchar* name);
     66
     67    // GC
     68    static void gcCollectJavascriptObjects();
     69    static void gcCollectJavascriptObjectsOnAlternateThread(bool waitUntilDone);
     70    static unsigned long gcCountJavascriptObjects();
    6571
    6672    static void whiteListAccessFromOrigin(const gchar* sourceOrigin, const gchar* destinationProtocol, const gchar* destinationHost, bool allowDestinationSubdomains);
  • trunk/WebKit/gtk/webkit/webkitprivate.h

    r73455 r73527  
    352352
    353353    WEBKIT_API void
    354     webkit_gc_collect_javascript_objects();
    355 
    356     WEBKIT_API void
    357     webkit_gc_collect_javascript_objects_on_alternate_thread(gboolean waitUntilDone);
    358 
    359     WEBKIT_API gsize
    360     webkit_gc_count_javascript_objects();
    361 
    362     WEBKIT_API void
    363354    webkit_application_cache_set_maximum_size(unsigned long long size);
    364355
     
    373364    webkit_security_origin_get_web_database(WebKitSecurityOrigin* securityOrigin, const char* databaseName);
    374365
    375     WEBKIT_API void
    376     webkit_web_frame_layout(WebKitWebFrame* frame);
    377 
    378366    void webkitWebViewEnterFullscreen(WebKitWebView* webView, WebCore::Node* node);
    379367    void webkitWebViewExitFullscreen(WebKitWebView* webView);
  • trunk/WebKit/gtk/webkit/webkitwebframe.cpp

    r73325 r73527  
    4848#include "GtkVersioning.h"
    4949#include "HTMLFrameOwnerElement.h"
    50 #include "JSDOMWindow.h"
    5150#include "JSElement.h"
    52 #include "JSLock.h"
    5351#include "PrintContext.h"
    5452#include "RenderListItem.h"
     
    877875}
    878876
    879 void webkit_gc_collect_javascript_objects()
    880 {
    881     gcController().garbageCollectNow();
    882 }
    883 
    884 void webkit_gc_collect_javascript_objects_on_alternate_thread(gboolean waitUntilDone)
    885 {
    886     gcController().garbageCollectOnAlternateThreadForDebugging(waitUntilDone);
    887 }
    888 
    889 gsize webkit_gc_count_javascript_objects()
    890 {
    891     JSC::JSLock lock(JSC::SilenceAssertionsOnly);
    892     return JSDOMWindow::commonJSGlobalData()->heap.objectCount();
    893 
    894 }
    895 
    896877GtkPolicyType webkit_web_frame_get_horizontal_scrollbar_policy(WebKitWebFrame* frame)
    897878{
     
    958939    priv->origin = kit(priv->coreFrame->document()->securityOrigin());
    959940    return priv->origin;
    960 }
    961 
    962 void webkit_web_frame_layout(WebKitWebFrame* frame)
    963 {
    964     Frame* coreFrame = core(frame);
    965     if (!coreFrame)
    966         return;
    967 
    968     FrameView* view = coreFrame->view();
    969     if (!view)
    970         return;
    971 
    972     view->layout();
    973941}
    974942
  • trunk/WebKitTools/ChangeLog

    r73456 r73527  
     12010-12-08  Antonio Gomes  <agomes@rim.com>
     2
     3        Reviewed by Martin Robinson.
     4
     5        [Gtk] Populate DumpRenderTreeSupportGtk (part III)
     6        https://bugs.webkit.org/show_bug.cgi?id=48429
     7
     8        Moved the following methods from webkitprivate.h to DumpRenderTreeSupportGtk.cpp|h:
     9        * webkit_gc_collect_javascript_objects;
     10        * webkit_gc_collect_javascript_objects_on_alternate_thread;
     11        * webkit_gc_count_javascript_objects;
     12        * webkit_web_frame_layout.
     13
     14        These were all only used by GTK+ DRT.
     15
     16        * DumpRenderTree/gtk/EventSender.cpp:
     17        (dispatchEvent):
     18        * DumpRenderTree/gtk/GCControllerGtk.cpp:
     19        (GCController::collect):
     20        (GCController::collectOnAlternateThread):
     21        (GCController::getJSObjectCount):
     22
    1232010-12-07  Tony Chang  <tony@chromium.org>
    224
  • trunk/WebKitTools/DumpRenderTree/gtk/EventSender.cpp

    r67928 r73527  
    3434
    3535#include "DumpRenderTree.h"
     36#include "WebCoreSupport/DumpRenderTreeSupportGtk.h"
    3637
    3738#include <GtkVersioning.h>
     
    5051
    5152extern "C" {
    52     extern void webkit_web_frame_layout(WebKitWebFrame* frame);
    5353    extern GtkMenu* webkit_web_view_get_context_menu(WebKitWebView*);
    5454}
     
    444444static void dispatchEvent(GdkEvent* event)
    445445{
    446     webkit_web_frame_layout(mainFrame);
     446    DumpRenderTreeSupportGtk::layoutFrame(mainFrame);
    447447    WebKitWebView* view = webkit_web_frame_get_web_view(mainFrame);
    448448    if (!view) {
  • trunk/WebKitTools/DumpRenderTree/gtk/GCControllerGtk.cpp

    r46319 r73527  
    3030#include "GCController.h"
    3131
     32#include "WebCoreSupport/DumpRenderTreeSupportGtk.h"
     33
    3234#include <glib.h>
    3335#include <webkit/webkit.h>
    3436
    35 extern "C" {
    36 extern void webkit_gc_collect_javascript_objects();
    37 extern void webkit_gc_collect_javascript_objects_on_alternate_thread(gboolean waitUntilDone);
    38 extern gsize webkit_gc_count_javascript_objects();
    39 }
    40 
    4137void GCController::collect() const
    4238{
    43     webkit_gc_collect_javascript_objects();
     39    DumpRenderTreeSupportGtk::gcCollectJavascriptObjects();
    4440}
    4541
    4642void GCController::collectOnAlternateThread(bool waitUntilDone) const
    4743{
    48     webkit_gc_collect_javascript_objects_on_alternate_thread(waitUntilDone);
     44    DumpRenderTreeSupportGtk::gcCollectJavascriptObjectsOnAlternateThread(waitUntilDone);
    4945}
    5046
    5147size_t GCController::getJSObjectCount() const
    5248{
    53     return webkit_gc_count_javascript_objects();
     49    return DumpRenderTreeSupportGtk::gcCountJavascriptObjects();
    5450}
Note: See TracChangeset for help on using the changeset viewer.