Changeset 168405 in webkit


Ignore:
Timestamp:
May 6, 2014 8:47:06 PM (10 years ago)
Author:
mitz@apple.com
Message:

-[WKWebView isLoading] is NO immediately after -loadRequest: until the provisional load starts
https://bugs.webkit.org/show_bug.cgi?id=132639

Reviewed by Darin Adler.

  • UIProcess/PageLoadState.cpp:

(WebKit::PageLoadState::commitChanges): Updated for change from isLoadingState to isLoading.
(WebKit::PageLoadState::isLoading): Renamed from isLoadingState, changed to take Data and
check whether there is a non-null pending API request URL. If so, return true.

  • UIProcess/PageLoadState.h:
Location:
trunk/Source/WebKit2
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebKit2/ChangeLog

    r168397 r168405  
     12014-05-06  Dan Bernstein  <mitz@apple.com>
     2
     3        -[WKWebView isLoading] is NO immediately after -loadRequest: until the provisional load starts
     4        https://bugs.webkit.org/show_bug.cgi?id=132639
     5
     6        Reviewed by Darin Adler.
     7
     8        * UIProcess/PageLoadState.cpp:
     9        (WebKit::PageLoadState::commitChanges): Updated for change from isLoadingState to isLoading.
     10        (WebKit::PageLoadState::isLoading): Renamed from isLoadingState, changed to take Data and
     11        check whether there is a non-null pending API request URL. If so, return true.
     12        * UIProcess/PageLoadState.h:
     13
    1142014-05-06  Dean Jackson  <dino@apple.com>
    215
  • trunk/Source/WebKit2/UIProcess/PageLoadState.cpp

    r167525 r168405  
    9797
    9898    bool titleChanged = m_committedState.title != m_uncommittedState.title;
    99     bool isLoadingChanged = isLoadingState(m_committedState.state) != isLoadingState(m_uncommittedState.state);
     99    bool isLoadingChanged = isLoading(m_committedState) != isLoading(m_uncommittedState);
    100100    bool activeURLChanged = activeURL(m_committedState) != activeURL(m_uncommittedState);
    101101    bool hasOnlySecureContentChanged = hasOnlySecureContent(m_committedState) != hasOnlySecureContent(m_uncommittedState);
     
    149149bool PageLoadState::isLoading() const
    150150{
    151     return isLoadingState(m_committedState.state);
     151    return isLoading(m_committedState);
    152152}
    153153
     
    337337}
    338338
    339 bool PageLoadState::isLoadingState(State state)
    340 {
    341     switch (state) {
     339bool PageLoadState::isLoading(const Data& data)
     340{
     341    if (!data.pendingAPIRequestURL.isNull())
     342        return true;
     343
     344    switch (data.state) {
    342345    case State::Provisional:
    343346    case State::Committed:
  • trunk/Source/WebKit2/UIProcess/PageLoadState.h

    r167525 r168405  
    140140
    141141private:
    142     static bool isLoadingState(State);
    143 
    144142    void beginTransaction() { ++m_outstandingTransactionCount; }
    145143    void endTransaction();
     
    172170    };
    173171
     172    static bool isLoading(const Data&);
    174173    static String activeURL(const Data&);
    175174    static bool hasOnlySecureContent(const Data&);
Note: See TracChangeset for help on using the changeset viewer.