[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da
tonikitoo at webkit.org
tonikitoo at webkit.org
Wed Dec 22 18:11:39 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 09c23cc28e966c18d2862d547f9b81e6bf2684eb
Author: tonikitoo at webkit.org <tonikitoo at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Dec 8 17:47:49 2010 +0000
2010-12-08 Antonio Gomes <agomes at 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):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73527 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/gtk/ChangeLog b/WebKit/gtk/ChangeLog
index 7456258..205d1a5 100644
--- a/WebKit/gtk/ChangeLog
+++ b/WebKit/gtk/ChangeLog
@@ -1,3 +1,22 @@
+2010-12-08 Antonio Gomes <agomes at rim.com>
+
+ Reviewed by Martin Robinson.
+
+ [Gtk] Populate DumpRenderTreeSupportGtk (part III)
+ https://bugs.webkit.org/show_bug.cgi?id=48429
+
+ 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:
+
2010-12-08 Gustavo Noronha Silva <gustavo.noronha at collabora.co.uk>
Reviewed by Xan Lopez.
diff --git a/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.cpp b/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.cpp
index 10694d0..82aebc9 100644
--- a/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.cpp
+++ b/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.cpp
@@ -28,7 +28,9 @@
#include "FrameLoaderClientGtk.h"
#include "FrameView.h"
#include "FrameTree.h"
+#include "GCController.h"
#include "GraphicsContext.h"
+#include "JSDOMWindow.h"
#include "JSDocument.h"
#include "JSElement.h"
#include "JSLock.h"
@@ -377,3 +379,31 @@ void DumpRenderTreeSupportGtk::resetOriginAccessWhiteLists()
SecurityOrigin::resetOriginAccessWhitelists();
}
+void DumpRenderTreeSupportGtk::gcCollectJavascriptObjects()
+{
+ gcController().garbageCollectNow();
+}
+
+void DumpRenderTreeSupportGtk::gcCollectJavascriptObjectsOnAlternateThread(bool waitUntilDone)
+{
+ gcController().garbageCollectOnAlternateThreadForDebugging(waitUntilDone);
+}
+
+unsigned long DumpRenderTreeSupportGtk::gcCountJavascriptObjects()
+{
+ JSC::JSLock lock(JSC::SilenceAssertionsOnly);
+ return JSDOMWindow::commonJSGlobalData()->heap.objectCount();
+}
+
+void DumpRenderTreeSupportGtk::layoutFrame(WebKitWebFrame* frame)
+{
+ Frame* coreFrame = core(frame);
+ if (!coreFrame)
+ return;
+
+ FrameView* view = coreFrame->view();
+ if (!view)
+ return;
+
+ view->layout();
+}
diff --git a/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.h b/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.h
index ef57b14..6db6268 100644
--- a/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.h
+++ b/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.h
@@ -58,11 +58,17 @@ public:
static void resumeAnimations(WebKitWebFrame* frame);
static void clearMainFrameName(WebKitWebFrame* frame);
static AtkObject* getFocusedAccessibleElement(WebKitWebFrame* frame);
+ static void layoutFrame(WebKitWebFrame*);
// WebKitWebView
static void executeCoreCommandByName(WebKitWebView* webView, const gchar* name, const gchar* value);
static bool isCommandEnabled(WebKitWebView* webView, const gchar* name);
+ // GC
+ static void gcCollectJavascriptObjects();
+ static void gcCollectJavascriptObjectsOnAlternateThread(bool waitUntilDone);
+ static unsigned long gcCountJavascriptObjects();
+
static void whiteListAccessFromOrigin(const gchar* sourceOrigin, const gchar* destinationProtocol, const gchar* destinationHost, bool allowDestinationSubdomains);
static void resetOriginAccessWhiteLists();
diff --git a/WebKit/gtk/webkit/webkitprivate.h b/WebKit/gtk/webkit/webkitprivate.h
index 0f8d700..9abcd9f 100644
--- a/WebKit/gtk/webkit/webkitprivate.h
+++ b/WebKit/gtk/webkit/webkitprivate.h
@@ -351,15 +351,6 @@ extern "C" {
webkit_history_items(void);
WEBKIT_API void
- webkit_gc_collect_javascript_objects();
-
- WEBKIT_API void
- webkit_gc_collect_javascript_objects_on_alternate_thread(gboolean waitUntilDone);
-
- WEBKIT_API gsize
- webkit_gc_count_javascript_objects();
-
- WEBKIT_API void
webkit_application_cache_set_maximum_size(unsigned long long size);
WEBKIT_API unsigned int
@@ -372,9 +363,6 @@ extern "C" {
WEBKIT_API WebKitWebDatabase *
webkit_security_origin_get_web_database(WebKitSecurityOrigin* securityOrigin, const char* databaseName);
- WEBKIT_API void
- webkit_web_frame_layout(WebKitWebFrame* frame);
-
void webkitWebViewEnterFullscreen(WebKitWebView* webView, WebCore::Node* node);
void webkitWebViewExitFullscreen(WebKitWebView* webView);
}
diff --git a/WebKit/gtk/webkit/webkitwebframe.cpp b/WebKit/gtk/webkit/webkitwebframe.cpp
index ed10e48..13344a2 100644
--- a/WebKit/gtk/webkit/webkitwebframe.cpp
+++ b/WebKit/gtk/webkit/webkitwebframe.cpp
@@ -47,9 +47,7 @@
#include "GraphicsContext.h"
#include "GtkVersioning.h"
#include "HTMLFrameOwnerElement.h"
-#include "JSDOMWindow.h"
#include "JSElement.h"
-#include "JSLock.h"
#include "PrintContext.h"
#include "RenderListItem.h"
#include "RenderView.h"
@@ -876,23 +874,6 @@ WebKitLoadStatus webkit_web_frame_get_load_status(WebKitWebFrame* frame)
return priv->loadStatus;
}
-void webkit_gc_collect_javascript_objects()
-{
- gcController().garbageCollectNow();
-}
-
-void webkit_gc_collect_javascript_objects_on_alternate_thread(gboolean waitUntilDone)
-{
- gcController().garbageCollectOnAlternateThreadForDebugging(waitUntilDone);
-}
-
-gsize webkit_gc_count_javascript_objects()
-{
- JSC::JSLock lock(JSC::SilenceAssertionsOnly);
- return JSDOMWindow::commonJSGlobalData()->heap.objectCount();
-
-}
-
GtkPolicyType webkit_web_frame_get_horizontal_scrollbar_policy(WebKitWebFrame* frame)
{
g_return_val_if_fail(WEBKIT_IS_WEB_FRAME(frame), GTK_POLICY_AUTOMATIC);
@@ -959,19 +940,6 @@ WebKitSecurityOrigin* webkit_web_frame_get_security_origin(WebKitWebFrame* frame
return priv->origin;
}
-void webkit_web_frame_layout(WebKitWebFrame* frame)
-{
- Frame* coreFrame = core(frame);
- if (!coreFrame)
- return;
-
- FrameView* view = coreFrame->view();
- if (!view)
- return;
-
- view->layout();
-}
-
/**
* webkit_web_frame_get_network_response:
* @frame: a #WebKitWebFrame
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 9cabc08..8049dbf 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,25 @@
+2010-12-08 Antonio Gomes <agomes at rim.com>
+
+ Reviewed by Martin Robinson.
+
+ [Gtk] Populate DumpRenderTreeSupportGtk (part III)
+ https://bugs.webkit.org/show_bug.cgi?id=48429
+
+ 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):
+
2010-12-07 Tony Chang <tony at chromium.org>
Reviewed by Ojan Vafai.
diff --git a/WebKitTools/DumpRenderTree/gtk/EventSender.cpp b/WebKitTools/DumpRenderTree/gtk/EventSender.cpp
index 6e5fa5f..b844558 100644
--- a/WebKitTools/DumpRenderTree/gtk/EventSender.cpp
+++ b/WebKitTools/DumpRenderTree/gtk/EventSender.cpp
@@ -33,6 +33,7 @@
#include "EventSender.h"
#include "DumpRenderTree.h"
+#include "WebCoreSupport/DumpRenderTreeSupportGtk.h"
#include <GtkVersioning.h>
#include <JavaScriptCore/JSObjectRef.h>
@@ -49,7 +50,6 @@
#include <string.h>
extern "C" {
- extern void webkit_web_frame_layout(WebKitWebFrame* frame);
extern GtkMenu* webkit_web_view_get_context_menu(WebKitWebView*);
}
@@ -443,7 +443,7 @@ static void sendOrQueueEvent(GdkEvent* event, bool shouldReplaySavedEvents)
static void dispatchEvent(GdkEvent* event)
{
- webkit_web_frame_layout(mainFrame);
+ DumpRenderTreeSupportGtk::layoutFrame(mainFrame);
WebKitWebView* view = webkit_web_frame_get_web_view(mainFrame);
if (!view) {
gdk_event_free(event);
diff --git a/WebKitTools/DumpRenderTree/gtk/GCControllerGtk.cpp b/WebKitTools/DumpRenderTree/gtk/GCControllerGtk.cpp
index 87eb413..4eb5d6e 100644
--- a/WebKitTools/DumpRenderTree/gtk/GCControllerGtk.cpp
+++ b/WebKitTools/DumpRenderTree/gtk/GCControllerGtk.cpp
@@ -29,26 +29,22 @@
#include "config.h"
#include "GCController.h"
+#include "WebCoreSupport/DumpRenderTreeSupportGtk.h"
+
#include <glib.h>
#include <webkit/webkit.h>
-extern "C" {
-extern void webkit_gc_collect_javascript_objects();
-extern void webkit_gc_collect_javascript_objects_on_alternate_thread(gboolean waitUntilDone);
-extern gsize webkit_gc_count_javascript_objects();
-}
-
void GCController::collect() const
{
- webkit_gc_collect_javascript_objects();
+ DumpRenderTreeSupportGtk::gcCollectJavascriptObjects();
}
void GCController::collectOnAlternateThread(bool waitUntilDone) const
{
- webkit_gc_collect_javascript_objects_on_alternate_thread(waitUntilDone);
+ DumpRenderTreeSupportGtk::gcCollectJavascriptObjectsOnAlternateThread(waitUntilDone);
}
size_t GCController::getJSObjectCount() const
{
- return webkit_gc_count_javascript_objects();
+ return DumpRenderTreeSupportGtk::gcCountJavascriptObjects();
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list