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

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

Issue 14301003: Rename FeatureObserver to UseCounter to make clear that all it stores are usage counts. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Now with 20% more awesome 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
Index: Source/WebCore/loader/FrameLoader.cpp
diff --git a/Source/WebCore/loader/FrameLoader.cpp b/Source/WebCore/loader/FrameLoader.cpp
index f9cda4e27f084fc0d6be6c2a8a4a6cb35d52c920..17378fc0b14b3440be0e841c27b54a82beedd7e2 100644
--- a/Source/WebCore/loader/FrameLoader.cpp
+++ b/Source/WebCore/loader/FrameLoader.cpp
@@ -2816,7 +2816,7 @@ void FrameLoader::applyUserAgent(ResourceRequest& request)
bool FrameLoader::shouldInterruptLoadForXFrameOptions(const String& content, const KURL& url, unsigned long requestIdentifier)
{
- FeatureObserver::observe(m_frame->document(), FeatureObserver::XFrameOptions);
+ UseCounter::observe(m_frame->document(), UseCounter::XFrameOptions);
Frame* topFrame = m_frame->tree()->top();
if (m_frame == topFrame)
@@ -2826,13 +2826,13 @@ bool FrameLoader::shouldInterruptLoadForXFrameOptions(const String& content, con
switch (disposition) {
case XFrameOptionsSameOrigin: {
- FeatureObserver::observe(m_frame->document(), FeatureObserver::XFrameOptionsSameOrigin);
+ UseCounter::observe(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())) {
- FeatureObserver::observe(m_frame->document(), FeatureObserver::XFrameOptionsSameOriginWithBadAncestorChain);
+ UseCounter::observe(m_frame->document(), UseCounter::XFrameOptionsSameOriginWithBadAncestorChain);
break;
}
}
@@ -3131,7 +3131,7 @@ void FrameLoader::dispatchDidCommitLoad()
InspectorInstrumentation::didCommitLoad(m_frame, m_documentLoader.get());
if (m_frame->page()->mainFrame() == m_frame)
- m_frame->page()->featureObserver()->didCommitLoad();
+ m_frame->page()->useCounter()->didCommitLoad();
}

Powered by Google App Engine
This is Rietveld 408576698