[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198
andersca at apple.com
andersca at apple.com
Sun Feb 20 22:45:44 UTC 2011
The following commit has been merged in the webkit-1.3 branch:
commit 8d7653d73dd50672cc5051dd79f46df7ca8356ff
Author: andersca at apple.com <andersca at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Jan 11 02:50:41 2011 +0000
Didn't mean to land this.
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::initializeWebPage):
* UIProcess/WebPageProxy.h:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75466 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 58309ff..202864d 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,5 +1,13 @@
2011-01-10 Anders Carlsson <andersca at apple.com>
+ Didn't mean to land this.
+
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::initializeWebPage):
+ * UIProcess/WebPageProxy.h:
+
+2011-01-10 Anders Carlsson <andersca at apple.com>
+
Reviewed by Sam Weinig.
WebPageProxy::creationParameters no longer needs to take a size
diff --git a/WebKit2/UIProcess/WebPageProxy.cpp b/WebKit2/UIProcess/WebPageProxy.cpp
index d029b5e..07b04e4 100644
--- a/WebKit2/UIProcess/WebPageProxy.cpp
+++ b/WebKit2/UIProcess/WebPageProxy.cpp
@@ -212,7 +212,7 @@ void WebPageProxy::relaunch()
m_pageClient->didRelaunchProcess();
}
-void WebPageProxy::initializeWebPage()
+void WebPageProxy::initializeWebPage(const IntSize& size)
{
if (!isValid()) {
relaunch();
diff --git a/WebKit2/UIProcess/WebPageProxy.h b/WebKit2/UIProcess/WebPageProxy.h
index 622d991..dc1b2f2 100644
--- a/WebKit2/UIProcess/WebPageProxy.h
+++ b/WebKit2/UIProcess/WebPageProxy.h
@@ -134,7 +134,7 @@ public:
void initializeUIClient(const WKPageUIClient*);
void relaunch();
- void initializeWebPage();
+ void initializeWebPage(const WebCore::IntSize&);
void reinitializeWebPage(const WebCore::IntSize&);
void close();
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list