diff options
| author | John Reck <jreck@google.com> | 2012-02-24 18:06:28 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-02-24 18:06:28 -0800 |
| commit | eec5b0af072de315fa24ad51ff99ad9c09ace399 (patch) | |
| tree | 51806ec23a634a61a54a9de1107c043688e63608 /Source/WebCore | |
| parent | c4bf028cc0da190b72c31d53fae6eb8a67371ab0 (diff) | |
| parent | 6bf2577653884795f04bbf9d8196ed9998896afe (diff) | |
| download | external_webkit-eec5b0af072de315fa24ad51ff99ad9c09ace399.zip external_webkit-eec5b0af072de315fa24ad51ff99ad9c09ace399.tar.gz external_webkit-eec5b0af072de315fa24ad51ff99ad9c09ace399.tar.bz2 | |
Merge "Delete CacheBuilder"
Diffstat (limited to 'Source/WebCore')
| -rw-r--r-- | Source/WebCore/dom/Document.cpp | 5 | ||||
| -rw-r--r-- | Source/WebCore/page/EventHandler.cpp | 6 |
2 files changed, 0 insertions, 11 deletions
diff --git a/Source/WebCore/dom/Document.cpp b/Source/WebCore/dom/Document.cpp index 20dad55..1b5f55b 100644 --- a/Source/WebCore/dom/Document.cpp +++ b/Source/WebCore/dom/Document.cpp @@ -189,11 +189,6 @@ #include "Settings.h" #endif -#ifdef ANDROID_RESET_SELECTION -#include "CacheBuilder.h" -#include "HTMLTextAreaElement.h" -#endif - #if ENABLE(TOUCH_EVENTS) #if USE(V8) #include "RuntimeEnabledFeatures.h" diff --git a/Source/WebCore/page/EventHandler.cpp b/Source/WebCore/page/EventHandler.cpp index e77809c..a737754 100644 --- a/Source/WebCore/page/EventHandler.cpp +++ b/Source/WebCore/page/EventHandler.cpp @@ -2415,16 +2415,10 @@ static Node* eventTargetNodeForDocument(Document* doc) if (!doc) return 0; Node* node = doc->focusedNode(); -#if defined(ANDROID_PLUGINS) - if (!node && doc->frame() && doc->frame()->view()) - node = android::WebViewCore::getWebViewCore(doc->frame()->view()) - ->cursorNodeIsPlugin(); -#else if (!node && doc->isPluginDocument()) { PluginDocument* pluginDocument = static_cast<PluginDocument*>(doc); node = pluginDocument->pluginNode(); } -#endif if (!node && doc->isHTMLDocument()) node = doc->body(); if (!node) |