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

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

Issue 715633006: Remove FontDescriptionChangeScope, and let FontBuilder partially apply values. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Fix size/family ordering. Created 6 years 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 1646 matching lines...) Expand 10 before | Expand all | Expand 10 after
1657 root = host; 1657 root = host;
1658 while (Node* ancestor = root->parentOrShadowHostNode()) 1658 while (Node* ancestor = root->parentOrShadowHostNode())
1659 root = ancestor; 1659 root = ancestor;
1660 if (root->childNeedsDistributionRecalc()) 1660 if (root->childNeedsDistributionRecalc())
1661 root->recalcDistribution(); 1661 root->recalcDistribution();
1662 } 1662 }
1663 1663
1664 void Document::setupFontBuilder(RenderStyle* documentStyle) 1664 void Document::setupFontBuilder(RenderStyle* documentStyle)
1665 { 1665 {
1666 FontBuilder fontBuilder(*this); 1666 FontBuilder fontBuilder(*this);
1667 fontBuilder.setFontDescription(documentStyle->fontDescription());
1668 RefPtrWillBeRawPtr<CSSFontSelector> selector = m_styleEngine->fontSelector() ; 1667 RefPtrWillBeRawPtr<CSSFontSelector> selector = m_styleEngine->fontSelector() ;
1669 fontBuilder.createFontForDocument(selector, documentStyle); 1668 fontBuilder.createFontForDocument(selector, documentStyle);
1670 } 1669 }
1671 1670
1672 void Document::inheritHtmlAndBodyElementStyles(StyleRecalcChange change) 1671 void Document::inheritHtmlAndBodyElementStyles(StyleRecalcChange change)
1673 { 1672 {
1674 ASSERT(inStyleRecalc()); 1673 ASSERT(inStyleRecalc());
1675 ASSERT(documentElement()); 1674 ASSERT(documentElement());
1676 1675
1677 RefPtr<RenderStyle> documentElementStyle = documentElement()->renderStyle(); 1676 RefPtr<RenderStyle> documentElementStyle = documentElement()->renderStyle();
(...skipping 4167 matching lines...) Expand 10 before | Expand all | Expand 10 after
5845 #ifndef NDEBUG 5844 #ifndef NDEBUG
5846 using namespace blink; 5845 using namespace blink;
5847 void showLiveDocumentInstances() 5846 void showLiveDocumentInstances()
5848 { 5847 {
5849 WeakDocumentSet& set = liveDocumentSet(); 5848 WeakDocumentSet& set = liveDocumentSet();
5850 fprintf(stderr, "There are %u documents currently alive:\n", set.size()); 5849 fprintf(stderr, "There are %u documents currently alive:\n", set.size());
5851 for (Document* document : set) 5850 for (Document* document : set)
5852 fprintf(stderr, "- Document %p URL: %s\n", document, document->url().str ing().utf8().data()); 5851 fprintf(stderr, "- Document %p URL: %s\n", document, document->url().str ing().utf8().data());
5853 } 5852 }
5854 #endif 5853 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698