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

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

Issue 714163002: Remove RenderStyle member from FontBuilder. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Ensure font is created before taking animation snapshot. Created 6 years, 1 month 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 1647 matching lines...) Expand 10 before | Expand all | Expand 10 after
1658 root = host; 1658 root = host;
1659 while (Node* ancestor = root->parentOrShadowHostNode()) 1659 while (Node* ancestor = root->parentOrShadowHostNode())
1660 root = ancestor; 1660 root = ancestor;
1661 if (root->childNeedsDistributionRecalc()) 1661 if (root->childNeedsDistributionRecalc())
1662 root->recalcDistribution(); 1662 root->recalcDistribution();
1663 } 1663 }
1664 1664
1665 void Document::setupFontBuilder(RenderStyle* documentStyle) 1665 void Document::setupFontBuilder(RenderStyle* documentStyle)
1666 { 1666 {
1667 FontBuilder fontBuilder(*this); 1667 FontBuilder fontBuilder(*this);
1668 fontBuilder.setStyle(documentStyle); 1668 fontBuilder.setFontDescription(documentStyle->fontDescription());
1669 RefPtrWillBeRawPtr<CSSFontSelector> selector = m_styleEngine->fontSelector() ; 1669 RefPtrWillBeRawPtr<CSSFontSelector> selector = m_styleEngine->fontSelector() ;
1670 fontBuilder.createFontForDocument(selector, documentStyle); 1670 fontBuilder.createFontForDocument(selector, documentStyle);
1671 } 1671 }
1672 1672
1673 void Document::inheritHtmlAndBodyElementStyles(StyleRecalcChange change) 1673 void Document::inheritHtmlAndBodyElementStyles(StyleRecalcChange change)
1674 { 1674 {
1675 ASSERT(inStyleRecalc()); 1675 ASSERT(inStyleRecalc());
1676 ASSERT(documentElement()); 1676 ASSERT(documentElement());
1677 1677
1678 RefPtr<RenderStyle> documentElementStyle = documentElement()->renderStyle(); 1678 RefPtr<RenderStyle> documentElementStyle = documentElement()->renderStyle();
(...skipping 4172 matching lines...) Expand 10 before | Expand all | Expand 10 after
5851 #ifndef NDEBUG 5851 #ifndef NDEBUG
5852 using namespace blink; 5852 using namespace blink;
5853 void showLiveDocumentInstances() 5853 void showLiveDocumentInstances()
5854 { 5854 {
5855 WeakDocumentSet& set = liveDocumentSet(); 5855 WeakDocumentSet& set = liveDocumentSet();
5856 fprintf(stderr, "There are %u documents currently alive:\n", set.size()); 5856 fprintf(stderr, "There are %u documents currently alive:\n", set.size());
5857 for (Document* document : set) 5857 for (Document* document : set)
5858 fprintf(stderr, "- Document %p URL: %s\n", document, document->url().str ing().utf8().data()); 5858 fprintf(stderr, "- Document %p URL: %s\n", document, document->url().str ing().utf8().data());
5859 } 5859 }
5860 #endif 5860 #endif
OLDNEW
« Source/core/css/resolver/StyleResolver.cpp ('K') | « Source/core/css/resolver/StyleResolverState.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698