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

Side by Side Diff: third_party/WebKit/Source/core/dom/StyleEngine.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 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
113 void htmlImportAddedOrRemoved(); 113 void htmlImportAddedOrRemoved();
114 114
115 void injectAuthorSheet(StyleSheetContents* authorSheet); 115 void injectAuthorSheet(StyleSheetContents* authorSheet);
116 CSSStyleSheet& ensureInspectorStyleSheet(); 116 CSSStyleSheet& ensureInspectorStyleSheet();
117 RuleSet* watchedSelectorsRuleSet() { 117 RuleSet* watchedSelectorsRuleSet() {
118 return m_globalRuleSet.watchedSelectorsRuleSet(); 118 return m_globalRuleSet.watchedSelectorsRuleSet();
119 } 119 }
120 120
121 RuleSet* ruleSetForSheet(CSSStyleSheet&); 121 RuleSet* ruleSetForSheet(CSSStyleSheet&);
122 void mediaQueryAffectingValueChanged(); 122 void mediaQueryAffectingValueChanged();
123 void updateStyleSheetsInImport(DocumentStyleSheetCollector& parentCollector); 123 void updateStyleSheetsInImport(StyleEngine& masterEngine,
124 DocumentStyleSheetCollector& parentCollector);
124 void updateActiveStyle(); 125 void updateActiveStyle();
125 void markAllTreeScopesDirty() { m_allTreeScopesDirty = true; } 126 void markAllTreeScopesDirty() { m_allTreeScopesDirty = true; }
126 127
127 String preferredStylesheetSetName() const { 128 String preferredStylesheetSetName() const {
128 return m_preferredStylesheetSetName; 129 return m_preferredStylesheetSetName;
129 } 130 }
130 String selectedStylesheetSetName() const { 131 String selectedStylesheetSetName() const {
131 return m_selectedStylesheetSetName; 132 return m_selectedStylesheetSetName;
132 } 133 }
133 void setPreferredStylesheetSetNameIfNotSet(const String&); 134 void setPreferredStylesheetSetNameIfNotSet(const String&);
(...skipping 239 matching lines...) Expand 10 before | Expand all | Expand 10 after
373 374
374 std::unique_ptr<StyleResolverStats> m_styleResolverStats; 375 std::unique_ptr<StyleResolverStats> m_styleResolverStats;
375 unsigned m_styleForElementCount = 0; 376 unsigned m_styleForElementCount = 0;
376 377
377 friend class StyleEngineTest; 378 friend class StyleEngineTest;
378 }; 379 };
379 380
380 } // namespace blink 381 } // namespace blink
381 382
382 #endif 383 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698