| Index: Source/core/rendering/RenderMenuList.cpp
|
| diff --git a/Source/core/rendering/RenderMenuList.cpp b/Source/core/rendering/RenderMenuList.cpp
|
| index b86a69822f4140a770791bccb02319ad13de4f68..263b1daf1a9bf4e2630bd569d1d04370a22394dc 100644
|
| --- a/Source/core/rendering/RenderMenuList.cpp
|
| +++ b/Source/core/rendering/RenderMenuList.cpp
|
| @@ -162,7 +162,7 @@ void RenderMenuList::styleDidChange(StyleDifference diff, const RenderStyle* old
|
| void RenderMenuList::updateOptionsWidth()
|
| {
|
| float maxOptionWidth = 0;
|
| - const Vector<HTMLElement*>& listItems = selectElement()->listItems();
|
| + const WillBeHeapVector<RawPtrWillBeMember<HTMLElement> >& listItems = selectElement()->listItems();
|
| int size = listItems.size();
|
| FontCachePurgePreventer fontCachePurgePreventer;
|
|
|
| @@ -214,7 +214,7 @@ void RenderMenuList::updateFromElement()
|
| void RenderMenuList::setTextFromOption(int optionIndex)
|
| {
|
| HTMLSelectElement* select = selectElement();
|
| - const Vector<HTMLElement*>& listItems = select->listItems();
|
| + const WillBeHeapVector<RawPtrWillBeMember<HTMLElement> >& listItems = select->listItems();
|
| int size = listItems.size();
|
|
|
| int i = select->optionToListIndex(optionIndex);
|
| @@ -392,7 +392,7 @@ void RenderMenuList::didUpdateActiveOption(int optionIndex)
|
| String RenderMenuList::itemText(unsigned listIndex) const
|
| {
|
| HTMLSelectElement* select = selectElement();
|
| - const Vector<HTMLElement*>& listItems = select->listItems();
|
| + const WillBeHeapVector<RawPtrWillBeMember<HTMLElement> >& listItems = select->listItems();
|
| if (listIndex >= listItems.size())
|
| return String();
|
|
|
| @@ -410,7 +410,7 @@ String RenderMenuList::itemText(unsigned listIndex) const
|
| String RenderMenuList::itemAccessibilityText(unsigned listIndex) const
|
| {
|
| // Allow the accessible name be changed if necessary.
|
| - const Vector<HTMLElement*>& listItems = selectElement()->listItems();
|
| + const WillBeHeapVector<RawPtrWillBeMember<HTMLElement> >& listItems = selectElement()->listItems();
|
| if (listIndex >= listItems.size())
|
| return String();
|
| return listItems[listIndex]->fastGetAttribute(aria_labelAttr);
|
| @@ -418,7 +418,7 @@ String RenderMenuList::itemAccessibilityText(unsigned listIndex) const
|
|
|
| String RenderMenuList::itemToolTip(unsigned listIndex) const
|
| {
|
| - const Vector<HTMLElement*>& listItems = selectElement()->listItems();
|
| + const WillBeHeapVector<RawPtrWillBeMember<HTMLElement> >& listItems = selectElement()->listItems();
|
| if (listIndex >= listItems.size())
|
| return String();
|
| return listItems[listIndex]->title();
|
| @@ -426,7 +426,7 @@ String RenderMenuList::itemToolTip(unsigned listIndex) const
|
|
|
| bool RenderMenuList::itemIsEnabled(unsigned listIndex) const
|
| {
|
| - const Vector<HTMLElement*>& listItems = selectElement()->listItems();
|
| + const WillBeHeapVector<RawPtrWillBeMember<HTMLElement> >& listItems = selectElement()->listItems();
|
| if (listIndex >= listItems.size())
|
| return false;
|
| HTMLElement* element = listItems[listIndex];
|
| @@ -446,7 +446,7 @@ bool RenderMenuList::itemIsEnabled(unsigned listIndex) const
|
|
|
| PopupMenuStyle RenderMenuList::itemStyle(unsigned listIndex) const
|
| {
|
| - const Vector<HTMLElement*>& listItems = selectElement()->listItems();
|
| + const WillBeHeapVector<RawPtrWillBeMember<HTMLElement> >& listItems = selectElement()->listItems();
|
| if (listIndex >= listItems.size()) {
|
| // If we are making an out of bounds access, then we want to use the style
|
| // of a different option element (index 0). However, if there isn't an option element
|
| @@ -471,7 +471,7 @@ PopupMenuStyle RenderMenuList::itemStyle(unsigned listIndex) const
|
|
|
| void RenderMenuList::getItemBackgroundColor(unsigned listIndex, Color& itemBackgroundColor, bool& itemHasCustomBackgroundColor) const
|
| {
|
| - const Vector<HTMLElement*>& listItems = selectElement()->listItems();
|
| + const WillBeHeapVector<RawPtrWillBeMember<HTMLElement> >& listItems = selectElement()->listItems();
|
| if (listIndex >= listItems.size()) {
|
| itemBackgroundColor = resolveColor(CSSPropertyBackgroundColor);
|
| itemHasCustomBackgroundColor = false;
|
| @@ -547,19 +547,19 @@ void RenderMenuList::popupDidHide()
|
|
|
| bool RenderMenuList::itemIsSeparator(unsigned listIndex) const
|
| {
|
| - const Vector<HTMLElement*>& listItems = selectElement()->listItems();
|
| + const WillBeHeapVector<RawPtrWillBeMember<HTMLElement> >& listItems = selectElement()->listItems();
|
| return listIndex < listItems.size() && isHTMLHRElement(*listItems[listIndex]);
|
| }
|
|
|
| bool RenderMenuList::itemIsLabel(unsigned listIndex) const
|
| {
|
| - const Vector<HTMLElement*>& listItems = selectElement()->listItems();
|
| + const WillBeHeapVector<RawPtrWillBeMember<HTMLElement> >& listItems = selectElement()->listItems();
|
| return listIndex < listItems.size() && isHTMLOptGroupElement(*listItems[listIndex]);
|
| }
|
|
|
| bool RenderMenuList::itemIsSelected(unsigned listIndex) const
|
| {
|
| - const Vector<HTMLElement*>& listItems = selectElement()->listItems();
|
| + const WillBeHeapVector<RawPtrWillBeMember<HTMLElement> >& listItems = selectElement()->listItems();
|
| if (listIndex >= listItems.size())
|
| return false;
|
| HTMLElement* element = listItems[listIndex];
|
|
|