Migrate PingLoader to be a LocalFrameLifecycleObserver.

BUG=526743,522622
TEST=webkit_unit_tests

Review URL: https://codereview.chromium.org/1311433008

git-svn-id: svn://svn.chromium.org/blink/trunk@201580 bbb929c8-8fbe-4397-9dbb-9b2b20218538

third_party/WebKit/Source/core/html/HTMLAnchorElement.cpp

@@ -29,6 +29,7 @@
 #include "core/events/MouseEvent.h"
 #include "core/frame/FrameHost.h"
 #include "core/frame/Settings.h"
+#include "core/frame/UseCounter.h"
 #include "core/html/HTMLImageElement.h"
 #include "core/html/parser/HTMLParserIdioms.h"
 #include "core/layout/LayoutImage.h"

third_party/WebKit/Source/core/loader/BeaconLoader.cpp

@@ -148,12 +148,9 @@ void BeaconLoader::willSendRequest(WebURLLoader*, WebURLRequest& passedNewReques
     StoredCredentials withCredentials = AllowStoredCredentials;
     ResourceLoaderOptions options;
     if (!CrossOriginAccessControl::handleRedirect(m_beaconOrigin.get(), newRequest, redirectResponse, withCredentials, options, errorDescription)) {
-        if (page() && page()->mainFrame()) {
-            if (page()->mainFrame()->isLocalFrame()) {
-                LocalFrame* localFrame = toLocalFrame(page()->mainFrame());
-                if (localFrame->document())
-                    localFrame->document()->addConsoleMessage(ConsoleMessage::create(JSMessageSource, ErrorMessageLevel, errorDescription));
-            }
+        if (LocalFrame* localFrame = frame()) {
+            if (localFrame->document())
+                localFrame->document()->addConsoleMessage(ConsoleMessage::create(JSMessageSource, ErrorMessageLevel, errorDescription));
         }
         // Cancel the load and self destruct.
         dispose();

third_party/WebKit/Source/core/loader/PingLoader.cpp

@@ -134,7 +134,7 @@ void PingLoader::start(LocalFrame* frame, ResourceRequest& request, const FetchI
 }
 
 PingLoader::PingLoader(LocalFrame* frame, ResourceRequest& request, const FetchInitiatorInfo& initiatorInfo, StoredCredentials credentialsAllowed)
-    : PageLifecycleObserver(frame->page())
+    : LocalFrameLifecycleObserver(frame)
     , m_timeout(this, &PingLoader::timeout)
     , m_url(request.url())
     , m_identifier(createUniqueIdentifier())
@@ -172,61 +172,60 @@ void PingLoader::dispose()
 
 void PingLoader::didReceiveResponse(WebURLLoader*, const WebURLResponse& response)
 {
-    if (Page* page = this->page()) {
+    if (LocalFrame* frame = this->frame()) {
         TRACE_EVENT_INSTANT1("devtools.timeline", "ResourceFinish", TRACE_EVENT_SCOPE_THREAD, "data", InspectorResourceFinishEvent::data(m_identifier, 0, true));
         const ResourceResponse& resourceResponse = response.toResourceResponse();
-        InspectorInstrumentation::didReceiveResourceResponse(page->deprecatedLocalMainFrame(), m_identifier, 0, resourceResponse, 0);
-        didFailLoading(page);
+        InspectorInstrumentation::didReceiveResourceResponse(frame, m_identifier, 0, resourceResponse, 0);
+        didFailLoading(frame);
     }
     dispose();
 }
 
 void PingLoader::didReceiveData(WebURLLoader*, const char*, int, int)
 {
-    if (Page* page = this->page()) {
+    if (LocalFrame* frame = this->frame()) {
         TRACE_EVENT_INSTANT1("devtools.timeline", "ResourceFinish", TRACE_EVENT_SCOPE_THREAD, "data", InspectorResourceFinishEvent::data(m_identifier, 0, true));
-        didFailLoading(page);
+        didFailLoading(frame);
     }
     dispose();
 }
 
 void PingLoader::didFinishLoading(WebURLLoader*, double, int64_t)
 {
-    if (Page* page = this->page()) {
+    if (LocalFrame* frame = this->frame()) {
         TRACE_EVENT_INSTANT1("devtools.timeline", "ResourceFinish", TRACE_EVENT_SCOPE_THREAD, "data", InspectorResourceFinishEvent::data(m_identifier, 0, true));
-        didFailLoading(page);
+        didFailLoading(frame);
     }
     dispose();
 }
 
 void PingLoader::didFail(WebURLLoader*, const WebURLError& resourceError)
 {
-    if (Page* page = this->page()) {
+    if (LocalFrame* frame = this->frame()) {
         TRACE_EVENT_INSTANT1("devtools.timeline", "ResourceFinish", TRACE_EVENT_SCOPE_THREAD, "data", InspectorResourceFinishEvent::data(m_identifier, 0, true));
-        didFailLoading(page);
+        didFailLoading(frame);
     }
     dispose();
 }
 
 void PingLoader::timeout(Timer<PingLoader>*)
 {
-    if (Page* page = this->page()) {
+    if (LocalFrame* frame = this->frame()) {
         TRACE_EVENT_INSTANT1("devtools.timeline", "ResourceFinish", TRACE_EVENT_SCOPE_THREAD, "data", InspectorResourceFinishEvent::data(m_identifier, 0, true));
-        didFailLoading(page);
+        didFailLoading(frame);
     }
     dispose();
 }
 
-void PingLoader::didFailLoading(Page* page)
+void PingLoader::didFailLoading(LocalFrame* frame)
 {
-    LocalFrame* frame = page->deprecatedLocalMainFrame();
     InspectorInstrumentation::didFailLoading(frame, m_identifier, ResourceError::cancelledError(m_url));
     frame->console().didFailLoading(m_identifier, ResourceError::cancelledError(m_url));
 }
 
 DEFINE_TRACE(PingLoader)
 {
-    PageLifecycleObserver::trace(visitor);
+    LocalFrameLifecycleObserver::trace(visitor);
 }
 
 } // namespace blink

third_party/WebKit/Source/core/loader/PingLoader.h

@@ -34,7 +34,7 @@
 
 #include "core/CoreExport.h"
 #include "core/fetch/ResourceLoaderOptions.h"
-#include "core/page/PageLifecycleObserver.h"
+#include "core/frame/LocalFrameLifecycleObserver.h"
 #include "platform/Timer.h"
 #include "platform/heap/Handle.h"
 #include "public/platform/WebURLLoaderClient.h"
@@ -57,7 +57,7 @@ class ResourceRequest;
 // The ping loader is used by audit pings, beacon transmissions and image loads
 // during page unloading.
 //
-class CORE_EXPORT PingLoader : public RefCountedWillBeRefCountedGarbageCollected<PingLoader>, public PageLifecycleObserver, private WebURLLoaderClient {
+class CORE_EXPORT PingLoader : public RefCountedWillBeRefCountedGarbageCollected<PingLoader>, public LocalFrameLifecycleObserver, private WebURLLoaderClient {
     WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(PingLoader);
     WTF_MAKE_NONCOPYABLE(PingLoader);
     WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED(PingLoader);
@@ -83,14 +83,14 @@ protected:
     void dispose();
 
 private:
-    void didReceiveResponse(WebURLLoader*, const WebURLResponse&) override;
-    void didReceiveData(WebURLLoader*, const char*, int, int) override;
-    void didFinishLoading(WebURLLoader*, double, int64_t) override;
-    void didFail(WebURLLoader*, const WebURLError&) override;
+    void didReceiveResponse(WebURLLoader*, const WebURLResponse&) final;
+    void didReceiveData(WebURLLoader*, const char*, int, int) final;
+    void didFinishLoading(WebURLLoader*, double, int64_t) final;
+    void didFail(WebURLLoader*, const WebURLError&) final;
 
     void timeout(Timer<PingLoader>*);
 
-    void didFailLoading(Page*);
+    void didFailLoading(LocalFrame*);
 
     OwnPtr<WebURLLoader> m_loader;
     Timer<PingLoader> m_timeout;

third_party/WebKit/Source/web/tests/WebFrameTest.cpp

@@ -7793,6 +7793,28 @@ TEST_P(ParameterizedWebFrameTest, CreateLocalChildWithPreviousSibling)
     view->close();
 }
 
+TEST_P(ParameterizedWebFrameTest, SendBeaconFromChildWithRemoteMainFrame)
+{
+    FrameTestHelpers::TestWebViewClient viewClient;
+    FrameTestHelpers::TestWebRemoteFrameClient remoteClient;
+    WebView* view = WebView::create(&viewClient);
+    view->settings()->setJavaScriptEnabled(true);
+    view->setMainFrame(remoteClient.frame());
+    WebRemoteFrame* root = view->mainFrame()->toWebRemoteFrame();
+    root->setReplicatedOrigin(SecurityOrigin::createUnique());
+
+    FrameTestHelpers::TestWebFrameClient localFrameClient;
+    WebLocalFrame* localFrame = root->createLocalChild(WebTreeScopeType::Document, "", WebSandboxFlags::None, &localFrameClient, nullptr);
+
+    // Finally, make sure an embedder triggered load in the local frame swapped
+    // back in works.
+    registerMockedHttpURLLoad("send_beacon.html");
+    registerMockedHttpURLLoad("reload_post.html"); // url param to sendBeacon()
+    FrameTestHelpers::loadFrame(localFrame, m_baseURL + "send_beacon.html");
+
+    view->close();
+}
+
 class OverscrollWebViewClient : public FrameTestHelpers::TestWebViewClient {
 public:
     MOCK_METHOD4(didOverscroll, void(const WebFloatSize&, const WebFloatSize&, const WebFloatPoint&, const WebFloatSize&));

third_party/WebKit/Source/web/tests/data/send_beacon.html

+<!DOCTYPE html>
+<html>
+<head>
+<script>
+  navigator.sendBeacon('/reload_post.html', 'bacon');
+</script>
+</head>
+<body>
+</body>
+</html>