[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
commit-queue at webkit.org
commit-queue at webkit.org
Wed Dec 22 12:09:36 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 7276ab7a3e61d5b3f53897250e76196173cfab65
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Aug 16 13:28:06 2010 +0000
2010-08-16 Sheriff Bot <webkit.review.bot at gmail.com>
Unreviewed, rolling out r65419.
http://trac.webkit.org/changeset/65419
https://bugs.webkit.org/show_bug.cgi?id=44053
Broke the Windows build (Requested by bbandix on #webkit).
* Shared/CoreIPCSupport/WebPageProxyMessageKinds.h:
(WebPageProxyMessage::):
* UIProcess/API/C/WKPage.h:
* UIProcess/API/qt/qwkpage.cpp:
(QWKPage::QWKPage):
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::didReceiveMessage):
* UIProcess/WebPageProxy.h:
* UIProcess/WebUIClient.cpp:
* UIProcess/WebUIClient.h:
* WebProcess/WebCoreSupport/WebChromeClient.cpp:
(WebKit::WebChromeClient::contentsSizeChanged):
2010-08-16 Sheriff Bot <webkit.review.bot at gmail.com>
Unreviewed, rolling out r65419.
http://trac.webkit.org/changeset/65419
https://bugs.webkit.org/show_bug.cgi?id=44053
Broke the Windows build (Requested by bbandix on #webkit).
* MiniBrowser/mac/BrowserWindowController.m:
(-[BrowserWindowController awakeFromNib]):
* MiniBrowser/win/BrowserView.cpp:
(BrowserView::create):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65421 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index aab3034..f08689c 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,24 @@
+2010-08-16 Sheriff Bot <webkit.review.bot at gmail.com>
+
+ Unreviewed, rolling out r65419.
+ http://trac.webkit.org/changeset/65419
+ https://bugs.webkit.org/show_bug.cgi?id=44053
+
+ Broke the Windows build (Requested by bbandix on #webkit).
+
+ * Shared/CoreIPCSupport/WebPageProxyMessageKinds.h:
+ (WebPageProxyMessage::):
+ * UIProcess/API/C/WKPage.h:
+ * UIProcess/API/qt/qwkpage.cpp:
+ (QWKPage::QWKPage):
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::didReceiveMessage):
+ * UIProcess/WebPageProxy.h:
+ * UIProcess/WebUIClient.cpp:
+ * UIProcess/WebUIClient.h:
+ * WebProcess/WebCoreSupport/WebChromeClient.cpp:
+ (WebKit::WebChromeClient::contentsSizeChanged):
+
2010-08-16 Balazs Kelemen <kb at inf.u-szeged.hu>
Reviewed by Kenneth Rohde Christiansen.
diff --git a/WebKit2/Shared/CoreIPCSupport/WebPageProxyMessageKinds.h b/WebKit2/Shared/CoreIPCSupport/WebPageProxyMessageKinds.h
index b552993..591249f 100644
--- a/WebKit2/Shared/CoreIPCSupport/WebPageProxyMessageKinds.h
+++ b/WebKit2/Shared/CoreIPCSupport/WebPageProxyMessageKinds.h
@@ -38,9 +38,8 @@ enum Kind {
RunJavaScriptAlert,
RunJavaScriptConfirm,
RunJavaScriptPrompt,
-
+
ClosePage,
- ContentsSizeChanged,
DecidePolicyForMIMEType,
DecidePolicyForNavigationAction,
DecidePolicyForNewWindowAction,
diff --git a/WebKit2/UIProcess/API/C/WKPage.h b/WebKit2/UIProcess/API/C/WKPage.h
index 072ad61..b4d7b21 100644
--- a/WebKit2/UIProcess/API/C/WKPage.h
+++ b/WebKit2/UIProcess/API/C/WKPage.h
@@ -130,7 +130,6 @@ typedef void (*WKPageCloseCallback)(WKPageRef page, const void *clientInfo);
typedef void (*WKPageRunJavaScriptAlertCallback)(WKPageRef page, WKStringRef alertText, WKFrameRef frame, const void *clientInfo);
typedef bool (*WKPageRunJavaScriptConfirmCallback)(WKPageRef page, WKStringRef message, WKFrameRef frame, const void *clientInfo);
typedef WKStringRef (*WKPageRunJavaScriptPromptCallback)(WKPageRef page, WKStringRef message, WKStringRef defaultValue, WKFrameRef frame, const void *clientInfo);
-typedef void (*WKPageContentsSizeChangedCallback)(WKPageRef page, int width, int height, WKFrameRef frame, const void *clientInfo);
struct WKPageUIClient {
int version;
@@ -141,7 +140,6 @@ struct WKPageUIClient {
WKPageRunJavaScriptAlertCallback runJavaScriptAlert;
WKPageRunJavaScriptConfirmCallback runJavaScriptConfirm;
WKPageRunJavaScriptPromptCallback runJavaScriptPrompt;
- WKPageContentsSizeChangedCallback contentsSizeChanged;
};
typedef struct WKPageUIClient WKPageUIClient;
diff --git a/WebKit2/UIProcess/API/qt/qwkpage.cpp b/WebKit2/UIProcess/API/qt/qwkpage.cpp
index b6d2916..7052f57 100644
--- a/WebKit2/UIProcess/API/qt/qwkpage.cpp
+++ b/WebKit2/UIProcess/API/qt/qwkpage.cpp
@@ -227,8 +227,7 @@ QWKPage::QWKPage(WKPageNamespaceRef namespaceRef)
qt_wk_close,
qt_wk_runJavaScriptAlert,
0, /* runJavaScriptConfirm */
- 0, /* runJavaScriptPrompt */
- 0 /* contentsSizeChanged */
+ 0 /* runJavaScriptPrompt */
};
WKPageSetPageUIClient(pageRef(), &uiClient);
}
diff --git a/WebKit2/UIProcess/WebPageProxy.cpp b/WebKit2/UIProcess/WebPageProxy.cpp
index 5f49a92..d5d9878 100644
--- a/WebKit2/UIProcess/WebPageProxy.cpp
+++ b/WebKit2/UIProcess/WebPageProxy.cpp
@@ -605,14 +605,6 @@ void WebPageProxy::didReceiveMessage(CoreIPC::Connection* connection, CoreIPC::M
goToItemInBackForwardList(process()->webBackForwardItem(itemID));
break;
}
- case WebPageProxyMessage::ContentsSizeChanged: {
- IntSize size;
- uint64_t frameID;
- if (!arguments->decode(CoreIPC::Out(frameID, size)))
- return;
- contentsSizeChanged(webFrame(frameID), size);
- break;
- }
default:
ASSERT_NOT_REACHED();
break;
@@ -884,11 +876,6 @@ String WebPageProxy::runJavaScriptPrompt(WebFrameProxy* frame, const String& mes
return m_uiClient.runJavaScriptPrompt(this, message, defaultValue, frame);
}
-void WebPageProxy::contentsSizeChanged(WebFrameProxy* frame, const WebCore::IntSize& size)
-{
- m_uiClient.contentsSizeChanged(this, size, frame);
-}
-
// BackForwardList
void WebPageProxy::addItemToBackForwardList(WebBackForwardListItem* item)
diff --git a/WebKit2/UIProcess/WebPageProxy.h b/WebKit2/UIProcess/WebPageProxy.h
index d281688..5eb483b 100644
--- a/WebKit2/UIProcess/WebPageProxy.h
+++ b/WebKit2/UIProcess/WebPageProxy.h
@@ -200,7 +200,6 @@ private:
void runJavaScriptAlert(WebFrameProxy*, const WTF::String&);
bool runJavaScriptConfirm(WebFrameProxy* frame, const WTF::String&);
WTF::String runJavaScriptPrompt(WebFrameProxy* frame, const WTF::String&, const WTF::String&);
- void contentsSizeChanged(WebFrameProxy*, const WebCore::IntSize&);
void addItemToBackForwardList(WebBackForwardListItem*);
void goToItemInBackForwardList(WebBackForwardListItem*);
diff --git a/WebKit2/UIProcess/WebUIClient.cpp b/WebKit2/UIProcess/WebUIClient.cpp
index b22e69c..8c3942d 100644
--- a/WebKit2/UIProcess/WebUIClient.cpp
+++ b/WebKit2/UIProcess/WebUIClient.cpp
@@ -27,7 +27,6 @@
#include "WKAPICast.h"
#include "WebPageProxy.h"
-#include <WebCore/IntSize.h>
#include <WebCore/PlatformString.h>
#include <string.h>
@@ -103,12 +102,4 @@ String WebUIClient::runJavaScriptPrompt(WebPageProxy* page, const String& messag
return result;
}
-void WebUIClient::contentsSizeChanged(WebPageProxy* page, const IntSize& size, WebFrameProxy* frame)
-{
- if (!m_pageUIClient.contentsSizeChanged)
- return;
-
- m_pageUIClient.contentsSizeChanged(toRef(page), size.width(), size.height(), toRef(frame), m_pageUIClient.clientInfo);
-}
-
} // namespace WebKit
diff --git a/WebKit2/UIProcess/WebUIClient.h b/WebKit2/UIProcess/WebUIClient.h
index 2957ca8..4f8ed8f 100644
--- a/WebKit2/UIProcess/WebUIClient.h
+++ b/WebKit2/UIProcess/WebUIClient.h
@@ -30,11 +30,6 @@
#include <wtf/Forward.h>
#include <wtf/PassRefPtr.h>
-namespace WebCore {
-class IntSize;
-class String;
-}
-
namespace WebKit {
class WebFrameProxy;
@@ -51,7 +46,6 @@ public:
void runJavaScriptAlert(WebPageProxy*, const WTF::String&, WebFrameProxy*);
bool runJavaScriptConfirm(WebPageProxy*, const WTF::String&, WebFrameProxy*);
WTF::String runJavaScriptPrompt(WebPageProxy*, const WTF::String&, const WTF::String&, WebFrameProxy*);
- void contentsSizeChanged(WebPageProxy*, const WebCore::IntSize&, WebFrameProxy*);
private:
WKPageUIClient m_pageUIClient;
diff --git a/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp b/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp
index 6c22c62..53b47c9 100644
--- a/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp
+++ b/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp
@@ -345,11 +345,9 @@ PlatformPageClient WebChromeClient::platformPageClient() const
return 0;
}
-void WebChromeClient::contentsSizeChanged(Frame* frame, const IntSize& size) const
+void WebChromeClient::contentsSizeChanged(Frame*, const IntSize&) const
{
- WebFrame* webFrame = static_cast<WebFrameLoaderClient*>(frame->loader()->client())->webFrame();
- WebProcess::shared().connection()->send(WebPageProxyMessage::ContentsSizeChanged, m_page->pageID(),
- CoreIPC::In(webFrame->frameID(), size));
+ notImplemented();
}
void WebChromeClient::scrollRectIntoView(const IntRect&, const ScrollView*) const
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 4fc8dc9..357b0ba 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,16 @@
+2010-08-16 Sheriff Bot <webkit.review.bot at gmail.com>
+
+ Unreviewed, rolling out r65419.
+ http://trac.webkit.org/changeset/65419
+ https://bugs.webkit.org/show_bug.cgi?id=44053
+
+ Broke the Windows build (Requested by bbandix on #webkit).
+
+ * MiniBrowser/mac/BrowserWindowController.m:
+ (-[BrowserWindowController awakeFromNib]):
+ * MiniBrowser/win/BrowserView.cpp:
+ (BrowserView::create):
+
2010-08-16 Balazs Kelemen <kb at inf.u-szeged.hu>
Reviewed by Kenneth Rohde Christiansen.
diff --git a/WebKitTools/MiniBrowser/mac/BrowserWindowController.m b/WebKitTools/MiniBrowser/mac/BrowserWindowController.m
index 9842448..9a987d2 100644
--- a/WebKitTools/MiniBrowser/mac/BrowserWindowController.m
+++ b/WebKitTools/MiniBrowser/mac/BrowserWindowController.m
@@ -411,8 +411,7 @@ static WKStringRef runJavaScriptPrompt(WKPageRef page, WKStringRef message, WKSt
closePage,
runJavaScriptAlert,
runJavaScriptConfirm,
- runJavaScriptPrompt,
- 0 /* contentsSizeChanged */
+ runJavaScriptPrompt
};
WKPageSetPageUIClient(_webView.pageRef, &uiClient);
}
diff --git a/WebKitTools/MiniBrowser/win/BrowserView.cpp b/WebKitTools/MiniBrowser/win/BrowserView.cpp
index ee67a08..49e46bf 100644
--- a/WebKitTools/MiniBrowser/win/BrowserView.cpp
+++ b/WebKitTools/MiniBrowser/win/BrowserView.cpp
@@ -83,8 +83,7 @@ void BrowserView::create(RECT webViewRect, BrowserWindow* parentWindow)
createNewPage,
showPage,
closePage,
- runJavaScriptAlert,
- 0 /* contentsSizeChanged */
+ runJavaScriptAlert
};
WKPageSetPageUIClient(WKViewGetPage(m_webView), &uiClient);
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list