Diff
Modified: trunk/Source/WebKit2/ChangeLog (96412 => 96413)
--- trunk/Source/WebKit2/ChangeLog 2011-09-30 19:05:32 UTC (rev 96412)
+++ trunk/Source/WebKit2/ChangeLog 2011-09-30 19:11:39 UTC (rev 96413)
@@ -1,3 +1,19 @@
+2011-09-30 Anders Carlsson <ander...@apple.com>
+
+ Remove didCompleteRubberBandForMainFrame UIClient callback
+ https://bugs.webkit.org/show_bug.cgi?id=69161
+
+ Reviewed by Adam Roben.
+
+ * UIProcess/API/C/WKPage.h:
+ * UIProcess/WebPageProxy.cpp:
+ * UIProcess/WebPageProxy.h:
+ * UIProcess/WebPageProxy.messages.in:
+ * UIProcess/WebUIClient.cpp:
+ * UIProcess/WebUIClient.h:
+ * WebProcess/WebCoreSupport/WebChromeClient.cpp:
+ (WebKit::WebChromeClient::didCompleteRubberBandForFrame):
+
2011-09-30 Qi Zhang <qi.2.zh...@nokia.com>
WebKitTestRunner needs layoutTestController.setAppCacheMaximumSize
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPage.h (96412 => 96413)
--- trunk/Source/WebKit2/UIProcess/API/C/WKPage.h 2011-09-30 19:05:32 UTC (rev 96412)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPage.h 2011-09-30 19:11:39 UTC (rev 96413)
@@ -191,7 +191,6 @@
typedef void (*WKPageDrawHeaderCallback)(WKPageRef page, WKFrameRef frame, WKRect rect, const void* clientInfo);
typedef void (*WKPageDrawFooterCallback)(WKPageRef page, WKFrameRef frame, WKRect rect, const void* clientInfo);
typedef void (*WKPagePrintFrameCallback)(WKPageRef page, WKFrameRef frame, const void* clientInfo);
-typedef void (*WKPageDidCompleteRubberBandForMainFrameCallback)(WKPageRef page, WKSize initialOverhang, const void* clientInfo);
typedef void (*WKPageSaveDataToFileInDownloadsFolderCallback)(WKPageRef page, WKStringRef suggestedFilename, WKStringRef mimeType, WKURLRef originatingURL, WKDataRef data, const void* clientInfo);
typedef bool (*WKPageShouldInterruptJavaScriptCallback)(WKPageRef page, const void *clientInfo);
@@ -240,7 +239,7 @@
WKPageDrawFooterCallback drawFooter;
WKPagePrintFrameCallback printFrame;
WKPageCallback runModal;
- WKPageDidCompleteRubberBandForMainFrameCallback didCompleteRubberBandForMainFrame;
+ void* unused1; // Used to be didCompleteRubberBandForMainFrame
WKPageSaveDataToFileInDownloadsFolderCallback saveDataToFileInDownloadsFolder;
WKPageShouldInterruptJavaScriptCallback shouldInterruptJavaScript;
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (96412 => 96413)
--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2011-09-30 19:05:32 UTC (rev 96412)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2011-09-30 19:11:39 UTC (rev 96413)
@@ -3140,11 +3140,6 @@
m_uiClient.runModal(this);
}
-void WebPageProxy::didCompleteRubberBandForMainFrame(const IntSize& initialOverhang)
-{
- m_uiClient.didCompleteRubberBandForMainFrame(this, initialOverhang);
-}
-
void WebPageProxy::notifyScrollerThumbIsVisibleInRect(const IntRect& scrollerThumb)
{
m_visibleScrollerThumbRect = scrollerThumb;
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (96412 => 96413)
--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2011-09-30 19:05:32 UTC (rev 96412)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2011-09-30 19:11:39 UTC (rev 96413)
@@ -649,7 +649,6 @@
void exceededDatabaseQuota(uint64_t frameID, const String& originIdentifier, const String& databaseName, const String& displayName, uint64_t currentQuota, uint64_t currentOriginUsage, uint64_t currentDatabaseUsage, uint64_t expectedUsage, uint64_t& newQuota);
void requestGeolocationPermissionForFrame(uint64_t geolocationID, uint64_t frameID, String originIdentifier);
void runModal();
- void didCompleteRubberBandForMainFrame(const WebCore::IntSize&);
void notifyScrollerThumbIsVisibleInRect(const WebCore::IntRect&);
void didChangeScrollbarsForMainFrame(bool hasHorizontalScrollbar, bool hasVerticalScrollbar);
void didChangeScrollOffsetPinningForMainFrame(bool pinnedToLeftSide, bool pinnedToRightSide);
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in (96412 => 96413)
--- trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in 2011-09-30 19:05:32 UTC (rev 96412)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in 2011-09-30 19:11:39 UTC (rev 96413)
@@ -60,7 +60,6 @@
RunOpenPanel(uint64_t frameID, WebKit::WebOpenPanelParameters::Data parameters)
PrintFrame(uint64_t frameID) -> ()
RunModal()
- DidCompleteRubberBandForMainFrame(WebCore::IntSize initialOverhang)
NotifyScrollerThumbIsVisibleInRect(WebCore::IntRect scrollerThumb)
DidChangeScrollbarsForMainFrame(bool hasHorizontalScrollbar, bool hasVerticalScrollbar)
DidChangeScrollOffsetPinningForMainFrame(bool hasHorizontalScrollbar, bool hasVerticalScrollbar)
Modified: trunk/Source/WebKit2/UIProcess/WebUIClient.cpp (96412 => 96413)
--- trunk/Source/WebKit2/UIProcess/WebUIClient.cpp 2011-09-30 19:05:32 UTC (rev 96412)
+++ trunk/Source/WebKit2/UIProcess/WebUIClient.cpp 2011-09-30 19:11:39 UTC (rev 96413)
@@ -385,14 +385,6 @@
m_client.runModal(toAPI(page), m_client.clientInfo);
}
-void WebUIClient::didCompleteRubberBandForMainFrame(WebPageProxy* page, const IntSize& initialOverhang)
-{
- if (!m_client.didCompleteRubberBandForMainFrame)
- return;
-
- m_client.didCompleteRubberBandForMainFrame(toAPI(page), toAPI(initialOverhang), m_client.clientInfo);
-}
-
void WebUIClient::saveDataToFileInDownloadsFolder(WebPageProxy* page, const String& suggestedFilename, const String& mimeType, const String& originatingURLString, WebData* data)
{
if (!m_client.saveDataToFileInDownloadsFolder)
Modified: trunk/Source/WebKit2/UIProcess/WebUIClient.h (96412 => 96413)
--- trunk/Source/WebKit2/UIProcess/WebUIClient.h 2011-09-30 19:05:32 UTC (rev 96412)
+++ trunk/Source/WebKit2/UIProcess/WebUIClient.h 2011-09-30 19:11:39 UTC (rev 96413)
@@ -110,8 +110,6 @@
bool canRunModal() const;
void runModal(WebPageProxy*);
- void didCompleteRubberBandForMainFrame(WebPageProxy*, const WebCore::IntSize&);
-
void saveDataToFileInDownloadsFolder(WebPageProxy*, const String& suggestedFilename, const String& mimeType, const String& originatingURLString, WebData*);
bool shouldInterruptJavaScript(WebPageProxy*);
Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp (96412 => 96413)
--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp 2011-09-30 19:05:32 UTC (rev 96412)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp 2011-09-30 19:11:39 UTC (rev 96413)
@@ -777,10 +777,6 @@
void WebChromeClient::didCompleteRubberBandForFrame(Frame* frame, const IntSize& initialOverhang) const
{
m_page->drawingArea()->enableDisplayThrottling();
-
- if (frame != frame->page()->mainFrame())
- return;
- m_page->send(Messages::WebPageProxy::DidCompleteRubberBandForMainFrame(initialOverhang));
}
void WebChromeClient::didStartAnimatedScroll() const
