diff options
| author | Steve Block <steveblock@google.com> | 2010-02-02 18:22:07 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-02-04 15:06:57 +0000 |
| commit | 8761fdb52e725d81cca926454dae4a0e8e1fe1f5 (patch) | |
| tree | e0cdec5eebd87a78318180c9257a81673bd1181f /WebCore/plugins/PluginView.h | |
| parent | 33fc8ca0ce504ea94c9b038e11968187fc10d13e (diff) | |
| download | external_webkit-8761fdb52e725d81cca926454dae4a0e8e1fe1f5.zip external_webkit-8761fdb52e725d81cca926454dae4a0e8e1fe1f5.tar.gz external_webkit-8761fdb52e725d81cca926454dae4a0e8e1fe1f5.tar.bz2 | |
Merge webkit.org at r54127 : Fix conflicts due to use of OS_ANDROID
See http://trac.webkit.org/changeset/52791
Change-Id: I0e1a6ae16f93cdbb12ae5770607a220079451cb8
Diffstat (limited to 'WebCore/plugins/PluginView.h')
| -rw-r--r-- | WebCore/plugins/PluginView.h | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/WebCore/plugins/PluginView.h b/WebCore/plugins/PluginView.h index 286ba03..f3e3802 100644 --- a/WebCore/plugins/PluginView.h +++ b/WebCore/plugins/PluginView.h @@ -47,15 +47,13 @@ #include <wtf/RefPtr.h> #include <wtf/Vector.h> -<<<<<<< HEAD +// ANDROID +// TODO: Upstream to webkit.org #ifdef PLUGIN_SCHEDULE_TIMER #include "PluginTimer.h" #endif -#if PLATFORM(WIN_OS) && (PLATFORM(QT) || PLATFORM(WX)) -======= #if OS(WINDOWS) && (PLATFORM(QT) || PLATFORM(WX)) ->>>>>>> webkit.org at r54127 typedef struct HWND__* HWND; typedef HWND PlatformPluginWidget; #elif defined(ANDROID_PLUGINS) @@ -354,15 +352,13 @@ namespace WebCore { bool m_haveUpdatedPluginWidget; #endif -<<<<<<< HEAD +// ANDROID +// TODO: Upstream to webkit.org #ifdef PLUGIN_SCHEDULE_TIMER PluginTimerList m_timerList; #endif -#if ((PLATFORM(QT) || PLATFORM(WX)) && PLATFORM(WIN_OS)) || defined(XP_MACOSX) -======= #if ((PLATFORM(QT) || PLATFORM(WX)) && OS(WINDOWS)) || defined(XP_MACOSX) ->>>>>>> webkit.org at r54127 // On Mac OSX and Qt/Windows the plugin does not have its own native widget, // but is using the containing window as its reference for positioning/painting. PlatformPluginWidget m_window; @@ -381,11 +377,7 @@ public: private: -<<<<<<< HEAD -#if defined(XP_UNIX) || defined(Q_WS_X11) || PLATFORM(SYMBIAN) || defined(ANDROID_PLUGINS) -======= -#if defined(XP_UNIX) || PLATFORM(SYMBIAN) ->>>>>>> webkit.org at r54127 +#if defined(XP_UNIX) || PLATFORM(SYMBIAN) || defined(ANDROID_PLUGINS) void setNPWindowIfNeeded(); #elif defined(XP_MACOSX) NP_CGContext m_npCgContext; |