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

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

Issue 1181023004: Move rem handling out of CSSParserValues.cpp (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Another attempt Created 5 years, 4 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
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 317 matching lines...) Expand 10 before | Expand all | Expand 10 after
328 updateActiveStyleSheetsInShadow(updateMode, treeScope, treeScope sRemoved); 328 updateActiveStyleSheetsInShadow(updateMode, treeScope, treeScope sRemoved);
329 } else { 329 } else {
330 for (TreeScope* treeScope : m_dirtyTreeScopes) 330 for (TreeScope* treeScope : m_dirtyTreeScopes)
331 updateActiveStyleSheetsInShadow(updateMode, treeScope, treeScope sRemoved); 331 updateActiveStyleSheetsInShadow(updateMode, treeScope, treeScope sRemoved);
332 } 332 }
333 for (TreeScope* treeScope : treeScopesRemoved) 333 for (TreeScope* treeScope : treeScopesRemoved)
334 m_activeTreeScopes.remove(treeScope); 334 m_activeTreeScopes.remove(treeScope);
335 } 335 }
336 336
337 InspectorInstrumentation::activeStyleSheetsUpdated(m_document); 337 InspectorInstrumentation::activeStyleSheetsUpdated(m_document);
338 m_usesRemUnits = documentStyleSheetCollection()->usesRemUnits();
339 338
340 m_dirtyTreeScopes.clear(); 339 m_dirtyTreeScopes.clear();
341 m_documentScopeDirty = false; 340 m_documentScopeDirty = false;
342 } 341 }
343 342
344 const WillBeHeapVector<RefPtrWillBeMember<CSSStyleSheet>> StyleEngine::activeSty leSheetsForInspector() const 343 const WillBeHeapVector<RefPtrWillBeMember<CSSStyleSheet>> StyleEngine::activeSty leSheetsForInspector() const
345 { 344 {
346 if (m_activeTreeScopes.isEmpty()) 345 if (m_activeTreeScopes.isEmpty())
347 return documentStyleSheetCollection()->activeAuthorStyleSheets(); 346 return documentStyleSheetCollection()->activeAuthorStyleSheets();
348 347
(...skipping 373 matching lines...) Expand 10 before | Expand all | Expand 10 after
722 visitor->trace(m_dirtyTreeScopes); 721 visitor->trace(m_dirtyTreeScopes);
723 visitor->trace(m_activeTreeScopes); 722 visitor->trace(m_activeTreeScopes);
724 visitor->trace(m_fontSelector); 723 visitor->trace(m_fontSelector);
725 visitor->trace(m_textToSheetCache); 724 visitor->trace(m_textToSheetCache);
726 visitor->trace(m_sheetToTextCache); 725 visitor->trace(m_sheetToTextCache);
727 #endif 726 #endif
728 CSSFontSelectorClient::trace(visitor); 727 CSSFontSelectorClient::trace(visitor);
729 } 728 }
730 729
731 } 730 }
OLDNEW
« no previous file with comments | « Source/core/dom/ShadowTreeStyleSheetCollection.cpp ('k') | Source/core/dom/TreeScopeStyleSheetCollection.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698