Expose APIs for text track settings

Source/core/css/resolver/StyleResolver.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com)
  * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com)
  * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved.
  * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
  * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org>
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  * Copyright (c) 2011, Code Aurora Forum. All rights reserved.
  * Copyright (C) Research In Motion Limited 2011. All rights reserved.
@@ skipping 59 matching lines @@
 #include "core/css/resolver/ViewportStyleResolver.h"
 #include "core/dom/CSSSelectorWatch.h"
 #include "core/dom/FirstLetterPseudoElement.h"
 #include "core/dom/NodeLayoutStyle.h"
 #include "core/dom/StyleEngine.h"
 #include "core/dom/Text.h"
 #include "core/dom/shadow/ElementShadow.h"
 #include "core/dom/shadow/ShadowRoot.h"
 #include "core/frame/FrameView.h"
 #include "core/frame/LocalFrame.h"
+#include "core/frame/Settings.h"
 #include "core/html/HTMLIFrameElement.h"
 #include "core/inspector/InspectorInstrumentation.h"
 #include "core/layout/LayoutView.h"
 #include "core/layout/style/KeyframeList.h"
 #include "core/svg/SVGDocumentExtensions.h"
 #include "core/svg/SVGElement.h"
 #include "platform/RuntimeEnabledFeatures.h"
 #include "wtf/StdLibExtras.h"
 
 namespace {
@@ skipping 918 matching lines @@
 {
     for (const auto& interpolationEntry : activeInterpolations) {
         CSSPropertyID property = interpolationEntry.key;
         if (!CSSPropertyPriorityData<priority>::propertyHasPriority(property))
             continue;
         const StyleInterpolation* interpolation = toStyleInterpolation(interpolationEntry.value.get());
         interpolation->apply(state);
     }
 }
 
-static inline bool isValidCueStyleProperty(CSSPropertyID id)
+static inline bool isValidCueStyleProperty(CSSPropertyID id, bool textTrackIgnoreAuthorStyle)
 {
+    if (textTrackIgnoreAuthorStyle)
+        return false;
     switch (id) {
     case CSSPropertyBackground:
     case CSSPropertyBackgroundAttachment:
     case CSSPropertyBackgroundClip:
     case CSSPropertyBackgroundColor:
     case CSSPropertyBackgroundImage:
     case CSSPropertyBackgroundOrigin:
     case CSSPropertyBackgroundPosition:
     case CSSPropertyBackgroundPositionX:
     case CSSPropertyBackgroundPositionY:
@@ skipping 209 matching lines @@
         StylePropertySet::PropertyReference current = properties->propertyAt(i);
         if (isImportant != current.isImportant())
             continue;
 
         CSSPropertyID property = current.id();
         if (property == CSSPropertyAll) {
             applyAllProperty<priority>(state, current.value(), inheritedOnly);
             continue;
         }
 
-        if (propertyWhitelistType == PropertyWhitelistCue && !isValidCueStyleProperty(property))
+        if (propertyWhitelistType == PropertyWhitelistCue && !isValidCueStyleProperty(property, shouldIgnoreTextTrackAuthorStyle()))

[philipj_slow, 2015/03/25 16:29:20]

When structured like this there's no reason to pass the bool to
isValidCueStyleProperty, instead just check it before the call.

Can you also verify if this still lets through the style in mediaContros.css,
like ::cue { background-color: rgba(0, 0, 0, 0.8) }? If it doesn't I presume
you'll have to also test if we're currently parsing a UA style sheet or not.

[srivats, 2015/03/26 01:36:02]

Done.

             continue;
+
         if (propertyWhitelistType == PropertyWhitelistFirstLetter && !isValidFirstLetterStyleProperty(property))
             continue;
 
         if (inheritedOnly && !current.isInherited()) {
             // If the property value is explicitly inherited, we need to apply further non-inherited properties
             // as they might override the value inherited here. For this reason we don't allow declarations with
             // explicitly inherited properties to be cached.
             ASSERT(!current.value()->isInheritedValue());
             continue;
         }
@@ skipping 219 matching lines @@
 
 bool StyleResolver::mediaQueryAffectedByViewportChange() const
 {
     for (unsigned i = 0; i < m_viewportDependentMediaQueryResults.size(); ++i) {
         if (m_medium->eval(m_viewportDependentMediaQueryResults[i]->expression()) != m_viewportDependentMediaQueryResults[i]->result())
             return true;
     }
     return false;
 }
 
+bool StyleResolver::shouldIgnoreTextTrackAuthorStyle()
+{
+    Settings* settings = document().settings();
+    if (!settings)
+        return false;
+    // Ignore author specified settings for text tracks when any of the user settings are present.
+    if (!settings->textTrackBackgroundColor().isEmpty()
+        || !settings->textTrackFontFamily().isEmpty()
+        || !settings->textTrackFontStyle().isEmpty()
+        || !settings->textTrackFontVariant().isEmpty()
+        || !settings->textTrackTextColor().isEmpty()
+        || !settings->textTrackTextShadow().isEmpty()
+        || !settings->textTrackTextSize().isEmpty())
+        return true;
+    return false;
+}
+
 DEFINE_TRACE(StyleResolver)
 {
 #if ENABLE(OILPAN)
     visitor->trace(m_matchedPropertiesCache);
     visitor->trace(m_viewportDependentMediaQueryResults);
     visitor->trace(m_selectorFilter);
     visitor->trace(m_viewportStyleResolver);
     visitor->trace(m_features);
     visitor->trace(m_siblingRuleSet);
     visitor->trace(m_uncommonAttributeRuleSet);
     visitor->trace(m_watchedSelectorsRules);
     visitor->trace(m_treeBoundaryCrossingRules);
     visitor->trace(m_styleResourceLoader);
     visitor->trace(m_styleSharingLists);
     visitor->trace(m_pendingStyleSheets);
     visitor->trace(m_document);
 #endif
 }
 
 } // namespace blink