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: webkit/gpu/webgraphicscontext3d_in_process_impl.cc

Issue 10391041: remove WEBKIT_USING_SKIA (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased Created 8 years, 7 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 | Annotate | Revision Log
« no previous file with comments | « webkit/gpu/webgraphicscontext3d_in_process_impl.h ('k') | webkit/media/webmediaplayer_impl.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "webkit/gpu/webgraphicscontext3d_in_process_impl.h" 5 #include "webkit/gpu/webgraphicscontext3d_in_process_impl.h"
6 6
7 #include <string.h> 7 #include <string.h>
8 8
9 #include <algorithm> 9 #include <algorithm>
10 #include <string> 10 #include <string>
(...skipping 1658 matching lines...) Expand 10 before | Expand all | Expand 10 after
1669 DELEGATE_TO_GL_1(endQueryEXT, EndQueryARB, WGC3Denum) 1669 DELEGATE_TO_GL_1(endQueryEXT, EndQueryARB, WGC3Denum)
1670 DELEGATE_TO_GL_3(getQueryivEXT, GetQueryivARB, WGC3Denum, WGC3Denum, WGC3Dint*) 1670 DELEGATE_TO_GL_3(getQueryivEXT, GetQueryivARB, WGC3Denum, WGC3Denum, WGC3Dint*)
1671 DELEGATE_TO_GL_3(getQueryObjectuivEXT, GetQueryObjectuivARB, 1671 DELEGATE_TO_GL_3(getQueryObjectuivEXT, GetQueryObjectuivARB,
1672 WebGLId, WGC3Denum, WGC3Duint*) 1672 WebGLId, WGC3Denum, WGC3Duint*)
1673 1673
1674 void WebGraphicsContext3DInProcessImpl::copyTextureCHROMIUM( 1674 void WebGraphicsContext3DInProcessImpl::copyTextureCHROMIUM(
1675 WGC3Denum, WebGLId, WebGLId, WGC3Dint, WGC3Denum) 1675 WGC3Denum, WebGLId, WebGLId, WGC3Dint, WGC3Denum)
1676 { 1676 {
1677 } 1677 }
1678 1678
1679 #if WEBKIT_USING_SKIA
1680 GrGLInterface* WebGraphicsContext3DInProcessImpl::onCreateGrGLInterface() { 1679 GrGLInterface* WebGraphicsContext3DInProcessImpl::onCreateGrGLInterface() {
1681 return gfx::CreateInProcessSkiaGLBinding(); 1680 return gfx::CreateInProcessSkiaGLBinding();
1682 } 1681 }
1683 #endif
1684 1682
1685 bool WebGraphicsContext3DInProcessImpl::AngleCreateCompilers() { 1683 bool WebGraphicsContext3DInProcessImpl::AngleCreateCompilers() {
1686 if (!ShInitialize()) 1684 if (!ShInitialize())
1687 return false; 1685 return false;
1688 1686
1689 ShBuiltInResources resources; 1687 ShBuiltInResources resources;
1690 ShInitBuiltInResources(&resources); 1688 ShInitBuiltInResources(&resources);
1691 getIntegerv(GL_MAX_VERTEX_ATTRIBS, &resources.MaxVertexAttribs); 1689 getIntegerv(GL_MAX_VERTEX_ATTRIBS, &resources.MaxVertexAttribs);
1692 getIntegerv(MAX_VERTEX_UNIFORM_VECTORS, &resources.MaxVertexUniformVectors); 1690 getIntegerv(MAX_VERTEX_UNIFORM_VECTORS, &resources.MaxVertexUniformVectors);
1693 getIntegerv(MAX_VARYING_VECTORS, &resources.MaxVaryingVectors); 1691 getIntegerv(MAX_VARYING_VECTORS, &resources.MaxVaryingVectors);
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
1755 if (length > 1) { 1753 if (length > 1) {
1756 entry->translated_source.reset(new char[length]); 1754 entry->translated_source.reset(new char[length]);
1757 ShGetObjectCode(compiler, entry->translated_source.get()); 1755 ShGetObjectCode(compiler, entry->translated_source.get());
1758 } 1756 }
1759 entry->is_valid = true; 1757 entry->is_valid = true;
1760 return true; 1758 return true;
1761 } 1759 }
1762 1760
1763 } // namespace gpu 1761 } // namespace gpu
1764 } // namespace webkit 1762 } // namespace webkit
OLDNEW
« no previous file with comments | « webkit/gpu/webgraphicscontext3d_in_process_impl.h ('k') | webkit/media/webmediaplayer_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698