[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
alice.liu at apple.com
alice.liu at apple.com
Wed Dec 22 12:49:17 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 91cb48cb19905d5e872f74bda831d6e5bfc4f63c
Author: alice.liu at apple.com <alice.liu at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Aug 31 03:34:33 2010 +0000
Add missing parts of didFinishDocumentLoadForFrame
https://bugs.webkit.org/show_bug.cgi?id=44913
Reviewed by Darin Adler.
WebKit2:
* Shared/CoreIPCSupport/WebPageProxyMessageKinds.h: Added new kind
* UIProcess/API/C/WKPage.h:
* UIProcess/API/qt/qwkpage.cpp:
(QWKPage::QWKPage): Updated struct
* UIProcess/WebLoaderClient.cpp:
(WebKit::WebLoaderClient::didFinishDocumentLoadForFrame): Added
* UIProcess/WebLoaderClient.h:
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::didReceiveMessage): Added case for WebPageProxyMessage::DidFinishDocumentLoadForFrame
(WebKit::WebPageProxy::didFinishDocumentLoadForFrame): Added
* UIProcess/WebPageProxy.h:
Just rearranging existing code in these:
* WebProcess/InjectedBundle/API/c/WKBundlePage.h:
* WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.cpp:
(WebKit::InjectedBundlePageLoaderClient::didFinishDocumentLoadForFrame):
* WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.h:
WebKitTools:
* MiniBrowser/mac/BrowserWindowController.m:
(didFinishDocumentLoadForFrame): Added
(-[BrowserWindowController awakeFromNib]): Updated struct
* WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp:
(WTR::InjectedBundlePage::InjectedBundlePage): Rearranged function ptr
* WebKitTestRunner/TestController.cpp:
(WTR::TestController::initialize): Updated struct
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66448 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index e789902..338d094 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,28 @@
+2010-08-30 Alice Liu <alice.liu at apple.com>
+
+ Reviewed by Darin Adler.
+
+ Add missing parts of didFinishDocumentLoadForFrame
+ https://bugs.webkit.org/show_bug.cgi?id=44913
+
+ * Shared/CoreIPCSupport/WebPageProxyMessageKinds.h: Added new kind
+ * UIProcess/API/C/WKPage.h:
+ * UIProcess/API/qt/qwkpage.cpp:
+ (QWKPage::QWKPage): Updated struct
+ * UIProcess/WebLoaderClient.cpp:
+ (WebKit::WebLoaderClient::didFinishDocumentLoadForFrame): Added
+ * UIProcess/WebLoaderClient.h:
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::didReceiveMessage): Added case for WebPageProxyMessage::DidFinishDocumentLoadForFrame
+ (WebKit::WebPageProxy::didFinishDocumentLoadForFrame): Added
+ * UIProcess/WebPageProxy.h:
+
+ Just rearranging existing code in these:
+ * WebProcess/InjectedBundle/API/c/WKBundlePage.h:
+ * WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.cpp:
+ (WebKit::InjectedBundlePageLoaderClient::didFinishDocumentLoadForFrame):
+ * WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.h:
+
2010-08-30 Sam Weinig <sam at webkit.org>
Try and fix the WebKit2 buildbot.
diff --git a/WebKit2/Shared/CoreIPCSupport/WebPageProxyMessageKinds.h b/WebKit2/Shared/CoreIPCSupport/WebPageProxyMessageKinds.h
index b552993..2a1f1f3 100644
--- a/WebKit2/Shared/CoreIPCSupport/WebPageProxyMessageKinds.h
+++ b/WebKit2/Shared/CoreIPCSupport/WebPageProxyMessageKinds.h
@@ -50,6 +50,7 @@ enum Kind {
DidCreateSubFrame,
DidFailLoadForFrame,
DidFailProvisionalLoadForFrame,
+ DidFinishDocumentLoadForFrame,
DidFinishLoadForFrame,
DidFinishProgress,
DidFirstLayoutForFrame,
diff --git a/WebKit2/UIProcess/API/C/WKPage.h b/WebKit2/UIProcess/API/C/WKPage.h
index 44209cf..29f9686 100644
--- a/WebKit2/UIProcess/API/C/WKPage.h
+++ b/WebKit2/UIProcess/API/C/WKPage.h
@@ -61,6 +61,7 @@ typedef void (*WKPageDidStartProvisionalLoadForFrameCallback)(WKPageRef page, WK
typedef void (*WKPageDidReceiveServerRedirectForProvisionalLoadForFrameCallback)(WKPageRef page, WKFrameRef frame, const void *clientInfo);
typedef void (*WKPageDidFailProvisionalLoadWithErrorForFrameCallback)(WKPageRef page, WKFrameRef frame, const void *clientInfo); // FIXME: Add WKErrorRef.
typedef void (*WKPageDidCommitLoadForFrameCallback)(WKPageRef page, WKFrameRef frame, const void *clientInfo);
+typedef void (*WKPageDidFinishDocumentLoadForFrameCallback)(WKPageRef page, WKFrameRef frame, const void *clientInfo);
typedef void (*WKPageDidFinishLoadForFrameCallback)(WKPageRef page, WKFrameRef frame, const void *clientInfo);
typedef void (*WKPageDidFailLoadWithErrorForFrameCallback)(WKPageRef page, WKFrameRef frame, const void *clientInfo); // FIXME: Add WKErrorRef.
typedef void (*WKPageDidReceiveTitleForFrameCallback)(WKPageRef page, WKStringRef title, WKFrameRef frame, const void *clientInfo);
@@ -87,6 +88,7 @@ struct WKPageLoaderClient {
WKPageDidReceiveServerRedirectForProvisionalLoadForFrameCallback didReceiveServerRedirectForProvisionalLoadForFrame;
WKPageDidFailProvisionalLoadWithErrorForFrameCallback didFailProvisionalLoadWithErrorForFrame;
WKPageDidCommitLoadForFrameCallback didCommitLoadForFrame;
+ WKPageDidFinishDocumentLoadForFrameCallback didFinishDocumentLoadForFrame;
WKPageDidFinishLoadForFrameCallback didFinishLoadForFrame;
WKPageDidFailLoadWithErrorForFrameCallback didFailLoadWithErrorForFrame;
WKPageDidReceiveTitleForFrameCallback didReceiveTitleForFrame;
diff --git a/WebKit2/UIProcess/API/qt/qwkpage.cpp b/WebKit2/UIProcess/API/qt/qwkpage.cpp
index 875f2d2..54a3f44 100644
--- a/WebKit2/UIProcess/API/qt/qwkpage.cpp
+++ b/WebKit2/UIProcess/API/qt/qwkpage.cpp
@@ -225,6 +225,7 @@ QWKPage::QWKPage(WKPageNamespaceRef namespaceRef)
qt_wk_didReceiveServerRedirectForProvisionalLoadForFrame,
qt_wk_didFailProvisionalLoadWithErrorForFrame,
qt_wk_didCommitLoadForFrame,
+ qt_wk_didFinishDocumentLoadForFrame,
qt_wk_didFinishLoadForFrame,
qt_wk_didFailLoadWithErrorForFrame,
qt_wk_didReceiveTitleForFrame,
diff --git a/WebKit2/UIProcess/WebLoaderClient.cpp b/WebKit2/UIProcess/WebLoaderClient.cpp
index aa6a7ac..a55bb35 100644
--- a/WebKit2/UIProcess/WebLoaderClient.cpp
+++ b/WebKit2/UIProcess/WebLoaderClient.cpp
@@ -67,6 +67,12 @@ void WebLoaderClient::didCommitLoadForFrame(WebPageProxy* page, WebFrameProxy* f
m_pageLoaderClient.didCommitLoadForFrame(toRef(page), toRef(frame), m_pageLoaderClient.clientInfo);
}
+void WebLoaderClient::didFinishDocumentLoadForFrame(WebPageProxy* page, WebFrameProxy* frame)
+{
+ if (m_pageLoaderClient.didFinishDocumentLoadForFrame)
+ m_pageLoaderClient.didFinishDocumentLoadForFrame(toRef(page), toRef(frame), m_pageLoaderClient.clientInfo);
+}
+
void WebLoaderClient::didFinishLoadForFrame(WebPageProxy* page, WebFrameProxy* frame)
{
if (m_pageLoaderClient.didFinishLoadForFrame)
diff --git a/WebKit2/UIProcess/WebLoaderClient.h b/WebKit2/UIProcess/WebLoaderClient.h
index a6d93fe..5d3fc79 100644
--- a/WebKit2/UIProcess/WebLoaderClient.h
+++ b/WebKit2/UIProcess/WebLoaderClient.h
@@ -43,6 +43,7 @@ public:
void didReceiveServerRedirectForProvisionalLoadForFrame(WebPageProxy*, WebFrameProxy*);
void didFailProvisionalLoadWithErrorForFrame(WebPageProxy*, WebFrameProxy*);
void didCommitLoadForFrame(WebPageProxy*, WebFrameProxy*);
+ void didFinishDocumentLoadForFrame(WebPageProxy*, WebFrameProxy*);
void didFinishLoadForFrame(WebPageProxy*, WebFrameProxy*);
void didFailLoadWithErrorForFrame(WebPageProxy*, WebFrameProxy*);
void didReceiveTitleForFrame(WebPageProxy*, WTF::StringImpl*, WebFrameProxy*);
diff --git a/WebKit2/UIProcess/WebPageProxy.cpp b/WebKit2/UIProcess/WebPageProxy.cpp
index 6d41c09..0beeab7 100644
--- a/WebKit2/UIProcess/WebPageProxy.cpp
+++ b/WebKit2/UIProcess/WebPageProxy.cpp
@@ -466,6 +466,13 @@ void WebPageProxy::didReceiveMessage(CoreIPC::Connection* connection, CoreIPC::M
didCommitLoadForFrame(process()->webFrame(frameID));
break;
}
+ case WebPageProxyMessage::DidFinishDocumentLoadForFrame: {
+ uint64_t frameID;
+ if (!arguments->decode(frameID))
+ return;
+ didFinishDocumentLoadForFrame(process()->webFrame(frameID));
+ break;
+ }
case WebPageProxyMessage::DidFinishLoadForFrame: {
uint64_t frameID;
if (!arguments->decode(frameID))
@@ -806,6 +813,11 @@ void WebPageProxy::didCommitLoadForFrame(WebFrameProxy* frame)
m_loaderClient.didCommitLoadForFrame(this, frame);
}
+void WebPageProxy::didFinishDocumentLoadForFrame(WebFrameProxy* frame)
+{
+ m_loaderClient.didFinishDocumentLoadForFrame(this, frame);
+}
+
void WebPageProxy::didFinishLoadForFrame(WebFrameProxy* frame)
{
frame->didFinishLoad();
diff --git a/WebKit2/UIProcess/WebPageProxy.h b/WebKit2/UIProcess/WebPageProxy.h
index 3b7c881..082c69c 100644
--- a/WebKit2/UIProcess/WebPageProxy.h
+++ b/WebKit2/UIProcess/WebPageProxy.h
@@ -186,6 +186,7 @@ private:
void didReceiveServerRedirectForProvisionalLoadForFrame(WebFrameProxy*);
void didFailProvisionalLoadForFrame(WebFrameProxy*);
void didCommitLoadForFrame(WebFrameProxy*);
+ void didFinishDocumentLoadForFrame(WebFrameProxy*);
void didFinishLoadForFrame(WebFrameProxy*);
void didFailLoadForFrame(WebFrameProxy*);
void didReceiveTitleForFrame(WebFrameProxy*, const WTF::String&);
diff --git a/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.h b/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.h
index 776eaed..a23f8cd 100644
--- a/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.h
+++ b/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.h
@@ -53,6 +53,7 @@ typedef void (*WKBundlePageDidStartProvisionalLoadForFrameCallback)(WKBundlePage
typedef void (*WKBundlePageDidReceiveServerRedirectForProvisionalLoadForFrameCallback)(WKBundlePageRef page, WKBundleFrameRef frame, const void *clientInfo);
typedef void (*WKBundlePageDidFailProvisionalLoadWithErrorForFrameCallback)(WKBundlePageRef page, WKBundleFrameRef frame, const void *clientInfo); // FIXME: Add WKErrorRef.
typedef void (*WKBundlePageDidCommitLoadForFrameCallback)(WKBundlePageRef page, WKBundleFrameRef frame, const void *clientInfo);
+typedef void (*WKBundlePageDidDocumentFinishLoadForFrameCallback)(WKBundlePageRef page, WKBundleFrameRef frame, const void *clientInfo);
typedef void (*WKBundlePageDidFinishLoadForFrameCallback)(WKBundlePageRef page, WKBundleFrameRef frame, const void *clientInfo);
typedef void (*WKBundlePageDidFailLoadWithErrorForFrameCallback)(WKBundlePageRef page, WKBundleFrameRef frame, const void *clientInfo); // FIXME: Add WKErrorRef.
typedef void (*WKBundlePageDidReceiveTitleForFrameCallback)(WKBundlePageRef page, WKStringRef title, WKBundleFrameRef frame, const void *clientInfo);
@@ -73,6 +74,7 @@ struct WKBundlePageLoaderClient {
WKBundlePageDidReceiveServerRedirectForProvisionalLoadForFrameCallback didReceiveServerRedirectForProvisionalLoadForFrame;
WKBundlePageDidFailProvisionalLoadWithErrorForFrameCallback didFailProvisionalLoadWithErrorForFrame;
WKBundlePageDidCommitLoadForFrameCallback didCommitLoadForFrame;
+ WKBundlePageDidFinishDocumentLoadForFrameCallback didFinishDocumentLoadForFrame;
WKBundlePageDidFinishLoadForFrameCallback didFinishLoadForFrame;
WKBundlePageDidFailLoadWithErrorForFrameCallback didFailLoadWithErrorForFrame;
WKBundlePageDidReceiveTitleForFrameCallback didReceiveTitleForFrame;
@@ -80,7 +82,6 @@ struct WKBundlePageLoaderClient {
WKBundlePageDidCancelClientRedirectForFrameCallback didCancelClientRedirectForFrame;
WKBundlePageWillPerformClientRedirectForFrameCallback willPerformClientRedirectForFrame;
WKBundlePageDidChangeLocationWithinPageForFrameCallback didChangeLocationWithinPageForFrame;
- WKBundlePageDidFinishDocumentLoadForFrameCallback didFinishDocumentLoadForFrame;
WKBundlePageDidHandleOnloadEventsForFrameCallback didHandleOnloadEventsForFrame;
WKBundlePageDidDisplayInsecureContentForFrameCallback didDisplayInsecureContentForFrame;
WKBundlePageDidRunInsecureContentForFrameCallback didRunInsecureContentForFrame;
diff --git a/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.cpp b/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.cpp
index 376cd6f..237499c 100644
--- a/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.cpp
+++ b/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.cpp
@@ -70,6 +70,12 @@ void InjectedBundlePageLoaderClient::didCommitLoadForFrame(WebPage* page, WebFra
m_client.didCommitLoadForFrame(toRef(page), toRef(frame), m_client.clientInfo);
}
+void InjectedBundlePageLoaderClient::didFinishDocumentLoadForFrame(WebPage* page, WebFrame* frame)
+{
+ if (m_client.didFinishDocumentLoadForFrame)
+ m_client.didFinishDocumentLoadForFrame(toRef(page), toRef(frame), m_client.clientInfo);
+}
+
void InjectedBundlePageLoaderClient::didFinishLoadForFrame(WebPage* page, WebFrame* frame)
{
if (m_client.didFinishLoadForFrame)
@@ -112,12 +118,6 @@ void InjectedBundlePageLoaderClient::didChangeLocationWithinPageForFrame(WebPage
m_client.didChangeLocationWithinPageForFrame(toRef(page), toRef(frame), m_client.clientInfo);
}
-void InjectedBundlePageLoaderClient::didFinishDocumentLoadForFrame(WebPage* page, WebFrame* frame)
-{
- if (m_client.didFinishDocumentLoadForFrame)
- m_client.didFinishDocumentLoadForFrame(toRef(page), toRef(frame), m_client.clientInfo);
-}
-
void InjectedBundlePageLoaderClient::didHandleOnloadEventsForFrame(WebPage* page, WebFrame* frame)
{
if (m_client.didHandleOnloadEventsForFrame)
diff --git a/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.h b/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.h
index 11e34af..00c7fc6 100644
--- a/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.h
+++ b/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.h
@@ -44,6 +44,7 @@ public:
void didReceiveServerRedirectForProvisionalLoadForFrame(WebPage*, WebFrame*);
void didFailProvisionalLoadWithErrorForFrame(WebPage*, WebFrame*);
void didCommitLoadForFrame(WebPage*, WebFrame*);
+ void didFinishDocumentLoadForFrame(WebPage*, WebFrame*);
void didFinishLoadForFrame(WebPage*, WebFrame*);
void didFailLoadWithErrorForFrame(WebPage*, WebFrame*);
void didReceiveTitleForFrame(WebPage*, const WTF::String&, WebFrame*);
@@ -51,7 +52,6 @@ public:
void didCancelClientRedirectForFrame(WebPage*, WebFrame*);
void willPerformClientRedirectForFrame(WebPage*, WebFrame*, const WTF::String& url, double delay, double date);
void didChangeLocationWithinPageForFrame(WebPage*, WebFrame*);
- void didFinishDocumentLoadForFrame(WebPage*, WebFrame*);
void didHandleOnloadEventsForFrame(WebPage*, WebFrame*);
void didDisplayInsecureContentForFrame(WebPage*, WebFrame*);
void didRunInsecureContentForFrame(WebPage*, WebFrame*);
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 24b01c4..b992126 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,18 @@
+2010-08-30 Alice Liu <alice.liu at apple.com>
+
+ Reviewed by Darin Adler.
+
+ Add missing parts of didFinishDocumentLoadForFrame
+ https://bugs.webkit.org/show_bug.cgi?id=44913
+
+ * MiniBrowser/mac/BrowserWindowController.m:
+ (didFinishDocumentLoadForFrame): Added
+ (-[BrowserWindowController awakeFromNib]): Updated struct
+ * WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp:
+ (WTR::InjectedBundlePage::InjectedBundlePage): Rearranged function ptr
+ * WebKitTestRunner/TestController.cpp:
+ (WTR::TestController::initialize): Updated struct
+
2010-08-30 Vangelis Kokkevis <vangelis at chromium.org>
Unreviewed: Add myself to the list of Committers.
diff --git a/WebKitTools/MiniBrowser/mac/BrowserWindowController.m b/WebKitTools/MiniBrowser/mac/BrowserWindowController.m
index 6422cca..0b4e170 100644
--- a/WebKitTools/MiniBrowser/mac/BrowserWindowController.m
+++ b/WebKitTools/MiniBrowser/mac/BrowserWindowController.m
@@ -172,6 +172,11 @@ static void didCommitLoadForFrame(WKPageRef page, WKFrameRef frame, const void *
[(BrowserWindowController *)clientInfo didCommitLoadForFrame:frame];
}
+static void didFinishDocumentLoadForFrame(WKPageRef page, WKFrameRef frame, const void *clientInfo)
+{
+ LOG(@"didFinishDocumentLoadForFrame");
+}
+
static void didFinishLoadForFrame(WKPageRef page, WKFrameRef frame, const void *clientInfo)
{
LOG(@"didFinishLoadForFrame");
@@ -379,6 +384,7 @@ static WKStringRef runJavaScriptPrompt(WKPageRef page, WKStringRef message, WKSt
didReceiveServerRedirectForProvisionalLoadForFrame,
didFailProvisionalLoadWithErrorForFrame,
didCommitLoadForFrame,
+ didFinishDocumentLoadForFrame,
didFinishLoadForFrame,
didFailLoadWithErrorForFrame,
didReceiveTitleForFrame,
diff --git a/WebKitTools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp b/WebKitTools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp
index 424f7ab..c7f9a84 100644
--- a/WebKitTools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp
+++ b/WebKitTools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp
@@ -100,6 +100,7 @@ InjectedBundlePage::InjectedBundlePage(WKBundlePageRef page)
didReceiveServerRedirectForProvisionalLoadForFrame,
didFailProvisionalLoadWithErrorForFrame,
didCommitLoadForFrame,
+ didFinishDocumentLoadForFrame,
didFinishLoadForFrame,
didFailLoadWithErrorForFrame,
didReceiveTitleForFrame,
@@ -107,7 +108,6 @@ InjectedBundlePage::InjectedBundlePage(WKBundlePageRef page)
didCancelClientRedirectForFrame,
willPerformClientRedirectForFrame,
didChangeLocationWithinPageForFrame,
- didFinishDocumentLoadForFrame,
didHandleOnloadEventsForFrame,
didDisplayInsecureContentForFrame,
didRunInsecureContentForFrame
diff --git a/WebKitTools/WebKitTestRunner/TestController.cpp b/WebKitTools/WebKitTestRunner/TestController.cpp
index 82e2e9b..32097a1 100644
--- a/WebKitTools/WebKitTestRunner/TestController.cpp
+++ b/WebKitTools/WebKitTestRunner/TestController.cpp
@@ -171,6 +171,7 @@ void TestController::initialize(int argc, const char* argv[])
0,
0,
0,
+ 0,
didFinishLoadForFrame,
0,
0,
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list