Source/core/rendering/RenderThemeChromiumDefault.h - Issue 41733004: Roll up patch for running layout tests under Aura.

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

Issue 41733004: Roll up patch for running layout tests under Aura. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: move useMockTheme() into a helper function Created 7 years, 1 month 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 | « Source/core/platform/ScrollbarThemeGtkOrAura.cpp ('k') | Source/core/rendering/RenderThemeChromiumDefault.cpp » ('j') | no next file with comments »

OLD	NEW
1 /*	1 /*

2 * This file is part of the WebKit project.	2 * This file is part of the WebKit project.

3 *	3 *

4 * Copyright (C) 2006 Apple Computer, Inc.	4 * Copyright (C) 2006 Apple Computer, Inc.

5 * Copyright (C) 2006 Michael Emmel mike.emmel@gmail.com	5 * Copyright (C) 2006 Michael Emmel mike.emmel@gmail.com

6 * Copyright (C) 2007 Holger Hans Peter Freyther	6 * Copyright (C) 2007 Holger Hans Peter Freyther

7 * Copyright (C) 2007 Alp Toker <alp@atoker.com>	7 * Copyright (C) 2007 Alp Toker <alp@atoker.com>

8 * Copyright (C) 2008, 2009 Google, Inc.	8 * Copyright (C) 2008, 2009 Google, Inc.

9 * All rights reserved.	9 * All rights reserved.

10 * Copyright (C) 2009 Kenneth Rohde Christiansen	10 * Copyright (C) 2009 Kenneth Rohde Christiansen

(...skipping 25 matching lines...) Expand all Loading...
36 class RenderThemeChromiumDefault : public RenderThemeChromiumSkia {	36 class RenderThemeChromiumDefault : public RenderThemeChromiumSkia {

37 public:	37 public:

38 static PassRefPtr<RenderTheme> create();	38 static PassRefPtr<RenderTheme> create();

39 virtual String extraDefaultStyleSheet();	39 virtual String extraDefaultStyleSheet();

40	40

41 virtual Color systemColor(CSSValueID) const;	41 virtual Color systemColor(CSSValueID) const;

42	42

43 // A method asking if the control changes its tint when the window has focus or not.	43 // A method asking if the control changes its tint when the window has focus or not.

44 virtual bool controlSupportsTints(const RenderObject*) const;	44 virtual bool controlSupportsTints(const RenderObject*) const;

45	45

	46 virtual bool supportsFocusRing(const RenderStyle*) const OVERRIDE;

	47

46 // List Box selection color	48 // List Box selection color

47 virtual Color activeListBoxSelectionBackgroundColor() const;	49 virtual Color activeListBoxSelectionBackgroundColor() const;

48 virtual Color activeListBoxSelectionForegroundColor() const;	50 virtual Color activeListBoxSelectionForegroundColor() const;

49 virtual Color inactiveListBoxSelectionBackgroundColor() const;	51 virtual Color inactiveListBoxSelectionBackgroundColor() const;

50 virtual Color inactiveListBoxSelectionForegroundColor() const;	52 virtual Color inactiveListBoxSelectionForegroundColor() const;

51	53

52 virtual Color platformActiveSelectionBackgroundColor() const;	54 virtual Color platformActiveSelectionBackgroundColor() const;

53 virtual Color platformInactiveSelectionBackgroundColor() const;	55 virtual Color platformInactiveSelectionBackgroundColor() const;

54 virtual Color platformActiveSelectionForegroundColor() const;	56 virtual Color platformActiveSelectionForegroundColor() const;

55 virtual Color platformInactiveSelectionForegroundColor() const;	57 virtual Color platformInactiveSelectionForegroundColor() const;

(...skipping 24 matching lines...) Expand all Loading...
80	82

81 virtual bool paintProgressBar(RenderObject*, const PaintInfo&, const IntRect &);	83 virtual bool paintProgressBar(RenderObject*, const PaintInfo&, const IntRect &);

82	84

83 virtual bool shouldOpenPickerWithF4Key() const OVERRIDE;	85 virtual bool shouldOpenPickerWithF4Key() const OVERRIDE;

84	86

85 static void setSelectionColors(unsigned activeBackgroundColor, unsigned acti veForegroundColor, unsigned inactiveBackgroundColor, unsigned inactiveForeground Color);	87 static void setSelectionColors(unsigned activeBackgroundColor, unsigned acti veForegroundColor, unsigned inactiveBackgroundColor, unsigned inactiveForeground Color);

86	88

87 protected:	89 protected:

88 RenderThemeChromiumDefault();	90 RenderThemeChromiumDefault();

89 virtual ~RenderThemeChromiumDefault();	91 virtual ~RenderThemeChromiumDefault();

	92 virtual bool shouldUseFallbackTheme(RenderStyle*) const OVERRIDE;

90	93

91 private:	94 private:

92 // A general method asking if any control tinting is supported at all.	95 // A general method asking if any control tinting is supported at all.

93 virtual bool supportsControlTints() const;	96 virtual bool supportsControlTints() const;

94	97

95 static double m_caretBlinkInterval;	98 static double m_caretBlinkInterval;

96	99

97 static unsigned m_activeSelectionBackgroundColor;	100 static unsigned m_activeSelectionBackgroundColor;

98 static unsigned m_activeSelectionForegroundColor;	101 static unsigned m_activeSelectionForegroundColor;

99 static unsigned m_inactiveSelectionBackgroundColor;	102 static unsigned m_inactiveSelectionBackgroundColor;

100 static unsigned m_inactiveSelectionForegroundColor;	103 static unsigned m_inactiveSelectionForegroundColor;

101 };	104 };

102	105

103 } // namespace WebCore	106 } // namespace WebCore

104	107

105 #endif // RenderThemeChromiumDefault_h	108 #endif // RenderThemeChromiumDefault_h

OLD	NEW