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 bb018a9d1a1b2348b78aba790d66a9c908f4d826..fe33b85a57862b2e1dc5b6a7b6e3ff6d3c44101c 100644 |
--- a/third_party/WebKit/Source/core/html/ImageData.cpp |
+++ b/third_party/WebKit/Source/core/html/ImageData.cpp |
@@ -205,12 +205,12 @@ ImageData* ImageData::createForTest(const IntSize& size) { |
} |
ImageData* ImageData::create(const IntSize& size, |
- DOMUint8ClampedArray* byteArray) { |
+ const NotShared<DOMUint8ClampedArray>& byteArray) { |
if (!ImageData::validateConstructorArguments(kParamSize | kParamData, &size, |
- 0, 0, byteArray)) |
+ 0, 0, byteArray.view())) |
return nullptr; |
- return new ImageData(size, byteArray); |
+ return new ImageData(size, byteArray.view()); |
} |
ImageData* ImageData::create(unsigned width, |
@@ -226,27 +226,28 @@ ImageData* ImageData::create(unsigned width, |
return byteArray ? new ImageData(IntSize(width, height), byteArray) : nullptr; |
} |
-ImageData* ImageData::create(DOMUint8ClampedArray* data, |
+ImageData* ImageData::create(const NotShared<DOMUint8ClampedArray>& data, |
unsigned width, |
ExceptionState& exceptionState) { |
- if (!ImageData::validateConstructorArguments( |
- kParamData | kParamWidth, nullptr, width, 0, data, &exceptionState)) |
+ if (!ImageData::validateConstructorArguments(kParamData | kParamWidth, |
+ nullptr, width, 0, data.view(), |
+ &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(const NotShared<DOMUint8ClampedArray>& data, |
unsigned width, |
unsigned height, |
ExceptionState& exceptionState) { |
if (!ImageData::validateConstructorArguments( |
- kParamData | kParamWidth | kParamHeight, nullptr, width, height, data, |
- &exceptionState)) |
+ kParamData | kParamWidth | kParamHeight, nullptr, width, height, |
+ data.view(), &exceptionState)) |
return nullptr; |
- return new ImageData(IntSize(width, height), data); |
+ return new ImageData(IntSize(width, height), data.view()); |
} |
ImageData* ImageData::createImageData( |
@@ -278,11 +279,11 @@ ImageData* ImageData::createImageData( |
ExceptionState& exceptionState) { |
DOMArrayBufferView* bufferView = nullptr; |
if (data.isUint8ClampedArray()) |
- bufferView = data.getAsUint8ClampedArray(); |
+ bufferView = data.getAsUint8ClampedArray().view(); |
else if (data.isUint16Array()) |
- bufferView = data.getAsUint16Array(); |
+ bufferView = data.getAsUint16Array().view(); |
else if (data.isFloat32Array()) |
- bufferView = data.getAsFloat32Array(); |
+ bufferView = data.getAsFloat32Array().view(); |
else |
NOTREACHED(); |