Changeset 12315 in webkit for trunk/JavaScriptCore

Timestamp:

Jan 23, 2006, 9:10:45 AM (19 years ago)

Author:

darin

Message:

Reviewed by John Sullivan.

• change needed for fix to ​http://bugzilla.opendarwin.org/show_bug.cgi?id=6617 REGRESSION: Crash in cloneChildNodes when clicking element

• kxmlcore/PassRefPtr.h: Fix assignment operator from RefPtr of a different type by calling get() instead of going directly at m_ptr.
• kxmlcore/RefPtr.h: Ditto.

• other changes

• JavaScriptCore.xcodeproj/project.pbxproj: Xcode decided to change this file. It's just a resorted list of keys in a dictionary.

• kjs/fpconst.cpp: Wrap this file in #if APPLE since the alternate version in internal.cpp is in #if __APPLE. This file is to give us the "no init routine" property we want to have on OS X.

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• JavaScriptCore.xcodeproj/project.pbxproj (modified) (1 diff)
• kjs/fpconst.cpp (modified) (4 diffs)
• kxmlcore/PassRefPtr.h (modified) (1 diff)
• kxmlcore/RefPtr.h (modified) (2 diffs)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2006-01-23  Darin Adler  <[email protected]>
+
+        Reviewed by John Sullivan.
+
+        - change needed for fix to http://bugzilla.opendarwin.org/show_bug.cgi?id=6617
+          REGRESSION: Crash in cloneChildNodes when clicking element
+
+        * kxmlcore/PassRefPtr.h: Fix assignment operator from RefPtr of a different
+        type by calling get() instead of going directly at m_ptr.
+        * kxmlcore/RefPtr.h: Ditto.
+
+        - other changes
+
+        * JavaScriptCore.xcodeproj/project.pbxproj: Xcode decided to change this file.
+        It's just a resorted list of keys in a dictionary.
+
+        * kjs/fpconst.cpp: Wrap this file in #if __APPLE__ since the alternate version
+        in internal.cpp is in #if !__APPLE__. This file is to give us the "no init
+        routine" property we want to have on OS X.
+
 2006-01-22  Maciej Stachowiak  <[email protected]>
 

trunk/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj

@@ -381 +381 @@
                 933A349A038AE7C6008635CE /* identifier.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = identifier.h; sourceTree = "<group>"; tabWidth = 8; };
                 933A349D038AE80F008635CE /* identifier.cpp */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = identifier.cpp; sourceTree = "<group>"; tabWidth = 8; };
-                935F69F608244FEA003D1A45 /* dftables */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = "compiled.mach-o.executable"; path = dftables; sourceTree = BUILT_PRODUCTS_DIR; };
+                935F69F608244FEA003D1A45 /* dftables */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = dftables; sourceTree = BUILT_PRODUCTS_DIR; };
                 9364B273045B7D6C00A9CAC1 /* fpconst.cpp */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = fpconst.cpp; sourceTree = "<group>"; tabWidth = 8; };
                 9373524E038DA8C2008635CE /* context.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = context.h; sourceTree = "<group>"; tabWidth = 8; };

trunk/JavaScriptCore/kjs/fpconst.cpp

@@ -1 +1 @@
 /*
- *  Copyright (C) 2003 Apple Computer, Inc.
+ *  Copyright (C) 2003, 2006 Apple Computer, Inc.
  *
  *  This library is free software; you can redistribute it and/or
@@ -21 +21 @@
 #include "config.h"
 
+namespace KJS {
+
 // This file exists because JavaScriptCore needs to define the NaN and Inf globals in a way
 // that does not use a static initializer so we don't have a framework initialization routine.
@@ -30 +32 @@
 // It would be good to figure out a 100% clean way that still avoids code that runs at init time.
 
-namespace KJS {
+#if __APPLE__
 
 #ifdef WORDS_BIGENDIAN
@@ -40 +42 @@
 #endif
 
-};
+#endif
+
+}

trunk/JavaScriptCore/kxmlcore/PassRefPtr.h

@@ -75 +75 @@
     template <typename T> template <typename U> inline PassRefPtr<T>& PassRefPtr<T>::operator=(const RefPtr<U>& o) 
     {
-        T* optr = o.m_ptr;
+        T* optr = o.get();
         if (optr)
             optr->ref();

trunk/JavaScriptCore/kxmlcore/RefPtr.h

@@ -75 +75 @@
     template <typename T> RefPtr<T>& RefPtr<T>::operator=(const RefPtr<T>& o)
     {
-        T* optr = o.m_ptr;
+        T* optr = o.get();
         if (optr)
             optr->ref();
@@ -87 +87 @@
     template <typename T> template <typename U> RefPtr<T>& RefPtr<T>::operator=(const RefPtr<U>& o)
     {
-        T *optr = o.m_ptr;
+        T* optr = o.get();
         if (optr)
             optr->ref();