Changeset 95555 in webkit
- Timestamp:
- Sep 20, 2011 11:02:33 AM (13 years ago)
- Location:
- trunk/Source
- Files:
-
- 39 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/JavaScriptCore/ChangeLog
r95540 r95555 1 2011-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 1 37 2011-09-20 Adam Roben <aroben@apple.com> 2 38 -
trunk/Source/JavaScriptCore/heap/MarkStack.h
r94929 r95555 249 249 if (size == m_allocated) 250 250 return; 251 #if OS(WINDOWS) || OS(SYMBIAN) || PLATFORM(BREWMP)251 #if OS(WINDOWS) || OS(SYMBIAN) 252 252 // We cannot release a part of a region with VirtualFree. To get around this, 253 253 // we'll release the entire region and reallocate the size that we want. -
trunk/Source/JavaScriptCore/jit/ExecutableAllocator.h
r94920 r95555 65 65 #endif 66 66 67 #if PLATFORM(BREWMP)68 #include <AEEIMemCache1.h>69 #include <AEEMemCache1.bid>70 #include <wtf/brew/RefPtrBrew.h>71 #endif72 73 67 #define JIT_ALLOCATOR_LARGE_ALLOC_SIZE (pageSize() * 4) 74 68 … … 221 215 CacheRangeFlush(code, size, CACHE_SYNC_ALL); 222 216 } 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 }230 217 #elif CPU(SH4) && OS(LINUX) 231 218 static void cacheFlush(void* code, size_t size) -
trunk/Source/JavaScriptCore/runtime/TimeoutChecker.cpp
r81803 r95555 40 40 #else 41 41 #include "CurrentTime.h" 42 #endif43 44 #if PLATFORM(BREWMP)45 #include <AEEStdLib.h>46 42 #endif 47 43 … … 92 88 ASSERT_WITH_MESSAGE(err == KErrNone, "GetCpuTime failed with %d", err); 93 89 return cpuTime.Int64() / 1000; 94 #elif PLATFORM(BREWMP)95 // This function returns a continuously and linearly increasing millisecond96 // timer from the time the device was powered on.97 // There is only one thread in BREW, so this is enough.98 return GETUPTIMEMS();99 90 #else 100 91 // FIXME: We should return the time the current thread has spent executing. -
trunk/Source/JavaScriptCore/wtf/Assertions.cpp
r90649 r95555 42 42 #endif 43 43 44 #if COMPILER(MSVC) && !OS(WINCE) && !PLATFORM(BREWMP)44 #if COMPILER(MSVC) && !OS(WINCE) 45 45 #include <crtdbg.h> 46 46 #endif … … 48 48 #if OS(WINDOWS) 49 49 #include <windows.h> 50 #endif51 52 #if PLATFORM(BREWMP)53 #include <AEEdbg.h>54 #include <wtf/Vector.h>55 50 #endif 56 51 … … 62 57 63 58 extern "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 #else75 const int printBufferSize = 32;76 #endif77 78 char printBuffer[printBufferSize + 1];79 printBuffer[printBufferSize] = 0; // to guarantee null termination80 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 #endif91 59 92 60 WTF_ATTRIBUTE_PRINTF(1, 0) … … 109 77 CFRelease(cfFormat); 110 78 return; 111 }112 #elif PLATFORM(BREWMP)113 // When str is 0, the return value is the number of bytes needed114 // 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);120 79 } 121 80 -
trunk/Source/JavaScriptCore/wtf/Assertions.h
r93018 r95555 56 56 #endif 57 57 58 #if PLATFORM(BREWMP)59 #include <AEEError.h>60 #include <AEEdbg.h>61 #endif62 63 58 #ifdef NDEBUG 64 59 /* Disable ASSERT* macros in release mode. */ … … 174 169 User::Panic(_L("Webkit CRASH"),0); \ 175 170 } 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)182 171 #elif COMPILER(CLANG) 183 172 #define CRASH() do { \ … … 236 225 /* FIXME: Change to use something other than ASSERT to avoid this conflict with the underlying platform */ 237 226 #undef ASSERT 238 #endif239 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_ASSERT246 227 #endif 247 228 -
trunk/Source/JavaScriptCore/wtf/CurrentTime.cpp
r92859 r95555 61 61 #elif PLATFORM(WX) 62 62 #include <wx/datetime.h> 63 #elif PLATFORM(BREWMP)64 #include <AEEStdLib.h>65 63 #elif PLATFORM(EFL) 66 64 #include <Ecore.h> … … 275 273 } 276 274 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 last281 // occurrence of 00:00:00 local time.282 // We can combine GETUTCSECONDS and GETTIMEMS to calculate the number of milliseconds283 // 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/06287 const unsigned diffSeconds = 315964800;288 return static_cast<double>(diffSeconds + GETUTCSECONDS() + ((GETTIMEMS() % 1000) / msPerSecond));289 }290 291 275 #elif PLATFORM(EFL) 292 276 -
trunk/Source/JavaScriptCore/wtf/DateMath.cpp
r90916 r95555 394 394 int32_t calculateUTCOffset() 395 395 { 396 #if PLATFORM(BREWMP)397 time_t localTime = static_cast<time_t>(currentTime());398 #else399 396 time_t localTime = time(0); 400 #endif401 397 tm localt; 402 398 getLocalTime(&localTime, &localt); -
trunk/Source/JavaScriptCore/wtf/FastMalloc.cpp
r95511 r95555 220 220 #if FORCE_SYSTEM_MALLOC 221 221 222 #if PLATFORM(BREWMP)223 #include "brew/SystemMallocBrew.h"224 #endif225 226 222 #if OS(DARWIN) 227 223 #include <malloc/malloc.h> … … 269 265 #endif 270 266 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) 278 268 CRASH(); 279 }280 269 281 270 return result; … … 316 305 #endif 317 306 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) 325 308 CRASH(); 326 }327 309 328 310 return result; … … 403 385 #elif OS(DARWIN) 404 386 return malloc_size(p); 405 #elif OS(WINDOWS) && !PLATFORM(BREWMP)387 #elif OS(WINDOWS) 406 388 // Brew MP uses its own memory allocator, so _msize does not work on the Brew MP simulator. 407 389 return _msize(const_cast<void*>(p)); -
trunk/Source/JavaScriptCore/wtf/FastMalloc.h
r85700 r95555 248 248 #endif 249 249 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) 251 251 252 252 // The nothrow functions here are actually not all that helpful, because fastMalloc will -
trunk/Source/JavaScriptCore/wtf/MainThread.cpp
r86972 r95555 232 232 } 233 233 234 #if !PLATFORM(MAC) && !PLATFORM(QT) && !PLATFORM(BREWMP)234 #if !PLATFORM(MAC) && !PLATFORM(QT) 235 235 bool isMainThread() 236 236 { -
trunk/Source/JavaScriptCore/wtf/MathExtras.h
r94457 r95555 260 260 } 261 261 262 #if !COMPILER(MSVC) && ! (COMPILER(RVCT) && PLATFORM(BREWMP)) && !OS(SOLARIS) && !OS(SYMBIAN)262 #if !COMPILER(MSVC) && !COMPILER(RVCT) && !OS(SOLARIS) && !OS(SYMBIAN) 263 263 using std::isfinite; 264 264 using std::isinf; -
trunk/Source/JavaScriptCore/wtf/OwnPtrCommon.h
r91018 r95555 39 39 #endif 40 40 41 #if PLATFORM(BREWMP)42 // Forward delcarations at this point avoid the need to include BREW includes43 // 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 #endif52 53 41 #if PLATFORM(EFL) 54 42 typedef struct _Ecore_Evas Ecore_Evas; … … 76 64 #endif 77 65 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 #endif87 88 66 #if PLATFORM(EFL) 89 67 void deleteOwnedPtr(Ecore_Evas*); -
trunk/Source/JavaScriptCore/wtf/Platform.h
r95512 r95555 431 431 #elif defined(BUILDING_HAIKU__) 432 432 #define WTF_PLATFORM_HAIKU 1 433 #elif defined(BUILDING_BREWMP__)434 #define WTF_PLATFORM_BREWMP 1435 #if defined(AEE_SIMULATOR)436 #define WTF_PLATFORM_BREWMP_SIMULATOR 1437 #else438 #define WTF_PLATFORM_BREWMP_SIMULATOR 0439 #endif440 #undef WTF_OS_WINDOWS441 #undef WTF_PLATFORM_WIN442 433 #elif OS(DARWIN) 443 434 #define WTF_PLATFORM_MAC 1 … … 491 482 #endif 492 483 493 #if PLATFORM(BREWMP)494 #define WTF_USE_SKIA 1495 #endif496 497 484 #if PLATFORM(GTK) 498 485 #define WTF_USE_CAIRO 1 … … 532 519 #elif OS(WINCE) 533 520 #define WTF_USE_WINCE_UNICODE 1 534 #elif PLATFORM(BREWMP)535 #define WTF_USE_BREWMP_UNICODE 1536 521 #elif PLATFORM(GTK) 537 522 /* The GTK+ Unicode backend is configurable */ … … 651 636 #endif 652 637 653 #if PLATFORM(BREWMP)654 #define USE_SYSTEM_MALLOC 1655 #endif656 657 #if PLATFORM(BREWMP_SIMULATOR)658 #define ENABLE_JIT 0659 #endif660 661 638 #if !defined(HAVE_ACCESSIBILITY) 662 639 #if PLATFORM(IOS) || PLATFORM(MAC) || PLATFORM(WIN) || PLATFORM(GTK) || PLATFORM(CHROMIUM) … … 683 660 #if !OS(WINDOWS) && !OS(SOLARIS) && !OS(QNX) \ 684 661 && !OS(SYMBIAN) && !OS(HAIKU) && !OS(RVCT) \ 685 && !OS(ANDROID) && !PLATFORM(BREWMP)662 && !OS(ANDROID) 686 663 #define HAVE_TM_GMTOFF 1 687 664 #define HAVE_TM_ZONE 1 … … 743 720 #endif 744 721 745 #elif PLATFORM(BREWMP)746 747 #define HAVE_ERRNO_H 1748 749 722 #elif OS(QNX) 750 723 -
trunk/Source/JavaScriptCore/wtf/RandomNumber.cpp
r95511 r95555 42 42 #endif 43 43 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 #endif51 52 44 namespace WTF { 53 45 … … 64 56 #if USE(MERSENNE_TWISTER_19937) 65 57 return genrand_res53(); 66 #elif PLATFORM(BREWMP)67 uint32_t bits;68 // Is this a cryptographically strong source of random numbers? If so, we69 // should move this into OSRandomSource.70 // http://csrc.nist.gov/groups/STM/cmvp/documents/140-1/140sp/140sp851.pdf71 // is slightly unclear on this point, although it seems to imply that it is72 // 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);77 58 #else 78 59 uint32_t part1 = rand() & (RAND_MAX - 1); -
trunk/Source/JavaScriptCore/wtf/RandomNumberSeed.h
r77260 r95555 57 57 #elif COMPILER(MSVC) && defined(_CRT_RAND_S) 58 58 // On Windows we use rand_s which initialises itself 59 #elif PLATFORM(BREWMP)60 // On Brew MP we use AEECLSID_RANDOM which initialises itself61 59 #elif OS(UNIX) 62 60 // 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 51 51 #endif 52 52 53 #if PLATFORM(BREWMP)54 // AECHAR is defined in AEEStdDef.h, but don't include it here to avoid conflicts.55 #ifndef _AECHAR_DEFINED56 typedef uint16 AECHAR;57 #define _AECHAR_DEFINED58 #endif59 #endif60 61 53 namespace WTF { 62 54 … … 319 311 String(const BString&); 320 312 operator BString() const; 321 #endif322 323 #if PLATFORM(BREWMP)324 String(const AECHAR*);325 313 #endif 326 314 -
trunk/Source/JavaScriptCore/wtf/unicode/Unicode.h
r69723 r95555 34 34 #elif USE(WINCE_UNICODE) 35 35 #include <wtf/unicode/wince/UnicodeWinCE.h> 36 #elif USE(BREWMP_UNICODE)37 #include <wtf/unicode/brew/UnicodeBrew.h>38 36 #else 39 37 #error "Unknown Unicode implementation" -
trunk/Source/WebCore/ChangeLog
r95554 r95555 1 2011-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 1 36 2011-09-20 Pavel Feldman <pfeldman@google.com> 2 37 -
trunk/Source/WebCore/WebCorePrefix.h
r94290 r95555 60 60 61 61 #else 62 #if !defined(BUILDING_BREWMP__) 62 63 63 #include <pthread.h> 64 #endif65 #endif // defined(WIN32) || defined(_WIN32)66 64 67 #if !defined(BUILDING_BREWMP__) 65 MachineStackMarker.h#endif // defined(WIN32) || defined(_WIN32) 66 68 67 #include <sys/types.h> 69 68 #include <fcntl.h> 70 #endif71 69 #if defined(__APPLE__) 72 70 #include <regex.h> … … 98 96 #endif 99 97 100 #if !defined(BUILDING_BREWMP__)101 98 #include <sys/types.h> 102 #endif103 99 #if defined(__APPLE__) 104 100 #include <sys/param.h> 105 101 #endif 106 #if !defined(BUILDING_BREWMP__)107 102 #include <sys/stat.h> 108 #endif109 103 #if defined(__APPLE__) 110 104 #include <sys/time.h> … … 114 108 #include <time.h> 115 109 116 #if !defined(BUILDING_WX__) && !defined(BUILDING_BREWMP__)110 #if !defined(BUILDING_WX__) 117 111 #include <CoreFoundation/CoreFoundation.h> 118 112 #ifdef WTF_PLATFORM_WIN_CAIRO … … 139 133 140 134 #endif 141 #endif // !defined(BUILDING_WX__) && !defined(BUILDING_BREWMP__)135 #endif // !defined(BUILDING_WX__) 142 136 143 137 #ifdef __OBJC__ -
trunk/Source/WebCore/loader/cache/CachedFont.cpp
r93573 r95555 29 29 30 30 // 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) 32 32 #define STORE_FONT_CUSTOM_PLATFORM_DATA 33 33 #endif -
trunk/Source/WebCore/platform/DragData.h
r89582 r95555 66 66 class BMessage; 67 67 typedef class BMessage* DragDataRef; 68 #elif PLATFORM(EFL) || PLATFORM(BREWMP)68 #elif PLATFORM(EFL) 69 69 typedef void* DragDataRef; 70 70 #endif -
trunk/Source/WebCore/platform/DragImage.h
r93573 r95555 52 52 #elif PLATFORM(HAIKU) 53 53 class BBitmap; 54 #elif PLATFORM(BREWMP)55 typedef struct IImage IImage;56 54 #endif 57 55 … … 79 77 #elif PLATFORM(HAIKU) 80 78 typedef BBitmap* DragImageRef; 81 #elif PLATFORM(BREWMP)82 typedef IImage* DragImageRef;83 79 #elif PLATFORM(EFL) 84 80 typedef void* DragImageRef; -
trunk/Source/WebCore/platform/FileSystem.h
r89039 r95555 66 66 #endif 67 67 68 #if PLATFORM(BREWMP)69 typedef struct _IFile IFile;70 #endif71 72 68 #if PLATFORM(GTK) 73 69 typedef struct _GFileIOStream GFileIOStream; … … 131 127 // avoid using Windows headers in headers. We'd rather move this into the .cpp. 132 128 const PlatformFileHandle invalidPlatformFileHandle = reinterpret_cast<HANDLE>(-1); 133 #elif PLATFORM(BREWMP)134 typedef IFile* PlatformFileHandle;135 const PlatformFileHandle invalidPlatformFileHandle = 0;136 129 #elif PLATFORM(WX) 137 130 typedef wxFile* PlatformFileHandle; -
trunk/Source/WebCore/platform/PlatformKeyboardEvent.h
r82067 r95555 68 68 #endif 69 69 70 #if PLATFORM(BREWMP)71 typedef unsigned short uint16;72 typedef unsigned long int uint32;73 #define AEEEvent uint1674 #endif75 76 70 namespace WebCore { 77 71 … … 198 192 #endif 199 193 200 #if PLATFORM(BREWMP)201 PlatformKeyboardEvent(AEEEvent, uint16, uint32, Type);202 #endif203 204 194 #if PLATFORM(WIN) || PLATFORM(CHROMIUM) 205 195 bool isSystemKey() const { return m_isSystemKey; } -
trunk/Source/WebCore/platform/PlatformMouseEvent.h
r93053 r95555 60 60 #if PLATFORM(HAIKU) 61 61 class BMessage; 62 #endif63 64 #if PLATFORM(BREWMP)65 typedef unsigned short uint16;66 typedef unsigned long int uint32;67 #define AEEEvent uint1668 62 #endif 69 63 … … 174 168 #endif 175 169 176 #if PLATFORM(BREWMP)177 PlatformMouseEvent(AEEEvent, uint16 wParam, uint32 dwParam);178 #endif179 180 170 protected: 181 171 LayoutPoint m_position; -
trunk/Source/WebCore/platform/PlatformTouchEvent.h
r93573 r95555 32 32 #endif 33 33 34 #if PLATFORM(BREWMP)35 typedef unsigned short uint16;36 typedef unsigned long int uint32;37 #define AEEEvent uint1638 #endif39 40 34 #if PLATFORM(EFL) 41 35 typedef struct _Eina_List Eina_List; … … 63 57 #if PLATFORM(QT) 64 58 PlatformTouchEvent(QTouchEvent*); 65 #elif PLATFORM(BREWMP)66 PlatformTouchEvent(AEEEvent, uint16 wParam, uint32 dwParam);67 59 #elif PLATFORM(EFL) 68 60 PlatformTouchEvent(Eina_List*, const IntPoint, TouchEventType, int metaState); -
trunk/Source/WebCore/platform/PlatformTouchPoint.h
r93573 r95555 48 48 PlatformTouchPoint(const QTouchEvent::TouchPoint&); 49 49 PlatformTouchPoint() {}; 50 #elif PLATFORM(BREWMP)51 PlatformTouchPoint(int id, const IntPoint& windowPos, State);52 50 #elif PLATFORM(EFL) 53 51 PlatformTouchPoint(unsigned id, const IntPoint& windowPos, State); -
trunk/Source/WebCore/platform/Widget.h
r93573 r95555 84 84 #endif 85 85 86 #if PLATFORM(BREWMP)87 typedef void* PlatformWidget;88 #endif89 90 86 #if PLATFORM(EFL) 91 87 typedef struct _Evas_Object Evas_Object; -
trunk/Source/WebCore/platform/graphics/IntPoint.h
r91417 r95555 66 66 #endif 67 67 68 #if PLATFORM(BREWMP)69 typedef struct _point AEEPoint;70 #endif71 72 68 #if USE(SKIA) 73 69 struct SkPoint; … … 156 152 #endif 157 153 158 #if PLATFORM(BREWMP)159 IntPoint(const AEEPoint&);160 operator AEEPoint() const;161 #endif162 163 154 #if USE(SKIA) 164 155 IntPoint(const SkIPoint&); -
trunk/Source/WebCore/platform/graphics/IntSize.h
r90167 r95555 52 52 #if PLATFORM(WX) 53 53 class wxSize; 54 #endif55 56 #if PLATFORM(BREWMP)57 typedef struct AEESize AEESize;58 54 #endif 59 55 … … 140 136 #endif 141 137 142 #if PLATFORM(BREWMP)143 IntSize(const AEESize&);144 operator AEESize() const;145 #endif146 147 138 private: 148 139 int m_width, m_height; -
trunk/Source/WebCore/platform/graphics/WOFFFileFormat.cpp
r95487 r95555 36 36 #endif 37 37 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 #endif45 46 38 #if OS(WINDOWS) 47 39 #if CPU(BIG_ENDIAN) -
trunk/Source/WebCore/platform/graphics/skia/FontCustomPlatformData.cpp
r95487 r95555 38 38 #include "OpenTypeUtilities.h" 39 39 #include "PlatformSupport.h" 40 #elif OS(UNIX) || PLATFORM(BREWMP)40 #elif OS(UNIX) 41 41 #include "SkStream.h" 42 42 #endif … … 49 49 #if OS(WINDOWS) 50 50 #include <objbase.h> 51 #elif OS(UNIX) || PLATFORM(BREWMP)51 #elif OS(UNIX) 52 52 #include <cstring> 53 53 #endif … … 60 60 if (m_fontReference) 61 61 RemoveFontMemResourceEx(m_fontReference); 62 #elif OS(UNIX) || PLATFORM(BREWMP)62 #elif OS(UNIX) 63 63 if (m_fontReference) 64 64 m_fontReference->unref(); … … 102 102 HFONT hfont = CreateFontIndirect(&logFont); 103 103 return FontPlatformData(hfont, size); 104 #elif OS(UNIX) || PLATFORM(BREWMP)104 #elif OS(UNIX) 105 105 ASSERT(m_fontReference); 106 106 return FontPlatformData(m_fontReference, "", size, bold && !m_fontReference->isBold(), italic && !m_fontReference->isItalic(), orientation, textOrientation); … … 125 125 #endif 126 126 127 #if OS(UNIX) || PLATFORM(BREWMP)127 #if OS(UNIX) 128 128 class RemoteFontStream : public SkStream { 129 129 public: … … 188 188 return 0; 189 189 return new FontCustomPlatformData(fontReference, fontName); 190 #elif OS(UNIX) || PLATFORM(BREWMP)190 #elif OS(UNIX) 191 191 RemoteFontStream* stream = new RemoteFontStream(buffer); 192 192 SkTypeface* typeface = SkTypeface::CreateFromStream(stream); -
trunk/Source/WebCore/platform/graphics/skia/FontCustomPlatformData.h
r84921 r95555 43 43 #include "PlatformString.h" 44 44 #include <windows.h> 45 #elif OS(UNIX) || PLATFORM(BREWMP)45 #elif OS(UNIX) 46 46 #include "SkTypeface.h" 47 47 #endif … … 60 60 , m_name(name) 61 61 {} 62 #elif OS(UNIX) || PLATFORM(BREWMP)62 #elif OS(UNIX) 63 63 explicit FontCustomPlatformData(SkTypeface* typeface) 64 64 : m_fontReference(typeface) … … 76 76 HANDLE m_fontReference; 77 77 String m_name; 78 #elif OS(UNIX) || PLATFORM(BREWMP)78 #elif OS(UNIX) 79 79 SkTypeface* m_fontReference; 80 80 #endif -
trunk/Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp
r84890 r95555 43 43 #include <wtf/PassOwnPtr.h> 44 44 45 #if OS(WINCE) || PLATFORM(BREWMP_SIMULATOR)45 #if OS(WINCE) 46 46 // Remove warning: 'FAR' macro redefinition 47 47 #undef FAR -
trunk/Source/WebCore/platform/text/TextBoundaries.cpp
r94527 r95555 61 61 } 62 62 63 #if !PLATFORM( BREWMP) && !PLATFORM(MAC) && !PLATFORM(QT)63 #if !PLATFORM(MAC) && !PLATFORM(QT) 64 64 65 65 int findNextWordFromIndex(const UChar* chars, int len, int position, bool forward) … … 103 103 } 104 104 105 #endif // !PLATFORM( BREWMP) && !PLATFORM(MAC) && !PLATFORM(QT)105 #endif // !PLATFORM(MAC) && !PLATFORM(QT) 106 106 107 107 } // namespace WebCore -
trunk/Source/WebCore/platform/text/TextEncoding.cpp
r73566 r95555 130 130 OwnPtr<TextCodec> textCodec = newTextCodec(*this); 131 131 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 automatically134 OwnPtr<TextCodec> textCodec = newTextCodec(*this);135 return textCodec.get() ? textCodec->encode(characters, length, handling) : CString();136 132 #endif 137 133 } -
trunk/Source/WebCore/platform/text/TextEncodingRegistry.cpp
r92068 r95555 52 52 #include "gtk/TextCodecGtk.h" 53 53 #endif 54 #if USE(BREWMP_UNICODE)55 #include "brew/TextCodecBrew.h"56 #endif57 54 #if OS(WINCE) && !PLATFORM(QT) 58 55 #include "TextCodecWinCE.h" -
trunk/Source/WebCore/plugins/PluginViewNone.cpp
r92492 r95555 136 136 // added, please make sure they have the proper platform #ifs so that changes 137 137 // 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)) 139 139 #if ENABLE(NETSCAPE_PLUGIN_API) 140 140 void PluginView::keepAlive(NPP)
Note: See TracChangeset
for help on using the changeset viewer.