Changeset 60830 in webkit


Ignore:
Timestamp:
Jun 8, 2010 1:35:10 AM (14 years ago)
Author:
eric@webkit.org
Message:

2010-06-08 Kwang Yul Seo <​skyul@company100.net>

Reviewed by Adam Barth.

Change OwnPtrCommon to include platform-specific headers
​https://bugs.webkit.org/show_bug.cgi?id=40279

Adding new type to OwnPtrCommon needlessly causes all ports to do full rebuilds.
Change OwnPtrCommon to include platform-specific headers to avoid all ports rebuilds.

  • JavaScriptCore.vcproj/WTF/WTF.vcproj:
  • wtf/OwnPtrCommon.h:
  • wtf/brew/OwnPtrBrew.h: Added.
  • wtf/win/OwnPtrWin.h: Added.
Location:
trunk/JavaScriptCore
Files:
3 edited
2 copied

Legend:

Unmodified
Added
Removed

  • trunk/JavaScriptCore/ChangeLog

    r60820 r60830  
     12010-06-08  Kwang Yul Seo  <skyul@company100.net>
     2
     3        Reviewed by Adam Barth.
     4
     5        Change OwnPtrCommon to include platform-specific headers
     6        https://bugs.webkit.org/show_bug.cgi?id=40279
     7
     8        Adding new type to OwnPtrCommon needlessly causes all ports to do full rebuilds.
     9        Change OwnPtrCommon to include platform-specific headers to avoid all ports rebuilds.
     10
     11        * JavaScriptCore.vcproj/WTF/WTF.vcproj:
     12        * wtf/OwnPtrCommon.h:
     13        * wtf/brew/OwnPtrBrew.h: Added.
     14        * wtf/win/OwnPtrWin.h: Added.
     15
    1162010-06-07  MORITA Hajime  <morrita@google.com>
    217       

  • trunk/JavaScriptCore/JavaScriptCore.vcproj/WTF/WTF.vcproj

    r59187 r60830  
    244244                                >
    245245                        </File>
     246                        <File
     247                                RelativePath="..\..\wtf\win\OwnPtrWin.h"
     248                                >
     249                        </File>
    246250                </Filter>
    247251                <File

  • trunk/JavaScriptCore/wtf/OwnPtrCommon.h

    r60787 r60830  
    2929#define WTF_OwnPtrCommon_h
    3030
    31 #if PLATFORM(WIN)
    32 typedef struct HBITMAP__* HBITMAP;
    33 typedef struct HBRUSH__* HBRUSH;
    34 typedef struct HDC__* HDC;
    35 typedef struct HFONT__* HFONT;
    36 typedef struct HPALETTE__* HPALETTE;
    37 typedef struct HPEN__* HPEN;
    38 typedef struct HRGN__* HRGN;
    39 #endif
    40 
    41 #if PLATFORM(BREWMP)
    42 // Forward delcarations at this point avoid the need to include BREW includes
    43 // in WTF headers.
    44 typedef struct _ISocket ISocket;
    45 typedef struct _IFileMgr IFileMgr;
    46 typedef struct _IFile IFile;
    47 typedef struct IBitmap IBitmap;
    48 typedef struct ISSL ISSL;
    49 #endif
    50 
    5131namespace WTF {
    5232
    … …  
    5838    }
    5939
    60 #if PLATFORM(WIN)
    61     void deleteOwnedPtr(HBITMAP);
    62     void deleteOwnedPtr(HBRUSH);
    63     void deleteOwnedPtr(HDC);
    64     void deleteOwnedPtr(HFONT);
    65     void deleteOwnedPtr(HPALETTE);
    66     void deleteOwnedPtr(HPEN);
    67     void deleteOwnedPtr(HRGN);
     40} // namespace WTF
     41
     42#if PLATFORM(BREWMP)
     43#include <wtf/brew/OwnPtrBrew.h>
     44#elif PLATFORM(WIN)
     45#include <wtf/win/OwnPtrWin.h>
    6846#endif
    6947
    70 #if PLATFORM(BREWMP)
    71     void deleteOwnedPtr(IFileMgr*);
    72     void deleteOwnedPtr(IFile*);
    73     void deleteOwnedPtr(IBitmap*);
    74     void deleteOwnedPtr(ISSL*);
    75     void deleteOwnedPtr(ISocket*);
    76 #endif
    77 
    78 } // namespace WTF
    79 
    8048#endif // WTF_OwnPtrCommon_h

  • trunk/JavaScriptCore/wtf/brew/OwnPtrBrew.h

    r60828 r60830  
    11/*
    2  * Copyright (C) 2009 Apple Inc. All rights reserved.
    3  * Copyright (C) 2009 Torch Mobile, Inc.
    4  * Copyright (C) 2010 Company 100 Inc.
     2 * Copyright (C) 2010 Company 100 Inc. All rights reserved.
    53 *
    64 * Redistribution and use in source and binary forms, with or without
    … …  
    2624 */
    2725
    28 #ifndef WTF_OwnPtrCommon_h
    29 #define WTF_OwnPtrCommon_h
     26#ifndef OwnPtrBrew_h
     27#define OwnPtrBrew_h
    3028
    31 #if PLATFORM(WIN)
    32 typedef struct HBITMAP__* HBITMAP;
    33 typedef struct HBRUSH__* HBRUSH;
    34 typedef struct HDC__* HDC;
    35 typedef struct HFONT__* HFONT;
    36 typedef struct HPALETTE__* HPALETTE;
    37 typedef struct HPEN__* HPEN;
    38 typedef struct HRGN__* HRGN;
    39 #endif
    40 
    41 #if PLATFORM(BREWMP)
    4229// Forward delcarations at this point avoid the need to include BREW includes
    4330// in WTF headers.
    … …  
    4734typedef struct IBitmap IBitmap;
    4835typedef struct ISSL ISSL;
    49 #endif
    5036
    5137namespace WTF {
    5238
    53     template <typename T> inline void deleteOwnedPtr(T* ptr)
    54     {
    55         typedef char known[sizeof(T) ? 1 : -1];
    56         if (sizeof(known))
    57             delete ptr;
    58     }
    59 
    60 #if PLATFORM(WIN)
    61     void deleteOwnedPtr(HBITMAP);
    62     void deleteOwnedPtr(HBRUSH);
    63     void deleteOwnedPtr(HDC);
    64     void deleteOwnedPtr(HFONT);
    65     void deleteOwnedPtr(HPALETTE);
    66     void deleteOwnedPtr(HPEN);
    67     void deleteOwnedPtr(HRGN);
    68 #endif
    69 
    70 #if PLATFORM(BREWMP)
    71     void deleteOwnedPtr(IFileMgr*);
    72     void deleteOwnedPtr(IFile*);
    73     void deleteOwnedPtr(IBitmap*);
    74     void deleteOwnedPtr(ISSL*);
    75     void deleteOwnedPtr(ISocket*);
    76 #endif
     39void deleteOwnedPtr(IFileMgr*);
     40void deleteOwnedPtr(IFile*);
     41void deleteOwnedPtr(IBitmap*);
     42void deleteOwnedPtr(ISSL*);
     43void deleteOwnedPtr(ISocket*);
    7744
    7845} // namespace WTF
    7946
    80 #endif // WTF_OwnPtrCommon_h
     47#endif // OwnPtrBrew_h

  • trunk/JavaScriptCore/wtf/win/OwnPtrWin.h

    r60828 r60830  
    11/*
    2  * Copyright (C) 2009 Apple Inc. All rights reserved.
    3  * Copyright (C) 2009 Torch Mobile, Inc.
     2 * Copyright (C) 2009 Torch Mobile, Inc. All rights reserved.
    43 * Copyright (C) 2010 Company 100 Inc.
    54 *
    … …  
    2625 */
    2726
    28 #ifndef WTF_OwnPtrCommon_h
    29 #define WTF_OwnPtrCommon_h
     27#ifndef OwnPtrWin_h
     28#define OwnPtrWin_h
    3029
    31 #if PLATFORM(WIN)
    3230typedef struct HBITMAP__* HBITMAP;
    3331typedef struct HBRUSH__* HBRUSH;
    … …  
    3735typedef struct HPEN__* HPEN;
    3836typedef struct HRGN__* HRGN;
    39 #endif
    40 
    41 #if PLATFORM(BREWMP)
    42 // Forward delcarations at this point avoid the need to include BREW includes
    43 // in WTF headers.
    44 typedef struct _ISocket ISocket;
    45 typedef struct _IFileMgr IFileMgr;
    46 typedef struct _IFile IFile;
    47 typedef struct IBitmap IBitmap;
    48 typedef struct ISSL ISSL;
    49 #endif
    5037
    5138namespace WTF {
    5239
    53     template <typename T> inline void deleteOwnedPtr(T* ptr)
    54     {
    55         typedef char known[sizeof(T) ? 1 : -1];
    56         if (sizeof(known))
    57             delete ptr;
    58     }
    59 
    60 #if PLATFORM(WIN)
    61     void deleteOwnedPtr(HBITMAP);
    62     void deleteOwnedPtr(HBRUSH);
    63     void deleteOwnedPtr(HDC);
    64     void deleteOwnedPtr(HFONT);
    65     void deleteOwnedPtr(HPALETTE);
    66     void deleteOwnedPtr(HPEN);
    67     void deleteOwnedPtr(HRGN);
    68 #endif
    69 
    70 #if PLATFORM(BREWMP)
    71     void deleteOwnedPtr(IFileMgr*);
    72     void deleteOwnedPtr(IFile*);
    73     void deleteOwnedPtr(IBitmap*);
    74     void deleteOwnedPtr(ISSL*);
    75     void deleteOwnedPtr(ISocket*);
    76 #endif
     40void deleteOwnedPtr(HBITMAP);
     41void deleteOwnedPtr(HBRUSH);
     42void deleteOwnedPtr(HDC);
     43void deleteOwnedPtr(HFONT);
     44void deleteOwnedPtr(HPALETTE);
     45void deleteOwnedPtr(HPEN);
     46void deleteOwnedPtr(HRGN);
    7747
    7848} // namespace WTF
    7949
    80 #endif // WTF_OwnPtrCommon_h
     50#endif // OwnPtrWin_h
Note: See TracChangeset for help on using the changeset viewer.