Removed FrameHost::useCounter()

third_party/WebKit/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
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 13 matching lines @@
  */
 
 #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/Deprecation.h"
 #include "core/frame/FrameConsole.h"
-#include "core/frame/FrameHost.h"
 #include "core/frame/LocalFrame.h"
 #include "core/inspector/ConsoleMessage.h"
+#include "core/page/Page.h"
 #include "core/workers/WorkerOrWorkletGlobalScope.h"
 #include "platform/Histogram.h"
 #include "platform/instrumentation/tracing/TraceEvent.h"
 #include "platform/weborigin/SchemeRegistry.h"
 
 namespace {
 
 int totalPagesMeasuredCSSSampleId() {
   return 1;
 }
@@ skipping 1119 matching lines @@
   m_CSSRecorded.clearAll();
   if (!m_disableReporting && !m_muteCount) {
     featuresHistogram().count(PageVisits);
     cssHistogram().count(totalPagesMeasuredCSSSampleId());
   }
 }
 
 void UseCounter::count(const Frame* frame, Feature feature) {
   if (!frame)
     return;
-  FrameHost* host = frame->host();
-  if (!host)
+  Page* page = frame->page();
+  if (!page)
     return;
 
-  host->useCounter().count(feature);
+  page->useCounter().count(feature);
 }
 
 void UseCounter::count(const Document& document, Feature feature) {
   count(document.frame(), feature);
 }
 
 bool UseCounter::isCounted(Document& document, Feature feature) {
-  Frame* frame = document.frame();
-  if (!frame)
+  Page* page = document.page();
+  if (!page)
     return false;
-  FrameHost* host = frame->host();
-  if (!host)
-    return false;
-  return host->useCounter().hasRecordedMeasurement(feature);
+  return page->useCounter().hasRecordedMeasurement(feature);
 }
 
 bool UseCounter::isCounted(CSSPropertyID unresolvedProperty) {
   return m_CSSRecorded.quickGet(unresolvedProperty);
 }
 
 void UseCounter::addObserver(Observer* observer) {
   DCHECK(!m_observers.contains(observer));
   m_observers.insert(observer);
 }
 
 bool UseCounter::isCounted(Document& document, const String& string) {
-  Frame* frame = document.frame();
-  if (!frame)
-    return false;
-  FrameHost* host = frame->host();
-  if (!host)
+  Page* page = document.page();
+  if (!page)
     return false;
 
   CSSPropertyID unresolvedProperty = unresolvedCSSPropertyID(string);
   if (unresolvedProperty == CSSPropertyInvalid)
     return false;
-  return host->useCounter().isCounted(unresolvedProperty);
+  return page->useCounter().isCounted(unresolvedProperty);
 }
 
 void UseCounter::count(ExecutionContext* context, Feature feature) {
   if (!context)
     return;
   if (context->isDocument()) {
     count(*toDocument(context), feature);
     return;
   }
   if (context->isWorkerOrWorkletGlobalScope())
@@ skipping 128 matching lines @@
     }
   }
 
   if (needsPagesMeasuredUpdate)
     cssPropertiesHistogram.count(totalPagesMeasuredCSSSampleId());
 
   m_CSSBits.clearAll();
 }
 
 }  // namespace blink