diff options
| author | Kristian Monsen <kristianm@google.com> | 2010-07-30 10:46:49 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2010-08-04 13:01:34 +0100 |
| commit | 0617145a89917ae7735fe1c9538688ab9a577df5 (patch) | |
| tree | 56206078694427c37ed7bdf27eb5221398b833c0 /WebKit/win/WebCoreSupport | |
| parent | ef1adcdfc805d4d13103f6f15cc5b4d96828a60f (diff) | |
| download | external_webkit-0617145a89917ae7735fe1c9538688ab9a577df5.zip external_webkit-0617145a89917ae7735fe1c9538688ab9a577df5.tar.gz external_webkit-0617145a89917ae7735fe1c9538688ab9a577df5.tar.bz2 | |
Merge WebKit at r64264 : Initial merge by git.
Change-Id: Ic42bef02efef8217a0f84c47176a9c617c28d1f1
Diffstat (limited to 'WebKit/win/WebCoreSupport')
| -rw-r--r-- | WebKit/win/WebCoreSupport/WebEditorClient.cpp | 6 | ||||
| -rw-r--r-- | WebKit/win/WebCoreSupport/WebGeolocationControllerClient.h | 1 |
2 files changed, 6 insertions, 1 deletions
diff --git a/WebKit/win/WebCoreSupport/WebEditorClient.cpp b/WebKit/win/WebCoreSupport/WebEditorClient.cpp index e05951c..f03ffd6 100644 --- a/WebKit/win/WebCoreSupport/WebEditorClient.cpp +++ b/WebKit/win/WebCoreSupport/WebEditorClient.cpp @@ -41,9 +41,10 @@ #include <WebCore/HTMLInputElement.h> #include <WebCore/HTMLNames.h> #include <WebCore/KeyboardEvent.h> -#include <WebCore/PlatformKeyboardEvent.h> #include <WebCore/NotImplemented.h> +#include <WebCore/PlatformKeyboardEvent.h> #include <WebCore/Range.h> +#include <WebCore/UserTypingGestureIndicator.h> #pragma warning(pop) using namespace WebCore; @@ -347,6 +348,9 @@ void WebEditorClient::textFieldDidEndEditing(Element* e) void WebEditorClient::textDidChangeInTextField(Element* e) { + if (!UserTypingGestureIndicator::processingUserTypingGesture() || UserTypingGestureIndicator::focusedElementAtGestureStart() != e) + return; + IWebFormDelegate* formDelegate; if (SUCCEEDED(m_webView->formDelegate(&formDelegate)) && formDelegate) { IDOMElement* domElement = DOMElement::createInstance(e); diff --git a/WebKit/win/WebCoreSupport/WebGeolocationControllerClient.h b/WebKit/win/WebCoreSupport/WebGeolocationControllerClient.h index ec0bef7..ed73454 100644 --- a/WebKit/win/WebCoreSupport/WebGeolocationControllerClient.h +++ b/WebKit/win/WebCoreSupport/WebGeolocationControllerClient.h @@ -42,6 +42,7 @@ public: virtual void geolocationDestroyed(); virtual void startUpdating(); virtual void stopUpdating(); + virtual void setEnableHighAccuracy(bool) { } virtual WebCore::GeolocationPosition* lastPosition(); private: |