Update binding test results after r156808 for r156769.

* bindings/scripts/test/JS/JSattribute.cpp:
(WebCore::JSattributeOwner::finalize):
* bindings/scripts/test/JS/JSattribute.h:
(WebCore::wrapperOwner):
(WebCore::wrapperContext):
* bindings/scripts/test/JS/JSreadonly.cpp:
(WebCore::JSreadonlyOwner::finalize):
* bindings/scripts/test/JS/JSreadonly.h:
(WebCore::wrapperOwner):
(WebCore::wrapperContext):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@156824 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 01b0e2a4a8ca586cfb4d8152f1d4851f6df06316..5feaaa3493f2f7d558a23339fabeb95225478f0b 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,18 @@
+2013-10-02  Ryosuke Niwa  <rniwa@webkit.org>
+
+        Update binding test results after r156808 for r156769.
+
+        * bindings/scripts/test/JS/JSattribute.cpp:
+        (WebCore::JSattributeOwner::finalize):
+        * bindings/scripts/test/JS/JSattribute.h:
+        (WebCore::wrapperOwner):
+        (WebCore::wrapperContext):
+        * bindings/scripts/test/JS/JSreadonly.cpp:
+        (WebCore::JSreadonlyOwner::finalize):
+        * bindings/scripts/test/JS/JSreadonly.h:
+        (WebCore::wrapperOwner):
+        (WebCore::wrapperContext):
+
 2013-10-02  Commit Queue  <commit-queue@webkit.org>
 
         Unreviewed, rolling out r156816.

diff --git a/Source/WebCore/bindings/scripts/test/JS/JSattribute.cpp b/Source/WebCore/bindings/scripts/test/JS/JSattribute.cpp
index 2037cfbbdf26eb61eb5ac2a1ef343fdc0959dcf3..ab9f1abf39ce0589ce5951302c1d7efc72520187 100644 (file)
--- a/Source/WebCore/bindings/scripts/test/JS/JSattribute.cpp
+++ b/Source/WebCore/bindings/scripts/test/JS/JSattribute.cpp
@@ -160,7 +160,7 @@ bool JSattributeOwner::isReachableFromOpaqueRoots(JSC::Handle<JSC::Unknown> hand
 void JSattributeOwner::finalize(JSC::Handle<JSC::Unknown> handle, void* context)
 {
     JSattribute* jsattribute = jsCast<JSattribute*>(handle.get().asCell());
-    DOMWrapperWorld* world = static_cast<DOMWrapperWorld*>(context);
+    DOMWrapperWorld& world = *static_cast<DOMWrapperWorld*>(context);
     uncacheWrapper(world, jsattribute->impl(), jsattribute);
     jsattribute->releaseImpl();
 }

diff --git a/Source/WebCore/bindings/scripts/test/JS/JSattribute.h b/Source/WebCore/bindings/scripts/test/JS/JSattribute.h
index 10c2986b0cfb7a92f90982c4d918dbc7111d985c..c7028b569f99b9b0279334c73d2e1f8c552f1d9a 100644 (file)
--- a/Source/WebCore/bindings/scripts/test/JS/JSattribute.h
+++ b/Source/WebCore/bindings/scripts/test/JS/JSattribute.h
@@ -76,15 +76,15 @@ public:
     virtual void finalize(JSC::Handle<JSC::Unknown>, void* context);
 };
 
-inline JSC::WeakHandleOwner* wrapperOwner(DOMWrapperWorld*, attribute*)
+inline JSC::WeakHandleOwner* wrapperOwner(DOMWrapperWorld&, attribute*)
 {
     DEFINE_STATIC_LOCAL(JSattributeOwner, jsattributeOwner, ());
     return &jsattributeOwner;
 }
 
-inline void* wrapperContext(DOMWrapperWorld* world, attribute*)
+inline void* wrapperContext(DOMWrapperWorld& world, attribute*)
 {
-    return world;
+    return &world;
 }
 
 JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, attribute*);

diff --git a/Source/WebCore/bindings/scripts/test/JS/JSreadonly.cpp b/Source/WebCore/bindings/scripts/test/JS/JSreadonly.cpp
index a930df544babb65090305ac81c92eaaf56272e6c..81d4f3e0dd7801fe519bda170927cfb50133d115 100644 (file)
--- a/Source/WebCore/bindings/scripts/test/JS/JSreadonly.cpp
+++ b/Source/WebCore/bindings/scripts/test/JS/JSreadonly.cpp
@@ -147,7 +147,7 @@ bool JSreadonlyOwner::isReachableFromOpaqueRoots(JSC::Handle<JSC::Unknown> handl
 void JSreadonlyOwner::finalize(JSC::Handle<JSC::Unknown> handle, void* context)
 {
     JSreadonly* jsreadonly = jsCast<JSreadonly*>(handle.get().asCell());
-    DOMWrapperWorld* world = static_cast<DOMWrapperWorld*>(context);
+    DOMWrapperWorld& world = *static_cast<DOMWrapperWorld*>(context);
     uncacheWrapper(world, jsreadonly->impl(), jsreadonly);
     jsreadonly->releaseImpl();
 }

diff --git a/Source/WebCore/bindings/scripts/test/JS/JSreadonly.h b/Source/WebCore/bindings/scripts/test/JS/JSreadonly.h
index d9ce0b32a6721ddfa04b16125589419ce142ab65..fc2dea702f0a47494399c76cecce8d7ea389a590 100644 (file)
--- a/Source/WebCore/bindings/scripts/test/JS/JSreadonly.h
+++ b/Source/WebCore/bindings/scripts/test/JS/JSreadonly.h
@@ -76,15 +76,15 @@ public:
     virtual void finalize(JSC::Handle<JSC::Unknown>, void* context);
 };
 
-inline JSC::WeakHandleOwner* wrapperOwner(DOMWrapperWorld*, readonly*)
+inline JSC::WeakHandleOwner* wrapperOwner(DOMWrapperWorld&, readonly*)
 {
     DEFINE_STATIC_LOCAL(JSreadonlyOwner, jsreadonlyOwner, ());
     return &jsreadonlyOwner;
 }
 
-inline void* wrapperContext(DOMWrapperWorld* world, readonly*)
+inline void* wrapperContext(DOMWrapperWorld& world, readonly*)
 {
-    return world;
+    return &world;
 }
 
 JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, readonly*);