| 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 | 6 * Copyright (C) 2004, 2005, 2006, 2007, 2009, 2010, 2011 Apple Inc. All rights |
| 7 * reserved. | 7 * reserved. |
| 8 * (C) 2006 Alexey Proskuryakov (ap@nypop.com) | 8 * (C) 2006 Alexey Proskuryakov (ap@nypop.com) |
| 9 * Copyright (C) 2010 Google Inc. All rights reserved. | 9 * Copyright (C) 2010 Google Inc. All rights reserved. |
| 10 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. | 10 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. |
| (...skipping 1816 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1827 | 1827 |
| 1828 if (layoutObject()) | 1828 if (layoutObject()) |
| 1829 applyTextTransform(layoutObject()->style(), itemString, ' '); | 1829 applyTextTransform(layoutObject()->style(), itemString, ' '); |
| 1830 return itemString; | 1830 return itemString; |
| 1831 } | 1831 } |
| 1832 | 1832 |
| 1833 bool HTMLSelectElement::itemIsDisplayNone(Element& element) const { | 1833 bool HTMLSelectElement::itemIsDisplayNone(Element& element) const { |
| 1834 if (isHTMLOptionElement(element)) | 1834 if (isHTMLOptionElement(element)) |
| 1835 return toHTMLOptionElement(element).isDisplayNone(); | 1835 return toHTMLOptionElement(element).isDisplayNone(); |
| 1836 if (const ComputedStyle* style = itemComputedStyle(element)) | 1836 if (const ComputedStyle* style = itemComputedStyle(element)) |
| 1837 return style->display() == EDisplay::None; | 1837 return style->display() == EDisplay::kNone; |
| 1838 return false; | 1838 return false; |
| 1839 } | 1839 } |
| 1840 | 1840 |
| 1841 const ComputedStyle* HTMLSelectElement::itemComputedStyle( | 1841 const ComputedStyle* HTMLSelectElement::itemComputedStyle( |
| 1842 Element& element) const { | 1842 Element& element) const { |
| 1843 return element.computedStyle() ? element.computedStyle() | 1843 return element.computedStyle() ? element.computedStyle() |
| 1844 : element.ensureComputedStyle(); | 1844 : element.ensureComputedStyle(); |
| 1845 } | 1845 } |
| 1846 | 1846 |
| 1847 LayoutUnit HTMLSelectElement::clientPaddingLeft() const { | 1847 LayoutUnit HTMLSelectElement::clientPaddingLeft() const { |
| (...skipping 190 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2038 m_popupUpdater = nullptr; | 2038 m_popupUpdater = nullptr; |
| 2039 } | 2039 } |
| 2040 | 2040 |
| 2041 void HTMLSelectElement::didMutateSubtree() { | 2041 void HTMLSelectElement::didMutateSubtree() { |
| 2042 DCHECK(popupIsVisible()); | 2042 DCHECK(popupIsVisible()); |
| 2043 DCHECK(m_popup); | 2043 DCHECK(m_popup); |
| 2044 m_popup->updateFromElement(PopupMenu::ByDOMChange); | 2044 m_popup->updateFromElement(PopupMenu::ByDOMChange); |
| 2045 } | 2045 } |
| 2046 | 2046 |
| 2047 } // namespace blink | 2047 } // namespace blink |
| OLD | NEW |