Index: third_party/WebKit/Source/core/page/FrameTree.cpp |
diff --git a/third_party/WebKit/Source/core/page/FrameTree.cpp b/third_party/WebKit/Source/core/page/FrameTree.cpp |
index 945eaa4d7ff63a2c534e9dfa4121f9cd19ba98dc..9480da093754bb8bf1b0bd857573f8a1d615c4a1 100644 |
--- a/third_party/WebKit/Source/core/page/FrameTree.cpp |
+++ b/third_party/WebKit/Source/core/page/FrameTree.cpp |
@@ -51,8 +51,14 @@ FrameTree::~FrameTree() {} |
const AtomicString& FrameTree::GetName() const { |
// TODO(andypaicu): remove this once we have gathered the data |
if (experimental_set_nulled_name_) { |
- UseCounter::Count(this_frame_.Get(), |
- UseCounter::kCrossOriginMainFrameNulledNameAccessed); |
+ const LocalFrame* frame = |
+ this_frame_->IsLocalFrame() |
+ ? ToLocalFrame(this_frame_) |
+ : (Top().IsLocalFrame() ? ToLocalFrame(&Top()) : nullptr); |
+ if (frame) { |
+ UseCounter::Count(frame, |
+ UseCounter::kCrossOriginMainFrameNulledNameAccessed); |
+ } |
} |
return name_; |
} |