diff options
author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-06-01 10:36:58 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-06-01 10:36:58 +0200 |
commit | b1e9e47fa11f608ae16bc07f97a2acf95bf80272 (patch) | |
tree | c88c45e80c9c44506e7cdf9a3bb39ebf82a8cd5b /Source/WebCore/bindings/v8/custom/V8HTMLCanvasElementCustom.cpp | |
parent | be01689f43cf6882cf670d33df49ead1f570c53a (diff) | |
download | qtwebkit-b1e9e47fa11f608ae16bc07f97a2acf95bf80272.tar.gz |
Imported WebKit commit 499c84c99aa98e9870fa7eaa57db476c6d160d46 (http://svn.webkit.org/repository/webkit/trunk@119200)
Weekly update :). Particularly relevant changes for Qt are the use of the WebCore image decoders and direct usage
of libpng/libjpeg if available in the system.
Diffstat (limited to 'Source/WebCore/bindings/v8/custom/V8HTMLCanvasElementCustom.cpp')
-rw-r--r-- | Source/WebCore/bindings/v8/custom/V8HTMLCanvasElementCustom.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/WebCore/bindings/v8/custom/V8HTMLCanvasElementCustom.cpp b/Source/WebCore/bindings/v8/custom/V8HTMLCanvasElementCustom.cpp index 01c54db46..20db53d64 100644 --- a/Source/WebCore/bindings/v8/custom/V8HTMLCanvasElementCustom.cpp +++ b/Source/WebCore/bindings/v8/custom/V8HTMLCanvasElementCustom.cpp @@ -84,7 +84,7 @@ v8::Handle<v8::Value> V8HTMLCanvasElement::getContextCallback(const v8::Argument #endif CanvasRenderingContext* result = imp->getContext(contextId, attrs.get()); if (!result) - return v8::Null(); + return v8::Null(args.GetIsolate()); if (result->is2d()) return toV8(static_cast<CanvasRenderingContext2D*>(result), args.GetIsolate()); #if ENABLE(WEBGL) @@ -92,7 +92,7 @@ v8::Handle<v8::Value> V8HTMLCanvasElement::getContextCallback(const v8::Argument return toV8(static_cast<WebGLRenderingContext*>(result), args.GetIsolate()); #endif ASSERT_NOT_REACHED(); - return v8::Null(); + return v8::Null(args.GetIsolate()); } v8::Handle<v8::Value> V8HTMLCanvasElement::toDataURLCallback(const v8::Arguments& args) @@ -111,7 +111,7 @@ v8::Handle<v8::Value> V8HTMLCanvasElement::toDataURLCallback(const v8::Arguments String result = canvas->toDataURL(type, qualityPtr, ec); V8Proxy::setDOMException(ec, args.GetIsolate()); - return v8StringOrUndefined(result); + return v8StringOrUndefined(result, args.GetIsolate()); } } // namespace WebCore |