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

Unified Diff: Source/core/html/HTMLMediaElement.cpp

Issue 26270004: Element should not use confusingAndOftenMisusedAttached (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: rebase Created 7 years, 2 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/html/HTMLMediaElement.h ('k') | Source/core/rendering/RenderVideo.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/html/HTMLMediaElement.cpp
diff --git a/Source/core/html/HTMLMediaElement.cpp b/Source/core/html/HTMLMediaElement.cpp
index b3769c1f05afc141e6e8a2d1791f0b4d88711711..d9d459335f990595e378f1b81114f42d2be46410 100644
--- a/Source/core/html/HTMLMediaElement.cpp
+++ b/Source/core/html/HTMLMediaElement.cpp
@@ -272,7 +272,7 @@ HTMLMediaElement::HTMLMediaElement(const QualifiedName& tagName, Document& docum
, m_playing(false)
, m_shouldDelayLoadEvent(false)
, m_haveFiredLoadedData(false)
- , m_inActiveDocument(true)
+ , m_active(true)
, m_autoplaying(true)
, m_muted(false)
, m_paused(true)
@@ -486,7 +486,7 @@ Node::InsertionNotificationRequest HTMLMediaElement::insertedInto(ContainerNode*
HTMLElement::insertedInto(insertionPoint);
if (insertionPoint->inDocument()) {
- m_inActiveDocument = true;
+ m_active = true;
if (!getAttribute(srcAttr).isEmpty() && m_networkState == NETWORK_EMPTY)
scheduleDelayedAction(LoadMediaResource);
@@ -500,7 +500,7 @@ void HTMLMediaElement::removedFrom(ContainerNode* insertionPoint)
{
LOG(Media, "HTMLMediaElement::removedFrom");
- m_inActiveDocument = false;
+ m_active = false;
if (insertionPoint->inDocument()) {
configureMediaControls();
if (m_networkState > NETWORK_EMPTY)
@@ -1224,7 +1224,7 @@ void HTMLMediaElement::endIgnoringTrackDisplayUpdateRequests()
{
ASSERT(m_ignoreTrackDisplayUpdate);
--m_ignoreTrackDisplayUpdate;
- if (!m_ignoreTrackDisplayUpdate && m_inActiveDocument)
+ if (!m_ignoreTrackDisplayUpdate && m_active)
updateActiveTextTrackCues(currentTime());
}
@@ -3411,7 +3411,7 @@ void HTMLMediaElement::stop()
{
LOG(Media, "HTMLMediaElement::stop");
- m_inActiveDocument = false;
+ m_active = false;
userCancelledLoad();
// Stop the playback without generating events
« no previous file with comments | « Source/core/html/HTMLMediaElement.h ('k') | Source/core/rendering/RenderVideo.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698