Ticket #230: patchdoduo_win32_msvc.patch

File patchdoduo_win32_msvc.patch, 100.3 kB (added by mickael.leforestier, 5 months ago)

patch version beta 1

  • versionPropre/Doduo_owb/BAL/Base/NotImplemented.h

    old new  
    2525 
    2626#ifndef NotImplemented_h 
    2727#define NotImplemented_h 
    28  
     28#ifndef __OWBAL_PLATFORM_WIN32PORT__ 
    2929#include "Logging.h" 
    3030#include <Assertions.h> 
     31#else 
     32#include "BCLoggingWK.h" 
     33#include "BCAssertionsWK.h" 
     34#endif 
    3135 
    3236#if PLATFORM(GTK) 
    3337    //#define supressNotImplementedWarning() getenv("DISABLE_NI_WARNING") 

  • versionPropre/Doduo_owb/BAL/Base/wtf/Platform.h

    old new  
    105105#elif PLATFORM(DARWIN) && !defined(__OWBAL_PLATFORM_MACPORT__) 
    106106#define WTF_PLATFORM_MAC 1 
    107107#elif PLATFORM(WIN_OS) 
     108#ifndef __OWBAL_PLATFORM_WIN32PORT__ 
    108109#define WTF_PLATFORM_WIN 1 
     110#else 
     111#define WTF_PLATFORM_WIN 0 
     112#endif 
    109113#endif 
    110114 
    111115/* Graphics engines */ 
    …… 
    208212 
    209213/* multiple threads only supported on Mac for now */ 
    210214#if PLATFORM(MAC) || PLATFORM(WIN) 
     215#ifndef __OWBAL_PLATFORM_WIN32PORT__ 
    211216#define WTF_USE_MULTIPLE_THREADS 1 
     217#else 
     218#define WTF_USE_MULTIPLE_THREADS 0 
     219#endif 
    212220#endif 
    213221 
    214222/* for Unicode, KDE uses Qt */ 

  • versionPropre/Doduo_owb/BAL/OWBAL/Concretizations/Facilities/Posix/BCFileSystemPosix.cpp

    old new  
    3333#include "PlatformString.h" 
    3434 
    3535#include <sys/stat.h> 
     36#ifndef __OWBAL_PLATFORM_WIN32PORT__ 
    3637#include <libgen.h> 
    3738#include <unistd.h> 
     39#else 
     40#define rmdir rmdir_win 
     41bool rmdir_win(const char * t){ return 0;} 
     42#define F_OK 1 
     43bool access(const char * t,int i){ return true;} 
     44#define S_IRWXU 0 
     45bool mkdir(const char * t,int i){ return true;} 
     46const char* dirname(const char * t){ return t;} 
     47#endif 
    3848 
    3949namespace OWBAL { 
    4050 

  • versionPropre/Doduo_owb/BAL/WKAL/Concretizations/Events/SDL/BCPlatformKeyboardEventSDL.cpp

    old new  
    139139        case SDLK_DELETE: 
    140140            return "U+00007F"; 
    141141        default: 
     142#ifndef __OWBAL_PLATFORM_WIN32PORT__ 
    142143            return WebCore::String::format("U+%06X", WTF::Unicode::toUpper(keyCode)); 
     144#else 
     145                        return WebCore::String::format("U+%04X",WTF::Unicode::toUpper((unsigned short)keyCode)); 
     146#endif 
    143147    } 
    144148} 
    145149 
    …… 
    489493        case SDLK_RSUPER: 
    490494            return VK_RWIN; 
    491495        default: 
     496#ifndef __OWBAL_PLATFORM_WIN32PORT__ 
    492497            DS_WAR("ARGH!!! No virtual key!!!\n"); 
     498#endif 
    493499            return 0; 
    494500    } 
    495501} 
    …… 
    705711    WebCore::String aText(aSrc); 
    706712    WebCore::String aUnmodifiedText(aSrc); 
    707713    WebCore::String aKeyIdentifier = keyIdentifierForSDLKeyCode(event->keysym.sym); 
    708  
    709714    m_text = aText; 
    710715    m_unmodifiedText = aUnmodifiedText; 
    711716    m_keyIdentifier = aKeyIdentifier; 

  • versionPropre/Doduo_owb/BAL/WKAL/Concretizations/Graphics/SDL/BCGraphicsContextSDL.cpp

    old new  
    4646#include "SDL.h" 
    4747#include <SDL/SDL_gfxPrimitives.h> 
    4848#include <SDL/SDL_rotozoom.h> 
    49  
     49#ifdef __OWBAL_PLATFORM_WIN32PORT__ 
     50#define DS_WAR() void(0) 
     51typedef short int16_t; 
     52typedef int16_t         Sint16; 
     53typedef unsigned char uint8_t; 
     54typedef uint8_t         Uint8; 
     55extern "C" int lineRGBA(SDL_Surface * dst, Sint16 x1, Sint16 y1, Sint16 x2, Sint16 y2, Uint8 r, Uint8 g, Uint8 b, Uint8 a); 
     56extern "C" int ellipseRGBA(SDL_Surface * dst, Sint16 x, Sint16 y, Sint16 rx, Sint16 ry, Uint8 r, Uint8 g, Uint8 b, Uint8 a); 
     57extern "C" int rectangleRGBA(SDL_Surface * dst, Sint16 x1, Sint16 y1, Sint16 x2, Sint16 y2, Uint8 r, Uint8 g, Uint8 b, Uint8 a); 
     58extern "C" int filledPolygonRGBA(SDL_Surface * dst, const Sint16 * vx, const Sint16 * vy, int n, Uint8 r, Uint8 g, Uint8 b, Uint8 a); 
     59extern SDL_Surface *zoomSurface(SDL_Surface * src, double zoomx, double zoomy, int smooth); 
     60#endif 
    5061#ifndef M_PI 
    5162#define M_PI 3.14159265358979323846 
    5263#endif 

  • versionPropre/Doduo_owb/BAL/WKAL/Concretizations/Graphics/SDL/BCImageSDL.cpp

    old new  
    3636#include "SDL.h" 
    3737#include <SDL/SDL_gfxPrimitives.h> 
    3838#include <SDL/SDL_rotozoom.h> 
    39  
     39#ifdef __OWBAL_PLATFORM_WIN32PORT__ 
     40extern SDL_Surface *zoomSurface(SDL_Surface * src, double zoomx, double zoomy, int smooth); 
     41#endif 
    4042// This function loads resources from WebKit 
    4143Vector<char> loadResourceIntoArray(const char*); 
    4244 

  • versionPropre/Doduo_owb/BAL/WKAL/Concretizations/Graphics/SDL/BCIntPointSDL.cpp

    old new  
    2727 */ 
    2828#include "config.h" 
    2929#include "IntPoint.h" 
     30#ifndef __NOT_USE_DEEPSEE__ 
    3031#include DEEPSEE_INCLUDE 
     32#endif 
    3133#include "stdio.h" 
    3234 
    3335namespace WKAL { 

  • versionPropre/Doduo_owb/BAL/WKAL/Concretizations/Widgets/SDL/BCCursorSDL.cpp

    old new  
    6161{ 
    6262    int width = 16, height = 24; 
    6363    int i, row, col; 
     64#ifndef __OWBAL_PLATFORM_WIN32PORT__ 
    6465    Uint8 data[4 * height]; 
    6566    Uint8 mask[4 * height]; 
     67#else 
     68        Uint8 data[4 * 24]; 
     69    Uint8 mask[4 * 24]; 
     70#endif 
    6671    int hot_x, hot_y; 
    6772 
    6873    i = -1; 

  • versionPropre/Doduo_owb/BAL/WKAL/Concretizations/Widgets/SDL/BCPasteboardSDL.cpp

    old new  
    2727 */ 
    2828 
    2929#include "config.h" 
     30#ifdef __OWBAL_PLATFORM_WIN32PORT__ 
     31#include "Range.h" 
     32#endif 
    3033#include "Pasteboard.h" 
    3134 
    3235#include "CString.h" 

  • versionPropre/Doduo_owb/BAL/WKAL/Concretizations/Widgets/SDL/BCPlatformScreenSDL.cpp

    old new  
    3232 
    3333#include "Widget.h" 
    3434#include "SDL.h" 
     35#ifdef __OWBAL_PLATFORM_WIN32PORT__ 
     36#include <wtf/Assertions.h> 
     37#endif 
    3538 
    3639namespace WKAL { 
    3740 

  • versionPropre/Doduo_owb/CMakeLists.txt

    old new  
    4141# Global switch for OWBAL support for Mac port 
    4242OPTION (OWBAL_PLATFORM_MACPORT "OWBAL support for Mac port" OFF) 
    4343 
     44 
    4445# Global switch for OWBAL support for Graphics backend 
    4546SET (OWBAL_PLATFORM_GRAPHICS "GTK" CACHE STRING "Graphics support. (GTK/SDL)") 
    4647 
    …… 
    9798# Threading support 
    9899SET (WEBKIT_USE_THREADING "GTK" CACHE STRING "Threading support. (GTK/PTHREADS/NONE)") 
    99100 
     101# Global switch for OWBAL support for Mac port 
     102OPTION (OWBAL_PLATFORM_WIN32PORT "OWBAL support for Win32 port" OFF) 
     103 
     104# Global switch for WinLib directory 
     105SET (WINLIB_DIRECTORY "WINLIB" CACHE STRING "Compile WebKit with win32 Library/header.") 
     106 
     107IF (OWBAL_PLATFORM_WIN32PORT) 
     108        ADD_DEFINITIONS(-D __OWBAL_PLATFORM_WIN32PORT__) 
     109        ADD_DEFINITIONS(-D __NOT_USE_DEEPSEE__) 
     110ENDIF(OWBAL_PLATFORM_WIN32PORT) 
     111 
    100112INCLUDE (CMakeListsCustomer.txt OPTIONAL) 
    101113 
    102114####################################### 
    …… 
    171183        MESSAGE (SEND_ERROR "gthread-2.0 ${MESSAGE_NOT_FOUND}\n${MESSAGE_CHOOSE} gthread package.") 
    172184    ENDIF (NOT GTHREAD_FOUND) 
    173185ELSEIF (${OWBAL_PLATFORM_GRAPHICS} STREQUAL "SDL") 
     186        IF (NOT OWBAL_PLATFORM_WIN32PORT) 
    174187    PKG_CHECK_MODULES (SDL REQUIRED sdl) 
    175188    IF (NOT SDL_FOUND) 
    176         MESSAGE (SEND_ERROR "sdl ${MESSAGE_NOT_FOUND}\n${MESSAGE_CHOOSE} sdl library.") 
     189                MESSAGE (SEND_ERROR "sdl ${MESSAGE_NOT_FOUND}\n 
     190                ${MESSAGE_CHOOSE} sdl library.") 
    177191    ENDIF (NOT SDL_FOUND) 
     192        ENDIF (NOT OWBAL_PLATFORM_WIN32PORT) 
    178193ENDIF (${OWBAL_PLATFORM_GRAPHICS} STREQUAL "GTK") 
    179194 
    180195IF (WEBKIT_USE_DATABASE) 
    …… 
    234249ADD_DEFINITIONS (-DUSE_CONSERVATIVE_GC=0) 
    235250ADD_DEFINITIONS (-DD_MULTISCAN_FILES_SUPPORTED) 
    236251# FIXME: what about this flag and compilation for MAC or Win32? 
     252IF (NOT OWBAL_PLATFORM_WIN32PORT) 
    237253ADD_DEFINITIONS (-DLINUX) 
     254ELSEIF(NOT OWBAL_PLATFORM_WIN32PORT) 
     255ADD_DEFINITIONS (-DWIN32) 
     256ENDIF (NOT OWBAL_PLATFORM_WIN32PORT) 
     257 
    238258ADD_DEFINITIONS (-DWTF_CHANGES) 
    239259ADD_DEFINITIONS (-DUSE_SYSTEM_MALLOC) 
    240260ADD_DEFINITIONS (-DWTF_USE_ICU_UNICODE=1) 
    …… 
    277297ENDIF (WEBKIT_USE_CC_PIC) 
    278298 
    279299IF (NOT WEBKIT_USE_CC_EXCEPTIONS) 
     300IF (NOT OWBAL_PLATFORM_WIN32PORT) 
    280301    ADD_DEFINITIONS (-fno-exceptions) 
     302ENDIF  (NOT OWBAL_PLATFORM_WIN32PORT) 
    281303ENDIF (NOT WEBKIT_USE_CC_EXCEPTIONS) 
    282304 
    283305IF (NOT WEBKIT_USE_CC_RTTI) 
     306IF (NOT OWBAL_PLATFORM_WIN32PORT) 
    284307    ADD_DEFINITIONS (-fno-rtti) 
     308ELSEIF(NOT OWBAL_PLATFORM_WIN32PORT) 
     309        ADD_DEFINITIONS (-D/GR-) 
     310ENDIF  (NOT OWBAL_PLATFORM_WIN32PORT) 
    285311ENDIF (NOT WEBKIT_USE_CC_RTTI) 
    286312 
    287313IF (${WEBKIT_DEBUG} MATCHES "^DEBUG*") 
    288314    ADD_DEFINITIONS (-DENABLE_FTPDIR=1) 
     315IF (NOT OWBAL_PLATFORM_WIN32PORT) 
    289316    ADD_DEFINITIONS (-W) 
    290317    ADD_DEFINITIONS (-Wall) 
     318ENDIF  (NOT OWBAL_PLATFORM_WIN32PORT) 
    291319    ADD_DEFINITIONS (-DDEBUG_LAYOUTTEST) 
     320IF (NOT OWBAL_PLATFORM_WIN32PORT) 
    292321    ADD_DEFINITIONS (-g) 
     322ENDIF  (NOT OWBAL_PLATFORM_WIN32PORT) 
    293323    ADD_DEFINITIONS (-DBAL_LOG) 
     324IF (NOT OWBAL_PLATFORM_WIN32PORT) 
    294325    ADD_DEFINITIONS (-Wno-unused-parameter) 
    295326    ADD_DEFINITIONS (-Wno-unused-variable) 
     327ENDIF  (NOT OWBAL_PLATFORM_WIN32PORT) 
    296328ENDIF (${WEBKIT_DEBUG} MATCHES "^DEBUG*") 
    297329IF (${WEBKIT_DEBUG} STREQUAL "DEBUG_GCC3.X") 
    298330        ADD_DEFINITIONS (-funit-at-a-time) 
    …… 
    352384    ADD_DEFINITIONS (-DWTF_USE_BALI18N=1) 
    353385ENDIF (NOT ${WEBKIT_USE_I18N} STREQUAL "ICU") 
    354386 
    355 IF (NOT OWBAL_PLATFORM_MACPORT) 
     387IF (NOT OWBAL_PLATFORM_MACPORT OR NOT OWBAL_PLATFORM_WIN32PORT) 
    356388    ADD_DEFINITIONS (-pthread) 
    357 ENDIF (NOT OWBAL_PLATFORM_MACPORT) 
     389ENDIF (NOT OWBAL_PLATFORM_MACPORT OR NOT OWBAL_PLATFORM_WIN32PORT) 
    358390 
    359391IF (WEBKIT_OFFLINE_WEB_APPLICATIONS) 
    360392    ADD_DEFINITIONS (-DENABLE_OFFLINE_WEB_APPLICATIONS=1) 
    …… 
    364396####################################### 
    365397# DEEPSEE Stuff                       # 
    366398####################################### 
     399IF (NOT OWBAL_PLATFORM_WIN32PORT) 
    367400OPTION (DEEPSEE_USE_FAKED_DEEPSEE "Use an existing faked_deepsee.h" ON) 
    368401SET (DEEPSEE_USE_FAKED_DEEPSEE_PATH "BAL/Includes/FakedDeepsee.h" CACHE STRING "Define your faked_deepsee.h path and name" ) 
    369402#include DeepSee cmake commands if available 
    …… 
    377410        ADD_DEFINITIONS (-DOWB_FAILSAFE_WITHOUT_DEEPSEE) 
    378411    ENDIF (OWB_FAILSAFE_WITHOUT_DEEPSEE) 
    379412ENDIF (NOT DEEPSEE_ENABLE) 
    380  
     413ENDIF(NOT OWBAL_PLATFORM_WIN32PORT) 
    381414 
    382415MACRO (OWBLN _in_FILE _dest_DIR _keep _noLink ) 
    383416    EXECUTE_PROCESS (COMMAND ${CMAKE_SOURCE_DIR}/BAL/scripts/create_link.sh ${_in_FILE} ${_dest_DIR} ${_keep} ${CMAKE_CURRENT_SOURCE_DIR} ${_noLink} 

  • versionPropre/Doduo_owb/JavaScriptCore/wtf/Platform.h

    old new  
    3636 
    3737/* Operating systems - low-level dependencies */ 
    3838 
     39 
     40 
    3941/* PLATFORM(DARWIN) */ 
    4042/* Operating system level dependencies for Mac OS X / Darwin that should */ 
    4143/* be used regardless of operating environment */ 
    …… 
    101103#define WTF_PLATFORM_WIN 1 
    102104#endif 
    103105 
     106#ifdef __OWBAL_PLATFORM_WIN32PORT__ 
     107#define WTF_PLATFORM_WIN 0 
     108#endif 
    104109/* Graphics engines */ 
    105110 
    106111/* PLATFORM(CG) */ 

  • versionPropre/Doduo_owb/JavaScriptCore/wtf/RetainPtr.h

    old new  
    2424#define RetainPtr_h 
    2525 
    2626#include <algorithm> 
     27#ifndef __OWBAL_PLATFORM_WIN32PORT__ 
    2728#include <CoreFoundation/CoreFoundation.h> 
     29#endif 
    2830 
    2931#ifdef __OBJC__ 
    3032#import <Foundation/Foundation.h> 

  • versionPropre/Doduo_owb/WebCore/bindings/js/JSEventCustom.cpp

    old new  
    5454#include "XMLHttpRequestProgressEvent.h" 
    5555#include "kjs_events.h" 
    5656 
     57#ifdef __OWBAL_PLATFORM_WIN32PORT__ 
     58#define ENABLE_DOM_STORAGE 0 
     59#endif 
     60 
    5761#if ENABLE(DOM_STORAGE) 
    5862#include "JSStorageEvent.h" 
    5963#include "StorageEvent.h" 

  • versionPropre/Doduo_owb/WebCore/bridge/bal/bal_class.cpp

    old new  
    3030#include "config.h" 
    3131#include "identifier.h" 
    3232 
     33 
     34#include "bal_runtime.h" 
    3335#include "bal_class.h" 
    3436#include "bal_instance.h" 
    3537#include "bal_runtime.h" 
    36  
    3738#include <bal_object.h> 
    3839 
    3940namespace KJS { 

  • versionPropre/Doduo_owb/WebCore/bridge/bal/bal_class.h

    old new  
    5555public: 
    5656    static BalClass* classForObject(BalObject*); 
    5757    virtual ~BalClass(); 
    58  
    5958    virtual const char* name() const; 
    6059    virtual MethodList methodsNamed(const Identifier&, Instance*) const; 
    6160    virtual Field* fieldNamed(const Identifier&, Instance*) const; 

  • versionPropre/Doduo_owb/WebCore/bridge/bal/bal_instance.cpp

    old new  
    2727 */ 
    2828 
    2929#include "config.h" 
     30#ifdef __OWBAL_PLATFORM_WIN32PORT__ 
     31#include "bal_runtime.h" 
     32#include "StringExtras.h" 
     33#endif 
    3034#include "bal_instance.h" 
    3135 
    3236#include "bal_class.h" 
    33 #include "bal_runtime.h" 
    34 #include "list.h" 
    3537 
    36 #include "bal_object.h" 
     38#include "list.h" 
     39# 
     40#include <bal_object.h> 
    3741#include "balValuePrivate.h" 
     42#include "bal_runtime.h" 
     43#include "runtime_object.h" 
     44#include "jsglobalobject.h" 
    3845#include "wtf/HashMap.h" 
    3946#include "object_object.h" 
    4047 
    …… 
    169176 
    170177    BalValue *val = m_object->invoke(ident, cArgs); 
    171178    cArgs.clear(); 
    172  
    173179    return val->d->getValue(); 
     180    
    174181} 
    175182 
    176183 
    …… 
    193200JSValue* BalInstance::stringValue() const 
    194201{ 
    195202    char buf[1024]; 
     203 
    196204    snprintf(buf, sizeof(buf), "BalObject %p (%s)", m_object, m_class->name()); 
    197205    return jsString(buf); 
    198206} 

  • versionPropre/Doduo_owb/WebCore/bridge/bal/bal_instance.h

    old new  
    9090    virtual BindingLanguage getBindingLanguage() const { return BalLanguage; } 
    9191    static JSObject* getRuntimeObject(PassRefPtr<BalInstance>); 
    9292private: 
    93     BalInstance(BalObject*, PassRefPtr<RootObject>); 
    9493 
     94        BalInstance(BalObject*, PassRefPtr<RootObject>); 
    9595    mutable BalClass* m_class; 
    9696    BalObject *m_object; 
    9797}; 

  • versionPropre/Doduo_owb/WebCore/bridge/bal/bal_runtime.h

    old new  
    4242#define BINDINGS_BAL_RUNTIME_H_ 
    4343 
    4444#include "runtime.h" 
     45 
    4546#include "bal_object.h" 
    4647 
    4748namespace KJS { 

  • versionPropre/Doduo_owb/WebCore/config.h

    old new  
    9090#define AVOID_STATIC_CONSTRUCTORS 1 
    9191#endif 
    9292 
     93#ifdef __OWBAL_PLATFORM_WIN32PORT__ 
     94#define WTF_PLATFORM_CG 0 
     95#define WTF_USE_CFNETWORK 0 
     96#define WTF_PLATFORM_CF 0 
     97#endif 
     98 
    9399#if PLATFORM(WIN) 
    94100#define WTF_USE_JAVASCRIPTCORE_BINDINGS 1 
    95 #define WTF_PLATFORM_CG 1 
    96101#undef WTF_PLATFORM_CAIRO 
    97 #define WTF_USE_CFNETWORK 1 
    98102#undef WTF_USE_WININET 
     103#define WTF_PLATFORM_CG 1 
     104#define WTF_USE_CFNETWORK 1 
    99105#define WTF_PLATFORM_CF 1 
    100106#define WTF_USE_PTHREADS 0 
    101107#endif 

  • versionPropre/Doduo_owb/WebCore/dom/EventNames.h

    old new  
    2121 
    2222#ifndef EventNames_h 
    2323#define EventNames_h 
    24  
    2524#include "AtomicString.h" 
    2625 
     26 
    2727namespace WebCore { namespace EventNames { 
    2828 
    2929#define DOM_EVENT_NAMES_FOR_EACH(macro) \ 

  • versionPropre/Doduo_owb/WebCore/html/CanvasPattern.h

    old new  
    2525 
    2626#ifndef CanvasPattern_h 
    2727#define CanvasPattern_h 
    28  
     28#ifdef __OWBAL_PLATFORM_WIN32PORT__ 
     29#include "config.h" 
     30#define WTF_PLATFORM_CG 0 
     31#define WTF_USE_CFNETWORK 0 
     32#define WTF_PLATFORM_CF 0 
     33#define WTF_PLATFORM_WIN 0 
     34#define WTF_PLATFORM_CAIRO 0 
     35#endif 
    2936#include "CachedResourceClient.h" 
    3037#include <wtf/PassRefPtr.h> 
    3138#include <wtf/RefCounted.h> 

  • versionPropre/Doduo_owb/WebCore/loader/FTPDirectoryDocument.cpp

    old new  
    3939#include "SharedBuffer.h" 
    4040#include "Text.h" 
    4141 
     42#ifdef __OWBAL_PLATFORM_WIN32PORT__ 
     43#define localtime_r(x,y) localtime_s(y,x) 
     44#endif 
     45 
    4246// On Win, the threadsafe *_r functions need to be gotten from pthreads.   
    4347#if COMPILER(MSVC) && USE(PTHREADS)  
    4448#include <pthread.h>  

  • versionPropre/Doduo_owb/WebCore/loader/FTPDirectoryParser.cpp

    old new  
    2424#if ENABLE(FTPDIR) 
    2525#include "FTPDirectoryParser.h" 
    2626 
     27#ifdef __OWBAL_PLATFORM_WIN32PORT__ 
     28#define gmtime_r(x,y)   gmtime_s(y,x) 
     29#endif 
     30 
    2731// On Win, the threadsafe *_r functions need to be gotten from pthreads.  
    2832#if COMPILER(MSVC) && USE(PTHREADS) 
    2933#include <pthread.h> 

  • versionPropre/Doduo_owb/WebCore/page/ContextMenuController.cpp

    old new  
    5555#include "TextIterator.h" 
    5656#include "WindowFeatures.h" 
    5757#include "markup.h" 
     58#ifdef __OWBAL_PLATFORM_WIN32PORT__ 
     59#define WTF_PLATFORM_GTK 0 
     60#define WTF_PLATFORM_BAL 0 
     61#endif 
    5862 
    5963namespace WebCore { 
    6064 

  • versionPropre/Doduo_owb/WebCore/page/EventHandler.h

    old new  
    2929#include "DragActions.h" 
    3030#include "FocusDirection.h" 
    3131#include "PlatformMouseEvent.h" 
    32 #include "ScrollTypes.h" 
    3332#include "Timer.h" 
    34 #include <wtf/Forward.h> 
     33#include "ScrollTypes.h" 
    3534#include <wtf/Noncopyable.h> 
    36 #include <wtf/Platform.h> 
    3735#include <wtf/RefPtr.h> 
     36#include <wtf/Forward.h> 
     37#include <wtf/Platform.h> 
    3838 
    3939#if PLATFORM(MAC) 
    4040#include "WebCoreKeyboardUIMode.h" 

  • versionPropre/Doduo_owb/WebCore/page/FrameView.cpp

    old new  
    328328    // Protect the view from being deleted during layout (in recalcStyle) 
    329329    RefPtr<FrameView> protector(this); 
    330330 
     331int i=9; 
     332 
    331333    if (!m_frame) { 
    332334        // FIXME: Do we need to set m_size.width here? 
    333335        // FIXME: Should we set m_size.height here too? 
    …… 
    335337        return; 
    336338    } 
    337339     
     340i += (int) &m_frame; 
     341if(!i) 
     342  return; 
     343 
    338344    // we shouldn't enter layout() while painting 
    339345    ASSERT(!m_frame->isPainting()); 
    340346    if (m_frame->isPainting()) 

  • versionPropre/Doduo_owb/WebCore/page/FrameView.h

    old new  
    147147#if PLATFORM(WIN) || PLATFORM(GTK) || PLATFORM(QT) || PLATFORM(BAL) 
    148148    void layoutIfNeededRecursive(); 
    149149#endif 
    150  
    151150private: 
    152151    void init(); 
    153152 

  • versionPropre/Doduo_owb/WebCore/page/Page.h

    old new  
    2626#include "ContextMenuController.h" 
    2727#include "FrameLoaderTypes.h" 
    2828#include "PlatformString.h" 
     29#include <wtf/HashSet.h> 
     30#include <wtf/OwnPtr.h> 
    2931#if PLATFORM(MAC) 
    3032#include "SchedulePair.h" 
    3133#endif 
    32 #include <wtf/HashSet.h> 
    33 #include <wtf/OwnPtr.h> 
     34 
    3435 
    3536#if PLATFORM(WIN) || (PLATFORM(WX) && PLATFORM(WIN_OS))  
    3637typedef struct HINSTANCE__* HINSTANCE; 

  • versionPropre/Doduo_owb/WebCore/platform/ContextMenuItem.h

    old new  
    2626#ifndef ContextMenuItem_h 
    2727#define ContextMenuItem_h 
    2828 
     29#ifdef __OWBAL_PLATFORM_WIN32PORT__ 
     30#define WTF_PLATFORM_CG 0 
     31#define WTF_USE_CFNETWORK 0 
     32#define WTF_PLATFORM_CF 0 
     33#define WTF_PLATFORM_WIN 0 
     34#include "baltypesdl.h" 
     35#include "BALbase.h" 
     36 
     37#endif 
     38 
    2939#include "PlatformMenuDescription.h" 
    3040#include "PlatformString.h" 
    3141#include <wtf/OwnPtr.h> 
    3242 
     43 
    3344#if PLATFORM(MAC) 
    3445#include <wtf/RetainPtr.h> 
    3546 
    …… 
    170181#elif PLATFORM(WX) 
    171182    typedef wxMenuItem* PlatformMenuItemDescription; 
    172183#endif 
     184#ifdef __OWBAL_PLATFORM_WIN32PORT__ 
     185struct PlatformMenuItemDescription { 
     186        PlatformMenuItemDescription() 
     187            : type(ActionType) 
     188            , action(ContextMenuItemTagNoAction) 
     189            , subMenu(0) 
     190            , checked(false) 
     191            , enabled(true) 
     192        {} 
    173193 
     194        ContextMenuItemType type; 
     195        ContextMenuAction action; 
     196        String title; 
     197        void* subMenu; 
     198        bool checked; 
     199        bool enabled; 
     200    }; 
     201#endif 
    174202    class ContextMenuItem { 
    175203    public: 
    176204        ContextMenuItem(PlatformMenuItemDescription); 

  • versionPropre/Doduo_owb/WebCore/platform/Cursor.h

    old new  
    2828 
    2929#include <wtf/Platform.h> 
    3030 
     31#ifdef __OWBAL_PLATFORM_WIN32PORT__ 
     32#define WTF_PLATFORM_CG 0 
     33#define WTF_USE_CFNETWORK 0 
     34#define WTF_PLATFORM_CF 0 
     35#define WTF_PLATFORM_WIN 0 
     36#include "BALbase.h" 
     37#endif 
     38 
    3139#if PLATFORM(WIN) 
    3240typedef struct HICON__* HICON; 
    3341typedef HICON HCURSOR; 
    …… 
    7785#elif PLATFORM(WX) 
    7886    typedef wxCursor* PlatformCursor; 
    7987#else 
     88#ifndef __OWBAL_PLATFORM_WIN32PORT__ 
    8089    typedef void* PlatformCursor; 
    8190#endif 
     91#endif 
    8292 
    8393    class Cursor { 
    8494    public: 
    …… 
    8797        : m_impl(0) 
    8898#endif 
    8999        { } 
    90  
    91100        Cursor(Image*, const IntPoint& hotspot); 
    92101        Cursor(const Cursor&); 
    93102        ~Cursor(); 

  • versionPropre/Doduo_owb/WebCore/platform/DragImage.h

    old new  
    2929#include "IntSize.h" 
    3030#include "FloatSize.h" 
    3131 
     32#ifdef __OWBAL_PLATFORM_WIN32PORT__ 
     33#include "baltypesdl.h" 
     34#define WTF_PLATFORM_CG 0 
     35#define WTF_USE_CFNETWORK 0 
     36#define WTF_PLATFORM_CF 0 
     37#define WTF_PLATFORM_WIN 0 
     38#endif 
     39 
    3240#if PLATFORM(MAC) 
    3341#include <wtf/RetainPtr.h> 
    3442#ifdef __OBJC__ 
    …… 
    7078    typedef void* DragImageRef; 
    7179#endif 
    7280     
     81 
    7382    IntSize dragImageSize(DragImageRef); 
    7483     
    7584    //These functions should be memory neutral, eg. if they return a newly allocated image,  

  • versionPropre/Doduo_owb/WebCore/platform/FileSystem.h

    old new  
    3030#ifndef FileSystem_h 
    3131#define FileSystem_h 
    3232 
     33#ifdef __OWBAL_PLATFORM_WIN32PORT__ 
     34#define WTF_PLATFORM_WIN 0 
     35#endif 
     36 
    3337#if PLATFORM(GTK) 
    3438#include <gmodule.h> 
    3539#endif 

  • versionPropre/Doduo_owb/WebCore/platform/NotImplemented.h

    old new  
    2727#define NotImplemented_h 
    2828 
    2929#include "Logging.h" 
     30#ifndef __OWBAL_PLATFORM_WIN32PORT__ 
    3031#include <Assertions.h> 
     32#endif 
    3133 
    3234#if PLATFORM(GTK) 
    3335    #define supressNotImplementedWarning() getenv("DISABLE_NI_WARNING") 

  • versionPropre/Doduo_owb/WebCore/platform/Pasteboard.h

    old new  
    120120#if PLATFORM(QT) 
    121121    bool m_selectionMode; 
    122122#endif 
     123 
    123124}; 
    124125 
    125126} // namespace WebCore 

  • versionPropre/Doduo_owb/WebCore/platform/PlatformMenuDescription.h

    old new  
    4242class wxMenu; 
    4343#endif 
    4444 
     45 
    4546namespace WebCore { 
    4647 
    4748#if PLATFORM(MAC) 
    …… 
    5657#elif PLATFORM(WX) 
    5758    typedef wxMenu* PlatformMenuDescription; 
    5859#endif 
     60#ifdef __OWBAL_PLATFORM_WIN32PORT__ 
     61        typedef void* PlatformMenuDescription; 
     62#endif 
     63 
    5964 
    6065} // namespace 
    6166 

  • versionPropre/Doduo_owb/WebCore/platform/PlatformMouseEvent.h

    old new  
    2929#include "IntPoint.h" 
    3030#include <wtf/Platform.h> 
    3131 
     32 
    3233#if PLATFORM(MAC) 
    3334#ifdef __OBJC__ 
    3435@class NSEvent; 

  • versionPropre/Doduo_owb/WebCore/platform/PlatformWheelEvent.h

    old new  
    2828 
    2929#include "IntPoint.h" 
    3030 
     31 
    3132#if PLATFORM(MAC) 
    3233#ifdef __OBJC__ 
    3334@class NSEvent; 
    …… 
    100101#if PLATFORM(WX) 
    101102        PlatformWheelEvent(const wxMouseEvent&, const wxPoint&); 
    102103#endif 
    103  
    104104    private: 
    105105        IntPoint m_position; 
    106106        IntPoint m_globalPosition; 

  • versionPropre/Doduo_owb/WebCore/platform/PopupMenu.h

    old new  
    2727#include "PopupMenuClient.h" 
    2828#include <wtf/PassRefPtr.h> 
    2929 
     30#ifdef __OWBAL_PLATFORM_WIN32PORT__ 
     31#define WTF_PLATFORM_CG 0 
     32#define WTF_USE_CFNETWORK 0 
     33#define WTF_PLATFORM_CF 0 
     34#define WTF_PLATFORM_WIN 0 
     35#endif 
     36 
    3037#if PLATFORM(MAC) 
    3138#include <wtf/RetainPtr.h> 
    3239#ifdef __OBJC__ 
    …… 
    7279                , public wxEvtHandler 
    7380#endif 
    7481{ 
     82 
    7583public: 
    7684    static PassRefPtr<PopupMenu> create(PopupMenuClient* client) { return new PopupMenu(client); } 
    7785    ~PopupMenu(); 
    78      
    7986    void disconnectClient() { m_popupClient = 0; } 
    8087 
    8188    void show(const IntRect&, FrameView*, int index); 
    …… 
    8693    PopupMenuClient* client() const { return m_popupClient; } 
    8794 
    8895    static bool itemWritingDirectionIsNatural(); 
    89  
    9096#if PLATFORM(WIN) 
    9197    PlatformScrollbar* scrollBar() const { return m_scrollBar.get(); } 
    9298 
    …… 
    176182    void OnMenuItemSelected(wxCommandEvent&); 
    177183#endif 
    178184 
     185 
    179186}; 
    180187 
    181188} 

  • versionPropre/Doduo_owb/WebCore/platform/ScrollView.h

    old new  
    2727#define ScrollView_h 
    2828 
    2929#include "IntRect.h" 
    30 #include "ScrollTypes.h" 
    3130#include "Widget.h" 
     31 
     32 
     33#include "ScrollTypes.h" 
     34 
    3235#include <wtf/HashSet.h> 
    3336 
    3437#if PLATFORM(MAC) && defined __OBJC__ 
    …… 
    195198    public: 
    196199        void setGtkAdjustments(GtkAdjustment* hadj, GtkAdjustment* vadj); 
    197200#endif 
    198  
    199201#if PLATFORM(WX) 
    200202    public: 
    201203        virtual void setNativeWindow(wxWindow*); 

  • versionPropre/Doduo_owb/WebCore/platform/SharedBuffer.h

    old new  
    3030#include <wtf/Forward.h> 
    3131#include <wtf/Vector.h> 
    3232 
     33#ifdef __OWBAL_PLATFORM_WIN32PORT__ 
     34#define WTF_PLATFORM_CF 0 
     35#endif 
     36 
    3337#if PLATFORM(CF) 
    3438#include <wtf/RetainPtr.h> 
    3539#endif 

  • versionPropre/Doduo_owb/WebCore/platform/SharedTimer.h

    old new  
    3838 
    3939    void setSharedTimerFireTime(double fireTime); 
    4040    void stopSharedTimer(); 
     41        void fireTimerIfNeeded(); 
    4142 
    4243} 
    4344 

  • versionPropre/Doduo_owb/WebCore/platform/Timer.h

    old new  
    3737 
    3838class TimerBase : Noncopyable { 
    3939public: 
    40     TimerBase(); 
    41     virtual ~TimerBase(); 
    4240 
    4341    void start(double nextFireInterval, double repeatInterval); 
    44  
     42        TimerBase(); 
     43    virtual ~TimerBase(); 
     44        void stop(); 
     45        bool isActive() const; 
     46        double nextFireInterval() const; 
     47        static void fireTimersInNestedEventLoop(); 
    4548    void startRepeating(double repeatInterval) { start(repeatInterval, repeatInterval); } 
    4649    void startOneShot(double interval) { start(interval, 0); } 
    4750 
    48     void stop(); 
    49     bool isActive() const; 
    5051 
    51     double nextFireInterval() const; 
    5252    double repeatInterval() const { return m_repeatInterval; } 
    5353 
    5454    void augmentRepeatInterval(double delta) { setNextFireTime(m_nextFireTime + delta); m_repeatInterval += delta; } 
    5555 
    56     static void fireTimersInNestedEventLoop(); 
     56     
    5757 
    5858private: 
    5959    virtual void fired() = 0; 
    6060 
    6161    void checkConsistency() const; 
    6262    void checkHeapIndex() const; 
    63  
    6463    void setNextFireTime(double); 
    65  
    6664    bool inHeap() const { return m_heapIndex != -1; } 
    6765 
    6866    void heapDecreaseKey(); 
    …… 
    105103// Set to true to prevent any timers from firing. 
    106104// When set back to false, timers that were deferred will fire. 
    107105bool isDeferringTimers(); 
     106 
    108107void setDeferringTimers(bool); 
    109108 
    110109} 

  • versionPropre/Doduo_owb/WebCore/platform/graphics/AffineTransform.h

    old new  
    2626#ifndef AffineTransform_h 
    2727#define AffineTransform_h 
    2828 
     29#ifdef __OWBAL_PLATFORM_WIN32PORT__ 
     30#define WTF_PLATFORM_CG 0 
     31#define WTF_USE_CFNETWORK 0 
     32#define WTF_PLATFORM_CF 0 
     33#define WTF_PLATFORM_WIN 0 
     34#define WTF_PLATFORM_CAIRO 0 
     35#endif 
     36 
    2937#if PLATFORM(CG) 
    3038#include <CoreGraphics/CGAffineTransform.h> 
    3139#elif PLATFORM(QT) 
    3240#include <QMatrix> 
    3341#elif PLATFORM(CAIRO) 
     42#ifndef __OWBAL_PLATFORM_WIN32PORT__ 
    3443#include <cairo.h> 
     44#endif 
    3545#elif PLATFORM(WX) && USE(WXGC) 
    3646#include <wx/defs.h> 
    3747#include <wx/graphics.h> 
    …… 
    110120#elif PLATFORM(QT) 
    111121    operator QMatrix() const; 
    112122#elif PLATFORM(CAIRO) 
     123#ifndef __OWBAL_PLATFORM_WIN32PORT__ 
    113124    operator cairo_matrix_t() const; 
     125#endif 
    114126#elif PLATFORM(WX) && USE(WXGC) 
    115127    operator wxGraphicsMatrix() const; 
    116128#endif 
    …… 
    126138#elif PLATFORM(QT) 
    127139    QMatrix m_transform; 
    128140#elif PLATFORM(CAIRO) 
     141#ifndef __OWBAL_PLATFORM_WIN32PORT__ 
    129142    cairo_matrix_t m_transform; 
     143#endif 
    130144#elif PLATFORM(WX) && USE(WXGC) 
    131145    wxGraphicsMatrix m_transform; 
    132146#endif 

  • versionPropre/Doduo_owb/WebCore/platform/graphics/GraphicsContextPrivate.h

    old new  
    4141            , shadowBlur(0) 
    4242        { 
    4343        } 
    44  
    4544        Font font; 
    4645        StrokeStyle strokeStyle; 
    4746        float strokeThickness; 

  • versionPropre/Doduo_owb/WebCore/platform/graphics/Image.h

    old new  
    3434#include <wtf/PassRefPtr.h> 
    3535#include "SharedBuffer.h" 
    3636 
     37#ifdef __OWBAL_PLATFORM_WIN32PORT__ 
     38#define WTF_PLATFORM_CG 0 
     39#define WTF_USE_CFNETWORK 0 
     40#define WTF_PLATFORM_CF 0 
     41#define WTF_PLATFORM_WIN 0 
     42#endif 
     43 
     44 
    3745#if PLATFORM(MAC) 
    3846#ifdef __OBJC__ 
    3947@class NSImage; 

  • versionPropre/Doduo_owb/WebCore/platform/graphics/ImageSource.h

    old new  
    2828 
    2929#include <wtf/Noncopyable.h> 
    3030#include <wtf/Vector.h> 
     31#ifdef __OWBAL_PLATFORM_WIN32PORT__ 
     32#include "baltypesdl.h" 
     33#endif 
    3134 
    3235#if PLATFORM(WX) 
    3336class wxBitmap; 
    …… 
    6568#else 
    6669class ImageDecoder; 
    6770typedef ImageDecoder* NativeImageSourcePtr; 
     71#ifndef __OWBAL_PLATFORM_WIN32PORT__ 
    6872typedef cairo_surface_t* NativeImagePtr; 
     73#else 
     74typedef SDL_Surface* NativeImagePtr; 
     75#endif 
     76 
    6977#endif 
    7078 
    7179const int cAnimationLoopOnce = -1; 

  • versionPropre/Doduo_owb/WebCore/platform/graphics/IntPoint.h

    old new  
    2929#include "IntSize.h" 
    3030#include <wtf/Platform.h> 
    3131 
     32#ifdef __OWBAL_PLATFORM_WIN32PORT__ 
     33#include "baltypesdl.h" 
     34#endif 
     35 
    3236#if PLATFORM(CG) 
    3337typedef struct CGPoint CGPoint; 
    3438#endif 
    …… 
    6367 
    6468class IntPoint { 
    6569public: 
     70         
    6671    IntPoint() : m_x(0), m_y(0) { } 
    6772    IntPoint(int x, int y) : m_x(x), m_y(y) { } 
    6873 
    …… 
    106111    operator wxPoint() const; 
    107112#endif 
    108113 
     114 
     115 
    109116private: 
    110117    int m_x, m_y; 
    111118}; 
    …… 
    122129    return a; 
    123130} 
    124131 
    125 inline IntPoint operator+(const IntPoint& a, const IntSize& b) 
    126 { 
    127     return IntPoint(a.x() + b.width(), a.y() + b.height()); 
    128 } 
    129132 
    130133inline IntSize operator-(const IntPoint& a, const IntPoint& b) 
    131134{ 
    …… 
    136139{ 
    137140    return IntPoint(a.x() - b.width(), a.y() - b.height()); 
    138141} 
     142inline IntPoint operator+(const IntPoint& a, const IntSize& b) 
     143{ 
     144    return IntPoint(a.x() + b.width(), a.y() + b.height()); 
     145} 
    139146 
    140147inline bool operator==(const IntPoint& a, const IntPoint& b) 
    141148{ 

  • versionPropre/Doduo_owb/WebCore/platform/graphics/IntRect.h

    old new  
    2929#include "IntPoint.h" 
    3030#include <wtf/Platform.h> 
    3131 
     32#ifdef __OWBAL_PLATFORM_WIN32PORT__ 
     33#include "baltypesdl.h" 
     34#endif 
     35 
    3236#if PLATFORM(CG) 
    3337typedef struct CGRect CGRect; 
    3438#endif 
    …… 
    127131    } 
    128132    void inflate(int d) { inflateX(d); inflateY(d); } 
    129133    void scale(float s); 
    130  
    131134#if PLATFORM(WX) 
    132135    IntRect(const wxRect&); 
    133136    operator wxRect() const; 

  • versionPropre/Doduo_owb/WebCore/platform/graphics/SimpleFontData.h

    old new  
    117117#if PLATFORM(WX) 
    118118    wxFont getWxFont() const { return m_font.font(); } 
    119119#endif 
    120  
    121120private: 
    122121    void platformInit(); 
    123122    void platformDestroy(); 

  • versionPropre/Doduo_owb/WebCore/platform/graphics/win/FontCustomPlatformData.h

    old new  
    2323 
    2424#include "FontRenderingMode.h" 
    2525#include <wtf/Noncopyable.h> 
     26#ifdef __OWBAL_PLATFORM_WIN32PORT__ 
     27typedef void* HANDLE; 
     28#endif 
    2629 
    2730typedef struct CGFont* CGFontRef; 
    2831 
    …… 
    4447 
    4548    CGFontRef m_cgFont; 
    4649    HANDLE m_fontReference; 
     50 
    4751}; 
    4852 
    4953FontCustomPlatformData* createFontCustomPlatformData(SharedBuffer*); 

  • versionPropre/Doduo_owb/WebCore/platform/graphics/win/FontPlatformData.h

    old new  
    2424#ifndef FontPlatformData_H 
    2525#define FontPlatformData_H 
    2626 
     27#ifdef __OWBAL_PLATFORM_WIN32PORT__ 
     28#define WTF_PLATFORM_CG 0 
     29#define WTF_USE_CFNETWORK 0 
     30#define WTF_PLATFORM_CF 0 
     31#define WTF_PLATFORM_WIN 0 
     32#define WTF_PLATFORM_CAIRO 0 
     33#include "BALbase.h" 
     34#endif 
     35 
    2736#include "StringImpl.h" 
    2837#include <wtf/RetainPtr.h> 
    2938#include <wtf/Refcounted.h> 
    30  
    3139#if PLATFORM(CAIRO) 
    3240#include <cairo-win32.h> 
    3341#endif 
    3442 
     43#ifdef __OWBAL_PLATFORM_WIN32PORT__ 
     44#define WTF_PLATFORM_CG 0 
     45#define WTF_USE_CFNETWORK 0 
     46#define WTF_PLATFORM_CF 0 
     47#define WTF_PLATFORM_WIN 0 
     48#define WTF_PLATFORM_CAIRO 0 
     49#include "BALbase.h" 
     50#endif 
     51 
    3552typedef struct HFONT__* HFONT; 
    3653typedef struct CGFont* CGFontRef; 
    3754 
    …… 
    6582#endif 
    6683    ~FontPlatformData(); 
    6784