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

Unified Diff: Source/core/css/resolver/ViewportStyleResolver.cpp

Issue 989973002: Remove temporary OS(ANDROID) for @viewport. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@collect-viewport-20150305
Patch Set: Created 5 years, 9 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/css/resolver/ViewportStyleResolver.cpp
diff --git a/Source/core/css/resolver/ViewportStyleResolver.cpp b/Source/core/css/resolver/ViewportStyleResolver.cpp
index 7ab40abd6cb4bdb80c63dfdd5d21689d978e1f50..b957c9742d34d79b1cb381f26c32ce3a9e045605 100644
--- a/Source/core/css/resolver/ViewportStyleResolver.cpp
+++ b/Source/core/css/resolver/ViewportStyleResolver.cpp
@@ -60,12 +60,7 @@ void ViewportStyleResolver::collectViewportRules()
CSSDefaultStyleSheets& defaultStyleSheets = CSSDefaultStyleSheets::instance();
collectViewportRules(defaultStyleSheets.defaultStyle(), UserAgentOrigin);
- bool useMobileViewportStyle = m_document->settings() && m_document->settings()->useMobileViewportStyle();
-#if OS(ANDROID)
- // FIXME: Remove when useMobileViewportStyle is set from chromium.
- useMobileViewportStyle = true;
-#endif
- if (useMobileViewportStyle)
+ if (m_document->settings() && m_document->settings()->useMobileViewportStyle())
collectViewportRules(defaultStyleSheets.defaultMobileViewportStyle(), UserAgentOrigin);
if (m_document->isMobileDocument())
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698