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

Side by Side Diff: third_party/WebKit/Source/core/dom/DocumentStyleSheetCollection.h

Issue 2618803002: Use master StyleEngine to evaluate MQ in html imports. (Closed)
Patch Set: preferred sheet change broke a test Created 3 years, 11 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * (C) 2001 Dirk Mueller (mueller@kde.org) 4 * (C) 2001 Dirk Mueller (mueller@kde.org)
5 * (C) 2006 Alexey Proskuryakov (ap@webkit.org) 5 * (C) 2006 Alexey Proskuryakov (ap@webkit.org)
6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012 Apple Inc. All 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012 Apple Inc. All
7 * rights reserved. 7 * rights reserved.
8 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. 8 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved.
9 * (http://www.torchmobile.com/) 9 * (http://www.torchmobile.com/)
10 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies) 10 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
(...skipping 18 matching lines...) Expand all
29 29
30 #ifndef DocumentStyleSheetCollection_h 30 #ifndef DocumentStyleSheetCollection_h
31 #define DocumentStyleSheetCollection_h 31 #define DocumentStyleSheetCollection_h
32 32
33 #include "core/dom/TreeScopeStyleSheetCollection.h" 33 #include "core/dom/TreeScopeStyleSheetCollection.h"
34 #include "platform/heap/WrapperVisitor.h" 34 #include "platform/heap/WrapperVisitor.h"
35 35
36 namespace blink { 36 namespace blink {
37 37
38 class DocumentStyleSheetCollector; 38 class DocumentStyleSheetCollector;
39 class StyleEngine;
39 class TreeScope; 40 class TreeScope;
40 class ViewportStyleResolver; 41 class ViewportStyleResolver;
41 42
42 class DocumentStyleSheetCollection final 43 class DocumentStyleSheetCollection final
43 : public TreeScopeStyleSheetCollection { 44 : public TreeScopeStyleSheetCollection {
44 WTF_MAKE_NONCOPYABLE(DocumentStyleSheetCollection); 45 WTF_MAKE_NONCOPYABLE(DocumentStyleSheetCollection);
45 46
46 public: 47 public:
47 static DocumentStyleSheetCollection* create(TreeScope& treeScope) { 48 static DocumentStyleSheetCollection* create(TreeScope& treeScope) {
48 return new DocumentStyleSheetCollection(treeScope); 49 return new DocumentStyleSheetCollection(treeScope);
49 } 50 }
50 51
51 void updateActiveStyleSheets(); 52 void updateActiveStyleSheets(StyleEngine& masterEngine);
52 void collectStyleSheets(DocumentStyleSheetCollector&); 53 void collectStyleSheets(StyleEngine& masterEngine,
54 DocumentStyleSheetCollector&);
53 void collectViewportRules(ViewportStyleResolver&); 55 void collectViewportRules(ViewportStyleResolver&);
54 56
55 DEFINE_INLINE_VIRTUAL_TRACE() { 57 DEFINE_INLINE_VIRTUAL_TRACE() {
56 TreeScopeStyleSheetCollection::trace(visitor); 58 TreeScopeStyleSheetCollection::trace(visitor);
57 } 59 }
58 60
59 private: 61 private:
60 explicit DocumentStyleSheetCollection(TreeScope&); 62 explicit DocumentStyleSheetCollection(TreeScope&);
61 63
62 void collectStyleSheetsFromCandidates(DocumentStyleSheetCollector&); 64 void collectStyleSheetsFromCandidates(StyleEngine& masterEngine,
65 DocumentStyleSheetCollector&);
63 }; 66 };
64 67
65 } // namespace blink 68 } // namespace blink
66 69
67 #endif 70 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698