Index: Source/core/rendering/RenderThemeChromiumAndroid.cpp |
diff --git a/Source/core/rendering/RenderThemeChromiumAndroid.cpp b/Source/core/rendering/RenderThemeChromiumAndroid.cpp |
index 61401f1e606eff0956fe607f174ca404cb47eba0..89ad65a3154693259828eb7cca61e5894f9e5412 100644 |
--- a/Source/core/rendering/RenderThemeChromiumAndroid.cpp |
+++ b/Source/core/rendering/RenderThemeChromiumAndroid.cpp |
@@ -28,7 +28,6 @@ |
#include "core/CSSValueKeywords.h" |
#include "core/InputTypeNames.h" |
-#include "core/UserAgentStyleSheets.h" |
#include "core/rendering/PaintInfo.h" |
#include "core/rendering/RenderMediaControls.h" |
#include "core/rendering/RenderObject.h" |
@@ -38,6 +37,7 @@ |
#include "platform/graphics/Color.h" |
#include "platform/scroll/ScrollbarTheme.h" |
#include "public/platform/Platform.h" |
+#include "public/platform/WebData.h" |
#include "public/platform/WebThemeEngine.h" |
#include "wtf/StdLibExtras.h" |
@@ -60,13 +60,15 @@ RenderThemeChromiumAndroid::~RenderThemeChromiumAndroid() |
String RenderThemeChromiumAndroid::extraMediaControlsStyleSheet() |
{ |
- return String(mediaControlsAndroidCss, sizeof(mediaControlsAndroidCss)); |
+ const blink::WebData& mediaControlsAndroidCssResource = blink::Platform::current()->loadResource("mediaControlsAndroid.css"); |
+ return String(mediaControlsAndroidCssResource.data(), mediaControlsAndroidCssResource.size()); |
abarth-chromium
2014/08/01 19:15:15
Should we add a function to WebData that returns a
|
} |
String RenderThemeChromiumAndroid::extraDefaultStyleSheet() |
{ |
+ const blink::WebData& themeChromiumAndroidCssResource = blink::Platform::current()->loadResource("themeChromiumAndroid.css"); |
return RenderThemeChromiumDefault::extraDefaultStyleSheet() + |
- String(themeChromiumAndroidCss, sizeof(themeChromiumAndroidCss)); |
+ String(themeChromiumAndroidCssResource.data(), themeChromiumAndroidCssResource.size()); |
} |
void RenderThemeChromiumAndroid::adjustInnerSpinButtonStyle(RenderStyle* style, Element*) const |