Title: [172288] branches/safari-600.1-branch/Source/WebCore
Diff
Modified: branches/safari-600.1-branch/Source/WebCore/ChangeLog (172287 => 172288)
--- branches/safari-600.1-branch/Source/WebCore/ChangeLog 2014-08-07 22:17:50 UTC (rev 172287)
+++ branches/safari-600.1-branch/Source/WebCore/ChangeLog 2014-08-07 22:20:11 UTC (rev 172288)
@@ -1,5 +1,19 @@
2014-08-07 Dana Burkart <[email protected]>
+ Merge r172228
+
+ 2014-08-07 Roger Fong <[email protected]>
+
+ Unreviewed build fix following r172224.
+
+ * html/track/TextTrackCueGeneric.cpp:
+ (WebCore::TextTrackCueGenericBoxElement::applyCSSProperties):
+ * html/track/VTTCue.cpp:
+ (WebCore::VTTCueBox::applyCSSProperties):
+ * html/track/VTTCue.h:
+
+2014-08-07 Dana Burkart <[email protected]>
+
Merge r172224
2014-08-06 Roger Fong <[email protected]>
Modified: branches/safari-600.1-branch/Source/WebCore/html/track/TextTrackCueGeneric.cpp (172287 => 172288)
--- branches/safari-600.1-branch/Source/WebCore/html/track/TextTrackCueGeneric.cpp 2014-08-07 22:17:50 UTC (rev 172287)
+++ branches/safari-600.1-branch/Source/WebCore/html/track/TextTrackCueGeneric.cpp 2014-08-07 22:20:11 UTC (rev 172288)
@@ -78,7 +78,7 @@
setInlineStyleProperty(CSSPropertyLeft, static_cast<float>(cue->position()), CSSPrimitiveValue::CSS_PERCENTAGE);
setInlineStyleProperty(CSSPropertyTop, static_cast<float>(cue->line()), CSSPrimitiveValue::CSS_PERCENTAGE);
- float authorFontSize = std::max(VTTCueBox::DEFAULTFONTSIZE, static_cast<float>(videoSize.height() * cue->baseFontSizeRelativeToVideoHeight() / 100));
+ float authorFontSize = std::max(DEFAULTCAPTIONFONTSIZE, static_cast<float>(videoSize.height() * cue->baseFontSizeRelativeToVideoHeight() / 100));
if (cue->fontSizeMultiplier())
authorFontSize *= cue->fontSizeMultiplier() / 100;
Modified: branches/safari-600.1-branch/Source/WebCore/html/track/VTTCue.cpp (172287 => 172288)
--- branches/safari-600.1-branch/Source/WebCore/html/track/VTTCue.cpp 2014-08-07 22:17:50 UTC (rev 172287)
+++ branches/safari-600.1-branch/Source/WebCore/html/track/VTTCue.cpp 2014-08-07 22:20:11 UTC (rev 172288)
@@ -170,7 +170,7 @@
// the 'left' property must be set to left
setInlineStyleProperty(CSSPropertyLeft, static_cast<double>(position.first), CSSPrimitiveValue::CSS_PERCENTAGE);
- float multiplier = std::max(1.0f, m_fontSizeFromCaptionUserPrefs / VTTCueBox::DEFAULTFONTSIZE);
+ float multiplier = std::max(1.0f, m_fontSizeFromCaptionUserPrefs / VTTCueBox::DEFAULTCAPTIONFONTSIZE);
// the 'width' property must be set to width, and the 'height' property must be set to height
if (m_cue.vertical() == horizontalKeyword()) {
setInlineStyleProperty(CSSPropertyWidth, static_cast<double>(m_cue.getCSSSize() * multiplier), CSSPrimitiveValue::CSS_PERCENTAGE);
Modified: branches/safari-600.1-branch/Source/WebCore/html/track/VTTCue.h (172287 => 172288)
--- branches/safari-600.1-branch/Source/WebCore/html/track/VTTCue.h 2014-08-07 22:17:50 UTC (rev 172287)
+++ branches/safari-600.1-branch/Source/WebCore/html/track/VTTCue.h 2014-08-07 22:20:11 UTC (rev 172288)
@@ -49,6 +49,9 @@
class VTTScanner;
class WebVTTCueData;
+// This default value must be the same as the one specified in mediaControlsApple.css for -webkit-media-controls-closed-captions-container
+const static float DEFAULTCAPTIONFONTSIZE = 10;
+
// ----------------------------
class VTTCueBox : public HTMLElement {
@@ -68,13 +71,8 @@
VTTCue& m_cue;
int m_fontSizeFromCaptionUserPrefs;
-
- static const float DEFAULTFONTSIZE;
};
-// This default value must be the same as the one specified in mediaControlsApple.css for -webkit-media-controls-closed-captions-container
-const float VTTCueBox::DEFAULTFONTSIZE = 10;
-
// ----------------------------
class VTTCue : public TextTrackCue {
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
