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

Unified Diff: Source/core/dom/DocumentStyleSheetCollection.cpp

Issue 143463011: [import] support document.stylesheets in imported documents. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 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 side-by-side diff with in-line comments
Download patch
Index: Source/core/dom/DocumentStyleSheetCollection.cpp
diff --git a/Source/core/dom/DocumentStyleSheetCollection.cpp b/Source/core/dom/DocumentStyleSheetCollection.cpp
index 07a8160e095c7570549dd92d5debd885e0900c25..dcd9a5addc0e6fad4d4b8f814e3dcfad1de3cb6e 100644
--- a/Source/core/dom/DocumentStyleSheetCollection.cpp
+++ b/Source/core/dom/DocumentStyleSheetCollection.cpp
@@ -101,8 +101,7 @@ void DocumentStyleSheetCollection::collectStyleSheetsFromCandidates(StyleEngine*
if (candidate.hasPreferrableName(engine->preferredStylesheetSetName()))
engine->selectStylesheetSetName(candidate.title());
- if (collector.isCollectingForList(m_treeScope))
- collector.appendSheetForList(sheet);
+ collector.appendSheetForList(sheet);
if (candidate.canBeActivated(engine->preferredStylesheetSetName()))
collector.appendActiveStyleSheet(toCSSStyleSheet(sheet));
}
@@ -154,7 +153,11 @@ bool DocumentStyleSheetCollection::updateActiveStyleSheets(StyleEngine* engine,
engine->resetFontSelector();
}
m_scopingNodesForStyleScoped.didRemoveScopingNodes();
+
collector.setCollectionTo(*this);
+ for (DocumentStyleSheetCollector::SheetListMapIteraor i = collector.sheetListMap().begin(); i != collector.sheetListMap().end(); ++i)
esprehn 2014/01/23 07:51:03 typo, you want SheetListMapIterator (missing t)
Hajime Morrita 2014/01/24 01:25:51 Done.
+ i->key->styleEngine()->setStyleSheetsForStyleSheetList(i->value);
+
updateUsesRemUnits();
return change.requiresFullStyleRecalc;

Powered by Google App Engine
This is Rietveld 408576698