diff options
| author | Steve Block <steveblock@google.com> | 2010-08-27 12:31:11 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-09-02 17:17:20 +0100 |
| commit | b7ddb6671c47bb6409bec6b6d017d9f88e557401 (patch) | |
| tree | 670add84f8652796304ae7dc58c93fcaf8b55596 /WebCore/plugins/PluginView.h | |
| parent | e8b154fd68f9b33be40a3590e58347f353835f5c (diff) | |
| download | external_webkit-b7ddb6671c47bb6409bec6b6d017d9f88e557401.zip external_webkit-b7ddb6671c47bb6409bec6b6d017d9f88e557401.tar.gz external_webkit-b7ddb6671c47bb6409bec6b6d017d9f88e557401.tar.bz2 | |
Merge WebKit at r66079 : Fix conflicts
- WebCore/dom/Document.cpp
Conflict due to Android guards around m_axObjectCache
See http://trac.webkit.org/changeset/65787
- WebCore/dom/Document.h
Conflict due to Android guards around m_axObjectCache whitespace diff
See http://trac.webkit.org/changeset/65787
and http://trac.webkit.org/changeset/66037
- WebCore/html/HTMLDocumentParser.cpp
Conflict due to ANDROID_INSTRUMENT
See http://trac.webkit.org/changeset/65692
- WebCore/platform/image-decoders/ImageDecoder.cpp
Conflict due to Android not implementing ImageDecoder::create()
See http://trac.webkit.org/changeset/66039
- WebCore/plugins/PluginView.h
Conflict due to PLUGIN_SCHEDULE_TIMER
See http://trac.webkit.org/changeset/65697
Change-Id: I5dc94bad471ea566dbabf965425938b732735d02
Diffstat (limited to 'WebCore/plugins/PluginView.h')
| -rw-r--r-- | WebCore/plugins/PluginView.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/WebCore/plugins/PluginView.h b/WebCore/plugins/PluginView.h index 01797e5..a17d327 100644 --- a/WebCore/plugins/PluginView.h +++ b/WebCore/plugins/PluginView.h @@ -43,16 +43,15 @@ #include <wtf/Vector.h> #include <wtf/text/CString.h> -<<<<<<< HEAD +#if ENABLE(NETSCAPE_PLUGIN_API) +#include "PluginStream.h" +#include "npruntime_internal.h" +#endif + // ANDROID // TODO: Upstream to webkit.org #ifdef PLUGIN_SCHEDULE_TIMER #include "PluginTimer.h" -======= -#if ENABLE(NETSCAPE_PLUGIN_API) -#include "PluginStream.h" -#include "npruntime_internal.h" ->>>>>>> webkit.org at r66079 #endif #if OS(WINDOWS) && (PLATFORM(QT) || PLATFORM(WX)) |