Merge webkit.org at r54127 : Fix conflicts due to use of OS_ANDROID

See http://trac.webkit.org/changeset/52791

Change-Id: I0e1a6ae16f93cdbb12ae5770607a220079451cb8

4 files changed, 8 insertions, 29 deletions

diff --git a/JavaScriptCore/wtf/ThreadingPthreads.cpp b/JavaScriptCore/wtf/ThreadingPthreads.cpp
index e4fc0eb..5a7ff55 100644
--- a/JavaScriptCore/wtf/ThreadingPthreads.cpp
+++ b/JavaScriptCore/wtf/ThreadingPthreads.cpp
@@ -47,13 +47,8 @@
 #include <sys/time.h>
 #endif
 
-<<<<<<< HEAD
-#if PLATFORM(ANDROID)
-#include "JNIUtility.h"
-=======
 #if OS(ANDROID)
-#include "jni_utility.h"
->>>>>>> webkit.org at r54127
+#include "JNIUtility.h"
 #endif
 
 namespace WTF {
diff --git a/WebCore/loader/CachedFont.cpp b/WebCore/loader/CachedFont.cpp
index 3d3fd8d..3d9eeb9 100644
--- a/WebCore/loader/CachedFont.cpp
+++ b/WebCore/loader/CachedFont.cpp
@@ -27,11 +27,7 @@
 #include "config.h"
 #include "CachedFont.h"
 
-<<<<<<< HEAD
-#if PLATFORM(ANDROID) || PLATFORM(CG) || PLATFORM(QT) || PLATFORM(GTK) || (PLATFORM(CHROMIUM) && (PLATFORM(WIN_OS) || PLATFORM(LINUX))) || PLATFORM(HAIKU) || PLATFORM(WINCE)
-=======
-#if PLATFORM(CG) || PLATFORM(QT) || PLATFORM(GTK) || (PLATFORM(CHROMIUM) && (OS(WINDOWS) || OS(LINUX))) || PLATFORM(HAIKU) || OS(WINCE)
->>>>>>> webkit.org at r54127
+#if PLATFORM(CG) || PLATFORM(QT) || PLATFORM(GTK) || (PLATFORM(CHROMIUM) && (OS(WINDOWS) || OS(LINUX))) || PLATFORM(HAIKU) || OS(WINCE) || OS(ANDROID)
 #define STORE_FONT_CUSTOM_PLATFORM_DATA
 #endif
 
diff --git a/WebCore/platform/Widget.cpp b/WebCore/platform/Widget.cpp
index 1a8f7f8..520eb6f 100644
--- a/WebCore/platform/Widget.cpp
+++ b/WebCore/platform/Widget.cpp
@@ -127,11 +127,7 @@ IntPoint Widget::convertFromContainingWindowToRoot(const Widget*, const IntPoint
 }
 #endif
 
-<<<<<<< HEAD
-#if (!PLATFORM(MAC) && !PLATFORM(GTK) && !PLATFORM(ANDROID)) || ENABLE(EXPERIMENTAL_SINGLE_VIEW_MODE)
-=======
-#if !PLATFORM(MAC) && !PLATFORM(GTK)
->>>>>>> webkit.org at r54127
+#if !PLATFORM(MAC) && !PLATFORM(GTK) && !OS(ANDROID)
 void Widget::releasePlatformWidget()
 {
 }
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;