diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-07-24 17:03:20 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-07-24 17:03:20 +0200 |
| commit | 08d4a74d56ca431877819fc4566e27eafe150342 (patch) | |
| tree | ebd8530838ab390c015c6b7e659a22852c1663ae /Source/WebCore/rendering/RenderThemeChromiumAndroid.cpp | |
| parent | 1de6cd4794bbd5a52189384189a2b8df1848b39b (diff) | |
| download | qtwebkit-08d4a74d56ca431877819fc4566e27eafe150342.tar.gz | |
Imported WebKit commit 0fbd41c4e13f5a190faf160bf993eee614e6e18e (http://svn.webkit.org/repository/webkit/trunk@123477)
New snapshot that adapts to latest Qt API changes
Diffstat (limited to 'Source/WebCore/rendering/RenderThemeChromiumAndroid.cpp')
| -rw-r--r-- | Source/WebCore/rendering/RenderThemeChromiumAndroid.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Source/WebCore/rendering/RenderThemeChromiumAndroid.cpp b/Source/WebCore/rendering/RenderThemeChromiumAndroid.cpp index 5404e47f8..9240df34c 100644 --- a/Source/WebCore/rendering/RenderThemeChromiumAndroid.cpp +++ b/Source/WebCore/rendering/RenderThemeChromiumAndroid.cpp @@ -28,6 +28,7 @@ #include "CSSValueKeywords.h" #include "Color.h" +#include "LayoutTestSupport.h" #include "PaintInfo.h" #include "PlatformSupport.h" #include "RenderMediaControlsChromium.h" @@ -56,7 +57,7 @@ RenderThemeChromiumAndroid::~RenderThemeChromiumAndroid() Color RenderThemeChromiumAndroid::systemColor(int cssValueId) const { - if (PlatformSupport::layoutTestMode() && cssValueId == CSSValueButtonface) { + if (isRunningLayoutTest() && cssValueId == CSSValueButtonface) { // Match Chromium Linux' button color in layout tests. static const Color linuxButtonGrayColor(0xffdddddd); return linuxButtonGrayColor; @@ -77,7 +78,7 @@ String RenderThemeChromiumAndroid::extraDefaultStyleSheet() void RenderThemeChromiumAndroid::adjustInnerSpinButtonStyle(StyleResolver*, RenderStyle* style, Element*) const { - if (PlatformSupport::layoutTestMode()) { + if (isRunningLayoutTest()) { // Match Chromium Linux spin button style in layout tests. // FIXME: Consider removing the conditional if a future Android theme matches this. IntSize size = PlatformSupport::getThemePartSize(PlatformSupport::PartInnerSpinButton); |