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

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

Issue 10392068: ui: Move gl/ directory out of gfx/, up to ui/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix mac_rel 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
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>
11 11
12 #include "base/lazy_instance.h" 12 #include "base/lazy_instance.h"
13 #include "base/logging.h" 13 #include "base/logging.h"
14 #include "base/memory/scoped_ptr.h"
14 #include "base/string_split.h" 15 #include "base/string_split.h"
15 #include "base/memory/scoped_ptr.h"
16 #include "base/synchronization/lock.h" 16 #include "base/synchronization/lock.h"
17 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" 17 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
18 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
18 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h" 19 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h"
19 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" 20 #include "ui/gl/gl_bindings.h"
20 #include "ui/gfx/gl/gl_bindings.h" 21 #include "ui/gl/gl_bindings_skia_in_process.h"
21 #include "ui/gfx/gl/gl_bindings_skia_in_process.h" 22 #include "ui/gl/gl_context.h"
22 #include "ui/gfx/gl/gl_context.h" 23 #include "ui/gl/gl_implementation.h"
23 #include "ui/gfx/gl/gl_implementation.h" 24 #include "ui/gl/gl_surface.h"
24 #include "ui/gfx/gl/gl_surface.h"
25 25
26 namespace webkit { 26 namespace webkit {
27 namespace gpu { 27 namespace gpu {
28 28
29 enum { 29 enum {
30 MAX_VERTEX_UNIFORM_VECTORS = 0x8DFB, 30 MAX_VERTEX_UNIFORM_VECTORS = 0x8DFB,
31 MAX_VARYING_VECTORS = 0x8DFC, 31 MAX_VARYING_VECTORS = 0x8DFC,
32 MAX_FRAGMENT_UNIFORM_VECTORS = 0x8DFD 32 MAX_FRAGMENT_UNIFORM_VECTORS = 0x8DFD
33 }; 33 };
34 34
(...skipping 1718 matching lines...) Expand 10 before | Expand all | Expand 10 after
1753 if (length > 1) { 1753 if (length > 1) {
1754 entry->translated_source.reset(new char[length]); 1754 entry->translated_source.reset(new char[length]);
1755 ShGetObjectCode(compiler, entry->translated_source.get()); 1755 ShGetObjectCode(compiler, entry->translated_source.get());
1756 } 1756 }
1757 entry->is_valid = true; 1757 entry->is_valid = true;
1758 return true; 1758 return true;
1759 } 1759 }
1760 1760
1761 } // namespace gpu 1761 } // namespace gpu
1762 } // namespace webkit 1762 } // namespace webkit
OLDNEW
« no previous file with comments | « webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc ('k') | webkit/gpu/webkit_gpu.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698