Upstream version 9.38.198.0

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

diff --git a/src/third_party/WebKit/Source/core/rendering/RenderThemeChromiumSkia.cpp b/src/third_party/WebKit/Source/core/rendering/RenderThemeChromiumSkia.cpp
index f836738..b2e10ca 100644 (file)
--- a/src/third_party/WebKit/Source/core/rendering/RenderThemeChromiumSkia.cpp
+++ b/src/third_party/WebKit/Source/core/rendering/RenderThemeChromiumSkia.cpp
@@ -38,7 +38,7 @@
 #include "wtf/CurrentTime.h"
 #include "wtf/StdLibExtras.h"
 
-namespace WebCore {
+namespace blink {
 
 enum PaddingType {
     TopPadding,
@@ -70,14 +70,14 @@ RenderThemeChromiumSkia::~RenderThemeChromiumSkia()
 String RenderThemeChromiumSkia::extraDefaultStyleSheet()
 {
     return RenderTheme::extraDefaultStyleSheet() +
-        String(themeWinUserAgentStyleSheet, sizeof(themeWinUserAgentStyleSheet)) +
-        String(themeChromiumSkiaUserAgentStyleSheet, sizeof(themeChromiumSkiaUserAgentStyleSheet)) +
-        String(themeChromiumUserAgentStyleSheet, sizeof(themeChromiumUserAgentStyleSheet));
+        String(themeWinCss, sizeof(themeWinCss)) +
+        String(themeChromiumSkiaCss, sizeof(themeChromiumSkiaCss)) +
+        String(themeChromiumCss, sizeof(themeChromiumCss));
 }
 
 String RenderThemeChromiumSkia::extraQuirksStyleSheet()
 {
-    return String(themeWinQuirksUserAgentStyleSheet, sizeof(themeWinQuirksUserAgentStyleSheet));
+    return String(themeWinQuirksCss, sizeof(themeWinQuirksCss));
 }
 
 bool RenderThemeChromiumSkia::supportsHover(const RenderStyle* style) const
@@ -121,7 +121,7 @@ double RenderThemeChromiumSkia::caretBlinkInterval() const
 {
     // Disable the blinking caret in layout test mode, as it introduces
     // a race condition for the pixel tests. http://b/1198440
-    if (isRunningLayoutTest())
+    if (LayoutTestSupport::isRunningLayoutTest())
         return 0;
 
     return caretBlinkIntervalInternal();
@@ -351,7 +351,7 @@ bool RenderThemeChromiumSkia::paintMediaFullscreenButton(RenderObject* object, c
     return RenderMediaControls::paintMediaControlsPart(MediaEnterFullscreenButton, object, paintInfo, rect);
 }
 
-void RenderThemeChromiumSkia::adjustMenuListStyle(RenderStyle* style, WebCore::Element*) const
+void RenderThemeChromiumSkia::adjustMenuListStyle(RenderStyle* style, Element*) const
 {
     // Height is locked to auto on all browsers.
     style->setLineHeight(RenderStyle::initialLineHeight());
@@ -487,4 +487,4 @@ RenderThemeChromiumSkia::DirectionFlippingScope::~DirectionFlippingScope()
     m_paintInfo.context->restore();
 }
 
-} // namespace WebCore
+} // namespace blink