Changeset 95555 in webkit


Ignore:
Timestamp:
Sep 20, 2011 11:02:33 AM (13 years ago)
Author:
ggaren@apple.com
Message:

Removed BREWMP* platform #ifdefs
https://bugs.webkit.org/show_bug.cgi?id=68425

BREWMP* has no maintainer, and this is dead code.

Reviewed by Darin Adler.

../JavaScriptCore:

  • heap/MarkStack.h:

(JSC::::shrinkAllocation):

  • jit/ExecutableAllocator.h:

(JSC::ExecutableAllocator::cacheFlush):

  • runtime/TimeoutChecker.cpp:

(JSC::getCPUTime):

  • wtf/Assertions.cpp:
  • wtf/Assertions.h:
  • wtf/CurrentTime.cpp:
  • wtf/DateMath.cpp:

(WTF::calculateUTCOffset):

  • wtf/FastMalloc.cpp:

(WTF::fastMalloc):
(WTF::fastCalloc):
(WTF::fastMallocSize):

  • wtf/FastMalloc.h:
  • wtf/MainThread.cpp:
  • wtf/MathExtras.h:
  • wtf/OwnPtrCommon.h:
  • wtf/Platform.h:
  • wtf/RandomNumber.cpp:

(WTF::randomNumber):

  • wtf/RandomNumberSeed.h:

(WTF::initializeRandomNumberGenerator):

  • wtf/text/WTFString.h:
  • wtf/unicode/Unicode.h:

../WebCore:

  • WebCorePrefix.h:
  • loader/cache/CachedFont.cpp:
  • platform/DragData.h:
  • platform/DragImage.h:
  • platform/FileSystem.h:
  • platform/PlatformKeyboardEvent.h:
  • platform/PlatformMouseEvent.h:
  • platform/PlatformTouchEvent.h:
  • platform/PlatformTouchPoint.h:

(WebCore::PlatformTouchPoint::PlatformTouchPoint):

  • platform/Widget.h:
  • platform/graphics/IntPoint.h:
  • platform/graphics/IntSize.h:
  • platform/graphics/WOFFFileFormat.cpp:
  • platform/graphics/skia/FontCustomPlatformData.cpp:

(WebCore::FontCustomPlatformData::~FontCustomPlatformData):
(WebCore::FontCustomPlatformData::fontPlatformData):
(WebCore::createFontCustomPlatformData):

  • platform/graphics/skia/FontCustomPlatformData.h:
  • platform/image-decoders/jpeg/JPEGImageDecoder.cpp:
  • platform/text/TextBoundaries.cpp:
  • platform/text/TextEncoding.cpp:

(WebCore::TextEncoding::encode):

  • platform/text/TextEncodingRegistry.cpp:
  • plugins/PluginViewNone.cpp:
