Have InputType factories take an HTMLInputElement reference in parameter

Have InputType factories take an HTMLInputElement reference in parameter

Have InputType factories take an HTMLInputElement reference in parameter
as they expect the pointer to be non-null.

As a consequence, InputTypeView::element() can now return a reference
instead of a pointer, which makes the calling code look safer.

R=adamk, tkent
NOTRY=true

Committed: https://src.chromium.org/viewvc/blink?view=rev&revision=160093

[tkent, 2013-10-20 21:53:59]

lgtm

[commit-bot: I haz the power, 2013-10-20 21:54:13]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/ch.dumez@samsung.com/27746003/6001

[commit-bot: I haz the power, 2013-10-20 21:54:34]

Failed to apply patch for Source/core/html/forms/TextFieldInputType.cpp:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file Source/core/html/forms/TextFieldInputType.cpp
  Hunk #12 FAILED at 392.
  Hunk #13 succeeded at 415 (offset 2 lines).
  Hunk #14 succeeded at 428 (offset 2 lines).
  Hunk #15 succeeded at 465 (offset 2 lines).
  Hunk #16 succeeded at 485 (offset 2 lines).
  1 out of 16 hunks FAILED -- saving rejects to file
Source/core/html/forms/TextFieldInputType.cpp.rej

Patch:       Source/core/html/forms/TextFieldInputType.cpp
Index: Source/core/html/forms/TextFieldInputType.cpp
diff --git a/Source/core/html/forms/TextFieldInputType.cpp
b/Source/core/html/forms/TextFieldInputType.cpp
index
407d7036b1990c6182c1ddd93eb5717d45a65492..91a95f78de71a98a7ce3254cee3ff6c273badcb0
100644
--- a/Source/core/html/forms/TextFieldInputType.cpp
+++ b/Source/core/html/forms/TextFieldInputType.cpp
@@ -58,7 +58,7 @@ namespace WebCore {
 
 using namespace HTMLNames;
 
-TextFieldInputType::TextFieldInputType(HTMLInputElement* element)
+TextFieldInputType::TextFieldInputType(HTMLInputElement& element)
     : InputType(element)
 {
 }
@@ -71,7 +71,7 @@ TextFieldInputType::~TextFieldInputType()
 
 SpinButtonElement* TextFieldInputType::spinButtonElement() const
 {
-    return
toSpinButtonElement(element()->userAgentShadowRoot()->getElementById(ShadowElementNames::spinButton()));
+    return
toSpinButtonElement(element().userAgentShadowRoot()->getElementById(ShadowElementNames::spinButton()));
 }
 
 bool TextFieldInputType::shouldShowFocusRingOnMouseFocus() const
@@ -95,7 +95,7 @@ static inline bool shouldIgnoreRequiredAttribute(const
HTMLInputElement& input)
 
 bool TextFieldInputType::valueMissing(const String& value) const
 {
-    return !shouldIgnoreRequiredAttribute(*element()) &&
element()->isRequired() && value.isEmpty();
+    return !shouldIgnoreRequiredAttribute(element()) && element().isRequired()
&& value.isEmpty();
 }
 
 bool TextFieldInputType::canSetSuggestedValue()
@@ -151,17 +151,17 @@ void TextFieldInputType::setValue(const String&
sanitizedValue, bool valueChange
 
 void TextFieldInputType::handleKeydownEvent(KeyboardEvent* event)
 {
-    if (!element()->focused())
+    if (!element().focused())
         return;
-    Frame* frame = element()->document().frame();
-    if (!frame || !frame->editor().doTextFieldCommandFromEvent(element(),
event))
+    Frame* frame = element().document().frame();
+    if (!frame || !frame->editor().doTextFieldCommandFromEvent(&element(),
event))
         return;
     event->setDefaultHandled();
 }
 
 void TextFieldInputType::handleKeydownEventForSpinButton(KeyboardEvent* event)
 {
-    if (element()->isDisabledOrReadOnly())
+    if (element().isDisabledOrReadOnly())
         return;
     const String& key = event->keyIdentifier();
     if (key == "Up")
@@ -181,8 +181,8 @@ void TextFieldInputType::forwardEvent(Event* event)
             return;
     }
 
-    if (element()->renderer() && (event->isMouseEvent() || event->isDragEvent()
|| event->hasInterface(EventNames::WheelEvent) || event->type() ==
EventTypeNames::blur || event->type() == EventTypeNames::focus)) {
-        RenderTextControlSingleLine* renderTextControl =
toRenderTextControlSingleLine(element()->renderer());
+    if (element().renderer() && (event->isMouseEvent() || event->isDragEvent()
|| event->hasInterface(EventNames::WheelEvent) || event->type() ==
EventTypeNames::blur || event->type() == EventTypeNames::focus)) {
+        RenderTextControlSingleLine* renderTextControl =
toRenderTextControlSingleLine(element().renderer());
         if (event->type() == EventTypeNames::blur) {
             if (RenderBox* innerTextRenderer = innerTextElement()->renderBox())
{
                 // FIXME: This class has no need to know about RenderLayer!
@@ -198,20 +198,20 @@ void TextFieldInputType::forwardEvent(Event* event)
             renderTextControl->capsLockStateMayHaveChanged();
         }
 
-        element()->forwardEvent(event);
+        element().forwardEvent(event);
     }
 }
 
 void TextFieldInputType::handleFocusEvent(Element* oldFocusedNode,
FocusDirection focusDirection)
 {
     InputType::handleFocusEvent(oldFocusedNode, focusDirection);
-    element()->beginEditing();
+    element().beginEditing();
 }
 
 void TextFieldInputType::handleBlurEvent()
 {
     InputType::handleBlurEvent();
-    element()->endEditing();
+    element().endEditing();
 }
 
 bool TextFieldInputType::shouldSubmitImplicitly(Event* event)
@@ -221,13 +221,13 @@ bool TextFieldInputType::shouldSubmitImplicitly(Event*
event)
 
 RenderObject* TextFieldInputType::createRenderer(RenderStyle*) const
 {
-    return new RenderTextControlSingleLine(element());
+    return new RenderTextControlSingleLine(&element());
 }
 
 bool TextFieldInputType::needsContainer() const
 {
 #if ENABLE(INPUT_SPEECH)
-    return element()->isSpeechEnabled();
+    return element().isSpeechEnabled();
 #else
     return false;
 #endif
@@ -235,16 +235,16 @@ bool TextFieldInputType::needsContainer() const
 
 bool TextFieldInputType::shouldHaveSpinButton() const
 {
-    return RenderTheme::theme().shouldHaveSpinButton(element());
+    return RenderTheme::theme().shouldHaveSpinButton(&element());
 }
 
 void TextFieldInputType::createShadowSubtree()
 {
-    ASSERT(element()->shadow());
-    ShadowRoot* shadowRoot = element()->userAgentShadowRoot();
+    ASSERT(element().shadow());
+    ShadowRoot* shadowRoot = element().userAgentShadowRoot();
     ASSERT(!shadowRoot->hasChildNodes());
 
-    Document& document = element()->document();
+    Document& document = element().document();
     bool shouldHaveSpinButton = this->shouldHaveSpinButton();
     bool createsContainer = shouldHaveSpinButton || needsContainer();
 
@@ -263,7 +263,7 @@ void TextFieldInputType::createShadowSubtree()
     container->appendChild(editingViewPort.release());
 
 #if ENABLE(INPUT_SPEECH)
-    if (element()->isSpeechEnabled())
+    if (element().isSpeechEnabled())
        
container->appendChild(InputFieldSpeechButtonElement::create(document));
 #endif
 
@@ -273,7 +273,7 @@ void TextFieldInputType::createShadowSubtree()
 
 Element* TextFieldInputType::containerElement() const
 {
-    return
element()->userAgentShadowRoot()->getElementById(ShadowElementNames::textFieldContainer());
+    return
element().userAgentShadowRoot()->getElementById(ShadowElementNames::textFieldContainer());
 }
 
 HTMLElement* TextFieldInputType::innerTextElement() const
@@ -355,19 +355,19 @@ void
TextFieldInputType::handleBeforeTextInsertedEvent(BeforeTextInsertedEvent*
     // We use HTMLInputElement::innerTextValue() instead of
     // HTMLInputElement::value() because they can be mismatched by
     // sanitizeValue() in HTMLInputElement::subtreeHasChanged() in some cases.
-    unsigned oldLength = element()->innerTextValue().length();
+    unsigned oldLength = element().innerTextValue().length();
 
     // selectionLength represents the selection length of this text field to be
     // removed by this insertion.
     // If the text field has no focus, we don't need to take account of the
     // selection length. The selection is the source of text drag-and-drop in
     // that case, and nothing in the text field will be removed.
-    unsigned selectionLength = element()->focused() ?
plainText(element()->document().frame()->selection().selection().toNormalizedRange().get()).length()
: 0;
+    unsigned selectionLength = element().focused() ?
plainText(element().document().frame()->selection().selection().toNormalizedRange().get()).length()
: 0;
     ASSERT(oldLength >= selectionLength);
 
     // Selected characters will be removed by the next text event.
     unsigned baseLength = oldLength - selectionLength;
-    unsigned maxLength = static_cast<unsigned>(isTextType() ?
element()->maxLength() : HTMLInputElement::maximumLength); // maxLength can
never be negative.
+    unsigned maxLength = static_cast<unsigned>(isTextType() ?
element().maxLength() : HTMLInputElement::maximumLength); // maxLength can never
be negative.
     unsigned appendableLength = maxLength > baseLength ? maxLength - baseLength
: 0;
 
     // Truncate the inserted text to avoid violating the maxLength and other
constraints.
@@ -392,20 +392,20 @@ void TextFieldInputType::updatePlaceholderText()
 {
     if (!supportsPlaceholder())
         return;
-    HTMLElement* placeholder = element()->placeholderElement();
-    String placeholderText = element()->strippedPlaceholder();
+    HTMLElement* placeholder = element().placeholderElement();
+    String placeholderText = element().strippedPlaceholder();
     if (placeholderText.isEmpty()) {
         if (placeholder)
             placeholder->remove(ASSERT_NO_EXCEPTION);
         return;
     }
     if (!placeholder) {
-        RefPtr<HTMLElement> newElement =
HTMLDivElement::create(element()->document());
+        RefPtr<HTMLElement> newElement =
HTMLDivElement::create(element().document());
         placeholder = newElement.get();
         placeholder->setPart(AtomicString("-webkit-input-placeholder",
AtomicString::ConstructFromLiteral));
         placeholder->setAttribute(idAttr, ShadowElementNames::placeholder());
         Element* container = containerElement();
-        element()->userAgentShadowRoot()->insertBefore(placeholder, container ?
container->nextSibling() : innerTextElement()->nextSibling());
+        element().userAgentShadowRoot()->insertBefore(placeholder, container ?
container->nextSibling() : innerTextElement()->nextSibling());
     }
     placeholder->setTextContent(placeholderText, ASSERT_NO_EXCEPTION);
 }
@@ -413,9 +413,9 @@ void TextFieldInputType::updatePlaceholderText()
 bool TextFieldInputType::appendFormData(FormDataList& list, bool multipart)
const
 {
     InputType::appendFormData(list, multipart);
-    const AtomicString& dirnameAttrValue =
element()->fastGetAttribute(dirnameAttr);
+    const AtomicString& dirnameAttrValue = elem…
(message too large)

[commit-bot: I haz the power, 2013-10-21 13:26:12]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/ch.dumez@samsung.com/27746003/41001

[commit-bot: I haz the power, 2013-10-21 15:43:50]

Retried try job too often on win_blink_rel for step(s) webkit_tests
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=win_blink_...

[commit-bot: I haz the power, 2013-10-21 15:50:16]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/ch.dumez@samsung.com/27746003/41001

[commit-bot: I haz the power, 2013-10-21 15:51:05]

Change committed as 160093