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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: third_party/WebKit/Source/core/frame/LocalFrame.cpp

Issue 2389023002: Deferred frame loading stats v2 (Closed)
Patch Set: address comments round 2 Created 4 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
« third_party/WebKit/Source/core/frame/FrameView.cpp ('K') | « third_party/WebKit/Source/core/frame/FrameView.cpp ('k') | third_party/WebKit/Source/web/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/core/frame/LocalFrame.cpp
diff --git a/third_party/WebKit/Source/core/frame/LocalFrame.cpp b/third_party/WebKit/Source/core/frame/LocalFrame.cpp
index 38269f0f9930117de9489404270140c54eed9224..b337fe1e4f0e8c88c19f1def876708590a62ccaa 100644
--- a/third_party/WebKit/Source/core/frame/LocalFrame.cpp
+++ b/third_party/WebKit/Source/core/frame/LocalFrame.cpp
@@ -538,6 +538,9 @@ LocalFrame* LocalFrame::localFrameRoot() {
}
bool LocalFrame::isCrossOriginSubframe() const {
+ if (isMainFrame())
+ return false;
+ DCHECK(securityContext());
dcheng 2016/10/14 23:40:30 Let's revert these 3 lines.
dgrogan 2016/10/18 22:11:45 Done.
const SecurityOrigin* securityOrigin = securityContext()->getSecurityOrigin();
Frame* top = tree().top();
return top &&
« third_party/WebKit/Source/core/frame/FrameView.cpp ('K') | « third_party/WebKit/Source/core/frame/FrameView.cpp ('k') | third_party/WebKit/Source/web/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698