summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCary Clark <cary@android.com>2011-01-06 10:52:42 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-01-06 10:52:42 -0800
commit608cd75e8bcc1526c42be58a3253f813647cf7d3 (patch)
tree38358ebd0974b6e606ccf0a5d58f9d07496bf1b1
parentd5641d5dacf9bda84fa6d806eb9aa18b9609cfdf (diff)
parent668fb0e6a215bfcdf50eb3ffb47a75f676a95456 (diff)
downloadexternal_webkit-608cd75e8bcc1526c42be58a3253f813647cf7d3.zip
external_webkit-608cd75e8bcc1526c42be58a3253f813647cf7d3.tar.gz
external_webkit-608cd75e8bcc1526c42be58a3253f813647cf7d3.tar.bz2
Merge "add iframes to the types that want key events" into honeycomb
-rw-r--r--WebKit/android/nav/CachedNode.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/WebKit/android/nav/CachedNode.h b/WebKit/android/nav/CachedNode.h
index db48a66..961018b 100644
--- a/WebKit/android/nav/CachedNode.h
+++ b/WebKit/android/nav/CachedNode.h
@@ -178,7 +178,8 @@ public:
const CachedNode* traverseNextNode() const { return mLast ? NULL : &this[1]; }
bool useBounds() const { return mUseBounds; }
bool useHitBounds() const { return mUseHitBounds; }
- bool wantsKeyEvents() const { return isTextInput() || isPlugin() || isContentEditable(); }
+ bool wantsKeyEvents() const { return isTextInput() || isPlugin()
+ || isContentEditable() || isFrame(); }
private:
friend class CacheBuilder;
WTF::String mExport;