diff options
author | Russell Brenner <russellbrenner@google.com> | 2010-11-18 17:33:13 -0800 |
---|---|---|
committer | Russell Brenner <russellbrenner@google.com> | 2010-12-02 13:47:21 -0800 |
commit | 6b70adc33054f8aee8c54d0f460458a9df11b8a5 (patch) | |
tree | 103a13998c33944d6ab3b8318c509a037e639460 /WebCore/wml | |
parent | bdf4ebc8e70b2d221b6ee7a65660918ecb1d33aa (diff) | |
download | external_webkit-6b70adc33054f8aee8c54d0f460458a9df11b8a5.zip external_webkit-6b70adc33054f8aee8c54d0f460458a9df11b8a5.tar.gz external_webkit-6b70adc33054f8aee8c54d0f460458a9df11b8a5.tar.bz2 |
Merge WebKit at r72274: Initial merge by git.
Change-Id: Ie51f0b4a16da82942bd516dce59cfb79ebbe25fb
Diffstat (limited to 'WebCore/wml')
-rw-r--r-- | WebCore/wml/WMLDoElement.cpp | 1 | ||||
-rw-r--r-- | WebCore/wml/WMLDocument.cpp | 1 | ||||
-rw-r--r-- | WebCore/wml/WMLInputElement.cpp | 2 | ||||
-rw-r--r-- | WebCore/wml/WMLPageState.cpp | 1 | ||||
-rw-r--r-- | WebCore/wml/WMLPrevElement.cpp | 1 |
5 files changed, 5 insertions, 1 deletions
diff --git a/WebCore/wml/WMLDoElement.cpp b/WebCore/wml/WMLDoElement.cpp index 899bee1..a8d4880 100644 --- a/WebCore/wml/WMLDoElement.cpp +++ b/WebCore/wml/WMLDoElement.cpp @@ -24,6 +24,7 @@ #include "WMLDoElement.h" #include "Attribute.h" +#include "BackForwardController.h" #include "Event.h" #include "EventNames.h" #include "HTMLNames.h" diff --git a/WebCore/wml/WMLDocument.cpp b/WebCore/wml/WMLDocument.cpp index 440f8ee..9b29899 100644 --- a/WebCore/wml/WMLDocument.cpp +++ b/WebCore/wml/WMLDocument.cpp @@ -23,6 +23,7 @@ #if ENABLE(WML) #include "WMLDocument.h" +#include "BackForwardController.h" #include "BackForwardList.h" #include "Frame.h" #include "Page.h" diff --git a/WebCore/wml/WMLInputElement.cpp b/WebCore/wml/WMLInputElement.cpp index 2165bd4..2d7310a 100644 --- a/WebCore/wml/WMLInputElement.cpp +++ b/WebCore/wml/WMLInputElement.cpp @@ -191,7 +191,7 @@ void WMLInputElement::restoreFormControlState(const String& state) void WMLInputElement::select() { if (RenderTextControl* r = toRenderTextControl(renderer())) - r->select(); + setSelectionRange(this, 0, r->text().length()); } void WMLInputElement::accessKeyAction(bool) diff --git a/WebCore/wml/WMLPageState.cpp b/WebCore/wml/WMLPageState.cpp index 5779e0e..a3c6243 100644 --- a/WebCore/wml/WMLPageState.cpp +++ b/WebCore/wml/WMLPageState.cpp @@ -24,6 +24,7 @@ #if ENABLE(WML) #include "WMLPageState.h" +#include "BackForwardController.h" #include "BackForwardList.h" #include "Document.h" #include "Frame.h" diff --git a/WebCore/wml/WMLPrevElement.cpp b/WebCore/wml/WMLPrevElement.cpp index fccdc0b..c07f019 100644 --- a/WebCore/wml/WMLPrevElement.cpp +++ b/WebCore/wml/WMLPrevElement.cpp @@ -23,6 +23,7 @@ #if ENABLE(WML) #include "WMLPrevElement.h" +#include "BackForwardController.h" #include "Page.h" #include "WMLCardElement.h" #include "WMLDocument.h" |