| 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 | 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 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 43 TreeScope& tree_scope) | 43 TreeScope& tree_scope) |
| 44 : TreeScopeStyleSheetCollection(tree_scope) { | 44 : TreeScopeStyleSheetCollection(tree_scope) { |
| 45 DCHECK_EQ(tree_scope.RootNode(), tree_scope.RootNode().GetDocument()); | 45 DCHECK_EQ(tree_scope.RootNode(), tree_scope.RootNode().GetDocument()); |
| 46 } | 46 } |
| 47 | 47 |
| 48 void DocumentStyleSheetCollection::CollectStyleSheetsFromCandidates( | 48 void DocumentStyleSheetCollection::CollectStyleSheetsFromCandidates( |
| 49 StyleEngine& master_engine, | 49 StyleEngine& master_engine, |
| 50 DocumentStyleSheetCollector& collector) { | 50 DocumentStyleSheetCollector& collector) { |
| 51 DocumentOrderedList::MutationForbiddenScope mutation_forbidden_( | 51 DocumentOrderedList::MutationForbiddenScope mutation_forbidden_( |
| 52 &style_sheet_candidate_nodes_); | 52 &style_sheet_candidate_nodes_); |
| 53 // TODO(keishi) Check added for crbug.com/699269 diagnosis. Remove once done. |
| 54 CHECK(HeapObjectHeader::FromPayload(this)->IsValid()); |
| 55 CHECK(ThreadState::Current()->IsOnThreadHeap(this)); |
| 53 for (Node* n : style_sheet_candidate_nodes_) { | 56 for (Node* n : style_sheet_candidate_nodes_) { |
| 57 CHECK(HeapObjectHeader::FromPayload(n)->IsValid()); |
| 58 CHECK(ThreadState::Current()->IsOnThreadHeap(n)); |
| 54 StyleSheetCandidate candidate(*n); | 59 StyleSheetCandidate candidate(*n); |
| 55 | 60 |
| 56 DCHECK(!candidate.IsXSL()); | 61 DCHECK(!candidate.IsXSL()); |
| 57 if (candidate.IsImport()) { | 62 if (candidate.IsImport()) { |
| 58 Document* document = candidate.ImportedDocument(); | 63 Document* document = candidate.ImportedDocument(); |
| 59 if (!document) | 64 if (!document) |
| 60 continue; | 65 continue; |
| 61 if (collector.HasVisited(document)) | 66 if (collector.HasVisited(document)) |
| 62 continue; | 67 continue; |
| 63 collector.WillVisit(document); | 68 collector.WillVisit(document); |
| (...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 123 continue; | 128 continue; |
| 124 if (!candidate.CanBeActivated( | 129 if (!candidate.CanBeActivated( |
| 125 GetDocument().GetStyleEngine().PreferredStylesheetSetName())) | 130 GetDocument().GetStyleEngine().PreferredStylesheetSetName())) |
| 126 continue; | 131 continue; |
| 127 viewport_resolver.CollectViewportRulesFromAuthorSheet( | 132 viewport_resolver.CollectViewportRulesFromAuthorSheet( |
| 128 *ToCSSStyleSheet(sheet)); | 133 *ToCSSStyleSheet(sheet)); |
| 129 } | 134 } |
| 130 } | 135 } |
| 131 | 136 |
| 132 } // namespace blink | 137 } // namespace blink |
| OLD | NEW |