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

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

Issue 712333004: Create the document font using normal FontBuilder calls. Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Recreate patch on new master. Created 5 years, 10 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/FontBuilder.cpp ('k') | Source/core/dom/Document.h » ('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) 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 503 matching lines...) Expand 10 before | Expand all | Expand 10 after
514 documentStyle->setZoom(frame && !document.printing() ? frame->pageZoomFactor () : 1); 514 documentStyle->setZoom(frame && !document.printing() ? frame->pageZoomFactor () : 1);
515 documentStyle->setLocale(document.contentLanguage()); 515 documentStyle->setLocale(document.contentLanguage());
516 documentStyle->setZIndex(0); 516 documentStyle->setZIndex(0);
517 documentStyle->setUserModify(document.inDesignMode() ? READ_WRITE : READ_ONL Y); 517 documentStyle->setUserModify(document.inDesignMode() ? READ_WRITE : READ_ONL Y);
518 // These are designed to match the user-agent stylesheet values for the docu ment element 518 // These are designed to match the user-agent stylesheet values for the docu ment element
519 // so that the common case doesn't need to create a new RenderStyle in 519 // so that the common case doesn't need to create a new RenderStyle in
520 // Document::inheritHtmlAndBodyElementStyles. 520 // Document::inheritHtmlAndBodyElementStyles.
521 documentStyle->setDisplay(BLOCK); 521 documentStyle->setDisplay(BLOCK);
522 documentStyle->setScrollBlocksOn(WebScrollBlocksOnStartTouch | WebScrollBloc ksOnWheelEvent); 522 documentStyle->setScrollBlocksOn(WebScrollBlocksOnStartTouch | WebScrollBloc ksOnWheelEvent);
523 523
524 document.setupFontBuilder(documentStyle.get()); 524 document.createFont(documentStyle.get());
525 525
526 return documentStyle.release(); 526 return documentStyle.release();
527 } 527 }
528 528
529 void StyleResolver::adjustRenderStyle(StyleResolverState& state, Element* elemen t) 529 void StyleResolver::adjustRenderStyle(StyleResolverState& state, Element* elemen t)
530 { 530 {
531 StyleAdjuster adjuster(document().inQuirksMode()); 531 StyleAdjuster adjuster(document().inQuirksMode());
532 adjuster.adjustRenderStyle(state.style(), state.parentStyle(), element, stat e.cachedUAStyle()); 532 adjuster.adjustRenderStyle(state.style(), state.parentStyle(), element, stat e.cachedUAStyle());
533 } 533 }
534 534
(...skipping 990 matching lines...) Expand 10 before | Expand all | Expand 10 after
1525 visitor->trace(m_uncommonAttributeRuleSet); 1525 visitor->trace(m_uncommonAttributeRuleSet);
1526 visitor->trace(m_watchedSelectorsRules); 1526 visitor->trace(m_watchedSelectorsRules);
1527 visitor->trace(m_treeBoundaryCrossingRules); 1527 visitor->trace(m_treeBoundaryCrossingRules);
1528 visitor->trace(m_styleSharingLists); 1528 visitor->trace(m_styleSharingLists);
1529 visitor->trace(m_pendingStyleSheets); 1529 visitor->trace(m_pendingStyleSheets);
1530 visitor->trace(m_document); 1530 visitor->trace(m_document);
1531 #endif 1531 #endif
1532 } 1532 }
1533 1533
1534 } // namespace blink 1534 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/css/resolver/FontBuilder.cpp ('k') | Source/core/dom/Document.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698