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

Unified Diff: Source/core/html/track/TextTrackRegion.cpp

Issue 25798003: Enable WebVTT regions for runtime testing, updated tests and minor fixes (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Revert Logging 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
Index: Source/core/html/track/TextTrackRegion.cpp
diff --git a/Source/core/html/track/TextTrackRegion.cpp b/Source/core/html/track/TextTrackRegion.cpp
index 33a079b85dbe55a108fc73ea1df4aefa992d4dc7..66869ae5fc1b7c3ee833c3b5014a5a21f6fa2e3b 100644
--- a/Source/core/html/track/TextTrackRegion.cpp
+++ b/Source/core/html/track/TextTrackRegion.cpp
@@ -29,9 +29,6 @@
*/
#include "config.h"
-
-#if ENABLE(WEBVTT_REGIONS)
-
#include "core/html/track/TextTrackRegion.h"
#include "bindings/v8/ExceptionState.h"
@@ -358,7 +355,7 @@ const AtomicString& TextTrackRegion::textTrackRegionShadowPseudoId()
PassRefPtr<HTMLDivElement> TextTrackRegion::getDisplayTree()
{
if (!m_regionDisplayTree) {
- m_regionDisplayTree = HTMLDivElement::create(ownerDocument());
+ m_regionDisplayTree = HTMLDivElement::create(*ownerDocument());
prepareRegionDisplayTree();
}
@@ -398,7 +395,7 @@ void TextTrackRegion::displayLastTextTrackCueBox()
// property to move elements. We should just scroll the text track cues on the
// compositor with an animation.
- if (!m_scrollTimer.isActive())
+ if (m_scrollTimer.isActive())
return;
// If it's a scrolling region, add the scrolling class.
@@ -466,7 +463,7 @@ void TextTrackRegion::prepareRegionDisplayTree()
// The cue container is used to wrap the cues and it is the object which is
// gradually scrolled out as multiple cues are appended to the region.
- m_cueContainer = HTMLDivElement::create(ownerDocument());
+ m_cueContainer = HTMLDivElement::create(*ownerDocument());
m_cueContainer->setInlineStyleProperty(CSSPropertyTop,
0.0,
CSSPrimitiveValue::CSS_PX);
@@ -506,5 +503,3 @@ void TextTrackRegion::scrollTimerFired(Timer<TextTrackRegion>*)
}
} // namespace WebCore
-
-#endif

Powered by Google App Engine
This is Rietveld 408576698