diff options
| author | Ben Murdoch <benm@google.com> | 2009-08-12 14:34:59 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2009-08-12 14:42:41 +0100 |
| commit | f387cad0dc92f856383b5200c20fb02099df4ea5 (patch) | |
| tree | 369a090508fa3c9a4c52064ee3d399e06e872f1d /WebCore/plugins/PluginView.h | |
| parent | 617533d59d6add1e541d472502e5f956fb7baad7 (diff) | |
| download | external_webkit-f387cad0dc92f856383b5200c20fb02099df4ea5.zip external_webkit-f387cad0dc92f856383b5200c20fb02099df4ea5.tar.gz external_webkit-f387cad0dc92f856383b5200c20fb02099df4ea5.tar.bz2 | |
r47029: Merges WebCore/page, plugins and storage.
Diffstat (limited to 'WebCore/plugins/PluginView.h')
| -rw-r--r-- | WebCore/plugins/PluginView.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/WebCore/plugins/PluginView.h b/WebCore/plugins/PluginView.h index 45bd867..5c39535 100644 --- a/WebCore/plugins/PluginView.h +++ b/WebCore/plugins/PluginView.h @@ -218,16 +218,13 @@ namespace WebCore { static bool isCallingPlugin(); -#ifdef MANUAL_MERGE_REQUIRED #ifdef ANDROID_PLUGINS Frame* getParentFrame() const { return m_parentFrame; } Element* getElement() const { return m_element; } #endif -#else // MANUAL_MERGE_REQUIRED bool start(); -#endif // MANUAL_MERGE_REQUIRED private: PluginView(Frame* parentFrame, const IntSize&, PluginPackage*, Element*, const KURL&, const Vector<String>& paramNames, const Vector<String>& paramValues, const String& mimeType, bool loadManually); |