Diff
Modified: trunk/Source/WebCore/ChangeLog (93572 => 93573)
--- trunk/Source/WebCore/ChangeLog 2011-08-23 02:02:35 UTC (rev 93572)
+++ trunk/Source/WebCore/ChangeLog 2011-08-23 02:05:48 UTC (rev 93573)
@@ -1,3 +1,41 @@
+2011-08-22 Adam Barth <[email protected]>
+
+ Remove PLATFORM(ANDROID)
+ https://bugs.webkit.org/show_bug.cgi?id=66741
+
+ Reviewed by Darin Adler.
+
+ PLATFORM(CHROMIUM) && OS(ANDROID) is the new hotness. These special
+ cases can be removed now that Android shares more code with Chromium.
+
+ * bindings/js/JSDOMWindowBase.cpp:
+ (WebCore::JSDOMWindowBase::supportsRichSourceInfo):
+ * bindings/v8/ScriptCachedFrameData.cpp:
+ * bindings/v8/ScriptCachedFrameData.h:
+ * bindings/v8/V8GCController.cpp:
+ * bridge/jni/jsc/JavaInstanceJSC.cpp:
+ (JavaInstance::invokeMethod):
+ * history/HistoryItem.cpp:
+ (WebCore::HistoryItem::~HistoryItem):
+ (WebCore::HistoryItem::setDocumentState):
+ (WebCore::HistoryItem::clearDocumentState):
+ (WebCore::HistoryItem::setIsTargetItem):
+ (WebCore::HistoryItem::addChildItem):
+ (WebCore::HistoryItem::setFormInfoFromRequest):
+ * history/HistoryItem.h:
+ * loader/cache/CachedFont.cpp:
+ * platform/DragImage.h:
+ * platform/PlatformTouchEvent.h:
+ * platform/PlatformTouchPoint.h:
+ (WebCore::PlatformTouchPoint::PlatformTouchPoint):
+ * platform/Widget.h:
+ * platform/network/NetworkStateNotifier.cpp:
+ * platform/network/NetworkStateNotifier.h:
+ * platform/network/NetworkingContext.h:
+ * platform/network/ResourceHandle.h:
+ * platform/network/ResourceHandleInternal.h:
+ * platform/network/ResourceRequestBase.cpp:
+
2011-08-22 Adrienne Walker <[email protected]>
[chromium] Remove compositing assertions about creating layers when painting
Modified: trunk/Source/WebCore/bindings/js/JSDOMWindowBase.cpp (93572 => 93573)
--- trunk/Source/WebCore/bindings/js/JSDOMWindowBase.cpp 2011-08-23 02:02:35 UTC (rev 93572)
+++ trunk/Source/WebCore/bindings/js/JSDOMWindowBase.cpp 2011-08-23 02:05:48 UTC (rev 93573)
@@ -108,9 +108,7 @@
bool JSDOMWindowBase::supportsRichSourceInfo() const
{
-#if PLATFORM(ANDROID)
- return true;
-#elif !ENABLE(_javascript__DEBUGGER) || !ENABLE(INSPECTOR)
+#if !ENABLE(_javascript__DEBUGGER) || !ENABLE(INSPECTOR)
return false;
#else
Frame* frame = impl()->frame();
Modified: trunk/Source/WebCore/bindings/v8/ScriptCachedFrameData.cpp (93572 => 93573)
--- trunk/Source/WebCore/bindings/v8/ScriptCachedFrameData.cpp 2011-08-23 02:02:35 UTC (rev 93572)
+++ trunk/Source/WebCore/bindings/v8/ScriptCachedFrameData.cpp 2011-08-23 02:05:48 UTC (rev 93573)
@@ -26,7 +26,7 @@
#include "config.h"
#include "ScriptCachedFrameData.h"
-#if PLATFORM(ANDROID) || PLATFORM(QT)
+#if PLATFORM(QT)
// FIXME: the right guard should be ENABLE(PAGE_CACHE). Replace with the right guard, once
// https://bugs.webkit.org/show_bug.cgi?id=35061 is fixed.
@@ -76,4 +76,4 @@
} // namespace WebCore
-#endif // PLATFORM(ANDROID) || PLATFORM(QT)
+#endif // PLATFORM(QT)
Modified: trunk/Source/WebCore/bindings/v8/ScriptCachedFrameData.h (93572 => 93573)
--- trunk/Source/WebCore/bindings/v8/ScriptCachedFrameData.h 2011-08-23 02:02:35 UTC (rev 93572)
+++ trunk/Source/WebCore/bindings/v8/ScriptCachedFrameData.h 2011-08-23 02:05:48 UTC (rev 93573)
@@ -51,7 +51,7 @@
} // namespace WebCore
-#elif PLATFORM(ANDROID) || PLATFORM(QT)
+#elif PLATFORM(QT)
// FIXME: the right guard should be ENABLE(PAGE_CACHE). Replace with the right guard, once
// https://bugs.webkit.org/show_bug.cgi?id=35061 is fixed.
//
Modified: trunk/Source/WebCore/bindings/v8/V8GCController.cpp (93572 => 93573)
--- trunk/Source/WebCore/bindings/v8/V8GCController.cpp 2011-08-23 02:02:35 UTC (rev 93572)
+++ trunk/Source/WebCore/bindings/v8/V8GCController.cpp 2011-08-23 02:05:48 UTC (rev 93573)
@@ -420,7 +420,7 @@
int getMemoryUsageInMB()
{
-#if PLATFORM(CHROMIUM) || PLATFORM(ANDROID)
+#if PLATFORM(CHROMIUM)
return PlatformBridge::memoryUsageMB();
#else
return 0;
@@ -429,7 +429,7 @@
int getActualMemoryUsageInMB()
{
-#if PLATFORM(CHROMIUM) || PLATFORM(ANDROID)
+#if PLATFORM(CHROMIUM)
return PlatformBridge::actualMemoryUsageMB();
#else
return 0;
Modified: trunk/Source/WebCore/bridge/jni/jsc/JavaInstanceJSC.cpp (93572 => 93573)
--- trunk/Source/WebCore/bridge/jni/jsc/JavaInstanceJSC.cpp 2011-08-23 02:02:35 UTC (rev 93572)
+++ trunk/Source/WebCore/bridge/jni/jsc/JavaInstanceJSC.cpp 2011-08-23 02:05:48 UTC (rev 93573)
@@ -213,13 +213,6 @@
}
}
-// This is a deprecated code path which should not be required on Android.
-// Remove this guard once Bug 39476 is fixed.
-#if PLATFORM(ANDROID)
- if (!handled)
- result = callJNIMethod(m_instance->instance(), jMethod->returnType(), jMethod->name().utf8().data(), jMethod->signature(), jArgs.data());
-#endif
-
switch (jMethod->returnType()) {
case JavaTypeVoid:
{
Modified: trunk/Source/WebCore/history/HistoryItem.cpp (93572 => 93573)
--- trunk/Source/WebCore/history/HistoryItem.cpp 2011-08-23 02:02:35 UTC (rev 93572)
+++ trunk/Source/WebCore/history/HistoryItem.cpp 2011-08-23 02:05:48 UTC (rev 93573)
@@ -133,10 +133,6 @@
{
ASSERT(!m_cachedPage);
iconDatabase().releaseIconForPageURL(m_urlString);
-#if PLATFORM(ANDROID)
- if (m_bridge)
- m_bridge->detachHistoryItem();
-#endif
}
inline HistoryItem::HistoryItem(const HistoryItem& item)
@@ -435,9 +431,6 @@
void HistoryItem::setDocumentState(const Vector<String>& state)
{
m_documentState = state;
-#if PLATFORM(ANDROID)
- notifyHistoryItemChanged(this);
-#endif
}
const Vector<String>& HistoryItem::documentState() const
@@ -448,9 +441,6 @@
void HistoryItem::clearDocumentState()
{
m_documentState.clear();
-#if PLATFORM(ANDROID)
- notifyHistoryItemChanged(this);
-#endif
}
bool HistoryItem::isTargetItem() const
@@ -461,9 +451,6 @@
void HistoryItem::setIsTargetItem(bool flag)
{
m_isTargetItem = flag;
-#if PLATFORM(ANDROID)
- notifyHistoryItemChanged(this);
-#endif
}
void HistoryItem::setStateObject(PassRefPtr<SerializedScriptValue> object)
@@ -475,9 +462,6 @@
{
ASSERT(!childItemWithTarget(child->target()));
m_children.append(child);
-#if PLATFORM(ANDROID)
- notifyHistoryItemChanged(this);
-#endif
}
void HistoryItem::setChildItem(PassRefPtr<HistoryItem> child)
@@ -621,9 +605,6 @@
m_formData = 0;
m_formContentType = String();
}
-#if PLATFORM(ANDROID)
- notifyHistoryItemChanged(this);
-#endif
}
void HistoryItem::setFormData(PassRefPtr<FormData> formData)
Modified: trunk/Source/WebCore/history/HistoryItem.h (93572 => 93573)
--- trunk/Source/WebCore/history/HistoryItem.h 2011-08-23 02:02:35 UTC (rev 93572)
+++ trunk/Source/WebCore/history/HistoryItem.h 2011-08-23 02:05:48 UTC (rev 93573)
@@ -43,10 +43,6 @@
#include <QDataStream>
#endif
-#if PLATFORM(ANDROID)
-#include "AndroidWebHistoryBridge.h"
-#endif
-
namespace WebCore {
class CachedPage;
@@ -202,11 +198,6 @@
QDataStream& saveState(QDataStream& out, int version) const;
#endif
-#if PLATFORM(ANDROID)
- void setBridge(AndroidWebHistoryBridge* bridge);
- AndroidWebHistoryBridge* bridge() const;
-#endif
-
#ifndef NDEBUG
int showTree() const;
int showTreeWithIndent(unsigned indentLevel) const;
@@ -295,10 +286,6 @@
QVariant m_userData;
#endif
-#if PLATFORM(ANDROID)
- RefPtr<AndroidWebHistoryBridge> m_bridge;
-#endif
-
}; //class HistoryItem
} //namespace WebCore
Modified: trunk/Source/WebCore/loader/cache/CachedFont.cpp (93572 => 93573)
--- trunk/Source/WebCore/loader/cache/CachedFont.cpp 2011-08-23 02:02:35 UTC (rev 93572)
+++ trunk/Source/WebCore/loader/cache/CachedFont.cpp 2011-08-23 02:05:48 UTC (rev 93573)
@@ -28,7 +28,7 @@
#include "CachedFont.h"
// FIXME: This should really be a blacklist instead of a whitelist
-#if USE(CG) || PLATFORM(QT) || PLATFORM(GTK) || (PLATFORM(CHROMIUM) && (!OS(DARWIN) || USE(SKIA_ON_MAC_CHROMIUM))) || PLATFORM(HAIKU) || OS(WINCE) || PLATFORM(ANDROID) || PLATFORM(BREWMP)
+#if USE(CG) || PLATFORM(QT) || PLATFORM(GTK) || (PLATFORM(CHROMIUM) && (!OS(DARWIN) || USE(SKIA_ON_MAC_CHROMIUM))) || PLATFORM(HAIKU) || OS(WINCE) || PLATFORM(BREWMP)
#define STORE_FONT_CUSTOM_PLATFORM_DATA
#endif
Modified: trunk/Source/WebCore/platform/DragImage.h (93572 => 93573)
--- trunk/Source/WebCore/platform/DragImage.h 2011-08-23 02:02:35 UTC (rev 93572)
+++ trunk/Source/WebCore/platform/DragImage.h 2011-08-23 02:05:48 UTC (rev 93573)
@@ -80,7 +80,7 @@
typedef BBitmap* DragImageRef;
#elif PLATFORM(BREWMP)
typedef IImage* DragImageRef;
-#elif PLATFORM(EFL) || PLATFORM(ANDROID)
+#elif PLATFORM(EFL)
typedef void* DragImageRef;
#endif
Modified: trunk/Source/WebCore/platform/PlatformTouchEvent.h (93572 => 93573)
--- trunk/Source/WebCore/platform/PlatformTouchEvent.h 2011-08-23 02:02:35 UTC (rev 93572)
+++ trunk/Source/WebCore/platform/PlatformTouchEvent.h 2011-08-23 02:05:48 UTC (rev 93573)
@@ -31,10 +31,6 @@
QT_END_NAMESPACE
#endif
-#if PLATFORM(ANDROID)
-#include "IntPoint.h"
-#endif
-
#if PLATFORM(BREWMP)
typedef unsigned short uint16;
typedef unsigned long int uint32;
@@ -66,8 +62,6 @@
{}
#if PLATFORM(QT)
PlatformTouchEvent(QTouchEvent*);
-#elif PLATFORM(ANDROID)
- PlatformTouchEvent(const Vector<int>&, const Vector<IntPoint>&, TouchEventType, const Vector<PlatformTouchPoint::State>&, int metaState);
#elif PLATFORM(BREWMP)
PlatformTouchEvent(AEEEvent, uint16 wParam, uint32 dwParam);
#elif PLATFORM(EFL)
Modified: trunk/Source/WebCore/platform/PlatformTouchPoint.h (93572 => 93573)
--- trunk/Source/WebCore/platform/PlatformTouchPoint.h 2011-08-23 02:02:35 UTC (rev 93572)
+++ trunk/Source/WebCore/platform/PlatformTouchPoint.h 2011-08-23 02:05:48 UTC (rev 93573)
@@ -47,8 +47,6 @@
#if PLATFORM(QT)
PlatformTouchPoint(const QTouchEvent::TouchPoint&);
PlatformTouchPoint() {};
-#elif PLATFORM(ANDROID)
- PlatformTouchPoint(unsigned id, const IntPoint& windowPos, State);
#elif PLATFORM(BREWMP)
PlatformTouchPoint(int id, const IntPoint& windowPos, State);
#elif PLATFORM(EFL)
Modified: trunk/Source/WebCore/platform/Widget.h (93572 => 93573)
--- trunk/Source/WebCore/platform/Widget.h 2011-08-23 02:02:35 UTC (rev 93572)
+++ trunk/Source/WebCore/platform/Widget.h 2011-08-23 02:05:48 UTC (rev 93573)
@@ -94,11 +94,6 @@
typedef Evas_Object* PlatformWidget;
#endif
-#if PLATFORM(ANDROID)
-class WebCoreViewBridge;
-typedef WebCoreViewBridge* PlatformWidget;
-#endif
-
#if PLATFORM(QT)
class QWebPageClient;
typedef QWebPageClient* PlatformPageClient;
Modified: trunk/Source/WebCore/platform/network/NetworkStateNotifier.cpp (93572 => 93573)
--- trunk/Source/WebCore/platform/network/NetworkStateNotifier.cpp 2011-08-23 02:02:35 UTC (rev 93572)
+++ trunk/Source/WebCore/platform/network/NetworkStateNotifier.cpp 2011-08-23 02:05:48 UTC (rev 93573)
@@ -46,7 +46,7 @@
m_networkStateChangedFunction = function;
}
-#if PLATFORM(ANDROID) || PLATFORM(CHROMIUM) || PLATFORM(EFL)
+#if PLATFORM(CHROMIUM) || PLATFORM(EFL)
void NetworkStateNotifier::setOnLine(bool onLine)
{
if (m_isOnLine == onLine)
@@ -57,6 +57,6 @@
if (m_networkStateChangedFunction)
m_networkStateChangedFunction();
}
-#endif // PLATFORM(ANDROID) || PLATFORM(CHROMIM)
+#endif // PLATFORM(CHROMIUM) || PLATFORM(EFL)
}
Modified: trunk/Source/WebCore/platform/network/NetworkStateNotifier.h (93572 => 93573)
--- trunk/Source/WebCore/platform/network/NetworkStateNotifier.h 2011-08-23 02:02:35 UTC (rev 93572)
+++ trunk/Source/WebCore/platform/network/NetworkStateNotifier.h 2011-08-23 02:05:48 UTC (rev 93573)
@@ -68,14 +68,10 @@
#if (PLATFORM(QT) && USE(QT_BEARER))
void setNetworkAccessAllowed(bool);
-#elif PLATFORM(ANDROID) || PLATFORM(CHROMIUM) || PLATFORM(EFL)
+#elif PLATFORM(CHROMIUM) || PLATFORM(EFL)
void setOnLine(bool);
#endif
-#if PLATFORM(ANDROID)
- void networkStateChange(bool online) { setOnLine(online); }
-#endif
-
private:
bool m_isOnLine;
void (*m_networkStateChangedFunction)();
Modified: trunk/Source/WebCore/platform/network/NetworkingContext.h (93572 => 93573)
--- trunk/Source/WebCore/platform/network/NetworkingContext.h 2011-08-23 02:02:35 UTC (rev 93572)
+++ trunk/Source/WebCore/platform/network/NetworkingContext.h 2011-08-23 02:05:48 UTC (rev 93573)
@@ -35,10 +35,6 @@
namespace WebCore {
-#if PLATFORM(ANDROID)
-class FrameLoaderClient;
-class MainResourceLoader;
-#endif
class ResourceError;
class ResourceRequest;
@@ -67,11 +63,6 @@
virtual ResourceError blockedError(const ResourceRequest&) const = 0;
#endif
-#if PLATFORM(ANDROID)
- virtual MainResourceLoader* mainResourceLoader() const = 0;
- virtual FrameLoaderClient* frameLoaderClient() const = 0;
-#endif
-
protected:
NetworkingContext() { }
};
Modified: trunk/Source/WebCore/platform/network/ResourceHandle.h (93572 => 93573)
--- trunk/Source/WebCore/platform/network/ResourceHandle.h 2011-08-23 02:02:35 UTC (rev 93572)
+++ trunk/Source/WebCore/platform/network/ResourceHandle.h 2011-08-23 02:05:48 UTC (rev 93573)
@@ -167,7 +167,7 @@
static void CALLBACK internetStatusCallback(HINTERNET, DWORD_PTR, DWORD, LPVOID, DWORD);
#endif
-#if PLATFORM(QT) || USE(CURL) || USE(SOUP) || PLATFORM(ANDROID)
+#if PLATFORM(QT) || USE(CURL) || USE(SOUP)
ResourceHandleInternal* getInternal() { return d.get(); }
#endif
Modified: trunk/Source/WebCore/platform/network/ResourceHandleInternal.h (93572 => 93573)
--- trunk/Source/WebCore/platform/network/ResourceHandleInternal.h 2011-08-23 02:02:35 UTC (rev 93572)
+++ trunk/Source/WebCore/platform/network/ResourceHandleInternal.h 2011-08-23 02:05:48 UTC (rev 93573)
@@ -70,10 +70,6 @@
#endif
#endif
-#if PLATFORM(ANDROID)
-#include "ResourceLoaderAndroid.h"
-#endif
-
// The allocations and releases in ResourceHandleInternal are
// Cocoa-exception-free (either simple Foundation classes or
// WebCoreResourceLoaderImp which avoids doing work in dealloc).
@@ -214,9 +210,6 @@
// It is almost identical to m_currentWebChallenge.nsURLAuthenticationChallenge(), but has a different sender.
NSURLAuthenticationChallenge *m_currentMacChallenge;
#endif
-#if PLATFORM(ANDROID)
- RefPtr<ResourceLoaderAndroid> m_loader;
-#endif
AuthenticationChallenge m_currentWebChallenge;
ResourceHandle::FailureType m_scheduledFailureType;
Modified: trunk/Source/WebCore/platform/network/ResourceRequestBase.cpp (93572 => 93573)
--- trunk/Source/WebCore/platform/network/ResourceRequestBase.cpp 2011-08-23 02:02:35 UTC (rev 93572)
+++ trunk/Source/WebCore/platform/network/ResourceRequestBase.cpp 2011-08-23 02:05:48 UTC (rev 93573)
@@ -443,7 +443,7 @@
m_resourceRequestUpdated = true;
}
-#if !PLATFORM(MAC) && !USE(CFNETWORK) && !USE(SOUP) && !PLATFORM(CHROMIUM) && !PLATFORM(ANDROID) && !PLATFORM(QT)
+#if !PLATFORM(MAC) && !USE(CFNETWORK) && !USE(SOUP) && !PLATFORM(CHROMIUM) && !PLATFORM(QT)
unsigned initializeMaximumHTTPConnectionCountPerHost()
{
// This is used by the loader to control the number of issued parallel load requests.
