Web Inspector: Hangs when loading under SpeculativeLoad::shouldCaptureExtraNetworkLoa...
authorjoepeck@webkit.org <joepeck@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 7 Apr 2017 00:39:43 +0000 (00:39 +0000)
committerjoepeck@webkit.org <joepeck@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 7 Apr 2017 00:39:43 +0000 (00:39 +0000)
https://bugs.webkit.org/show_bug.cgi?id=170575

Rubber-stamped by Brian Burg.

* NetworkProcess/cache/NetworkCacheSpeculativeLoad.cpp:
(WebKit::NetworkCache::SpeculativeLoad::shouldCaptureExtraNetworkLoadMetrics): Deleted.
* NetworkProcess/cache/NetworkCacheSpeculativeLoad.h:
m_networkLoad is a wrapper around `this` as the client, so we would infinite loop here.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@215078 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebKit2/ChangeLog
Source/WebKit2/NetworkProcess/cache/NetworkCacheSpeculativeLoad.cpp
Source/WebKit2/NetworkProcess/cache/NetworkCacheSpeculativeLoad.h

index ab2777f..8678e56 100644 (file)
@@ -1,3 +1,15 @@
+2017-04-06  Joseph Pecoraro  <pecoraro@apple.com>
+
+        Web Inspector: Hangs when loading under SpeculativeLoad::shouldCaptureExtraNetworkLoadMetrics
+        https://bugs.webkit.org/show_bug.cgi?id=170575
+
+        Rubber-stamped by Brian Burg.
+
+        * NetworkProcess/cache/NetworkCacheSpeculativeLoad.cpp:
+        (WebKit::NetworkCache::SpeculativeLoad::shouldCaptureExtraNetworkLoadMetrics): Deleted.
+        * NetworkProcess/cache/NetworkCacheSpeculativeLoad.h:
+        m_networkLoad is a wrapper around `this` as the client, so we would infinite loop here.
+
 2017-04-06  Commit Queue  <commit-queue@webkit.org>
 
         Unreviewed, rolling out r214973.
index 2e2f4b1..b93868c 100644 (file)
@@ -156,13 +156,6 @@ void SpeculativeLoad::didComplete()
     m_completionHandler(WTFMove(m_cacheEntry));
 }
 
-#if USE(NETWORK_SESSION)
-bool SpeculativeLoad::shouldCaptureExtraNetworkLoadMetrics() const
-{
-    return m_networkLoad->shouldCaptureExtraNetworkLoadMetrics();
-}
-#endif
-
 } // namespace NetworkCache
 } // namespace WebKit
 
index c22c2e8..a3fe906 100644 (file)
@@ -64,10 +64,6 @@ private:
     void didFinishLoading(const WebCore::NetworkLoadMetrics&) override;
     void didFailLoading(const WebCore::ResourceError&) override;
 
-#if USE(NETWORK_SESSION)
-    bool shouldCaptureExtraNetworkLoadMetrics() const override;
-#endif
-
     void didComplete();
 
     GlobalFrameID m_frameID;