Chromium Code Reviews| 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 29 matching lines...) Expand all Loading... | |
| 40 : TreeScopeStyleSheetCollection(shadowRoot) | 40 : TreeScopeStyleSheetCollection(shadowRoot) |
| 41 { | 41 { |
| 42 } | 42 } |
| 43 | 43 |
| 44 void ShadowTreeStyleSheetCollection::collectStyleSheets(StyleEngine* engine, Sty leSheetCollection& collection) | 44 void ShadowTreeStyleSheetCollection::collectStyleSheets(StyleEngine* engine, Sty leSheetCollection& collection) |
| 45 { | 45 { |
| 46 DocumentOrderedList::iterator begin = m_styleSheetCandidateNodes.begin(); | 46 DocumentOrderedList::iterator begin = m_styleSheetCandidateNodes.begin(); |
| 47 DocumentOrderedList::iterator end = m_styleSheetCandidateNodes.end(); | 47 DocumentOrderedList::iterator end = m_styleSheetCandidateNodes.end(); |
| 48 for (DocumentOrderedList::iterator it = begin; it != end; ++it) { | 48 for (DocumentOrderedList::iterator it = begin; it != end; ++it) { |
| 49 Node* node = *it; | 49 Node* node = *it; |
| 50 if (!isHTMLStyleElement(*node)) | 50 if (!isHTMLStyleElement(*node)) |
|
ojan
2014/12/12 23:38:39
I guess the same applies here.
| |
| 51 continue; | 51 continue; |
| 52 | 52 if (CSSStyleSheet* sheet = toHTMLStyleElement(node)->sheet()) |
| 53 CSSStyleSheet* sheet = toHTMLStyleElement(node)->sheet(); | |
| 54 if (sheet) | |
| 55 collection.appendSheetForList(sheet); | |
| 56 if (sheet) | |
| 57 collection.appendActiveStyleSheet(sheet); | 53 collection.appendActiveStyleSheet(sheet); |
| 58 } | 54 } |
| 59 } | 55 } |
| 60 | 56 |
| 61 void ShadowTreeStyleSheetCollection::updateActiveStyleSheets(StyleEngine* engine ) | 57 void ShadowTreeStyleSheetCollection::updateActiveStyleSheets(StyleEngine* engine ) |
| 62 { | 58 { |
| 63 StyleSheetCollection collection; | 59 StyleSheetCollection collection; |
| 64 collectStyleSheets(engine, collection); | 60 collectStyleSheets(engine, collection); |
| 65 | 61 |
| 66 if (StyleResolver* styleResolver = engine->resolver()) { | 62 if (StyleResolver* styleResolver = engine->resolver()) { |
| 67 // We should not destroy StyleResolver when we find any stylesheet updat e in a shadow tree. | 63 // We should not destroy StyleResolver when we find any stylesheet updat e in a shadow tree. |
| 68 // In this case, we will reset rulesets created from style elements in t he shadow tree. | 64 // In this case, we will reset rulesets created from style elements in t he shadow tree. |
| 69 styleResolver->resetAuthorStyle(treeScope()); | 65 styleResolver->resetAuthorStyle(treeScope()); |
| 70 styleResolver->removePendingAuthorStyleSheets(m_activeAuthorStyleSheets) ; | 66 styleResolver->removePendingAuthorStyleSheets(m_activeAuthorStyleSheets) ; |
| 71 styleResolver->lazyAppendAuthorStyleSheets(0, collection.activeAuthorSty leSheets()); | 67 styleResolver->lazyAppendAuthorStyleSheets(0, collection.activeAuthorSty leSheets()); |
| 72 } | 68 } |
| 73 | 69 |
| 74 toShadowRoot(treeScope().rootNode()).host()->setNeedsStyleRecalc(SubtreeStyl eChange); | 70 toShadowRoot(treeScope().rootNode()).host()->setNeedsStyleRecalc(SubtreeStyl eChange); |
| 75 | 71 |
| 76 collection.swap(*this); | 72 collection.swap(*this); |
| 77 updateUsesRemUnits(); | 73 updateUsesRemUnits(); |
| 78 } | 74 } |
| 79 | 75 |
| 80 } | 76 } |
| OLD | NEW |