Location:
trunk/Source
Files:
39 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/JavaScriptCore/ChangeLog

    r95540 r95555  
     12011-09-19  Geoffrey Garen  <ggaren@apple.com>
     2
     3        Removed BREWMP* platform #ifdefs
     4        https://bugs.webkit.org/show_bug.cgi?id=68425
     5       
     6        BREWMP* has no maintainer, and this is dead code.
     7
     8        Reviewed by Darin Adler.
     9
     10        * heap/MarkStack.h:
     11        (JSC::::shrinkAllocation):
     12        * jit/ExecutableAllocator.h:
     13        (JSC::ExecutableAllocator::cacheFlush):
     14        * runtime/TimeoutChecker.cpp:
     15        (JSC::getCPUTime):
     16        * wtf/Assertions.cpp:
     17        * wtf/Assertions.h:
     18        * wtf/CurrentTime.cpp:
     19        * wtf/DateMath.cpp:
     20        (WTF::calculateUTCOffset):
     21        * wtf/FastMalloc.cpp:
     22        (WTF::fastMalloc):
     23        (WTF::fastCalloc):
     24        (WTF::fastMallocSize):
     25        * wtf/FastMalloc.h:
     26        * wtf/MainThread.cpp:
     27        * wtf/MathExtras.h:
     28        * wtf/OwnPtrCommon.h:
     29        * wtf/Platform.h:
     30        * wtf/RandomNumber.cpp:
     31        (WTF::randomNumber):
     32        * wtf/RandomNumberSeed.h:
     33        (WTF::initializeRandomNumberGenerator):
     34        * wtf/text/WTFString.h:
     35        * wtf/unicode/Unicode.h:
     36
    1372011-09-20  Adam Roben  <aroben@apple.com>
    238
  • trunk/Source/JavaScriptCore/heap/MarkStack.h

    r94929 r95555  
    249249        if (size == m_allocated)
    250250            return;
    251 #if OS(WINDOWS) || OS(SYMBIAN) || PLATFORM(BREWMP)
     251#if OS(WINDOWS) || OS(SYMBIAN)
    252252        // We cannot release a part of a region with VirtualFree.  To get around this,
    253253        // we'll release the entire region and reallocate the size that we want.
  • trunk/Source/JavaScriptCore/jit/ExecutableAllocator.h

    r94920 r95555  
    6565#endif
    6666
    67 #if PLATFORM(BREWMP)
    68 #include <AEEIMemCache1.h>
    69 #include <AEEMemCache1.bid>
    70 #include <wtf/brew/RefPtrBrew.h>
    71 #endif
    72 
    7367#define JIT_ALLOCATOR_LARGE_ALLOC_SIZE (pageSize() * 4)
    7468
     
    221215        CacheRangeFlush(code, size, CACHE_SYNC_ALL);
    222216    }
    223 #elif PLATFORM(BREWMP)
    224     static void cacheFlush(void* code, size_t size)
    225     {
    226         RefPtr<IMemCache1> memCache = createRefPtrInstance<IMemCache1>(AEECLSID_MemCache1);
    227         IMemCache1_ClearCache(memCache.get(), reinterpret_cast<uint32>(code), size, MEMSPACE_CACHE_FLUSH, MEMSPACE_DATACACHE);
    228         IMemCache1_ClearCache(memCache.get(), reinterpret_cast<uint32>(code), size, MEMSPACE_CACHE_INVALIDATE, MEMSPACE_INSTCACHE);
    229     }
    230217#elif CPU(SH4) && OS(LINUX)
    231218    static void cacheFlush(void* code, size_t size)
  • trunk/Source/JavaScriptCore/runtime/TimeoutChecker.cpp

    r81803 r95555  
    4040#else
    4141#include "CurrentTime.h"
    42 #endif
    43 
    44 #if PLATFORM(BREWMP)
    45 #include <AEEStdLib.h>
    4642#endif
    4743
     
    9288    ASSERT_WITH_MESSAGE(err == KErrNone, "GetCpuTime failed with %d", err);
    9389    return cpuTime.Int64() / 1000;
    94 #elif PLATFORM(BREWMP)
    95     // This function returns a continuously and linearly increasing millisecond
    96     // timer from the time the device was powered on.
    97     // There is only one thread in BREW, so this is enough.
    98     return GETUPTIMEMS();
    9990#else
    10091    // FIXME: We should return the time the current thread has spent executing.
  • trunk/Source/JavaScriptCore/wtf/Assertions.cpp

    r90649 r95555  
    4242#endif
    4343
    44 #if COMPILER(MSVC) && !OS(WINCE) && !PLATFORM(BREWMP)
     44#if COMPILER(MSVC) && !OS(WINCE)
    4545#include <crtdbg.h>
    4646#endif
     
    4848#if OS(WINDOWS)
    4949#include <windows.h>
    50 #endif
    51 
    52 #if PLATFORM(BREWMP)
    53 #include <AEEdbg.h>
    54 #include <wtf/Vector.h>
    5550#endif
    5651
     
    6257
    6358extern "C" {
    64 
    65 #if PLATFORM(BREWMP)
    66 
    67 static void printLog(const Vector<char>& buffer)
    68 {
    69     // Each call to DBGPRINTF generates at most 128 bytes of output on the Windows SDK.
    70     // On Qualcomm chipset targets, DBGPRINTF() comes out the diag port (though this may change).
    71     // The length of each output string is constrained even more than on the Windows SDK.
    72 #if COMPILER(MSVC)
    73     const int printBufferSize = 128;
    74 #else
    75     const int printBufferSize = 32;
    76 #endif
    77 
    78     char printBuffer[printBufferSize + 1];
    79     printBuffer[printBufferSize] = 0; // to guarantee null termination
    80 
    81     const char* p = buffer.data();
    82     const char* end = buffer.data() + buffer.size();
    83     while (p < end) {
    84         strncpy(printBuffer, p, printBufferSize);
    85         dbg_Message(printBuffer, DBG_MSG_LEVEL_HIGH, __FILE__, __LINE__);
    86         p += printBufferSize;
    87     }
    88 }
    89 
    90 #endif
    9159
    9260WTF_ATTRIBUTE_PRINTF(1, 0)
     
    10977        CFRelease(cfFormat);
    11078        return;
    111     }
    112 #elif PLATFORM(BREWMP)
    113     // When str is 0, the return value is the number of bytes needed
    114     // to accept the result including null termination.
    115     int size = vsnprintf(0, 0, format, args);
    116     if (size > 0) {
    117         Vector<char> buffer(size);
    118         vsnprintf(buffer.data(), size, format, args);
    119         printLog(buffer);
    12079    }
    12180
  • trunk/Source/JavaScriptCore/wtf/Assertions.h

    r93018 r95555  
    5656#endif
    5757
    58 #if PLATFORM(BREWMP)
    59 #include <AEEError.h>
    60 #include <AEEdbg.h>
    61 #endif
    62 
    6358#ifdef NDEBUG
    6459/* Disable ASSERT* macros in release mode. */
     
    174169    User::Panic(_L("Webkit CRASH"),0); \
    175170} while (false)
    176 #elif PLATFORM(BREWMP)
    177 #define CRASH() do { \
    178     dbg_Message("WebKit CRASH", DBG_MSG_LEVEL_FATAL, __FILE__, __LINE__); \
    179     *(int *)(uintptr_t)0xbbadbeef = 0; \
    180     ((void(*)())0)(); /* More reliable, but doesn't say BBADBEEF */ \
    181 } while (false)
    182171#elif COMPILER(CLANG)
    183172#define CRASH() do { \
     
    236225/* FIXME: Change to use something other than ASSERT to avoid this conflict with the underlying platform */
    237226#undef ASSERT
    238 #endif
    239 
    240 #if PLATFORM(BREWMP)
    241 /* FIXME: We include this here only to avoid a conflict with the COMPILE_ASSERT macro. */
    242 #include <AEEClassIDs.h>
    243 
    244 /* FIXME: Change to use something other than COMPILE_ASSERT to avoid this conflict with the underlying platform */
    245 #undef COMPILE_ASSERT
    246227#endif
    247228
  • trunk/Source/JavaScriptCore/wtf/CurrentTime.cpp

    r92859 r95555  
    6161#elif PLATFORM(WX)
    6262#include <wx/datetime.h>
    63 #elif PLATFORM(BREWMP)
    64 #include <AEEStdLib.h>
    6563#elif PLATFORM(EFL)
    6664#include <Ecore.h>
     
    275273}
    276274
    277 #elif PLATFORM(BREWMP)
    278 
    279 // GETUTCSECONDS returns the number of seconds since 1980/01/06 00:00:00 UTC,
    280 // and GETTIMEMS returns the number of milliseconds that have elapsed since the last
    281 // occurrence of 00:00:00 local time.
    282 // We can combine GETUTCSECONDS and GETTIMEMS to calculate the number of milliseconds
    283 // since 1970/01/01 00:00:00 UTC.
    284 double currentTime()
    285 {
    286     // diffSeconds is the number of seconds from 1970/01/01 to 1980/01/06
    287     const unsigned diffSeconds = 315964800;
    288     return static_cast<double>(diffSeconds + GETUTCSECONDS() + ((GETTIMEMS() % 1000) / msPerSecond));
    289 }
    290 
    291275#elif PLATFORM(EFL)
    292276
  • trunk/Source/JavaScriptCore/wtf/DateMath.cpp

    r90916 r95555  
    394394int32_t calculateUTCOffset()
    395395{
    396 #if PLATFORM(BREWMP)
    397     time_t localTime = static_cast<time_t>(currentTime());
    398 #else
    399396    time_t localTime = time(0);
    400 #endif
    401397    tm localt;
    402398    getLocalTime(&localTime, &localt);
  • trunk/Source/JavaScriptCore/wtf/FastMalloc.cpp

    r95511 r95555  
    220220#if FORCE_SYSTEM_MALLOC
    221221
    222 #if PLATFORM(BREWMP)
    223 #include "brew/SystemMallocBrew.h"
    224 #endif
    225 
    226222#if OS(DARWIN)
    227223#include <malloc/malloc.h>
     
    269265#endif
    270266
    271     if (!result) {
    272 #if PLATFORM(BREWMP)
    273         // The behavior of malloc(0) is implementation defined.
    274         // To make sure that fastMalloc never returns 0, retry with fastMalloc(1).
    275         if (!n)
    276             return fastMalloc(1);
    277 #endif
     267    if (!result)
    278268        CRASH();
    279     }
    280269
    281270    return result;
     
    316305#endif
    317306
    318     if (!result) {
    319 #if PLATFORM(BREWMP)
    320         // If either n_elements or element_size is 0, the behavior of calloc is implementation defined.
    321         // To make sure that fastCalloc never returns 0, retry with fastCalloc(1, 1).
    322         if (!n_elements || !element_size)
    323             return fastCalloc(1, 1);
    324 #endif
     307    if (!result)
    325308        CRASH();
    326     }
    327309
    328310    return result;
     
    403385#elif OS(DARWIN)
    404386    return malloc_size(p);
    405 #elif OS(WINDOWS) && !PLATFORM(BREWMP)
     387#elif OS(WINDOWS)
    406388    // Brew MP uses its own memory allocator, so _msize does not work on the Brew MP simulator.
    407389    return _msize(const_cast<void*>(p));
  • trunk/Source/JavaScriptCore/wtf/FastMalloc.h

    r85700 r95555  
    248248#endif
    249249
    250 #if !defined(_CRTDBG_MAP_ALLOC) && !(defined(USE_SYSTEM_MALLOC) && USE_SYSTEM_MALLOC && !PLATFORM(BREWMP))
     250#if !defined(_CRTDBG_MAP_ALLOC) && !(defined(USE_SYSTEM_MALLOC) && USE_SYSTEM_MALLOC)
    251251
    252252// The nothrow functions here are actually not all that helpful, because fastMalloc will
  • trunk/Source/JavaScriptCore/wtf/MainThread.cpp

    r86972 r95555  
    232232}
    233233
    234 #if !PLATFORM(MAC) && !PLATFORM(QT) && !PLATFORM(BREWMP)
     234#if !PLATFORM(MAC) && !PLATFORM(QT)
    235235bool isMainThread()
    236236{
  • trunk/Source/JavaScriptCore/wtf/MathExtras.h

    r94457 r95555  
    260260}
    261261
    262 #if !COMPILER(MSVC) && !(COMPILER(RVCT) && PLATFORM(BREWMP)) && !OS(SOLARIS) && !OS(SYMBIAN)
     262#if !COMPILER(MSVC) && !COMPILER(RVCT) && !OS(SOLARIS) && !OS(SYMBIAN)
    263263using std::isfinite;
    264264using std::isinf;
  • trunk/Source/JavaScriptCore/wtf/OwnPtrCommon.h

    r91018 r95555  
    3939#endif
    4040
    41 #if PLATFORM(BREWMP)
    42 // Forward delcarations at this point avoid the need to include BREW includes
    43 // in WTF headers.
    44 typedef struct _ISocket ISocket;
    45 typedef struct _IFileMgr IFileMgr;
    46 typedef struct _IFile IFile;
    47 typedef struct IBitmap IBitmap;
    48 typedef struct ISSL ISSL;
    49 typedef struct IMemGroup IMemGroup;
    50 typedef struct IMemSpace IMemSpace;
    51 #endif
    52 
    5341#if PLATFORM(EFL)
    5442typedef struct _Ecore_Evas Ecore_Evas;
     
    7664#endif
    7765
    78 #if PLATFORM(BREWMP)
    79     void deleteOwnedPtr(IFileMgr*);
    80     void deleteOwnedPtr(IFile*);
    81     void deleteOwnedPtr(IBitmap*);
    82     void deleteOwnedPtr(ISSL*);
    83     void deleteOwnedPtr(ISocket*);
    84     void deleteOwnedPtr(IMemGroup*);
    85     void deleteOwnedPtr(IMemSpace*);
    86 #endif
    87 
    8866#if PLATFORM(EFL)
    8967    void deleteOwnedPtr(Ecore_Evas*);
  • trunk/Source/JavaScriptCore/wtf/Platform.h

    r95512 r95555  
    431431#elif defined(BUILDING_HAIKU__)
    432432#define WTF_PLATFORM_HAIKU 1
    433 #elif defined(BUILDING_BREWMP__)
    434 #define WTF_PLATFORM_BREWMP 1
    435 #if defined(AEE_SIMULATOR)
    436 #define WTF_PLATFORM_BREWMP_SIMULATOR 1
    437 #else
    438 #define WTF_PLATFORM_BREWMP_SIMULATOR 0
    439 #endif
    440 #undef WTF_OS_WINDOWS
    441 #undef WTF_PLATFORM_WIN
    442433#elif OS(DARWIN)
    443434#define WTF_PLATFORM_MAC 1
     
    491482#endif
    492483
    493 #if PLATFORM(BREWMP)
    494 #define WTF_USE_SKIA 1
    495 #endif
    496 
    497484#if PLATFORM(GTK)
    498485#define WTF_USE_CAIRO 1
     
    532519#elif OS(WINCE)
    533520#define WTF_USE_WINCE_UNICODE 1
    534 #elif PLATFORM(BREWMP)
    535 #define WTF_USE_BREWMP_UNICODE 1
    536521#elif PLATFORM(GTK)
    537522/* The GTK+ Unicode backend is configurable */
     
    651636#endif
    652637
    653 #if PLATFORM(BREWMP)
    654 #define USE_SYSTEM_MALLOC 1
    655 #endif
    656 
    657 #if PLATFORM(BREWMP_SIMULATOR)
    658 #define ENABLE_JIT 0
    659 #endif
    660 
    661638#if !defined(HAVE_ACCESSIBILITY)
    662639#if PLATFORM(IOS) || PLATFORM(MAC) || PLATFORM(WIN) || PLATFORM(GTK) || PLATFORM(CHROMIUM)
     
    683660#if !OS(WINDOWS) && !OS(SOLARIS) && !OS(QNX) \
    684661    && !OS(SYMBIAN) && !OS(HAIKU) && !OS(RVCT) \
    685     && !OS(ANDROID) && !PLATFORM(BREWMP)
     662    && !OS(ANDROID)
    686663#define HAVE_TM_GMTOFF 1
    687664#define HAVE_TM_ZONE 1
     
    743720#endif
    744721
    745 #elif PLATFORM(BREWMP)
    746 
    747 #define HAVE_ERRNO_H 1
    748 
    749722#elif OS(QNX)
    750723
  • trunk/Source/JavaScriptCore/wtf/RandomNumber.cpp

    r95511 r95555  
    4242#endif
    4343
    44 #if PLATFORM(BREWMP)
    45 #include <AEEAppGen.h>
    46 #include <AEESource.h>
    47 #include <AEEStdLib.h>
    48 #include <wtf/brew/RefPtrBrew.h>
    49 #include <wtf/brew/ShellBrew.h>
    50 #endif
    51 
    5244namespace WTF {
    5345
     
    6456#if USE(MERSENNE_TWISTER_19937)
    6557    return genrand_res53();
    66 #elif PLATFORM(BREWMP)
    67     uint32_t bits;
    68     // Is this a cryptographically strong source of random numbers? If so, we
    69     // should move this into OSRandomSource.
    70     // http://csrc.nist.gov/groups/STM/cmvp/documents/140-1/140sp/140sp851.pdf
    71     // is slightly unclear on this point, although it seems to imply that it is
    72     // secure.
    73     RefPtr<ISource> randomSource = createRefPtrInstance<ISource>(AEECLSID_RANDOM);
    74     ISOURCE_Read(randomSource.get(), reinterpret_cast<char*>(&bits), 4);
    75 
    76     return static_cast<double>(bits) / (static_cast<double>(std::numeric_limits<uint32_t>::max()) + 1.0);
    7758#else
    7859    uint32_t part1 = rand() & (RAND_MAX - 1);
  • trunk/Source/JavaScriptCore/wtf/RandomNumberSeed.h

    r77260 r95555  
    5757#elif COMPILER(MSVC) && defined(_CRT_RAND_S)
    5858    // On Windows we use rand_s which initialises itself
    59 #elif PLATFORM(BREWMP)
    60     // On Brew MP we use AEECLSID_RANDOM which initialises itself
    6159#elif OS(UNIX)
    6260    // srandomdev is not guaranteed to exist on linux so we use this poor seed, this should be improved
  • trunk/Source/JavaScriptCore/wtf/text/WTFString.h

    r91837 r95555  
    5151#endif
    5252
    53 #if PLATFORM(BREWMP)
    54 // AECHAR is defined in AEEStdDef.h, but don't include it here to avoid conflicts.
    55 #ifndef _AECHAR_DEFINED
    56 typedef uint16             AECHAR;
    57 #define _AECHAR_DEFINED
    58 #endif
    59 #endif
    60 
    6153namespace WTF {
    6254
     
    319311    String(const BString&);
    320312    operator BString() const;
    321 #endif
    322 
    323 #if PLATFORM(BREWMP)
    324     String(const AECHAR*);
    325313#endif
    326314
  • trunk/Source/JavaScriptCore/wtf/unicode/Unicode.h

    r69723 r95555  
    3434#elif USE(WINCE_UNICODE)
    3535#include <wtf/unicode/wince/UnicodeWinCE.h>
    36 #elif USE(BREWMP_UNICODE)
    37 #include <wtf/unicode/brew/UnicodeBrew.h>
    3836#else
    3937#error "Unknown Unicode implementation"
  • trunk/Source/WebCore/ChangeLog

    r95554 r95555  
     12011-09-19  Geoffrey Garen  <ggaren@apple.com>
     2
     3        Removed BREWMP* platform #ifdefs
     4        https://bugs.webkit.org/show_bug.cgi?id=68425
     5       
     6        BREWMP* has no maintainer, and this is dead code.
     7
     8        Reviewed by Darin Adler.
     9
     10        * WebCorePrefix.h:
     11        * loader/cache/CachedFont.cpp:
     12        * platform/DragData.h:
     13        * platform/DragImage.h:
     14        * platform/FileSystem.h:
     15        * platform/PlatformKeyboardEvent.h:
     16        * platform/PlatformMouseEvent.h:
     17        * platform/PlatformTouchEvent.h:
     18        * platform/PlatformTouchPoint.h:
     19        (WebCore::PlatformTouchPoint::PlatformTouchPoint):
     20        * platform/Widget.h:
     21        * platform/graphics/IntPoint.h:
     22        * platform/graphics/IntSize.h:
     23        * platform/graphics/WOFFFileFormat.cpp:
     24        * platform/graphics/skia/FontCustomPlatformData.cpp:
     25        (WebCore::FontCustomPlatformData::~FontCustomPlatformData):
     26        (WebCore::FontCustomPlatformData::fontPlatformData):
     27        (WebCore::createFontCustomPlatformData):
     28        * platform/graphics/skia/FontCustomPlatformData.h:
     29        * platform/image-decoders/jpeg/JPEGImageDecoder.cpp:
     30        * platform/text/TextBoundaries.cpp:
     31        * platform/text/TextEncoding.cpp:
     32        (WebCore::TextEncoding::encode):
     33        * platform/text/TextEncodingRegistry.cpp:
     34        * plugins/PluginViewNone.cpp:
     35
    1362011-09-20  Pavel Feldman  <pfeldman@google.com>
    237
  • trunk/Source/WebCore/WebCorePrefix.h

    r94290 r95555  
    6060
    6161#else
    62 #if !defined(BUILDING_BREWMP__)
     62
    6363#include <pthread.h>
    64 #endif
    65 #endif // defined(WIN32) || defined(_WIN32)
    6664
    67 #if !defined(BUILDING_BREWMP__)
     65MachineStackMarker.h#endif // defined(WIN32) || defined(_WIN32)
     66
    6867#include <sys/types.h>
    6968#include <fcntl.h>
    70 #endif
    7169#if defined(__APPLE__)
    7270#include <regex.h>
     
    9896#endif
    9997
    100 #if !defined(BUILDING_BREWMP__)
    10198#include <sys/types.h>
    102 #endif
    10399#if defined(__APPLE__)
    104100#include <sys/param.h>
    105101#endif
    106 #if !defined(BUILDING_BREWMP__)
    107102#include <sys/stat.h>
    108 #endif
    109103#if defined(__APPLE__)
    110104#include <sys/time.h>
     
    114108#include <time.h>
    115109
    116 #if !defined(BUILDING_WX__) && !defined(BUILDING_BREWMP__)
     110#if !defined(BUILDING_WX__)
    117111#include <CoreFoundation/CoreFoundation.h>
    118112#ifdef WTF_PLATFORM_WIN_CAIRO
     
    139133
    140134#endif
    141 #endif // !defined(BUILDING_WX__) && !defined(BUILDING_BREWMP__)
     135#endif // !defined(BUILDING_WX__)
    142136
    143137#ifdef __OBJC__
  • trunk/Source/WebCore/loader/cache/CachedFont.cpp

    r93573 r95555  
    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(BREWMP)
     31#if USE(CG) || PLATFORM(QT) || PLATFORM(GTK) || (PLATFORM(CHROMIUM) && (!OS(DARWIN) || USE(SKIA_ON_MAC_CHROMIUM))) || PLATFORM(HAIKU) || OS(WINCE)
    3232#define STORE_FONT_CUSTOM_PLATFORM_DATA
    3333#endif
  • trunk/Source/WebCore/platform/DragData.h

    r89582 r95555  
    6666class BMessage;
    6767typedef class BMessage* DragDataRef;
    68 #elif PLATFORM(EFL) || PLATFORM(BREWMP)
     68#elif PLATFORM(EFL)
    6969typedef void* DragDataRef;
    7070#endif
  • trunk/Source/WebCore/platform/DragImage.h

    r93573 r95555  
    5252#elif PLATFORM(HAIKU)
    5353class BBitmap;
    54 #elif PLATFORM(BREWMP)
    55 typedef struct IImage IImage;
    5654#endif
    5755
     
    7977#elif PLATFORM(HAIKU)
    8078    typedef BBitmap* DragImageRef;
    81 #elif PLATFORM(BREWMP)
    82     typedef IImage* DragImageRef;
    8379#elif PLATFORM(EFL)
    8480    typedef void* DragImageRef;
  • trunk/Source/WebCore/platform/FileSystem.h

    r89039 r95555  
    6666#endif
    6767
    68 #if PLATFORM(BREWMP)
    69 typedef struct _IFile IFile;
    70 #endif
    71 
    7268#if PLATFORM(GTK)
    7369typedef struct _GFileIOStream GFileIOStream;
     
    131127// avoid using Windows headers in headers.  We'd rather move this into the .cpp.
    132128const PlatformFileHandle invalidPlatformFileHandle = reinterpret_cast<HANDLE>(-1);
    133 #elif PLATFORM(BREWMP)
    134 typedef IFile* PlatformFileHandle;
    135 const PlatformFileHandle invalidPlatformFileHandle = 0;
    136129#elif PLATFORM(WX)
    137130typedef wxFile* PlatformFileHandle;
  • trunk/Source/WebCore/platform/PlatformKeyboardEvent.h

    r82067 r95555  
    6868#endif
    6969
    70 #if PLATFORM(BREWMP)
    71 typedef unsigned short    uint16;
    72 typedef unsigned long int uint32;
    73 #define AEEEvent uint16
    74 #endif
    75 
    7670namespace WebCore {
    7771
     
    198192#endif
    199193
    200 #if PLATFORM(BREWMP)
    201         PlatformKeyboardEvent(AEEEvent, uint16, uint32, Type);
    202 #endif
    203 
    204194#if PLATFORM(WIN) || PLATFORM(CHROMIUM)
    205195        bool isSystemKey() const { return m_isSystemKey; }
  • trunk/Source/WebCore/platform/PlatformMouseEvent.h

    r93053 r95555  
    6060#if PLATFORM(HAIKU)
    6161class BMessage;
    62 #endif
    63 
    64 #if PLATFORM(BREWMP)
    65 typedef unsigned short    uint16;
    66 typedef unsigned long int uint32;
    67 #define AEEEvent uint16
    6862#endif
    6963
     
    174168#endif
    175169
    176 #if PLATFORM(BREWMP)
    177         PlatformMouseEvent(AEEEvent, uint16 wParam, uint32 dwParam);
    178 #endif
    179 
    180170    protected:
    181171        LayoutPoint m_position;
  • trunk/Source/WebCore/platform/PlatformTouchEvent.h

    r93573 r95555  
    3232#endif
    3333
    34 #if PLATFORM(BREWMP)
    35 typedef unsigned short    uint16;
    36 typedef unsigned long int uint32;
    37 #define AEEEvent uint16
    38 #endif
    39 
    4034#if PLATFORM(EFL)
    4135typedef struct _Eina_List Eina_List;
     
    6357#if PLATFORM(QT)
    6458    PlatformTouchEvent(QTouchEvent*);
    65 #elif PLATFORM(BREWMP)
    66     PlatformTouchEvent(AEEEvent, uint16 wParam, uint32 dwParam);
    6759#elif PLATFORM(EFL)
    6860    PlatformTouchEvent(Eina_List*, const IntPoint, TouchEventType, int metaState);
  • trunk/Source/WebCore/platform/PlatformTouchPoint.h

    r93573 r95555  
    4848    PlatformTouchPoint(const QTouchEvent::TouchPoint&);
    4949    PlatformTouchPoint() {};
    50 #elif PLATFORM(BREWMP)
    51     PlatformTouchPoint(int id, const IntPoint& windowPos, State);
    5250#elif PLATFORM(EFL)
    5351    PlatformTouchPoint(unsigned id, const IntPoint& windowPos, State);
  • trunk/Source/WebCore/platform/Widget.h

    r93573 r95555  
    8484#endif
    8585
    86 #if PLATFORM(BREWMP)
    87 typedef void* PlatformWidget;
    88 #endif
    89 
    9086#if PLATFORM(EFL)
    9187typedef struct _Evas_Object Evas_Object;
  • trunk/Source/WebCore/platform/graphics/IntPoint.h

    r91417 r95555  
    6666#endif
    6767
    68 #if PLATFORM(BREWMP)
    69 typedef struct _point AEEPoint;
    70 #endif
    71 
    7268#if USE(SKIA)
    7369struct SkPoint;
     
    156152#endif
    157153
    158 #if PLATFORM(BREWMP)
    159     IntPoint(const AEEPoint&);
    160     operator AEEPoint() const;
    161 #endif
    162 
    163154#if USE(SKIA)
    164155    IntPoint(const SkIPoint&);
  • trunk/Source/WebCore/platform/graphics/IntSize.h

    r90167 r95555  
    5252#if PLATFORM(WX)
    5353class wxSize;
    54 #endif
    55 
    56 #if PLATFORM(BREWMP)
    57 typedef struct AEESize AEESize;
    5854#endif
    5955
     
    140136#endif
    141137
    142 #if PLATFORM(BREWMP)
    143     IntSize(const AEESize&);
    144     operator AEESize() const;
    145 #endif
    146 
    147138private:
    148139    int m_width, m_height;
  • trunk/Source/WebCore/platform/graphics/WOFFFileFormat.cpp

    r95487 r95555  
    3636#endif
    3737
    38 #if PLATFORM(BREWMP)
    39 #include <AEEstd.h>
    40 #define htonl(x) std_htonl(x)
    41 #define htons(x) std_htons(x)
    42 #define ntohl(x) std_ntohl(x)
    43 #define ntohs(x) std_ntohs(x)
    44 #endif
    45 
    4638#if OS(WINDOWS)
    4739#if CPU(BIG_ENDIAN)
  • trunk/Source/WebCore/platform/graphics/skia/FontCustomPlatformData.cpp

    r95487 r95555  
    3838#include "OpenTypeUtilities.h"
    3939#include "PlatformSupport.h"
    40 #elif OS(UNIX) || PLATFORM(BREWMP)
     40#elif OS(UNIX)
    4141#include "SkStream.h"
    4242#endif
     
    4949#if OS(WINDOWS)
    5050#include <objbase.h>
    51 #elif OS(UNIX) || PLATFORM(BREWMP)
     51#elif OS(UNIX)
    5252#include <cstring>
    5353#endif
     
    6060    if (m_fontReference)
    6161        RemoveFontMemResourceEx(m_fontReference);
    62 #elif OS(UNIX) || PLATFORM(BREWMP)
     62#elif OS(UNIX)
    6363    if (m_fontReference)
    6464        m_fontReference->unref();
     
    102102    HFONT hfont = CreateFontIndirect(&logFont);
    103103    return FontPlatformData(hfont, size);
    104 #elif OS(UNIX) || PLATFORM(BREWMP)
     104#elif OS(UNIX)
    105105    ASSERT(m_fontReference);
    106106    return FontPlatformData(m_fontReference, "", size, bold && !m_fontReference->isBold(), italic && !m_fontReference->isItalic(), orientation, textOrientation);
     
    125125#endif
    126126
    127 #if OS(UNIX) || PLATFORM(BREWMP)
     127#if OS(UNIX)
    128128class RemoteFontStream : public SkStream {
    129129public:
     
    188188        return 0;
    189189    return new FontCustomPlatformData(fontReference, fontName);
    190 #elif OS(UNIX) || PLATFORM(BREWMP)
     190#elif OS(UNIX)
    191191    RemoteFontStream* stream = new RemoteFontStream(buffer);
    192192    SkTypeface* typeface = SkTypeface::CreateFromStream(stream);
  • trunk/Source/WebCore/platform/graphics/skia/FontCustomPlatformData.h

    r84921 r95555  
    4343#include "PlatformString.h"
    4444#include <windows.h>
    45 #elif OS(UNIX) || PLATFORM(BREWMP)
     45#elif OS(UNIX)
    4646#include "SkTypeface.h"
    4747#endif
     
    6060        , m_name(name)
    6161    {}
    62 #elif OS(UNIX) || PLATFORM(BREWMP)
     62#elif OS(UNIX)
    6363    explicit FontCustomPlatformData(SkTypeface* typeface)
    6464        : m_fontReference(typeface)
     
    7676    HANDLE m_fontReference;
    7777    String m_name;
    78 #elif OS(UNIX) || PLATFORM(BREWMP)
     78#elif OS(UNIX)
    7979    SkTypeface* m_fontReference;
    8080#endif
  • trunk/Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp

    r84890 r95555  
    4343#include <wtf/PassOwnPtr.h>
    4444
    45 #if OS(WINCE) || PLATFORM(BREWMP_SIMULATOR)
     45#if OS(WINCE)
    4646// Remove warning: 'FAR' macro redefinition
    4747#undef FAR
  • trunk/Source/WebCore/platform/text/TextBoundaries.cpp

    r94527 r95555  
    6161}
    6262
    63 #if !PLATFORM(BREWMP) && !PLATFORM(MAC) && !PLATFORM(QT)
     63#if !PLATFORM(MAC) && !PLATFORM(QT)
    6464
    6565int findNextWordFromIndex(const UChar* chars, int len, int position, bool forward)
     
    103103}
    104104
    105 #endif // !PLATFORM(BREWMP) && !PLATFORM(MAC) && !PLATFORM(QT)
     105#endif // !PLATFORM(MAC) && !PLATFORM(QT)
    106106
    107107} // namespace WebCore
  • trunk/Source/WebCore/platform/text/TextEncoding.cpp

    r73566 r95555  
    130130    OwnPtr<TextCodec> textCodec = newTextCodec(*this);
    131131    return textCodec.get() ? textCodec->encode(characters, length, handling) : CString();
    132 #elif USE(BREWMP_UNICODE)
    133     // FIXME: not sure if Brew MP normalizes the input string automatically
    134     OwnPtr<TextCodec> textCodec = newTextCodec(*this);
    135     return textCodec.get() ? textCodec->encode(characters, length, handling) : CString();
    136132#endif
    137133}
  • trunk/Source/WebCore/platform/text/TextEncodingRegistry.cpp

    r92068 r95555  
    5252#include "gtk/TextCodecGtk.h"
    5353#endif
    54 #if USE(BREWMP_UNICODE)
    55 #include "brew/TextCodecBrew.h"
    56 #endif
    5754#if OS(WINCE) && !PLATFORM(QT)
    5855#include "TextCodecWinCE.h"
  • trunk/Source/WebCore/plugins/PluginViewNone.cpp

    r92492 r95555  
    136136// added, please make sure they have the proper platform #ifs so that changes
    137137// do not break ports who compile both this file and PluginView.cpp.   
    138 #if PLATFORM(MAC) || PLATFORM(CHROMIUM) || PLATFORM(EFL) || (OS(WINCE) && !PLATFORM(QT)) || (PLATFORM(QT) && !OS(WINCE)) || PLATFORM(BREWMP)
     138#if PLATFORM(MAC) || PLATFORM(CHROMIUM) || PLATFORM(EFL) || (OS(WINCE) && !PLATFORM(QT)) || (PLATFORM(QT) && !OS(WINCE))
    139139#if ENABLE(NETSCAPE_PLUGIN_API)
    140140void PluginView::keepAlive(NPP)
Note: See TracChangeset for help on using the changeset viewer.