Changeset 61847 in webkit


Ignore:
Timestamp:
Jun 25, 2010 4:07:10 AM (14 years ago)
Author:
commit-queue@webkit.org
Message:

2010-06-25 Sheriff Bot <​webkit.review.bot@gmail.com>

Unreviewed, rolling out r61842.
​http://trac.webkit.org/changeset/61842
​https://bugs.webkit.org/show_bug.cgi?id=41208

It broke Windows build (Requested by Ossy_ on #webkit).

  • JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreCommon.vsprops:
  • JavaScriptCore.vcproj/WTF/WTF.vcproj:
  • wtf/OwnPtrCommon.h:
  • wtf/brew/OwnPtrBrew.h: Removed.
  • wtf/win/OwnPtrWin.h: Removed.

2010-06-25 Sheriff Bot <​webkit.review.bot@gmail.com>

Unreviewed, rolling out r61842.
​http://trac.webkit.org/changeset/61842
​https://bugs.webkit.org/show_bug.cgi?id=41208

It broke Windows build (Requested by Ossy_ on #webkit).

  • ForwardingHeaders/wtf/win/OwnPtrWin.h: Removed.
Location:
trunk
Files:
3 deleted
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/JavaScriptCore/ChangeLog

    r61845 r61847  
     12010-06-25  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r61842.
     4        http://trac.webkit.org/changeset/61842
     5        https://bugs.webkit.org/show_bug.cgi?id=41208
     6
     7        It broke Windows build (Requested by Ossy_ on #webkit).
     8
     9        * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreCommon.vsprops:
     10        * JavaScriptCore.vcproj/WTF/WTF.vcproj:
     11        * wtf/OwnPtrCommon.h:
     12        * wtf/brew/OwnPtrBrew.h: Removed.
     13        * wtf/win/OwnPtrWin.h: Removed.
     14
    1152010-06-25  Sheriff Bot  <webkit.review.bot@gmail.com>
    216

  • trunk/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreCommon.vsprops

    r61842 r61847  
    1818        <Tool
    1919                Name="VCPostBuildEventTool"
    20                 CommandLine="mkdir 2&gt;NUL &quot;$(WebKitOutputDir)\include\private\JavaScriptCore&quot;&#x0D;&#x0A;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)\..\..\wtf\*.h&quot; &quot;$(WebKitOutputDir)\include\private\JavaScriptCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)\..\..\wtf\text\*.h&quot; &quot;$(WebKitOutputDir)\include\private\JavaScriptCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)\..\..\wtf\unicode\*.h&quot; &quot;$(WebKitOutputDir)\include\private\JavaScriptCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)\..\..\wtf\unicode\icu\*.h&quot; &quot;$(WebKitOutputDir)\include\private\JavaScriptCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)\..\..\wtf\win\*.h&quot; &quot;$(WebKitOutputDir)\include\private\JavaScriptCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)\..\..\parser\*.h&quot; &quot;$(WebKitOutputDir)\include\private\JavaScriptCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)\..\..\runtime\*.h&quot; &quot;$(WebKitOutputDir)\include\private\JavaScriptCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)\..\..\VM\*.h&quot; &quot;$(WebKitOutputDir)\include\private\JavaScriptCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)\..\..\bytecode\*.h&quot; &quot;$(WebKitOutputDir)\include\private\JavaScriptCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)\..\..\interpreter\*.h&quot; &quot;$(WebKitOutputDir)\include\private\JavaScriptCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)\..\..\assembler\*.h&quot; &quot;$(WebKitOutputDir)\include\private\JavaScriptCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)\..\..\jit\*.h&quot; &quot;$(WebKitOutputDir)\include\private\JavaScriptCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)\..\..\debugger\*.h&quot; &quot;$(WebKitOutputDir)\include\private\JavaScriptCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)\..\..\profiler\*.h&quot; &quot;$(WebKitOutputDir)\include\private\JavaScriptCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)\..\..\create_hash_table&quot; &quot;$(WebKitOutputDir)\include\private\JavaScriptCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)\..\..\pcre\pcre.h&quot; &quot;$(WebKitOutputDir)\include\private\JavaScriptCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)\..\..\wtf\text\AtomicString.cpp&quot; &quot;$(WebKitOutputDir)\include\private\JavaScriptCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)\..\..\wtf\text\StringImpl.cpp&quot; &quot;$(WebKitOutputDir)\include\private\JavaScriptCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)\..\..\wtf\text\WTFString.cpp&quot; &quot;$(WebKitOutputDir)\include\private\JavaScriptCore&quot;&#x0D;&#x0A;&#x0D;&#x0A;&#x0D;&#x0A;mkdir 2&gt;NUL &quot;$(OutDir)\JavaScriptCore.resources&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\$(ProjectName).resources\*&quot; &quot;$(OutDir)\$(ProjectName).resources&quot;&#x0D;&#x0A;&#x0D;&#x0A;if exist &quot;$(WebKitOutputDir)\buildfailed&quot; del &quot;$(WebKitOutputDir)\buildfailed&quot;&#x0D;&#x0A;"
     20                CommandLine="mkdir 2&gt;NUL &quot;$(WebKitOutputDir)\include\private\JavaScriptCore&quot;&#x0D;&#x0A;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)\..\..\wtf\*.h&quot; &quot;$(WebKitOutputDir)\include\private\JavaScriptCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)\..\..\wtf\text\*.h&quot; &quot;$(WebKitOutputDir)\include\private\JavaScriptCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)\..\..\wtf\unicode\*.h&quot; &quot;$(WebKitOutputDir)\include\private\JavaScriptCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)\..\..\wtf\unicode\icu\*.h&quot; &quot;$(WebKitOutputDir)\include\private\JavaScriptCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)\..\..\parser\*.h&quot; &quot;$(WebKitOutputDir)\include\private\JavaScriptCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)\..\..\runtime\*.h&quot; &quot;$(WebKitOutputDir)\include\private\JavaScriptCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)\..\..\VM\*.h&quot; &quot;$(WebKitOutputDir)\include\private\JavaScriptCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)\..\..\bytecode\*.h&quot; &quot;$(WebKitOutputDir)\include\private\JavaScriptCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)\..\..\interpreter\*.h&quot; &quot;$(WebKitOutputDir)\include\private\JavaScriptCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)\..\..\assembler\*.h&quot; &quot;$(WebKitOutputDir)\include\private\JavaScriptCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)\..\..\jit\*.h&quot; &quot;$(WebKitOutputDir)\include\private\JavaScriptCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)\..\..\debugger\*.h&quot; &quot;$(WebKitOutputDir)\include\private\JavaScriptCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)\..\..\profiler\*.h&quot; &quot;$(WebKitOutputDir)\include\private\JavaScriptCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)\..\..\create_hash_table&quot; &quot;$(WebKitOutputDir)\include\private\JavaScriptCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)\..\..\pcre\pcre.h&quot; &quot;$(WebKitOutputDir)\include\private\JavaScriptCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)\..\..\wtf\text\AtomicString.cpp&quot; &quot;$(WebKitOutputDir)\include\private\JavaScriptCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)\..\..\wtf\text\StringImpl.cpp&quot; &quot;$(WebKitOutputDir)\include\private\JavaScriptCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)\..\..\wtf\text\WTFString.cpp&quot; &quot;$(WebKitOutputDir)\include\private\JavaScriptCore&quot;&#x0D;&#x0A;&#x0D;&#x0A;&#x0D;&#x0A;mkdir 2&gt;NUL &quot;$(OutDir)\JavaScriptCore.resources&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\$(ProjectName).resources\*&quot; &quot;$(OutDir)\$(ProjectName).resources&quot;&#x0D;&#x0A;&#x0D;&#x0A;if exist &quot;$(WebKitOutputDir)\buildfailed&quot; del &quot;$(WebKitOutputDir)\buildfailed&quot;&#x0D;&#x0A;"
    2121        />
    2222        <Tool

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

    r61842 r61847  
    244244                                >
    245245                        </File>
    246                         <File
    247                                 RelativePath="..\..\wtf\win\OwnPtrWin.h"
    248                                 >
    249                         </File>
    250246                </Filter>
    251247                <File

  • trunk/JavaScriptCore/wtf/OwnPtrCommon.h

    r61842 r61847  
    2929#define WTF_OwnPtrCommon_h
    3030
     31#if PLATFORM(WIN)
     32typedef struct HBITMAP__* HBITMAP;
     33typedef struct HBRUSH__* HBRUSH;
     34typedef struct HDC__* HDC;
     35typedef struct HFONT__* HFONT;
     36typedef struct HPALETTE__* HPALETTE;
     37typedef struct HPEN__* HPEN;
     38typedef 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.
     44typedef struct _ISocket ISocket;
     45typedef struct _IFileMgr IFileMgr;
     46typedef struct _IFile IFile;
     47typedef struct IBitmap IBitmap;
     48typedef struct ISSL ISSL;
     49#endif
     50
    3151namespace WTF {
    3252
    … …  
    3858    }
    3959
     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
     77
    4078} // namespace WTF
    4179
    42 #if PLATFORM(BREWMP)
    43 #include <wtf/brew/OwnPtrBrew.h>
    44 #elif PLATFORM(WIN)
    45 #include <wtf/win/OwnPtrWin.h>
    46 #endif
    47 
    4880#endif // WTF_OwnPtrCommon_h

  • trunk/WebCore/ChangeLog

    r61846 r61847  
     12010-06-25  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r61842.
     4        http://trac.webkit.org/changeset/61842
     5        https://bugs.webkit.org/show_bug.cgi?id=41208
     6
     7        It broke Windows build (Requested by Ossy_ on #webkit).
     8
     9        * ForwardingHeaders/wtf/win/OwnPtrWin.h: Removed.
     10
    1112010-06-25  Patrick Gansterer  <paroga@paroga.com>
    212
Note: See TracChangeset for help on using the changeset viewer.