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

Side by Side Diff: Source/core/dom/DocumentStyleSheetCollector.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
« no previous file with comments | « Source/core/dom/DocumentStyleSheetCollector.h ('k') | Source/core/dom/StyleSheetCandidate.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 15 matching lines...) Expand all
26 26
27 #include "config.h" 27 #include "config.h"
28 #include "core/dom/DocumentStyleSheetCollector.h" 28 #include "core/dom/DocumentStyleSheetCollector.h"
29 29
30 #include "core/css/CSSStyleSheet.h" 30 #include "core/css/CSSStyleSheet.h"
31 #include "core/css/StyleSheet.h" 31 #include "core/css/StyleSheet.h"
32 #include "core/dom/DocumentStyleSheetCollection.h" 32 #include "core/dom/DocumentStyleSheetCollection.h"
33 33
34 namespace WebCore { 34 namespace WebCore {
35 35
36 DocumentStyleSheetCollector::DocumentStyleSheetCollector(Vector<RefPtr<StyleShee t> >& sheetsForList, Vector<RefPtr<CSSStyleSheet> >& activeList) 36 DocumentStyleSheetCollector::DocumentStyleSheetCollector(Vector<RefPtr<StyleShee t> >& sheetsForList, Vector<RefPtr<CSSStyleSheet> >& activeList, HashSet<Documen t*>& visitedDocuments)
37 : m_styleSheetsForStyleSheetList(sheetsForList) 37 : m_styleSheetsForStyleSheetList(sheetsForList)
38 , m_activeAuthorStyleSheets(activeList) 38 , m_activeAuthorStyleSheets(activeList)
39 , m_visitedDocuments(visitedDocuments)
39 { 40 {
40 } 41 }
41 42
42 DocumentStyleSheetCollector::~DocumentStyleSheetCollector() 43 DocumentStyleSheetCollector::~DocumentStyleSheetCollector()
43 { 44 {
44 } 45 }
45 46
46 void DocumentStyleSheetCollector::appendActiveStyleSheets(const Vector<RefPtr<CS SStyleSheet> >& sheets) 47 void DocumentStyleSheetCollector::appendActiveStyleSheets(const Vector<RefPtr<CS SStyleSheet> >& sheets)
47 { 48 {
48 m_activeAuthorStyleSheets.appendVector(sheets); 49 m_activeAuthorStyleSheets.appendVector(sheets);
49 } 50 }
50 51
51 void DocumentStyleSheetCollector::appendActiveStyleSheet(CSSStyleSheet* sheet) 52 void DocumentStyleSheetCollector::appendActiveStyleSheet(CSSStyleSheet* sheet)
52 { 53 {
53 m_activeAuthorStyleSheets.append(sheet); 54 m_activeAuthorStyleSheets.append(sheet);
54 } 55 }
55 56
56 void DocumentStyleSheetCollector::appendSheetForList(StyleSheet* sheet) 57 void DocumentStyleSheetCollector::appendSheetForList(StyleSheet* sheet)
57 { 58 {
58 m_styleSheetsForStyleSheetList.append(sheet); 59 m_styleSheetsForStyleSheetList.append(sheet);
59 } 60 }
60 61
61 ActiveDocumentStyleSheetCollector::ActiveDocumentStyleSheetCollector(StyleSheetC ollection& collection) 62 ActiveDocumentStyleSheetCollector::ActiveDocumentStyleSheetCollector(StyleSheetC ollection& collection)
62 : DocumentStyleSheetCollector(collection.m_styleSheetsForStyleSheetList, col lection.m_activeAuthorStyleSheets) 63 : DocumentStyleSheetCollector(collection.m_styleSheetsForStyleSheetList, col lection.m_activeAuthorStyleSheets, m_visitedDocuments)
63 { 64 {
64 } 65 }
65 66
66 ImportedDocumentStyleSheetCollector::ImportedDocumentStyleSheetCollector(Documen tStyleSheetCollector& collector, Vector<RefPtr<StyleSheet> >& sheetForList) 67 ImportedDocumentStyleSheetCollector::ImportedDocumentStyleSheetCollector(Documen tStyleSheetCollector& collector, Vector<RefPtr<StyleSheet> >& sheetForList)
67 : DocumentStyleSheetCollector(sheetForList, collector.m_activeAuthorStyleShe ets) 68 : DocumentStyleSheetCollector(sheetForList, collector.m_activeAuthorStyleShe ets, collector.m_visitedDocuments)
68 { 69 {
69 } 70 }
70 71
71 } 72 }
OLDNEW
« no previous file with comments | « Source/core/dom/DocumentStyleSheetCollector.h ('k') | Source/core/dom/StyleSheetCandidate.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698