Changeset 27208 in webkit

Timestamp:

Oct 28, 2007 9:37:37 PM (16 years ago)

Author:

darin

Message:

• fix "broken everything" from the storage leak fix

• wtf/RefPtr.h: (WTF::RefPtr::RefPtr): Added a PlacementNewAdopt constructor.
• kjs/ustring.h: (KJS::UString::UString): Pass PlacementNewAdopt along to RefPtr.

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• kjs/ustring.h (modified) (2 diffs)
• wtf/RefPtr.h (modified) (4 diffs)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2007-10-28  Darin Adler  <darin@apple.com>
+
+        - fix "broken everything" from the storage leak fix
+
+        * wtf/RefPtr.h: (WTF::RefPtr::RefPtr): Added a PlacementNewAdopt constructor.
+        * kjs/ustring.h: (KJS::UString::UString): Pass PlacementNewAdopt along to RefPtr.
+
 2007-10-28  Darin Adler  <darin@apple.com>
 

trunk/JavaScriptCore/kjs/ustring.h

@@ -51 +51 @@
 namespace KJS {
 
-    enum PlacementNewAdoptType { PlacementNewAdopt };
+  using WTF::PlacementNewAdoptType;
+  using WTF::PlacementNewAdopt;
 
   class UString;
@@ -225 +226 @@
 
     // Special constructor for cases where we overwrite an object in place.
-    UString(PlacementNewAdoptType) { }
+    UString(PlacementNewAdoptType) : m_rep(PlacementNewAdopt) { }
 
     /**

trunk/JavaScriptCore/wtf/RefPtr.h

@@ -1 +1 @@
 // -*- mode: c++; c-basic-offset: 4 -*-
 /*
- *  This file is part of the KDE libraries
- *  Copyright (C) 2005, 2006 Apple Computer, Inc.
+ *  Copyright (C) 2005, 2006, 2007 Apple Inc. All rights reserved.
  *
  *  This library is free software; you can redistribute it and/or
@@ -29 +28 @@
 namespace WTF {
 
+    enum PlacementNewAdoptType { PlacementNewAdopt };
+
     template <typename T> class PassRefPtr;
 
-    template <typename T> class RefPtr
-    {
+    template <typename T> class RefPtr {
     public:
         RefPtr() : m_ptr(0) {}
@@ -39 +39 @@
         // see comment in PassRefPtr.h for why this takes const reference
         template <typename U> RefPtr(const PassRefPtr<U>&);
+
+        // Special constructor for cases where we overwrite an object in place.
+        RefPtr(PlacementNewAdoptType) { }
 
         ~RefPtr() { if (T *ptr = m_ptr) ptr->deref(); }
@@ -66 +69 @@
 
     private:
-        T *m_ptr;
+        T* m_ptr;
     };