Changeset 73527 in webkit
- Timestamp:
- Dec 8, 2010 9:47:49 AM (13 years ago)
- Location:
- trunk
- Files:
-
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebKit/gtk/ChangeLog
r73507 r73527 1 2010-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 1 20 2010-12-08 Gustavo Noronha Silva <gustavo.noronha@collabora.co.uk> 2 21 -
trunk/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.cpp
r73348 r73527 29 29 #include "FrameView.h" 30 30 #include "FrameTree.h" 31 #include "GCController.h" 31 32 #include "GraphicsContext.h" 33 #include "JSDOMWindow.h" 32 34 #include "JSDocument.h" 33 35 #include "JSElement.h" … … 378 380 } 379 381 382 void DumpRenderTreeSupportGtk::gcCollectJavascriptObjects() 383 { 384 gcController().garbageCollectNow(); 385 } 386 387 void DumpRenderTreeSupportGtk::gcCollectJavascriptObjectsOnAlternateThread(bool waitUntilDone) 388 { 389 gcController().garbageCollectOnAlternateThreadForDebugging(waitUntilDone); 390 } 391 392 unsigned long DumpRenderTreeSupportGtk::gcCountJavascriptObjects() 393 { 394 JSC::JSLock lock(JSC::SilenceAssertionsOnly); 395 return JSDOMWindow::commonJSGlobalData()->heap.objectCount(); 396 } 397 398 void 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 59 59 static void clearMainFrameName(WebKitWebFrame* frame); 60 60 static AtkObject* getFocusedAccessibleElement(WebKitWebFrame* frame); 61 static void layoutFrame(WebKitWebFrame*); 61 62 62 63 // WebKitWebView 63 64 static void executeCoreCommandByName(WebKitWebView* webView, const gchar* name, const gchar* value); 64 65 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(); 65 71 66 72 static void whiteListAccessFromOrigin(const gchar* sourceOrigin, const gchar* destinationProtocol, const gchar* destinationHost, bool allowDestinationSubdomains); -
trunk/WebKit/gtk/webkit/webkitprivate.h
r73455 r73527 352 352 353 353 WEBKIT_API void 354 webkit_gc_collect_javascript_objects();355 356 WEBKIT_API void357 webkit_gc_collect_javascript_objects_on_alternate_thread(gboolean waitUntilDone);358 359 WEBKIT_API gsize360 webkit_gc_count_javascript_objects();361 362 WEBKIT_API void363 354 webkit_application_cache_set_maximum_size(unsigned long long size); 364 355 … … 373 364 webkit_security_origin_get_web_database(WebKitSecurityOrigin* securityOrigin, const char* databaseName); 374 365 375 WEBKIT_API void376 webkit_web_frame_layout(WebKitWebFrame* frame);377 378 366 void webkitWebViewEnterFullscreen(WebKitWebView* webView, WebCore::Node* node); 379 367 void webkitWebViewExitFullscreen(WebKitWebView* webView); -
trunk/WebKit/gtk/webkit/webkitwebframe.cpp
r73325 r73527 48 48 #include "GtkVersioning.h" 49 49 #include "HTMLFrameOwnerElement.h" 50 #include "JSDOMWindow.h"51 50 #include "JSElement.h" 52 #include "JSLock.h"53 51 #include "PrintContext.h" 54 52 #include "RenderListItem.h" … … 877 875 } 878 876 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 896 877 GtkPolicyType webkit_web_frame_get_horizontal_scrollbar_policy(WebKitWebFrame* frame) 897 878 { … … 958 939 priv->origin = kit(priv->coreFrame->document()->securityOrigin()); 959 940 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();973 941 } 974 942 -
trunk/WebKitTools/ChangeLog
r73456 r73527 1 2010-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 1 23 2010-12-07 Tony Chang <tony@chromium.org> 2 24 -
trunk/WebKitTools/DumpRenderTree/gtk/EventSender.cpp
r67928 r73527 34 34 35 35 #include "DumpRenderTree.h" 36 #include "WebCoreSupport/DumpRenderTreeSupportGtk.h" 36 37 37 38 #include <GtkVersioning.h> … … 50 51 51 52 extern "C" { 52 extern void webkit_web_frame_layout(WebKitWebFrame* frame);53 53 extern GtkMenu* webkit_web_view_get_context_menu(WebKitWebView*); 54 54 } … … 444 444 static void dispatchEvent(GdkEvent* event) 445 445 { 446 webkit_web_frame_layout(mainFrame);446 DumpRenderTreeSupportGtk::layoutFrame(mainFrame); 447 447 WebKitWebView* view = webkit_web_frame_get_web_view(mainFrame); 448 448 if (!view) { -
trunk/WebKitTools/DumpRenderTree/gtk/GCControllerGtk.cpp
r46319 r73527 30 30 #include "GCController.h" 31 31 32 #include "WebCoreSupport/DumpRenderTreeSupportGtk.h" 33 32 34 #include <glib.h> 33 35 #include <webkit/webkit.h> 34 36 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 41 37 void GCController::collect() const 42 38 { 43 webkit_gc_collect_javascript_objects();39 DumpRenderTreeSupportGtk::gcCollectJavascriptObjects(); 44 40 } 45 41 46 42 void GCController::collectOnAlternateThread(bool waitUntilDone) const 47 43 { 48 webkit_gc_collect_javascript_objects_on_alternate_thread(waitUntilDone);44 DumpRenderTreeSupportGtk::gcCollectJavascriptObjectsOnAlternateThread(waitUntilDone); 49 45 } 50 46 51 47 size_t GCController::getJSObjectCount() const 52 48 { 53 return webkit_gc_count_javascript_objects();49 return DumpRenderTreeSupportGtk::gcCountJavascriptObjects(); 54 50 }
Note: See TracChangeset
for help on using the changeset viewer.