[webkit-changes] [172290] branches/safari-600.1-branch/Source/WebCore

[dburkart]

Title: [172290] branches/safari-600.1-branch/Source/WebCore

Revision

172290

Author

dburk...@apple.com

Date

2014-08-07 15:22:13 -0700 (Thu, 07 Aug 2014)

Log Message

Merged r172231

Modified Paths

branches/safari-600.1-branch/Source/WebCore/ChangeLog
branches/safari-600.1-branch/Source/WebCore/html/track/VTTCue.cpp

Diff

Modified: branches/safari-600.1-branch/Source/WebCore/ChangeLog (172289 => 172290)

--- branches/safari-600.1-branch/Source/WebCore/ChangeLog	2014-08-07 22:21:25 UTC (rev 172289)
+++ branches/safari-600.1-branch/Source/WebCore/ChangeLog	2014-08-07 22:22:13 UTC (rev 172290)
@@ -1,5 +1,16 @@
 2014-08-07  Dana Burkart <dburk...@apple.com>
 
+        Merge r172231
+
+    2014-08-07  Roger Fong  <roger_f...@apple.com>
+
+            Unreviewed build fix attempt #2 following r172224.
+
+            * html/track/VTTCue.cpp:
+            (WebCore::VTTCueBox::applyCSSProperties):
+
+2014-08-07  Dana Burkart <dburk...@apple.com>
+
         Merge r172228
 
     2014-08-07  Roger Fong  <roger_f...@apple.com>

Modified: branches/safari-600.1-branch/Source/WebCore/html/track/VTTCue.cpp (172289 => 172290)

--- branches/safari-600.1-branch/Source/WebCore/html/track/VTTCue.cpp	2014-08-07 22:21:25 UTC (rev 172289)
+++ branches/safari-600.1-branch/Source/WebCore/html/track/VTTCue.cpp	2014-08-07 22:22:13 UTC (rev 172290)
@@ -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::DEFAULTCAPTIONFONTSIZE);
+    float multiplier = std::max(1.0f, m_fontSizeFromCaptionUserPrefs / 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);

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes