[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:49 UTC 2011
The following commit has been merged in the webkit-1.3 branch:
commit 87a20681b336f0debc13177347054f288fb67ab4
Author: andersca at apple.com <andersca at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Jan 11 02:57:12 2011 +0000
2011-01-10 Anders Carlsson <andersca at apple.com>
Reviewed by Sam Weinig.
Remove size parameter to WebPageProxy::initializeWebPage
https://bugs.webkit.org/show_bug.cgi?id=52188
* UIProcess/API/mac/WKView.mm:
(-[WKView initWithFrame:contextRef:pageGroupRef:]):
* UIProcess/API/qt/qwkpage.cpp:
(QWKPagePrivate::init):
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::initializeWebPage):
* UIProcess/WebPageProxy.h:
* UIProcess/win/WebView.cpp:
(WebKit::WebView::WebView):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75468 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 202864d..8f380f3 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,5 +1,22 @@
2011-01-10 Anders Carlsson <andersca at apple.com>
+ Reviewed by Sam Weinig.
+
+ Remove size parameter to WebPageProxy::initializeWebPage
+ https://bugs.webkit.org/show_bug.cgi?id=52188
+
+ * UIProcess/API/mac/WKView.mm:
+ (-[WKView initWithFrame:contextRef:pageGroupRef:]):
+ * UIProcess/API/qt/qwkpage.cpp:
+ (QWKPagePrivate::init):
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::initializeWebPage):
+ * UIProcess/WebPageProxy.h:
+ * UIProcess/win/WebView.cpp:
+ (WebKit::WebView::WebView):
+
+2011-01-10 Anders Carlsson <andersca at apple.com>
+
Didn't mean to land this.
* UIProcess/WebPageProxy.cpp:
diff --git a/WebKit2/UIProcess/API/mac/WKView.mm b/WebKit2/UIProcess/API/mac/WKView.mm
index a8b3aad..5322d7e 100644
--- a/WebKit2/UIProcess/API/mac/WKView.mm
+++ b/WebKit2/UIProcess/API/mac/WKView.mm
@@ -166,7 +166,7 @@ typedef HashMap<String, ValidationVector> ValidationMap;
_data->_pageClient = PageClientImpl::create(self);
_data->_page = toImpl(contextRef)->createWebPage(_data->_pageClient.get(), toImpl(pageGroupRef));
- _data->_page->initializeWebPage(IntSize(frame.size));
+ _data->_page->initializeWebPage();
WebContext::statistics().wkViewCount++;
diff --git a/WebKit2/UIProcess/API/qt/qwkpage.cpp b/WebKit2/UIProcess/API/qt/qwkpage.cpp
index c116256..db4adbb 100644
--- a/WebKit2/UIProcess/API/qt/qwkpage.cpp
+++ b/WebKit2/UIProcess/API/qt/qwkpage.cpp
@@ -99,7 +99,7 @@ QWKPagePrivate::~QWKPagePrivate()
void QWKPagePrivate::init(const QSize& viewportSize, PassOwnPtr<DrawingAreaProxy> proxy)
{
page->setDrawingArea(proxy);
- page->initializeWebPage(IntSize(viewportSize));
+ page->initializeWebPage();
}
void QWKPagePrivate::setCursor(const WebCore::Cursor& cursor)
diff --git a/WebKit2/UIProcess/WebPageProxy.cpp b/WebKit2/UIProcess/WebPageProxy.cpp
index 07b04e4..d029b5e 100644
--- a/WebKit2/UIProcess/WebPageProxy.cpp
+++ b/WebKit2/UIProcess/WebPageProxy.cpp
@@ -212,7 +212,7 @@ void WebPageProxy::relaunch()
m_pageClient->didRelaunchProcess();
}
-void WebPageProxy::initializeWebPage(const IntSize& size)
+void WebPageProxy::initializeWebPage()
{
if (!isValid()) {
relaunch();
diff --git a/WebKit2/UIProcess/WebPageProxy.h b/WebKit2/UIProcess/WebPageProxy.h
index dc1b2f2..622d991 100644
--- a/WebKit2/UIProcess/WebPageProxy.h
+++ b/WebKit2/UIProcess/WebPageProxy.h
@@ -134,7 +134,7 @@ public:
void initializeUIClient(const WKPageUIClient*);
void relaunch();
- void initializeWebPage(const WebCore::IntSize&);
+ void initializeWebPage();
void reinitializeWebPage(const WebCore::IntSize&);
void close();
diff --git a/WebKit2/UIProcess/win/WebView.cpp b/WebKit2/UIProcess/win/WebView.cpp
index ca5e4b6..c22d54d 100644
--- a/WebKit2/UIProcess/win/WebView.cpp
+++ b/WebKit2/UIProcess/win/WebView.cpp
@@ -241,7 +241,7 @@ WebView::WebView(RECT rect, WebContext* context, WebPageGroup* pageGroup, HWND p
rect.top, rect.left, rect.right - rect.left, rect.bottom - rect.top, parentWindow ? parentWindow : HWND_MESSAGE, 0, instanceHandle(), this);
ASSERT(::IsWindow(m_window));
- m_page->initializeWebPage(IntRect(rect).size());
+ m_page->initializeWebPage();
::ShowWindow(m_window, SW_SHOW);
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list