| Index: third_party/WebKit/Source/core/html/ImageData.cpp
|
| diff --git a/third_party/WebKit/Source/core/html/ImageData.cpp b/third_party/WebKit/Source/core/html/ImageData.cpp
|
| index 7d26541bd3169eb8691f61f4141638b21d9b1d07..2dee26e7886b3c52ea0e1469f640ca3800d0a012 100644
|
| --- a/third_party/WebKit/Source/core/html/ImageData.cpp
|
| +++ b/third_party/WebKit/Source/core/html/ImageData.cpp
|
| @@ -227,12 +227,13 @@ ImageData* ImageData::create(const IntSize& size,
|
| }
|
|
|
| ImageData* ImageData::create(const IntSize& size,
|
| - DOMArrayBufferView* dataArray,
|
| + NotShared<DOMArrayBufferView> dataArray,
|
| const ImageDataColorSettings* colorSettings) {
|
| if (!ImageData::validateConstructorArguments(kParamSize | kParamData, &size,
|
| - 0, 0, dataArray, colorSettings))
|
| + 0, 0, dataArray.view(),
|
| + colorSettings))
|
| return nullptr;
|
| - return new ImageData(size, dataArray, colorSettings);
|
| + return new ImageData(size, dataArray.view(), colorSettings);
|
| }
|
|
|
| ImageData* ImageData::create(unsigned width,
|
| @@ -248,28 +249,28 @@ ImageData* ImageData::create(unsigned width,
|
| return byteArray ? new ImageData(IntSize(width, height), byteArray) : nullptr;
|
| }
|
|
|
| -ImageData* ImageData::create(DOMUint8ClampedArray* data,
|
| +ImageData* ImageData::create(NotShared<DOMUint8ClampedArray> data,
|
| unsigned width,
|
| ExceptionState& exceptionState) {
|
| if (!ImageData::validateConstructorArguments(kParamData | kParamWidth,
|
| - nullptr, width, 0, data, nullptr,
|
| - &exceptionState))
|
| + nullptr, width, 0, data.view(),
|
| + nullptr, &exceptionState))
|
| return nullptr;
|
|
|
| - unsigned height = data->length() / (width * 4);
|
| - return new ImageData(IntSize(width, height), data);
|
| + unsigned height = data.view()->length() / (width * 4);
|
| + return new ImageData(IntSize(width, height), data.view());
|
| }
|
|
|
| -ImageData* ImageData::create(DOMUint8ClampedArray* data,
|
| +ImageData* ImageData::create(NotShared<DOMUint8ClampedArray> data,
|
| unsigned width,
|
| unsigned height,
|
| ExceptionState& exceptionState) {
|
| if (!ImageData::validateConstructorArguments(
|
| - kParamData | kParamWidth | kParamHeight, nullptr, width, height, data,
|
| - nullptr, &exceptionState))
|
| + kParamData | kParamWidth | kParamHeight, nullptr, width, height,
|
| + data.view(), nullptr, &exceptionState))
|
| return nullptr;
|
|
|
| - return new ImageData(IntSize(width, height), data);
|
| + return new ImageData(IntSize(width, height), data.view());
|
| }
|
|
|
| ImageData* ImageData::createImageData(
|
| @@ -305,13 +306,13 @@ ImageData* ImageData::createImageData(ImageDataArray& data,
|
| String storageFormatName;
|
|
|
| if (data.isUint8ClampedArray()) {
|
| - bufferView = data.getAsUint8ClampedArray();
|
| + bufferView = data.getAsUint8ClampedArray().view();
|
| storageFormatName = kUint8ClampedArrayStorageFormatName;
|
| } else if (data.isUint16Array()) {
|
| - bufferView = data.getAsUint16Array();
|
| + bufferView = data.getAsUint16Array().view();
|
| storageFormatName = kUint16ArrayStorageFormatName;
|
| } else if (data.isFloat32Array()) {
|
| - bufferView = data.getAsFloat32Array();
|
| + bufferView = data.getAsFloat32Array().view();
|
| storageFormatName = kFloat32ArrayStorageFormatName;
|
| } else {
|
| NOTREACHED();
|
|
|