diff options
author | Steve Block <steveblock@google.com> | 2010-04-25 23:41:36 -0700 |
---|---|---|
committer | Steve Block <steveblock@google.com> | 2010-05-11 14:42:12 +0100 |
commit | eebae91469b8f225fe78e97ce6dae26efcf6da43 (patch) | |
tree | b1d1189684ad999f6339a3f7f941c5bbbcaeac3c /WebCore/platform | |
parent | dcc8cf2e65d1aa555cce12431a16547e66b469ee (diff) | |
download | external_webkit-eebae91469b8f225fe78e97ce6dae26efcf6da43.zip external_webkit-eebae91469b8f225fe78e97ce6dae26efcf6da43.tar.gz external_webkit-eebae91469b8f225fe78e97ce6dae26efcf6da43.tar.bz2 |
Merge webkit.org at r58033 : Resolve merge conflicts
- CanvasRenderingContext2D.cpp - Take upstream, conflict due to cherry-pick of security fix, see 285b474734e82bc42b25e48ea4824f8050badb4f
- CanvasSurface.cpp, HTMLCanvasElement.cpp - convertLogicalToDevice has been refactored. See http://trac.webkit.org/changeset/56447
- Chrome.cpp/h, ChromeClient.h - Take upstream, conflict due to cherry-pick of cancelling Geolocation permission request
- Document.h - Take both, conflicts due to ANDROID_META_SUPPORT
- DragImage.h - Take both, conflict due to Android addition
- EmptyClients.h - Take upstream, conflicts due to Geo cancel permission request
- EventHandler.cpp - Take both, conflicts due to recently upstreamed touch events and ANDROID_PLUGINS
- EventHandler.cpp - Keep ours, conflict due to touch event bug fixes not yet upstreamed. See 7f034a1734d634dd1fdb3b64817d5828b5e46922 and 73adc26dba4be1d9da34a7f0907cb7b12f10c909
- FileSystemPOSIX - Take both, conflict due to ANDROID_PLUGINS
- FrameLoader.cpp - Take both, conflct due to ANDROID_BLOCK_NETWORK_IMAGE
- FrameView.cpp - Take both, conflict due to Android frame flattening
- Geolocation.h - Merge conflicts due to Android-specific changes
- Geolocation.cpp - Take upstream, conflict due to addition of Geolocation maximumAge
- GeolocationPositionCache.cpp - Take upstream, conflict due to addition of ENABLE_GEOLOCATION guards
- Gradient.h - Take both, conflict due to Android addition
- HTMLLinkElement.cpp, DocLoader.cpp - Take both, conflict due to new link prefetching not yet upstreamed. See f91ac8eab3399adb5325701bebe0590a77e49df7
- HTMLMetaElement.cpp - Take both, conflict due to recently upstreamed meta element
- JavaInstanceJSC.cpp - Take both, conflict due to Android additional logging
- MediaPlayer.cpp/h - Take both, conflict due to Android-specific change
- PlatformTouchPoint.h - Take upstream, conflict due to recently upstreamed unsigned stuff
- RenderFrame.cpp, RenderFrameSet.h - Take both, conflict due to Android frameset flattening
- RenderLayerCompositor.cpp - Take both, conflicts due to Android layers code
- Settings.cpp/h - Conflict due to ANDROID_PLUGINS
- TextInputController.h - Take upstream, git got confused
- V8DOMWindowShell.cpp - Take upstream, conflict due to cherry-pick of method to add V8 bindings for page cache, see 8fecd9c9a62aa89fb44ed3142ba583dc7b8cbe29
- V8DOMWraper.cpp - Take upstream, conflict due to recently upstreamed WORKERS guards
- WebCore.xcodeproj - Take upstream, conflict due to addition of Geolocation maximumAge
- Widget.h - Take both, conflict due to Android addition
- jsc/JNIUtilityPrivate.cpp - Take upstream, conflict due to switching from bzero to memset
- mac/WebCoreSupport/WebChromeCient.h - Take upstream, conflicts due to Geo cancel permission request
Change-Id: I1b75eac220faddf2f84c7fd4fd3436a5e07edf64
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> |