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

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

Issue 671613003: Eliminate FontBuilder::initForStyleResolve. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 2 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
« no previous file with comments | « Source/core/css/resolver/StyleResolverState.cpp ('k') | no next file » | 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 1644 matching lines...) Expand 10 before | Expand all | Expand 10 after
1655 while (Node* host = root->shadowHost()) 1655 while (Node* host = root->shadowHost())
1656 root = host; 1656 root = host;
1657 while (Node* ancestor = root->parentOrShadowHostNode()) 1657 while (Node* ancestor = root->parentOrShadowHostNode())
1658 root = ancestor; 1658 root = ancestor;
1659 if (root->childNeedsDistributionRecalc()) 1659 if (root->childNeedsDistributionRecalc())
1660 root->recalcDistribution(); 1660 root->recalcDistribution();
1661 } 1661 }
1662 1662
1663 void Document::setupFontBuilder(RenderStyle* documentStyle) 1663 void Document::setupFontBuilder(RenderStyle* documentStyle)
1664 { 1664 {
1665 FontBuilder fontBuilder; 1665 FontBuilder fontBuilder(*this);
1666 fontBuilder.initForStyleResolve(*this, documentStyle); 1666 fontBuilder.setStyle(documentStyle);
1667 RefPtrWillBeRawPtr<CSSFontSelector> selector = m_styleEngine->fontSelector() ; 1667 RefPtrWillBeRawPtr<CSSFontSelector> selector = m_styleEngine->fontSelector() ;
1668 fontBuilder.createFontForDocument(selector, documentStyle); 1668 fontBuilder.createFontForDocument(selector, documentStyle);
1669 } 1669 }
1670 1670
1671 void Document::inheritHtmlAndBodyElementStyles(StyleRecalcChange change) 1671 void Document::inheritHtmlAndBodyElementStyles(StyleRecalcChange change)
1672 { 1672 {
1673 ASSERT(inStyleRecalc()); 1673 ASSERT(inStyleRecalc());
1674 ASSERT(documentElement()); 1674 ASSERT(documentElement());
1675 1675
1676 RefPtr<RenderStyle> documentElementStyle = documentElement()->renderStyle(); 1676 RefPtr<RenderStyle> documentElementStyle = documentElement()->renderStyle();
(...skipping 4178 matching lines...) Expand 10 before | Expand all | Expand 10 after
5855 using namespace blink; 5855 using namespace blink;
5856 void showLiveDocumentInstances() 5856 void showLiveDocumentInstances()
5857 { 5857 {
5858 WeakDocumentSet& set = liveDocumentSet(); 5858 WeakDocumentSet& set = liveDocumentSet();
5859 fprintf(stderr, "There are %u documents currently alive:\n", set.size()); 5859 fprintf(stderr, "There are %u documents currently alive:\n", set.size());
5860 for (WeakDocumentSet::const_iterator it = set.begin(); it != set.end(); ++it ) { 5860 for (WeakDocumentSet::const_iterator it = set.begin(); it != set.end(); ++it ) {
5861 fprintf(stderr, "- Document %p URL: %s\n", *it, (*it)->url().string().ut f8().data()); 5861 fprintf(stderr, "- Document %p URL: %s\n", *it, (*it)->url().string().ut f8().data());
5862 } 5862 }
5863 } 5863 }
5864 #endif 5864 #endif
OLDNEW
« no previous file with comments | « Source/core/css/resolver/StyleResolverState.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698