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

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

Issue 463633002: Revert "Cleanup deadcode in Rendering" (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebase Created 6 years, 4 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/rendering/RenderMenuList.h ('k') | Source/core/rendering/RenderRegion.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 * 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 384 matching lines...) Expand 10 before | Expand all | Expand 10 after
395 // Check to ensure a page navigation has not occurred while 395 // Check to ensure a page navigation has not occurred while
396 // the popup was up. 396 // the popup was up.
397 Document& doc = toElement(node())->document(); 397 Document& doc = toElement(node())->document();
398 if (&doc != doc.frame()->document()) 398 if (&doc != doc.frame()->document())
399 return; 399 return;
400 400
401 HTMLSelectElement* select = selectElement(); 401 HTMLSelectElement* select = selectElement();
402 select->optionSelectedByUser(select->listToOptionIndex(listIndex), fireOnCha nge); 402 select->optionSelectedByUser(select->listToOptionIndex(listIndex), fireOnCha nge);
403 } 403 }
404 404
405 void RenderMenuList::listBoxSelectItem(int listIndex, bool allowMultiplySelectio ns, bool shift, bool fireOnChangeNow)
406 {
407 selectElement()->listBoxSelectItem(listIndex, allowMultiplySelections, shift , fireOnChangeNow);
408 }
409
405 bool RenderMenuList::multiple() const 410 bool RenderMenuList::multiple() const
406 { 411 {
407 return selectElement()->multiple(); 412 return selectElement()->multiple();
408 } 413 }
409 414
410 void RenderMenuList::didSetSelectedIndex(int listIndex) 415 void RenderMenuList::didSetSelectedIndex(int listIndex)
411 { 416 {
412 didUpdateActiveOption(selectElement()->listToOptionIndex(listIndex)); 417 didUpdateActiveOption(selectElement()->listToOptionIndex(listIndex));
413 } 418 }
414 419
(...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after
606 HTMLElement* element = listItems[listIndex]; 611 HTMLElement* element = listItems[listIndex];
607 return isHTMLOptionElement(*element) && toHTMLOptionElement(*element).select ed(); 612 return isHTMLOptionElement(*element) && toHTMLOptionElement(*element).select ed();
608 } 613 }
609 614
610 void RenderMenuList::setTextFromItem(unsigned listIndex) 615 void RenderMenuList::setTextFromItem(unsigned listIndex)
611 { 616 {
612 setTextFromOption(selectElement()->listToOptionIndex(listIndex)); 617 setTextFromOption(selectElement()->listToOptionIndex(listIndex));
613 } 618 }
614 619
615 } 620 }
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderMenuList.h ('k') | Source/core/rendering/RenderRegion.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698