[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da
aestes at apple.com
aestes at apple.com
Wed Dec 22 17:57:07 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 9b1a5242891498d15eb33ff2283db328485093fb
Author: aestes at apple.com <aestes at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Dec 3 05:21:57 2010 +0000
Update bindings test results with new GObject results.
Rubber-stamped by Mark Rowe.
* bindings/scripts/test/GObject/WebKitDOMTestCallback.cpp:
(WebKit::kit):
* bindings/scripts/test/GObject/WebKitDOMTestCallbackPrivate.h:
* bindings/scripts/test/GObject/WebKitDOMTestInterface.cpp:
(WebKit::kit):
* bindings/scripts/test/GObject/WebKitDOMTestInterfacePrivate.h:
* bindings/scripts/test/GObject/WebKitDOMTestMediaQueryListListener.cpp:
(WebKit::kit):
* bindings/scripts/test/GObject/WebKitDOMTestMediaQueryListListenerPrivate.h:
* bindings/scripts/test/GObject/WebKitDOMTestObj.cpp:
(WebKit::kit):
(webkit_dom_test_obj_obj_method):
(webkit_dom_test_obj_obj_method_with_args):
(webkit_dom_test_obj_method_that_requires_all_args):
(webkit_dom_test_obj_method_that_requires_all_args_and_throws):
(webkit_dom_test_obj_with_script_state_obj):
(webkit_dom_test_obj_with_script_state_obj_exception):
(webkit_dom_test_obj_get_read_only_test_obj_attr):
(webkit_dom_test_obj_get_test_obj_attr):
(webkit_dom_test_obj_get_xml_obj_attr):
* bindings/scripts/test/GObject/WebKitDOMTestObjPrivate.h:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73238 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 623cf78..2941f0c 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,31 @@
+2010-12-02 Andy Estes <aestes at apple.com>
+
+ Rubber-stamped by Mark Rowe.
+
+ Update bindings test results with new GObject results.
+
+ * bindings/scripts/test/GObject/WebKitDOMTestCallback.cpp:
+ (WebKit::kit):
+ * bindings/scripts/test/GObject/WebKitDOMTestCallbackPrivate.h:
+ * bindings/scripts/test/GObject/WebKitDOMTestInterface.cpp:
+ (WebKit::kit):
+ * bindings/scripts/test/GObject/WebKitDOMTestInterfacePrivate.h:
+ * bindings/scripts/test/GObject/WebKitDOMTestMediaQueryListListener.cpp:
+ (WebKit::kit):
+ * bindings/scripts/test/GObject/WebKitDOMTestMediaQueryListListenerPrivate.h:
+ * bindings/scripts/test/GObject/WebKitDOMTestObj.cpp:
+ (WebKit::kit):
+ (webkit_dom_test_obj_obj_method):
+ (webkit_dom_test_obj_obj_method_with_args):
+ (webkit_dom_test_obj_method_that_requires_all_args):
+ (webkit_dom_test_obj_method_that_requires_all_args_and_throws):
+ (webkit_dom_test_obj_with_script_state_obj):
+ (webkit_dom_test_obj_with_script_state_obj_exception):
+ (webkit_dom_test_obj_get_read_only_test_obj_attr):
+ (webkit_dom_test_obj_get_test_obj_attr):
+ (webkit_dom_test_obj_get_xml_obj_attr):
+ * bindings/scripts/test/GObject/WebKitDOMTestObjPrivate.h:
+
2010-12-02 Simon Fraser <simon.fraser at apple.com>
Revert r73217 and r73227 because of continued bustage.
diff --git a/WebCore/bindings/scripts/test/GObject/WebKitDOMTestCallback.cpp b/WebCore/bindings/scripts/test/GObject/WebKitDOMTestCallback.cpp
index 554cc15..9c8fa59 100644
--- a/WebCore/bindings/scripts/test/GObject/WebKitDOMTestCallback.cpp
+++ b/WebCore/bindings/scripts/test/GObject/WebKitDOMTestCallback.cpp
@@ -44,14 +44,14 @@
namespace WebKit {
-gpointer kit(WebCore::TestCallback* obj)
+WebKitDOMTestCallback* kit(WebCore::TestCallback* obj)
{
g_return_val_if_fail(obj, 0);
if (gpointer ret = DOMObjectCache::get(obj))
- return ret;
+ return static_cast<WebKitDOMTestCallback*>(ret);
- return DOMObjectCache::put(obj, WebKit::wrapTestCallback(obj));
+ return static_cast<WebKitDOMTestCallback*>(DOMObjectCache::put(obj, WebKit::wrapTestCallback(obj)));
}
} // namespace WebKit //
diff --git a/WebCore/bindings/scripts/test/GObject/WebKitDOMTestCallbackPrivate.h b/WebCore/bindings/scripts/test/GObject/WebKitDOMTestCallbackPrivate.h
index 45884b2..3ad6ff4 100644
--- a/WebCore/bindings/scripts/test/GObject/WebKitDOMTestCallbackPrivate.h
+++ b/WebCore/bindings/scripts/test/GObject/WebKitDOMTestCallbackPrivate.h
@@ -31,7 +31,7 @@ namespace WebKit {
WebCore::TestCallback *
core(WebKitDOMTestCallback *request);
- gpointer
+ WebKitDOMTestCallback*
kit(WebCore::TestCallback* node);
} // namespace WebKit
diff --git a/WebCore/bindings/scripts/test/GObject/WebKitDOMTestInterface.cpp b/WebCore/bindings/scripts/test/GObject/WebKitDOMTestInterface.cpp
index 6c906e4..b68340b 100644
--- a/WebCore/bindings/scripts/test/GObject/WebKitDOMTestInterface.cpp
+++ b/WebCore/bindings/scripts/test/GObject/WebKitDOMTestInterface.cpp
@@ -38,14 +38,14 @@
namespace WebKit {
-gpointer kit(WebCore::TestInterface* obj)
+WebKitDOMTestInterface* kit(WebCore::TestInterface* obj)
{
g_return_val_if_fail(obj, 0);
if (gpointer ret = DOMObjectCache::get(obj))
- return ret;
+ return static_cast<WebKitDOMTestInterface*>(ret);
- return DOMObjectCache::put(obj, WebKit::wrapTestInterface(obj));
+ return static_cast<WebKitDOMTestInterface*>(DOMObjectCache::put(obj, WebKit::wrapTestInterface(obj)));
}
} // namespace WebKit //
diff --git a/WebCore/bindings/scripts/test/GObject/WebKitDOMTestInterfacePrivate.h b/WebCore/bindings/scripts/test/GObject/WebKitDOMTestInterfacePrivate.h
index 45fb949..0a4e3a2 100644
--- a/WebCore/bindings/scripts/test/GObject/WebKitDOMTestInterfacePrivate.h
+++ b/WebCore/bindings/scripts/test/GObject/WebKitDOMTestInterfacePrivate.h
@@ -31,7 +31,7 @@ namespace WebKit {
WebCore::TestInterface *
core(WebKitDOMTestInterface *request);
- gpointer
+ WebKitDOMTestInterface*
kit(WebCore::TestInterface* node);
} // namespace WebKit
diff --git a/WebCore/bindings/scripts/test/GObject/WebKitDOMTestMediaQueryListListener.cpp b/WebCore/bindings/scripts/test/GObject/WebKitDOMTestMediaQueryListListener.cpp
index a7d364c..93d0bde 100644
--- a/WebCore/bindings/scripts/test/GObject/WebKitDOMTestMediaQueryListListener.cpp
+++ b/WebCore/bindings/scripts/test/GObject/WebKitDOMTestMediaQueryListListener.cpp
@@ -36,14 +36,14 @@
namespace WebKit {
-gpointer kit(WebCore::TestMediaQueryListListener* obj)
+WebKitDOMTestMediaQueryListListener* kit(WebCore::TestMediaQueryListListener* obj)
{
g_return_val_if_fail(obj, 0);
if (gpointer ret = DOMObjectCache::get(obj))
- return ret;
+ return static_cast<WebKitDOMTestMediaQueryListListener*>(ret);
- return DOMObjectCache::put(obj, WebKit::wrapTestMediaQueryListListener(obj));
+ return static_cast<WebKitDOMTestMediaQueryListListener*>(DOMObjectCache::put(obj, WebKit::wrapTestMediaQueryListListener(obj)));
}
} // namespace WebKit //
diff --git a/WebCore/bindings/scripts/test/GObject/WebKitDOMTestMediaQueryListListenerPrivate.h b/WebCore/bindings/scripts/test/GObject/WebKitDOMTestMediaQueryListListenerPrivate.h
index c8ba6cc..5fc652f 100644
--- a/WebCore/bindings/scripts/test/GObject/WebKitDOMTestMediaQueryListListenerPrivate.h
+++ b/WebCore/bindings/scripts/test/GObject/WebKitDOMTestMediaQueryListListenerPrivate.h
@@ -31,7 +31,7 @@ namespace WebKit {
WebCore::TestMediaQueryListListener *
core(WebKitDOMTestMediaQueryListListener *request);
- gpointer
+ WebKitDOMTestMediaQueryListListener*
kit(WebCore::TestMediaQueryListListener* node);
} // namespace WebKit
diff --git a/WebCore/bindings/scripts/test/GObject/WebKitDOMTestObj.cpp b/WebCore/bindings/scripts/test/GObject/WebKitDOMTestObj.cpp
index ec2c6dc..ea6eaee 100644
--- a/WebCore/bindings/scripts/test/GObject/WebKitDOMTestObj.cpp
+++ b/WebCore/bindings/scripts/test/GObject/WebKitDOMTestObj.cpp
@@ -43,14 +43,14 @@
namespace WebKit {
-gpointer kit(WebCore::TestObj* obj)
+WebKitDOMTestObj* kit(WebCore::TestObj* obj)
{
g_return_val_if_fail(obj, 0);
if (gpointer ret = DOMObjectCache::get(obj))
- return ret;
+ return static_cast<WebKitDOMTestObj*>(ret);
- return DOMObjectCache::put(obj, WebKit::wrapTestObj(obj));
+ return static_cast<WebKitDOMTestObj*>(DOMObjectCache::put(obj, WebKit::wrapTestObj(obj)));
}
} // namespace WebKit //
@@ -116,7 +116,7 @@ webkit_dom_test_obj_obj_method(WebKitDOMTestObj* self)
WebCore::JSMainThreadNullState state;
WebCore::TestObj * item = WebKit::core(self);
PassRefPtr<WebCore::TestObj> g_res = WTF::getPtr(item->objMethod());
- WebKitDOMTestObj* res = static_cast<WebKitDOMTestObj*>(WebKit::kit(g_res.get()));
+ WebKitDOMTestObj* res = WebKit::kit(g_res.get());
return res;
}
@@ -135,7 +135,7 @@ webkit_dom_test_obj_obj_method_with_args(WebKitDOMTestObj* self, glong int_arg,
g_return_val_if_fail(converted_obj_arg, 0);
}
PassRefPtr<WebCore::TestObj> g_res = WTF::getPtr(item->objMethodWithArgs(int_arg, converted_str_arg, converted_obj_arg));
- WebKitDOMTestObj* res = static_cast<WebKitDOMTestObj*>(WebKit::kit(g_res.get()));
+ WebKitDOMTestObj* res = WebKit::kit(g_res.get());
return res;
}
@@ -154,7 +154,7 @@ webkit_dom_test_obj_method_that_requires_all_args(WebKitDOMTestObj* self, const
g_return_val_if_fail(converted_obj_arg, 0);
}
PassRefPtr<WebCore::TestObj> g_res = WTF::getPtr(item->methodThatRequiresAllArgs(converted_str_arg, converted_obj_arg));
- WebKitDOMTestObj* res = static_cast<WebKitDOMTestObj*>(WebKit::kit(g_res.get()));
+ WebKitDOMTestObj* res = WebKit::kit(g_res.get());
return res;
}
@@ -179,7 +179,7 @@ webkit_dom_test_obj_method_that_requires_all_args_and_throws(WebKitDOMTestObj* s
WebCore::getExceptionCodeDescription(ec, ecdesc);
g_set_error_literal(error, g_quark_from_string("WEBKIT_DOM"), ecdesc.code, ecdesc.name);
}
- WebKitDOMTestObj* res = static_cast<WebKitDOMTestObj*>(WebKit::kit(g_res.get()));
+ WebKitDOMTestObj* res = WebKit::kit(g_res.get());
return res;
}
@@ -316,7 +316,7 @@ webkit_dom_test_obj_with_script_state_obj(WebKitDOMTestObj* self)
WebCore::JSMainThreadNullState state;
WebCore::TestObj * item = WebKit::core(self);
PassRefPtr<WebCore::TestObj> g_res = WTF::getPtr(item->withScriptStateObj());
- WebKitDOMTestObj* res = static_cast<WebKitDOMTestObj*>(WebKit::kit(g_res.get()));
+ WebKitDOMTestObj* res = WebKit::kit(g_res.get());
return res;
}
@@ -348,7 +348,7 @@ webkit_dom_test_obj_with_script_state_obj_exception(WebKitDOMTestObj* self, GErr
WebCore::getExceptionCodeDescription(ec, ecdesc);
g_set_error_literal(error, g_quark_from_string("WEBKIT_DOM"), ecdesc.code, ecdesc.name);
}
- WebKitDOMTestObj* res = static_cast<WebKitDOMTestObj*>(WebKit::kit(g_res.get()));
+ WebKitDOMTestObj* res = WebKit::kit(g_res.get());
return res;
}
@@ -434,7 +434,7 @@ webkit_dom_test_obj_get_read_only_test_obj_attr(WebKitDOMTestObj* self)
WebCore::JSMainThreadNullState state;
WebCore::TestObj * item = WebKit::core(self);
PassRefPtr<WebCore::TestObj> g_res = WTF::getPtr(item->readOnlyTestObjAttr());
- WebKitDOMTestObj* res = static_cast<WebKitDOMTestObj*>(WebKit::kit(g_res.get()));
+ WebKitDOMTestObj* res = WebKit::kit(g_res.get());
return res;
}
@@ -561,7 +561,7 @@ webkit_dom_test_obj_get_test_obj_attr(WebKitDOMTestObj* self)
WebCore::JSMainThreadNullState state;
WebCore::TestObj * item = WebKit::core(self);
PassRefPtr<WebCore::TestObj> g_res = WTF::getPtr(item->testObjAttr());
- WebKitDOMTestObj* res = static_cast<WebKitDOMTestObj*>(WebKit::kit(g_res.get()));
+ WebKitDOMTestObj* res = WebKit::kit(g_res.get());
return res;
}
@@ -587,7 +587,7 @@ webkit_dom_test_obj_get_xml_obj_attr(WebKitDOMTestObj* self)
WebCore::JSMainThreadNullState state;
WebCore::TestObj * item = WebKit::core(self);
PassRefPtr<WebCore::TestObj> g_res = WTF::getPtr(item->xmlObjAttr());
- WebKitDOMTestObj* res = static_cast<WebKitDOMTestObj*>(WebKit::kit(g_res.get()));
+ WebKitDOMTestObj* res = WebKit::kit(g_res.get());
return res;
}
diff --git a/WebCore/bindings/scripts/test/GObject/WebKitDOMTestObjPrivate.h b/WebCore/bindings/scripts/test/GObject/WebKitDOMTestObjPrivate.h
index 78cd87f..96722f7 100644
--- a/WebCore/bindings/scripts/test/GObject/WebKitDOMTestObjPrivate.h
+++ b/WebCore/bindings/scripts/test/GObject/WebKitDOMTestObjPrivate.h
@@ -31,7 +31,7 @@ namespace WebKit {
WebCore::TestObj *
core(WebKitDOMTestObj *request);
- gpointer
+ WebKitDOMTestObj*
kit(WebCore::TestObj* node);
} // namespace WebKit
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list