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

Side by Side Diff: Source/core/rendering/RenderTheme.h

Issue 23581008: Revert r154797: "Move isValid/isCurrentColor from Color to StyleColor" (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 3 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 | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * This file is part of the theme implementation for form controls in WebCore. 2 * This file is part of the theme implementation for form controls in WebCore.
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2012 Apple Computer, Inc. 4 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2012 Apple Computer, Inc.
5 * 5 *
6 * This library is free software; you can redistribute it and/or 6 * This library is free software; you can redistribute it and/or
7 * modify it under the terms of the GNU Library General Public 7 * modify it under the terms of the GNU Library General Public
8 * License as published by the Free Software Foundation; either 8 * License as published by the Free Software Foundation; either
9 * version 2 of the License, or (at your option) any later version. 9 * version 2 of the License, or (at your option) any later version.
10 * 10 *
(...skipping 324 matching lines...) Expand 10 before | Expand all | Expand 10 after
335 mutable Color m_activeSelectionBackgroundColor; 335 mutable Color m_activeSelectionBackgroundColor;
336 mutable Color m_inactiveSelectionBackgroundColor; 336 mutable Color m_inactiveSelectionBackgroundColor;
337 mutable Color m_activeSelectionForegroundColor; 337 mutable Color m_activeSelectionForegroundColor;
338 mutable Color m_inactiveSelectionForegroundColor; 338 mutable Color m_inactiveSelectionForegroundColor;
339 339
340 mutable Color m_activeListBoxSelectionBackgroundColor; 340 mutable Color m_activeListBoxSelectionBackgroundColor;
341 mutable Color m_inactiveListBoxSelectionBackgroundColor; 341 mutable Color m_inactiveListBoxSelectionBackgroundColor;
342 mutable Color m_activeListBoxSelectionForegroundColor; 342 mutable Color m_activeListBoxSelectionForegroundColor;
343 mutable Color m_inactiveListBoxSelectionForegroundColor; 343 mutable Color m_inactiveListBoxSelectionForegroundColor;
344 344
345 mutable unsigned m_selectionColorsValid;
346
347 // This color is expected to be drawn on a semi-transparent overlay, 345 // This color is expected to be drawn on a semi-transparent overlay,
348 // making it more transparent than its alpha value indicates. 346 // making it more transparent than its alpha value indicates.
349 static const RGBA32 defaultTapHighlightColor = 0x66000000; 347 static const RGBA32 defaultTapHighlightColor = 0x66000000;
350 348
351 #if USE(NEW_THEME) 349 #if USE(NEW_THEME)
352 Theme* m_platformTheme; // The platform-specific theme. 350 Theme* m_platformTheme; // The platform-specific theme.
353 #endif 351 #endif
354 }; 352 };
355 353
356 } // namespace WebCore 354 } // namespace WebCore
357 355
358 #endif // RenderTheme_h 356 #endif // RenderTheme_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698