diff options
author | Kristian Monsen <kristianm@google.com> | 2010-07-06 11:37:41 +0100 |
---|---|---|
committer | Kristian Monsen <kristianm@google.com> | 2010-07-15 12:55:05 +0100 |
commit | ff80790be406da04e7afbd8aea7bb0e26f1f08f0 (patch) | |
tree | bdcd94ef63cabf0e13e193a531b089c20bc2b177 /WebCore/page/ChromeClient.h | |
parent | 31dbf1e39c75fa71a6175b95ce2172727630129b (diff) | |
download | external_webkit-ff80790be406da04e7afbd8aea7bb0e26f1f08f0.zip external_webkit-ff80790be406da04e7afbd8aea7bb0e26f1f08f0.tar.gz external_webkit-ff80790be406da04e7afbd8aea7bb0e26f1f08f0.tar.bz2 |
Fix for bug 2816268: Refactor ANDROID_USER_GESTURE code
Used the UserGestureIndicator class instead of the local ANDROID_USER_GESTURE code. I have made a simple test case for the problem at:
http://updates.monsen.it/source.html
This cannot be made into a layout test since the Android Dumprendertree does not support focus on windows other than the main one.
Lots of local changes removed, but not many actual changes. Most are in parameters sent to other functions.
As far as I can see they user gestures are only checked for in ChromeClientAndroid.cpp and WebCoreFrameBridge.cpp, and I
replaced ANDROID_USER_GESTURE with UserGestureIndicator::processingUserGesture().
The UserGestureIndicator class was added to webkit in this CL:
http://trac.webkit.org/changeset/57045
ResourceRequest.h is a cherry-pick of this CL from webkit.org
http://trac.webkit.org/changeset/62668
Change-Id: Ia254b2cee833459fcc2cacfb2751ef7a29a8f64a
Diffstat (limited to 'WebCore/page/ChromeClient.h')
-rw-r--r-- | WebCore/page/ChromeClient.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/WebCore/page/ChromeClient.h b/WebCore/page/ChromeClient.h index 660ec68..64b9f26 100644 --- a/WebCore/page/ChromeClient.h +++ b/WebCore/page/ChromeClient.h @@ -79,11 +79,7 @@ namespace WebCore { virtual float scaleFactor() = 0; -#ifdef ANDROID_USER_GESTURE - virtual void focus(bool userGesture) = 0; -#else virtual void focus() = 0; -#endif virtual void unfocus() = 0; virtual bool canTakeFocus(FocusDirection) = 0; |