Update UsageCounter methods to be callable on Frames.

Source/core/frame/UseCounter.cpp

 
 /*
  * Copyright (C) 2012 Google, Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 13 matching lines @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 #include "core/frame/UseCounter.h"
 
 #include "core/css/CSSStyleSheet.h"
 #include "core/css/StyleSheetContents.h"
 #include "core/dom/Document.h"
 #include "core/dom/ExecutionContext.h"
-#include "core/frame/LocalDOMWindow.h"
 #include "core/frame/FrameConsole.h"
 #include "core/frame/FrameHost.h"
 #include "core/frame/LocalFrame.h"
 #include "core/inspector/ConsoleMessage.h"
 #include "core/workers/WorkerGlobalScope.h"
 #include "public/platform/Platform.h"
 
 namespace blink {
 
 static int totalPagesMeasuredCSSSampleId() { return 1; }
@@ skipping 525 matching lines @@
         blink::Platform::current()->histogramEnumeration("WebCore.FeatureObserver.CSSProperties", totalPagesMeasuredCSSSampleId(), maximumCSSSampleId());
 
     m_CSSFeatureBits.clearAll();
 }
 
 void UseCounter::didCommitLoad()
 {
     updateMeasurements();
 }
 
-void UseCounter::count(const Document& document, Feature feature)
+void UseCounter::count(const Frame* frame, Feature feature)
 {
-    FrameHost* host = document.frameHost();
+    if (!frame)
+        return;
+    FrameHost* host = frame->host();
     if (!host)
         return;
 
     ASSERT(host->useCounter().deprecationMessage(feature).isEmpty());
     host->useCounter().recordMeasurement(feature);
 }
 
+void UseCounter::count(const Document& document, Feature feature)
+{
+    count(document.frame(), feature);
+}
+
 void UseCounter::count(const ExecutionContext* context, Feature feature)
 {
     if (!context)
         return;
     if (context->isDocument()) {
         count(*toDocument(context), feature);
         return;
     }
     if (context->isWorkerGlobalScope())
         toWorkerGlobalScope(context)->countFeature(feature);
 }
 
+void UseCounter::countIfNotPrivateScript(v8::Isolate* isolate, const Frame* frame, Feature feature)
+{
+    if (DOMWrapperWorld::current(isolate).isPrivateScriptIsolatedWorld())
+        return;
+    UseCounter::count(frame, feature);
+}
+
 void UseCounter::countIfNotPrivateScript(v8::Isolate* isolate, const Document& document, Feature feature)
 {
     if (DOMWrapperWorld::current(isolate).isPrivateScriptIsolatedWorld())
         return;
     UseCounter::count(document, feature);
 }
 
 void UseCounter::countIfNotPrivateScript(v8::Isolate* isolate, const ExecutionContext* context, Feature feature)
 {
     if (DOMWrapperWorld::current(isolate).isPrivateScriptIsolatedWorld())
         return;
     UseCounter::count(context, feature);
 }
 
+void UseCounter::countDeprecation(const LocalFrame* frame, Feature feature)
+{
+    if (!frame)
+        return;
+    FrameHost* host = frame->host();
+    if (!host)
+        return;
+
+    if (host->useCounter().recordMeasurement(feature)) {
+        ASSERT(!host->useCounter().deprecationMessage(feature).isEmpty());
+        frame->console().addMessage(ConsoleMessage::create(DeprecationMessageSource, WarningMessageLevel, host->useCounter().deprecationMessage(feature)));
+    }
+}
+
 void UseCounter::countDeprecation(ExecutionContext* context, Feature feature)
 {
     if (!context)
         return;
     if (context->isDocument()) {
         UseCounter::countDeprecation(*toDocument(context), feature);
         return;
     }
     if (context->isWorkerGlobalScope())
         toWorkerGlobalScope(context)->countDeprecation(feature);
 }
 
-void UseCounter::countDeprecation(const LocalDOMWindow* window, Feature feature)
-{
-    if (!window || !window->document())
-        return;
-    UseCounter::countDeprecation(*window->document(), feature);
-}
-
 void UseCounter::countDeprecation(const Document& document, Feature feature)
 {
-    FrameHost* host = document.frameHost();
-    LocalFrame* frame = document.frame();
-    if (!host || !frame)
-        return;
-
-    if (host->useCounter().recordMeasurement(feature)) {
-        ASSERT(!host->useCounter().deprecationMessage(feature).isEmpty());
-        frame->console().addMessage(ConsoleMessage::create(DeprecationMessageSource, WarningMessageLevel, host->useCounter().deprecationMessage(feature)));
-    }
+    UseCounter::countDeprecation(document.frame(), feature);
 }
 
 void UseCounter::countDeprecationIfNotPrivateScript(v8::Isolate* isolate, ExecutionContext* context, Feature feature)
 {
     if (DOMWrapperWorld::current(isolate).isPrivateScriptIsolatedWorld())
         return;
     UseCounter::countDeprecation(context, feature);
 }
 
 // FIXME: Update other UseCounter::deprecationMessage() cases to use this.
@@ skipping 195 matching lines @@
 UseCounter* UseCounter::getFrom(const StyleSheetContents* sheetContents)
 {
     // FIXME: We may want to handle stylesheets that have multiple owners
     //        http://crbug.com/242125
     if (sheetContents && sheetContents->hasSingleOwnerNode())
         return getFrom(sheetContents->singleOwnerDocument());
     return 0;
 }
 
 } // namespace blink