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

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

Issue 214473004: Rename RenderStyle::diff and RenderStyle::compare to better names (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: typos 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 | « no previous file | Source/core/dom/Element.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, 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 1766 matching lines...) Expand 10 before | Expand all | Expand 10 after
1777 change = Force; 1777 change = Force;
1778 1778
1779 // FIXME: Cannot access the ensureStyleResolver() before calling styleForDoc ument below because 1779 // FIXME: Cannot access the ensureStyleResolver() before calling styleForDoc ument below because
1780 // apparently the StyleResolver's constructor has side effects. We should fi x it. 1780 // apparently the StyleResolver's constructor has side effects. We should fi x it.
1781 // See printing/setPrinting.html, printing/width-overflow.html though they o nly fail on 1781 // See printing/setPrinting.html, printing/width-overflow.html though they o nly fail on
1782 // mac when accessing the resolver by what appears to be a viewport size dif ference. 1782 // mac when accessing the resolver by what appears to be a viewport size dif ference.
1783 1783
1784 if (change == Force) { 1784 if (change == Force) {
1785 m_hasNodesWithPlaceholderStyle = false; 1785 m_hasNodesWithPlaceholderStyle = false;
1786 RefPtr<RenderStyle> documentStyle = StyleResolver::styleForDocument(*thi s, m_styleEngine->fontSelector()); 1786 RefPtr<RenderStyle> documentStyle = StyleResolver::styleForDocument(*thi s, m_styleEngine->fontSelector());
1787 StyleRecalcChange localChange = RenderStyle::compare(documentStyle.get() , renderView()->style()); 1787 StyleRecalcChange localChange = RenderStyle::stylePropagationDiff(docume ntStyle.get(), renderView()->style());
1788 if (localChange != NoChange) 1788 if (localChange != NoChange)
1789 renderView()->setStyle(documentStyle.release()); 1789 renderView()->setStyle(documentStyle.release());
1790 } 1790 }
1791 1791
1792 clearNeedsStyleRecalc(); 1792 clearNeedsStyleRecalc();
1793 1793
1794 // Uncomment to enable printing of statistics about style sharing and the ma tched property cache. 1794 // Uncomment to enable printing of statistics about style sharing and the ma tched property cache.
1795 // Optionally pass StyleResolver::ReportSlowStats to print numbers that requ ire crawling the 1795 // Optionally pass StyleResolver::ReportSlowStats to print numbers that requ ire crawling the
1796 // entire DOM (where collecting them is very slow). 1796 // entire DOM (where collecting them is very slow).
1797 // FIXME: Expose this as a runtime flag. 1797 // FIXME: Expose this as a runtime flag.
(...skipping 3693 matching lines...) Expand 10 before | Expand all | Expand 10 after
5491 } 5491 }
5492 5492
5493 void Document::invalidateNodeListCaches(const QualifiedName* attrName) 5493 void Document::invalidateNodeListCaches(const QualifiedName* attrName)
5494 { 5494 {
5495 HashSet<LiveNodeListBase*>::iterator end = m_listsInvalidatedAtDocument.end( ); 5495 HashSet<LiveNodeListBase*>::iterator end = m_listsInvalidatedAtDocument.end( );
5496 for (HashSet<LiveNodeListBase*>::iterator it = m_listsInvalidatedAtDocument. begin(); it != end; ++it) 5496 for (HashSet<LiveNodeListBase*>::iterator it = m_listsInvalidatedAtDocument. begin(); it != end; ++it)
5497 (*it)->invalidateCache(attrName); 5497 (*it)->invalidateCache(attrName);
5498 } 5498 }
5499 5499
5500 } // namespace WebCore 5500 } // namespace WebCore
OLDNEW
« no previous file with comments | « no previous file | Source/core/dom/Element.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698