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

Unified Diff: Source/core/fetch/ResourceFetcher.cpp

Issue 33353003: Have Frame::tree() return a reference (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebase on master Created 7 years, 2 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
« no previous file with comments | « Source/core/editing/SpellChecker.cpp ('k') | Source/core/frame/DOMWindow.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/fetch/ResourceFetcher.cpp
diff --git a/Source/core/fetch/ResourceFetcher.cpp b/Source/core/fetch/ResourceFetcher.cpp
index 94683d3b30680f2aca796cd5a74b30d34093f16c..cb24e19358d4d4cc1dac7828680d5fba5db91627 100644
--- a/Source/core/fetch/ResourceFetcher.cpp
+++ b/Source/core/fetch/ResourceFetcher.cpp
@@ -366,7 +366,7 @@ bool ResourceFetcher::checkInsecureContent(Resource::Type type, const KURL& url,
}
} else if (treatment == TreatAsPassiveContent) {
if (Frame* f = frame()) {
- Frame* top = f->tree()->top();
+ Frame* top = f->tree().top();
if (!top->loader()->mixedContentChecker()->canDisplayInsecureContent(top->document()->securityOrigin(), url))
return false;
}
@@ -632,7 +632,7 @@ void ResourceFetcher::determineTargetType(ResourceRequest& request, Resource::Ty
switch (type) {
case Resource::MainResource:
- if (frame()->tree()->parent())
+ if (frame()->tree().parent())
targetType = ResourceRequest::TargetIsSubframe;
else
targetType = ResourceRequest::TargetIsMainFrame;
« no previous file with comments | « Source/core/editing/SpellChecker.cpp ('k') | Source/core/frame/DOMWindow.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698