| Index: third_party/WebKit/Source/core/paint/ThemePainterDefault.cpp
|
| diff --git a/third_party/WebKit/Source/core/paint/ThemePainterDefault.cpp b/third_party/WebKit/Source/core/paint/ThemePainterDefault.cpp
|
| index d540356437baf2da64f9dffba4fa90535c3ab7d7..76f1f467e3642f4487ea9100d9429787ba8b1e06 100644
|
| --- a/third_party/WebKit/Source/core/paint/ThemePainterDefault.cpp
|
| +++ b/third_party/WebKit/Source/core/paint/ThemePainterDefault.cpp
|
| @@ -41,7 +41,9 @@ namespace blink {
|
|
|
| namespace {
|
|
|
| +#if !USE(NEW_THEME)
|
| const unsigned defaultButtonBackgroundColor = 0xffdddddd;
|
| +#endif
|
|
|
| bool useMockTheme()
|
| {
|
| @@ -133,6 +135,7 @@ IntRect convertToPaintingRect(const LayoutObject& inputLayoutObject, const Layou
|
|
|
| } // namespace
|
|
|
| +#if !USE(NEW_THEME)
|
| bool ThemePainterDefault::paintCheckbox(const LayoutObject& o, const PaintInfo& i, const IntRect& rect)
|
| {
|
| WebThemeEngine::ExtraParams extraParams;
|
| @@ -155,7 +158,9 @@ bool ThemePainterDefault::paintCheckbox(const LayoutObject& o, const PaintInfo&
|
| Platform::current()->themeEngine()->paint(canvas, WebThemeEngine::PartCheckbox, getWebThemeState(o), WebRect(unzoomedRect), &extraParams);
|
| return false;
|
| }
|
| +#endif // !USE(NEW_THEME)
|
|
|
| +#if !USE(NEW_THEME)
|
| bool ThemePainterDefault::paintRadio(const LayoutObject& o, const PaintInfo& i, const IntRect& rect)
|
| {
|
| WebThemeEngine::ExtraParams extraParams;
|
| @@ -165,7 +170,9 @@ bool ThemePainterDefault::paintRadio(const LayoutObject& o, const PaintInfo& i,
|
| Platform::current()->themeEngine()->paint(canvas, WebThemeEngine::PartRadio, getWebThemeState(o), WebRect(rect), &extraParams);
|
| return false;
|
| }
|
| +#endif // !USE(NEW_THEME)
|
|
|
| +#if !USE(NEW_THEME)
|
| bool ThemePainterDefault::paintButton(const LayoutObject& o, const PaintInfo& i, const IntRect& rect)
|
| {
|
| WebThemeEngine::ExtraParams extraParams;
|
| @@ -178,6 +185,7 @@ bool ThemePainterDefault::paintButton(const LayoutObject& o, const PaintInfo& i,
|
| Platform::current()->themeEngine()->paint(canvas, WebThemeEngine::PartButton, getWebThemeState(o), WebRect(rect), &extraParams);
|
| return false;
|
| }
|
| +#endif // !USE(NEW_THEME)
|
|
|
| bool ThemePainterDefault::paintTextField(const LayoutObject& o, const PaintInfo& i, const IntRect& rect)
|
| {
|
| @@ -323,6 +331,7 @@ bool ThemePainterDefault::paintSliderThumb(const LayoutObject& o, const PaintInf
|
| return false;
|
| }
|
|
|
| +#if !USE(NEW_THEME)
|
| bool ThemePainterDefault::paintInnerSpinButton(const LayoutObject& o, const PaintInfo& i, const IntRect& rect)
|
| {
|
| WebThemeEngine::ExtraParams extraParams;
|
| @@ -333,6 +342,7 @@ bool ThemePainterDefault::paintInnerSpinButton(const LayoutObject& o, const Pain
|
| Platform::current()->themeEngine()->paint(canvas, WebThemeEngine::PartInnerSpinButton, getWebThemeState(o), WebRect(rect), &extraParams);
|
| return false;
|
| }
|
| +#endif // !USE(NEW_THEME)
|
|
|
| bool ThemePainterDefault::paintProgressBar(const LayoutObject& o, const PaintInfo& i, const IntRect& rect)
|
| {
|
|
|