Split Media.Controls.Show in .Video and .Audio.

third_party/WebKit/Source/core/html/HTMLMediaElement.cpp

 /*
  * Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple 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 2158 matching lines @@
 }
 
 void HTMLMediaElement::setLoop(bool b)
 {
     WTF_LOG(Media, "HTMLMediaElement::setLoop(%p, %s)", this, boolString(b));
     setBooleanAttribute(loopAttr, b);
 }
 
 bool HTMLMediaElement::shouldShowControls(const RecordMetricsBehavior recordMetrics) const
 {
-    DEFINE_STATIC_LOCAL(EnumerationHistogram, showControlsHistogram, ("Media.Controls.Show", MediaControlsShowMax));
-
     if (fastHasAttribute(controlsAttr)) {
         if (recordMetrics == RecordMetricsBehavior::DoRecord)
-            showControlsHistogram.count(MediaControlsShowAttribute);
+            showControlsHistogram().count(MediaControlsShowAttribute);
         return true;
     }
 
     if (isFullscreen()) {
         if (recordMetrics == RecordMetricsBehavior::DoRecord)
-            showControlsHistogram.count(MediaControlsShowFullscreen);
+            showControlsHistogram().count(MediaControlsShowFullscreen);
         return true;
     }
 
     LocalFrame* frame = document().frame();
     if (frame && !frame->script().canExecuteScripts(NotAboutToExecuteScript)) {
         if (recordMetrics == RecordMetricsBehavior::DoRecord)
-            showControlsHistogram.count(MediaControlsShowNoScript);
+            showControlsHistogram().count(MediaControlsShowNoScript);
         return true;
     }
 
     if (recordMetrics == RecordMetricsBehavior::DoRecord)
-        showControlsHistogram.count(MediaControlsShowNotShown);
+        showControlsHistogram().count(MediaControlsShowNotShown);
     return false;
 }
 
 double HTMLMediaElement::volume() const
 {
     return m_volume;
 }
 
 void HTMLMediaElement::setVolume(double vol, ExceptionState& exceptionState)
 {
@@ skipping 1537 matching lines @@
 void HTMLMediaElement::rejectPlayPromises(ExceptionCode code, const String& message)
 {
     ASSERT(code == AbortError || code == NotSupportedError);
 
     for (auto& resolver: m_playResolvers)
         resolver->reject(DOMException::create(code, message));
 
     m_playResolvers.clear();
 }
 
+EnumerationHistogram& HTMLMediaElement::showControlsHistogram() const
+{
+    if (isHTMLVideoElement()) {
+        DEFINE_STATIC_LOCAL(EnumerationHistogram, histogram, ("Media.Controls.Show.Video", MediaControlsShowMax));
+        return histogram;
+    }
+
+    DEFINE_STATIC_LOCAL(EnumerationHistogram, histogram, ("Media.Controls.Show.Audio", MediaControlsShowMax));
+    return histogram;
+}
+
 void HTMLMediaElement::clearWeakMembers(Visitor* visitor)
 {
     if (!ThreadHeap::isHeapObjectAlive(m_audioSourceNode)) {
         getAudioSourceProvider().setClient(nullptr);
         m_audioSourceNode = nullptr;
     }
 }
 
 void HTMLMediaElement::AudioSourceProviderImpl::wrap(WebAudioSourceProvider* provider)
 {
@@ skipping 97 matching lines @@
 
 IntRect HTMLMediaElement::AutoplayHelperClientImpl::absoluteBoundingBoxRect() const
 {
     IntRect result;
     if (LayoutObject* object = m_element->layoutObject())
         result = object->absoluteBoundingBoxRect();
     return result;
 }
 
 } // namespace blink