diff options
Diffstat (limited to 'WebCore/bindings/v8/custom')
9 files changed, 170 insertions, 67 deletions
diff --git a/WebCore/bindings/v8/custom/V8ClipboardCustom.cpp b/WebCore/bindings/v8/custom/V8ClipboardCustom.cpp index 69742f8..d85d7a0 100644 --- a/WebCore/bindings/v8/custom/V8ClipboardCustom.cpp +++ b/WebCore/bindings/v8/custom/V8ClipboardCustom.cpp @@ -101,7 +101,7 @@ v8::Handle<v8::Value> V8Clipboard::setDragImageCallback(const v8::Arguments& arg INC_STATS("DOM.Clipboard.setDragImage()"); Clipboard* clipboard = V8Clipboard::toNative(args.Holder()); - if (!clipboard->isForDragging()) + if (!clipboard->isForDragAndDrop()) return v8::Undefined(); if (args.Length() != 3) diff --git a/WebCore/bindings/v8/custom/V8CustomVoidCallback.cpp b/WebCore/bindings/v8/custom/V8CustomVoidCallback.cpp index 25e7e0d..11f309b 100644 --- a/WebCore/bindings/v8/custom/V8CustomVoidCallback.cpp +++ b/WebCore/bindings/v8/custom/V8CustomVoidCallback.cpp @@ -66,6 +66,7 @@ void V8CustomVoidCallback::handleEvent() bool invokeCallback(v8::Persistent<v8::Object> callback, int argc, v8::Handle<v8::Value> argv[], bool& callbackReturnValue, ScriptExecutionContext* scriptExecutionContext) { v8::TryCatch exceptionCatcher; + exceptionCatcher.SetVerbose(true); v8::Local<v8::Function> callbackFunction; if (callback->IsFunction()) { @@ -84,14 +85,7 @@ bool invokeCallback(v8::Persistent<v8::Object> callback, int argc, v8::Handle<v8 v8::Handle<v8::Value> result = callbackFunction->Call(thisObject, argc, argv); callbackReturnValue = !result.IsEmpty() && result->BooleanValue(); - - if (exceptionCatcher.HasCaught()) { - v8::Local<v8::Message> message = exceptionCatcher.Message(); - scriptExecutionContext->reportException(toWebCoreString(message->Get()), message->GetLineNumber(), toWebCoreString(message->GetScriptResourceName())); - return true; - } - - return false; + return exceptionCatcher.HasCaught(); } } // namespace WebCore diff --git a/WebCore/bindings/v8/custom/V8DOMStringMapCustom.cpp b/WebCore/bindings/v8/custom/V8DOMStringMapCustom.cpp index c8a975b..71ff357 100644 --- a/WebCore/bindings/v8/custom/V8DOMStringMapCustom.cpp +++ b/WebCore/bindings/v8/custom/V8DOMStringMapCustom.cpp @@ -34,6 +34,7 @@ #include "DOMStringMap.h" #include "V8Binding.h" #include "V8DOMWrapper.h" +#include "V8Element.h" namespace WebCore { @@ -101,8 +102,11 @@ v8::Handle<v8::Value> toV8(DOMStringMap* impl) v8::Handle<v8::Object> wrapper = V8DOMStringMap::wrap(impl); // Add a hidden reference from the element to the DOMStringMap. Element* element = impl->element(); - if (!wrapper.IsEmpty() && element) - V8DOMWrapper::setHiddenWindowReference(element->document()->frame(), wrapper); + if (!wrapper.IsEmpty() && element) { + v8::Handle<v8::Value> elementValue = toV8(element); + if (!elementValue.IsEmpty() && elementValue->IsObject()) + V8DOMWrapper::setHiddenReference(elementValue.As<v8::Object>(), wrapper); + } return wrapper; } diff --git a/WebCore/bindings/v8/custom/V8DOMTokenListCustom.cpp b/WebCore/bindings/v8/custom/V8DOMTokenListCustom.cpp new file mode 100644 index 0000000..171ff5c --- /dev/null +++ b/WebCore/bindings/v8/custom/V8DOMTokenListCustom.cpp @@ -0,0 +1,56 @@ +/* + * Copyright (C) 2010 Google Inc. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * * Neither the name of Google Inc. nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#include "config.h" +#include "V8DOMTokenList.h" + +#include "DOMTokenList.h" +#include "V8Binding.h" +#include "V8DOMWrapper.h" +#include "V8Element.h" + +namespace WebCore { + +v8::Handle<v8::Value> toV8(DOMTokenList* impl) +{ + if (!impl) + return v8::Null(); + v8::Handle<v8::Object> wrapper = V8DOMTokenList::wrap(impl); + // Add a hidden reference from the element to the DOMTokenList. + Element* element = impl->element(); + if (!wrapper.IsEmpty() && element) { + v8::Handle<v8::Value> elementValue = toV8(element); + if (!elementValue.IsEmpty() && elementValue->IsObject()) + V8DOMWrapper::setHiddenReference(elementValue.As<v8::Object>(), wrapper); + } + return wrapper; +} + +} // namespace WebCore diff --git a/WebCore/bindings/v8/custom/V8DeviceMotionEventCustom.cpp b/WebCore/bindings/v8/custom/V8DeviceMotionEventCustom.cpp index 67f27c5..f7a03f9 100644 --- a/WebCore/bindings/v8/custom/V8DeviceMotionEventCustom.cpp +++ b/WebCore/bindings/v8/custom/V8DeviceMotionEventCustom.cpp @@ -37,67 +37,122 @@ namespace WebCore { -v8::Handle<v8::Value> V8DeviceMotionEvent::xAccelerationAccessorGetter(v8::Local<v8::String> name, const v8::AccessorInfo& info) +namespace { + +v8::Handle<v8::Value> createAccelerationObject(const DeviceMotionData::Acceleration* acceleration) { - INC_STATS("DOM.DeviceMotionEvent.xAcceleration._get"); - v8::Handle<v8::Object> holder = info.Holder(); - DeviceMotionEvent* imp = V8DeviceMotionEvent::toNative(holder); - if (!imp->deviceMotionData()->canProvideXAcceleration()) - return v8::Null(); - return v8::Number::New(imp->deviceMotionData()->xAcceleration()); + v8::Local<v8::Object> object = v8::Object::New(); + object->Set(v8::String::New("x"), acceleration->canProvideX() ? v8::Number::New(acceleration->x()) : v8::Null()); + object->Set(v8::String::New("y"), acceleration->canProvideY() ? v8::Number::New(acceleration->y()) : v8::Null()); + object->Set(v8::String::New("z"), acceleration->canProvideZ() ? v8::Number::New(acceleration->z()) : v8::Null()); + return object; } -v8::Handle<v8::Value> V8DeviceMotionEvent::yAccelerationAccessorGetter(v8::Local<v8::String> name, const v8::AccessorInfo& info) +v8::Handle<v8::Value> createRotationRateObject(const DeviceMotionData::RotationRate* rotationRate) { - INC_STATS("DOM.DeviceMotionEvent.yAcceleration._get"); - v8::Handle<v8::Object> holder = info.Holder(); - DeviceMotionEvent* imp = V8DeviceMotionEvent::toNative(holder); - if (!imp->deviceMotionData()->canProvideYAcceleration()) - return v8::Null(); - return v8::Number::New(imp->deviceMotionData()->yAcceleration()); + v8::Local<v8::Object> object = v8::Object::New(); + object->Set(v8::String::New("alpha"), rotationRate->canProvideAlpha() ? v8::Number::New(rotationRate->alpha()) : v8::Null()); + object->Set(v8::String::New("beta"), rotationRate->canProvideBeta() ? v8::Number::New(rotationRate->beta()) : v8::Null()); + object->Set(v8::String::New("gamma"), rotationRate->canProvideGamma() ? v8::Number::New(rotationRate->gamma()) : v8::Null()); + return object; } -v8::Handle<v8::Value> V8DeviceMotionEvent::zAccelerationAccessorGetter(v8::Local<v8::String> name, const v8::AccessorInfo& info) +RefPtr<DeviceMotionData::Acceleration> readAccelerationArgument(v8::Local<v8::Value> value) { - INC_STATS("DOM.DeviceMotionEvent.zAcceleration._get"); - v8::Handle<v8::Object> holder = info.Holder(); - DeviceMotionEvent* imp = V8DeviceMotionEvent::toNative(holder); - if (!imp->deviceMotionData()->canProvideZAcceleration()) - return v8::Null(); - return v8::Number::New(imp->deviceMotionData()->zAcceleration()); + if (isUndefinedOrNull(value)) + return 0; + + // Given the test above, this will always yield an object. + v8::Local<v8::Object> object = value->ToObject(); + + v8::Local<v8::Value> xValue = object->Get(v8::String::New("x")); + if (xValue.IsEmpty()) + return 0; + bool canProvideX = !isUndefinedOrNull(xValue); + double x = xValue->NumberValue(); + + v8::Local<v8::Value> yValue = object->Get(v8::String::New("y")); + if (yValue.IsEmpty()) + return 0; + bool canProvideY = !isUndefinedOrNull(yValue); + double y = yValue->NumberValue(); + + v8::Local<v8::Value> zValue = object->Get(v8::String::New("z")); + if (zValue.IsEmpty()) + return 0; + bool canProvideZ = !isUndefinedOrNull(zValue); + double z = zValue->NumberValue(); + + if (!canProvideX && !canProvideY && !canProvideZ) + return 0; + + return DeviceMotionData::Acceleration::create(canProvideX, x, canProvideY, y, canProvideZ, z); } -v8::Handle<v8::Value> V8DeviceMotionEvent::xRotationRateAccessorGetter(v8::Local<v8::String> name, const v8::AccessorInfo& info) +RefPtr<DeviceMotionData::RotationRate> readRotationRateArgument(v8::Local<v8::Value> value) { - INC_STATS("DOM.DeviceMotionEvent.xRotationRate._get"); + if (isUndefinedOrNull(value)) + return 0; + + // Given the test above, this will always yield an object. + v8::Local<v8::Object> object = value->ToObject(); + + v8::Local<v8::Value> alphaValue = object->Get(v8::String::New("alpha")); + if (alphaValue.IsEmpty()) + return 0; + bool canProvideAlpha = !isUndefinedOrNull(alphaValue); + double alpha = alphaValue->NumberValue(); + + v8::Local<v8::Value> betaValue = object->Get(v8::String::New("beta")); + if (betaValue.IsEmpty()) + return 0; + bool canProvideBeta = !isUndefinedOrNull(betaValue); + double beta = betaValue->NumberValue(); + + v8::Local<v8::Value> gammaValue = object->Get(v8::String::New("gamma")); + if (gammaValue.IsEmpty()) + return 0; + bool canProvideGamma = !isUndefinedOrNull(gammaValue); + double gamma = gammaValue->NumberValue(); + + if (!canProvideAlpha && !canProvideBeta && !canProvideGamma) + return 0; + + return DeviceMotionData::RotationRate::create(canProvideAlpha, alpha, canProvideBeta, beta, canProvideGamma, gamma); +} + +} // namespace + +v8::Handle<v8::Value> V8DeviceMotionEvent::accelerationAccessorGetter(v8::Local<v8::String> name, const v8::AccessorInfo& info) +{ + INC_STATS("DOM.DeviceMotionEvent.acceleration._get"); v8::Handle<v8::Object> holder = info.Holder(); DeviceMotionEvent* imp = V8DeviceMotionEvent::toNative(holder); - if (!imp->deviceMotionData()->canProvideXRotationRate()) + if (!imp->deviceMotionData()->acceleration()) return v8::Null(); - return v8::Number::New(imp->deviceMotionData()->xRotationRate()); + return createAccelerationObject(imp->deviceMotionData()->acceleration()); } -v8::Handle<v8::Value> V8DeviceMotionEvent::yRotationRateAccessorGetter(v8::Local<v8::String> name, const v8::AccessorInfo& info) +v8::Handle<v8::Value> V8DeviceMotionEvent::accelerationIncludingGravityAccessorGetter(v8::Local<v8::String> name, const v8::AccessorInfo& info) { - INC_STATS("DOM.DeviceMotionEvent.yRotationRate._get"); + INC_STATS("DOM.DeviceMotionEvent.accelerationIncludingGravity._get"); v8::Handle<v8::Object> holder = info.Holder(); DeviceMotionEvent* imp = V8DeviceMotionEvent::toNative(holder); - if (!imp->deviceMotionData()->canProvideYRotationRate()) + if (!imp->deviceMotionData()->accelerationIncludingGravity()) return v8::Null(); - return v8::Number::New(imp->deviceMotionData()->yRotationRate()); + return createAccelerationObject(imp->deviceMotionData()->accelerationIncludingGravity()); } -v8::Handle<v8::Value> V8DeviceMotionEvent::zRotationRateAccessorGetter(v8::Local<v8::String> name, const v8::AccessorInfo& info) +v8::Handle<v8::Value> V8DeviceMotionEvent::rotationRateAccessorGetter(v8::Local<v8::String> name, const v8::AccessorInfo& info) { - INC_STATS("DOM.DeviceMotionEvent.zRotationRate._get"); + INC_STATS("DOM.DeviceMotionEvent.rotationRate._get"); v8::Handle<v8::Object> holder = info.Holder(); DeviceMotionEvent* imp = V8DeviceMotionEvent::toNative(holder); - if (!imp->deviceMotionData()->canProvideZRotationRate()) + if (!imp->deviceMotionData()->rotationRate()) return v8::Null(); - return v8::Number::New(imp->deviceMotionData()->zRotationRate()); + return createRotationRateObject(imp->deviceMotionData()->rotationRate()); } - v8::Handle<v8::Value> V8DeviceMotionEvent::intervalAccessorGetter(v8::Local<v8::String> name, const v8::AccessorInfo& info) { INC_STATS("DOM.DeviceMotionEvent.interval._get"); @@ -114,23 +169,12 @@ v8::Handle<v8::Value> V8DeviceMotionEvent::initDeviceMotionEventCallback(const v STRING_TO_V8PARAMETER_EXCEPTION_BLOCK(V8Parameter<>, type, args[0]); bool bubbles = args[1]->BooleanValue(); bool cancelable = args[2]->BooleanValue(); - // If any of the parameters are null or undefined, mark them as not provided. - // Otherwise, use the standard JavaScript conversion. - bool xAccelerationProvided = !isUndefinedOrNull(args[3]); - double xAcceleration = static_cast<double>(args[3]->NumberValue()); - bool yAccelerationProvided = !isUndefinedOrNull(args[4]); - double yAcceleration = static_cast<double>(args[4]->NumberValue()); - bool zAccelerationProvided = !isUndefinedOrNull(args[5]); - double zAcceleration = static_cast<double>(args[5]->NumberValue()); - bool xRotationRateProvided = !isUndefinedOrNull(args[6]); - double xRotationRate = static_cast<double>(args[6]->NumberValue()); - bool yRotationRateProvided = !isUndefinedOrNull(args[7]); - double yRotationRate = static_cast<double>(args[7]->NumberValue()); - bool zRotationRateProvided = !isUndefinedOrNull(args[8]); - double zRotationRate = static_cast<double>(args[8]->NumberValue()); - bool intervalProvided = !isUndefinedOrNull(args[9]); - double interval = static_cast<double>(args[9]->NumberValue()); - RefPtr<DeviceMotionData> deviceMotionData = DeviceMotionData::create(xAccelerationProvided, xAcceleration, yAccelerationProvided, yAcceleration, zAccelerationProvided, zAcceleration, xRotationRateProvided, xRotationRate, yRotationRateProvided, yRotationRate, zRotationRateProvided, zRotationRate, intervalProvided, interval); + RefPtr<DeviceMotionData::Acceleration> acceleration = readAccelerationArgument(args[3]); + RefPtr<DeviceMotionData::Acceleration> accelerationIncludingGravity = readAccelerationArgument(args[4]); + RefPtr<DeviceMotionData::RotationRate> rotationRate = readRotationRateArgument(args[5]); + bool intervalProvided = !isUndefinedOrNull(args[6]); + double interval = args[6]->NumberValue(); + RefPtr<DeviceMotionData> deviceMotionData = DeviceMotionData::create(acceleration, accelerationIncludingGravity, rotationRate, intervalProvided, interval); imp->initDeviceMotionEvent(type, bubbles, cancelable, deviceMotionData.get()); return v8::Handle<v8::Value>(); } diff --git a/WebCore/bindings/v8/custom/V8DeviceOrientationEventCustom.cpp b/WebCore/bindings/v8/custom/V8DeviceOrientationEventCustom.cpp index 72f759a..ce8eaf3 100644 --- a/WebCore/bindings/v8/custom/V8DeviceOrientationEventCustom.cpp +++ b/WebCore/bindings/v8/custom/V8DeviceOrientationEventCustom.cpp @@ -76,11 +76,11 @@ v8::Handle<v8::Value> V8DeviceOrientationEvent::initDeviceOrientationEventCallba // If alpha, beta or gamma are null or undefined, mark them as not provided. // Otherwise, use the standard JavaScript conversion. bool alphaProvided = !isUndefinedOrNull(args[3]); - double alpha = static_cast<double>(args[3]->NumberValue()); + double alpha = args[3]->NumberValue(); bool betaProvided = !isUndefinedOrNull(args[4]); - double beta = static_cast<double>(args[4]->NumberValue()); + double beta = args[4]->NumberValue(); bool gammaProvided = !isUndefinedOrNull(args[5]); - double gamma = static_cast<double>(args[5]->NumberValue()); + double gamma = args[5]->NumberValue(); RefPtr<DeviceOrientation> orientation = DeviceOrientation::create(alphaProvided, alpha, betaProvided, beta, gammaProvided, gamma); imp->initDeviceOrientationEvent(type, bubbles, cancelable, orientation.get()); return v8::Handle<v8::Value>(); diff --git a/WebCore/bindings/v8/custom/V8DirectoryEntryCustom.cpp b/WebCore/bindings/v8/custom/V8DirectoryEntryCustom.cpp index 286b154..fc8cf98 100644 --- a/WebCore/bindings/v8/custom/V8DirectoryEntryCustom.cpp +++ b/WebCore/bindings/v8/custom/V8DirectoryEntryCustom.cpp @@ -71,7 +71,7 @@ v8::Handle<v8::Value> V8DirectoryEntry::getDirectoryCallback(const v8::Arguments } } else { EXCEPTION_BLOCK(Flags*, tmp_flags, V8Flags::HasInstance(args[1]) ? V8Flags::toNative(v8::Handle<v8::Object>::Cast(args[1])) : 0); - flags = adoptRef(tmp_flags); + flags = tmp_flags; } RefPtr<EntryCallback> successCallback; if (args.Length() > 2 && !args[2]->IsNull() && !args[2]->IsUndefined()) { @@ -114,7 +114,7 @@ v8::Handle<v8::Value> V8DirectoryEntry::getFileCallback(const v8::Arguments& arg } } else { EXCEPTION_BLOCK(Flags*, tmp_flags, V8Flags::HasInstance(args[1]) ? V8Flags::toNative(v8::Handle<v8::Object>::Cast(args[1])) : 0); - flags = adoptRef(tmp_flags); + flags = tmp_flags; } RefPtr<EntryCallback> successCallback; if (args.Length() > 2 && !args[2]->IsNull() && !args[2]->IsUndefined()) { diff --git a/WebCore/bindings/v8/custom/V8InspectorFrontendHostCustom.cpp b/WebCore/bindings/v8/custom/V8InspectorFrontendHostCustom.cpp index 25b9010..94fa86e 100644 --- a/WebCore/bindings/v8/custom/V8InspectorFrontendHostCustom.cpp +++ b/WebCore/bindings/v8/custom/V8InspectorFrontendHostCustom.cpp @@ -47,6 +47,8 @@ v8::Handle<v8::Value> V8InspectorFrontendHost::platformCallback(const v8::Argume return v8String("mac"); #elif defined(OS_LINUX) return v8String("linux"); +#elif defined(OS_FREEBSD) + return v8String("freebsd"); #elif defined(OS_WIN) return v8String("windows"); #else diff --git a/WebCore/bindings/v8/custom/V8XMLHttpRequestCustom.cpp b/WebCore/bindings/v8/custom/V8XMLHttpRequestCustom.cpp index cfeb503..2355d2a 100644 --- a/WebCore/bindings/v8/custom/V8XMLHttpRequestCustom.cpp +++ b/WebCore/bindings/v8/custom/V8XMLHttpRequestCustom.cpp @@ -32,6 +32,7 @@ #include "V8XMLHttpRequest.h" #include "Frame.h" +#include "InspectorController.h" #include "V8Binding.h" #include "V8Blob.h" #include "V8DOMFormData.h" @@ -113,6 +114,8 @@ v8::Handle<v8::Value> V8XMLHttpRequest::sendCallback(const v8::Arguments& args) INC_STATS("DOM.XMLHttpRequest.send()"); XMLHttpRequest* xmlHttpRequest = V8XMLHttpRequest::toNative(args.Holder()); + InspectorController::instrumentWillSendXMLHttpRequest(xmlHttpRequest->scriptExecutionContext(), xmlHttpRequest->url()); + ExceptionCode ec = 0; if (args.Length() < 1) xmlHttpRequest->send(ec); |