Changeset 168405 in webkit
- Timestamp:
- May 6, 2014, 8:47:06 PM (10 years ago)
- Location:
- trunk/Source/WebKit2
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit2/ChangeLog
r168397 r168405 1 2014-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 1 14 2014-05-06 Dean Jackson <dino@apple.com> 2 15 -
trunk/Source/WebKit2/UIProcess/PageLoadState.cpp
r167525 r168405 97 97 98 98 bool titleChanged = m_committedState.title != m_uncommittedState.title; 99 bool isLoadingChanged = isLoading State(m_committedState.state) != isLoadingState(m_uncommittedState.state);99 bool isLoadingChanged = isLoading(m_committedState) != isLoading(m_uncommittedState); 100 100 bool activeURLChanged = activeURL(m_committedState) != activeURL(m_uncommittedState); 101 101 bool hasOnlySecureContentChanged = hasOnlySecureContent(m_committedState) != hasOnlySecureContent(m_uncommittedState); … … 149 149 bool PageLoadState::isLoading() const 150 150 { 151 return isLoading State(m_committedState.state);151 return isLoading(m_committedState); 152 152 } 153 153 … … 337 337 } 338 338 339 bool PageLoadState::isLoadingState(State state) 340 { 341 switch (state) { 339 bool PageLoadState::isLoading(const Data& data) 340 { 341 if (!data.pendingAPIRequestURL.isNull()) 342 return true; 343 344 switch (data.state) { 342 345 case State::Provisional: 343 346 case State::Committed: -
trunk/Source/WebKit2/UIProcess/PageLoadState.h
r167525 r168405 140 140 141 141 private: 142 static bool isLoadingState(State);143 144 142 void beginTransaction() { ++m_outstandingTransactionCount; } 145 143 void endTransaction(); … … 172 170 }; 173 171 172 static bool isLoading(const Data&); 174 173 static String activeURL(const Data&); 175 174 static bool hasOnlySecureContent(const Data&);
Note:
See TracChangeset
for help on using the changeset viewer.