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

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

Issue 25257003: Empty @viewport should not override legacy viewport. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 7 years, 3 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/core/css/resolver/ViewportStyleResolver.h
diff --git a/Source/core/css/resolver/ViewportStyleResolver.h b/Source/core/css/resolver/ViewportStyleResolver.h
index b71128e9f0bc02d9f214a22d7c21f4ebb00646de..bb0a36ff9bb9ef27e4e4a1f67edeb911bbd7ce2f 100644
--- a/Source/core/css/resolver/ViewportStyleResolver.h
+++ b/Source/core/css/resolver/ViewportStyleResolver.h
@@ -31,6 +31,7 @@
#define ViewportStyleResolver_h
#include "CSSPropertyNames.h"
+#include "core/css/RuleSet.h"
#include "core/platform/Length.h"
#include "wtf/RefCounted.h"
#include "wtf/RefPtr.h"
@@ -50,8 +51,9 @@ public:
~ViewportStyleResolver();
- void setHasAuthorStyle() { m_hasAuthorStyle = true; }
- void addViewportRule(StyleRuleViewport*);
+ enum Origin { UserAgentOrigin, AuthorOrigin };
+
+ void collectViewportRules(RuleSet*, Origin);
void clearDocument();
void resolve();
@@ -59,6 +61,8 @@ public:
private:
explicit ViewportStyleResolver(Document*);
+ void addViewportRule(StyleRuleViewport*, Origin);
+
float viewportArgumentValue(CSSPropertyID) const;
Length viewportLengthValue(CSSPropertyID) const;

Powered by Google App Engine
This is Rietveld 408576698