Changeset 158702 in webkit

Timestamp:

Nov 5, 2013 5:26:53 PM (10 years ago)

Author:

barraclough@apple.com

Message:

Subresource loads should not prevent page throttling
​https://bugs.webkit.org/show_bug.cgi?id=123757

Reviewed by Alexey Proskuryakov.

The page-is-loading test for inhibiting process supression is currently
too conservative, preventing supression of pages with infinitely loading
resources (commonly XHRs). Instead, just rely on the FrameLoader being
active (with hysteresis).

• loader/SubresourceLoader.cpp:

(WebCore::SubresourceLoader::init):
(WebCore::SubresourceLoader::checkForHTTPStatusCodeError):
(WebCore::SubresourceLoader::didFinishLoading):
(WebCore::SubresourceLoader::didFail):
(WebCore::SubresourceLoader::willCancel):

• loader/SubresourceLoader.h:
  • remove m_activityAssertion from SubresourceLoader.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• loader/SubresourceLoader.cpp (modified) (5 diffs)
• loader/SubresourceLoader.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-11-05  Gavin Barraclough  <barraclough@apple.com>
+
+        Subresource loads should not prevent page throttling
+        https://bugs.webkit.org/show_bug.cgi?id=123757
+
+        Reviewed by Alexey Proskuryakov.
+
+        The page-is-loading test for inhibiting process supression is currently
+        too conservative, preventing supression of pages with infinitely loading
+        resources (commonly XHRs). Instead, just rely on the FrameLoader being
+        active (with hysteresis).
+
+        * loader/SubresourceLoader.cpp:
+        (WebCore::SubresourceLoader::init):
+        (WebCore::SubresourceLoader::checkForHTTPStatusCodeError):
+        (WebCore::SubresourceLoader::didFinishLoading):
+        (WebCore::SubresourceLoader::didFail):
+        (WebCore::SubresourceLoader::willCancel):
+        * loader/SubresourceLoader.h:
+            - remove m_activityAssertion from SubresourceLoader.
+
 2013-11-05  Tim Horton  <timothy_horton@apple.com>
 

trunk/Source/WebCore/loader/SubresourceLoader.cpp

@@ -110 +110 @@
     ASSERT(!reachedTerminalState());
     m_state = Initialized;
-    if (m_frame && m_frame->page() && !m_activityAssertion)
-        m_activityAssertion = m_frame->page()->createActivityToken();
     m_documentLoader->addSubresourceLoader(this);
     return true;
@@ -261 +259 @@
 
     m_state = Finishing;
-    m_activityAssertion = nullptr;
     m_resource->error(CachedResource::LoadError);
     cancel();
@@ -279 +276 @@
     CachedResourceHandle<CachedResource> protectResource(m_resource);
     m_state = Finishing;
-    m_activityAssertion = nullptr;
     m_resource->setLoadFinishTime(finishTime);
     m_resource->finishLoading(resourceData());
@@ -304 +300 @@
     CachedResourceHandle<CachedResource> protectResource(m_resource);
     m_state = Finishing;
-    m_activityAssertion = nullptr;
     if (m_resource->resourceToRevalidate())
         memoryCache()->revalidationFailed(m_resource);
@@ -327 +322 @@
     Ref<SubresourceLoader> protect(*this);
     m_state = Finishing;
-    m_activityAssertion = nullptr;
     if (m_resource->resourceToRevalidate())
         memoryCache()->revalidationFailed(m_resource);

trunk/Source/WebCore/loader/SubresourceLoader.h

@@ -103 +103 @@
     SubresourceLoaderState m_state;
     OwnPtr<RequestCountTracker> m_requestCountTracker;
-    std::unique_ptr<PageActivityAssertionToken> m_activityAssertion;
 };