Commit f903ca32 authored by ggaren@apple.com's avatar ggaren@apple.com

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:


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@95555 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 0d2e10ed
2011-09-19 Geoffrey Garen <ggaren@apple.com>
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.
* 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:
2011-09-20 Adam Roben <aroben@apple.com>
Windows build fix after r95523
......@@ -248,7 +248,7 @@ namespace JSC {
ASSERT(isPageAligned(size));
if (size == m_allocated)
return;
#if OS(WINDOWS) || OS(SYMBIAN) || PLATFORM(BREWMP)
#if OS(WINDOWS) || OS(SYMBIAN)
// We cannot release a part of a region with VirtualFree. To get around this,
// we'll release the entire region and reallocate the size that we want.
MarkStack::releaseStack(m_data, m_allocated);
......
......@@ -64,12 +64,6 @@
extern "C" __declspec(dllimport) void CacheRangeFlush(LPVOID pAddr, DWORD dwLength, DWORD dwFlags);
#endif
#if PLATFORM(BREWMP)
#include <AEEIMemCache1.h>
#include <AEEMemCache1.bid>
#include <wtf/brew/RefPtrBrew.h>
#endif
#define JIT_ALLOCATOR_LARGE_ALLOC_SIZE (pageSize() * 4)
#if ENABLE(ASSEMBLER_WX_EXCLUSIVE)
......@@ -220,13 +214,6 @@ public:
{
CacheRangeFlush(code, size, CACHE_SYNC_ALL);
}
#elif PLATFORM(BREWMP)
static void cacheFlush(void* code, size_t size)
{
RefPtr<IMemCache1> memCache = createRefPtrInstance<IMemCache1>(AEECLSID_MemCache1);
IMemCache1_ClearCache(memCache.get(), reinterpret_cast<uint32>(code), size, MEMSPACE_CACHE_FLUSH, MEMSPACE_DATACACHE);
IMemCache1_ClearCache(memCache.get(), reinterpret_cast<uint32>(code), size, MEMSPACE_CACHE_INVALIDATE, MEMSPACE_INSTCACHE);
}
#elif CPU(SH4) && OS(LINUX)
static void cacheFlush(void* code, size_t size)
{
......
......@@ -41,10 +41,6 @@
#include "CurrentTime.h"
#endif
#if PLATFORM(BREWMP)
#include <AEEStdLib.h>
#endif
using namespace std;
namespace JSC {
......@@ -91,11 +87,6 @@ static inline unsigned getCPUTime()
TInt err = current.GetCpuTime(cpuTime);
ASSERT_WITH_MESSAGE(err == KErrNone, "GetCpuTime failed with %d", err);
return cpuTime.Int64() / 1000;
#elif PLATFORM(BREWMP)
// This function returns a continuously and linearly increasing millisecond
// timer from the time the device was powered on.
// There is only one thread in BREW, so this is enough.
return GETUPTIMEMS();
#else
// FIXME: We should return the time the current thread has spent executing.
......
......@@ -41,7 +41,7 @@
#include <CoreFoundation/CFString.h>
#endif
#if COMPILER(MSVC) && !OS(WINCE) && !PLATFORM(BREWMP)
#if COMPILER(MSVC) && !OS(WINCE)
#include <crtdbg.h>
#endif
......@@ -49,11 +49,6 @@
#include <windows.h>
#endif
#if PLATFORM(BREWMP)
#include <AEEdbg.h>
#include <wtf/Vector.h>
#endif
#if PLATFORM(MAC)
#include <cxxabi.h>
#include <dlfcn.h>
......@@ -62,33 +57,6 @@
extern "C" {
#if PLATFORM(BREWMP)
static void printLog(const Vector<char>& buffer)
{
// Each call to DBGPRINTF generates at most 128 bytes of output on the Windows SDK.
// On Qualcomm chipset targets, DBGPRINTF() comes out the diag port (though this may change).
// The length of each output string is constrained even more than on the Windows SDK.
#if COMPILER(MSVC)
const int printBufferSize = 128;
#else
const int printBufferSize = 32;
#endif
char printBuffer[printBufferSize + 1];
printBuffer[printBufferSize] = 0; // to guarantee null termination
const char* p = buffer.data();
const char* end = buffer.data() + buffer.size();
while (p < end) {
strncpy(printBuffer, p, printBufferSize);
dbg_Message(printBuffer, DBG_MSG_LEVEL_HIGH, __FILE__, __LINE__);
p += printBufferSize;
}
}
#endif
WTF_ATTRIBUTE_PRINTF(1, 0)
static void vprintf_stderr_common(const char* format, va_list args)
{
......@@ -109,15 +77,6 @@ static void vprintf_stderr_common(const char* format, va_list args)
CFRelease(cfFormat);
return;
}
#elif PLATFORM(BREWMP)
// When str is 0, the return value is the number of bytes needed
// to accept the result including null termination.
int size = vsnprintf(0, 0, format, args);
if (size > 0) {
Vector<char> buffer(size);
vsnprintf(buffer.data(), size, format, args);
printLog(buffer);
}
#elif HAVE(ISDEBUGGERPRESENT)
if (IsDebuggerPresent()) {
......
......@@ -55,11 +55,6 @@
#include <e32debug.h>
#endif
#if PLATFORM(BREWMP)
#include <AEEError.h>
#include <AEEdbg.h>
#endif
#ifdef NDEBUG
/* Disable ASSERT* macros in release mode. */
#define ASSERTIONS_DISABLED_DEFAULT 1
......@@ -173,12 +168,6 @@ WTF_EXPORT_PRIVATE void WTFLogVerbose(const char* file, int line, const char* fu
__DEBUGGER(); \
User::Panic(_L("Webkit CRASH"),0); \
} while (false)
#elif PLATFORM(BREWMP)
#define CRASH() do { \
dbg_Message("WebKit CRASH", DBG_MSG_LEVEL_FATAL, __FILE__, __LINE__); \
*(int *)(uintptr_t)0xbbadbeef = 0; \
((void(*)())0)(); /* More reliable, but doesn't say BBADBEEF */ \
} while (false)
#elif COMPILER(CLANG)
#define CRASH() do { \
WTFReportBacktrace(); \
......@@ -237,14 +226,6 @@ WTF_EXPORT_PRIVATE void WTFLogVerbose(const char* file, int line, const char* fu
#undef ASSERT
#endif
#if PLATFORM(BREWMP)
/* FIXME: We include this here only to avoid a conflict with the COMPILE_ASSERT macro. */
#include <AEEClassIDs.h>
/* FIXME: Change to use something other than COMPILE_ASSERT to avoid this conflict with the underlying platform */
#undef COMPILE_ASSERT
#endif
#if ASSERT_DISABLED
#define ASSERT(assertion) ((void)0)
......
......@@ -60,8 +60,6 @@ extern "C" time_t mktime(struct tm *t);
#include <glib.h>
#elif PLATFORM(WX)
#include <wx/datetime.h>
#elif PLATFORM(BREWMP)
#include <AEEStdLib.h>
#elif PLATFORM(EFL)
#include <Ecore.h>
#else
......@@ -274,20 +272,6 @@ double currentTime()
return (double)now.GetTicks() + (double)(now.GetMillisecond() / 1000.0);
}
#elif PLATFORM(BREWMP)
// GETUTCSECONDS returns the number of seconds since 1980/01/06 00:00:00 UTC,
// and GETTIMEMS returns the number of milliseconds that have elapsed since the last
// occurrence of 00:00:00 local time.
// We can combine GETUTCSECONDS and GETTIMEMS to calculate the number of milliseconds
// since 1970/01/01 00:00:00 UTC.
double currentTime()
{
// diffSeconds is the number of seconds from 1970/01/01 to 1980/01/06
const unsigned diffSeconds = 315964800;
return static_cast<double>(diffSeconds + GETUTCSECONDS() + ((GETTIMEMS() % 1000) / msPerSecond));
}
#elif PLATFORM(EFL)
double currentTime()
......
......@@ -393,11 +393,7 @@ int equivalentYearForDST(int year)
int32_t calculateUTCOffset()
{
#if PLATFORM(BREWMP)
time_t localTime = static_cast<time_t>(currentTime());
#else
time_t localTime = time(0);
#endif
tm localt;
getLocalTime(&localTime, &localt);
......
......@@ -219,10 +219,6 @@ TryMallocReturnValue tryFastZeroedMalloc(size_t n)
#if FORCE_SYSTEM_MALLOC
#if PLATFORM(BREWMP)
#include "brew/SystemMallocBrew.h"
#endif
#if OS(DARWIN)
#include <malloc/malloc.h>
#elif OS(WINDOWS)
......@@ -268,15 +264,8 @@ void* fastMalloc(size_t n)
void* result = malloc(n);
#endif
if (!result) {
#if PLATFORM(BREWMP)
// The behavior of malloc(0) is implementation defined.
// To make sure that fastMalloc never returns 0, retry with fastMalloc(1).
if (!n)
return fastMalloc(1);
#endif
if (!result)
CRASH();
}
return result;
}
......@@ -315,15 +304,8 @@ void* fastCalloc(size_t n_elements, size_t element_size)
void* result = calloc(n_elements, element_size);
#endif
if (!result) {
#if PLATFORM(BREWMP)
// If either n_elements or element_size is 0, the behavior of calloc is implementation defined.
// To make sure that fastCalloc never returns 0, retry with fastCalloc(1, 1).
if (!n_elements || !element_size)
return fastCalloc(1, 1);
#endif
if (!result)
CRASH();
}
return result;
}
......@@ -402,7 +384,7 @@ size_t fastMallocSize(const void* p)
return Internal::fastMallocValidationHeader(const_cast<void*>(p))->m_size;
#elif OS(DARWIN)
return malloc_size(p);
#elif OS(WINDOWS) && !PLATFORM(BREWMP)
#elif OS(WINDOWS)
// Brew MP uses its own memory allocator, so _msize does not work on the Brew MP simulator.
return _msize(const_cast<void*>(p));
#else
......
......@@ -247,7 +247,7 @@ using WTF::fastMallocAllow;
#define WTF_PRIVATE_INLINE inline
#endif
#if !defined(_CRTDBG_MAP_ALLOC) && !(defined(USE_SYSTEM_MALLOC) && USE_SYSTEM_MALLOC && !PLATFORM(BREWMP))
#if !defined(_CRTDBG_MAP_ALLOC) && !(defined(USE_SYSTEM_MALLOC) && USE_SYSTEM_MALLOC)
// The nothrow functions here are actually not all that helpful, because fastMalloc will
// call CRASH() rather than returning 0, and returning 0 is what nothrow is all about.
......
......@@ -231,7 +231,7 @@ void setMainThreadCallbacksPaused(bool paused)
scheduleDispatchFunctionsOnMainThread();
}
#if !PLATFORM(MAC) && !PLATFORM(QT) && !PLATFORM(BREWMP)
#if !PLATFORM(MAC) && !PLATFORM(QT)
bool isMainThread()
{
return currentThread() == mainThreadIdentifier;
......
......@@ -259,7 +259,7 @@ inline bool isWithinIntRange(float x)
return x > static_cast<float>(std::numeric_limits<int>::min()) && x < static_cast<float>(std::numeric_limits<int>::max());
}
#if !COMPILER(MSVC) && !(COMPILER(RVCT) && PLATFORM(BREWMP)) && !OS(SOLARIS) && !OS(SYMBIAN)
#if !COMPILER(MSVC) && !COMPILER(RVCT) && !OS(SOLARIS) && !OS(SYMBIAN)
using std::isfinite;
using std::isinf;
using std::isnan;
......
......@@ -38,18 +38,6 @@ typedef struct HPEN__* HPEN;
typedef struct HRGN__* HRGN;
#endif
#if PLATFORM(BREWMP)
// Forward delcarations at this point avoid the need to include BREW includes
// in WTF headers.
typedef struct _ISocket ISocket;
typedef struct _IFileMgr IFileMgr;
typedef struct _IFile IFile;
typedef struct IBitmap IBitmap;
typedef struct ISSL ISSL;
typedef struct IMemGroup IMemGroup;
typedef struct IMemSpace IMemSpace;
#endif
#if PLATFORM(EFL)
typedef struct _Ecore_Evas Ecore_Evas;
typedef struct _Ecore_Pipe Ecore_Pipe;
......@@ -75,16 +63,6 @@ namespace WTF {
void deleteOwnedPtr(HRGN);
#endif
#if PLATFORM(BREWMP)
void deleteOwnedPtr(IFileMgr*);
void deleteOwnedPtr(IFile*);
void deleteOwnedPtr(IBitmap*);
void deleteOwnedPtr(ISSL*);
void deleteOwnedPtr(ISocket*);
void deleteOwnedPtr(IMemGroup*);
void deleteOwnedPtr(IMemSpace*);
#endif
#if PLATFORM(EFL)
void deleteOwnedPtr(Ecore_Evas*);
void deleteOwnedPtr(Ecore_Pipe*);
......
......@@ -430,15 +430,6 @@
#define WTF_PLATFORM_GTK 1
#elif defined(BUILDING_HAIKU__)
#define WTF_PLATFORM_HAIKU 1
#elif defined(BUILDING_BREWMP__)
#define WTF_PLATFORM_BREWMP 1
#if defined(AEE_SIMULATOR)
#define WTF_PLATFORM_BREWMP_SIMULATOR 1
#else
#define WTF_PLATFORM_BREWMP_SIMULATOR 0
#endif
#undef WTF_OS_WINDOWS
#undef WTF_PLATFORM_WIN
#elif OS(DARWIN)
#define WTF_PLATFORM_MAC 1
#elif OS(WINDOWS)
......@@ -490,10 +481,6 @@
#endif
#endif
#if PLATFORM(BREWMP)
#define WTF_USE_SKIA 1
#endif
#if PLATFORM(GTK)
#define WTF_USE_CAIRO 1
#endif
......@@ -531,8 +518,6 @@
#endif
#elif OS(WINCE)
#define WTF_USE_WINCE_UNICODE 1
#elif PLATFORM(BREWMP)
#define WTF_USE_BREWMP_UNICODE 1
#elif PLATFORM(GTK)
/* The GTK+ Unicode backend is configurable */
#else
......@@ -650,14 +635,6 @@
#define ENABLE_NETSCAPE_PLUGIN_API 0
#endif
#if PLATFORM(BREWMP)
#define USE_SYSTEM_MALLOC 1
#endif
#if PLATFORM(BREWMP_SIMULATOR)
#define ENABLE_JIT 0
#endif
#if !defined(HAVE_ACCESSIBILITY)
#if PLATFORM(IOS) || PLATFORM(MAC) || PLATFORM(WIN) || PLATFORM(GTK) || PLATFORM(CHROMIUM)
#define HAVE_ACCESSIBILITY 1
......@@ -682,7 +659,7 @@
#if !OS(WINDOWS) && !OS(SOLARIS) && !OS(QNX) \
&& !OS(SYMBIAN) && !OS(HAIKU) && !OS(RVCT) \
&& !OS(ANDROID) && !PLATFORM(BREWMP)
&& !OS(ANDROID)
#define HAVE_TM_GMTOFF 1
#define HAVE_TM_ZONE 1
#define HAVE_TIMEGM 1
......@@ -742,10 +719,6 @@
#define HAVE_SYS_PARAM_H 1
#endif
#elif PLATFORM(BREWMP)
#define HAVE_ERRNO_H 1
#elif OS(QNX)
#define HAVE_ERRNO_H 1
......
......@@ -41,14 +41,6 @@ extern "C" {
}
#endif
#if PLATFORM(BREWMP)
#include <AEEAppGen.h>
#include <AEESource.h>
#include <AEEStdLib.h>
#include <wtf/brew/RefPtrBrew.h>
#include <wtf/brew/ShellBrew.h>
#endif
namespace WTF {
double randomNumber()
......@@ -63,17 +55,6 @@ double randomNumber()
#if USE(MERSENNE_TWISTER_19937)
return genrand_res53();
#elif PLATFORM(BREWMP)
uint32_t bits;
// Is this a cryptographically strong source of random numbers? If so, we
// should move this into OSRandomSource.
// http://csrc.nist.gov/groups/STM/cmvp/documents/140-1/140sp/140sp851.pdf
// is slightly unclear on this point, although it seems to imply that it is
// secure.
RefPtr<ISource> randomSource = createRefPtrInstance<ISource>(AEECLSID_RANDOM);
ISOURCE_Read(randomSource.get(), reinterpret_cast<char*>(&bits), 4);
return static_cast<double>(bits) / (static_cast<double>(std::numeric_limits<uint32_t>::max()) + 1.0);
#else
uint32_t part1 = rand() & (RAND_MAX - 1);
uint32_t part2 = rand() & (RAND_MAX - 1);
......
......@@ -56,8 +56,6 @@ inline void initializeRandomNumberGenerator()
srand(GetTickCount());
#elif COMPILER(MSVC) && defined(_CRT_RAND_S)
// On Windows we use rand_s which initialises itself
#elif PLATFORM(BREWMP)
// On Brew MP we use AEECLSID_RANDOM which initialises itself
#elif OS(UNIX)
// srandomdev is not guaranteed to exist on linux so we use this poor seed, this should be improved
timeval time;
......
......@@ -50,14 +50,6 @@ class wxString;
class BString;
#endif
#if PLATFORM(BREWMP)
// AECHAR is defined in AEEStdDef.h, but don't include it here to avoid conflicts.
#ifndef _AECHAR_DEFINED
typedef uint16 AECHAR;
#define _AECHAR_DEFINED
#endif
#endif
namespace WTF {
class CString;
......@@ -320,10 +312,6 @@ public:
operator BString() const;
#endif
#if PLATFORM(BREWMP)
String(const AECHAR*);
#endif
// String::fromUTF8 will return a null string if
// the input data contains invalid UTF-8 sequences.
WTF_EXPORT_PRIVATE static String fromUTF8(const char*, size_t);
......
......@@ -33,8 +33,6 @@
#include <wtf/unicode/glib/UnicodeGLib.h>
#elif USE(WINCE_UNICODE)
#include <wtf/unicode/wince/UnicodeWinCE.h>
#elif USE(BREWMP_UNICODE)
#include <wtf/unicode/brew/UnicodeBrew.h>
#else
#error "Unknown Unicode implementation"
#endif
......
2011-09-19 Geoffrey Garen <ggaren@apple.com>
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.
* 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:
2011-09-20 Pavel Feldman <pfeldman@google.com>
Web Inspector: Copy Stack Trace lacks newlines on Windows
......@@ -59,15 +59,13 @@
#endif
#else
#if !defined(BUILDING_BREWMP__)
#include <pthread.h>
#endif
#endif // defined(WIN32) || defined(_WIN32)
#if !defined(BUILDING_BREWMP__)
MachineStackMarker.h#endif // defined(WIN32) || defined(_WIN32)
#include <sys/types.h>
#include <fcntl.h>
#endif
#if defined(__APPLE__)
#include <regex.h>
#endif
......@@ -97,15 +95,11 @@
#endif
#if !defined(BUILDING_BREWMP__)
#include <sys/types.h>
#endif
#if defined(__APPLE__)
#include <sys/param.h>
#endif
#if !defined(BUILDING_BREWMP__)
#include <sys/stat.h>
#endif
#if defined(__APPLE__)
#include <sys/time.h>
#include <sys/resource.h>
......@@ -113,7 +107,7 @@
#include <time.h>
#if !defined(BUILDING_WX__) && !defined(BUILDING_BREWMP__)
#if !defined(BUILDING_WX__)
#include <CoreFoundation/CoreFoundation.h>
#ifdef WTF_PLATFORM_WIN_CAIRO
#include <ConditionalMacros.h>
......@@ -138,7 +132,7 @@
#endif
#endif
#endif // !defined(BUILDING_WX__) && !defined(BUILDING_BREWMP__)
#endif // !defined(BUILDING_WX__)
#ifdef __OBJC__
#import <Cocoa/Cocoa.h>
......
......@@ -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(BREWMP)
#if USE(CG) || PLATFORM(QT) || PLATFORM(GTK) || (PLATFORM(CHROMIUM) && (!OS(DARWIN) || USE(SKIA_ON_MAC_CHROMIUM))) || PLATFORM(HAIKU) || OS(WINCE)
#define STORE_FONT_CUSTOM_PLATFORM_DATA
#endif
......
......@@ -65,7 +65,7 @@ typedef WebCore::DataObjectGtk* DragDataRef;
#elif PLATFORM(HAIKU)
class BMessage;
typedef class BMessage* DragDataRef;
#elif PLATFORM(EFL) || PLATFORM(BREWMP)
#elif PLATFORM(EFL)
typedef void* DragDataRef;
#endif
......
......@@ -51,8 +51,6 @@ class wxDragImage;
typedef struct _cairo_surface cairo_surface_t;
#elif PLATFORM(HAIKU)
class BBitmap;
#elif PLATFORM(BREWMP)
typedef struct IImage IImage;
#endif
//We need to #define YOffset as it needs to be shared with WebKit
......@@ -78,8 +76,6 @@ namespace WebCore {
typedef cairo_surface_t* DragImageRef;
#elif PLATFORM(HAIKU)
typedef BBitmap* DragImageRef;
#elif PLATFORM(BREWMP)
typedef IImage* DragImageRef;