Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2)

Side by Side Diff: third_party/WebKit/Source/core/layout/LayoutThemeDefault.cpp

Issue 2216733002: blink: honor renderer caret_blink_interval in non-default themes (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2007 Apple Inc. 2 * Copyright (C) 2007 Apple Inc.
3 * Copyright (C) 2007 Alp Toker <alp@atoker.com> 3 * Copyright (C) 2007 Alp Toker <alp@atoker.com>
4 * Copyright (C) 2008 Collabora Ltd. 4 * Copyright (C) 2008 Collabora Ltd.
5 * Copyright (C) 2008, 2009 Google Inc. 5 * Copyright (C) 2008, 2009 Google Inc.
6 * Copyright (C) 2009 Kenneth Rohde Christiansen 6 * Copyright (C) 2009 Kenneth Rohde Christiansen
7 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Library General Public 9 * modify it under the terms of the GNU Library General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after
194 style.setWidth(Length(size.width() * zoomLevel, Fixed)); 194 style.setWidth(Length(size.width() * zoomLevel, Fixed));
195 style.setHeight(Length(size.height() * zoomLevel, Fixed)); 195 style.setHeight(Length(size.height() * zoomLevel, Fixed));
196 } else if (style.appearance() == SliderThumbVerticalPart) { 196 } else if (style.appearance() == SliderThumbVerticalPart) {
197 style.setWidth(Length(size.height() * zoomLevel, Fixed)); 197 style.setWidth(Length(size.height() * zoomLevel, Fixed));
198 style.setHeight(Length(size.width() * zoomLevel, Fixed)); 198 style.setHeight(Length(size.width() * zoomLevel, Fixed));
199 } else { 199 } else {
200 MediaControlsPainter::adjustMediaSliderThumbSize(style); 200 MediaControlsPainter::adjustMediaSliderThumbSize(style);
201 } 201 }
202 } 202 }
203 203
204 void LayoutThemeDefault::setCaretBlinkInterval(double interval)
205 {
206 m_caretBlinkInterval = interval;
207 }
208
209 void LayoutThemeDefault::setSelectionColors( 204 void LayoutThemeDefault::setSelectionColors(
210 unsigned activeBackgroundColor, 205 unsigned activeBackgroundColor,
211 unsigned activeForegroundColor, 206 unsigned activeForegroundColor,
212 unsigned inactiveBackgroundColor, 207 unsigned inactiveBackgroundColor,
213 unsigned inactiveForegroundColor) 208 unsigned inactiveForegroundColor)
214 { 209 {
215 m_activeSelectionBackgroundColor = activeBackgroundColor; 210 m_activeSelectionBackgroundColor = activeBackgroundColor;
216 m_activeSelectionForegroundColor = activeForegroundColor; 211 m_activeSelectionForegroundColor = activeForegroundColor;
217 m_inactiveSelectionBackgroundColor = inactiveBackgroundColor; 212 m_inactiveSelectionBackgroundColor = inactiveBackgroundColor;
218 m_inactiveSelectionForegroundColor = inactiveForegroundColor; 213 m_inactiveSelectionForegroundColor = inactiveForegroundColor;
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
279 return focusRingColor; 274 return focusRingColor;
280 } 275 }
281 276
282 double LayoutThemeDefault::caretBlinkInterval() const 277 double LayoutThemeDefault::caretBlinkInterval() const
283 { 278 {
284 // Disable the blinking caret in layout test mode, as it introduces 279 // Disable the blinking caret in layout test mode, as it introduces
285 // a race condition for the pixel tests. http://b/1198440 280 // a race condition for the pixel tests. http://b/1198440
286 if (LayoutTestSupport::isRunningLayoutTest()) 281 if (LayoutTestSupport::isRunningLayoutTest())
287 return 0; 282 return 0;
288 283
289 return m_caretBlinkInterval; 284 return LayoutTheme::caretBlinkInterval();
290 } 285 }
291 286
292 void LayoutThemeDefault::systemFont(CSSValueID systemFontID, FontStyle& fontStyl e, FontWeight& fontWeight, float& fontSize, AtomicString& fontFamily) const 287 void LayoutThemeDefault::systemFont(CSSValueID systemFontID, FontStyle& fontStyl e, FontWeight& fontWeight, float& fontSize, AtomicString& fontFamily) const
293 { 288 {
294 LayoutThemeFontProvider::systemFont(systemFontID, fontStyle, fontWeight, fon tSize, fontFamily); 289 LayoutThemeFontProvider::systemFont(systemFontID, fontStyle, fontWeight, fon tSize, fontFamily);
295 } 290 }
296 291
297 int LayoutThemeDefault::minimumMenuListSize(const ComputedStyle& style) const 292 int LayoutThemeDefault::minimumMenuListSize(const ComputedStyle& style) const
298 { 293 {
299 return 0; 294 return 0;
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
399 { 394 {
400 return progressAnimationInterval; 395 return progressAnimationInterval;
401 } 396 }
402 397
403 double LayoutThemeDefault::animationDurationForProgressBar() const 398 double LayoutThemeDefault::animationDurationForProgressBar() const
404 { 399 {
405 return progressAnimationInterval * progressAnimationFrames * 2; // "2" for b ack and forth 400 return progressAnimationInterval * progressAnimationFrames * 2; // "2" for b ack and forth
406 } 401 }
407 402
408 } // namespace blink 403 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutThemeDefault.h ('k') | third_party/WebKit/Source/web/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698