Changeset 143857 in webkit

Timestamp:

Feb 23, 2013, 9:31:10 PM (12 years ago)

Author:

eric.carlson@apple.com

Message:

[Mac] user preference caption style applied incorrectly
​https://bugs.webkit.org/show_bug.cgi?id=110707
<rdar://problem/13281096>

Reviewed by Maciej Stachowiak.

• html/shadow/MediaControlElements.cpp:

(WebCore::MediaControlTextTrackContainerElement::textTrackContainerElementShadowPseudoId): New

static function so the pseudo ID is available.

(WebCore::MediaControlTextTrackContainerElement::shadowPseudoId): Call textTrackContainerElementShadowPseudoId.

• html/shadow/MediaControlElements.h:

• page/CaptionUserPreferencesMac.mm:

(WebCore::CaptionUserPreferencesMac::captionsStyleSheetOverride): Style the text track container

element for cue color, edge style, and font name.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/shadow/MediaControlElements.cpp (modified) (1 diff)
• html/shadow/MediaControlElements.h (modified) (1 diff)
• page/CaptionUserPreferencesMac.mm (modified) (4 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-02-23  Eric Carlson  <eric.carlson@apple.com>
+
+        [Mac] user preference caption style applied incorrectly
+        https://bugs.webkit.org/show_bug.cgi?id=110707
+        <rdar://problem/13281096>
+
+        Reviewed by Maciej Stachowiak.
+
+        * html/shadow/MediaControlElements.cpp:
+        (WebCore::MediaControlTextTrackContainerElement::textTrackContainerElementShadowPseudoId): New
+            static function so the pseudo ID is available.
+        (WebCore::MediaControlTextTrackContainerElement::shadowPseudoId): Call textTrackContainerElementShadowPseudoId.
+        * html/shadow/MediaControlElements.h:
+
+        * page/CaptionUserPreferencesMac.mm:
+        (WebCore::CaptionUserPreferencesMac::captionsStyleSheetOverride): Style the text track container
+            element for cue color, edge style, and font name.
+
 2013-02-22  Kentaro Hara  <haraken@chromium.org>
 

trunk/Source/WebCore/html/shadow/MediaControlElements.cpp

@@ -1201 +1201 @@
 }
 
+const AtomicString& MediaControlTextTrackContainerElement::textTrackContainerElementShadowPseudoId()
+{
+    DEFINE_STATIC_LOCAL(AtomicString, id, ("-webkit-media-text-track-container", AtomicString::ConstructFromLiteral));
+    return id;
+}
+    
 const AtomicString& MediaControlTextTrackContainerElement::shadowPseudoId() const
 {
-    DEFINE_STATIC_LOCAL(AtomicString, id, ("-webkit-media-text-track-container", AtomicString::ConstructFromLiteral));
-    return id;
+    return textTrackContainerElementShadowPseudoId();
 }
 

trunk/Source/WebCore/html/shadow/MediaControlElements.h

@@ -441 +441 @@
     void updateSizes(bool forceUpdate = false);
     void createSubtrees(Document*);
+    static const AtomicString& textTrackContainerElementShadowPseudoId();
 
 private:

trunk/Source/WebCore/page/CaptionUserPreferencesMac.mm

@@ -38 +38 @@
 #import "LocalizedStrings.h"
 #import "Logging.h"
+#import "MediaControlElements.h"
 #import "PageGroup.h"
 #import "SoftLinking.h"
@@ -377 +378 @@
     String windowColor = captionsWindowCSS();
     String windowCornerRadius = windowRoundedCornerRadiusCSS();
-    String captionsColor = captionsTextColorCSS();
-    String edgeStyle = captionsTextEdgeCSS();
-    String fontName = captionsDefaultFontCSS();
-    if (!captionsColor.isEmpty() || !windowColor.isEmpty() || !windowCornerRadius.isEmpty() || !edgeStyle.isEmpty() || !fontName.isEmpty()) {
+    if (!windowColor.isEmpty() || !windowCornerRadius.isEmpty()) {
         captionsOverrideStyleSheet.append(" video::");
         captionsOverrideStyleSheet.append(TextTrackCueBox::textTrackCueBoxShadowPseudoId());
@@ -389 +387 @@
         if (!windowCornerRadius.isEmpty())
             captionsOverrideStyleSheet.append(windowCornerRadius);
+
+        captionsOverrideStyleSheet.append('}');
+    }
+    
+    String captionsColor = captionsTextColorCSS();
+    String edgeStyle = captionsTextEdgeCSS();
+    String fontName = captionsDefaultFontCSS();
+    if (!captionsColor.isEmpty() || !edgeStyle.isEmpty() || !fontName.isEmpty()) {
+        captionsOverrideStyleSheet.append(" video::");
+        captionsOverrideStyleSheet.append(MediaControlTextTrackContainerElement::textTrackContainerElementShadowPseudoId());
+        captionsOverrideStyleSheet.append('{');
+
         if (!captionsColor.isEmpty())
             captionsOverrideStyleSheet.append(captionsColor);
@@ -398 +408 @@
         captionsOverrideStyleSheet.append('}');
     }
-
+    
     LOG(Media, "CaptionUserPreferencesMac::captionsStyleSheetOverrideSetting sytle to:\n%s", captionsOverrideStyleSheet.toString().utf8().data());