Changeset 262037 in webkit
- Timestamp:
- May 21, 2020 5:13:11 PM (4 years ago)
- Location:
- trunk/Source/WebKit
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit/ChangeLog
r262035 r262037 1 2020-05-21 Tyler Wilcock <twilco.o@protonmail.com> 2 3 Fix misspelling -- m_releaseNetwrokActivityTimer --> m_releaseNetworkActivityTimer 4 https://bugs.webkit.org/show_bug.cgi?id=212237 5 6 Reviewed by Simon Fraser. 7 8 No new tests required -- simply fixing a misspelling. 9 10 * UIProcess/Cocoa/NavigationState.h: Rename m_releaseNetwrokActivityTimer to m_releaseNetworkActivityTimer 11 * UIProcess/Cocoa/NavigationState.mm: Rename m_releaseNetwrokActivityTimer to m_releaseNetworkActivityTimer 12 (WebKit::NavigationState::NavigationState): 13 (WebKit::NavigationState::releaseNetworkActivity): 14 (WebKit::NavigationState::didChangeIsLoading): 15 1 16 2020-05-21 Sam Weinig <weinig@apple.com> 2 17 -
trunk/Source/WebKit/UIProcess/Cocoa/NavigationState.h
r260914 r262037 277 277 #if PLATFORM(IOS_FAMILY) 278 278 std::unique_ptr<ProcessThrottler::BackgroundActivity> m_networkActivity; 279 RunLoop::Timer<NavigationState> m_releaseNetw rokActivityTimer;279 RunLoop::Timer<NavigationState> m_releaseNetworkActivityTimer; 280 280 #endif 281 281 }; -
trunk/Source/WebKit/UIProcess/Cocoa/NavigationState.mm
r261833 r262037 106 106 , m_historyDelegateMethods() 107 107 #if PLATFORM(IOS_FAMILY) 108 , m_releaseNetw rokActivityTimer(RunLoop::current(), this, &NavigationState::releaseNetworkActivityAfterLoadCompletion)108 , m_releaseNetworkActivityTimer(RunLoop::current(), this, &NavigationState::releaseNetworkActivityAfterLoadCompletion) 109 109 #endif 110 110 { … … 1322 1322 } 1323 1323 m_networkActivity = nullptr; 1324 m_releaseNetw rokActivityTimer.stop();1324 m_releaseNetworkActivityTimer.stop(); 1325 1325 } 1326 1326 #endif … … 1334 1334 return; 1335 1335 1336 if (m_releaseNetw rokActivityTimer.isActive()) {1336 if (m_releaseNetworkActivityTimer.isActive()) { 1337 1337 RELEASE_LOG_IF(m_webView->_page->isAlwaysOnLoggingAllowed(), ProcessSuspension, "%p - NavigationState keeps its process network assertion because a new page load started", this); 1338 m_releaseNetw rokActivityTimer.stop();1338 m_releaseNetworkActivityTimer.stop(); 1339 1339 } 1340 1340 if (!m_networkActivity) { … … 1346 1346 // before suspending the WebContent process <rdar://problem/27910964>. 1347 1347 RELEASE_LOG_IF(m_webView->_page->isAlwaysOnLoggingAllowed(), ProcessSuspension, "%p - NavigationState will release its process network assertion soon because the page load completed", this); 1348 m_releaseNetw rokActivityTimer.startOneShot(3_s);1348 m_releaseNetworkActivityTimer.startOneShot(3_s); 1349 1349 } 1350 1350 #endif
Note: See TracChangeset
for help on using the changeset viewer.