| OLD | NEW |
| 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 r
ights reserved. | 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012 Apple Inc. All r
ights reserved. |
| 7 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t
orchmobile.com/) | 7 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t
orchmobile.com/) |
| 8 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies) | 8 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies) |
| 9 * Copyright (C) 2013 Google Inc. All rights reserved. | 9 * Copyright (C) 2013 Google Inc. All rights reserved. |
| 10 * | 10 * |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 43 } | 43 } |
| 44 | 44 |
| 45 void DocumentStyleSheetCollection::collectStyleSheetsFromCandidates(StyleEngine*
engine, DocumentStyleSheetCollector& collector) | 45 void DocumentStyleSheetCollection::collectStyleSheetsFromCandidates(StyleEngine*
engine, DocumentStyleSheetCollector& collector) |
| 46 { | 46 { |
| 47 DocumentOrderedList::iterator begin = m_styleSheetCandidateNodes.begin(); | 47 DocumentOrderedList::iterator begin = m_styleSheetCandidateNodes.begin(); |
| 48 DocumentOrderedList::iterator end = m_styleSheetCandidateNodes.end(); | 48 DocumentOrderedList::iterator end = m_styleSheetCandidateNodes.end(); |
| 49 for (DocumentOrderedList::iterator it = begin; it != end; ++it) { | 49 for (DocumentOrderedList::iterator it = begin; it != end; ++it) { |
| 50 Node* n = *it; | 50 Node* n = *it; |
| 51 StyleSheetCandidate candidate(*n); | 51 StyleSheetCandidate candidate(*n); |
| 52 | 52 |
| 53 if (candidate.isImport()) { | |
| 54 Document* document = candidate.importedDocument(); | |
| 55 if (!document) | |
| 56 continue; | |
| 57 if (collector.hasVisited(document)) | |
| 58 continue; | |
| 59 collector.willVisit(document); | |
| 60 document->styleEngine()->updateStyleSheetsInImport(collector); | |
| 61 continue; | |
| 62 } | |
| 63 | |
| 64 StyleSheet* sheet = candidate.sheet(); | 53 StyleSheet* sheet = candidate.sheet(); |
| 65 if (!sheet) | 54 if (!sheet) |
| 66 continue; | 55 continue; |
| 67 | 56 |
| 68 collector.appendSheetForList(sheet); | 57 collector.appendSheetForList(sheet); |
| 69 if (candidate.canBeActivated()) | 58 if (candidate.canBeActivated()) |
| 70 collector.appendActiveStyleSheet(toCSSStyleSheet(sheet)); | 59 collector.appendActiveStyleSheet(toCSSStyleSheet(sheet)); |
| 71 } | 60 } |
| 72 } | 61 } |
| 73 | 62 |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 105 } | 94 } |
| 106 if (change.requiresFullStyleRecalc) | 95 if (change.requiresFullStyleRecalc) |
| 107 document().setNeedsStyleRecalc(SubtreeStyleChange); | 96 document().setNeedsStyleRecalc(SubtreeStyleChange); |
| 108 | 97 |
| 109 collection.swap(*this); | 98 collection.swap(*this); |
| 110 | 99 |
| 111 updateUsesRemUnits(); | 100 updateUsesRemUnits(); |
| 112 } | 101 } |
| 113 | 102 |
| 114 } | 103 } |
| OLD | NEW |