Expose APIs for text track settings

Source/core/html/track/vtt/VTTCue.cpp

 /*
  * Copyright (c) 2013, Opera Software ASA. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 20 matching lines @@
 #include "core/html/track/vtt/VTTCue.h"
 
 #include "bindings/core/v8/ExceptionMessages.h"
 #include "bindings/core/v8/ExceptionStatePlaceholder.h"
 #include "bindings/core/v8/UnionTypesCore.h"
 #include "core/CSSPropertyNames.h"
 #include "core/CSSValueKeywords.h"
 #include "core/dom/DocumentFragment.h"
 #include "core/dom/NodeTraversal.h"
 #include "core/events/Event.h"
+#include "core/frame/Settings.h"
 #include "core/frame/UseCounter.h"
 #include "core/html/HTMLDivElement.h"
 #include "core/html/track/TextTrack.h"
 #include "core/html/track/TextTrackCueList.h"
 #include "core/html/track/vtt/VTTElement.h"
 #include "core/html/track/vtt/VTTParser.h"
 #include "core/html/track/vtt/VTTRegionList.h"
 #include "core/html/track/vtt/VTTScanner.h"
 #include "core/layout/LayoutVTTCue.h"
 #include "platform/FloatConversion.h"
@@ skipping 78 matching lines @@
 
 static bool isInvalidPercentage(double value, ExceptionState& exceptionState)
 {
     if (isInvalidPercentage(value)) {
         exceptionState.throwDOMException(IndexSizeError, ExceptionMessages::indexOutsideRange<double>("value", value, 0, ExceptionMessages::InclusiveBound, 100, ExceptionMessages::InclusiveBound));
         return true;
     }
     return false;
 }
 
+// Sets inline CSS properties on passed in element if value is not an empty string
+static void setInlineStylePropertyIfNotEmpty(PassRefPtrWillBeRawPtr<HTMLDivElement> element,

[philipj_slow, 2015/03/17 02:22:31]

Just Element& as the argument type is OK.

[srivats, 2015/03/18 01:58:13]

Done.

+    CSSPropertyID propertyID, const String& value)
+{
+    if (!value.isEmpty())
+        element->setInlineStyleProperty(propertyID, value, true);
+}
+
 VTTCueBox::VTTCueBox(Document& document, VTTCue* cue)
     : HTMLDivElement(document)
     , m_cue(cue)
 {
     setShadowPseudoId(AtomicString("-webkit-media-text-track-display", AtomicString::ConstructFromLiteral));
 }
 
 void VTTCueBox::applyCSSProperties(const VTTDisplayParameters& displayParameters)
 {
     // FIXME: Apply all the initial CSS positioning properties. http://wkb.ug/79916
@@ skipping 680 matching lines @@
 
     // FIXME(BUG 79916): Text runs must be wrapped according to the CSS
     // line-wrapping rules, except that additionally, regardless of the value of
     // the 'white-space' property, lines must be wrapped at the edge of their
     // containing blocks, even if doing so requires splitting a word where there
     // is no line breaking opportunity. (Thus, normally text wraps as needed,
     // but if there is a particularly long word, it does not overflow as it
     // normally would in CSS, it is instead forcibly wrapped at the box's edge.)
     displayTree->applyCSSProperties(displayParameters);
 
+    // Apply user override settings for text tracks
+    applyUserOverrideCSSProperties();
+
     m_displayTreeShouldChange = false;
 
     // 10.15. Let cue's text track cue display state have the CSS boxes in
     // boxes.
     return displayTree.release();
 }
 
 void VTTCue::removeDisplayTree(RemovalNotification removalNotification)
 {
     if (removalNotification == NotifyRegion && track()->regions()) {
@@ skipping 272 matching lines @@
 }
 
 DEFINE_TRACE(VTTCue)
 {
     visitor->trace(m_vttNodeTree);
     visitor->trace(m_cueBackgroundBox);
     visitor->trace(m_displayTree);
     TextTrackCue::trace(visitor);
 }
 
+void VTTCue::applyUserOverrideCSSProperties()
+{
+    Settings* settings = m_cueBackgroundBox->document().settings();

[philipj_slow, 2015/03/17 02:22:31]

You can use just document(), see VTTCue::document(),

[srivats, 2015/03/18 01:58:13]

Done.

+    if (settings) {

[philipj_slow, 2015/03/17 02:22:31]

if (!settings) return;

[srivats, 2015/03/18 01:58:13]

Done.

+        setInlineStylePropertyIfNotEmpty(m_cueBackgroundBox,
+            CSSPropertyBackgroundColor, settings->textTrackBackgroundColor());
+        setInlineStylePropertyIfNotEmpty(m_cueBackgroundBox,
+            CSSPropertyBackgroundColor, settings->textTrackBackgroundColor());
+        setInlineStylePropertyIfNotEmpty(m_cueBackgroundBox,
+            CSSPropertyFontFamily, settings->textTrackFontFamily());
+        setInlineStylePropertyIfNotEmpty(m_cueBackgroundBox,
+            CSSPropertyFontStyle, settings->textTrackFontStyle());
+        setInlineStylePropertyIfNotEmpty(m_cueBackgroundBox,
+            CSSPropertyFontVariant, settings->textTrackFontVariant());
+        setInlineStylePropertyIfNotEmpty(m_cueBackgroundBox,
+            CSSPropertyColor, settings->textTrackTextColor());
+        setInlineStylePropertyIfNotEmpty(m_cueBackgroundBox,
+            CSSPropertyTextShadow, settings->textTrackTextShadow());
+        setInlineStylePropertyIfNotEmpty(m_cueBackgroundBox,
+            CSSPropertyFontSize, settings->textTrackTextSize());
+    }
+}
+
 } // namespace blink