OLD | NEW |
---|---|
1 /* | 1 /* |
2 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). | 2 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). |
3 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) | 3 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) |
4 * (C) 1999 Antti Koivisto (koivisto@kde.org) | 4 * (C) 1999 Antti Koivisto (koivisto@kde.org) |
5 * (C) 2001 Dirk Mueller (mueller@kde.org) | 5 * (C) 2001 Dirk Mueller (mueller@kde.org) |
6 * Copyright (C) 2004, 2005, 2006, 2007, 2009, 2010, 2011 Apple Inc. All rights reserved. | 6 * Copyright (C) 2004, 2005, 2006, 2007, 2009, 2010, 2011 Apple Inc. All rights reserved. |
7 * (C) 2006 Alexey Proskuryakov (ap@nypop.com) | 7 * (C) 2006 Alexey Proskuryakov (ap@nypop.com) |
8 * Copyright (C) 2010 Google Inc. All rights reserved. | 8 * Copyright (C) 2010 Google Inc. All rights reserved. |
9 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/) | 9 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/) |
10 * | 10 * |
(...skipping 359 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
370 bool HTMLSelectElement::shouldShowFocusRingOnMouseFocus() const | 370 bool HTMLSelectElement::shouldShowFocusRingOnMouseFocus() const |
371 { | 371 { |
372 return true; | 372 return true; |
373 } | 373 } |
374 | 374 |
375 bool HTMLSelectElement::canSelectAll() const | 375 bool HTMLSelectElement::canSelectAll() const |
376 { | 376 { |
377 return !usesMenuList(); | 377 return !usesMenuList(); |
378 } | 378 } |
379 | 379 |
380 RenderObject* HTMLSelectElement::createRenderer(RenderStyle*) | 380 RenderObject* HTMLSelectElement::createRenderer(RenderStyle* style) |
381 { | 381 { |
382 if (usesMenuList()) | 382 if (usesMenuList()) |
383 return new RenderMenuList(this); | 383 return new RenderMenuList(this); |
384 return new RenderListBox(this); | 384 return HTMLFormControlElementWithState::createRenderer(style); |
tkent
2014/09/25 06:49:51
Looks an accidental change.
keishi
2014/09/25 07:02:55
Sorry, thanks.
| |
385 // return new RenderListBox(this); | |
385 } | 386 } |
386 | 387 |
387 PassRefPtrWillBeRawPtr<HTMLCollection> HTMLSelectElement::selectedOptions() | 388 PassRefPtrWillBeRawPtr<HTMLCollection> HTMLSelectElement::selectedOptions() |
388 { | 389 { |
389 updateListItemSelectedStates(); | 390 updateListItemSelectedStates(); |
390 return ensureCachedCollection<HTMLCollection>(SelectedOptions); | 391 return ensureCachedCollection<HTMLCollection>(SelectedOptions); |
391 } | 392 } |
392 | 393 |
393 PassRefPtrWillBeRawPtr<HTMLOptionsCollection> HTMLSelectElement::options() | 394 PassRefPtrWillBeRawPtr<HTMLOptionsCollection> HTMLSelectElement::options() |
394 { | 395 { |
(...skipping 1346 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1741 int focusedIndex = activeSelectionEndListIndex(); | 1742 int focusedIndex = activeSelectionEndListIndex(); |
1742 if (focusedIndex < 0) | 1743 if (focusedIndex < 0) |
1743 focusedIndex = firstSelectableListIndex(); | 1744 focusedIndex = firstSelectableListIndex(); |
1744 if (focusedIndex < 0) | 1745 if (focusedIndex < 0) |
1745 return nullptr; | 1746 return nullptr; |
1746 HTMLElement* focused = listItems()[focusedIndex]; | 1747 HTMLElement* focused = listItems()[focusedIndex]; |
1747 return isHTMLOptionElement(focused) ? toHTMLOptionElement(focused) : nullptr ; | 1748 return isHTMLOptionElement(focused) ? toHTMLOptionElement(focused) : nullptr ; |
1748 } | 1749 } |
1749 | 1750 |
1750 } // namespace | 1751 } // namespace |
OLD | NEW |