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

Unified Diff: third_party/WebKit/Source/core/html/HTMLSelectElement.cpp

Issue 1686483002: Oilpan: Remove most WillBe types from the code base (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 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 side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/core/html/HTMLSelectElement.cpp
diff --git a/third_party/WebKit/Source/core/html/HTMLSelectElement.cpp b/third_party/WebKit/Source/core/html/HTMLSelectElement.cpp
index 0311a0f773e614c0ca158c0be056aaecdabe1fab..c156e11855fee3bb741ba6b01a98dd8273eefdba 100644
--- a/third_party/WebKit/Source/core/html/HTMLSelectElement.cpp
+++ b/third_party/WebKit/Source/core/html/HTMLSelectElement.cpp
@@ -98,16 +98,16 @@ HTMLSelectElement::HTMLSelectElement(Document& document, HTMLFormElement* form)
setHasCustomStyleCallbacks();
}
-PassRefPtrWillBeRawPtr<HTMLSelectElement> HTMLSelectElement::create(Document& document)
+RawPtr<HTMLSelectElement> HTMLSelectElement::create(Document& document)
{
- RefPtrWillBeRawPtr<HTMLSelectElement> select = adoptRefWillBeNoop(new HTMLSelectElement(document, 0));
+ RawPtr<HTMLSelectElement> select = (new HTMLSelectElement(document, 0));
select->ensureUserAgentShadowRoot();
return select.release();
}
-PassRefPtrWillBeRawPtr<HTMLSelectElement> HTMLSelectElement::create(Document& document, HTMLFormElement* form)
+RawPtr<HTMLSelectElement> HTMLSelectElement::create(Document& document, HTMLFormElement* form)
{
- RefPtrWillBeRawPtr<HTMLSelectElement> select = adoptRefWillBeNoop(new HTMLSelectElement(document, form));
+ RawPtr<HTMLSelectElement> select = (new HTMLSelectElement(document, form));
select->ensureUserAgentShadowRoot();
return select.release();
}
@@ -230,14 +230,14 @@ int HTMLSelectElement::activeSelectionEndListIndex() const
void HTMLSelectElement::add(const HTMLOptionElementOrHTMLOptGroupElement& element, const HTMLElementOrLong& before, ExceptionState& exceptionState)
{
- RefPtrWillBeRawPtr<HTMLElement> elementToInsert;
+ RawPtr<HTMLElement> elementToInsert;
ASSERT(!element.isNull());
if (element.isHTMLOptionElement())
elementToInsert = element.getAsHTMLOptionElement();
else
elementToInsert = element.getAsHTMLOptGroupElement();
- RefPtrWillBeRawPtr<HTMLElement> beforeElement;
+ RawPtr<HTMLElement> beforeElement;
if (before.isHTMLElement())
beforeElement = before.getAsHTMLElement();
else if (before.isLong())
@@ -401,13 +401,13 @@ LayoutObject* HTMLSelectElement::createLayoutObject(const ComputedStyle&)
return new LayoutListBox(this);
}
-PassRefPtrWillBeRawPtr<HTMLCollection> HTMLSelectElement::selectedOptions()
+RawPtr<HTMLCollection> HTMLSelectElement::selectedOptions()
{
updateListItemSelectedStates();
return ensureCachedCollection<HTMLCollection>(SelectedOptions);
}
-PassRefPtrWillBeRawPtr<HTMLOptionsCollection> HTMLSelectElement::options()
+RawPtr<HTMLOptionsCollection> HTMLSelectElement::options()
{
return ensureCachedCollection<HTMLOptionsCollection>(SelectOptions);
}
@@ -520,7 +520,7 @@ void HTMLSelectElement::setLength(unsigned newLen, ExceptionState& exceptionStat
// Removing children fires mutation events, which might mutate the DOM
// further, so we first copy out a list of elements that we intend to
// remove then attempt to remove them one at a time.
- WillBeHeapVector<RefPtrWillBeMember<Element>> itemsToRemove;
+ HeapVector<Member<Element>> itemsToRemove;
size_t optionIndex = 0;
for (auto& item : listItems()) {
if (isHTMLOptionElement(item) && optionIndex++ >= newLen) {
@@ -730,7 +730,7 @@ void HTMLSelectElement::listBoxOnChange()
}
if (fireOnChange) {
- RefPtrWillBeRawPtr<HTMLSelectElement> protector(this);
+ RawPtr<HTMLSelectElement> protector(this);
dispatchInputEvent();
dispatchFormControlChangeEvent();
}
@@ -743,7 +743,7 @@ void HTMLSelectElement::dispatchInputAndChangeEventForMenuList()
HTMLOptionElement* selectedOption = this->selectedOption();
if (m_lastOnChangeOption.get() != selectedOption) {
m_lastOnChangeOption = selectedOption;
- RefPtrWillBeRawPtr<HTMLSelectElement> protector(this);
+ RawPtr<HTMLSelectElement> protector(this);
dispatchInputEvent();
dispatchFormControlChangeEvent();
}
@@ -774,7 +774,7 @@ const HTMLSelectElement::ListItems& HTMLSelectElement::listItems() const
recalcListItems();
} else {
#if ENABLE(ASSERT)
- WillBeHeapVector<RawPtrWillBeMember<HTMLElement>> items = m_listItems;
+ HeapVector<Member<HTMLElement>> items = m_listItems;
recalcListItems(false);
ASSERT(items == m_listItems);
#endif
@@ -945,12 +945,12 @@ void HTMLSelectElement::scrollToIndex(int listIndex)
// |listIndex| before executing scrollToIndexTask().
m_optionToScrollTo = toHTMLOptionElement(items[listIndex]);
if (!hasPendingTask)
- document().postTask(BLINK_FROM_HERE, createSameThreadTask(&HTMLSelectElement::scrollToIndexTask, PassRefPtrWillBeRawPtr<HTMLSelectElement>(this)));
+ document().postTask(BLINK_FROM_HERE, createSameThreadTask(&HTMLSelectElement::scrollToIndexTask, RawPtr<HTMLSelectElement>(this)));
}
void HTMLSelectElement::scrollToIndexTask()
{
- RefPtrWillBeRawPtr<HTMLOptionElement> option = m_optionToScrollTo.release();
+ RawPtr<HTMLOptionElement> option = m_optionToScrollTo.release();
if (!option || !inDocument())
return;
// optionRemoved() makes sure m_optionToScrollTo doesn't have an option with
@@ -1806,7 +1806,7 @@ void HTMLSelectElement::finishParsingChildren()
cache->listboxActiveIndexChanged(this);
}
-bool HTMLSelectElement::anonymousIndexedSetter(unsigned index, PassRefPtrWillBeRawPtr<HTMLOptionElement> value, ExceptionState& exceptionState)
+bool HTMLSelectElement::anonymousIndexedSetter(unsigned index, RawPtr<HTMLOptionElement> value, ExceptionState& exceptionState)
{
if (!value) { // undefined or null
remove(index);
@@ -1854,7 +1854,7 @@ void HTMLSelectElement::willRecalcStyle(StyleRecalcChange change)
void HTMLSelectElement::didAddUserAgentShadowRoot(ShadowRoot& root)
{
- RefPtrWillBeRawPtr<HTMLContentElement> content = HTMLContentElement::create(document());
+ RawPtr<HTMLContentElement> content = HTMLContentElement::create(document());
content->setAttribute(selectAttr, "option,optgroup,hr");
root.appendChild(content);
}

Powered by Google App Engine
This is Rietveld 408576698