[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373
kov at webkit.org
kov at webkit.org
Thu Apr 8 02:01:52 UTC 2010
The following commit has been merged in the webkit-1.2 branch:
commit 58afcde5a4a66bdadeeba037121feb6c7202e79d
Author: kov at webkit.org <kov at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Feb 26 22:39:51 2010 +0000
WebKit/gtk
2009-12-04 Gustavo Noronha Silva <gustavo.noronha at collabora.co.uk>
Reviewed by Xan Lopez.
[GTK] Needs proper reporting of frame loader callbacks, in DRT
https://bugs.webkit.org/show_bug.cgi?id=32170
Add new signal to report when the document load is finished for a
frame.
* WebCoreSupport/FrameLoaderClientGtk.cpp:
(WebKit::FrameLoaderClient::dispatchDidFinishDocumentLoad):
* webkit/webkitwebview.cpp:
(webkit_web_view_class_init):
WebKitTools
2010-02-26 Gustavo Noronha Silva <gustavo.noronha at collabora.co.uk>
Reviewed by Xan Lopez.
[GTK] Needs proper reporting of frame loader callbacks, in DRT
https://bugs.webkit.org/show_bug.cgi?id=32170
Fix reporting of unload handlers, so that it is emitted where
needed, not after it.
* DumpRenderTree/gtk/DumpRenderTree.cpp:
(webViewLoadFinished):
(webViewDocumentLoadFinished):
(createWebView):
LayoutTests
2010-02-26 Gustavo Noronha Silva <gustavo.noronha at collabora.co.uk>
Reviewed by Xan Lopez.
[GTK] Needs proper reporting of frame loader callbacks, in DRT
https://bugs.webkit.org/show_bug.cgi?id=32170
Unskip tests that now pass.
* LayoutTests/platform/gtk/http/tests/loading/redirect-with-no-location-crash-expected.txt: rebaselined.
* platform/gtk/Skipped:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55316 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 73009bb..49f0d8a 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -51,6 +51,18 @@
2010-02-26 Gustavo Noronha Silva <gustavo.noronha at collabora.co.uk>
+ Reviewed by Xan Lopez.
+
+ [GTK] Needs proper reporting of frame loader callbacks, in DRT
+ https://bugs.webkit.org/show_bug.cgi?id=32170
+
+ Unskip tests that now pass.
+
+ * LayoutTests/platform/gtk/http/tests/loading/redirect-with-no-location-crash-expected.txt: rebaselined.
+ * platform/gtk/Skipped:
+
+2010-02-26 Gustavo Noronha Silva <gustavo.noronha at collabora.co.uk>
+
Rebaseline of platform-specific results for test.
SVGResourceClipper needs to be moved to RenderSVGResourceClipper
diff --git a/LayoutTests/platform/gtk/Skipped b/LayoutTests/platform/gtk/Skipped
index 35aa143..6ffc18b 100644
--- a/LayoutTests/platform/gtk/Skipped
+++ b/LayoutTests/platform/gtk/Skipped
@@ -1399,10 +1399,7 @@ fast/history/history_reload.html
fast/history/window-open.html
fast/html/tab-order.html
fast/html/text-field-input-types.html
-fast/loader/frames-with-unload-handlers-in-page-cache.html
fast/loader/main-document-url-for-non-http-loads.html
-fast/loader/onunload-form-submit-crash-2.html
-fast/loader/onunload-form-submit-crash.html
fast/loader/onload-policy-ignore-for-frame.html
fast/loader/policy-delegate-action-hit-test-zoomed.html
fast/loader/reload-policy-delegate.html
@@ -5642,8 +5639,6 @@ editing/selection/5825350-2.html
# Need proper frame loader callbacks reporting
# See https://bugs.webkit.org/show_bug.cgi?id=32170
-fast/loader/stateobjects/document-destroyed-navigate-back-with-fragment-scroll.html
-fast/loader/stateobjects/document-destroyed-navigate-back.html
http/tests/loading/state-object-security-exception.html
http/tests/security/mixedContent/empty-url-plugin-in-frame.html
# Seems to be the same issue as above.
diff --git a/LayoutTests/platform/gtk/http/tests/loading/redirect-with-no-location-crash-expected.txt b/LayoutTests/platform/gtk/http/tests/loading/redirect-with-no-location-crash-expected.txt
index 8b13789..41e3c89 100644
--- a/LayoutTests/platform/gtk/http/tests/loading/redirect-with-no-location-crash-expected.txt
+++ b/LayoutTests/platform/gtk/http/tests/loading/redirect-with-no-location-crash-expected.txt
@@ -1 +1 @@
-
+main frame - didFinishDocumentLoadForFrameframe "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame
diff --git a/WebKit/gtk/ChangeLog b/WebKit/gtk/ChangeLog
index abecbc9..f43d084 100644
--- a/WebKit/gtk/ChangeLog
+++ b/WebKit/gtk/ChangeLog
@@ -1,3 +1,18 @@
+2009-12-04 Gustavo Noronha Silva <gustavo.noronha at collabora.co.uk>
+
+ Reviewed by Xan Lopez.
+
+ [GTK] Needs proper reporting of frame loader callbacks, in DRT
+ https://bugs.webkit.org/show_bug.cgi?id=32170
+
+ Add new signal to report when the document load is finished for a
+ frame.
+
+ * WebCoreSupport/FrameLoaderClientGtk.cpp:
+ (WebKit::FrameLoaderClient::dispatchDidFinishDocumentLoad):
+ * webkit/webkitwebview.cpp:
+ (webkit_web_view_class_init):
+
2010-02-26 Antonio Gomes <tonikitoo at webkit.org>
Complementary commit of r55300. Missing "notify::" to signal name.
diff --git a/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp b/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp
index 638327f..e6208ec 100644
--- a/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp
+++ b/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp
@@ -788,7 +788,8 @@ void FrameLoaderClient::dispatchDidCommitLoad()
void FrameLoaderClient::dispatchDidFinishDocumentLoad()
{
- notImplemented();
+ WebKitWebView* webView = getViewFromFrame(m_frame);
+ g_signal_emit_by_name(webView, "document-load-finished", m_frame);
}
void FrameLoaderClient::dispatchDidFirstLayout()
diff --git a/WebKit/gtk/webkit/webkitwebview.cpp b/WebKit/gtk/webkit/webkitwebview.cpp
index b83e49d..d2be7fa 100644
--- a/WebKit/gtk/webkit/webkitwebview.cpp
+++ b/WebKit/gtk/webkit/webkitwebview.cpp
@@ -158,6 +158,7 @@ enum {
REDO,
DATABASE_QUOTA_EXCEEDED,
RESOURCE_REQUEST_STARTING,
+ DOCUMENT_LOAD_FINISHED,
LAST_SIGNAL
};
@@ -2165,6 +2166,30 @@ static void webkit_web_view_class_init(WebKitWebViewClass* webViewClass)
WEBKIT_TYPE_NETWORK_RESPONSE);
/*
+ * DOM-related signals. These signals are experimental, for now,
+ * and may change API and ABI. Their comments lack one * on
+ * purpose, to make them not be catched by gtk-doc.
+ */
+
+ /*
+ * WebKitWebView::document-load-finished
+ * @web_view: the object which received the signal
+ * @web_frame: the #WebKitWebFrame whose load dispatched this request
+ *
+ * Emitted when the DOM document object load is finished for the
+ * given frame.
+ */
+ webkit_web_view_signals[DOCUMENT_LOAD_FINISHED] = g_signal_new("document-load-finished",
+ G_TYPE_FROM_CLASS(webViewClass),
+ (GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION),
+ 0,
+ NULL, NULL,
+ g_cclosure_marshal_VOID__OBJECT,
+ G_TYPE_NONE, 1,
+ WEBKIT_TYPE_WEB_FRAME);
+
+
+ /*
* implementations of virtual methods
*/
webViewClass->create_web_view = webkit_web_view_real_create_web_view;
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 9c362a3..eae0f27 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,18 @@
+2010-02-26 Gustavo Noronha Silva <gustavo.noronha at collabora.co.uk>
+
+ Reviewed by Xan Lopez.
+
+ [GTK] Needs proper reporting of frame loader callbacks, in DRT
+ https://bugs.webkit.org/show_bug.cgi?id=32170
+
+ Fix reporting of unload handlers, so that it is emitted where
+ needed, not after it.
+
+ * DumpRenderTree/gtk/DumpRenderTree.cpp:
+ (webViewLoadFinished):
+ (webViewDocumentLoadFinished):
+ (createWebView):
+
2010-02-26 Antonio Gomes <tonikitoo at webkit.org>
Reviewed by Gustavo Noronha.
diff --git a/WebKitTools/DumpRenderTree/gtk/DumpRenderTree.cpp b/WebKitTools/DumpRenderTree/gtk/DumpRenderTree.cpp
index a2fc79b..7480d85 100644
--- a/WebKitTools/DumpRenderTree/gtk/DumpRenderTree.cpp
+++ b/WebKitTools/DumpRenderTree/gtk/DumpRenderTree.cpp
@@ -550,7 +550,7 @@ static char* getFrameNameSuitableForTestResult(WebKitWebView* view, WebKitWebFra
// This is a bit strange. Shouldn't web_frame_get_name return NULL?
if (frameName && (frameName[0] != '\0')) {
char* tmp = g_strdup_printf("main frame \"%s\"", frameName);
- g_free (frameName);
+ g_free(frameName);
frameName = tmp;
} else {
g_free(frameName);
@@ -559,6 +559,10 @@ static char* getFrameNameSuitableForTestResult(WebKitWebView* view, WebKitWebFra
} else if (!frameName || (frameName[0] == '\0')) {
g_free(frameName);
frameName = g_strdup("frame (anonymous)");
+ } else {
+ char* tmp = g_strdup_printf("frame \"%s\"", frameName);
+ g_free(frameName);
+ frameName = tmp;
}
return frameName;
@@ -566,15 +570,6 @@ static char* getFrameNameSuitableForTestResult(WebKitWebView* view, WebKitWebFra
static void webViewLoadFinished(WebKitWebView* view, WebKitWebFrame* frame, void*)
{
- if (!done && !gLayoutTestController->dumpFrameLoadCallbacks()) {
- guint pendingFrameUnloadEvents = webkit_web_frame_get_pending_unload_event_count(frame);
- if (pendingFrameUnloadEvents) {
- char* frameName = getFrameNameSuitableForTestResult(view, frame);
- printf("%s - has %u onunload handler(s)\n", frameName, pendingFrameUnloadEvents);
- g_free(frameName);
- }
- }
-
if (frame != topLoadingFrame)
return;
@@ -589,6 +584,22 @@ static void webViewLoadFinished(WebKitWebView* view, WebKitWebFrame* frame, void
dump();
}
+static void webViewDocumentLoadFinished(WebKitWebView* view, WebKitWebFrame* frame, void*)
+{
+ if (!done && gLayoutTestController->dumpFrameLoadCallbacks()) {
+ char* frameName = getFrameNameSuitableForTestResult(view, frame);
+ printf("%s - didFinishDocumentLoadForFrame", frameName);
+ g_free(frameName);
+ } else if (!done) {
+ guint pendingFrameUnloadEvents = webkit_web_frame_get_pending_unload_event_count(frame);
+ if (pendingFrameUnloadEvents) {
+ char* frameName = getFrameNameSuitableForTestResult(view, frame);
+ printf("%s - has %u onunload handler(s)\n", frameName, pendingFrameUnloadEvents);
+ g_free(frameName);
+ }
+ }
+}
+
static void webViewWindowObjectCleared(WebKitWebView* view, WebKitWebFrame* frame, JSGlobalContextRef context, JSObjectRef windowObject, gpointer data)
{
JSValueRef exception = 0;
@@ -775,6 +786,7 @@ static WebKitWebView* createWebView()
"signal::create-web-view", webViewCreate, 0,
"signal::close-web-view", webViewClose, 0,
"signal::database-quota-exceeded", databaseQuotaExceeded, 0,
+ "signal::document-load-finished", webViewDocumentLoadFinished, 0,
NULL);
WebKitWebInspector* inspector = webkit_web_view_get_inspector(view);
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list