Oilpan: keep ImageData on the heap by default.

Source/core/html/ImageData.cpp

 /*
  * Copyright (C) 2008 Apple 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:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 18 matching lines @@
 #include "config.h"
 #include "core/html/ImageData.h"
 
 #include "bindings/core/v8/ExceptionState.h"
 #include "bindings/core/v8/V8Uint8ClampedArray.h"
 #include "core/dom/ExceptionCode.h"
 #include "platform/RuntimeEnabledFeatures.h"
 
 namespace blink {
 
-PassRefPtrWillBeRawPtr<ImageData> ImageData::create(const IntSize& size)
+ImageData* ImageData::create(const IntSize& size)
 {
     Checked<int, RecordOverflow> dataSize = 4;
     dataSize *= size.width();
     dataSize *= size.height();
     if (dataSize.hasOverflowed())
         return nullptr;
 
-    return adoptRefWillBeNoop(new ImageData(size));
+    return new ImageData(size);
 }
 
-PassRefPtrWillBeRawPtr<ImageData> ImageData::create(const IntSize& size, PassRefPtr<DOMUint8ClampedArray> byteArray)
+ImageData* ImageData::create(const IntSize& size, PassRefPtr<DOMUint8ClampedArray> byteArray)
 {
     Checked<int, RecordOverflow> dataSize = 4;
     dataSize *= size.width();
     dataSize *= size.height();
     if (dataSize.hasOverflowed())
         return nullptr;
 
     if (dataSize.unsafeGet() < 0
         || static_cast<unsigned>(dataSize.unsafeGet()) > byteArray->length())
         return nullptr;
 
-    return adoptRefWillBeNoop(new ImageData(size, byteArray));
+    return new ImageData(size, byteArray);
 }
 
-PassRefPtrWillBeRawPtr<ImageData> ImageData::create(unsigned width, unsigned height, ExceptionState& exceptionState)
+ImageData* ImageData::create(unsigned width, unsigned height, ExceptionState& exceptionState)
 {
     if (!RuntimeEnabledFeatures::imageDataConstructorEnabled()) {
         exceptionState.throwTypeError("Illegal constructor");
         return nullptr;
     }
     if (!width || !height) {
         exceptionState.throwDOMException(IndexSizeError, String::format("The source %s is zero or not a number.", width ? "height" : "width"));
         return nullptr;
     }
 
     Checked<unsigned, RecordOverflow> dataSize = 4;
     dataSize *= width;
     dataSize *= height;
     if (dataSize.hasOverflowed()) {
         exceptionState.throwDOMException(IndexSizeError, "The requested image size exceeds the supported range.");
         return nullptr;
     }
 
-    return adoptRefWillBeNoop(new ImageData(IntSize(width, height)));
+    return new ImageData(IntSize(width, height));
 }
 
 bool ImageData::validateConstructorArguments(DOMUint8ClampedArray* data, unsigned width, unsigned& lengthInPixels, ExceptionState& exceptionState)
 {
     if (!width) {
         exceptionState.throwDOMException(IndexSizeError, "The source width is zero or not a number.");
         return false;
     }
     ASSERT(data);
     unsigned length = data->length();
     if (!length) {
         exceptionState.throwDOMException(IndexSizeError, "The input data has a zero byte length.");
         return false;
     }
     if (length % 4) {
         exceptionState.throwDOMException(IndexSizeError, "The input data byte length is not a multiple of 4.");
         return false;
     }
     length /= 4;
     if (length % width) {
         exceptionState.throwDOMException(IndexSizeError, "The input data byte length is not a multiple of (4 * width).");
         return false;
     }
     lengthInPixels = length;
     return true;
 }
 
-PassRefPtrWillBeRawPtr<ImageData> ImageData::create(DOMUint8ClampedArray* data, unsigned width, ExceptionState& exceptionState)
+ImageData* ImageData::create(DOMUint8ClampedArray* data, unsigned width, ExceptionState& exceptionState)
 {
     if (!RuntimeEnabledFeatures::imageDataConstructorEnabled()) {
         exceptionState.throwTypeError("Illegal constructor");
         return nullptr;
     }
     unsigned lengthInPixels = 0;
     if (!validateConstructorArguments(data, width, lengthInPixels, exceptionState)) {
         ASSERT(exceptionState.hadException());
         return nullptr;
     }
     ASSERT(lengthInPixels && width);
     unsigned height = lengthInPixels / width;
-    return adoptRefWillBeNoop(new ImageData(IntSize(width, height), data));
+    return new ImageData(IntSize(width, height), data);
 }
 
-PassRefPtrWillBeRawPtr<ImageData> ImageData::create(DOMUint8ClampedArray* data, unsigned width, unsigned height, ExceptionState& exceptionState)
+ImageData* ImageData::create(DOMUint8ClampedArray* data, unsigned width, unsigned height, ExceptionState& exceptionState)
 {
     if (!RuntimeEnabledFeatures::imageDataConstructorEnabled()) {
         exceptionState.throwTypeError("Illegal constructor");
         return nullptr;
     }
     unsigned lengthInPixels = 0;
     if (!validateConstructorArguments(data, width, lengthInPixels, exceptionState)) {
         ASSERT(exceptionState.hadException());
         return nullptr;
     }
     ASSERT(lengthInPixels && width);
     if (height != lengthInPixels / width) {
         exceptionState.throwDOMException(IndexSizeError, "The input data byte length is not equal to (4 * width * height).");
         return nullptr;
     }
-    return adoptRefWillBeNoop(new ImageData(IntSize(width, height), data));
+    return new ImageData(IntSize(width, height), data);
 }
 
 v8::Local<v8::Object> ImageData::associateWithWrapper(v8::Isolate* isolate, const WrapperTypeInfo* wrapperType, v8::Local<v8::Object> wrapper)
 {
     ScriptWrappable::associateWithWrapper(isolate, wrapperType, wrapper);
 
     if (!wrapper.IsEmpty() && m_data.get()) {
         // Create a V8 Uint8ClampedArray object and set the "data" property
         // of the ImageData object to the created v8 object, eliminating the
         // C++ callback when accessing the "data" property.
@@ skipping 10 matching lines @@
 {
 }
 
 ImageData::ImageData(const IntSize& size, PassRefPtr<DOMUint8ClampedArray> byteArray)
     : m_size(size)
     , m_data(byteArray)
 {
     ASSERT_WITH_SECURITY_IMPLICATION(static_cast<unsigned>(size.width() * size.height() * 4) <= m_data->length());
 }
 
+void ImageData::dispose()
+{
+    m_data.clear();
+}
+
 } // namespace blink