Merge WebKit at r84325: Initial merge by git.

Change-Id: Ic1a909300ecc0a13ddc6b4e784371d2ac6e3d59b

10 files changed, 90 insertions, 13 deletions

diff --git a/Source/JavaScriptGlue/ChangeLog b/Source/JavaScriptGlue/ChangeLog
index 6093c84..3b8abdd 100644
--- a/Source/JavaScriptGlue/ChangeLog
+++ b/Source/JavaScriptGlue/ChangeLog
@@ -1,3 +1,76 @@
+2011-04-19  Renata Hodovan  <reni@webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        Move the alignment related macros in Vector.h to new Alignment.h.
+        https://bugs.webkit.org/show_bug.cgi?id=56000
+
+        Adding the new file to the forwarding headers of JavaScriptGlue.
+
+        * ForwardingHeaders/wtf/Alignment.h: Added.
+
+2011-04-15  Oliver Hunt  <oliver@apple.com>
+
+        GC allocate Structure
+        https://bugs.webkit.org/show_bug.cgi?id=58483
+
+        Rolling r83894 r83827 r83810 r83809 r83808 back in with
+        a workaround for the gcc bug seen by the gtk bots
+
+        * JSRun.cpp:
+        (JSGlueGlobalObject::JSGlueGlobalObject):
+        * JSRun.h:
+        * JSUtils.cpp:
+        (JSObjectKJSValue):
+        * UserObjectImp.cpp:
+        (UserObjectImp::UserObjectImp):
+        * UserObjectImp.h:
+        (UserObjectImp::createStructure):
+
+2011-04-08  Geoffrey Garen  <ggaren@apple.com>
+
+        Reviewed by Oliver Hunt.
+
+        A few heap-related renames and file moves.
+        
+        WeakGCPtr<T> => Weak<T>
+        Global<T> => Strong<T>
+        collector/ => heap/
+        collector/* => heap/*
+        runtime/WeakGCPtr.h => heap/Weak.h
+        
+        (Eventually, even more files should move into the heap directory. Like
+        Heap.h and Heap.cpp, for example.)
+
+        * JSRun.h:
+        * JSValueWrapper.h:
+
+2011-04-07  Geoffrey Garen  <ggaren@apple.com>
+
+        Reviewed by Maciej Stachowiak.
+
+        Some Handle<T> cleanup
+        https://bugs.webkit.org/show_bug.cgi?id=58109
+
+        * JSRun.h:
+        * JSValueWrapper.h: #include a file that was missing before, but was
+        harmlessly so until now.
+
+2011-03-30  Timur Iskhodzhanov  <timurrrr@google.com>
+
+        Reviewed by Alexey Proskuryakov.
+
+        Add some dynamic annotations to JavaScriptCore/wtf
+        https://bugs.webkit.org/show_bug.cgi?id=53747
+
+        By using these annotations we can improve the precision of finding
+        WebKit errors using dynamic analysis tools like ThreadSanitizer and Valgrind.
+        These annotations don't affect the compiled binaries unless USE(DYNAMIC_ANNOTATIONS) is "1".
+
+        These files don't add new functionality, so don't need extra tests.
+
+        * ForwardingHeaders/wtf/DynamicAnnotations.h: Added.
+
 2011-03-25  Oliver Hunt  <oliver@apple.com>
 
         Reviewed by Geoffrey Garen.
diff --git a/Source/JavaScriptGlue/Configurations/Version.xcconfig b/Source/JavaScriptGlue/Configurations/Version.xcconfig
index 59988e3..8ea0822 100644
--- a/Source/JavaScriptGlue/Configurations/Version.xcconfig
+++ b/Source/JavaScriptGlue/Configurations/Version.xcconfig
@@ -22,7 +22,7 @@
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
 
 MAJOR_VERSION = 534;
-MINOR_VERSION = 27;
+MINOR_VERSION = 30;
 TINY_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION);
 
diff --git a/Source/JavaScriptGlue/ForwardingHeaders/wtf/Alignment.h b/Source/JavaScriptGlue/ForwardingHeaders/wtf/Alignment.h
new file mode 100644
index 0000000..e83483e
--- /dev/null
+++ b/Source/JavaScriptGlue/ForwardingHeaders/wtf/Alignment.h
@@ -0,0 +1 @@
+#include <JavaScriptCore/Alignment.h>
diff --git a/Source/JavaScriptGlue/ForwardingHeaders/wtf/DynamicAnnotations.h b/Source/JavaScriptGlue/ForwardingHeaders/wtf/DynamicAnnotations.h
new file mode 100644
index 0000000..1280da8
--- /dev/null
+++ b/Source/JavaScriptGlue/ForwardingHeaders/wtf/DynamicAnnotations.h
@@ -0,0 +1 @@
+#include <JavaScriptCore/DynamicAnnotations.h>
diff --git a/Source/JavaScriptGlue/JSRun.cpp b/Source/JavaScriptGlue/JSRun.cpp
index a8096aa..3b9d245 100644
--- a/Source/JavaScriptGlue/JSRun.cpp
+++ b/Source/JavaScriptGlue/JSRun.cpp
@@ -33,10 +33,10 @@
 #include <JavaScriptCore/Completion.h>
 #include <JavaScriptCore/SourceCode.h>
 
-JSGlueGlobalObject::JSGlueGlobalObject(JSGlobalData& globalData, PassRefPtr<Structure> structure, JSFlags flags)
-    : JSGlobalObject(structure)
+JSGlueGlobalObject::JSGlueGlobalObject(JSGlobalData& globalData, Structure* structure, JSFlags flags)
+    : JSGlobalObject(globalData, structure)
     , m_flags(flags)
-    , m_userObjectStructure(UserObjectImp::createStructure(globalData, jsNull()))
+    , m_userObjectStructure(globalData, UserObjectImp::createStructure(globalData, jsNull()))
 {
 }
 
diff --git a/Source/JavaScriptGlue/JSRun.h b/Source/JavaScriptGlue/JSRun.h
index d7aa682..9fe7767 100644
--- a/Source/JavaScriptGlue/JSRun.h
+++ b/Source/JavaScriptGlue/JSRun.h
@@ -29,19 +29,20 @@
 #ifndef JSRun_h
 #define JSRun_h
 
+#include <JavaScriptCore/Strong.h>
 #include "JSBase.h"
 #include "JSUtils.h"
 
 class JSGlueGlobalObject : public JSGlobalObject {
     public:
-        JSGlueGlobalObject(JSGlobalData&, PassRefPtr<Structure>, JSFlags = kJSFlagNone);
+        JSGlueGlobalObject(JSGlobalData&, Structure*, JSFlags = kJSFlagNone);
 
         JSFlags Flags() const { return m_flags; }
         Structure* userObjectStructure() const { return m_userObjectStructure.get(); }
 
     private:
         JSFlags m_flags;
-        RefPtr<Structure> m_userObjectStructure;
+        Strong<Structure> m_userObjectStructure;
 };
 
 class JSRun : public JSBase {
@@ -56,7 +57,7 @@ class JSRun : public JSBase {
         JSFlags Flags() const;
     private:
         UString fSource;
-        Global<JSGlobalObject> fGlobalObject;
+        Strong<JSGlobalObject> fGlobalObject;
         JSFlags fFlags;
 };
 
diff --git a/Source/JavaScriptGlue/JSUtils.cpp b/Source/JavaScriptGlue/JSUtils.cpp
index b62e7bf..7db650f 100644
--- a/Source/JavaScriptGlue/JSUtils.cpp
+++ b/Source/JavaScriptGlue/JSUtils.cpp
@@ -184,7 +184,7 @@ JSValue JSObjectKJSValue(JSUserObject* ptr)
         if (!handled)
         {
             ExecState* exec = getThreadGlobalExecState();
-            result = new (exec) UserObjectImp(getThreadGlobalObject()->userObjectStructure(), ptr);
+            result = new (exec) UserObjectImp(exec->globalData(), getThreadGlobalObject()->userObjectStructure(), ptr);
         }
     }
     return result;
diff --git a/Source/JavaScriptGlue/JSValueWrapper.h b/Source/JavaScriptGlue/JSValueWrapper.h
index 9d27f89..66e0c59 100644
--- a/Source/JavaScriptGlue/JSValueWrapper.h
+++ b/Source/JavaScriptGlue/JSValueWrapper.h
@@ -29,6 +29,7 @@
 #ifndef JSValueWrapper_h
 #define JSValueWrapper_h
 
+#include <JavaScriptCore/Strong.h>
 #include "JSUtils.h"
 #include "JSBase.h"
 #include "JSObject.h"
@@ -43,7 +44,7 @@ public:
     JSValue GetValue();
 
 private:
-    Global<Unknown> fValue;
+    Strong<Unknown> fValue;
     
     static void JSObjectDispose(void *data);
     static CFArrayRef JSObjectCopyPropertyNames(void *data);
diff --git a/Source/JavaScriptGlue/UserObjectImp.cpp b/Source/JavaScriptGlue/UserObjectImp.cpp
index a04f58e..c93748f 100644
--- a/Source/JavaScriptGlue/UserObjectImp.cpp
+++ b/Source/JavaScriptGlue/UserObjectImp.cpp
@@ -34,8 +34,8 @@
 
 const ClassInfo UserObjectImp::s_info = { "UserObject", &JSNonFinalObject::s_info, 0, 0 };
 
-UserObjectImp::UserObjectImp(PassRefPtr<Structure> structure, JSUserObject* userObject)
-    : JSNonFinalObject(structure)
+UserObjectImp::UserObjectImp(JSGlobalData& globalData, Structure* structure, JSUserObject* userObject)
+    : JSNonFinalObject(globalData, structure)
     , fJSUserObject((JSUserObject*)userObject->Retain())
 {
 }
diff --git a/Source/JavaScriptGlue/UserObjectImp.h b/Source/JavaScriptGlue/UserObjectImp.h
index c6b8d86..9bd6f0f 100644
--- a/Source/JavaScriptGlue/UserObjectImp.h
+++ b/Source/JavaScriptGlue/UserObjectImp.h
@@ -36,7 +36,7 @@
 
 class UserObjectImp : public JSNonFinalObject {
 public:
-    UserObjectImp(PassRefPtr<Structure>, JSUserObject*);
+    UserObjectImp(JSGlobalData&, Structure*, JSUserObject*);
     virtual ~UserObjectImp();
 
     static const ClassInfo s_info;
@@ -58,7 +58,7 @@ public:
 
     JSUserObject *GetJSUserObject() const;
 
-    static PassRefPtr<Structure> createStructure(JSGlobalData& globalData, JSValue prototype)
+    static Structure* createStructure(JSGlobalData& globalData, JSValue prototype)
     {
         return Structure::create(globalData, prototype, TypeInfo(ObjectType, OverridesGetOwnPropertySlot | OverridesMarkChildren | OverridesGetPropertyNames), AnonymousSlotCount, &s_info);
     }