Changeset 60853 in webkit


Ignore:
Timestamp:
Jun 8, 2010 10:52:47 AM (14 years ago)
Author:
andersca@apple.com
Message:

2010-06-08 Anders Carlsson <​andersca@apple.com>

Reviewed by John Sullivan.

Would like a way to query WKPageRef for the current progress value
​https://bugs.webkit.org/show_bug.cgi?id=40310
<rdar://problem/8071299>

Add WKPageGetEstimatedProgress. Remove the progress parameter from the didChangeProgress
loader client callback function.

  • UIProcess/API/C/WKPage.cpp: (WKPageGetEstimatedProgress):
  • UIProcess/API/C/WKPage.h:
  • UIProcess/WebLoaderClient.cpp: (WebKit::WebLoaderClient::didChangeProgress):
  • UIProcess/WebLoaderClient.h:
  • UIProcess/WebPageProxy.cpp: (WebKit::WebPageProxy::WebPageProxy): (WebKit::WebPageProxy::close): (WebKit::WebPageProxy::didStartProgress): (WebKit::WebPageProxy::didChangeProgress): (WebKit::WebPageProxy::didFinishProgress): (WebKit::WebPageProxy::processDidExit):
  • UIProcess/WebPageProxy.h: (WebKit::WebPageProxy::estimatedProgress):
Location:
trunk/WebKit2
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/WebKit2/ChangeLog

    r60850 r60853  
     12010-06-08  Anders Carlsson  <andersca@apple.com>
     2
     3        Reviewed by John Sullivan.
     4
     5        Would like a way to query WKPageRef for the current progress value
     6        https://bugs.webkit.org/show_bug.cgi?id=40310
     7        <rdar://problem/8071299>
     8
     9        Add WKPageGetEstimatedProgress. Remove the progress parameter from the didChangeProgress
     10        loader client callback function.
     11
     12        * UIProcess/API/C/WKPage.cpp:
     13        (WKPageGetEstimatedProgress):
     14        * UIProcess/API/C/WKPage.h:
     15        * UIProcess/WebLoaderClient.cpp:
     16        (WebKit::WebLoaderClient::didChangeProgress):
     17        * UIProcess/WebLoaderClient.h:
     18        * UIProcess/WebPageProxy.cpp:
     19        (WebKit::WebPageProxy::WebPageProxy):
     20        (WebKit::WebPageProxy::close):
     21        (WebKit::WebPageProxy::didStartProgress):
     22        (WebKit::WebPageProxy::didChangeProgress):
     23        (WebKit::WebPageProxy::didFinishProgress):
     24        (WebKit::WebPageProxy::processDidExit):
     25        * UIProcess/WebPageProxy.h:
     26        (WebKit::WebPageProxy::estimatedProgress):
     27
    1282010-06-08  Anders Carlsson  <andersca@apple.com>
    229

  • trunk/WebKit2/UIProcess/API/C/WKPage.cpp

    r58684 r60853  
    101101}
    102102
     103double WKPageGetEstimatedProgress(WKPageRef pageRef)
     104{
     105    return toWK(pageRef)->estimatedProgress();
     106}
     107
    103108void WKPageTerminate(WKPageRef pageRef)
    104109{

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

    r58684 r60853  
    5151// Progress Client
    5252typedef void (*WKPageDidStartProgressCallback)(WKPageRef page, const void *clientInfo);
    53 typedef void (*WKPageDidChangeProgressCallback)(WKPageRef page, double value, const void *clientInfo);
     53typedef void (*WKPageDidChangeProgressCallback)(WKPageRef page, const void *clientInfo);
    5454typedef void (*WKPageDidFinishProgressCallback)(WKPageRef page, const void *clientInfo);
    5555
    … …  
    148148
    149149WK_EXPORT WKFrameRef WKPageGetMainFrame(WKPageRef page);
    150 
     150WK_EXPORT double WKPageGetEstimatedProgress(WKPageRef page);
     151   
    151152WK_EXPORT void WKPageTerminate(WKPageRef page);
    152153

  • trunk/WebKit2/UIProcess/WebLoaderClient.cpp

    r57359 r60853  
    103103}
    104104
    105 void WebLoaderClient::didChangeProgress(WebPageProxy* page, double value)
     105void WebLoaderClient::didChangeProgress(WebPageProxy* page)
    106106{
    107107    if (m_pageLoaderClient.didChangeProgress)
    108         m_pageLoaderClient.didChangeProgress(toRef(page), value, m_pageLoaderClient.clientInfo);
     108        m_pageLoaderClient.didChangeProgress(toRef(page), m_pageLoaderClient.clientInfo);
    109109}
    110110

  • trunk/WebKit2/UIProcess/WebLoaderClient.h

    r57352 r60853  
    5353    void didFirstVisuallyNonEmptyLayoutForFrame(WebPageProxy*, WebFrameProxy*);
    5454    void didStartProgress(WebPageProxy*);
    55     void didChangeProgress(WebPageProxy*, double);
     55    void didChangeProgress(WebPageProxy*);
    5656    void didFinishProgress(WebPageProxy*);
    5757

  • trunk/WebKit2/UIProcess/WebPageProxy.cpp

    r60705 r60853  
    6464    , m_pageNamespace(pageNamespace)
    6565    , m_mainFrame(0)
     66    , m_estimatedProgress(0.0)
    6667    , m_canGoBack(false)
    6768    , m_canGoForward(false)
    … …  
    183184    m_canGoBack = false;
    184185
     186    m_estimatedProgress = 0.0;
     187   
    185188    m_loaderClient.initialize(0);
    186189    m_policyClient.initialize(0);
    … …  
    614617void WebPageProxy::didStartProgress()
    615618{
     619    m_estimatedProgress = 0.0;
     620   
    616621    m_loaderClient.didStartProgress(this);
    617622}
    … …  
    619624void WebPageProxy::didChangeProgress(double value)
    620625{
    621     m_loaderClient.didChangeProgress(this, value);
     626    m_estimatedProgress = value;
     627   
     628    m_loaderClient.didChangeProgress(this);
    622629}
    623630
    624631void WebPageProxy::didFinishProgress()
    625632{
     633    m_estimatedProgress = 1.0;
     634
    626635    m_loaderClient.didFinishProgress(this);
    627636}
    … …  
    846855    m_canGoBack = false;
    847856
     857    m_estimatedProgress = 0.0;
     858   
    848859    m_pageClient->processDidExit();
    849860}

  • trunk/WebKit2/UIProcess/WebPageProxy.h

    r60705 r60853  
    117117    const WebCore::String& toolTip() const { return m_toolTip; }
    118118
     119    double estimatedProgress() const { return m_estimatedProgress; }
     120
    119121    void terminateProcess();
    120122
    … …  
    206208    HashMap<uint64_t, RefPtr<RenderTreeExternalRepresentationCallback> > m_renderTreeExternalRepresentationCallbacks;
    207209
     210    double m_estimatedProgress;
     211   
    208212    bool m_canGoBack;
    209213    bool m_canGoForward;
Note: See TracChangeset for help on using the changeset viewer.