Changeset 428

Show
Ignore:
Timestamp:
08/04/08 10:58:21 (4 months ago)
Author:
mbensi
Message:

2008-08-01 Olivier DOLE <odole@pleyo.com>

Reviewed by Mario Bensi.
Fix AmigaOS4 implementation by adding patches for future merge.
Fix all patches for merge to remove hunk offsets.
Remove duplicated BCTCSystemAllocWK files (was present in Memory and

Types).

  • OWBAL/Concretizations/Memory/WK/BCTCSystemAllocWK.cpp:
  • OWBAL/Concretizations/Types/CMakeLists.txt:
  • OWBAL/Concretizations/Types/WK/BCTCSpinLockWK.h:
    (TCMalloc_SlowLock):
  • OWBAL/Concretizations/Types/WK/BCTCSystemAllocWK.cpp: Removed.
  • OWBAL/Concretizations/Types/WK/BCTCSystemAllocWK.h: Removed.
  • scripts/patches/FileSystemPosix.patch:
  • scripts/patches/GraphicsContext.patch:
  • scripts/patches/JPEGImageDecoder.patch:
  • scripts/patches/KURL.patch:
  • scripts/patches/PNGImageDecoder.patch:
  • scripts/patches/Platform.patch:
  • scripts/patches/ResourceHandleManager.patch:
  • scripts/patches/TCSpinLock.patch: Added.
  • scripts/patches/TCSystemAlloc.patch: Added.
  • scripts/patches/index.txt:
Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/BAL/ChangeLogOWB

    r426 r428  
     12008-08-01  Olivier DOLE  <odole@pleyo.com> 
     2 
     3        Reviewed by Mario Bensi. 
     4        Fix AmigaOS4 implementation by adding patches for future merge. 
     5        Fix all patches for merge to remove hunk offsets. 
     6        Remove duplicated BCTCSystemAllocWK files (was present in Memory and 
     7                Types). 
     8 
     9        * OWBAL/Concretizations/Memory/WK/BCTCSystemAllocWK.cpp: 
     10        * OWBAL/Concretizations/Types/CMakeLists.txt: 
     11        * OWBAL/Concretizations/Types/WK/BCTCSpinLockWK.h: 
     12        (TCMalloc_SlowLock): 
     13        * OWBAL/Concretizations/Types/WK/BCTCSystemAllocWK.cpp: Removed. 
     14        * OWBAL/Concretizations/Types/WK/BCTCSystemAllocWK.h: Removed. 
     15        * scripts/patches/FileSystemPosix.patch: 
     16        * scripts/patches/GraphicsContext.patch: 
     17        * scripts/patches/JPEGImageDecoder.patch: 
     18        * scripts/patches/KURL.patch: 
     19        * scripts/patches/PNGImageDecoder.patch: 
     20        * scripts/patches/Platform.patch: 
     21        * scripts/patches/ResourceHandleManager.patch: 
     22        * scripts/patches/TCSpinLock.patch: Added. 
     23        * scripts/patches/TCSystemAlloc.patch: Added. 
     24        * scripts/patches/index.txt: 
     25 
    1262008-07-31  Joerg Strohmayer  <j_s@gmx.de> 
    227 

  • trunk/BAL/OWBAL/Concretizations/Memory/WK/BCTCSystemAllocWK.cpp

    r427 r428  
    4444#include <errno.h> 
    4545#include <unistd.h> 
     46#if !PLATFORM(AMIGAOS4) 
    4647#include <sys/mman.h> 
     48#endif 
    4749#endif 
    4850#include <fcntl.h> 

  • trunk/BAL/OWBAL/Concretizations/Types/CMakeLists.txt

    r394 r428  
    7171OWBLN (WK/BCSharedBufferWK.h OWBAL 0 0) 
    7272OWBLN (WK/BCStringExtrasWK.h OWBAL/wtf 0 0) 
    73 OWBLN (WK/BCTCSystemAllocWK.h OWBAL/wtf 0 0) 
    7473OWBLN (WK/BCTCPackedCacheWK.h OWBAL/wtf 0 0) 
    7574OWBLN (WK/BCTCPageMapWK.h OWBAL/wtf 0 0) 

  • trunk/BAL/OWBAL/Concretizations/Types/WK/BCTCSpinLockWK.h

    r427 r428  
    3838#include <time.h>       /* For nanosleep() */ 
    3939 
     40#if PLATFORM(AMIGAOS4) 
     41#include <unistd.h> 
     42#else 
    4043#include <sched.h>      /* For sched_yield() */ 
     44#endif 
    4145 
    4246#if HAVE(STDINT_H) 
    …… 
    136140 
    137141static void TCMalloc_SlowLock(volatile unsigned int* lockword) { 
     142#if !PLATFORM(AMIGAOS4) 
    138143  sched_yield();        // Yield immediately since fast path failed 
     144#endif 
    139145  while (true) { 
    140146    int r; 
    …… 
    182188#if PLATFORM(WIN_OS) 
    183189    Sleep(2); 
     190#elif PLATFORM(AMIGAOS4) 
     191    usleep(200); 
    184192#else 
    185193    struct timespec tm; 

  • trunk/BAL/scripts/generators/data/balInputList.txt

    r402 r428  
    434434../../OWBAL/Skeletons/Types     ../../../JavaScriptCore/wtf/ThreadSpecific.h 
    435435../../OWBAL/Skeletons/Types     ../../../JavaScriptCore/wtf/AVLTree.h 
    436 ../../OWBAL/Skeletons/Types     ../../../JavaScriptCore/wtf/TCSystemAlloc.h 
    437436../../OWBAL/Skeletons/Types     ../../../JavaScriptCore/wtf/HashFunctions.h 
    438437../../OWBAL/Skeletons/Types     ../../../JavaScriptCore/wtf/Assertions.h 
    …… 
    493492../../OWBAL/Concretizations/Types/WK    ../../../JavaScriptCore/wtf/ThreadSpecific.h 
    494493../../OWBAL/Concretizations/Types/WK    ../../../JavaScriptCore/wtf/AVLTree.h 
    495 ../../OWBAL/Concretizations/Types/WK    ../../../JavaScriptCore/wtf/TCSystemAlloc.h 
    496 ../../OWBAL/Concretizations/Types/WK    ../../../JavaScriptCore/wtf/TCSystemAlloc.cpp 
    497494../../OWBAL/Concretizations/Types/WK    ../../../JavaScriptCore/wtf/HashFunctions.h 
    498495../../OWBAL/Concretizations/Types/WK    ../../../JavaScriptCore/wtf/Assertions.h 

  • trunk/BAL/scripts/patches/FileSystemPosix.patch

    r297 r428  
    33--- BAL/OWBAL/Concretizations/Facilities/Posix/BCFileSystemPosix.cpp    (revision 2800) 
    44+++ BAL/OWBAL/Concretizations/Facilities/Posix/BCFileSystemPosix.cpp    (working copy) 
    5 @@ -157,4 +157,34 @@ 
    6      return dirname(fsRep.mutableData()); 
     5@@ -165,4 +165,34 @@ 
     6     return entries; 
    77 } 
    88  

  • trunk/BAL/scripts/patches/GraphicsContext.patch

    r243 r428  
    33--- BAL/WKAL/Concretizations/Graphics/WK/BCGraphicsContextWK.cpp        (revision 2800) 
    44+++ BAL/WKAL/Concretizations/Graphics/WK/BCGraphicsContextWK.cpp        (working copy) 
    5 @@ -427,7 +427,7 @@ 
     5@@ -426,7 +426,7 @@ 
    66 } 
    77 #endif 
    …… 
    1212 void GraphicsContext::clipToImageBuffer(const FloatRect&, const ImageBuffer*) 
    1313 { 
    14 @@ -435,7 +435,7 @@ 
     14@@ -434,7 +434,7 @@ 
    1515 } 
    1616 #endif 

  • trunk/BAL/scripts/patches/JPEGImageDecoder.patch

    r243 r428  
    99-#if PLATFORM(CAIRO) || PLATFORM(QT) || PLATFORM(WX) 
    1010+#if PLATFORM(CAIRO) || PLATFORM(QT) || PLATFORM(WX) || PLATFORM(BAL) 
    11   
    12  extern "C" { 
    13  #include "jpeglib.h" 
     11 
     12 #if COMPILER(MSVC) 
     13 // Remove warnings from warning level 4. 

  • trunk/BAL/scripts/patches/KURL.patch

    r243 r428  
    33--- BAL/OWBAL/Concretizations/Types/WK/BCKURLWK.cpp     (revision 2823) 
    44+++ BAL/OWBAL/Concretizations/Types/WK/BCKURLWK.cpp     (working copy) 
    5 @@ -1300,7 +1300,7 @@ 
     5@@ -1317,7 +1317,7 @@ 
    66         return; 
    77     } 
    …… 
    1212     UErrorCode error = U_ZERO_ERROR; 
    1313     int32_t numCharactersConverted = uidna_IDNToASCII(str, strLen, hostnameBuffer, 
    14 @@ -1310,6 +1310,8 @@ 
     14@@ -1327,6 +1327,8 @@ 
    1515 #elif USE(QT4_UNICODE) 
    1616     QByteArray result = QUrl::toAce(String(str, strLen)); 

  • trunk/BAL/scripts/patches/PNGImageDecoder.patch

    r243 r428  
    99-#if PLATFORM(CAIRO) || PLATFORM(QT) || PLATFORM(WX) 
    1010+#if PLATFORM(CAIRO) || PLATFORM(QT) || PLATFORM(WX) || PLATFORM(BAL) 
    11   
    12  namespace OWBAL { 
    13   
     11 
     12 #if COMPILER(MSVC) 
     13 // Remove warnings from warning level 4. 

  • trunk/BAL/scripts/patches/Platform.patch

    r416 r428  
    3232 /* Operating system level dependencies for Windows that should be used */ 
    3333 /* regardless of operating environment */ 
    34 @@ -72,6 +87,7 @@ 
     34@@ -79,6 +94,7 @@ 
    3535    || defined(unix)        \ 
    3636    || defined(__unix)      \ 
    …… 
    4040    || defined(_AIX) 
    4141 #define WTF_PLATFORM_UNIX 1 
    42 @@ -95,7 +111,7 @@ 
     42@@ -102,7 +118,7 @@ 
    4343 #define WTF_PLATFORM_WX 1 
    4444 #elif defined(BUILDING_GTK__) 
    …… 
    4949 #elif PLATFORM(WIN_OS) 
    5050 #define WTF_PLATFORM_WIN 1 
    51 @@ -272,6 +288,13 @@ 
     51@@ -284,6 +300,13 @@ 
    5252 #define HAVE_SYS_TIMEB_H 1 
    5353 #define HAVE_VIRTUALALLOC 1 

  • trunk/BAL/scripts/patches/ResourceHandleManager.patch

    r290 r428  
    33--- BAL/WKAL/Concretizations/Network/Curl/BCResourceHandleManagerCurl.cpp       (revision 286) 
    44+++ BAL/WKAL/Concretizations/Network/Curl/BCResourceHandleManagerCurl.cpp       (working copy) 
    5 @@ -466,8 +466,12 @@ 
     5@@ -467,8 +467,12 @@ 
    66         outData = reinterpret_cast<char*>(g_base64_decode(data.utf8().data(), &outLength)); 
    77 #else 
    …… 
    1818             data = String(); 
    1919 #endif 
    20 @@ -497,6 +501,9 @@ 
     20@@ -498,6 +502,9 @@ 
    2121  
    2222 #ifdef USE_GLIB_BASE64 

  • trunk/BAL/scripts/patches/index.txt

    r396 r428  
    1414../../WKAL/Concretizations/Widgets/Gtk/PasteboardHelperGtk.cpp  0:PasteboardHelperGtk.patch 
    1515../../WKAL/Concretizations/Graphics/WK/BCGraphicsContextWK.cpp  0:GraphicsContext.patch 
    16 ../../OWBAL/Concretizations/ImageDecoder/BMP/WK/BCBMPImageDecoderWK.cpp 0:BMPImageDecoder.patch 
    17 ../../OWBAL/Concretizations/ImageDecoder/GIF/WK/BCGIFImageDecoderWK.cpp 0:GIFImageDecoder.patch 
     16../../OWBAL/Concretizations/ImageDecoder/BMP/WK/BCBMPImageDecoderWK.cpp 1:BMPImageDecoder.patch 
     17../../OWBAL/Concretizations/ImageDecoder/GIF/WK/BCGIFImageDecoderWK.cpp 1:GIFImageDecoder.patch 
    1818../../OWBAL/Concretizations/ImageDecoder/GIF/WK/BCGIFImageReaderWK.cpp  0:GIFImageReader.patch 
    19 ../../OWBAL/Concretizations/ImageDecoder/ICO/WK/BCICOImageDecoderWK.cpp 0:ICOImageDecoder.patch 
     19../../OWBAL/Concretizations/ImageDecoder/ICO/WK/BCICOImageDecoderWK.cpp 1:ICOImageDecoder.patch 
    2020../../OWBAL/Concretizations/ImageDecoder/JPEG/WK/BCJPEGImageDecoderWK.cpp       0:JPEGImageDecoder.patch 
    2121../../OWBAL/Concretizations/ImageDecoder/PNG/WK/BCPNGImageDecoderWK.cpp 0:PNGImageDecoder.patch 
    22 ../../OWBAL/Concretizations/ImageDecoder/XBM/WK/BCXBMImageDecoderWK.cpp 0:XBMImageDecoder.patch 
     22../../OWBAL/Concretizations/ImageDecoder/XBM/WK/BCXBMImageDecoderWK.cpp 1:XBMImageDecoder.patch 
    2323../../OWBAL/Concretizations/Facilities/Posix/BCFileSystemPosix.cpp      0:FileSystemPosix.patch 
    2424../../WKAL/Concretizations/Fonts/WK/BCFontWK.cpp        0:Font.patch 
    …… 
    3030../../OWBAL/Concretizations/Types/WK/BCKURLWK.cpp       0:KURLI18N.patch 
    3131../../OWBAL/Concretizations/Types/WK/BCThreadSpecificWK.h       0:ThreadSpecific.patch 
     32../../OWBAL/Concretizations/Memory/WK/BCTCSystemAllocWK.cpp     0:TCSystemAlloc.patch 
     33../../OWBAL/Concretizations/Types/WK/BCTCSpinLockWK.h   0:TCSpinLock.patch 

  • trunk/JavaScriptCore/API/JSContextRef.h

    r424 r428  
    2929#include <JavaScriptCore/JSObjectRef.h> 
    3030#include <JavaScriptCore/JSValueRef.h> 
     31#include <JavaScriptCore/WebKitAvailability.h> 
    3132 
    3233#ifndef __cplusplus 
    …… 
    4849@result The created JSContextGroup. 
    4950*/ 
    50 JS_EXPORT JSContextGroupRef JSContextGroupCreate(); 
     51JS_EXPORT JSContextGroupRef JSContextGroupCreate() AVAILABLE_AFTER_WEBKIT_VERSION_3_1; 
    5152 
    5253/*! 
    …… 
    5657@result A JSContextGroup that is the same as group. 
    5758*/ 
    58 JS_EXPORT JSContextGroupRef JSContextGroupRetain(JSContextGroupRef group); 
     59JS_EXPORT JSContextGroupRef JSContextGroupRetain(JSContextGroupRef group) AVAILABLE_AFTER_WEBKIT_VERSION_3_1; 
    5960 
    6061/*! 
    …… 
    6364@param group The JSContextGroup to release. 
    6465*/ 
    65 JS_EXPORT void JSContextGroupRelease(JSContextGroupRef group); 
     66JS_EXPORT void JSContextGroupRelease(JSContextGroupRef group) AVAILABLE_AFTER_WEBKIT_VERSION_3_1; 
    6667 
    6768/*! 
    …… 
    8889 group equal to group. 
    8990*/ 
    90 JS_EXPORT JSGlobalContextRef JSGlobalContextCreateInGroup(JSContextGroupRef group, JSClassRef globalObjectClass); 
     91JS_EXPORT JSGlobalContextRef JSGlobalContextCreateInGroup(JSContextGroupRef group, JSClassRef globalObjectClass) AVAILABLE_AFTER_WEBKIT_VERSION_3_1; 
    9192 
    9293/*! 
    …… 
    119120@result ctx's group. 
    120121*/ 
    121 JS_EXPORT JSContextGroupRef JSContextGetGroup(JSContextRef ctx); 
     122JS_EXPORT JSContextGroupRef JSContextGetGroup(JSContextRef ctx) AVAILABLE_AFTER_WEBKIT_VERSION_3_1; 
    122123 
    123124#ifdef __cplusplus