diff options
| author | Steve Block <steveblock@google.com> | 2009-12-15 11:15:20 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2009-12-17 17:41:10 +0000 |
| commit | aad6f24e036b3740071bb995b955b18b572067b2 (patch) | |
| tree | 01f4412526c81ec62e02d71d128ec45827a12fdc /WebCore/plugins/PluginView.h | |
| parent | dc11ae82374cba25ed19c3e57537cbc667f8efe2 (diff) | |
| download | external_webkit-aad6f24e036b3740071bb995b955b18b572067b2.zip external_webkit-aad6f24e036b3740071bb995b955b18b572067b2.tar.gz external_webkit-aad6f24e036b3740071bb995b955b18b572067b2.tar.bz2 | |
Merge webkit.org at r51976 : Fix general conflicts.
Notes ...
For FrameLoader.cpp/h, see http://trac.webkit.org/changeset/51644
For FrameView.cpp and ScrolView.cpp, see http://trac.webkit.org/changeset/51636
For PluginInfoStore.cpp, see http://trac.webkit.org/changeset/51257
For Geolocation.cpp, see http://trac.webkit.org/changeset/50605
For V8DOMWrapper.cpp, see http://trac.webkit.org/changeset/51004
For V8Proxy.cpp, see http://trac.webkit.org/changeset/50441, http://trac.webkit.org/changeset/50327, http://trac.webkit.org/changeset/50406 and http://trac.webkit.org/changeset/50523
For HTMLInputElement.cpp, see http://trac.webkit.org/changeset/50996
For RenderBlock.cpp/RenderInline.cpp, see https://android-git.corp.google.com/g/#change,33465
Android-specific change to now-deleted JSCanvasArrayCustom.cpp was trivial.
Change-Id: Iddc8d43bdcb6208d6a991a7a1d591e8a4f918bf7
Diffstat (limited to 'WebCore/plugins/PluginView.h')
| -rw-r--r-- | WebCore/plugins/PluginView.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/WebCore/plugins/PluginView.h b/WebCore/plugins/PluginView.h index dd2458e..a5618f7 100644 --- a/WebCore/plugins/PluginView.h +++ b/WebCore/plugins/PluginView.h @@ -47,15 +47,11 @@ #include <wtf/RefPtr.h> #include <wtf/Vector.h> -<<<<<<< HEAD:WebCore/plugins/PluginView.h #ifdef PLUGIN_SCHEDULE_TIMER #include "PluginTimer.h" #endif -#if PLATFORM(WIN_OS) && PLATFORM(QT) -======= #if PLATFORM(WIN_OS) && (PLATFORM(QT) || PLATFORM(WX)) ->>>>>>> webkit.org at r51976:WebCore/plugins/PluginView.h typedef struct HWND__* HWND; typedef HWND PlatformPluginWidget; #elif defined(ANDROID_PLUGINS) @@ -354,15 +350,11 @@ namespace WebCore { bool m_haveUpdatedPluginWidget; #endif -<<<<<<< HEAD:WebCore/plugins/PluginView.h #ifdef PLUGIN_SCHEDULE_TIMER PluginTimerList m_timerList; #endif -#if (PLATFORM(QT) && PLATFORM(WIN_OS)) || defined(XP_MACOSX) -======= #if ((PLATFORM(QT) || PLATFORM(WX)) && PLATFORM(WIN_OS)) || defined(XP_MACOSX) ->>>>>>> webkit.org at r51976:WebCore/plugins/PluginView.h // 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; |