[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
kinuko at chromium.org
kinuko at chromium.org
Wed Dec 22 11:37:30 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 0b15a3e2a81606cb32588df7d7bd0c0de0633705
Author: kinuko at chromium.org <kinuko at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sat Jul 31 09:44:17 2010 +0000
2010-07-31 Kinuko Yasuda <kinuko at chromium.org>
Reviewed by Nikolas Zimmermann.
Fix 'bool' in bindings/scripts/test/TestObj.
* bindings/scripts/test/CPP/WebDOMTestObj.cpp:
(WebDOMTestObj::CREATE):
(WebDOMTestObj::setCREATE):
* bindings/scripts/test/CPP/WebDOMTestObj.h:
* bindings/scripts/test/GObject/WebKitDOMTestObj.cpp:
(webkit_dom_test_obj_get_create):
(webkit_dom_test_obj_set_create):
(webkit_dom_test_obj_set_property):
(webkit_dom_test_obj_get_property):
(webkit_dom_test_obj_class_init):
* bindings/scripts/test/GObject/WebKitDOMTestObj.h:
* bindings/scripts/test/JS/JSTestObj.cpp:
(WebCore::jsTestObjCreate):
(WebCore::setJSTestObjCreate):
* bindings/scripts/test/ObjC/DOMTestObj.h:
* bindings/scripts/test/ObjC/DOMTestObj.mm:
(-[DOMTestObj CREATE]):
(-[DOMTestObj setCREATE:]):
* bindings/scripts/test/TestObj.idl:
* bindings/scripts/test/V8/V8TestObj.cpp:
(WebCore::TestObjInternal::CREATEAttrGetter):
(WebCore::TestObjInternal::CREATEAttrSetter):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64415 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index bffbcce..ce371c5 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,32 @@
+2010-07-31 Kinuko Yasuda <kinuko at chromium.org>
+
+ Reviewed by Nikolas Zimmermann.
+
+ Fix 'bool' in bindings/scripts/test/TestObj.
+
+ * bindings/scripts/test/CPP/WebDOMTestObj.cpp:
+ (WebDOMTestObj::CREATE):
+ (WebDOMTestObj::setCREATE):
+ * bindings/scripts/test/CPP/WebDOMTestObj.h:
+ * bindings/scripts/test/GObject/WebKitDOMTestObj.cpp:
+ (webkit_dom_test_obj_get_create):
+ (webkit_dom_test_obj_set_create):
+ (webkit_dom_test_obj_set_property):
+ (webkit_dom_test_obj_get_property):
+ (webkit_dom_test_obj_class_init):
+ * bindings/scripts/test/GObject/WebKitDOMTestObj.h:
+ * bindings/scripts/test/JS/JSTestObj.cpp:
+ (WebCore::jsTestObjCreate):
+ (WebCore::setJSTestObjCreate):
+ * bindings/scripts/test/ObjC/DOMTestObj.h:
+ * bindings/scripts/test/ObjC/DOMTestObj.mm:
+ (-[DOMTestObj CREATE]):
+ (-[DOMTestObj setCREATE:]):
+ * bindings/scripts/test/TestObj.idl:
+ * bindings/scripts/test/V8/V8TestObj.cpp:
+ (WebCore::TestObjInternal::CREATEAttrGetter):
+ (WebCore::TestObjInternal::CREATEAttrSetter):
+
2010-07-30 Kinuko Yasuda <kinuko at chromium.org>
Reviewed by Dumitru Daniliuc.
diff --git a/WebCore/bindings/scripts/test/CPP/WebDOMTestObj.cpp b/WebCore/bindings/scripts/test/CPP/WebDOMTestObj.cpp
index 6e5326f..b8c551e 100644
--- a/WebCore/bindings/scripts/test/CPP/WebDOMTestObj.cpp
+++ b/WebCore/bindings/scripts/test/CPP/WebDOMTestObj.cpp
@@ -29,10 +29,8 @@
#include "TestObj.h"
#include "WebDOMIDBKey.h"
#include "WebDOMString.h"
-#include "WebDOMbool.h"
#include "WebExceptionHandler.h"
#include "WebNativeEventListener.h"
-#include "bool.h"
#include <wtf/GetPtr.h>
#include <wtf/RefPtr.h>
@@ -194,20 +192,20 @@ void WebDOMTestObj::setXMLObjAttr(const WebDOMTestObj& newXMLObjAttr)
impl()->setXMLObjAttr(toWebCore(newXMLObjAttr));
}
-WebDOMbool WebDOMTestObj::CREATE() const
+bool WebDOMTestObj::CREATE() const
{
if (!impl())
- return WebDOMbool();
+ return false;
- return toWebKit(WTF::getPtr(impl()->isCreate()));
+ return impl()->isCreate();
}
-void WebDOMTestObj::setCREATE(const WebDOMbool& newCREATE)
+void WebDOMTestObj::setCREATE(bool newCREATE)
{
if (!impl())
return;
- impl()->setCreate(toWebCore(newCREATE));
+ impl()->setCreate(newCREATE);
}
WebDOMString WebDOMTestObj::reflectedStringAttr() const
diff --git a/WebCore/bindings/scripts/test/CPP/WebDOMTestObj.h b/WebCore/bindings/scripts/test/CPP/WebDOMTestObj.h
index acc93eb..c3b65ca 100644
--- a/WebCore/bindings/scripts/test/CPP/WebDOMTestObj.h
+++ b/WebCore/bindings/scripts/test/CPP/WebDOMTestObj.h
@@ -34,7 +34,6 @@ class WebDOMEventListener;
class WebDOMIDBKey;
class WebDOMString;
class WebDOMTestObj;
-class WebDOMbool;
class WebDOMTestObj : public WebDOMObject {
public:
@@ -72,8 +71,8 @@ public:
void setTestObjAttr(const WebDOMTestObj&);
WebDOMTestObj XMLObjAttr() const;
void setXMLObjAttr(const WebDOMTestObj&);
- WebDOMbool CREATE() const;
- void setCREATE(const WebDOMbool&);
+ bool CREATE() const;
+ void setCREATE(bool);
WebDOMString reflectedStringAttr() const;
void setReflectedStringAttr(const WebDOMString&);
int reflectedIntegralAttr() const;
diff --git a/WebCore/bindings/scripts/test/GObject/WebKitDOMTestObj.cpp b/WebCore/bindings/scripts/test/GObject/WebKitDOMTestObj.cpp
index 82b90ad..6a8399e 100644
--- a/WebCore/bindings/scripts/test/GObject/WebKitDOMTestObj.cpp
+++ b/WebCore/bindings/scripts/test/GObject/WebKitDOMTestObj.cpp
@@ -28,7 +28,6 @@
#include "JSMainThreadExecState.h"
#include "TestObj.h"
#include "WebKitDOMBinding.h"
-#include "bool.h"
#include "gobject/ConvertToUTF8String.h"
#include "webkit/WebKitDOMIDBKey.h"
#include "webkit/WebKitDOMIDBKeyPrivate.h"
@@ -36,8 +35,6 @@
#include "webkit/WebKitDOMSerializedScriptValuePrivate.h"
#include "webkit/WebKitDOMTestObj.h"
#include "webkit/WebKitDOMTestObjPrivate.h"
-#include "webkit/WebKitDOMbool.h"
-#include "webkit/WebKitDOMboolPrivate.h"
#include "webkitmarshal.h"
#include "webkitprivate.h"
@@ -501,27 +498,23 @@ webkit_dom_test_obj_set_xml_obj_attr(WebKitDOMTestObj* self, WebKitDOMTestObj*
item->setXMLObjAttr(converted_value);
}
-WebKitDOMbool*
+gboolean
webkit_dom_test_obj_get_create(WebKitDOMTestObj* self)
{
WebCore::JSMainThreadNullState state;
g_return_val_if_fail(self, 0);
WebCore::TestObj * item = WebKit::core(self);
- PassRefPtr<WebCore::bool> g_res = WTF::getPtr(item->isCreate());
- WebKitDOMbool* res = static_cast<WebKitDOMbool* >(WebKit::kit(g_res.get()));
+ gboolean res = item->isCreate();
return res;
}
void
-webkit_dom_test_obj_set_create(WebKitDOMTestObj* self, WebKitDOMbool* value)
+webkit_dom_test_obj_set_create(WebKitDOMTestObj* self, gboolean value)
{
WebCore::JSMainThreadNullState state;
g_return_if_fail(self);
WebCore::TestObj * item = WebKit::core(self);
- g_return_if_fail(value);
- WebCore::bool * converted_value = WebKit::core(value);
- g_return_if_fail(converted_value);
- item->setCreate(converted_value);
+ item->setCreate(value);
}
gchar*
@@ -1051,6 +1044,11 @@ static void webkit_dom_test_obj_set_property(GObject* object, guint prop_id, con
coreSelf->setStringAttr(WebCore::String::fromUTF8(g_value_get_string(value)));
break;
}
+ case PROP_CREATE:
+ {
+ coreSelf->setCreate((g_value_get_boolean(value)));
+ break;
+ }
case PROP_REFLECTED_STRING_ATTR:
{
coreSelf->setAttribute(WebCore::HTMLNames::reflectedstringattrAttr, WebCore::String::fromUTF8(g_value_get_string(value)));
@@ -1214,8 +1212,7 @@ static void webkit_dom_test_obj_get_property(GObject* object, guint prop_id, GVa
}
case PROP_CREATE:
{
- RefPtr<WebCore::bool> ptr = coreSelf->isCreate();
- g_value_set_object(value, WebKit::kit(ptr.get()));
+ g_value_set_boolean(value, coreSelf->isCreate());
break;
}
case PROP_REFLECTED_STRING_ATTR:
@@ -1426,10 +1423,10 @@ G_MAXUINT64, /* min */
WEBKIT_PARAM_READWRITE));
g_object_class_install_property(gobjectClass,
PROP_CREATE,
- g_param_spec_object("create", /* name */
+ g_param_spec_boolean("create", /* name */
"test_obj_create", /* short description */
- "read-write WebKitDOMbool* TestObj.create", /* longer - could do with some extra doc stuff here */
- WEBKIT_TYPE_DOM_BOOL, /* gobject type */
+ "read-write gboolean TestObj.create", /* longer - could do with some extra doc stuff here */
+ FALSE, /* default */
WEBKIT_PARAM_READWRITE));
g_object_class_install_property(gobjectClass,
PROP_REFLECTED_STRING_ATTR,
diff --git a/WebCore/bindings/scripts/test/GObject/WebKitDOMTestObj.h b/WebCore/bindings/scripts/test/GObject/WebKitDOMTestObj.h
index 6408823..c9a1821 100644
--- a/WebCore/bindings/scripts/test/GObject/WebKitDOMTestObj.h
+++ b/WebCore/bindings/scripts/test/GObject/WebKitDOMTestObj.h
@@ -169,11 +169,11 @@ webkit_dom_test_obj_get_xml_obj_attr(WebKitDOMTestObj* self);
WEBKIT_API void
webkit_dom_test_obj_set_xml_obj_attr(WebKitDOMTestObj* self, WebKitDOMTestObj* value);
-WEBKIT_API WebKitDOMbool*
+WEBKIT_API gboolean
webkit_dom_test_obj_get_create(WebKitDOMTestObj* self);
WEBKIT_API void
-webkit_dom_test_obj_set_create(WebKitDOMTestObj* self, WebKitDOMbool* value);
+webkit_dom_test_obj_set_create(WebKitDOMTestObj* self, gboolean value);
WEBKIT_API gchar*
webkit_dom_test_obj_get_reflected_string_attr(WebKitDOMTestObj* self);
diff --git a/WebCore/bindings/scripts/test/JS/JSTestObj.cpp b/WebCore/bindings/scripts/test/JS/JSTestObj.cpp
index 11b9d7b..9c11bde 100644
--- a/WebCore/bindings/scripts/test/JS/JSTestObj.cpp
+++ b/WebCore/bindings/scripts/test/JS/JSTestObj.cpp
@@ -28,13 +28,11 @@
#include "JSEventListener.h"
#include "JSTestCallback.h"
#include "JSTestObj.h"
-#include "JSbool.h"
#include "JSlog.h"
#include "KURL.h"
#include "ScriptCallStack.h"
#include "SerializedScriptValue.h"
#include "TestObj.h"
-#include "bool.h"
#include <runtime/Error.h>
#include <runtime/JSNumberCell.h>
#include <runtime/JSString.h>
@@ -360,7 +358,7 @@ JSValue jsTestObjCreate(ExecState* exec, JSValue slotBase, const Identifier&)
JSTestObj* castedThis = static_cast<JSTestObj*>(asObject(slotBase));
UNUSED_PARAM(exec);
TestObj* imp = static_cast<TestObj*>(castedThis->impl());
- JSValue result = toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->isCreate()));
+ JSValue result = jsBoolean(imp->isCreate());
return result;
}
@@ -623,7 +621,7 @@ void setJSTestObjCreate(ExecState* exec, JSObject* thisObject, JSValue value)
{
JSTestObj* castedThis = static_cast<JSTestObj*>(thisObject);
TestObj* imp = static_cast<TestObj*>(castedThis->impl());
- imp->setCreate(tobool(value));
+ imp->setCreate(value.toBoolean(exec));
}
void setJSTestObjReflectedStringAttr(ExecState* exec, JSObject* thisObject, JSValue value)
diff --git a/WebCore/bindings/scripts/test/ObjC/DOMTestObj.h b/WebCore/bindings/scripts/test/ObjC/DOMTestObj.h
index 21c664e..4a0f065 100644
--- a/WebCore/bindings/scripts/test/ObjC/DOMTestObj.h
+++ b/WebCore/bindings/scripts/test/ObjC/DOMTestObj.h
@@ -30,7 +30,6 @@
@class DOMIDBKey;
@class DOMTestObj;
- at class DOMbool;
@class DOMlog;
@class NSString;
@protocol DOMEventListener;
@@ -65,8 +64,8 @@ enum {
- (void)setTestObjAttr:(DOMTestObj *)newTestObjAttr;
- (DOMTestObj *)XMLObjAttr;
- (void)setXMLObjAttr:(DOMTestObj *)newXMLObjAttr;
-- (DOMbool *)CREATE;
-- (void)setCREATE:(DOMbool *)newCREATE;
+- (BOOL)CREATE;
+- (void)setCREATE:(BOOL)newCREATE;
- (NSString *)reflectedStringAttr;
- (void)setReflectedStringAttr:(NSString *)newReflectedStringAttr;
- (int)reflectedIntegralAttr;
diff --git a/WebCore/bindings/scripts/test/ObjC/DOMTestObj.mm b/WebCore/bindings/scripts/test/ObjC/DOMTestObj.mm
index e23d5a5..71d3508 100644
--- a/WebCore/bindings/scripts/test/ObjC/DOMTestObj.mm
+++ b/WebCore/bindings/scripts/test/ObjC/DOMTestObj.mm
@@ -37,7 +37,6 @@
#import "DOMNodeInternal.h"
#import "DOMStyleSheetInternal.h"
#import "DOMTestObjInternal.h"
-#import "DOMboolInternal.h"
#import "DOMlogInternal.h"
#import "EventListener.h"
#import "ExceptionHandlers.h"
@@ -51,7 +50,6 @@
#import "ThreadCheck.h"
#import "WebCoreObjCExtras.h"
#import "WebScriptObjectPrivate.h"
-#import "bool.h"
#import "log.h"
#import <wtf/GetPtr.h>
@@ -170,18 +168,16 @@
IMPL->setXMLObjAttr(core(newXMLObjAttr));
}
-- (DOMbool *)CREATE
+- (BOOL)CREATE
{
WebCore::JSMainThreadNullState state;
- return kit(WTF::getPtr(IMPL->isCreate()));
+ return IMPL->isCreate();
}
-- (void)setCREATE:(DOMbool *)newCREATE
+- (void)setCREATE:(BOOL)newCREATE
{
WebCore::JSMainThreadNullState state;
- ASSERT(newCREATE);
-
- IMPL->setCreate(core(newCREATE));
+ IMPL->setCreate(newCREATE);
}
- (NSString *)reflectedStringAttr
diff --git a/WebCore/bindings/scripts/test/TestObj.idl b/WebCore/bindings/scripts/test/TestObj.idl
index 4966137..a2bc89d 100644
--- a/WebCore/bindings/scripts/test/TestObj.idl
+++ b/WebCore/bindings/scripts/test/TestObj.idl
@@ -44,7 +44,7 @@ module test {
JS, V8
// WK_ucfirst, WK_lcfirst exceptional cases.
attribute TestObj XMLObjAttr;
- attribute bool CREATE;
+ attribute boolean CREATE;
// Reflected DOM attributes
attribute [Reflect] DOMString reflectedStringAttr;
diff --git a/WebCore/bindings/scripts/test/V8/V8TestObj.cpp b/WebCore/bindings/scripts/test/V8/V8TestObj.cpp
index 026d94c..5584eaf 100644
--- a/WebCore/bindings/scripts/test/V8/V8TestObj.cpp
+++ b/WebCore/bindings/scripts/test/V8/V8TestObj.cpp
@@ -34,7 +34,6 @@
#include "V8IsolatedContext.h"
#include "V8Proxy.h"
#include "V8TestCallback.h"
-#include "V8bool.h"
#include "V8log.h"
#include <wtf/GetPtr.h>
#include <wtf/RefCounted.h>
@@ -176,15 +175,15 @@ static v8::Handle<v8::Value> CREATEAttrGetter(v8::Local<v8::String> name, const
{
INC_STATS("DOM.TestObj.CREATE._get");
TestObj* imp = V8TestObj::toNative(info.Holder());
- return toV8(imp->isCreate());
+ return v8Boolean(imp->isCreate());
}
static void CREATEAttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::AccessorInfo& info)
{
INC_STATS("DOM.TestObj.CREATE._set");
TestObj* imp = V8TestObj::toNative(info.Holder());
- bool* v = V8bool::HasInstance(value) ? V8bool::toNative(v8::Handle<v8::Object>::Cast(value)) : 0;
- imp->setCreate(WTF::getPtr(v));
+ bool v = value->BooleanValue();
+ imp->setCreate(v);
return;
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list