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

Side by Side Diff: Source/core/dom/DocumentStyleSheetCollection.cpp

Issue 179873020: [import] The first <link rel=import> should win in the cascading order computation. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Landing Created 6 years, 9 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
74 return; 74 return;
75 } 75 }
76 76
77 continue; 77 continue;
78 } 78 }
79 79
80 if (candidate.isImport()) { 80 if (candidate.isImport()) {
81 Document* document = candidate.importedDocument(); 81 Document* document = candidate.importedDocument();
82 if (!document) 82 if (!document)
83 continue; 83 continue;
84 if (collector.hasVisited(document))
85 continue;
86 collector.willVisit(document);
84 document->styleEngine()->updateStyleSheetsInImport(collector); 87 document->styleEngine()->updateStyleSheetsInImport(collector);
85 continue; 88 continue;
86 } 89 }
87 90
88 if (candidate.isEnabledAndLoading()) { 91 if (candidate.isEnabledAndLoading()) {
89 // it is loading but we should still decide which style sheet set to use 92 // it is loading but we should still decide which style sheet set to use
90 if (candidate.hasPreferrableName(engine->preferredStylesheetSetName( ))) 93 if (candidate.hasPreferrableName(engine->preferredStylesheetSetName( )))
91 engine->selectStylesheetSetName(candidate.title()); 94 engine->selectStylesheetSetName(candidate.title());
92 continue; 95 continue;
93 } 96 }
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
143 m_scopingNodesForStyleScoped.didRemoveScopingNodes(); 146 m_scopingNodesForStyleScoped.didRemoveScopingNodes();
144 147
145 collection.swap(*this); 148 collection.swap(*this);
146 149
147 updateUsesRemUnits(); 150 updateUsesRemUnits();
148 151
149 return change.requiresFullStyleRecalc; 152 return change.requiresFullStyleRecalc;
150 } 153 }
151 154
152 } 155 }
OLDNEW
« no previous file with comments | « LayoutTests/fast/html/imports/resources/style-target-blue.html ('k') | Source/core/dom/DocumentStyleSheetCollector.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698