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

Side by Side Diff: third_party/WebKit/Source/modules/webgl/WebGLDebugShaders.cpp

Issue 1834983003: Remove string-getting methods from WebGraphicsContext3D. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: getactive: pointers Created 4 years, 8 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) 2011 Google Inc. All rights reserved. 2 * Copyright (C) 2011 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 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
11 * notice, this list of conditions and the following disclaimer in the 11 * notice, this list of conditions and the following disclaimer in the
12 * documentation and/or other materials provided with the distribution. 12 * documentation and/or other materials provided with the distribution.
13 * 13 *
14 * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY 14 * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
15 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 15 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
16 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 16 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
17 * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY 17 * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
18 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 18 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
19 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 19 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
20 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 20 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
21 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 21 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
23 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 23 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24 */ 24 */
25 25
26 #include "modules/webgl/WebGLDebugShaders.h" 26 #include "modules/webgl/WebGLDebugShaders.h"
27 27
28 #include "bindings/core/v8/ExceptionState.h" 28 #include "bindings/core/v8/ExceptionState.h"
29 #include "modules/webgl/GLStringQuery.h"
29 #include "modules/webgl/WebGLRenderingContextBase.h" 30 #include "modules/webgl/WebGLRenderingContextBase.h"
30 #include "modules/webgl/WebGLShader.h" 31 #include "modules/webgl/WebGLShader.h"
31 32
32 namespace blink { 33 namespace blink {
33 34
34 WebGLDebugShaders::WebGLDebugShaders(WebGLRenderingContextBase* context) 35 WebGLDebugShaders::WebGLDebugShaders(WebGLRenderingContextBase* context)
35 : WebGLExtension(context) 36 : WebGLExtension(context)
36 { 37 {
37 } 38 }
38 39
(...skipping 11 matching lines...) Expand all
50 return new WebGLDebugShaders(context); 51 return new WebGLDebugShaders(context);
51 } 52 }
52 53
53 String WebGLDebugShaders::getTranslatedShaderSource(WebGLShader* shader) 54 String WebGLDebugShaders::getTranslatedShaderSource(WebGLShader* shader)
54 { 55 {
55 WebGLExtensionScopedContext scoped(this); 56 WebGLExtensionScopedContext scoped(this);
56 if (scoped.isLost()) 57 if (scoped.isLost())
57 return String(); 58 return String();
58 if (!scoped.context()->validateWebGLObject("getTranslatedShaderSource", shad er)) 59 if (!scoped.context()->validateWebGLObject("getTranslatedShaderSource", shad er))
59 return ""; 60 return "";
60 return scoped.context()->ensureNotNull(scoped.context()->webContext()->getTr anslatedShaderSourceANGLE(shader->object())); 61 GLStringQuery query(scoped.context()->contextGL());
62 return query.Run<GLStringQuery::TranslatedShaderSourceANGLE>(shader->object( ));
61 } 63 }
62 64
63 bool WebGLDebugShaders::supported(WebGLRenderingContextBase* context) 65 bool WebGLDebugShaders::supported(WebGLRenderingContextBase* context)
64 { 66 {
65 return context->extensionsUtil()->supportsExtension("GL_ANGLE_translated_sha der_source"); 67 return context->extensionsUtil()->supportsExtension("GL_ANGLE_translated_sha der_source");
66 } 68 }
67 69
68 const char* WebGLDebugShaders::extensionName() 70 const char* WebGLDebugShaders::extensionName()
69 { 71 {
70 return "WEBGL_debug_shaders"; 72 return "WEBGL_debug_shaders";
71 } 73 }
72 74
73 } // namespace blink 75 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698