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

Side by Side Diff: Source/core/css/resolver/StyleResolver.cpp

Issue 1086873002: Rename NodeRenderingTraversal to LayoutTreeBuilderTraversal (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebased Created 5 years, 8 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) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com) 3 * (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com)
4 * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com) 4 * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com)
5 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved. 5 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved.
6 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org> 6 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
7 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org> 7 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org>
8 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/) 8 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/)
9 * Copyright (c) 2011, Code Aurora Forum. All rights reserved. 9 * Copyright (c) 2011, Code Aurora Forum. All rights reserved.
10 * Copyright (C) Research In Motion Limited 2011. All rights reserved. 10 * Copyright (C) Research In Motion Limited 2011. All rights reserved.
(...skipping 883 matching lines...) Expand 10 before | Expand all | Expand 10 after
894 FontBuilder fontBuilder(document()); 894 FontBuilder fontBuilder(document());
895 fontBuilder.setInitial(style->effectiveZoom()); 895 fontBuilder.setInitial(style->effectiveZoom());
896 fontBuilder.createFont(document().styleEngine().fontSelector(), *style); 896 fontBuilder.createFont(document().styleEngine().fontSelector(), *style);
897 return style.release(); 897 return style.release();
898 } 898 }
899 899
900 PassRefPtr<ComputedStyle> StyleResolver::styleForText(Text* textNode) 900 PassRefPtr<ComputedStyle> StyleResolver::styleForText(Text* textNode)
901 { 901 {
902 ASSERT(textNode); 902 ASSERT(textNode);
903 903
904 Node* parentNode = NodeRenderingTraversal::parent(*textNode); 904 Node* parentNode = LayoutTreeBuilderTraversal::parent(*textNode);
905 if (!parentNode || !parentNode->computedStyle()) 905 if (!parentNode || !parentNode->computedStyle())
906 return initialStyleForElement(); 906 return initialStyleForElement();
907 return parentNode->mutableComputedStyle(); 907 return parentNode->mutableComputedStyle();
908 } 908 }
909 909
910 void StyleResolver::updateFont(StyleResolverState& state) 910 void StyleResolver::updateFont(StyleResolverState& state)
911 { 911 {
912 state.fontBuilder().createFont(document().styleEngine().fontSelector(), stat e.mutableStyleRef()); 912 state.fontBuilder().createFont(document().styleEngine().fontSelector(), stat e.mutableStyleRef());
913 state.setConversionFontSizes(CSSToLengthConversionData::FontSizes(state.styl e(), state.rootElementStyle())); 913 state.setConversionFontSizes(CSSToLengthConversionData::FontSizes(state.styl e(), state.rootElementStyle()));
914 state.setConversionZoom(state.style()->effectiveZoom()); 914 state.setConversionZoom(state.style()->effectiveZoom());
(...skipping 591 matching lines...) Expand 10 before | Expand all | Expand 10 after
1506 visitor->trace(m_watchedSelectorsRules); 1506 visitor->trace(m_watchedSelectorsRules);
1507 visitor->trace(m_treeBoundaryCrossingRules); 1507 visitor->trace(m_treeBoundaryCrossingRules);
1508 visitor->trace(m_styleResourceLoader); 1508 visitor->trace(m_styleResourceLoader);
1509 visitor->trace(m_styleSharingLists); 1509 visitor->trace(m_styleSharingLists);
1510 visitor->trace(m_pendingStyleSheets); 1510 visitor->trace(m_pendingStyleSheets);
1511 visitor->trace(m_document); 1511 visitor->trace(m_document);
1512 #endif 1512 #endif
1513 } 1513 }
1514 1514
1515 } // namespace blink 1515 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698