Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(205)

Unified Diff: third_party/WebKit/Source/core/loader/FrameLoader.cpp

Issue 2842253002: Move ReportLocalLoadFailed to ExecutionContext (Closed)
Patch Set: Revert ResourceLoader changes, handle main resource redirect in DocumentLoader Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/core/loader/FrameLoader.cpp
diff --git a/third_party/WebKit/Source/core/loader/FrameLoader.cpp b/third_party/WebKit/Source/core/loader/FrameLoader.cpp
index 5bc3baacfc881129f9e342c99a4963cb7befe6e5..50958ab2d4669e528c9f378b721a8757d07e7fbd 100644
--- a/third_party/WebKit/Source/core/loader/FrameLoader.cpp
+++ b/third_party/WebKit/Source/core/loader/FrameLoader.cpp
@@ -676,7 +676,9 @@ bool FrameLoader::PrepareRequestForThisFrame(FrameLoadRequest& request) {
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;
}
@@ -919,16 +921,6 @@ SubstituteData FrameLoader::DefaultSubstituteDataForURL(const KURL& url) {
"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)
« no previous file with comments | « third_party/WebKit/Source/core/loader/FrameLoader.h ('k') | third_party/WebKit/Source/core/loader/PingLoader.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698