diff options
| author | Steve Block <steveblock@google.com> | 2010-02-15 16:05:31 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-02-15 16:05:31 +0000 |
| commit | 4f8c82c5d2dcae236b058be4be79c988e0e98e2a (patch) | |
| tree | 8dc9c12af23db6beaf940684c540cda540c83c76 | |
| parent | a2a9aa200297099883000973aa8416f6407a9f85 (diff) | |
| download | external_webkit-4f8c82c5d2dcae236b058be4be79c988e0e98e2a.zip external_webkit-4f8c82c5d2dcae236b058be4be79c988e0e98e2a.tar.gz external_webkit-4f8c82c5d2dcae236b058be4be79c988e0e98e2a.tar.bz2 | |
Use common version of PluginView::parentFrame
This was added in http://trac.webkit.org/changeset/42748
Change-Id: Ifcb9308d817203b6e23945ceedd83b9f9eb2e80f
| -rw-r--r-- | WebCore/plugins/PluginView.h | 1 | ||||
| -rw-r--r-- | WebKit/android/plugins/PluginWidgetAndroid.cpp | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/WebCore/plugins/PluginView.h b/WebCore/plugins/PluginView.h index f3e3802..48c8ff1 100644 --- a/WebCore/plugins/PluginView.h +++ b/WebCore/plugins/PluginView.h @@ -237,7 +237,6 @@ namespace WebCore { static bool isCallingPlugin(); #ifdef ANDROID_PLUGINS - Frame* getParentFrame() const { return m_parentFrame; } Element* getElement() const { return m_element; } #endif diff --git a/WebKit/android/plugins/PluginWidgetAndroid.cpp b/WebKit/android/plugins/PluginWidgetAndroid.cpp index 7109ab4..06dfa39 100644 --- a/WebKit/android/plugins/PluginWidgetAndroid.cpp +++ b/WebKit/android/plugins/PluginWidgetAndroid.cpp @@ -268,7 +268,7 @@ void PluginWidgetAndroid::updateEventFlags(ANPEventFlags flags) { return; } - Document* doc = m_pluginView->getParentFrame()->document(); + Document* doc = m_pluginView->parentFrame()->document(); #if ENABLE(TOUCH_EVENTS) if((m_eventFlags ^ flags) & kTouch_ANPEventFlag) { if (flags & kTouch_ANPEventFlag) |