Changeset 142910 in webkit

Timestamp:

Feb 14, 2013, 1:51:49 PM (12 years ago)

Author:

eric.carlson@apple.com

Message:

[Mac] adjust caption color user preference calculation
​https://bugs.webkit.org/show_bug.cgi?id=109840

Reviewed by Dean Jackson.

No new tests, it isn't possible to test this with DRT.

• page/CaptionUserPreferencesMac.mm:

(WebCore::CaptionUserPreferencesMac::captionsWindowCSS): The color is "important" if either the

color or opacity are supposed to override.

(WebCore::CaptionUserPreferencesMac::captionsBackgroundCSS): Ditto.
(WebCore::CaptionUserPreferencesMac::captionsTextColor): Ditto.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/CaptionUserPreferencesMac.mm (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-02-14  Eric Carlson  <eric.carlson@apple.com>
+
+        [Mac] adjust caption color user preference calculation
+        https://bugs.webkit.org/show_bug.cgi?id=109840
+
+        Reviewed by Dean Jackson.
+
+        No new tests, it isn't possible to test this with DRT.
+
+        * page/CaptionUserPreferencesMac.mm:
+        (WebCore::CaptionUserPreferencesMac::captionsWindowCSS): The color is "important" if either the
+            color or opacity are supposed to override.
+        (WebCore::CaptionUserPreferencesMac::captionsBackgroundCSS): Ditto.
+        (WebCore::CaptionUserPreferencesMac::captionsTextColor): Ditto.
+
 2013-02-14  Cosmin Truta  <ctruta@rim.com>
 

trunk/Source/WebCore/page/CaptionUserPreferencesMac.mm

@@ -162 +162 @@
         windowColor = Color::transparent;
 
+    bool important = behavior == kMACaptionAppearanceBehaviorUseValue;
     CGFloat opacity = MACaptionAppearanceGetWindowOpacity(kMACaptionAppearanceDomainUser, &behavior);
-    String windowStyle = colorPropertyCSS(CSSPropertyBackgroundColor, Color(windowColor.red(), windowColor.green(), windowColor.blue(), static_cast<int>(opacity * 255)), behavior == kMACaptionAppearanceBehaviorUseValue);
+    if (!important)
+        important = behavior == kMACaptionAppearanceBehaviorUseValue;
+    String windowStyle = colorPropertyCSS(CSSPropertyBackgroundColor, Color(windowColor.red(), windowColor.green(), windowColor.blue(), static_cast<int>(opacity * 255)), important);
 
     if (!opacity)
@@ -189 +192 @@
         backgroundColor = defaultBackgroundColor;
 
+    bool important = behavior == kMACaptionAppearanceBehaviorUseValue;
     CGFloat opacity = MACaptionAppearanceGetBackgroundOpacity(kMACaptionAppearanceDomainUser, 0);
-    String backgroundStyle = colorPropertyCSS(CSSPropertyBackgroundColor, Color(backgroundColor.red(), backgroundColor.green(), backgroundColor.blue(), static_cast<int>(opacity * 255)), behavior == kMACaptionAppearanceBehaviorUseValue);
+    if (!important)
+        important = behavior == kMACaptionAppearanceBehaviorUseValue;
+    String backgroundStyle = colorPropertyCSS(CSSPropertyBackgroundColor, Color(backgroundColor.red(), backgroundColor.green(), backgroundColor.blue(), static_cast<int>(opacity * 255)), important);
 
     if (!opacity)
@@ -215 +221 @@
         textColor = Color::white;
     
+    important = behavior == kMACaptionAppearanceBehaviorUseValue;
     CGFloat opacity = MACaptionAppearanceGetForegroundOpacity(kMACaptionAppearanceDomainUser, &behavior);
-    important = behavior == kMACaptionAppearanceBehaviorUseValue;
+    if (!important)
+        important = behavior == kMACaptionAppearanceBehaviorUseValue;
     return Color(textColor.red(), textColor.green(), textColor.blue(), static_cast<int>(opacity * 255));
 }