| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (c) 2013, Google Inc. All rights reserved. | 2 * Copyright (c) 2013, Google 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 are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * 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 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 14 matching lines...) Expand all Loading... |
| 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
| 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 29 */ | 29 */ |
| 30 | 30 |
| 31 #include "config.h" | 31 #include "config.h" |
| 32 #include "core/frame/ImageBitmap.h" | 32 #include "core/frame/ImageBitmap.h" |
| 33 | 33 |
| 34 #include "SkPixelRef.h" // FIXME: qualify this skia header file. | 34 #include "SkPixelRef.h" // FIXME: qualify this skia header file. |
| 35 #include "bindings/core/v8/UnionTypesCore.h" |
| 35 #include "core/dom/Document.h" | 36 #include "core/dom/Document.h" |
| 36 #include "core/fetch/ImageResource.h" | 37 #include "core/fetch/ImageResource.h" |
| 37 #include "core/fetch/MemoryCache.h" | 38 #include "core/fetch/MemoryCache.h" |
| 38 #include "core/fetch/MockImageResourceClient.h" | 39 #include "core/fetch/MockImageResourceClient.h" |
| 39 #include "core/fetch/ResourcePtr.h" | 40 #include "core/fetch/ResourcePtr.h" |
| 40 #include "core/html/HTMLCanvasElement.h" | 41 #include "core/html/HTMLCanvasElement.h" |
| 41 #include "core/html/HTMLImageElement.h" | 42 #include "core/html/HTMLImageElement.h" |
| 43 #include "core/html/HTMLVideoElement.h" |
| 42 #include "core/html/canvas/CanvasRenderingContext2D.h" | 44 #include "core/html/canvas/CanvasRenderingContext2D.h" |
| 43 #include "platform/graphics/BitmapImage.h" | 45 #include "platform/graphics/BitmapImage.h" |
| 44 #include "platform/graphics/skia/NativeImageSkia.h" | 46 #include "platform/graphics/skia/NativeImageSkia.h" |
| 45 #include "platform/heap/Handle.h" | 47 #include "platform/heap/Handle.h" |
| 46 #include "platform/network/ResourceRequest.h" | 48 #include "platform/network/ResourceRequest.h" |
| 47 #include "wtf/OwnPtr.h" | 49 #include "wtf/OwnPtr.h" |
| 48 | 50 |
| 49 #include <gtest/gtest.h> | 51 #include <gtest/gtest.h> |
| 50 | 52 |
| 51 namespace blink { | 53 namespace blink { |
| (...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 200 RefPtrWillBeRawPtr<HTMLCanvasElement> canvasElement = HTMLCanvasElement::cre
ate(*Document::create().get()); | 202 RefPtrWillBeRawPtr<HTMLCanvasElement> canvasElement = HTMLCanvasElement::cre
ate(*Document::create().get()); |
| 201 canvasElement->setHeight(40); | 203 canvasElement->setHeight(40); |
| 202 canvasElement->setWidth(40); | 204 canvasElement->setWidth(40); |
| 203 RefPtrWillBeRawPtr<ImageBitmap> imageBitmapDerived = nullptr; | 205 RefPtrWillBeRawPtr<ImageBitmap> imageBitmapDerived = nullptr; |
| 204 { | 206 { |
| 205 RefPtrWillBeRawPtr<ImageBitmap> imageBitmapFromCanvas = ImageBitmap::cre
ate(canvasElement.get(), IntRect(0, 0, canvasElement->width(), canvasElement->he
ight())); | 207 RefPtrWillBeRawPtr<ImageBitmap> imageBitmapFromCanvas = ImageBitmap::cre
ate(canvasElement.get(), IntRect(0, 0, canvasElement->width(), canvasElement->he
ight())); |
| 206 imageBitmapDerived = ImageBitmap::create(imageBitmapFromCanvas.get(), In
tRect(0, 0, 20, 20)); | 208 imageBitmapDerived = ImageBitmap::create(imageBitmapFromCanvas.get(), In
tRect(0, 0, 20, 20)); |
| 207 } | 209 } |
| 208 CanvasRenderingContext* context = canvasElement->getContext("2d"); | 210 CanvasRenderingContext* context = canvasElement->getContext("2d"); |
| 209 TrackExceptionState exceptionState; | 211 TrackExceptionState exceptionState; |
| 210 toCanvasRenderingContext2D(context)->drawImage(imageBitmapDerived.get(), 0,
0, exceptionState); | 212 CanvasImageSourceUnion imageSource; |
| 213 imageSource.setImageBitmap(imageBitmapDerived); |
| 214 toCanvasRenderingContext2D(context)->drawImage(imageSource, 0, 0, exceptionS
tate); |
| 211 } | 215 } |
| 212 | 216 |
| 213 } // namespace | 217 } // namespace |
| OLD | NEW |