diff options
author | Andras Becsi <andras.becsi@digia.com> | 2014-03-18 13:16:26 +0100 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-03-20 15:55:39 +0100 |
commit | 3f0f86b0caed75241fa71c95a5d73bc0164348c5 (patch) | |
tree | 92b9fb00f2e9e90b0be2262093876d4f43b6cd13 /chromium/third_party/WebKit/Source/core/html/forms/BaseCheckableInputType.cpp | |
parent | e90d7c4b152c56919d963987e2503f9909a666d2 (diff) |
Update to new stable branch 1750
This also includes an updated ninja and chromium dependencies
needed on Windows.
Change-Id: Icd597d80ed3fa4425933c9f1334c3c2e31291c42
Reviewed-by: Zoltan Arvai <zarvai@inf.u-szeged.hu>
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
Diffstat (limited to 'chromium/third_party/WebKit/Source/core/html/forms/BaseCheckableInputType.cpp')
-rw-r--r-- | chromium/third_party/WebKit/Source/core/html/forms/BaseCheckableInputType.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/chromium/third_party/WebKit/Source/core/html/forms/BaseCheckableInputType.cpp b/chromium/third_party/WebKit/Source/core/html/forms/BaseCheckableInputType.cpp index 1e04eba843c..7ffe40b29da 100644 --- a/chromium/third_party/WebKit/Source/core/html/forms/BaseCheckableInputType.cpp +++ b/chromium/third_party/WebKit/Source/core/html/forms/BaseCheckableInputType.cpp @@ -33,7 +33,7 @@ #include "core/html/forms/BaseCheckableInputType.h" #include "HTMLNames.h" -#include "core/dom/KeyboardEvent.h" +#include "core/events/KeyboardEvent.h" #include "core/html/FormDataList.h" #include "core/html/HTMLInputElement.h" #include "core/html/forms/FormController.h" @@ -44,19 +44,19 @@ using namespace HTMLNames; FormControlState BaseCheckableInputType::saveFormControlState() const { - return FormControlState(element()->checked() ? "on" : "off"); + return FormControlState(element().checked() ? "on" : "off"); } void BaseCheckableInputType::restoreFormControlState(const FormControlState& state) { - element()->setChecked(state[0] == "on"); + element().setChecked(state[0] == "on"); } bool BaseCheckableInputType::appendFormData(FormDataList& encoding, bool) const { - if (!element()->checked()) + if (!element().checked()) return false; - encoding.appendData(element()->name(), element()->value()); + encoding.appendData(element().name(), element().value()); return true; } @@ -64,7 +64,7 @@ void BaseCheckableInputType::handleKeydownEvent(KeyboardEvent* event) { const String& key = event->keyIdentifier(); if (key == "U+0020") { - element()->setActive(true, true); + element().setActive(true); // No setDefaultHandled(), because IE dispatches a keypress in this case // and the caller will only dispatch a keypress if we don't call setDefaultHandled(). } @@ -88,7 +88,7 @@ void BaseCheckableInputType::accessKeyAction(bool sendMouseEvents) { InputType::accessKeyAction(sendMouseEvents); - element()->dispatchSimulatedClick(0, sendMouseEvents ? SendMouseUpDownEvents : SendNoEvents); + element().dispatchSimulatedClick(0, sendMouseEvents ? SendMouseUpDownEvents : SendNoEvents); } String BaseCheckableInputType::fallbackValue() const @@ -103,7 +103,7 @@ bool BaseCheckableInputType::storesValueSeparateFromAttribute() void BaseCheckableInputType::setValue(const String& sanitizedValue, bool, TextFieldEventBehavior) { - element()->setAttribute(valueAttr, sanitizedValue); + element().setAttribute(valueAttr, AtomicString(sanitizedValue)); } bool BaseCheckableInputType::isCheckable() |