webkitgtk-2.16.5HEADwebkitgtk-2.16.5master

1 files changed, 9 insertions, 10 deletions

diff --git a/Source/WebCore/html/ImageData.h b/Source/WebCore/html/ImageData.h
index a90077938..6b8676808 100644
--- a/Source/WebCore/html/ImageData.h
+++ b/Source/WebCore/html/ImageData.h
@@ -10,7 +10,7 @@
  * 2.  Redistributions in binary form must reproduce the above copyright
  *     notice, this list of conditions and the following disclaimer in the
  *     documentation and/or other materials provided with the distribution.
- * 3.  Neither the name of Apple Computer, Inc. ("Apple") nor the names of
+ * 3.  Neither the name of Apple Inc. ("Apple") nor the names of
  *     its contributors may be used to endorse or promote products derived
  *     from this software without specific prior written permission.
  *
@@ -26,34 +26,33 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef ImageData_h
-#define ImageData_h
+#pragma once
 
+#include "ExceptionOr.h"
 #include "IntSize.h"
 #include <runtime/Uint8ClampedArray.h>
-#include <wtf/RefCounted.h>
-#include <wtf/RefPtr.h>
 
 namespace WebCore {
 
 class ImageData : public RefCounted<ImageData> {
 public:
-    static PassRefPtr<ImageData> create(const IntSize&);
-    static PassRefPtr<ImageData> create(const IntSize&, PassRefPtr<Uint8ClampedArray>);
+    static ExceptionOr<Ref<ImageData>> create(unsigned sw, unsigned sh);
+    static RefPtr<ImageData> create(const IntSize&);
+    static RefPtr<ImageData> create(const IntSize&, Ref<Uint8ClampedArray>&&);
+    static ExceptionOr<RefPtr<ImageData>> create(Ref<Uint8ClampedArray>&&, unsigned sw, unsigned sh);
 
     IntSize size() const { return m_size; }
     int width() const { return m_size.width(); }
     int height() const { return m_size.height(); }
+
     Uint8ClampedArray* data() const { return m_data.get(); }
 
 private:
     explicit ImageData(const IntSize&);
-    ImageData(const IntSize&, PassRefPtr<Uint8ClampedArray>);
+    ImageData(const IntSize&, Ref<Uint8ClampedArray>&&);
 
     IntSize m_size;
     RefPtr<Uint8ClampedArray> m_data;
 };
 
 } // namespace WebCore
-
-#endif // ImageData_h