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

Unified Diff: sky/engine/core/css/resolver/StyleResolver.cpp

Issue 654693004: Remove meta viewport and @viewport CSS rules. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 2 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: sky/engine/core/css/resolver/StyleResolver.cpp
diff --git a/sky/engine/core/css/resolver/StyleResolver.cpp b/sky/engine/core/css/resolver/StyleResolver.cpp
index 6fbe28526ef761a7a254f730194ad5d0efe18def..f49078f1b19f8b41761340d563c6cab50105cee4 100644
--- a/sky/engine/core/css/resolver/StyleResolver.cpp
+++ b/sky/engine/core/css/resolver/StyleResolver.cpp
@@ -62,7 +62,6 @@
#include "core/css/resolver/StyleAdjuster.h"
#include "core/css/resolver/StyleResolverState.h"
#include "core/css/resolver/StyleResolverStats.h"
-#include "core/css/resolver/ViewportStyleResolver.h"
#include "core/dom/NodeRenderStyle.h"
#include "core/dom/StyleEngine.h"
#include "core/dom/Text.h"
@@ -102,7 +101,6 @@ static void addFontFaceRule(Document* document, CSSFontSelector* cssFontSelector
StyleResolver::StyleResolver(Document& document)
: m_document(document)
- , m_viewportStyleResolver(ViewportStyleResolver::create(&document))
, m_needCollectFeatures(false)
, m_printMediaType(false)
, m_styleResourceLoader(document.fetcher())
@@ -171,8 +169,6 @@ void StyleResolver::finishAppendAuthorStyleSheets()
if (document().renderView() && document().renderView()->style())
document().renderView()->style()->font().update(document().styleEngine()->fontSelector());
-
- collectViewportRules();
}
void StyleResolver::resetRuleFeatures()
@@ -572,18 +568,6 @@ PassRefPtrWillBeRawPtr<AnimatableValue> StyleResolver::createAnimatableValueSnap
return CSSAnimatableValueFactory::create(property, *state.style());
}
-void StyleResolver::collectViewportRules()
-{
- CSSDefaultStyleSheets& defaultStyleSheets = CSSDefaultStyleSheets::instance();
- viewportStyleResolver()->collectViewportRules(defaultStyleSheets.defaultStyle(), ViewportStyleResolver::UserAgentOrigin);
- viewportStyleResolver()->collectViewportRules(defaultStyleSheets.defaultViewportStyle(), ViewportStyleResolver::UserAgentOrigin);
-
- if (ScopedStyleResolver* scopedResolver = document().scopedStyleResolver())
- scopedResolver->collectViewportRulesTo(this);
-
- viewportStyleResolver()->resolve();
-}
-
PassRefPtr<RenderStyle> StyleResolver::defaultStyleForElement()
{
StyleResolverState state(document(), 0);
@@ -872,7 +856,6 @@ void StyleResolver::invalidateMatchedPropertiesCache()
void StyleResolver::notifyResizeForViewportUnits()
{
- collectViewportRules();
m_matchedPropertiesCache.clearViewportDependent();
}
@@ -1028,7 +1011,6 @@ void StyleResolver::trace(Visitor* visitor)
visitor->trace(m_keyframesRuleMap);
visitor->trace(m_matchedPropertiesCache);
visitor->trace(m_viewportDependentMediaQueryResults);
- visitor->trace(m_viewportStyleResolver);
visitor->trace(m_features);
visitor->trace(m_attributeRuleSet);
visitor->trace(m_styleSharingLists);

Powered by Google App Engine
This is Rietveld 408576698