Changeset 117650 in webkit
- Timestamp:
- May 18, 2012 3:49:33 PM (12 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r117646 r117650 1 2012-05-18 Caio Marcelo de Oliveira Filho <caio.oliveira@openbossa.org> 2 3 Fix remaining uses of JSValue::toBoolean() 4 https://bugs.webkit.org/show_bug.cgi?id=86912 5 6 Reviewed by Filip Pizlo. 7 8 And unbreak Qt build. 9 10 * bindings/scripts/test/JS/JSTestEventTarget.cpp: 11 (WebCore::jsTestEventTargetPrototypeFunctionAddEventListener): 12 (WebCore::jsTestEventTargetPrototypeFunctionRemoveEventListener): 13 * bindings/scripts/test/JS/JSTestObj.cpp: 14 (WebCore::setJSTestObjCreate): 15 (WebCore::setJSTestObjReflectedBooleanAttr): 16 (WebCore::setJSTestObjReflectedCustomBooleanAttr): 17 (WebCore::jsTestObjPrototypeFunctionAddEventListener): 18 (WebCore::jsTestObjPrototypeFunctionRemoveEventListener): 19 * bridge/qt/qt_runtime.cpp: 20 (JSC::Bindings::convertValueToQVariant): 21 * bridge/qt/qt_runtime_qt4.cpp: 22 (JSC::Bindings::convertValueToQVariant): 23 1 24 2012-04-27 Filip Pizlo <fpizlo@apple.com> 2 25 -
trunk/Source/WebCore/bindings/scripts/test/JS/JSTestEventTarget.cpp
r117211 r117650 254 254 if (!listener.isObject()) 255 255 return JSValue::encode(jsUndefined()); 256 impl->addEventListener(ustringToAtomicString(exec->argument(0).toString(exec)->value(exec)), JSEventListener::create(asObject(listener), castedThis, false, currentWorld(exec)), exec->argument(2).toBoolean( exec));256 impl->addEventListener(ustringToAtomicString(exec->argument(0).toString(exec)->value(exec)), JSEventListener::create(asObject(listener), castedThis, false, currentWorld(exec)), exec->argument(2).toBoolean()); 257 257 return JSValue::encode(jsUndefined()); 258 258 } … … 269 269 if (!listener.isObject()) 270 270 return JSValue::encode(jsUndefined()); 271 impl->removeEventListener(ustringToAtomicString(exec->argument(0).toString(exec)->value(exec)), JSEventListener::create(asObject(listener), castedThis, false, currentWorld(exec)).get(), exec->argument(2).toBoolean( exec));271 impl->removeEventListener(ustringToAtomicString(exec->argument(0).toString(exec)->value(exec)), JSEventListener::create(asObject(listener), castedThis, false, currentWorld(exec)).get(), exec->argument(2).toBoolean()); 272 272 return JSValue::encode(jsUndefined()); 273 273 } -
trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp
r116828 r117650 1247 1247 JSTestObj* castedThis = jsCast<JSTestObj*>(thisObject); 1248 1248 TestObj* impl = static_cast<TestObj*>(castedThis->impl()); 1249 impl->setCreate(value.toBoolean( exec));1249 impl->setCreate(value.toBoolean()); 1250 1250 } 1251 1251 … … 1279 1279 JSTestObj* castedThis = jsCast<JSTestObj*>(thisObject); 1280 1280 TestObj* impl = static_cast<TestObj*>(castedThis->impl()); 1281 impl->setBooleanAttribute(WebCore::HTMLNames::reflectedbooleanattrAttr, value.toBoolean( exec));1281 impl->setBooleanAttribute(WebCore::HTMLNames::reflectedbooleanattrAttr, value.toBoolean()); 1282 1282 } 1283 1283 … … 1311 1311 JSTestObj* castedThis = jsCast<JSTestObj*>(thisObject); 1312 1312 TestObj* impl = static_cast<TestObj*>(castedThis->impl()); 1313 impl->setBooleanAttribute(WebCore::HTMLNames::customContentBooleanAttrAttr, value.toBoolean( exec));1313 impl->setBooleanAttribute(WebCore::HTMLNames::customContentBooleanAttrAttr, value.toBoolean()); 1314 1314 } 1315 1315 … … 1830 1830 if (!listener.isObject()) 1831 1831 return JSValue::encode(jsUndefined()); 1832 impl->addEventListener(ustringToAtomicString(exec->argument(0).toString(exec)->value(exec)), JSEventListener::create(asObject(listener), castedThis, false, currentWorld(exec)), exec->argument(2).toBoolean( exec));1832 impl->addEventListener(ustringToAtomicString(exec->argument(0).toString(exec)->value(exec)), JSEventListener::create(asObject(listener), castedThis, false, currentWorld(exec)), exec->argument(2).toBoolean()); 1833 1833 return JSValue::encode(jsUndefined()); 1834 1834 } … … 1845 1845 if (!listener.isObject()) 1846 1846 return JSValue::encode(jsUndefined()); 1847 impl->removeEventListener(ustringToAtomicString(exec->argument(0).toString(exec)->value(exec)), JSEventListener::create(asObject(listener), castedThis, false, currentWorld(exec)).get(), exec->argument(2).toBoolean( exec));1847 impl->removeEventListener(ustringToAtomicString(exec->argument(0).toString(exec)->value(exec)), JSEventListener::create(asObject(listener), castedThis, false, currentWorld(exec)).get(), exec->argument(2).toBoolean()); 1848 1848 return JSValue::encode(jsUndefined()); 1849 1849 } -
trunk/Source/WebCore/bridge/qt/qt_runtime.cpp
r116828 r117650 288 288 case QMetaType::Bool: 289 289 if (type == Object && object->inherits(&BooleanObject::s_info)) 290 ret = QVariant(asBooleanObject(value)->internalValue().toBoolean( exec));290 ret = QVariant(asBooleanObject(value)->internalValue().toBoolean()); 291 291 else 292 ret = QVariant(value.toBoolean( exec));292 ret = QVariant(value.toBoolean()); 293 293 if (type == Boolean) 294 294 dist = 0; -
trunk/Source/WebCore/bridge/qt/qt_runtime_qt4.cpp
r116828 r117650 288 288 case QMetaType::Bool: 289 289 if (type == Object && object->inherits(&BooleanObject::s_info)) 290 ret = QVariant(asBooleanObject(value)->internalValue().toBoolean( exec));290 ret = QVariant(asBooleanObject(value)->internalValue().toBoolean()); 291 291 else 292 ret = QVariant(value.toBoolean( exec));292 ret = QVariant(value.toBoolean()); 293 293 if (type == Boolean) 294 294 dist = 0;
Note: See TracChangeset
for help on using the changeset viewer.