Support deprecation warnings in shared/service workers

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 519 matching lines @@
 }
 
 UseCounter::~UseCounter()
 {
     // We always log PageDestruction so that we have a scale for the rest of the features.
     blink::Platform::current()->histogramEnumeration("WebCore.FeatureObserver", PageDestruction, NumberOfFeatures);
 
     updateMeasurements();
 }
 
+void UseCounter::CountBits::updateMeasurements()
+{
+    if (m_bits) {
+        for (unsigned i = 0; i < NumberOfFeatures; ++i) {
+            if (m_bits->quickGet(i))
+                blink::Platform::current()->histogramEnumeration("WebCore.FeatureObserver", i, NumberOfFeatures);
+        }
+        // Clearing count bits is timing sensitive.
+        m_bits->clearAll();
+    }
+}
+
 void UseCounter::updateMeasurements()
 {
     blink::Platform::current()->histogramEnumeration("WebCore.FeatureObserver", PageVisits, NumberOfFeatures);
-
-    if (m_countBits) {
-        for (unsigned i = 0; i < NumberOfFeatures; ++i) {
-            if (m_countBits->quickGet(i))
-                blink::Platform::current()->histogramEnumeration("WebCore.FeatureObserver", i, NumberOfFeatures);
-        }
-        // Clearing count bits is timing sensitive.
-        m_countBits->clearAll();
-    }
+    m_countBits.updateMeasurements();
 
     // FIXME: Sometimes this function is called more than once per page. The following
     //        bool guards against incrementing the page count when there are no CSS
     //        bits set. http://crbug.com/236262.
     bool needsPagesMeasuredUpdate = false;
     for (int i = firstCSSProperty; i <= lastCSSProperty; ++i) {
         if (m_CSSFeatureBits.quickGet(i)) {
             int cssSampleId = mapCSSPropertyIdToCSSSampleIdForHistogram(i);
             blink::Platform::current()->histogramEnumeration("WebCore.FeatureObserver.CSSProperties", cssSampleId, maximumCSSSampleId());
             needsPagesMeasuredUpdate = true;
@@ skipping 12 matching lines @@
 }
 
 void UseCounter::count(const Frame* frame, Feature feature)
 {
     if (!frame)
         return;
     FrameHost* host = frame->host();
     if (!host)
         return;
 
-    ASSERT(host->useCounter().deprecationMessage(feature).isEmpty());
+    ASSERT(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)
 {
@@ skipping 30 matching lines @@
 
 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)));
+        ASSERT(!deprecationMessage(feature).isEmpty());
+        frame->console().addMessage(ConsoleMessage::create(DeprecationMessageSource, WarningMessageLevel, deprecationMessage(feature)));
     }
 }
 
 void UseCounter::countDeprecation(ExecutionContext* context, Feature feature)
 {
     if (!context)
         return;
     if (context->isDocument()) {
         UseCounter::countDeprecation(*toDocument(context), feature);
         return;
@@ skipping 234 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