Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(447)

Side by Side Diff: third_party/WebKit/Source/core/html/AutoplayUmaHelper.cpp

Issue 2249223003: Fix a crash in AutoplayUmaHelper when releasing visibility observer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: wrapPersistent => wrapWeakPersistent Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "core/html/AutoplayUmaHelper.h" 5 #include "core/html/AutoplayUmaHelper.h"
6 6
7 #include "core/dom/Document.h" 7 #include "core/dom/Document.h"
8 #include "core/dom/ElementVisibilityObserver.h" 8 #include "core/dom/ElementVisibilityObserver.h"
9 #include "core/events/Event.h" 9 #include "core/events/Event.h"
10 #include "core/frame/LocalDOMWindow.h" 10 #include "core/frame/LocalDOMWindow.h"
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
74 return; 74 return;
75 75
76 if (oldDocument.domWindow()) 76 if (oldDocument.domWindow())
77 oldDocument.domWindow()->removeEventListener(EventTypeNames::unload, thi s, false); 77 oldDocument.domWindow()->removeEventListener(EventTypeNames::unload, thi s, false);
78 if (m_element && m_element->document().domWindow()) 78 if (m_element && m_element->document().domWindow())
79 m_element->document().domWindow()->addEventListener(EventTypeNames::unlo ad, this, false); 79 m_element->document().domWindow()->addEventListener(EventTypeNames::unlo ad, this, false);
80 } 80 }
81 81
82 void AutoplayUmaHelper::onVisibilityChangedForVideoMutedPlayMethod(bool isVisibl e) 82 void AutoplayUmaHelper::onVisibilityChangedForVideoMutedPlayMethod(bool isVisibl e)
83 { 83 {
84 if (!isVisible) 84 if (!isVisible || !m_videoMutedPlayMethodVisibilityObserver)
85 return; 85 return;
86 86
87 recordVideoAutoplayMutedPlayMethodBecomesVisibleUma(true); 87 recordVideoAutoplayMutedPlayMethodBecomesVisibleUma(true);
88 m_videoMutedPlayMethodVisibilityObserver->stop(); 88 m_videoMutedPlayMethodVisibilityObserver->stop();
89 m_videoMutedPlayMethodVisibilityObserver = nullptr; 89 m_videoMutedPlayMethodVisibilityObserver = nullptr;
90 if (m_element && m_element->document().domWindow()) 90 if (m_element && m_element->document().domWindow())
91 m_element->document().domWindow()->removeEventListener(EventTypeNames::u nload, this, false); 91 m_element->document().domWindow()->removeEventListener(EventTypeNames::u nload, this, false);
92 } 92 }
93 93
94 void AutoplayUmaHelper::handleEvent(ExecutionContext* executionContext, Event* e vent) 94 void AutoplayUmaHelper::handleEvent(ExecutionContext* executionContext, Event* e vent)
(...skipping 13 matching lines...) Expand all
108 m_videoMutedPlayMethodVisibilityObserver->stop(); 108 m_videoMutedPlayMethodVisibilityObserver->stop();
109 m_videoMutedPlayMethodVisibilityObserver = nullptr; 109 m_videoMutedPlayMethodVisibilityObserver = nullptr;
110 m_element->document().domWindow()->removeEventListener(EventTypeNames::u nload, this, false); 110 m_element->document().domWindow()->removeEventListener(EventTypeNames::u nload, this, false);
111 } 111 }
112 } 112 }
113 113
114 void AutoplayUmaHelper::handlePlayingEvent() 114 void AutoplayUmaHelper::handlePlayingEvent()
115 { 115 {
116 if (m_source == AutoplaySource::Method && m_element->isHTMLVideoElement() && m_element->muted()) { 116 if (m_source == AutoplaySource::Method && m_element->isHTMLVideoElement() && m_element->muted()) {
117 if (!m_videoMutedPlayMethodVisibilityObserver) { 117 if (!m_videoMutedPlayMethodVisibilityObserver) {
118 m_videoMutedPlayMethodVisibilityObserver = new ElementVisibilityObse rver(m_element, WTF::bind(&AutoplayUmaHelper::onVisibilityChangedForVideoMutedPl ayMethod, wrapPersistent(this))); 118 m_videoMutedPlayMethodVisibilityObserver = new ElementVisibilityObse rver(m_element, WTF::bind(&AutoplayUmaHelper::onVisibilityChangedForVideoMutedPl ayMethod, wrapWeakPersistent(this)));
119 m_videoMutedPlayMethodVisibilityObserver->start(); 119 m_videoMutedPlayMethodVisibilityObserver->start();
120 m_element->document().domWindow()->addEventListener(EventTypeNames:: unload, this, false); 120 m_element->document().domWindow()->addEventListener(EventTypeNames:: unload, this, false);
121 } 121 }
122 } 122 }
123 m_element->removeEventListener(EventTypeNames::playing, this, false); 123 m_element->removeEventListener(EventTypeNames::playing, this, false);
124 } 124 }
125 125
126 DEFINE_TRACE(AutoplayUmaHelper) 126 DEFINE_TRACE(AutoplayUmaHelper)
127 { 127 {
128 EventListener::trace(visitor); 128 EventListener::trace(visitor);
129 visitor->trace(m_element); 129 visitor->trace(m_element);
130 visitor->trace(m_videoMutedPlayMethodVisibilityObserver); 130 visitor->trace(m_videoMutedPlayMethodVisibilityObserver);
131 } 131 }
132 132
133 } // namespace blink 133 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698