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

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

Issue 11412177: Merge 135316 - When calling DocumentStyleSheetCollection::addUserSheet, pass in a user sheet (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1312/
Patch Set: Created 8 years 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
« no previous file with comments | « Source/WebCore/ChangeLog ('k') | Source/WebKit/chromium/ChangeLog » ('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, 2011, 2012 Apple Inc. All r ights reserved. 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2011, 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) 2008, 2009, 2011, 2012 Google Inc. All rights reserved. 8 * Copyright (C) 2008, 2009, 2011, 2012 Google Inc. All rights reserved.
9 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies) 9 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
10 * Copyright (C) Research In Motion Limited 2010-2011. All rights reserved. 10 * Copyright (C) Research In Motion Limited 2010-2011. All rights reserved.
(...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after
186 } 186 }
187 187
188 void DocumentStyleSheetCollection::invalidateInjectedStyleSheetCache() 188 void DocumentStyleSheetCollection::invalidateInjectedStyleSheetCache()
189 { 189 {
190 m_injectedStyleSheetCacheValid = false; 190 m_injectedStyleSheetCacheValid = false;
191 m_document->styleResolverChanged(DeferRecalcStyle); 191 m_document->styleResolverChanged(DeferRecalcStyle);
192 } 192 }
193 193
194 void DocumentStyleSheetCollection::addUserSheet(PassRefPtr<StyleSheetContents> u serSheet) 194 void DocumentStyleSheetCollection::addUserSheet(PassRefPtr<StyleSheetContents> u serSheet)
195 { 195 {
196 ASSERT(userSheet->isUserStyleSheet());
196 m_userStyleSheets.append(CSSStyleSheet::create(userSheet, m_document)); 197 m_userStyleSheets.append(CSSStyleSheet::create(userSheet, m_document));
197 m_document->styleResolverChanged(RecalcStyleImmediately); 198 m_document->styleResolverChanged(RecalcStyleImmediately);
198 } 199 }
199 200
200 // This method is called whenever a top-level stylesheet has finished loading. 201 // This method is called whenever a top-level stylesheet has finished loading.
201 void DocumentStyleSheetCollection::removePendingSheet(RemovePendingSheetNotifica tionType notification) 202 void DocumentStyleSheetCollection::removePendingSheet(RemovePendingSheetNotifica tionType notification)
202 { 203 {
203 // Make sure we knew this sheet was pending, and that our count isn't out of sync. 204 // Make sure we knew this sheet was pending, and that our count isn't out of sync.
204 ASSERT(m_pendingStylesheets > 0); 205 ASSERT(m_pendingStylesheets > 0);
205 206
(...skipping 288 matching lines...) Expand 10 before | Expand all | Expand 10 after
494 info.addMember(m_injectedAuthorStyleSheets); 495 info.addMember(m_injectedAuthorStyleSheets);
495 info.addMember(m_userStyleSheets); 496 info.addMember(m_userStyleSheets);
496 info.addMember(m_activeAuthorStyleSheets); 497 info.addMember(m_activeAuthorStyleSheets);
497 info.addMember(m_styleSheetsForStyleSheetList); 498 info.addMember(m_styleSheetsForStyleSheetList);
498 info.addMember(m_styleSheetCandidateNodes); 499 info.addMember(m_styleSheetCandidateNodes);
499 info.addMember(m_preferredStylesheetSetName); 500 info.addMember(m_preferredStylesheetSetName);
500 info.addMember(m_selectedStylesheetSetName); 501 info.addMember(m_selectedStylesheetSetName);
501 } 502 }
502 503
503 } 504 }
OLDNEW
« no previous file with comments | « Source/WebCore/ChangeLog ('k') | Source/WebKit/chromium/ChangeLog » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698