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

Side by Side Diff: Source/core/rendering/RenderMenuList.cpp

Issue 87503003: Moving fontSelector from StyleResolver to StyleEngine. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 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 | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * This file is part of the select element renderer in WebCore. 2 * This file is part of the select element renderer in WebCore.
3 * 3 *
4 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). 4 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
5 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserv ed. 5 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserv ed.
6 * 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/) 6 * 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/)
7 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Library General Public 9 * modify it under the terms of the GNU Library General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 584 matching lines...) Expand 10 before | Expand all | Expand 10 after
595 return element->hasTagName(optionTag) && toHTMLOptionElement(element)->selec ted(); 595 return element->hasTagName(optionTag) && toHTMLOptionElement(element)->selec ted();
596 } 596 }
597 597
598 void RenderMenuList::setTextFromItem(unsigned listIndex) 598 void RenderMenuList::setTextFromItem(unsigned listIndex)
599 { 599 {
600 setTextFromOption(selectElement()->listToOptionIndex(listIndex)); 600 setTextFromOption(selectElement()->listToOptionIndex(listIndex));
601 } 601 }
602 602
603 FontSelector* RenderMenuList::fontSelector() const 603 FontSelector* RenderMenuList::fontSelector() const
604 { 604 {
605 return document().ensureStyleResolver().fontSelector(); 605 return document().styleEngine()->fontSelector();
606 } 606 }
607 607
608 } 608 }
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderListBox.cpp ('k') | Source/core/rendering/svg/RenderSVGInlineText.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698