diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2012-10-15 16:08:57 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2012-10-15 16:08:57 +0200 |
| commit | 5466563f4b5b6b86523e3f89bb7f77e5b5270c78 (patch) | |
| tree | 8caccf7cd03a15207cde3ba282c88bf132482a91 /Source/WebCore/rendering/RenderThemeChromiumAndroid.cpp | |
| parent | 33b26980cb24288b5a9f2590ccf32a949281bb79 (diff) | |
| download | qtwebkit-5466563f4b5b6b86523e3f89bb7f77e5b5270c78.tar.gz | |
Imported WebKit commit 0dc6cd75e1d4836eaffbb520be96fac4847cc9d2 (http://svn.webkit.org/repository/webkit/trunk@131300)
WebKit update which introduces the QtWebKitWidgets module that contains the WK1
widgets based API. (In fact it renames QtWebKit to QtWebKitWidgets while we're
working on completing the entire split as part of
https://bugs.webkit.org/show_bug.cgi?id=99314
Diffstat (limited to 'Source/WebCore/rendering/RenderThemeChromiumAndroid.cpp')
| -rw-r--r-- | Source/WebCore/rendering/RenderThemeChromiumAndroid.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Source/WebCore/rendering/RenderThemeChromiumAndroid.cpp b/Source/WebCore/rendering/RenderThemeChromiumAndroid.cpp index be3701913..d25a80444 100644 --- a/Source/WebCore/rendering/RenderThemeChromiumAndroid.cpp +++ b/Source/WebCore/rendering/RenderThemeChromiumAndroid.cpp @@ -30,7 +30,6 @@ #include "Color.h" #include "LayoutTestSupport.h" #include "PaintInfo.h" -#include "PlatformSupport.h" #include "RenderMediaControlsChromium.h" #include "RenderObject.h" #include "RenderProgress.h" @@ -38,6 +37,9 @@ #include "ScrollbarTheme.h" #include "UserAgentStyleSheets.h" +#include <public/Platform.h> +#include <public/android/WebThemeEngine.h> + namespace WebCore { PassRefPtr<RenderTheme> RenderThemeChromiumAndroid::create() @@ -81,7 +83,7 @@ void RenderThemeChromiumAndroid::adjustInnerSpinButtonStyle(StyleResolver*, Rend 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); + IntSize size = WebKit::Platform::current()->themeEngine()->getSize(WebKit::WebThemeEngine::PartInnerSpinButton); style->setWidth(Length(size.width(), Fixed)); style->setMinWidth(Length(size.width(), Fixed)); @@ -104,7 +106,7 @@ int RenderThemeChromiumAndroid::menuListArrowPadding() const { // We cannot use the scrollbar thickness here, as it's width is 0 on Android. // Instead, use the width of the scrollbar down arrow. - IntSize scrollbarSize = PlatformSupport::getThemePartSize(PlatformSupport::PartScrollbarDownArrow); + IntSize scrollbarSize = WebKit::Platform::current()->themeEngine()->getSize(WebKit::WebThemeEngine::PartScrollbarDownArrow); return scrollbarSize.width(); } |