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

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

Issue 1826383002: Change the context type name to "bitmaprender" for ImageBitmapRenderingContext (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 9 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 | « third_party/WebKit/LayoutTests/fast/canvas/imagebitmap/transferImageBitmap-no-alpha.html ('k') | no next file » | 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) 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
(...skipping 28 matching lines...) Expand all
39 CanvasRenderingContext::ContextType CanvasRenderingContext::contextTypeFromId(co nst String& id) 39 CanvasRenderingContext::ContextType CanvasRenderingContext::contextTypeFromId(co nst String& id)
40 { 40 {
41 if (id == "2d") 41 if (id == "2d")
42 return Context2d; 42 return Context2d;
43 if (id == "experimental-webgl") 43 if (id == "experimental-webgl")
44 return ContextExperimentalWebgl; 44 return ContextExperimentalWebgl;
45 if (id == "webgl") 45 if (id == "webgl")
46 return ContextWebgl; 46 return ContextWebgl;
47 if (id == "webgl2") 47 if (id == "webgl2")
48 return ContextWebgl2; 48 return ContextWebgl2;
49 if (id == "imagebitmap" && RuntimeEnabledFeatures::experimentalCanvasFeature sEnabled()) { 49 if (id == "bitmaprenderer" && RuntimeEnabledFeatures::experimentalCanvasFeat uresEnabled()) {
50 return ContextImageBitmap; 50 return ContextImageBitmap;
51 } 51 }
52 return ContextTypeCount; 52 return ContextTypeCount;
53 } 53 }
54 54
55 CanvasRenderingContext::ContextType CanvasRenderingContext::resolveContextTypeAl iases(CanvasRenderingContext::ContextType type) 55 CanvasRenderingContext::ContextType CanvasRenderingContext::resolveContextTypeAl iases(CanvasRenderingContext::ContextType type)
56 { 56 {
57 if (type == ContextExperimentalWebgl) 57 if (type == ContextExperimentalWebgl)
58 return ContextWebgl; 58 return ContextWebgl;
59 return type; 59 return type;
(...skipping 21 matching lines...) Expand all
81 } 81 }
82 return taintOrigin; 82 return taintOrigin;
83 } 83 }
84 84
85 DEFINE_TRACE(CanvasRenderingContext) 85 DEFINE_TRACE(CanvasRenderingContext)
86 { 86 {
87 visitor->trace(m_canvas); 87 visitor->trace(m_canvas);
88 } 88 }
89 89
90 } // namespace blink 90 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/LayoutTests/fast/canvas/imagebitmap/transferImageBitmap-no-alpha.html ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698