Changeset 96413 in webkit


Ignore:
Timestamp:
Sep 30, 2011 12:11:39 PM (13 years ago)
Author:
andersca@apple.com
Message:

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):

Location:
trunk/Source/WebKit2
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit2/ChangeLog

    r96405 r96413  
     12011-09-30  Anders Carlsson  <andersca@apple.com>
     2
     3        Remove didCompleteRubberBandForMainFrame UIClient callback
     4        https://bugs.webkit.org/show_bug.cgi?id=69161
     5
     6        Reviewed by Adam Roben.
     7
     8        * UIProcess/API/C/WKPage.h:
     9        * UIProcess/WebPageProxy.cpp:
     10        * UIProcess/WebPageProxy.h:
     11        * UIProcess/WebPageProxy.messages.in:
     12        * UIProcess/WebUIClient.cpp:
     13        * UIProcess/WebUIClient.h:
     14        * WebProcess/WebCoreSupport/WebChromeClient.cpp:
     15        (WebKit::WebChromeClient::didCompleteRubberBandForFrame):
     16
    1172011-09-30  Qi Zhang  <qi.2.zhang@nokia.com>
    218

  • trunk/Source/WebKit2/UIProcess/API/C/WKPage.h

    r95901 r96413  
    192192typedef void (*WKPageDrawFooterCallback)(WKPageRef page, WKFrameRef frame, WKRect rect, const void* clientInfo);
    193193typedef void (*WKPagePrintFrameCallback)(WKPageRef page, WKFrameRef frame, const void* clientInfo);
    194 typedef void (*WKPageDidCompleteRubberBandForMainFrameCallback)(WKPageRef page, WKSize initialOverhang, const void* clientInfo);
    195194typedef void (*WKPageSaveDataToFileInDownloadsFolderCallback)(WKPageRef page, WKStringRef suggestedFilename, WKStringRef mimeType, WKURLRef originatingURL, WKDataRef data, const void* clientInfo);
    196195typedef bool (*WKPageShouldInterruptJavaScriptCallback)(WKPageRef page, const void *clientInfo);
    … …  
    241240    WKPagePrintFrameCallback                                            printFrame;
    242241    WKPageCallback                                                      runModal;
    243     WKPageDidCompleteRubberBandForMainFrameCallback                     didCompleteRubberBandForMainFrame;
     242    void*                                                               unused1; // Used to be didCompleteRubberBandForMainFrame
    244243    WKPageSaveDataToFileInDownloadsFolderCallback                       saveDataToFileInDownloadsFolder;
    245244    WKPageShouldInterruptJavaScriptCallback                             shouldInterruptJavaScript;   

  • trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp

    r96014 r96413  
    31413141}
    31423142
    3143 void WebPageProxy::didCompleteRubberBandForMainFrame(const IntSize& initialOverhang)
    3144 {
    3145     m_uiClient.didCompleteRubberBandForMainFrame(this, initialOverhang);
    3146 }
    3147 
    31483143void WebPageProxy::notifyScrollerThumbIsVisibleInRect(const IntRect& scrollerThumb)
    31493144{

  • trunk/Source/WebKit2/UIProcess/WebPageProxy.h

    r95901 r96413  
    650650    void requestGeolocationPermissionForFrame(uint64_t geolocationID, uint64_t frameID, String originIdentifier);
    651651    void runModal();
    652     void didCompleteRubberBandForMainFrame(const WebCore::IntSize&);
    653652    void notifyScrollerThumbIsVisibleInRect(const WebCore::IntRect&);
    654653    void didChangeScrollbarsForMainFrame(bool hasHorizontalScrollbar, bool hasVerticalScrollbar);

  • trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in

    r95303 r96413  
    6161    PrintFrame(uint64_t frameID) -> ()
    6262    RunModal()
    63     DidCompleteRubberBandForMainFrame(WebCore::IntSize initialOverhang)
    6463    NotifyScrollerThumbIsVisibleInRect(WebCore::IntRect scrollerThumb)
    6564    DidChangeScrollbarsForMainFrame(bool hasHorizontalScrollbar, bool hasVerticalScrollbar)

  • trunk/Source/WebKit2/UIProcess/WebUIClient.cpp

    r95901 r96413  
    386386}
    387387
    388 void WebUIClient::didCompleteRubberBandForMainFrame(WebPageProxy* page, const IntSize& initialOverhang)
    389 {
    390     if (!m_client.didCompleteRubberBandForMainFrame)
    391         return;
    392 
    393     m_client.didCompleteRubberBandForMainFrame(toAPI(page), toAPI(initialOverhang), m_client.clientInfo);
    394 }
    395 
    396388void WebUIClient::saveDataToFileInDownloadsFolder(WebPageProxy* page, const String& suggestedFilename, const String& mimeType, const String& originatingURLString, WebData* data)
    397389{

  • trunk/Source/WebKit2/UIProcess/WebUIClient.h

    r95901 r96413  
    111111    void runModal(WebPageProxy*);
    112112
    113     void didCompleteRubberBandForMainFrame(WebPageProxy*, const WebCore::IntSize&);
    114 
    115113    void saveDataToFileInDownloadsFolder(WebPageProxy*, const String& suggestedFilename, const String& mimeType, const String& originatingURLString, WebData*);
    116114

  • trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp

    r95989 r96413  
    778778{
    779779    m_page->drawingArea()->enableDisplayThrottling();
    780 
    781     if (frame != frame->page()->mainFrame())
    782         return;
    783     m_page->send(Messages::WebPageProxy::DidCompleteRubberBandForMainFrame(initialOverhang));
    784780}
    785781
Note: See TracChangeset for help on using the changeset viewer.