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

Side by Side Diff: Source/core/html/canvas/WebGLDebugShaders.cpp

Issue 798233005: Merge 185069 "Enforce context refrence guards in WebGL extensions." (Closed) Base URL: svn://svn.chromium.org/blink/branches/chromium/2214/
Patch Set: 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
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
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 return WebGLDebugShadersName; 46 return WebGLDebugShadersName;
47 } 47 }
48 48
49 PassRefPtrWillBeRawPtr<WebGLDebugShaders> WebGLDebugShaders::create(WebGLRenderi ngContextBase* context) 49 PassRefPtrWillBeRawPtr<WebGLDebugShaders> WebGLDebugShaders::create(WebGLRenderi ngContextBase* context)
50 { 50 {
51 return adoptRefWillBeNoop(new WebGLDebugShaders(context)); 51 return adoptRefWillBeNoop(new WebGLDebugShaders(context));
52 } 52 }
53 53
54 String WebGLDebugShaders::getTranslatedShaderSource(WebGLShader* shader) 54 String WebGLDebugShaders::getTranslatedShaderSource(WebGLShader* shader)
55 { 55 {
56 if (isLost()) 56 WebGLExtensionScopedContext scoped(this);
57 if (scoped.isLost())
57 return String(); 58 return String();
58 if (!m_context->validateWebGLObject("getTranslatedShaderSource", shader)) 59 if (!scoped.context()->validateWebGLObject("getTranslatedShaderSource", shad er))
59 return ""; 60 return "";
60 return m_context->ensureNotNull(m_context->webContext()->getTranslatedShader SourceANGLE(shader->object())); 61 return scoped.context()->ensureNotNull(scoped.context()->webContext()->getTr anslatedShaderSourceANGLE(shader->object()));
61 } 62 }
62 63
63 bool WebGLDebugShaders::supported(WebGLRenderingContextBase* context) 64 bool WebGLDebugShaders::supported(WebGLRenderingContextBase* context)
64 { 65 {
65 return context->extensionsUtil()->supportsExtension("GL_ANGLE_translated_sha der_source"); 66 return context->extensionsUtil()->supportsExtension("GL_ANGLE_translated_sha der_source");
66 } 67 }
67 68
68 const char* WebGLDebugShaders::extensionName() 69 const char* WebGLDebugShaders::extensionName()
69 { 70 {
70 return "WEBGL_debug_shaders"; 71 return "WEBGL_debug_shaders";
71 } 72 }
72 73
73 } // namespace blink 74 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/html/canvas/OESVertexArrayObject.cpp ('k') | Source/core/html/canvas/WebGLDrawBuffers.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698