diff options
Diffstat (limited to 'WebCore/platform')
-rw-r--r-- | WebCore/platform/DragImage.h | 6 | ||||
-rw-r--r-- | WebCore/platform/PlatformTouchPoint.h | 4 | ||||
-rw-r--r-- | WebCore/platform/Widget.h | 8 | ||||
-rw-r--r-- | WebCore/platform/graphics/Gradient.h | 3 | ||||
-rw-r--r-- | WebCore/platform/graphics/MediaPlayer.cpp | 10 | ||||
-rw-r--r-- | WebCore/platform/graphics/MediaPlayer.h | 10 | ||||
-rw-r--r-- | WebCore/platform/posix/FileSystemPOSIX.cpp | 10 |
7 files changed, 13 insertions, 38 deletions
diff --git a/WebCore/platform/DragImage.h b/WebCore/platform/DragImage.h index b905432..d7d53b2 100644 --- a/WebCore/platform/DragImage.h +++ b/WebCore/platform/DragImage.h @@ -80,11 +80,7 @@ namespace WebCore { typedef BBitmap* DragImageRef; #elif PLATFORM(BREWMP) typedef IImage* DragImageRef; -<<<<<<< HEAD -#elif PLATFORM(ANDROID) -======= -#elif PLATFORM(EFL) ->>>>>>> webkit.org at r58033 +#elif PLATFORM(EFL) || PLATFORM(ANDROID) typedef void* DragImageRef; #endif diff --git a/WebCore/platform/PlatformTouchPoint.h b/WebCore/platform/PlatformTouchPoint.h index 202a2d4..4a667a0 100644 --- a/WebCore/platform/PlatformTouchPoint.h +++ b/WebCore/platform/PlatformTouchPoint.h @@ -54,11 +54,7 @@ public: IntPoint screenPos() const { return m_screenPos; } IntPoint pos() const { return m_pos; } -<<<<<<< HEAD -private: -======= protected: ->>>>>>> webkit.org at r58033 unsigned m_id; State m_state; IntPoint m_screenPos; diff --git a/WebCore/platform/Widget.h b/WebCore/platform/Widget.h index 677fe34..2fce858 100644 --- a/WebCore/platform/Widget.h +++ b/WebCore/platform/Widget.h @@ -239,14 +239,12 @@ private: #if PLATFORM(MAC) WidgetPrivate* m_data; #endif -<<<<<<< HEAD +#if PLATFORM(HAIKU) + PlatformWidget m_topLevelPlatformWidget; +#endif #if PLATFORM(ANDROID) public: int screenWidth() const; -======= -#if PLATFORM(HAIKU) - PlatformWidget m_topLevelPlatformWidget; ->>>>>>> webkit.org at r58033 #endif }; diff --git a/WebCore/platform/graphics/Gradient.h b/WebCore/platform/graphics/Gradient.h index 371cad7..b6911f3 100644 --- a/WebCore/platform/graphics/Gradient.h +++ b/WebCore/platform/graphics/Gradient.h @@ -63,13 +63,10 @@ typedef class PlatformGradientRec* PlatformGradient; class SkShader; typedef class SkShader* PlatformGradient; typedef class SkShader* PlatformPattern; -<<<<<<< HEAD #endif -======= #elif PLATFORM(HAIKU) class BGradient; typedef BGradient* PlatformGradient; ->>>>>>> webkit.org at r58033 #else typedef void* PlatformGradient; #endif diff --git a/WebCore/platform/graphics/MediaPlayer.cpp b/WebCore/platform/graphics/MediaPlayer.cpp index 813b29c..55fa900 100644 --- a/WebCore/platform/graphics/MediaPlayer.cpp +++ b/WebCore/platform/graphics/MediaPlayer.cpp @@ -219,16 +219,12 @@ MediaPlayer::MediaPlayer(MediaPlayerClient* client) , m_volume(1.0f) , m_muted(false) , m_preservesPitch(true) -<<<<<<< HEAD - , m_autobuffer(false) -#if PLATFORM(ANDROID) - , m_mediaElementType(Video) -#endif -======= ->>>>>>> webkit.org at r58033 #if ENABLE(PLUGIN_PROXY_FOR_VIDEO) , m_playerProxy(0) #endif +#if PLATFORM(ANDROID) + , m_mediaElementType(Video) +#endif { #if ENABLE(PLUGIN_PROXY_FOR_VIDEO) Vector<MediaPlayerFactory*>& engines = installedMediaEngines(); diff --git a/WebCore/platform/graphics/MediaPlayer.h b/WebCore/platform/graphics/MediaPlayer.h index 24f4225..89021c3 100644 --- a/WebCore/platform/graphics/MediaPlayer.h +++ b/WebCore/platform/graphics/MediaPlayer.h @@ -266,16 +266,12 @@ private: float m_volume; bool m_muted; bool m_preservesPitch; -<<<<<<< HEAD - bool m_autobuffer; -#if PLATFORM(ANDROID) - MediaElementType m_mediaElementType; -#endif -======= ->>>>>>> webkit.org at r58033 #if ENABLE(PLUGIN_PROXY_FOR_VIDEO) WebMediaPlayerProxy* m_playerProxy; // not owned or used, passed to m_private #endif +#if PLATFORM(ANDROID) + MediaElementType m_mediaElementType; +#endif }; typedef MediaPlayerPrivateInterface* (*CreateMediaEnginePlayer)(MediaPlayer*); diff --git a/WebCore/platform/posix/FileSystemPOSIX.cpp b/WebCore/platform/posix/FileSystemPOSIX.cpp index db8dff8..ac8c7fa 100644 --- a/WebCore/platform/posix/FileSystemPOSIX.cpp +++ b/WebCore/platform/posix/FileSystemPOSIX.cpp @@ -30,18 +30,14 @@ #include "FileSystem.h" #include "PlatformString.h" -<<<<<<< HEAD - -#include <sys/stat.h> #ifdef ANDROID_PLUGINS -#include <sys/types.h> #include <dirent.h> -#include <fnmatch.h> #endif -======= #include <errno.h> #include <fcntl.h> ->>>>>>> webkit.org at r58033 +#ifdef ANDROID_PLUGINS +#include <fnmatch.h> +#endif #include <libgen.h> #include <sys/stat.h> #include <sys/types.h> |