Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / core / rendering / RenderThemeChromiumAndroid.cpp

diff --git a/src/third_party/WebKit/Source/core/rendering/RenderThemeChromiumAndroid.cpp b/src/third_party/WebKit/Source/core/rendering/RenderThemeChromiumAndroid.cpp
index 0c4040a..2e4aace 100644 (file)
--- a/src/third_party/WebKit/Source/core/rendering/RenderThemeChromiumAndroid.cpp
+++ b/src/third_party/WebKit/Source/core/rendering/RenderThemeChromiumAndroid.cpp
@@ -41,7 +41,7 @@
 #include "public/platform/WebThemeEngine.h"
 #include "wtf/StdLibExtras.h"
 
-namespace WebCore {
+namespace blink {
 
 PassRefPtr<RenderTheme> RenderThemeChromiumAndroid::create()
 {
@@ -60,21 +60,21 @@ RenderThemeChromiumAndroid::~RenderThemeChromiumAndroid()
 
 String RenderThemeChromiumAndroid::extraMediaControlsStyleSheet()
 {
-    return String(mediaControlsAndroidUserAgentStyleSheet, sizeof(mediaControlsAndroidUserAgentStyleSheet));
+    return String(mediaControlsAndroidCss, sizeof(mediaControlsAndroidCss));
 }
 
 String RenderThemeChromiumAndroid::extraDefaultStyleSheet()
 {
     return RenderThemeChromiumDefault::extraDefaultStyleSheet() +
-        String(themeChromiumAndroidUserAgentStyleSheet, sizeof(themeChromiumAndroidUserAgentStyleSheet));
+        String(themeChromiumAndroidCss, sizeof(themeChromiumAndroidCss));
 }
 
 void RenderThemeChromiumAndroid::adjustInnerSpinButtonStyle(RenderStyle* style, Element*) const
 {
-    if (isRunningLayoutTest()) {
+    if (LayoutTestSupport::isRunningLayoutTest()) {
         // Match Linux spin button style in layout tests.
         // FIXME: Consider removing the conditional if a future Android theme matches this.
-        IntSize size = blink::Platform::current()->themeEngine()->getSize(blink::WebThemeEngine::PartInnerSpinButton);
+        IntSize size = Platform::current()->themeEngine()->getSize(WebThemeEngine::PartInnerSpinButton);
 
         style->setWidth(Length(size.width(), Fixed));
         style->setMinWidth(Length(size.width(), Fixed));
@@ -85,8 +85,8 @@ 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 = blink::Platform::current()->themeEngine()->getSize(blink::WebThemeEngine::PartScrollbarDownArrow);
+    IntSize scrollbarSize = Platform::current()->themeEngine()->getSize(WebThemeEngine::PartScrollbarDownArrow);
     return scrollbarSize.width();
 }
 
-} // namespace WebCore
+} // namespace blink