Changeset 60852 in webkit for trunk/JavaScriptCore/wtf/OwnPtrCommon.h

Timestamp:

Jun 8, 2010, 10:37:44 AM (15 years ago)

Author:

[email protected]

Message:

2010-06-08 Sheriff Bot <​[email protected]>

Unreviewed, rolling out r60830.
​http://trac.webkit.org/changeset/60830
​https://bugs.webkit.org/show_bug.cgi?id=40305

Broke the Windows build (Requested by abarth on #webkit).

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

File:

• trunk/JavaScriptCore/wtf/OwnPtrCommon.h (modified) (2 diffs)

trunk/JavaScriptCore/wtf/OwnPtrCommon.h

@@ -29 +29 @@
 #define WTF_OwnPtrCommon_h
 
+#if PLATFORM(WIN)
+typedef struct HBITMAP__* HBITMAP;
+typedef struct HBRUSH__* HBRUSH;
+typedef struct HDC__* HDC;
+typedef struct HFONT__* HFONT;
+typedef struct HPALETTE__* HPALETTE;
+typedef struct HPEN__* HPEN;
+typedef struct HRGN__* HRGN;
+#endif
+
+#if PLATFORM(BREWMP)
+// Forward delcarations at this point avoid the need to include BREW includes
+// in WTF headers.
+typedef struct _ISocket ISocket;
+typedef struct _IFileMgr IFileMgr;
+typedef struct _IFile IFile;
+typedef struct IBitmap IBitmap;
+typedef struct ISSL ISSL;
+#endif
+
 namespace WTF {
 
@@ -38 +58 @@
     }
 
+#if PLATFORM(WIN)
+    void deleteOwnedPtr(HBITMAP);
+    void deleteOwnedPtr(HBRUSH);
+    void deleteOwnedPtr(HDC);
+    void deleteOwnedPtr(HFONT);
+    void deleteOwnedPtr(HPALETTE);
+    void deleteOwnedPtr(HPEN);
+    void deleteOwnedPtr(HRGN);
+#endif
+
+#if PLATFORM(BREWMP)
+    void deleteOwnedPtr(IFileMgr*);
+    void deleteOwnedPtr(IFile*);
+    void deleteOwnedPtr(IBitmap*);
+    void deleteOwnedPtr(ISSL*);
+    void deleteOwnedPtr(ISocket*);
+#endif
+
 } // namespace WTF
 
-#if PLATFORM(BREWMP)
-#include <wtf/brew/OwnPtrBrew.h>
-#elif PLATFORM(WIN)
-#include <wtf/win/OwnPtrWin.h>
-#endif
-
 #endif // WTF_OwnPtrCommon_h