[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

aroben at apple.com aroben at apple.com
Wed Dec 22 13:33:37 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 4fa4a98130d9437f9f2703bad34e7623d28fc697
Author: aroben at apple.com <aroben at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Sep 20 16:18:23 2010 +0000

    Export RegExpObject::info from JavaScriptCore
    
    This allows obj->inherits(&RegExpObject::info) to work correctly from
    outside JavaScriptCore.dll on Windows.
    
    Fixes <http://webkit.org/b/46098>
    fast/loader/stateobjects/pushstate-object-types.html fails on Windows
    
    Reviewed by John Sullivan.
    
    * runtime/RegExpObject.h: Added JS_EXPORTDATA to the info member, as
    we already have for some other classes whose info members have to be
    used from outside the DLL.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67855 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 3490748..09fb37c 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,19 @@
+2010-09-20  Adam Roben  <aroben at apple.com>
+
+        Export RegExpObject::info from JavaScriptCore
+
+        This allows obj->inherits(&RegExpObject::info) to work correctly from
+        outside JavaScriptCore.dll on Windows.
+
+        Fixes <http://webkit.org/b/46098>
+        fast/loader/stateobjects/pushstate-object-types.html fails on Windows
+
+        Reviewed by John Sullivan.
+
+        * runtime/RegExpObject.h: Added JS_EXPORTDATA to the info member, as
+        we already have for some other classes whose info members have to be
+        used from outside the DLL.
+
 2010-09-19  Gavin Barraclough  <barraclough at apple.com>
 
         Windows build fix pt 2.
diff --git a/JavaScriptCore/runtime/RegExpObject.h b/JavaScriptCore/runtime/RegExpObject.h
index f997374..19de929 100644
--- a/JavaScriptCore/runtime/RegExpObject.h
+++ b/JavaScriptCore/runtime/RegExpObject.h
@@ -45,7 +45,7 @@ namespace JSC {
         virtual void put(ExecState*, const Identifier& propertyName, JSValue, PutPropertySlot&);
 
         virtual const ClassInfo* classInfo() const { return &info; }
-        static const ClassInfo info;
+        static JS_EXPORTDATA const ClassInfo info;
 
         static PassRefPtr<Structure> createStructure(JSValue prototype)
         {

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list