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

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

Issue 6166008: Change namespace of WebGraphicsContext3DInProcessImpl based on review feedbac... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 11 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/support/test_webkit_client.cc » ('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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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>
11 11
12 #include "app/gfx/gl/gl_bindings.h" 12 #include "app/gfx/gl/gl_bindings.h"
13 #include "app/gfx/gl/gl_context.h" 13 #include "app/gfx/gl/gl_context.h"
14 #include "app/gfx/gl/gl_implementation.h" 14 #include "app/gfx/gl/gl_implementation.h"
15 #include "base/logging.h" 15 #include "base/logging.h"
16 #include "third_party/WebKit/WebKit/chromium/public/WebString.h" 16 #include "third_party/WebKit/WebKit/chromium/public/WebString.h"
17 #include "third_party/WebKit/WebKit/chromium/public/WebView.h" 17 #include "third_party/WebKit/WebKit/chromium/public/WebView.h"
18 18
19 using WebKit::WebGLId; 19 using WebKit::WebGLId;
20 using WebKit::WebGraphicsContext3D; 20 using WebKit::WebGraphicsContext3D;
21 using WebKit::WebString; 21 using WebKit::WebString;
22 using WebKit::WebView; 22 using WebKit::WebView;
23 23
24 namespace webkit_gpu { 24 namespace webkit {
25 namespace gpu {
25 26
26 enum { 27 enum {
27 MAX_VERTEX_UNIFORM_VECTORS = 0x8DFB, 28 MAX_VERTEX_UNIFORM_VECTORS = 0x8DFB,
28 MAX_VARYING_VECTORS = 0x8DFC, 29 MAX_VARYING_VECTORS = 0x8DFC,
29 MAX_FRAGMENT_UNIFORM_VECTORS = 0x8DFD 30 MAX_FRAGMENT_UNIFORM_VECTORS = 0x8DFD
30 }; 31 };
31 32
32 WebGraphicsContext3DInProcessImpl:: 33 WebGraphicsContext3DInProcessImpl::
33 VertexAttribPointerState::VertexAttribPointerState() 34 VertexAttribPointerState::VertexAttribPointerState()
34 : enabled(false), 35 : enabled(false),
(...skipping 1608 matching lines...) Expand 10 before | Expand all | Expand 10 after
1643 entry->translated_source.reset(new char[length]); 1644 entry->translated_source.reset(new char[length]);
1644 if (is_gles2_) 1645 if (is_gles2_)
1645 strncpy(entry->translated_source.get(), entry->source.get(), length); 1646 strncpy(entry->translated_source.get(), entry->source.get(), length);
1646 else 1647 else
1647 ShGetObjectCode(compiler, entry->translated_source.get()); 1648 ShGetObjectCode(compiler, entry->translated_source.get());
1648 } 1649 }
1649 entry->is_valid = true; 1650 entry->is_valid = true;
1650 return true; 1651 return true;
1651 } 1652 }
1652 1653
1653 } // namespace webkit_gpu 1654 } // namespace gpu
1655 } // namespace webkit
1654 1656
OLDNEW
« no previous file with comments | « webkit/gpu/webgraphicscontext3d_in_process_impl.h ('k') | webkit/support/test_webkit_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698