Changeset 25934 in webkit for trunk/JavaScriptCore/wtf/OwnPtr.h

Timestamp:

Oct 2, 2007, 1:49:13 PM (18 years ago)

Author:

darin

Message:

JavaScriptCore:

Reviewed by Adam.

• add support for GDI objects to OwnPtr; I plan to use this to fix some GDI handle leaks

• kjs/grammar.y: Change parser to avoid macros that conflict with macros defined in Windows system headers: THIS, DELETE, VOID, IN, and CONST. This is needed because OwnPtr.h will now include <windows.h>.
• kjs/keywords.table: Ditto.

• wtf/OwnPtr.h: For PLATFORM(WIN), add support so that OwnPtr can be a GDI handle, and it will call DeleteObject. Also change to use the RemovePointer technique used by RetainPtr, so you can say OwnPtr<HBITMAP> rather than having to pass in the type pointed to by HBITMAP.

• wtf/OwnPtrWin.cpp: Added. (WebCore::deleteOwnedPtr): Put this in a separate file so that we don't have to include <windows.h> in OwnPtr.h.

• JavaScriptCore.vcproj/WTF/WTF.vcproj: Added OwnPtrWin.cpp.

WebCore:

Reviewed by Adam.

• add support for GDI objects to OwnPtr; I plan to use this to fix some GDI handle leaks

• css/CSSGrammar.y: Change parser to avoid macro that conflicts with macro defined in Windows system headers: FLOAT. This is needed because OwnPtr.h will now include <windows.h>.
• css/CSSParser.cpp: (WebCore::CSSParser::lex): Ditto.
• css/tokenizer.flex: Ditto.

• platform/win/CursorWin.cpp: (WebCore::Cursor::Cursor): Use OwnPtr for a few HBITMAP objects as a test case.

• platform/win/COMPtr.h: (COMPtr::COMPtr): Fix so that we can use Query with other COMPtr. Before this would not compile if it was ever instantiated.

win:

Reviewed by Adam.

• started using the new OwnPtr everywhere we do DeleteObject

• WebNodeHighlight.cpp: (WebNodeHighlight::updateWindow):
• WebView.cpp: (WebView::WebView): (WebView::deleteBackingStore): (WebView::ensureBackingStore): (WebView::addToDirtyRegion): (WebView::scrollBackingStore): (WebView::updateBackingStore): (WebView::paint): (WebView::paintIntoBackingStore): (WebView::paintIntoWindow):
• WebView.h:

Also set svn:eol-style on all .vcproj to CRLF.

Also added svn:ignore of *.user for WebKitInitializer.

File:

• trunk/JavaScriptCore/wtf/OwnPtr.h (modified) (3 diffs)

trunk/JavaScriptCore/wtf/OwnPtr.h

@@ -1 +1 @@
 // -*- mode: c++; c-basic-offset: 4 -*-
 /*
- *  Copyright (C) 2006 Apple Computer, Inc.
+ *  Copyright (C) 2006, 2007 Apple Inc. All rights reserved.
  *
  *  This library is free software; you can redistribute it and/or
@@ -27 +27 @@
 #include <wtf/Noncopyable.h>
 
+#if PLATFORM(WIN)
+
+typedef struct HBITMAP__* HBITMAP;
+typedef struct HBRUSH__* HBRUSH;
+typedef struct HFONT__* HFONT;
+typedef struct HPALETTE__* HPALETTE;
+typedef struct HPEN__* HPEN;
+typedef struct HRGN__* HRGN;
+
+#endif
+
 namespace WTF {
+
+    // Unlike most of our smart pointers, OwnPtr can take either the pointer type or the pointed-to type.
+
+    // FIXME: Share a single RemovePointer class template with RetainPtr.
+    template <typename T> struct OwnPtrRemovePointer { typedef T type; };
+    template <typename T> struct OwnPtrRemovePointer<T*> { typedef T type; };
+
+    template <typename T> inline void deleteOwnedPtr(T* ptr)
+    {
+        typedef char known[sizeof(T) ? 1 : -1];
+        if (sizeof(known))
+            delete ptr;
+    }
+
+#if PLATFORM(WIN)
+    void deleteOwnedPtr(HBITMAP);
+    void deleteOwnedPtr(HBRUSH);
+    void deleteOwnedPtr(HFONT);
+    void deleteOwnedPtr(HPALETTE);
+    void deleteOwnedPtr(HPEN);
+    void deleteOwnedPtr(HRGN);
+#endif
 
     template <typename T> class OwnPtr : Noncopyable {
     public:
-        explicit OwnPtr(T* ptr = 0) : m_ptr(ptr) { }
-        ~OwnPtr() { safeDelete(); }
+        typedef typename OwnPtrRemovePointer<T>::type ValueType;
+        typedef ValueType* PtrType;
 
-        T* get() const { return m_ptr; }
-        T* release() { T* ptr = m_ptr; m_ptr = 0; return ptr; }
+        explicit OwnPtr(PtrType ptr = 0) : m_ptr(ptr) { }
+        ~OwnPtr() { deleteOwnedPtr(m_ptr); }
 
-        void set(T* ptr) { ASSERT(!ptr || m_ptr != ptr); safeDelete(); m_ptr = ptr; }
-        void clear() { safeDelete(); m_ptr = 0; }
+        PtrType get() const { return m_ptr; }
+        PtrType release() { PtrType ptr = m_ptr; m_ptr = 0; return ptr; }
 
-        T& operator*() const { ASSERT(m_ptr); return *m_ptr; }
-        T* operator->() const { ASSERT(m_ptr); return m_ptr; }
+        void set(PtrType ptr) { ASSERT(!ptr || m_ptr != ptr); deleteOwnedPtr(m_ptr); m_ptr = ptr; }
+        void clear() { deleteOwnedPtr(m_ptr); m_ptr = 0; }
+
+        ValueType& operator*() const { ASSERT(m_ptr); return *m_ptr; }
+        PtrType operator->() const { ASSERT(m_ptr); return m_ptr; }
 
         bool operator!() const { return !m_ptr; }
 
         // This conversion operator allows implicit conversion to bool but not to other integer types.
-        typedef T* (OwnPtr::*UnspecifiedBoolType)() const;
+        typedef PtrType (OwnPtr::*UnspecifiedBoolType)() const;
         operator UnspecifiedBoolType() const { return m_ptr ? &OwnPtr::get : 0; }
 
@@ -52 +88 @@
 
     private:
-        void safeDelete() { typedef char known[sizeof(T) ? 1 : -1]; if (sizeof(known)) delete m_ptr; }
-
-        T* m_ptr;
+        PtrType m_ptr;
     };
     
     template <typename T> inline void swap(OwnPtr<T>& a, OwnPtr<T>& b) { a.swap(b); }
 
-    template <typename T> inline T* getPtr(const OwnPtr<T>& p)
+    template <typename T> inline typename OwnPtr<T>::PtrType getPtr(const OwnPtr<T>& p)
     {
         return p.get();