| Index: Source/core/html/canvas/CanvasRenderingContext2D.cpp
|
| diff --git a/Source/core/html/canvas/CanvasRenderingContext2D.cpp b/Source/core/html/canvas/CanvasRenderingContext2D.cpp
|
| index ad640e01ac833df532c4f0d3d29afe31cec630d9..f95d56e193c5922e4e414e30cae65d9bc1131878 100644
|
| --- a/Source/core/html/canvas/CanvasRenderingContext2D.cpp
|
| +++ b/Source/core/html/canvas/CanvasRenderingContext2D.cpp
|
| @@ -1289,34 +1289,34 @@ void CanvasRenderingContext2D::drawImageInternal(Image* image, const FloatRect&
|
| }
|
| }
|
|
|
| -void CanvasRenderingContext2D::drawImage(ImageBitmap* bitmap, float x, float y, ExceptionState& es)
|
| +void CanvasRenderingContext2D::drawImage(ImageBitmap* bitmap, float x, float y, ExceptionState& exceptionState)
|
| {
|
| if (!bitmap) {
|
| - es.throwUninformativeAndGenericDOMException(TypeMismatchError);
|
| + exceptionState.throwUninformativeAndGenericDOMException(TypeMismatchError);
|
| return;
|
| }
|
| - drawImage(bitmap, x, y, bitmap->width(), bitmap->height(), es);
|
| + drawImage(bitmap, x, y, bitmap->width(), bitmap->height(), exceptionState);
|
| }
|
|
|
| void CanvasRenderingContext2D::drawImage(ImageBitmap* bitmap,
|
| - float x, float y, float width, float height, ExceptionState& es)
|
| + float x, float y, float width, float height, ExceptionState& exceptionState)
|
| {
|
| if (!bitmap) {
|
| - es.throwUninformativeAndGenericDOMException(TypeMismatchError);
|
| + exceptionState.throwUninformativeAndGenericDOMException(TypeMismatchError);
|
| return;
|
| }
|
| if (!bitmap->bitmapRect().width() || !bitmap->bitmapRect().height())
|
| return;
|
|
|
| - drawImage(bitmap, 0, 0, bitmap->width(), bitmap->height(), x, y, width, height, es);
|
| + drawImage(bitmap, 0, 0, bitmap->width(), bitmap->height(), x, y, width, height, exceptionState);
|
| }
|
|
|
| void CanvasRenderingContext2D::drawImage(ImageBitmap* bitmap,
|
| float sx, float sy, float sw, float sh,
|
| - float dx, float dy, float dw, float dh, ExceptionState& es)
|
| + float dx, float dy, float dw, float dh, ExceptionState& exceptionState)
|
| {
|
| if (!bitmap) {
|
| - es.throwUninformativeAndGenericDOMException(TypeMismatchError);
|
| + exceptionState.throwUninformativeAndGenericDOMException(TypeMismatchError);
|
| return;
|
| }
|
|
|
| @@ -1331,7 +1331,7 @@ void CanvasRenderingContext2D::drawImage(ImageBitmap* bitmap,
|
| if (!dstRect.width() || !dstRect.height())
|
| return;
|
| if (!srcRect.width() || !srcRect.height()) {
|
| - es.throwUninformativeAndGenericDOMException(IndexSizeError);
|
| + exceptionState.throwUninformativeAndGenericDOMException(IndexSizeError);
|
| return;
|
| }
|
|
|
| @@ -1364,43 +1364,43 @@ void CanvasRenderingContext2D::drawImage(ImageBitmap* bitmap,
|
| drawImageInternal(imageForRendering.get(), actualSrcRect, actualDstRect, state().m_globalComposite, state().m_globalBlend);
|
| }
|
|
|
| -void CanvasRenderingContext2D::drawImage(HTMLImageElement* image, float x, float y, ExceptionState& es)
|
| +void CanvasRenderingContext2D::drawImage(HTMLImageElement* image, float x, float y, ExceptionState& exceptionState)
|
| {
|
| if (!image) {
|
| - es.throwUninformativeAndGenericDOMException(TypeMismatchError);
|
| + exceptionState.throwUninformativeAndGenericDOMException(TypeMismatchError);
|
| return;
|
| }
|
| LayoutSize destRectSize = sizeFor(image, ImageSizeAfterDevicePixelRatio);
|
| - drawImage(image, x, y, destRectSize.width(), destRectSize.height(), es);
|
| + drawImage(image, x, y, destRectSize.width(), destRectSize.height(), exceptionState);
|
| }
|
|
|
| void CanvasRenderingContext2D::drawImage(HTMLImageElement* image,
|
| - float x, float y, float width, float height, ExceptionState& es)
|
| + float x, float y, float width, float height, ExceptionState& exceptionState)
|
| {
|
| if (!image) {
|
| - es.throwUninformativeAndGenericDOMException(TypeMismatchError);
|
| + exceptionState.throwUninformativeAndGenericDOMException(TypeMismatchError);
|
| return;
|
| }
|
| LayoutSize sourceRectSize = sizeFor(image, ImageSizeBeforeDevicePixelRatio);
|
| - drawImage(image, FloatRect(0, 0, sourceRectSize.width(), sourceRectSize.height()), FloatRect(x, y, width, height), es);
|
| + drawImage(image, FloatRect(0, 0, sourceRectSize.width(), sourceRectSize.height()), FloatRect(x, y, width, height), exceptionState);
|
| }
|
|
|
| void CanvasRenderingContext2D::drawImage(HTMLImageElement* image,
|
| float sx, float sy, float sw, float sh,
|
| - float dx, float dy, float dw, float dh, ExceptionState& es)
|
| + float dx, float dy, float dw, float dh, ExceptionState& exceptionState)
|
| {
|
| - drawImage(image, FloatRect(sx, sy, sw, sh), FloatRect(dx, dy, dw, dh), es);
|
| + drawImage(image, FloatRect(sx, sy, sw, sh), FloatRect(dx, dy, dw, dh), exceptionState);
|
| }
|
|
|
| -void CanvasRenderingContext2D::drawImage(HTMLImageElement* image, const FloatRect& srcRect, const FloatRect& dstRect, ExceptionState& es)
|
| +void CanvasRenderingContext2D::drawImage(HTMLImageElement* image, const FloatRect& srcRect, const FloatRect& dstRect, ExceptionState& exceptionState)
|
| {
|
| - drawImage(image, srcRect, dstRect, state().m_globalComposite, state().m_globalBlend, es);
|
| + drawImage(image, srcRect, dstRect, state().m_globalComposite, state().m_globalBlend, exceptionState);
|
| }
|
|
|
| -void CanvasRenderingContext2D::drawImage(HTMLImageElement* image, const FloatRect& srcRect, const FloatRect& dstRect, const CompositeOperator& op, const BlendMode& blendMode, ExceptionState& es)
|
| +void CanvasRenderingContext2D::drawImage(HTMLImageElement* image, const FloatRect& srcRect, const FloatRect& dstRect, const CompositeOperator& op, const BlendMode& blendMode, ExceptionState& exceptionState)
|
| {
|
| if (!image) {
|
| - es.throwUninformativeAndGenericDOMException(TypeMismatchError);
|
| + exceptionState.throwUninformativeAndGenericDOMException(TypeMismatchError);
|
| return;
|
| }
|
|
|
| @@ -1414,7 +1414,7 @@ void CanvasRenderingContext2D::drawImage(HTMLImageElement* image, const FloatRec
|
|
|
| LayoutSize size = sizeFor(image, ImageSizeBeforeDevicePixelRatio);
|
| if (!size.width() || !size.height()) {
|
| - es.throwUninformativeAndGenericDOMException(InvalidStateError);
|
| + exceptionState.throwUninformativeAndGenericDOMException(InvalidStateError);
|
| return;
|
| }
|
|
|
| @@ -1426,7 +1426,7 @@ void CanvasRenderingContext2D::drawImage(HTMLImageElement* image, const FloatRec
|
|
|
| FloatRect imageRect = FloatRect(FloatPoint(), size);
|
| if (!srcRect.width() || !srcRect.height()) {
|
| - es.throwUninformativeAndGenericDOMException(IndexSizeError);
|
| + exceptionState.throwUninformativeAndGenericDOMException(IndexSizeError);
|
| return;
|
| }
|
| if (!imageRect.intersects(normalizedSrcRect))
|
| @@ -1447,41 +1447,41 @@ void CanvasRenderingContext2D::drawImage(HTMLImageElement* image, const FloatRec
|
| drawImageInternal(imageForRendering, normalizedSrcRect, normalizedDstRect, op, blendMode);
|
| }
|
|
|
| -void CanvasRenderingContext2D::drawImage(HTMLCanvasElement* sourceCanvas, float x, float y, ExceptionState& es)
|
| +void CanvasRenderingContext2D::drawImage(HTMLCanvasElement* sourceCanvas, float x, float y, ExceptionState& exceptionState)
|
| {
|
| - drawImage(sourceCanvas, 0, 0, sourceCanvas->width(), sourceCanvas->height(), x, y, sourceCanvas->width(), sourceCanvas->height(), es);
|
| + drawImage(sourceCanvas, 0, 0, sourceCanvas->width(), sourceCanvas->height(), x, y, sourceCanvas->width(), sourceCanvas->height(), exceptionState);
|
| }
|
|
|
| void CanvasRenderingContext2D::drawImage(HTMLCanvasElement* sourceCanvas,
|
| - float x, float y, float width, float height, ExceptionState& es)
|
| + float x, float y, float width, float height, ExceptionState& exceptionState)
|
| {
|
| - drawImage(sourceCanvas, FloatRect(0, 0, sourceCanvas->width(), sourceCanvas->height()), FloatRect(x, y, width, height), es);
|
| + drawImage(sourceCanvas, FloatRect(0, 0, sourceCanvas->width(), sourceCanvas->height()), FloatRect(x, y, width, height), exceptionState);
|
| }
|
|
|
| void CanvasRenderingContext2D::drawImage(HTMLCanvasElement* sourceCanvas,
|
| float sx, float sy, float sw, float sh,
|
| - float dx, float dy, float dw, float dh, ExceptionState& es)
|
| + float dx, float dy, float dw, float dh, ExceptionState& exceptionState)
|
| {
|
| - drawImage(sourceCanvas, FloatRect(sx, sy, sw, sh), FloatRect(dx, dy, dw, dh), es);
|
| + drawImage(sourceCanvas, FloatRect(sx, sy, sw, sh), FloatRect(dx, dy, dw, dh), exceptionState);
|
| }
|
|
|
| void CanvasRenderingContext2D::drawImage(HTMLCanvasElement* sourceCanvas, const FloatRect& srcRect,
|
| - const FloatRect& dstRect, ExceptionState& es)
|
| + const FloatRect& dstRect, ExceptionState& exceptionState)
|
| {
|
| if (!sourceCanvas) {
|
| - es.throwUninformativeAndGenericDOMException(TypeMismatchError);
|
| + exceptionState.throwUninformativeAndGenericDOMException(TypeMismatchError);
|
| return;
|
| }
|
|
|
| FloatRect srcCanvasRect = FloatRect(FloatPoint(), sourceCanvas->size());
|
|
|
| if (!srcCanvasRect.width() || !srcCanvasRect.height()) {
|
| - es.throwUninformativeAndGenericDOMException(InvalidStateError);
|
| + exceptionState.throwUninformativeAndGenericDOMException(InvalidStateError);
|
| return;
|
| }
|
|
|
| if (!srcRect.width() || !srcRect.height()) {
|
| - es.throwUninformativeAndGenericDOMException(IndexSizeError);
|
| + exceptionState.throwUninformativeAndGenericDOMException(IndexSizeError);
|
| return;
|
| }
|
|
|
| @@ -1536,38 +1536,38 @@ void CanvasRenderingContext2D::drawImage(HTMLCanvasElement* sourceCanvas, const
|
| }
|
| }
|
|
|
| -void CanvasRenderingContext2D::drawImage(HTMLVideoElement* video, float x, float y, ExceptionState& es)
|
| +void CanvasRenderingContext2D::drawImage(HTMLVideoElement* video, float x, float y, ExceptionState& exceptionState)
|
| {
|
| if (!video) {
|
| - es.throwUninformativeAndGenericDOMException(TypeMismatchError);
|
| + exceptionState.throwUninformativeAndGenericDOMException(TypeMismatchError);
|
| return;
|
| }
|
| IntSize size = sizeFor(video);
|
| - drawImage(video, x, y, size.width(), size.height(), es);
|
| + drawImage(video, x, y, size.width(), size.height(), exceptionState);
|
| }
|
|
|
| void CanvasRenderingContext2D::drawImage(HTMLVideoElement* video,
|
| - float x, float y, float width, float height, ExceptionState& es)
|
| + float x, float y, float width, float height, ExceptionState& exceptionState)
|
| {
|
| if (!video) {
|
| - es.throwUninformativeAndGenericDOMException(TypeMismatchError);
|
| + exceptionState.throwUninformativeAndGenericDOMException(TypeMismatchError);
|
| return;
|
| }
|
| IntSize size = sizeFor(video);
|
| - drawImage(video, FloatRect(0, 0, size.width(), size.height()), FloatRect(x, y, width, height), es);
|
| + drawImage(video, FloatRect(0, 0, size.width(), size.height()), FloatRect(x, y, width, height), exceptionState);
|
| }
|
|
|
| void CanvasRenderingContext2D::drawImage(HTMLVideoElement* video,
|
| float sx, float sy, float sw, float sh,
|
| - float dx, float dy, float dw, float dh, ExceptionState& es)
|
| + float dx, float dy, float dw, float dh, ExceptionState& exceptionState)
|
| {
|
| - drawImage(video, FloatRect(sx, sy, sw, sh), FloatRect(dx, dy, dw, dh), es);
|
| + drawImage(video, FloatRect(sx, sy, sw, sh), FloatRect(dx, dy, dw, dh), exceptionState);
|
| }
|
|
|
| -void CanvasRenderingContext2D::drawImage(HTMLVideoElement* video, const FloatRect& srcRect, const FloatRect& dstRect, ExceptionState& es)
|
| +void CanvasRenderingContext2D::drawImage(HTMLVideoElement* video, const FloatRect& srcRect, const FloatRect& dstRect, ExceptionState& exceptionState)
|
| {
|
| if (!video) {
|
| - es.throwUninformativeAndGenericDOMException(TypeMismatchError);
|
| + exceptionState.throwUninformativeAndGenericDOMException(TypeMismatchError);
|
| return;
|
| }
|
|
|
| @@ -1576,7 +1576,7 @@ void CanvasRenderingContext2D::drawImage(HTMLVideoElement* video, const FloatRec
|
|
|
| FloatRect videoRect = FloatRect(FloatPoint(), sizeFor(video));
|
| if (!srcRect.width() || !srcRect.height()) {
|
| - es.throwUninformativeAndGenericDOMException(IndexSizeError);
|
| + exceptionState.throwUninformativeAndGenericDOMException(IndexSizeError);
|
| return;
|
| }
|
|
|
| @@ -1697,10 +1697,10 @@ template<class T> void CanvasRenderingContext2D::fullCanvasCompositedFill(const
|
| c->endLayer();
|
| }
|
|
|
| -PassRefPtr<CanvasGradient> CanvasRenderingContext2D::createLinearGradient(float x0, float y0, float x1, float y1, ExceptionState& es)
|
| +PassRefPtr<CanvasGradient> CanvasRenderingContext2D::createLinearGradient(float x0, float y0, float x1, float y1, ExceptionState& exceptionState)
|
| {
|
| if (!std::isfinite(x0) || !std::isfinite(y0) || !std::isfinite(x1) || !std::isfinite(y1)) {
|
| - es.throwUninformativeAndGenericDOMException(NotSupportedError);
|
| + exceptionState.throwUninformativeAndGenericDOMException(NotSupportedError);
|
| return 0;
|
| }
|
|
|
| @@ -1708,15 +1708,15 @@ PassRefPtr<CanvasGradient> CanvasRenderingContext2D::createLinearGradient(float
|
| return gradient.release();
|
| }
|
|
|
| -PassRefPtr<CanvasGradient> CanvasRenderingContext2D::createRadialGradient(float x0, float y0, float r0, float x1, float y1, float r1, ExceptionState& es)
|
| +PassRefPtr<CanvasGradient> CanvasRenderingContext2D::createRadialGradient(float x0, float y0, float r0, float x1, float y1, float r1, ExceptionState& exceptionState)
|
| {
|
| if (!std::isfinite(x0) || !std::isfinite(y0) || !std::isfinite(r0) || !std::isfinite(x1) || !std::isfinite(y1) || !std::isfinite(r1)) {
|
| - es.throwUninformativeAndGenericDOMException(NotSupportedError);
|
| + exceptionState.throwUninformativeAndGenericDOMException(NotSupportedError);
|
| return 0;
|
| }
|
|
|
| if (r0 < 0 || r1 < 0) {
|
| - es.throwUninformativeAndGenericDOMException(IndexSizeError);
|
| + exceptionState.throwUninformativeAndGenericDOMException(IndexSizeError);
|
| return 0;
|
| }
|
|
|
| @@ -1725,15 +1725,15 @@ PassRefPtr<CanvasGradient> CanvasRenderingContext2D::createRadialGradient(float
|
| }
|
|
|
| PassRefPtr<CanvasPattern> CanvasRenderingContext2D::createPattern(HTMLImageElement* image,
|
| - const String& repetitionType, ExceptionState& es)
|
| + const String& repetitionType, ExceptionState& exceptionState)
|
| {
|
| if (!image) {
|
| - es.throwUninformativeAndGenericDOMException(TypeMismatchError);
|
| + exceptionState.throwUninformativeAndGenericDOMException(TypeMismatchError);
|
| return 0;
|
| }
|
| bool repeatX, repeatY;
|
| - CanvasPattern::parseRepetitionType(repetitionType, repeatX, repeatY, es);
|
| - if (es.hadException())
|
| + CanvasPattern::parseRepetitionType(repetitionType, repeatX, repeatY, exceptionState);
|
| + if (exceptionState.hadException())
|
| return 0;
|
|
|
| if (!image->complete())
|
| @@ -1753,20 +1753,20 @@ PassRefPtr<CanvasPattern> CanvasRenderingContext2D::createPattern(HTMLImageEleme
|
| }
|
|
|
| PassRefPtr<CanvasPattern> CanvasRenderingContext2D::createPattern(HTMLCanvasElement* canvas,
|
| - const String& repetitionType, ExceptionState& es)
|
| + const String& repetitionType, ExceptionState& exceptionState)
|
| {
|
| if (!canvas) {
|
| - es.throwUninformativeAndGenericDOMException(TypeMismatchError);
|
| + exceptionState.throwUninformativeAndGenericDOMException(TypeMismatchError);
|
| return 0;
|
| }
|
| if (!canvas->width() || !canvas->height()) {
|
| - es.throwUninformativeAndGenericDOMException(InvalidStateError);
|
| + exceptionState.throwUninformativeAndGenericDOMException(InvalidStateError);
|
| return 0;
|
| }
|
|
|
| bool repeatX, repeatY;
|
| - CanvasPattern::parseRepetitionType(repetitionType, repeatX, repeatY, es);
|
| - if (es.hadException())
|
| + CanvasPattern::parseRepetitionType(repetitionType, repeatX, repeatY, exceptionState);
|
| + if (exceptionState.hadException())
|
| return 0;
|
| return CanvasPattern::create(canvas->copiedImage(), repeatX, repeatY, canvas->originClean());
|
| }
|
| @@ -1837,24 +1837,24 @@ static PassRefPtr<ImageData> createEmptyImageData(const IntSize& size)
|
| return data.release();
|
| }
|
|
|
| -PassRefPtr<ImageData> CanvasRenderingContext2D::createImageData(PassRefPtr<ImageData> imageData, ExceptionState& es) const
|
| +PassRefPtr<ImageData> CanvasRenderingContext2D::createImageData(PassRefPtr<ImageData> imageData, ExceptionState& exceptionState) const
|
| {
|
| if (!imageData) {
|
| - es.throwUninformativeAndGenericDOMException(NotSupportedError);
|
| + exceptionState.throwUninformativeAndGenericDOMException(NotSupportedError);
|
| return 0;
|
| }
|
|
|
| return createEmptyImageData(imageData->size());
|
| }
|
|
|
| -PassRefPtr<ImageData> CanvasRenderingContext2D::createImageData(float sw, float sh, ExceptionState& es) const
|
| +PassRefPtr<ImageData> CanvasRenderingContext2D::createImageData(float sw, float sh, ExceptionState& exceptionState) const
|
| {
|
| if (!sw || !sh) {
|
| - es.throwUninformativeAndGenericDOMException(IndexSizeError);
|
| + exceptionState.throwUninformativeAndGenericDOMException(IndexSizeError);
|
| return 0;
|
| }
|
| if (!std::isfinite(sw) || !std::isfinite(sh)) {
|
| - es.throwUninformativeAndGenericDOMException(NotSupportedError);
|
| + exceptionState.throwUninformativeAndGenericDOMException(NotSupportedError);
|
| return 0;
|
| }
|
|
|
| @@ -1871,29 +1871,29 @@ PassRefPtr<ImageData> CanvasRenderingContext2D::createImageData(float sw, float
|
| return createEmptyImageData(size);
|
| }
|
|
|
| -PassRefPtr<ImageData> CanvasRenderingContext2D::getImageData(float sx, float sy, float sw, float sh, ExceptionState& es) const
|
| +PassRefPtr<ImageData> CanvasRenderingContext2D::getImageData(float sx, float sy, float sw, float sh, ExceptionState& exceptionState) const
|
| {
|
| - return getImageData(ImageBuffer::LogicalCoordinateSystem, sx, sy, sw, sh, es);
|
| + return getImageData(ImageBuffer::LogicalCoordinateSystem, sx, sy, sw, sh, exceptionState);
|
| }
|
|
|
| -PassRefPtr<ImageData> CanvasRenderingContext2D::webkitGetImageDataHD(float sx, float sy, float sw, float sh, ExceptionState& es) const
|
| +PassRefPtr<ImageData> CanvasRenderingContext2D::webkitGetImageDataHD(float sx, float sy, float sw, float sh, ExceptionState& exceptionState) const
|
| {
|
| - return getImageData(ImageBuffer::BackingStoreCoordinateSystem, sx, sy, sw, sh, es);
|
| + return getImageData(ImageBuffer::BackingStoreCoordinateSystem, sx, sy, sw, sh, exceptionState);
|
| }
|
|
|
| -PassRefPtr<ImageData> CanvasRenderingContext2D::getImageData(ImageBuffer::CoordinateSystem coordinateSystem, float sx, float sy, float sw, float sh, ExceptionState& es) const
|
| +PassRefPtr<ImageData> CanvasRenderingContext2D::getImageData(ImageBuffer::CoordinateSystem coordinateSystem, float sx, float sy, float sw, float sh, ExceptionState& exceptionState) const
|
| {
|
| if (!canvas()->originClean()) {
|
| - es.throwSecurityError(ExceptionMessages::failedToExecute("getImageData", "CanvasRenderingContext2D", "the canvas has been tainted by cross-origin data."));
|
| + exceptionState.throwSecurityError(ExceptionMessages::failedToExecute("getImageData", "CanvasRenderingContext2D", "the canvas has been tainted by cross-origin data."));
|
| return 0;
|
| }
|
|
|
| if (!sw || !sh) {
|
| - es.throwUninformativeAndGenericDOMException(IndexSizeError);
|
| + exceptionState.throwUninformativeAndGenericDOMException(IndexSizeError);
|
| return 0;
|
| }
|
| if (!std::isfinite(sx) || !std::isfinite(sy) || !std::isfinite(sw) || !std::isfinite(sh)) {
|
| - es.throwUninformativeAndGenericDOMException(NotSupportedError);
|
| + exceptionState.throwUninformativeAndGenericDOMException(NotSupportedError);
|
| return 0;
|
| }
|
|
|
| @@ -1926,44 +1926,44 @@ PassRefPtr<ImageData> CanvasRenderingContext2D::getImageData(ImageBuffer::Coordi
|
| return ImageData::create(imageDataRect.size(), byteArray.release());
|
| }
|
|
|
| -void CanvasRenderingContext2D::putImageData(ImageData* data, float dx, float dy, ExceptionState& es)
|
| +void CanvasRenderingContext2D::putImageData(ImageData* data, float dx, float dy, ExceptionState& exceptionState)
|
| {
|
| if (!data) {
|
| - es.throwUninformativeAndGenericDOMException(TypeMismatchError);
|
| + exceptionState.throwUninformativeAndGenericDOMException(TypeMismatchError);
|
| return;
|
| }
|
| - putImageData(data, dx, dy, 0, 0, data->width(), data->height(), es);
|
| + putImageData(data, dx, dy, 0, 0, data->width(), data->height(), exceptionState);
|
| }
|
|
|
| -void CanvasRenderingContext2D::webkitPutImageDataHD(ImageData* data, float dx, float dy, ExceptionState& es)
|
| +void CanvasRenderingContext2D::webkitPutImageDataHD(ImageData* data, float dx, float dy, ExceptionState& exceptionState)
|
| {
|
| if (!data) {
|
| - es.throwUninformativeAndGenericDOMException(TypeMismatchError);
|
| + exceptionState.throwUninformativeAndGenericDOMException(TypeMismatchError);
|
| return;
|
| }
|
| - webkitPutImageDataHD(data, dx, dy, 0, 0, data->width(), data->height(), es);
|
| + webkitPutImageDataHD(data, dx, dy, 0, 0, data->width(), data->height(), exceptionState);
|
| }
|
|
|
| void CanvasRenderingContext2D::putImageData(ImageData* data, float dx, float dy, float dirtyX, float dirtyY,
|
| - float dirtyWidth, float dirtyHeight, ExceptionState& es)
|
| + float dirtyWidth, float dirtyHeight, ExceptionState& exceptionState)
|
| {
|
| - putImageData(data, ImageBuffer::LogicalCoordinateSystem, dx, dy, dirtyX, dirtyY, dirtyWidth, dirtyHeight, es);
|
| + putImageData(data, ImageBuffer::LogicalCoordinateSystem, dx, dy, dirtyX, dirtyY, dirtyWidth, dirtyHeight, exceptionState);
|
| }
|
|
|
| -void CanvasRenderingContext2D::webkitPutImageDataHD(ImageData* data, float dx, float dy, float dirtyX, float dirtyY, float dirtyWidth, float dirtyHeight, ExceptionState& es)
|
| +void CanvasRenderingContext2D::webkitPutImageDataHD(ImageData* data, float dx, float dy, float dirtyX, float dirtyY, float dirtyWidth, float dirtyHeight, ExceptionState& exceptionState)
|
| {
|
| - putImageData(data, ImageBuffer::BackingStoreCoordinateSystem, dx, dy, dirtyX, dirtyY, dirtyWidth, dirtyHeight, es);
|
| + putImageData(data, ImageBuffer::BackingStoreCoordinateSystem, dx, dy, dirtyX, dirtyY, dirtyWidth, dirtyHeight, exceptionState);
|
| }
|
|
|
| void CanvasRenderingContext2D::putImageData(ImageData* data, ImageBuffer::CoordinateSystem coordinateSystem, float dx, float dy, float dirtyX, float dirtyY,
|
| - float dirtyWidth, float dirtyHeight, ExceptionState& es)
|
| + float dirtyWidth, float dirtyHeight, ExceptionState& exceptionState)
|
| {
|
| if (!data) {
|
| - es.throwUninformativeAndGenericDOMException(TypeMismatchError);
|
| + exceptionState.throwUninformativeAndGenericDOMException(TypeMismatchError);
|
| return;
|
| }
|
| if (!std::isfinite(dx) || !std::isfinite(dy) || !std::isfinite(dirtyX) || !std::isfinite(dirtyY) || !std::isfinite(dirtyWidth) || !std::isfinite(dirtyHeight)) {
|
| - es.throwUninformativeAndGenericDOMException(NotSupportedError);
|
| + exceptionState.throwUninformativeAndGenericDOMException(NotSupportedError);
|
| return;
|
| }
|
|
|
|
|