| Index: third_party/WebKit/Source/core/css/resolver/ViewportStyleResolver.h
|
| diff --git a/third_party/WebKit/Source/core/css/resolver/ViewportStyleResolver.h b/third_party/WebKit/Source/core/css/resolver/ViewportStyleResolver.h
|
| index 6af05ee6565b0a6b5402575d976850f362c8116c..913bbc2c660c328050ca9b68cfffec8cb8d4b099 100644
|
| --- a/third_party/WebKit/Source/core/css/resolver/ViewportStyleResolver.h
|
| +++ b/third_party/WebKit/Source/core/css/resolver/ViewportStyleResolver.h
|
| @@ -44,7 +44,7 @@ class StyleRuleViewport;
|
| class CORE_EXPORT ViewportStyleResolver
|
| : public GarbageCollected<ViewportStyleResolver> {
|
| public:
|
| - static ViewportStyleResolver* create(Document* document) {
|
| + static ViewportStyleResolver* create(Document& document) {
|
| return new ViewportStyleResolver(document);
|
| }
|
|
|
| @@ -57,15 +57,19 @@ class CORE_EXPORT ViewportStyleResolver
|
| DECLARE_TRACE();
|
|
|
| private:
|
| - explicit ViewportStyleResolver(Document*);
|
| + explicit ViewportStyleResolver(Document&);
|
|
|
| - void addViewportRule(StyleRuleViewport*, Origin);
|
| + void collectViewportRulesFromUASheets();
|
| + void collectViewportChildRules(const HeapVector<Member<StyleRuleBase>>&,
|
| + Origin);
|
| + void addViewportRule(StyleRuleViewport&, Origin);
|
|
|
| float viewportArgumentValue(CSSPropertyID) const;
|
| Length viewportLengthValue(CSSPropertyID) const;
|
|
|
| Member<Document> m_document;
|
| Member<MutableStylePropertySet> m_propertySet;
|
| + Member<MediaQueryEvaluator> m_initialViewportMedium;
|
| bool m_hasAuthorStyle;
|
| };
|
|
|
|
|