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

Side by Side Diff: webkit/gpu/webgraphicscontext3d_in_process_impl.cc

Issue 7756004: Create a new GrGLInterface for each GrContext so callback can be used to set GL-context (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: switch machines 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 | Annotate | Revision Log
« no previous file with comments | « webkit/gpu/webgraphicscontext3d_in_process_impl.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 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 1534 matching lines...) Expand 10 before | Expand all | Expand 10 after
1545 makeContextCurrent(); 1545 makeContextCurrent();
1546 glDeleteTextures(1, &texture); 1546 glDeleteTextures(1, &texture);
1547 } 1547 }
1548 1548
1549 WGC3Denum WebGraphicsContext3DInProcessImpl::getGraphicsResetStatusARB() { 1549 WGC3Denum WebGraphicsContext3DInProcessImpl::getGraphicsResetStatusARB() {
1550 // TODO(kbr): this implementation doesn't support lost contexts yet. 1550 // TODO(kbr): this implementation doesn't support lost contexts yet.
1551 return GL_NO_ERROR; 1551 return GL_NO_ERROR;
1552 } 1552 }
1553 1553
1554 #if WEBKIT_USING_SKIA 1554 #if WEBKIT_USING_SKIA
1555 GrGLInterface* WebGraphicsContext3DInProcessImpl::grGLInterface() { 1555 GrGLInterface* WebGraphicsContext3DInProcessImpl::onCreateGrGLInterface() {
1556 return gfx::GetInProcessSkiaGLBinding(); 1556 return gfx::CreateInProcessSkiaGLBinding();
1557 } 1557 }
1558 #endif 1558 #endif
1559 1559
1560 bool WebGraphicsContext3DInProcessImpl::AngleCreateCompilers() { 1560 bool WebGraphicsContext3DInProcessImpl::AngleCreateCompilers() {
1561 if (!ShInitialize()) 1561 if (!ShInitialize())
1562 return false; 1562 return false;
1563 1563
1564 ShBuiltInResources resources; 1564 ShBuiltInResources resources;
1565 ShInitBuiltInResources(&resources); 1565 ShInitBuiltInResources(&resources);
1566 getIntegerv(GL_MAX_VERTEX_ATTRIBS, &resources.MaxVertexAttribs); 1566 getIntegerv(GL_MAX_VERTEX_ATTRIBS, &resources.MaxVertexAttribs);
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
1630 if (length > 1) { 1630 if (length > 1) {
1631 entry->translated_source.reset(new char[length]); 1631 entry->translated_source.reset(new char[length]);
1632 ShGetObjectCode(compiler, entry->translated_source.get()); 1632 ShGetObjectCode(compiler, entry->translated_source.get());
1633 } 1633 }
1634 entry->is_valid = true; 1634 entry->is_valid = true;
1635 return true; 1635 return true;
1636 } 1636 }
1637 1637
1638 } // namespace gpu 1638 } // namespace gpu
1639 } // namespace webkit 1639 } // namespace webkit
OLDNEW
« no previous file with comments | « webkit/gpu/webgraphicscontext3d_in_process_impl.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698