| Index: third_party/WebKit/Source/core/html/HTMLMediaElement.cpp
|
| diff --git a/third_party/WebKit/Source/core/html/HTMLMediaElement.cpp b/third_party/WebKit/Source/core/html/HTMLMediaElement.cpp
|
| index a3ef751b91ac82f20e7da58e4994b27fe026dc21..b61f709be202125c3164f3396979f8f9c5b64b66 100644
|
| --- a/third_party/WebKit/Source/core/html/HTMLMediaElement.cpp
|
| +++ b/third_party/WebKit/Source/core/html/HTMLMediaElement.cpp
|
| @@ -2190,29 +2190,27 @@ void HTMLMediaElement::setLoop(bool 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;
|
| }
|
|
|
| @@ -3759,6 +3757,17 @@ void HTMLMediaElement::rejectPlayPromises(ExceptionCode code, const String& mess
|
| 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)) {
|
|
|