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

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

Issue 2525513002: Move logic to turn off caret blinking for LayoutTests to LayoutTheme. (Closed)
Patch Set: Remove flaky marker from test. Created 4 years 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
« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutThemeDefault.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 231 matching lines...) Expand 10 before | Expand all | Expand 10 after
242 242
243 bool LayoutThemeDefault::supportsHover(const ComputedStyle& style) const { 243 bool LayoutThemeDefault::supportsHover(const ComputedStyle& style) const {
244 return true; 244 return true;
245 } 245 }
246 246
247 Color LayoutThemeDefault::platformFocusRingColor() const { 247 Color LayoutThemeDefault::platformFocusRingColor() const {
248 static Color focusRingColor(229, 151, 0, 255); 248 static Color focusRingColor(229, 151, 0, 255);
249 return focusRingColor; 249 return focusRingColor;
250 } 250 }
251 251
252 double LayoutThemeDefault::caretBlinkInterval() const {
253 // Disable the blinking caret in layout test mode, as it introduces
254 // a race condition for the pixel tests. http://b/1198440
255 if (LayoutTestSupport::isRunningLayoutTest())
256 return 0;
257
258 return LayoutTheme::caretBlinkInterval();
259 }
260
261 void LayoutThemeDefault::systemFont(CSSValueID systemFontID, 252 void LayoutThemeDefault::systemFont(CSSValueID systemFontID,
262 FontStyle& fontStyle, 253 FontStyle& fontStyle,
263 FontWeight& fontWeight, 254 FontWeight& fontWeight,
264 float& fontSize, 255 float& fontSize,
265 AtomicString& fontFamily) const { 256 AtomicString& fontFamily) const {
266 LayoutThemeFontProvider::systemFont(systemFontID, fontStyle, fontWeight, 257 LayoutThemeFontProvider::systemFont(systemFontID, fontStyle, fontWeight,
267 fontSize, fontFamily); 258 fontSize, fontFamily);
268 } 259 }
269 260
270 int LayoutThemeDefault::minimumMenuListSize(const ComputedStyle& style) const { 261 int LayoutThemeDefault::minimumMenuListSize(const ComputedStyle& style) const {
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
360 double LayoutThemeDefault::animationRepeatIntervalForProgressBar() const { 351 double LayoutThemeDefault::animationRepeatIntervalForProgressBar() const {
361 return progressAnimationInterval; 352 return progressAnimationInterval;
362 } 353 }
363 354
364 double LayoutThemeDefault::animationDurationForProgressBar() const { 355 double LayoutThemeDefault::animationDurationForProgressBar() const {
365 return progressAnimationInterval * progressAnimationFrames * 356 return progressAnimationInterval * progressAnimationFrames *
366 2; // "2" for back and forth 357 2; // "2" for back and forth
367 } 358 }
368 359
369 } // namespace blink 360 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutThemeDefault.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698