Move ReportLocalLoadFailed to ExecutionContext

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

 /*
  * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights
  * reserved.
  * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved.
  * (http://www.torchmobile.com/)
  * Copyright (C) 2008 Alp Toker <alp@atoker.com>
  * Copyright (C) Research In Motion Limited 2009. All rights reserved.
  * Copyright (C) 2011 Kris Jordan <krisjordan@gmail.com>
  * Copyright (C) 2011 Google Inc. All rights reserved.
@@ skipping 658 matching lines @@
   // If no origin Document* was specified, skip remaining security checks and
   // assume the caller has fully initialized the FrameLoadRequest.
   if (!request.OriginDocument())
     return true;
 
   KURL url = request.GetResourceRequest().Url();
   if (frame_->GetScriptController().ExecuteScriptIfJavaScriptURL(url, nullptr))
     return false;
 
   if (!request.OriginDocument()->GetSecurityOrigin()->CanDisplay(url)) {
-    ReportLocalLoadFailed(frame_, url.ElidedString());
+    request.OriginDocument()->AddConsoleMessage(ConsoleMessage::Create(
+        kSecurityMessageSource, kErrorMessageLevel,
+        "Not allowed to load local resource: " + url.ElidedString()));
     return false;
   }
 
   // Block renderer-initiated loads of data URLs in the top frame. If the mime
   // type of the data URL is supported, the URL will eventually be rendered, so
   // block it here. Otherwise, the load might be handled by a plugin or end up
   // as a download, so allow it to let the embedder figure out what to do with
   // it.
   if (frame_->IsMainFrame() &&
       !request.GetResourceRequest().IsSameDocumentNavigation() &&
@@ skipping 222 matching lines @@
   if (!ShouldTreatURLAsSrcdocDocument(url))
     return SubstituteData();
   String srcdoc = frame_->DeprecatedLocalOwner()->FastGetAttribute(srcdocAttr);
   DCHECK(!srcdoc.IsNull());
   CString encoded_srcdoc = srcdoc.Utf8();
   return SubstituteData(
       SharedBuffer::Create(encoded_srcdoc.data(), encoded_srcdoc.length()),
       "text/html", "UTF-8", KURL());
 }
 
-void FrameLoader::ReportLocalLoadFailed(LocalFrame* frame, const String& url) {
-  DCHECK(!url.IsEmpty());
-  if (!frame)
-    return;
-
-  frame->GetDocument()->AddConsoleMessage(
-      ConsoleMessage::Create(kSecurityMessageSource, kErrorMessageLevel,
-                             "Not allowed to load local resource: " + url));
-}
-
 void FrameLoader::StopAllLoaders() {
   if (frame_->GetDocument()->PageDismissalEventBeingDispatched() !=
       Document::kNoDismissal)
     return;
 
   // If this method is called from within this method, infinite recursion can
   // occur (3442218). Avoid this.
   if (in_stop_all_loaders_)
     return;
 
@@ skipping 768 matching lines @@
   // TODO(japhet): This is needed because the browser process DCHECKs if the
   // first entry we commit in a new frame has replacement set. It's unclear
   // whether the DCHECK is right, investigate removing this special case.
   bool replace_current_item = load_type == kFrameLoadTypeReplaceCurrentItem &&
                               (!Opener() || !request.Url().IsEmpty());
   loader->SetReplacesCurrentHistoryItem(replace_current_item);
   return loader;
 }
 
 }  // namespace blink