[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
kenneth at webkit.org
kenneth at webkit.org
Wed Dec 22 15:02:42 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit b2be6b5005ce33ebd11729a3594de44988c9f98d
Author: kenneth at webkit.org <kenneth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Oct 27 18:19:41 2010 +0000
2010-10-27 Kenneth Rohde Christiansen <kenneth at webkit.org>
Reviewed by Anders Carlsson.
Move contentsSizeChange from the UIClient into the PageClient and
and make it a private Qt-only API in the process.
Make WKPageContentsSizeChangedCallback be a private API
https://bugs.webkit.org/show_bug.cgi?id=48409
* UIProcess/API/C/WKPage.h:
* UIProcess/API/qt/qwkpage.cpp:
(QWKPagePrivate::didChangeContentsSize):
(QWKPage::QWKPage):
* UIProcess/API/qt/qwkpage_p.h:
* UIProcess/PageClient.h:
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::didChangeContentsSize):
* UIProcess/WebPageProxy.h:
* UIProcess/WebPageProxy.messages.in:
* UIProcess/WebUIClient.cpp:
* WebProcess/WebCoreSupport/WebChromeClient.cpp:
(WebKit::WebChromeClient::contentsSizeChanged):
2010-10-27 Kenneth Rohde Christiansen <kenneth at webkit.org>
Reviewed by Anders Carlsson.
Remove contentSizeChanged callbacks as it is no longer
part of the public UIClient.
Make WKPageContentsSizeChangedCallback be a private API
https://bugs.webkit.org/show_bug.cgi?id=48409
* MiniBrowser/mac/BrowserWindowController.m:
(-[BrowserWindowController awakeFromNib]):
* MiniBrowser/win/BrowserView.cpp:
(BrowserView::create):
* WebKitTestRunner/TestController.cpp:
(WTR::createOtherPage):
(WTR::TestController::initialize):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70676 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 59da550..bc2dda1 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,27 @@
+2010-10-27 Kenneth Rohde Christiansen <kenneth at webkit.org>
+
+ Reviewed by Anders Carlsson.
+
+ Move contentsSizeChange from the UIClient into the PageClient and
+ and make it a private Qt-only API in the process.
+
+ Make WKPageContentsSizeChangedCallback be a private API
+ https://bugs.webkit.org/show_bug.cgi?id=48409
+
+ * UIProcess/API/C/WKPage.h:
+ * UIProcess/API/qt/qwkpage.cpp:
+ (QWKPagePrivate::didChangeContentsSize):
+ (QWKPage::QWKPage):
+ * UIProcess/API/qt/qwkpage_p.h:
+ * UIProcess/PageClient.h:
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::didChangeContentsSize):
+ * UIProcess/WebPageProxy.h:
+ * UIProcess/WebPageProxy.messages.in:
+ * UIProcess/WebUIClient.cpp:
+ * WebProcess/WebCoreSupport/WebChromeClient.cpp:
+ (WebKit::WebChromeClient::contentsSizeChanged):
+
2010-10-26 Brian Weinstein <bweinstein at apple.com>
Reviewed by Adam Roben.
diff --git a/WebKit2/UIProcess/API/C/WKPage.h b/WebKit2/UIProcess/API/C/WKPage.h
index 46a8ef9..b0fe943 100644
--- a/WebKit2/UIProcess/API/C/WKPage.h
+++ b/WebKit2/UIProcess/API/C/WKPage.h
@@ -141,7 +141,6 @@ typedef bool (*WKPageRunJavaScriptConfirmCallback)(WKPageRef page, WKStringRef m
typedef WKStringRef (*WKPageRunJavaScriptPromptCallback)(WKPageRef page, WKStringRef message, WKStringRef defaultValue, WKFrameRef frame, const void *clientInfo);
typedef void (*WKPageSetStatusTextCallback)(WKPageRef page, WKStringRef text, const void *clientInfo);
typedef void (*WKPageMouseDidMoveOverElementCallback)(WKPageRef page, WKEventModifiers modifiers, WKTypeRef userData, const void *clientInfo);
-typedef void (*WKPageContentsSizeChangedCallback)(WKPageRef page, int width, int height, WKFrameRef frame, const void *clientInfo);
typedef void (*WKPageDidNotHandleKeyEventCallback)(WKPageRef page, WKNativeEventPtr event, const void *clientInfo);
typedef WKRect (*WKPageGetWindowFrameCallback)(WKPageRef page, const void *clientInfo);
typedef void (*WKPageSetWindowFrameCallback)(WKPageRef page, WKRect frame, const void *clientInfo);
@@ -161,7 +160,6 @@ struct WKPageUIClient {
WKPageRunJavaScriptPromptCallback runJavaScriptPrompt;
WKPageSetStatusTextCallback setStatusText;
WKPageMouseDidMoveOverElementCallback mouseDidMoveOverElement;
- WKPageContentsSizeChangedCallback contentsSizeChanged;
WKPageDidNotHandleKeyEventCallback didNotHandleKeyEvent;
WKPageGetWindowFrameCallback getWindowFrame;
WKPageSetWindowFrameCallback setWindowFrame;
diff --git a/WebKit2/UIProcess/API/qt/qwkpage.cpp b/WebKit2/UIProcess/API/qt/qwkpage.cpp
index 9a48658..5027597 100644
--- a/WebKit2/UIProcess/API/qt/qwkpage.cpp
+++ b/WebKit2/UIProcess/API/qt/qwkpage.cpp
@@ -97,6 +97,11 @@ void QWKPagePrivate::setViewportArguments(const ViewportArguments& args)
emit q->viewportChangeRequested();
}
+void QWKPagePrivate::didChangeContentsSize(const IntSize& newSize)
+{
+ emit q->contentsSizeChanged(QSize(newSize));
+}
+
void QWKPagePrivate::toolTipChanged(const String&, const String& newTooltip)
{
emit q->statusBarMessage(QString(newTooltip));
@@ -314,7 +319,6 @@ QWKPage::QWKPage(WKPageNamespaceRef namespaceRef)
0, /* runJavaScriptPrompt */
0, /* setStatusText */
0, /* mouseDidMoveOverElement */
- 0, /* contentsSizeChanged */
0, /* didNotHandleKeyEvent */
0, /* getWindowFrame */
0, /* setWindowFrame */
diff --git a/WebKit2/UIProcess/API/qt/qwkpage_p.h b/WebKit2/UIProcess/API/qt/qwkpage_p.h
index fb8ad0d..00ae9bf 100644
--- a/WebKit2/UIProcess/API/qt/qwkpage_p.h
+++ b/WebKit2/UIProcess/API/qt/qwkpage_p.h
@@ -50,6 +50,7 @@ public:
#endif // USE(ACCELERATED_COMPOSITING)
virtual void processDidCrash() { }
virtual void didRelaunchProcess() { }
+ virtual void didChangeContentsSize(const WebCore::IntSize&);
virtual void setCursor(const WebCore::Cursor&);
virtual void setViewportArguments(const WebCore::ViewportArguments&);
virtual void takeFocus(bool direction) { }
diff --git a/WebKit2/UIProcess/PageClient.h b/WebKit2/UIProcess/PageClient.h
index 3782efd..5c5c726 100644
--- a/WebKit2/UIProcess/PageClient.h
+++ b/WebKit2/UIProcess/PageClient.h
@@ -52,6 +52,10 @@ public:
virtual void takeFocus(bool direction) = 0;
virtual void toolTipChanged(const String&, const String&) = 0;
+#if PLATFORM(QT)
+ virtual void didChangeContentsSize(const WebCore::IntSize&) = 0;
+#endif
+
virtual void setCursor(const WebCore::Cursor&) = 0;
virtual void setViewportArguments(const WebCore::ViewportArguments&) = 0;
diff --git a/WebKit2/UIProcess/WebPageProxy.cpp b/WebKit2/UIProcess/WebPageProxy.cpp
index da24051..50fa864 100644
--- a/WebKit2/UIProcess/WebPageProxy.cpp
+++ b/WebKit2/UIProcess/WebPageProxy.cpp
@@ -917,11 +917,6 @@ void WebPageProxy::mouseDidMoveOverElement(uint32_t opaqueModifiers, CoreIPC::Ar
m_uiClient.mouseDidMoveOverElement(this, modifiers, userData.get());
}
-void WebPageProxy::contentsSizeChanged(uint64_t frameID, const WebCore::IntSize& size)
-{
- m_uiClient.contentsSizeChanged(this, size, process()->webFrame(frameID));
-}
-
void WebPageProxy::setWindowFrame(const FloatRect& newWindowFrame)
{
m_uiClient.setWindowFrame(this, m_pageClient->convertToDeviceSpace(newWindowFrame));
@@ -952,6 +947,13 @@ void WebPageProxy::pageDidScroll()
m_uiClient.pageDidScroll(this);
}
+#if PLATFORM(QT)
+void WebPageProxy::didChangeContentsSize(const WebCore::IntSize& size)
+{
+ m_pageClient->didChangeContentsSize(size);
+}
+#endif
+
void WebPageProxy::didDraw()
{
m_uiClient.didDraw(this);
diff --git a/WebKit2/UIProcess/WebPageProxy.h b/WebKit2/UIProcess/WebPageProxy.h
index 9da2e40..444fa07 100644
--- a/WebKit2/UIProcess/WebPageProxy.h
+++ b/WebKit2/UIProcess/WebPageProxy.h
@@ -270,13 +270,15 @@ private:
void runJavaScriptPrompt(uint64_t frameID, const String&, const String&, String& result);
void setStatusText(const String&);
void mouseDidMoveOverElement(uint32_t modifiers, CoreIPC::ArgumentDecoder*);
- void contentsSizeChanged(uint64_t frameID, const WebCore::IntSize&);
void setWindowFrame(const WebCore::FloatRect&);
void getWindowFrame(WebCore::FloatRect&);
void canRunBeforeUnloadConfirmPanel(bool& canRun);
void runBeforeUnloadConfirmPanel(const String& message, uint64_t frameID, bool& shouldClose);
void didChangeViewportData(const WebCore::ViewportArguments&);
void pageDidScroll();
+#if PLATFORM(QT)
+ void didChangeContentsSize(const WebCore::IntSize&);
+#endif
// Back/Forward list management
void backForwardAddItem(uint64_t itemID);
diff --git a/WebKit2/UIProcess/WebPageProxy.messages.in b/WebKit2/UIProcess/WebPageProxy.messages.in
index 9d3090d..388e270 100644
--- a/WebKit2/UIProcess/WebPageProxy.messages.in
+++ b/WebKit2/UIProcess/WebPageProxy.messages.in
@@ -29,7 +29,6 @@ messages -> WebPageProxy {
RunJavaScriptConfirm(uint64_t frameID, WTF::String message) -> (bool result)
RunJavaScriptPrompt(uint64_t frameID, WTF::String message, WTF::String defaultValue) -> (WTF::String result)
MouseDidMoveOverElement(uint32_t modifiers, WebKit::InjectedBundleUserMessageEncoder userData);
- ContentsSizeChanged(uint64_t frameID, WebCore::IntSize newSize)
DidChangeViewportData(WebCore::ViewportArguments arguments)
DidReceiveEvent(uint32_t type, bool handled)
DidValidateMenuItem(WTF::String commandName, bool isEnabled, int32_t state)
@@ -42,6 +41,9 @@ messages -> WebPageProxy {
CanRunBeforeUnloadConfirmPanel() -> (bool canRun)
RunBeforeUnloadConfirmPanel(WTF::String message, uint64_t frameID) -> (bool shouldClose)
PageDidScroll()
+#if PLATFORM(QT)
+ DidChangeContentsSize(WebCore::IntSize newSize)
+#endif
# Policy messages.
DecidePolicyForMIMEType(uint64_t frameID, WTF::String MIMEType, WTF::String url, uint64_t listenerID)
diff --git a/WebKit2/UIProcess/WebUIClient.cpp b/WebKit2/UIProcess/WebUIClient.cpp
index c098dff..4d7080b 100644
--- a/WebKit2/UIProcess/WebUIClient.cpp
+++ b/WebKit2/UIProcess/WebUIClient.cpp
@@ -141,15 +141,6 @@ void WebUIClient::mouseDidMoveOverElement(WebPageProxy* page, WebEvent::Modifier
m_pageUIClient.mouseDidMoveOverElement(toAPI(page), toAPI(modifiers), toAPI(userData), m_pageUIClient.clientInfo);
}
-
-void WebUIClient::contentsSizeChanged(WebPageProxy* page, const IntSize& size, WebFrameProxy* frame)
-{
- if (!m_pageUIClient.contentsSizeChanged)
- return;
-
- m_pageUIClient.contentsSizeChanged(toAPI(page), size.width(), size.height(), toAPI(frame), m_pageUIClient.clientInfo);
-}
-
void WebUIClient::didNotHandleKeyEvent(WebPageProxy* page, const NativeWebKeyboardEvent& event)
{
if (!m_pageUIClient.didNotHandleKeyEvent)
diff --git a/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp b/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp
index 9d5b00a..5fccdac 100644
--- a/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp
+++ b/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp
@@ -355,9 +355,14 @@ PlatformPageClient WebChromeClient::platformPageClient() const
void WebChromeClient::contentsSizeChanged(Frame* frame, const IntSize& size) const
{
+#if PLATFORM(QT)
WebFrame* webFrame = static_cast<WebFrameLoaderClient*>(frame->loader()->client())->webFrame();
- WebProcess::shared().connection()->send(Messages::WebPageProxy::ContentsSizeChanged(webFrame->frameID(), size), m_page->pageID());
+ if (!m_page->mainFrame() || m_page->mainFrame() != webFrame)
+ return;
+
+ WebProcess::shared().connection()->send(Messages::WebPageProxy::DidChangeContentsSize(size), m_page->pageID());
+#endif
}
void WebChromeClient::scrollRectIntoView(const IntRect&, const ScrollView*) const
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index ca93791..9ed3a4d 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,21 @@
+2010-10-27 Kenneth Rohde Christiansen <kenneth at webkit.org>
+
+ Reviewed by Anders Carlsson.
+
+ Remove contentSizeChanged callbacks as it is no longer
+ part of the public UIClient.
+
+ Make WKPageContentsSizeChangedCallback be a private API
+ https://bugs.webkit.org/show_bug.cgi?id=48409
+
+ * MiniBrowser/mac/BrowserWindowController.m:
+ (-[BrowserWindowController awakeFromNib]):
+ * MiniBrowser/win/BrowserView.cpp:
+ (BrowserView::create):
+ * WebKitTestRunner/TestController.cpp:
+ (WTR::createOtherPage):
+ (WTR::TestController::initialize):
+
2010-10-27 Gabor Rapcsanyi <rgabor at inf.u-szeged.hu>
Reviewed by Ojan Vafai.
diff --git a/WebKitTools/MiniBrowser/mac/BrowserWindowController.m b/WebKitTools/MiniBrowser/mac/BrowserWindowController.m
index 4b7c81b..cb57224 100644
--- a/WebKitTools/MiniBrowser/mac/BrowserWindowController.m
+++ b/WebKitTools/MiniBrowser/mac/BrowserWindowController.m
@@ -489,11 +489,6 @@ static void mouseDidMoveOverElement(WKPageRef page, WKEventModifiers modifiers,
LOG(@"mouseDidMoveOverElement");
}
-static void contentsSizeChanged(WKPageRef page, int width, int height, WKFrameRef frame, const void *clientInfo)
-{
- LOG(@"contentsSizeChanged");
-}
-
static WKRect getWindowFrame(WKPageRef page, const void* clientInfo)
{
NSRect rect = [[(BrowserWindowController *)clientInfo window] frame];
@@ -589,7 +584,6 @@ static bool runBeforeUnloadConfirmPanel(WKPageRef page, WKStringRef message, WKF
runJavaScriptPrompt,
setStatusText,
mouseDidMoveOverElement,
- contentsSizeChanged,
0, /* didNotHandleKeyEvent */
getWindowFrame,
setWindowFrame,
diff --git a/WebKitTools/MiniBrowser/win/BrowserView.cpp b/WebKitTools/MiniBrowser/win/BrowserView.cpp
index 769b9b2..c6d14a6 100644
--- a/WebKitTools/MiniBrowser/win/BrowserView.cpp
+++ b/WebKitTools/MiniBrowser/win/BrowserView.cpp
@@ -78,10 +78,6 @@ static void mouseDidMoveOverElement(WKPageRef page, WKEventModifiers modifiers,
{
}
-static void contentsSizeChanged(WKPageRef page, int width, int height, WKFrameRef frame, const void *clientInfo)
-{
-}
-
void BrowserView::create(RECT webViewRect, BrowserWindow* parentWindow)
{
assert(!m_webView);
@@ -109,7 +105,6 @@ void BrowserView::create(RECT webViewRect, BrowserWindow* parentWindow)
runJavaScriptPrompt,
setStatusText,
mouseDidMoveOverElement,
- contentsSizeChanged,
0 /* didNotHandleKeyEvent */
};
diff --git a/WebKitTools/WebKitTestRunner/TestController.cpp b/WebKitTools/WebKitTestRunner/TestController.cpp
index ef0707d..69c0265 100644
--- a/WebKitTools/WebKitTestRunner/TestController.cpp
+++ b/WebKitTools/WebKitTestRunner/TestController.cpp
@@ -116,7 +116,6 @@ static WKPageRef createOtherPage(WKPageRef oldPage, WKDictionaryRef, WKEventModi
0, // runJavaScriptPrompt
0, // setStatusText
0, // mouseDidMoveOverElement
- 0, // contentsSizeChanged
0, // didNotHandleKeyEvent
getWindowFrameOtherPage,
setWindowFrameOtherPage,
@@ -202,7 +201,6 @@ void TestController::initialize(int argc, const char* argv[])
0, // runJavaScriptPrompt
0, // setStatusText
0, // mouseDidMoveOverElement
- 0, // contentsSizeChanged
0, // didNotHandleKeyEvent
getWindowFrameMainPage,
setWindowFrameMainPage,
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list