Changeset 93573 in webkit


Ignore:
Timestamp:
Aug 22, 2011 7:05:48 PM (13 years ago)
Author:
abarth@webkit.org
Message:

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:
Location:
trunk/Source/WebCore
Files:
19 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r93571 r93573  
     12011-08-22  Adam Barth  <abarth@webkit.org>
     2
     3        Remove PLATFORM(ANDROID)
     4        https://bugs.webkit.org/show_bug.cgi?id=66741
     5
     6        Reviewed by Darin Adler.
     7
     8        PLATFORM(CHROMIUM) && OS(ANDROID) is the new hotness.  These special
     9        cases can be removed now that Android shares more code with Chromium.
     10
     11        * bindings/js/JSDOMWindowBase.cpp:
     12        (WebCore::JSDOMWindowBase::supportsRichSourceInfo):
     13        * bindings/v8/ScriptCachedFrameData.cpp:
     14        * bindings/v8/ScriptCachedFrameData.h:
     15        * bindings/v8/V8GCController.cpp:
     16        * bridge/jni/jsc/JavaInstanceJSC.cpp:
     17        (JavaInstance::invokeMethod):
     18        * history/HistoryItem.cpp:
     19        (WebCore::HistoryItem::~HistoryItem):
     20        (WebCore::HistoryItem::setDocumentState):
     21        (WebCore::HistoryItem::clearDocumentState):
     22        (WebCore::HistoryItem::setIsTargetItem):
     23        (WebCore::HistoryItem::addChildItem):
     24        (WebCore::HistoryItem::setFormInfoFromRequest):
     25        * history/HistoryItem.h:
     26        * loader/cache/CachedFont.cpp:
     27        * platform/DragImage.h:
     28        * platform/PlatformTouchEvent.h:
     29        * platform/PlatformTouchPoint.h:
     30        (WebCore::PlatformTouchPoint::PlatformTouchPoint):
     31        * platform/Widget.h:
     32        * platform/network/NetworkStateNotifier.cpp:
     33        * platform/network/NetworkStateNotifier.h:
     34        * platform/network/NetworkingContext.h:
     35        * platform/network/ResourceHandle.h:
     36        * platform/network/ResourceHandleInternal.h:
     37        * platform/network/ResourceRequestBase.cpp:
     38
    1392011-08-22  Adrienne Walker  <enne@google.com>
    240

  • trunk/Source/WebCore/bindings/js/JSDOMWindowBase.cpp

    r92224 r93573  
    109109bool JSDOMWindowBase::supportsRichSourceInfo() const
    110110{
    111 #if PLATFORM(ANDROID)
    112     return true;
    113 #elif !ENABLE(JAVASCRIPT_DEBUGGER) || !ENABLE(INSPECTOR)
     111#if !ENABLE(JAVASCRIPT_DEBUGGER) || !ENABLE(INSPECTOR)
    114112    return false;
    115113#else

  • trunk/Source/WebCore/bindings/v8/ScriptCachedFrameData.cpp

    r84371 r93573  
    2727#include "ScriptCachedFrameData.h"
    2828
    29 #if PLATFORM(ANDROID) || PLATFORM(QT)
     29#if PLATFORM(QT)
    3030// FIXME: the right guard should be ENABLE(PAGE_CACHE). Replace with the right guard, once
    3131// https://bugs.webkit.org/show_bug.cgi?id=35061 is fixed.
    … …  
    7777} // namespace WebCore
    7878
    79 #endif // PLATFORM(ANDROID) || PLATFORM(QT)
     79#endif // PLATFORM(QT)

  • trunk/Source/WebCore/bindings/v8/ScriptCachedFrameData.h

    r76251 r93573  
    5252} // namespace WebCore
    5353
    54 #elif PLATFORM(ANDROID) || PLATFORM(QT)
     54#elif PLATFORM(QT)
    5555// FIXME: the right guard should be ENABLE(PAGE_CACHE). Replace with the right guard, once
    5656// https://bugs.webkit.org/show_bug.cgi?id=35061 is fixed.

  • trunk/Source/WebCore/bindings/v8/V8GCController.cpp

    r93397 r93573  
    421421int getMemoryUsageInMB()
    422422{
    423 #if PLATFORM(CHROMIUM) || PLATFORM(ANDROID)
     423#if PLATFORM(CHROMIUM)
    424424    return PlatformBridge::memoryUsageMB();
    425425#else
    … …  
    430430int getActualMemoryUsageInMB()
    431431{
    432 #if PLATFORM(CHROMIUM) || PLATFORM(ANDROID)
     432#if PLATFORM(CHROMIUM)
    433433    return PlatformBridge::actualMemoryUsageMB();
    434434#else

  • trunk/Source/WebCore/bridge/jni/jsc/JavaInstanceJSC.cpp

    r93059 r93573  
    214214    }
    215215
    216 // This is a deprecated code path which should not be required on Android.
    217 // Remove this guard once Bug 39476 is fixed.
    218 #if PLATFORM(ANDROID)
    219     if (!handled)
    220         result = callJNIMethod(m_instance->instance(), jMethod->returnType(), jMethod->name().utf8().data(), jMethod->signature(), jArgs.data());
    221 #endif
    222 
    223216    switch (jMethod->returnType()) {
    224217    case JavaTypeVoid:

  • trunk/Source/WebCore/history/HistoryItem.cpp

    r88080 r93573  
    134134    ASSERT(!m_cachedPage);
    135135    iconDatabase().releaseIconForPageURL(m_urlString);
    136 #if PLATFORM(ANDROID)
    137     if (m_bridge)
    138         m_bridge->detachHistoryItem();
    139 #endif
    140136}
    141137
    … …  
    436432{
    437433    m_documentState = state;
    438 #if PLATFORM(ANDROID)
    439     notifyHistoryItemChanged(this);
    440 #endif
    441434}
    442435
    … …  
    449442{
    450443    m_documentState.clear();
    451 #if PLATFORM(ANDROID)
    452     notifyHistoryItemChanged(this);
    453 #endif
    454444}
    455445
    … …  
    462452{
    463453    m_isTargetItem = flag;
    464 #if PLATFORM(ANDROID)
    465     notifyHistoryItemChanged(this);
    466 #endif
    467454}
    468455
    … …  
    476463    ASSERT(!childItemWithTarget(child->target()));
    477464    m_children.append(child);
    478 #if PLATFORM(ANDROID)
    479     notifyHistoryItemChanged(this);
    480 #endif
    481465}
    482466
    … …  
    622606        m_formContentType = String();
    623607    }
    624 #if PLATFORM(ANDROID)
    625     notifyHistoryItemChanged(this);
    626 #endif
    627608}
    628609

  • trunk/Source/WebCore/history/HistoryItem.h

    r86325 r93573  
    4444#endif
    4545
    46 #if PLATFORM(ANDROID)
    47 #include "AndroidWebHistoryBridge.h"
    48 #endif
    49 
    5046namespace WebCore {
    5147
    … …  
    203199#endif
    204200
    205 #if PLATFORM(ANDROID)
    206     void setBridge(AndroidWebHistoryBridge* bridge);
    207     AndroidWebHistoryBridge* bridge() const;
    208 #endif
    209 
    210201#ifndef NDEBUG
    211202    int showTree() const;
    … …  
    296287#endif
    297288
    298 #if PLATFORM(ANDROID)
    299     RefPtr<AndroidWebHistoryBridge> m_bridge;
    300 #endif
    301 
    302289}; //class HistoryItem
    303290

  • trunk/Source/WebCore/loader/cache/CachedFont.cpp

    r90167 r93573  
    2929
    3030// FIXME: This should really be a blacklist instead of a whitelist
    31 #if USE(CG) || PLATFORM(QT) || PLATFORM(GTK) || (PLATFORM(CHROMIUM) && (!OS(DARWIN) || USE(SKIA_ON_MAC_CHROMIUM))) || PLATFORM(HAIKU) || OS(WINCE) || PLATFORM(ANDROID) || PLATFORM(BREWMP)
     31#if USE(CG) || PLATFORM(QT) || PLATFORM(GTK) || (PLATFORM(CHROMIUM) && (!OS(DARWIN) || USE(SKIA_ON_MAC_CHROMIUM))) || PLATFORM(HAIKU) || OS(WINCE) || PLATFORM(BREWMP)
    3232#define STORE_FONT_CUSTOM_PLATFORM_DATA
    3333#endif

  • trunk/Source/WebCore/platform/DragImage.h

    r86433 r93573  
    8181#elif PLATFORM(BREWMP)
    8282    typedef IImage* DragImageRef;
    83 #elif PLATFORM(EFL) || PLATFORM(ANDROID)
     83#elif PLATFORM(EFL)
    8484    typedef void* DragImageRef;
    8585#endif

  • trunk/Source/WebCore/platform/PlatformTouchEvent.h

    r81685 r93573  
    3232#endif
    3333
    34 #if PLATFORM(ANDROID)
    35 #include "IntPoint.h"
    36 #endif
    37 
    3834#if PLATFORM(BREWMP)
    3935typedef unsigned short    uint16;
    … …  
    6763#if PLATFORM(QT)
    6864    PlatformTouchEvent(QTouchEvent*);
    69 #elif PLATFORM(ANDROID)
    70     PlatformTouchEvent(const Vector<int>&, const Vector<IntPoint>&, TouchEventType, const Vector<PlatformTouchPoint::State>&, int metaState);
    7165#elif PLATFORM(BREWMP)
    7266    PlatformTouchEvent(AEEEvent, uint16 wParam, uint32 dwParam);

  • trunk/Source/WebCore/platform/PlatformTouchPoint.h

    r89212 r93573  
    4848    PlatformTouchPoint(const QTouchEvent::TouchPoint&);
    4949    PlatformTouchPoint() {};
    50 #elif PLATFORM(ANDROID)
    51     PlatformTouchPoint(unsigned id, const IntPoint& windowPos, State);
    5250#elif PLATFORM(BREWMP)
    5351    PlatformTouchPoint(int id, const IntPoint& windowPos, State);

  • trunk/Source/WebCore/platform/Widget.h

    r90734 r93573  
    9595#endif
    9696
    97 #if PLATFORM(ANDROID)
    98 class WebCoreViewBridge;
    99 typedef WebCoreViewBridge* PlatformWidget;
    100 #endif
    101 
    10297#if PLATFORM(QT)
    10398class QWebPageClient;

  • trunk/Source/WebCore/platform/network/NetworkStateNotifier.cpp

    r91255 r93573  
    4747}
    4848
    49 #if PLATFORM(ANDROID) || PLATFORM(CHROMIUM) || PLATFORM(EFL)
     49#if PLATFORM(CHROMIUM) || PLATFORM(EFL)
    5050void NetworkStateNotifier::setOnLine(bool onLine)
    5151{
    … …  
    5858        m_networkStateChangedFunction();
    5959}
    60 #endif // PLATFORM(ANDROID) || PLATFORM(CHROMIM)
     60#endif // PLATFORM(CHROMIUM) || PLATFORM(EFL)
    6161
    6262}

  • trunk/Source/WebCore/platform/network/NetworkStateNotifier.h

    r91255 r93573  
    6969#if (PLATFORM(QT) && USE(QT_BEARER))
    7070    void setNetworkAccessAllowed(bool);
    71 #elif PLATFORM(ANDROID) || PLATFORM(CHROMIUM) || PLATFORM(EFL)
     71#elif PLATFORM(CHROMIUM) || PLATFORM(EFL)
    7272    void setOnLine(bool);
    73 #endif
    74 
    75 #if PLATFORM(ANDROID)
    76     void networkStateChange(bool online) { setOnLine(online); }
    7773#endif
    7874

  • trunk/Source/WebCore/platform/network/NetworkingContext.h

    r84057 r93573  
    3636namespace WebCore {
    3737
    38 #if PLATFORM(ANDROID)
    39 class FrameLoaderClient;
    40 class MainResourceLoader;
    41 #endif
    4238class ResourceError;
    4339class ResourceRequest;
    … …  
    6864#endif
    6965
    70 #if PLATFORM(ANDROID)
    71     virtual MainResourceLoader* mainResourceLoader() const = 0;
    72     virtual FrameLoaderClient* frameLoaderClient() const = 0;
    73 #endif
    74 
    7566protected:
    7667    NetworkingContext() { }

  • trunk/Source/WebCore/platform/network/ResourceHandle.h

    r91799 r93573  
    168168#endif
    169169
    170 #if PLATFORM(QT) || USE(CURL) || USE(SOUP) || PLATFORM(ANDROID)
     170#if PLATFORM(QT) || USE(CURL) || USE(SOUP)
    171171    ResourceHandleInternal* getInternal() { return d.get(); }
    172172#endif

  • trunk/Source/WebCore/platform/network/ResourceHandleInternal.h

    r92271 r93573  
    7171#endif
    7272
    73 #if PLATFORM(ANDROID)
    74 #include "ResourceLoaderAndroid.h"
    75 #endif
    76 
    7773// The allocations and releases in ResourceHandleInternal are
    7874// Cocoa-exception-free (either simple Foundation classes or
    … …  
    215211        NSURLAuthenticationChallenge *m_currentMacChallenge;
    216212#endif
    217 #if PLATFORM(ANDROID)
    218         RefPtr<ResourceLoaderAndroid> m_loader;
    219 #endif
    220213        AuthenticationChallenge m_currentWebChallenge;
    221214

  • trunk/Source/WebCore/platform/network/ResourceRequestBase.cpp

    r92399 r93573  
    444444}
    445445
    446 #if !PLATFORM(MAC) && !USE(CFNETWORK) && !USE(SOUP) && !PLATFORM(CHROMIUM) && !PLATFORM(ANDROID) && !PLATFORM(QT)
     446#if !PLATFORM(MAC) && !USE(CFNETWORK) && !USE(SOUP) && !PLATFORM(CHROMIUM) && !PLATFORM(QT)
    447447unsigned initializeMaximumHTTPConnectionCountPerHost()
    448448{
Note: See TracChangeset for help on using the changeset viewer.