Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2186)

Unified Diff: Source/web/tests/WebFrameTest.cpp

Issue 438843004: Move the user agent styles sheets to blink_resources.grd (Part 3) (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/web/tests/WebFrameTest.cpp
diff --git a/Source/web/tests/WebFrameTest.cpp b/Source/web/tests/WebFrameTest.cpp
index 092bead1c60da397956adfc24db471dd7a533000..25df933932e294083d685546c526ec935fb09fed 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"
@@ -69,6 +68,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"
@@ -154,7 +154,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"));

Powered by Google App Engine
This is Rietveld 408576698