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

Side by Side Diff: Source/WebCore/html/canvas/WebGLRenderingContext.cpp

Issue 8015006: Merge 95728 - Ref protect shaders in V8WebGLRenderingContext::getAttachedShadersCallback (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/874/
Patch Set: Created 9 years, 3 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 | « Source/WebCore/html/canvas/WebGLRenderingContext.h ('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 1882 matching lines...) Expand 10 before | Expand all | Expand 10 after
1893 return 0; 1893 return 0;
1894 ActiveInfo info; 1894 ActiveInfo info;
1895 if (!m_context->getActiveUniform(objectOrZero(program), index, info)) 1895 if (!m_context->getActiveUniform(objectOrZero(program), index, info))
1896 return 0; 1896 return 0;
1897 if (!isGLES2Compliant()) 1897 if (!isGLES2Compliant())
1898 if (info.size > 1 && !info.name.endsWith("[0]")) 1898 if (info.size > 1 && !info.name.endsWith("[0]"))
1899 info.name.append("[0]"); 1899 info.name.append("[0]");
1900 return WebGLActiveInfo::create(info.name, info.type, info.size); 1900 return WebGLActiveInfo::create(info.name, info.type, info.size);
1901 } 1901 }
1902 1902
1903 bool WebGLRenderingContext::getAttachedShaders(WebGLProgram* program, Vector<Web GLShader*>& shaderObjects, ExceptionCode& ec) 1903 bool WebGLRenderingContext::getAttachedShaders(WebGLProgram* program, Vector<Ref Ptr<WebGLShader> >& shaderObjects, ExceptionCode& ec)
1904 { 1904 {
1905 UNUSED_PARAM(ec); 1905 UNUSED_PARAM(ec);
1906 shaderObjects.clear(); 1906 shaderObjects.clear();
1907 if (isContextLost() || !validateWebGLObject(program)) 1907 if (isContextLost() || !validateWebGLObject(program))
1908 return false; 1908 return false;
1909 1909
1910 const GC3Denum shaderType[] = { 1910 const GC3Denum shaderType[] = {
1911 GraphicsContext3D::VERTEX_SHADER, 1911 GraphicsContext3D::VERTEX_SHADER,
1912 GraphicsContext3D::FRAGMENT_SHADER 1912 GraphicsContext3D::FRAGMENT_SHADER
1913 }; 1913 };
(...skipping 2946 matching lines...) Expand 10 before | Expand all | Expand 10 after
4860 4860
4861 void WebGLRenderingContext::LRUImageBufferCache::bubbleToFront(int idx) 4861 void WebGLRenderingContext::LRUImageBufferCache::bubbleToFront(int idx)
4862 { 4862 {
4863 for (int i = idx; i > 0; --i) 4863 for (int i = idx; i > 0; --i)
4864 m_buffers[i].swap(m_buffers[i-1]); 4864 m_buffers[i].swap(m_buffers[i-1]);
4865 } 4865 }
4866 4866
4867 } // namespace WebCore 4867 } // namespace WebCore
4868 4868
4869 #endif // ENABLE(WEBGL) 4869 #endif // ENABLE(WEBGL)
OLDNEW
« no previous file with comments | « Source/WebCore/html/canvas/WebGLRenderingContext.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698