[Win] REGRESSION(r232486) 'WebCore::RenderTheme::activeListBoxSelectionBackgroundColo...
authortimothy@apple.com <timothy@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 5 Jun 2018 04:12:47 +0000 (04:12 +0000)
committertimothy@apple.com <timothy@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 5 Jun 2018 04:12:47 +0000 (04:12 +0000)
https://bugs.webkit.org/show_bug.cgi?id=186296

Unreviewed build fix.

* platform/win/PopupMenuWin.cpp:
(WebCore::PopupMenuWin::paint):
* rendering/RenderThemeWin.cpp:
(WebCore::RenderThemeWin::platformInactiveSelectionForegroundColor const):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@232500 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/platform/win/PopupMenuWin.cpp
Source/WebCore/rendering/RenderThemeWin.cpp

index 2903204..ab142c5 100644 (file)
@@ -1,3 +1,15 @@
+2018-06-04  Timothy Hatcher  <timothy@apple.com>
+
+        [Win] REGRESSION(r232486) 'WebCore::RenderTheme::activeListBoxSelectionBackgroundColor': function does not take 0 arguments
+        https://bugs.webkit.org/show_bug.cgi?id=186296
+
+        Unreviewed build fix.
+
+        * platform/win/PopupMenuWin.cpp:
+        (WebCore::PopupMenuWin::paint):
+        * rendering/RenderThemeWin.cpp:
+        (WebCore::RenderThemeWin::platformInactiveSelectionForegroundColor const):
+
 2018-06-04  Chris Dumez  <cdumez@apple.com>
 
         Rename "Cross-Origin-Options" HTTP header to "Cross-Origin-Window-Policy"
index f29406a..02f099d 100644 (file)
@@ -621,8 +621,8 @@ void PopupMenuWin::paint(const IntRect& damageRect, HDC hdc)
         Color optionBackgroundColor, optionTextColor;
         PopupMenuStyle itemStyle = client()->itemStyle(index);
         if (index == focusedIndex()) {
-            optionBackgroundColor = RenderTheme::singleton().activeListBoxSelectionBackgroundColor();
-            optionTextColor = RenderTheme::singleton().activeListBoxSelectionForegroundColor();
+            optionBackgroundColor = RenderTheme::singleton().activeListBoxSelectionBackgroundColor({ });
+            optionTextColor = RenderTheme::singleton().activeListBoxSelectionForegroundColor({ });
         } else {
             optionBackgroundColor = itemStyle.backgroundColor();
             optionTextColor = itemStyle.foregroundColor();
index f14a38e..98cb15a 100644 (file)
@@ -311,9 +311,9 @@ Color RenderThemeWin::platformActiveSelectionForegroundColor(OptionSet<StyleColo
     return Color(GetRValue(color), GetGValue(color), GetBValue(color));
 }
 
-Color RenderThemeWin::platformInactiveSelectionForegroundColor(OptionSet<StyleColor::Options>) const
+Color RenderThemeWin::platformInactiveSelectionForegroundColor(OptionSet<StyleColor::Options> options) const
 {
-    return platformActiveSelectionForegroundColor();
+    return platformActiveSelectionForegroundColor(options);
 }
 
 static void fillFontDescription(FontCascadeDescription& fontDescription, LOGFONT& logFont, float fontSize)