Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(489)

Side by Side Diff: Source/core/html/ImageData.h

Issue 871563003: Fix ImageData constructor infelicity. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « LayoutTests/fast/canvas/resources/canvas-ImageData.js ('k') | Source/core/html/ImageData.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2008, 2009 Apple Inc. All rights reserved. 2 * Copyright (C) 2008, 2009 Apple Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 28 matching lines...) Expand all
39 namespace blink { 39 namespace blink {
40 40
41 class ExceptionState; 41 class ExceptionState;
42 42
43 class ImageData final : public RefCountedWillBeGarbageCollectedFinalized<ImageDa ta>, public ScriptWrappable { 43 class ImageData final : public RefCountedWillBeGarbageCollectedFinalized<ImageDa ta>, public ScriptWrappable {
44 DEFINE_WRAPPERTYPEINFO(); 44 DEFINE_WRAPPERTYPEINFO();
45 public: 45 public:
46 static PassRefPtrWillBeRawPtr<ImageData> create(const IntSize&); 46 static PassRefPtrWillBeRawPtr<ImageData> create(const IntSize&);
47 static PassRefPtrWillBeRawPtr<ImageData> create(const IntSize&, PassRefPtr<D OMUint8ClampedArray>); 47 static PassRefPtrWillBeRawPtr<ImageData> create(const IntSize&, PassRefPtr<D OMUint8ClampedArray>);
48 static PassRefPtrWillBeRawPtr<ImageData> create(unsigned width, unsigned hei ght, ExceptionState&); 48 static PassRefPtrWillBeRawPtr<ImageData> create(unsigned width, unsigned hei ght, ExceptionState&);
49 static PassRefPtrWillBeRawPtr<ImageData> create(DOMUint8ClampedArray*, unsig ned width, ExceptionState&);
49 static PassRefPtrWillBeRawPtr<ImageData> create(DOMUint8ClampedArray*, unsig ned width, unsigned height, ExceptionState&); 50 static PassRefPtrWillBeRawPtr<ImageData> create(DOMUint8ClampedArray*, unsig ned width, unsigned height, ExceptionState&);
50 51
51 IntSize size() const { return m_size; } 52 IntSize size() const { return m_size; }
52 int width() const { return m_size.width(); } 53 int width() const { return m_size.width(); }
53 int height() const { return m_size.height(); } 54 int height() const { return m_size.height(); }
54 const DOMUint8ClampedArray* data() const { return m_data.get(); } 55 const DOMUint8ClampedArray* data() const { return m_data.get(); }
55 DOMUint8ClampedArray* data() { return m_data.get(); } 56 DOMUint8ClampedArray* data() { return m_data.get(); }
56 57
57 void trace(Visitor*) { } 58 void trace(Visitor*) { }
58 59
59 virtual v8::Handle<v8::Object> associateWithWrapper(v8::Isolate*, const Wrap perTypeInfo*, v8::Handle<v8::Object> wrapper) override; 60 virtual v8::Handle<v8::Object> associateWithWrapper(v8::Isolate*, const Wrap perTypeInfo*, v8::Handle<v8::Object> wrapper) override;
60 61
61 private: 62 private:
62 explicit ImageData(const IntSize&); 63 explicit ImageData(const IntSize&);
63 ImageData(const IntSize&, PassRefPtr<DOMUint8ClampedArray>); 64 ImageData(const IntSize&, PassRefPtr<DOMUint8ClampedArray>);
64 65
66 static bool validateConstructorArguments(DOMUint8ClampedArray*, unsigned wid th, unsigned&, ExceptionState&);
67
65 IntSize m_size; 68 IntSize m_size;
66 RefPtr<DOMUint8ClampedArray> m_data; 69 RefPtr<DOMUint8ClampedArray> m_data;
67 }; 70 };
68 71
69 } // namespace blink 72 } // namespace blink
70 73
71 #endif // ImageData_h 74 #endif // ImageData_h
OLDNEW
« no previous file with comments | « LayoutTests/fast/canvas/resources/canvas-ImageData.js ('k') | Source/core/html/ImageData.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698