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

Side by Side Diff: Source/core/frame/ImageBitmapTest.cpp

Issue 795833004: Use dictionaries for context creation attributes. Eliminate custom bindings. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebased. Created 6 years 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/dom/Document.cpp ('k') | Source/core/html/HTMLCanvasElement.h » ('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) 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 24 matching lines...) Expand all
35 #include "bindings/core/v8/UnionTypesCore.h" 35 #include "bindings/core/v8/UnionTypesCore.h"
36 #include "core/dom/Document.h" 36 #include "core/dom/Document.h"
37 #include "core/fetch/ImageResource.h" 37 #include "core/fetch/ImageResource.h"
38 #include "core/fetch/MemoryCache.h" 38 #include "core/fetch/MemoryCache.h"
39 #include "core/fetch/MockImageResourceClient.h" 39 #include "core/fetch/MockImageResourceClient.h"
40 #include "core/fetch/ResourcePtr.h" 40 #include "core/fetch/ResourcePtr.h"
41 #include "core/html/HTMLCanvasElement.h" 41 #include "core/html/HTMLCanvasElement.h"
42 #include "core/html/HTMLImageElement.h" 42 #include "core/html/HTMLImageElement.h"
43 #include "core/html/HTMLVideoElement.h" 43 #include "core/html/HTMLVideoElement.h"
44 #include "core/html/canvas/CanvasRenderingContext2D.h" 44 #include "core/html/canvas/CanvasRenderingContext2D.h"
45 #include "core/html/canvas/WebGLRenderingContext.h"
45 #include "platform/graphics/BitmapImage.h" 46 #include "platform/graphics/BitmapImage.h"
46 #include "platform/graphics/skia/NativeImageSkia.h" 47 #include "platform/graphics/skia/NativeImageSkia.h"
47 #include "platform/heap/Handle.h" 48 #include "platform/heap/Handle.h"
48 #include "platform/network/ResourceRequest.h" 49 #include "platform/network/ResourceRequest.h"
49 #include "wtf/OwnPtr.h" 50 #include "wtf/OwnPtr.h"
50 51
51 #include <gtest/gtest.h> 52 #include <gtest/gtest.h>
52 53
53 namespace blink { 54 namespace blink {
54 55
(...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after
200 TEST_F(ImageBitmapTest, ImageResourceLifetime) 201 TEST_F(ImageBitmapTest, ImageResourceLifetime)
201 { 202 {
202 RefPtrWillBeRawPtr<HTMLCanvasElement> canvasElement = HTMLCanvasElement::cre ate(*Document::create().get()); 203 RefPtrWillBeRawPtr<HTMLCanvasElement> canvasElement = HTMLCanvasElement::cre ate(*Document::create().get());
203 canvasElement->setHeight(40); 204 canvasElement->setHeight(40);
204 canvasElement->setWidth(40); 205 canvasElement->setWidth(40);
205 RefPtrWillBeRawPtr<ImageBitmap> imageBitmapDerived = nullptr; 206 RefPtrWillBeRawPtr<ImageBitmap> imageBitmapDerived = nullptr;
206 { 207 {
207 RefPtrWillBeRawPtr<ImageBitmap> imageBitmapFromCanvas = ImageBitmap::cre ate(canvasElement.get(), IntRect(0, 0, canvasElement->width(), canvasElement->he ight())); 208 RefPtrWillBeRawPtr<ImageBitmap> imageBitmapFromCanvas = ImageBitmap::cre ate(canvasElement.get(), IntRect(0, 0, canvasElement->width(), canvasElement->he ight()));
208 imageBitmapDerived = ImageBitmap::create(imageBitmapFromCanvas.get(), In tRect(0, 0, 20, 20)); 209 imageBitmapDerived = ImageBitmap::create(imageBitmapFromCanvas.get(), In tRect(0, 0, 20, 20));
209 } 210 }
210 CanvasRenderingContext* context = canvasElement->getContext("2d"); 211 CanvasContextCreationAttributes attributes;
212 CanvasRenderingContext2DOrWebGLRenderingContext context;
213 canvasElement->getContext("2d", attributes, context);
211 TrackExceptionState exceptionState; 214 TrackExceptionState exceptionState;
212 CanvasImageSourceUnion imageSource; 215 CanvasImageSourceUnion imageSource;
213 imageSource.setImageBitmap(imageBitmapDerived); 216 imageSource.setImageBitmap(imageBitmapDerived);
214 toCanvasRenderingContext2D(context)->drawImage(imageSource, 0, 0, exceptionS tate); 217 context.getAsCanvasRenderingContext2D()->drawImage(imageSource, 0, 0, except ionState);
215 } 218 }
216 219
217 } // namespace 220 } // namespace
OLDNEW
« no previous file with comments | « Source/core/dom/Document.cpp ('k') | Source/core/html/HTMLCanvasElement.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698