summaryrefslogtreecommitdiff
path: root/chromium/third_party/blink/renderer/core/layout/layout_theme_default.h
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2020-01-20 13:40:20 +0100
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2020-01-22 12:41:23 +0000
commit7961cea6d1041e3e454dae6a1da660b453efd238 (patch)
treec0eeb4a9ff9ba32986289c1653d9608e53ccb444 /chromium/third_party/blink/renderer/core/layout/layout_theme_default.h
parentb7034d0803538058e5c9d904ef03cf5eab34f6ef (diff)
downloadqtwebengine-chromium-7961cea6d1041e3e454dae6a1da660b453efd238.tar.gz
BASELINE: Update Chromium to 78.0.3904.130
Change-Id: If185e0c0061b3437531c97c9c8c78f239352a68b Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/third_party/blink/renderer/core/layout/layout_theme_default.h')
-rw-r--r--chromium/third_party/blink/renderer/core/layout/layout_theme_default.h21
1 files changed, 10 insertions, 11 deletions
diff --git a/chromium/third_party/blink/renderer/core/layout/layout_theme_default.h b/chromium/third_party/blink/renderer/core/layout/layout_theme_default.h
index 6fad09eb7ae..a65e945432e 100644
--- a/chromium/third_party/blink/renderer/core/layout/layout_theme_default.h
+++ b/chromium/third_party/blink/renderer/core/layout/layout_theme_default.h
@@ -32,7 +32,6 @@
#include "third_party/blink/renderer/core/core_export.h"
#include "third_party/blink/renderer/core/layout/layout_theme.h"
#include "third_party/blink/renderer/core/paint/theme_painter_default.h"
-#include "third_party/blink/renderer/platform/wtf/time.h"
namespace blink {
@@ -43,7 +42,7 @@ class CORE_EXPORT LayoutThemeDefault : public LayoutTheme {
String ExtraDefaultStyleSheet() override;
String ExtraQuirksStyleSheet() override;
- Color SystemColor(CSSValueID) const override;
+ Color SystemColor(CSSValueID, WebColorScheme color_scheme) const override;
bool ThemeDrawsFocusRing(const ComputedStyle&) const override;
@@ -81,10 +80,10 @@ class CORE_EXPORT LayoutThemeDefault : public LayoutTheme {
// when hovered.
bool SupportsHover(const ComputedStyle&) const final;
- void SetSelectionColors(unsigned active_background_color,
- unsigned active_foreground_color,
- unsigned inactive_background_color,
- unsigned inactive_foreground_color) override;
+ void SetSelectionColors(Color active_background_color,
+ Color active_foreground_color,
+ Color inactive_background_color,
+ Color inactive_foreground_color) override;
Color PlatformFocusRingColor() const override;
// System fonts.
@@ -145,12 +144,12 @@ class CORE_EXPORT LayoutThemeDefault : public LayoutTheme {
int MenuListInternalPadding(const ComputedStyle&, int padding) const;
static const RGBA32 kDefaultTapHighlightColor = 0x2e000000; // 18% black.
- static base::TimeDelta caret_blink_interval_;
+ base::TimeDelta caret_blink_interval_;
- static unsigned active_selection_background_color_;
- static unsigned active_selection_foreground_color_;
- static unsigned inactive_selection_background_color_;
- static unsigned inactive_selection_foreground_color_;
+ Color active_selection_background_color_ = 0xff1e90ff;
+ Color active_selection_foreground_color_ = Color::kBlack;
+ Color inactive_selection_background_color_ = 0xffc8c8c8;
+ Color inactive_selection_foreground_color_ = 0xff323232;
ThemePainterDefault painter_;
// Cached values for crbug.com/673754.