From a94275402997c11dd2e778633dacf4b7e630a35d Mon Sep 17 00:00:00 2001 From: Ben Murdoch Date: Fri, 22 Oct 2010 13:02:20 +0100 Subject: Merge WebKit at r70209: Initial merge by Git Change-Id: Id23a68efa36e9d1126bcce0b137872db00892c8e --- WebCore/rendering/RenderThemeWin.h | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) (limited to 'WebCore/rendering/RenderThemeWin.h') diff --git a/WebCore/rendering/RenderThemeWin.h b/WebCore/rendering/RenderThemeWin.h index 1efb117..c05d2ee 100644 --- a/WebCore/rendering/RenderThemeWin.h +++ b/WebCore/rendering/RenderThemeWin.h @@ -77,6 +77,9 @@ public: virtual bool paintButton(RenderObject*, const PaintInfo&, const IntRect&); + virtual void adjustInnerSpinButtonStyle(CSSStyleSelector*, RenderStyle*, Element*) const; + virtual bool paintInnerSpinButton(RenderObject*, const PaintInfo&, const IntRect&); + virtual bool paintTextField(RenderObject*, const PaintInfo&, const IntRect&); virtual bool paintTextArea(RenderObject* o, const PaintInfo& i, const IntRect& r) @@ -139,6 +142,12 @@ public: #endif private: + enum ControlSubPart { + None, + SpinButtonDown, + SpinButtonUp, + }; + RenderThemeWin(); ~RenderThemeWin(); @@ -146,24 +155,27 @@ private: void close(); unsigned determineState(RenderObject*); - unsigned determineClassicState(RenderObject*); + unsigned determineClassicState(RenderObject*, ControlSubPart = None); unsigned determineSliderThumbState(RenderObject*); unsigned determineButtonState(RenderObject*); + unsigned determineSpinButtonState(RenderObject*, ControlSubPart = None); bool supportsFocus(ControlPart) const; - ThemeData getThemeData(RenderObject*); - ThemeData getClassicThemeData(RenderObject* o); + ThemeData getThemeData(RenderObject*, ControlSubPart = None); + ThemeData getClassicThemeData(RenderObject* o, ControlSubPart = None); HANDLE buttonTheme() const; HANDLE textFieldTheme() const; HANDLE menuListTheme() const; HANDLE sliderTheme() const; + HANDLE spinButtonTheme() const; mutable HANDLE m_buttonTheme; mutable HANDLE m_textFieldTheme; mutable HANDLE m_menuListTheme; mutable HANDLE m_sliderTheme; + mutable HANDLE m_spinButtonTheme; }; }; -- cgit v1.1