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

Side by Side Diff: Source/core/rendering/RenderThemeChromiumDefault.cpp

Issue 154733004: Switch to a single merged version of WebThemeEngine.h (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: reorder the State enums to not break the mock theme Created 6 years, 10 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 * 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 16 matching lines...) Expand all
27 27
28 #include "CSSValueKeywords.h" 28 #include "CSSValueKeywords.h"
29 #include "UserAgentStyleSheets.h" 29 #include "UserAgentStyleSheets.h"
30 #include "core/rendering/PaintInfo.h" 30 #include "core/rendering/PaintInfo.h"
31 #include "core/rendering/RenderObject.h" 31 #include "core/rendering/RenderObject.h"
32 #include "core/rendering/RenderProgress.h" 32 #include "core/rendering/RenderProgress.h"
33 #include "platform/LayoutTestSupport.h" 33 #include "platform/LayoutTestSupport.h"
34 #include "platform/graphics/Color.h" 34 #include "platform/graphics/Color.h"
35 #include "platform/graphics/GraphicsContext.h" 35 #include "platform/graphics/GraphicsContext.h"
36 #include "platform/graphics/GraphicsContextStateSaver.h" 36 #include "platform/graphics/GraphicsContextStateSaver.h"
37 #include "public/platform/default/WebThemeEngine.h"
38 #include "public/platform/Platform.h" 37 #include "public/platform/Platform.h"
39 #include "public/platform/WebRect.h" 38 #include "public/platform/WebRect.h"
39 #include "public/platform/WebThemeEngine.h"
40 #include "wtf/StdLibExtras.h" 40 #include "wtf/StdLibExtras.h"
41 41
42 namespace WebCore { 42 namespace WebCore {
43 43
44 static bool useMockTheme() 44 static bool useMockTheme()
45 { 45 {
46 return isRunningLayoutTest(); 46 return isRunningLayoutTest();
47 } 47 }
48 48
49 unsigned RenderThemeChromiumDefault::m_activeSelectionBackgroundColor = 49 unsigned RenderThemeChromiumDefault::m_activeSelectionBackgroundColor =
(...skipping 470 matching lines...) Expand 10 before | Expand all | Expand 10 after
520 if (useMockTheme()) { 520 if (useMockTheme()) {
521 // The mock theme can't handle zoomed controls, so we fall back to the " fallback" theme. 521 // The mock theme can't handle zoomed controls, so we fall back to the " fallback" theme.
522 ControlPart part = style->appearance(); 522 ControlPart part = style->appearance();
523 if (part == CheckboxPart || part == RadioPart) 523 if (part == CheckboxPart || part == RadioPart)
524 return style->effectiveZoom() != 1; 524 return style->effectiveZoom() != 1;
525 } 525 }
526 return RenderTheme::shouldUseFallbackTheme(style); 526 return RenderTheme::shouldUseFallbackTheme(style);
527 } 527 }
528 528
529 } // namespace WebCore 529 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderThemeChromiumAndroid.cpp ('k') | Source/platform/scroll/ScrollbarThemeGtkOrAura.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698