Changeset 183778 in webkit

Timestamp:

May 4, 2015 4:42:56 PM (9 years ago)

Author:

dino@apple.com

Message:

Create a named CSS property for system colors
​https://bugs.webkit.org/show_bug.cgi?id=144423

Follow-up comments from Darin Adler.

• rendering/RenderThemeIOS.h: Cache a Color rather than an RGBA32.
• rendering/RenderThemeIOS.mm:

(WebCore::RenderThemeIOS::systemColor): Use "add" to avoid multiple hits on the HashMap, and
cache invalid responses so that we don't have to keep looking for non-existent colors.

• rendering/RenderThemeMac.h: Same as iOS.
• rendering/RenderThemeMac.mm:

(WebCore::RenderThemeMac::systemColor):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderThemeIOS.h (modified) (2 diffs)
• rendering/RenderThemeIOS.mm (modified) (2 diffs)
• rendering/RenderThemeMac.h (modified) (3 diffs)
• rendering/RenderThemeMac.mm (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-05-04  Dean Jackson  <dino@apple.com>
+
+        Create a named CSS property for system colors
+        https://bugs.webkit.org/show_bug.cgi?id=144423
+
+        Follow-up comments from Darin Adler.
+
+        * rendering/RenderThemeIOS.h: Cache a Color rather than an RGBA32.
+        * rendering/RenderThemeIOS.mm:
+        (WebCore::RenderThemeIOS::systemColor): Use "add" to avoid multiple hits on the HashMap, and
+        cache invalid responses so that we don't have to keep looking for non-existent colors.
+        * rendering/RenderThemeMac.h: Same as iOS.
+        * rendering/RenderThemeMac.mm:
+        (WebCore::RenderThemeMac::systemColor):
+
 2015-05-04  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebCore/rendering/RenderThemeIOS.h

@@ -112 +112 @@
 #endif
 
-    virtual Color systemColor(CSSValueID) const override;
-
 private:
     RenderThemeIOS();
@@ -121 +119 @@
     FloatRect addRoundedBorderClip(const RenderObject& box, GraphicsContext*, const IntRect&);
 
+    virtual Color systemColor(CSSValueID) const override;
+
     String m_mediaControlsScript;
     String m_mediaControlsStyleSheet;
 
-    mutable HashMap<int, RGBA32> m_systemColorCache;
+    mutable HashMap<int, Color> m_systemColorCache;
 };
 

trunk/Source/WebCore/rendering/RenderThemeIOS.mm

@@ -1312 +1312 @@
 #endif // ENABLE(VIDEO)
 
-Color RenderThemeIOS::systemColor(CSSValueID cssValueId) const
-{
-    {
-        auto it = m_systemColorCache.find(cssValueId);
-        if (it != m_systemColorCache.end())
-            return it->value;
-    }
+Color RenderThemeIOS::systemColor(CSSValueID cssValueID) const
+{
+    auto addResult = m_systemColorCache.add(cssValueID, Color());
+    if (!addResult.isNewEntry)
+        return addResult.iterator->value;
 
     Color color;
-    switch (cssValueId) {
+    switch (cssValueID) {
     case CSSValueAppleSystemBlue:
         color = [getUIColorClass() systemBlueColor].CGColor;
@@ -1348 +1346 @@
 
     if (!color.isValid())
-        color = RenderTheme::systemColor(cssValueId);
-
-    if (color.isValid())
-        m_systemColorCache.set(cssValueId, color.rgb());
-
-    return color;
+        color = RenderTheme::systemColor(cssValueID);
+
+    addResult.iterator->value = color;
+
+    return addResult.iterator->value;
 }
 

trunk/Source/WebCore/rendering/RenderThemeMac.h

@@ -97 +97 @@
     virtual IntRect progressBarRectForBounds(const RenderObject&, const IntRect&) const override;
 
-    virtual Color systemColor(CSSValueID) const override;
     // Controls color values returned from platformFocusRingColor(). systemColor() will be used when false.
     bool usesTestModeFocusRingColor() const;
@@ -179 +178 @@
 
     FloatRect convertToPaintingRect(const RenderObject& inputRenderer, const RenderObject& partRenderer, const FloatRect& inputRect, const IntRect&) const;
+
+    virtual Color systemColor(CSSValueID) const override;
 
     // Get the control size based off the font. Used by some of the controls (like buttons).
@@ -248 +249 @@
     bool m_isSliderThumbVerticalPressed;
 
-    mutable HashMap<int, RGBA32> m_systemColorCache;
+    mutable HashMap<int, Color> m_systemColorCache;
 
     RetainPtr<WebCoreRenderThemeNotificationObserver> m_notificationObserver;

trunk/Source/WebCore/rendering/RenderThemeMac.mm

@@ -456 +456 @@
 }
 
-Color RenderThemeMac::systemColor(CSSValueID cssValueId) const
-{
-    {
-        auto it = m_systemColorCache.find(cssValueId);
-        if (it != m_systemColorCache.end())
-            return it->value;
-    }
+Color RenderThemeMac::systemColor(CSSValueID cssValueID) const
+{
+    auto addResult = m_systemColorCache.add(cssValueID, Color());
+    if (!addResult.isNewEntry)
+        return addResult.iterator->value;
 
     Color color;
-    switch (cssValueId) {
+    switch (cssValueID) {
     case CSSValueActiveborder:
         color = convertNSColorToColor([NSColor keyboardFocusIndicatorColor]);
@@ -603 +601 @@
 
     if (!color.isValid())
-        color = RenderTheme::systemColor(cssValueId);
-
-    if (color.isValid())
-        m_systemColorCache.set(cssValueId, color.rgb());
-
-    return color;
+        color = RenderTheme::systemColor(cssValueID);
+
+    addResult.iterator->value = color;
+
+    return addResult.iterator->value;
 }