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

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

Issue 14070021: Rename 'UseCounter::observe' to 'UseCounter::count'. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: rebaseline. Created 7 years, 8 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/loader/DocumentLoader.cpp ('k') | Source/core/page/ContentSecurityPolicy.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/loader/FrameLoader.cpp
diff --git a/Source/core/loader/FrameLoader.cpp b/Source/core/loader/FrameLoader.cpp
index 5c84c902fc955eee93d80df8b8fbaf3810c6ba3c..3dff21cd8849c7fc5acf58f8894404cc0fb44006 100644
--- a/Source/core/loader/FrameLoader.cpp
+++ b/Source/core/loader/FrameLoader.cpp
@@ -2643,7 +2643,7 @@ void FrameLoader::applyUserAgent(ResourceRequest& request)
bool FrameLoader::shouldInterruptLoadForXFrameOptions(const String& content, const KURL& url, unsigned long requestIdentifier)
{
- UseCounter::observe(m_frame->document(), UseCounter::XFrameOptions);
+ UseCounter::count(m_frame->document(), UseCounter::XFrameOptions);
Frame* topFrame = m_frame->tree()->top();
if (m_frame == topFrame)
@@ -2653,13 +2653,13 @@ bool FrameLoader::shouldInterruptLoadForXFrameOptions(const String& content, con
switch (disposition) {
case XFrameOptionsSameOrigin: {
- UseCounter::observe(m_frame->document(), UseCounter::XFrameOptionsSameOrigin);
+ UseCounter::count(m_frame->document(), UseCounter::XFrameOptionsSameOrigin);
RefPtr<SecurityOrigin> origin = SecurityOrigin::create(url);
if (!origin->isSameSchemeHostPort(topFrame->document()->securityOrigin()))
return true;
for (Frame* frame = m_frame->tree()->parent(); frame; frame = frame->tree()->parent()) {
if (!origin->isSameSchemeHostPort(frame->document()->securityOrigin())) {
- UseCounter::observe(m_frame->document(), UseCounter::XFrameOptionsSameOriginWithBadAncestorChain);
+ UseCounter::count(m_frame->document(), UseCounter::XFrameOptionsSameOriginWithBadAncestorChain);
break;
}
}
« no previous file with comments | « Source/core/loader/DocumentLoader.cpp ('k') | Source/core/page/ContentSecurityPolicy.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698