| Index: Source/web/tests/WebFrameTest.cpp
|
| diff --git a/Source/web/tests/WebFrameTest.cpp b/Source/web/tests/WebFrameTest.cpp
|
| index d174a6ec5bcff68719b4a7c71f89ddc20f2f823b..08106ea01e92305b2c1ae7d78429869927c0a0a9 100644
|
| --- a/Source/web/tests/WebFrameTest.cpp
|
| +++ b/Source/web/tests/WebFrameTest.cpp
|
| @@ -34,7 +34,6 @@
|
|
|
| #include "SkBitmap.h"
|
| #include "SkCanvas.h"
|
| -#include "core/UserAgentStyleSheets.h"
|
| #include "core/clipboard/DataTransfer.h"
|
| #include "core/css/StyleSheetContents.h"
|
| #include "core/css/resolver/StyleResolver.h"
|
| @@ -72,6 +71,7 @@
|
| #include "platform/scroll/ScrollbarTheme.h"
|
| #include "platform/weborigin/SchemeRegistry.h"
|
| #include "public/platform/Platform.h"
|
| +#include "public/platform/WebData.h"
|
| #include "public/platform/WebFloatRect.h"
|
| #include "public/platform/WebSelectionBound.h"
|
| #include "public/platform/WebThread.h"
|
| @@ -158,7 +158,10 @@ protected:
|
| void applyViewportStyleOverride(FrameTestHelpers::WebViewHelper* webViewHelper)
|
| {
|
| RefPtrWillBeRawPtr<blink::StyleSheetContents> styleSheet = blink::StyleSheetContents::create(blink::CSSParserContext(blink::UASheetMode, 0));
|
| - styleSheet->parseString(String(blink::viewportAndroidCss, sizeof(blink::viewportAndroidCss)));
|
| + const blink::WebData& viewportAndroidCssResource = blink::Platform::current()->loadResource("viewportAndroid.css");
|
| + String viewportAndroidRules = viewportAndroidCssResource.toASCIIString();
|
| + ASSERT(!viewportAndroidRules.isEmpty());
|
| + styleSheet->parseString(viewportAndroidRules);
|
| OwnPtrWillBeRawPtr<blink::RuleSet> ruleSet = blink::RuleSet::create();
|
| ruleSet->addRulesFromSheet(styleSheet.get(), blink::MediaQueryEvaluator("screen"));
|
|
|
|
|