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

Side by Side Diff: third_party/WebKit/Source/core/html/canvas/CanvasRenderingContext.cpp

Issue 1598923002: Add ImageBitmapRenderingContext (experimental) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: another missing adoptRef Created 4 years, 10 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2009 Apple Inc. All rights reserved. 2 * Copyright (C) 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 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution. 11 * documentation and/or other materials provided with the distribution.
12 * 12 *
13 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY 13 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24 */ 24 */
25 25
26 #include "core/html/canvas/CanvasRenderingContext.h" 26 #include "core/html/canvas/CanvasRenderingContext.h"
27 27
28 #include "core/html/canvas/CanvasImageSource.h" 28 #include "core/html/canvas/CanvasImageSource.h"
29 #include "platform/RuntimeEnabledFeatures.h"
29 #include "platform/weborigin/SecurityOrigin.h" 30 #include "platform/weborigin/SecurityOrigin.h"
30 31
31 namespace blink { 32 namespace blink {
32 33
33 CanvasRenderingContext::CanvasRenderingContext(HTMLCanvasElement* canvas) 34 CanvasRenderingContext::CanvasRenderingContext(HTMLCanvasElement* canvas)
34 : m_canvas(canvas) 35 : m_canvas(canvas)
35 { 36 {
36 } 37 }
37 38
38 CanvasRenderingContext::ContextType CanvasRenderingContext::contextTypeFromId(co nst String& id) 39 CanvasRenderingContext::ContextType CanvasRenderingContext::contextTypeFromId(co nst String& id)
39 { 40 {
40 if (id == "2d") 41 if (id == "2d")
41 return Context2d; 42 return Context2d;
42 if (id == "experimental-webgl") 43 if (id == "experimental-webgl")
43 return ContextExperimentalWebgl; 44 return ContextExperimentalWebgl;
44 if (id == "webgl") 45 if (id == "webgl")
45 return ContextWebgl; 46 return ContextWebgl;
46 if (id == "webgl2") 47 if (id == "webgl2")
47 return ContextWebgl2; 48 return ContextWebgl2;
48 49 if (id == "imagebitmap" && RuntimeEnabledFeatures::experimentalCanvasFeature sEnabled()) {
50 return ContextImageBitmap;
51 }
49 return ContextTypeCount; 52 return ContextTypeCount;
50 } 53 }
51 54
52 CanvasRenderingContext::ContextType CanvasRenderingContext::resolveContextTypeAl iases(CanvasRenderingContext::ContextType type) 55 CanvasRenderingContext::ContextType CanvasRenderingContext::resolveContextTypeAl iases(CanvasRenderingContext::ContextType type)
53 { 56 {
54 if (type == ContextExperimentalWebgl) 57 if (type == ContextExperimentalWebgl)
55 return ContextWebgl; 58 return ContextWebgl;
56 return type; 59 return type;
57 } 60 }
58 61
(...skipping 19 matching lines...) Expand all
78 } 81 }
79 return taintOrigin; 82 return taintOrigin;
80 } 83 }
81 84
82 DEFINE_TRACE(CanvasRenderingContext) 85 DEFINE_TRACE(CanvasRenderingContext)
83 { 86 {
84 visitor->trace(m_canvas); 87 visitor->trace(m_canvas);
85 } 88 }
86 89
87 } // namespace blink 90 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/html/canvas/CanvasRenderingContext.h ('k') | third_party/WebKit/Source/modules/InitModules.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698