Changeset 206167 in webkit
- Timestamp:
- Sep 20, 2016 1:05:31 PM (8 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r206166 r206167 1 2016-09-20 Antti Koivisto <antti@apple.com> 2 3 Remove AuthorStyleSheets::m_hadActiveLoadingStylesheet bit 4 https://bugs.webkit.org/show_bug.cgi?id=162312 5 6 Reviewed by Chris Dumez. 7 8 * dom/AuthorStyleSheets.cpp: 9 (WebCore::AuthorStyleSheets::analyzeStyleSheetChange): 10 11 We can handle loading sheets with the normal stylesheet change logic. Remove the special case. 12 13 (WebCore::filterEnabledNonemptyCSSStyleSheets): 14 15 Filter out loading stylesheets. 16 17 * dom/AuthorStyleSheets.h: 18 1 19 2016-09-20 Keith Rollin <krollin@apple.com> 2 20 -
trunk/Source/WebCore/dom/AuthorStyleSheets.cpp
r204220 r206167 216 216 requiresFullStyleRecalc = true; 217 217 218 // Stylesheets of <style> elements that @import stylesheets are active but loading. We need to trigger a full recalc when such loads are done.219 bool hasActiveLoadingStylesheet = false;220 218 unsigned newStylesheetCount = newStylesheets.size(); 221 for (auto& sheet : newStylesheets) {222 if (sheet->isLoading())223 hasActiveLoadingStylesheet = true;224 }225 if (m_hadActiveLoadingStylesheet && !hasActiveLoadingStylesheet) {226 m_hadActiveLoadingStylesheet = false;227 return Reconstruct;228 }229 m_hadActiveLoadingStylesheet = hasActiveLoadingStylesheet;230 219 231 220 if (updateFlag != OptimizedUpdate) … … 282 271 continue; 283 272 CSSStyleSheet& styleSheet = downcast<CSSStyleSheet>(*sheet); 273 if (styleSheet.isLoading()) 274 continue; 284 275 if (styleSheet.disabled()) 285 276 continue; -
trunk/Source/WebCore/dom/AuthorStyleSheets.h
r190347 r206167 125 125 int m_pendingStyleSheetCount { 0 }; 126 126 127 bool m_hadActiveLoadingStylesheet { false };128 127 UpdateFlag m_pendingUpdateType { NoUpdate }; 129 128
Note: See TracChangeset
for help on using the changeset viewer.