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

Unified Diff: Source/core/layout/LayoutTextTrackContainer.cpp

Issue 949203002: Separate the text track container from the media controls (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: address nits Created 5 years, 9 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/layout/LayoutMedia.cpp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/layout/LayoutTextTrackContainer.cpp
diff --git a/Source/core/layout/LayoutTextTrackContainer.cpp b/Source/core/layout/LayoutTextTrackContainer.cpp
index eb3dc1d28566749abf540f0ae454badbb6ab0388..b0db395a576913bcd205e3f93a8329ad13da4494 100644
--- a/Source/core/layout/LayoutTextTrackContainer.cpp
+++ b/Source/core/layout/LayoutTextTrackContainer.cpp
@@ -47,11 +47,10 @@ void LayoutTextTrackContainer::layout()
DeprecatedScheduleStyleRecalcDuringLayout marker(node()->document().lifecycle());
- // Overlay enclosure -> Media controls -> Media element
- LayoutObject* mediaElementLayoutObject = parent()->parent()->parent();
- if (!mediaElementLayoutObject || !mediaElementLayoutObject->isVideo())
+ LayoutObject* mediaLayoutObject = parent();
+ if (!mediaLayoutObject || !mediaLayoutObject->isVideo())
return;
- if (updateSizes(toLayoutVideo(*mediaElementLayoutObject)))
+ if (updateSizes(toLayoutVideo(*mediaLayoutObject)))
toElement(node())->setInlineStyleProperty(CSSPropertyFontSize, m_fontSize, CSSPrimitiveValue::CSS_PX);
}
« no previous file with comments | « Source/core/layout/LayoutMedia.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698