summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authorjamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-06-27 16:12:03 +0000
committerjamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-06-27 16:12:03 +0000
commit0015bc533d9955ab9dfcb1b2d10b62083ab6cd88 (patch)
tree90ed4900ee098d640f3157a9b8cdb770f50104e6 /webkit
parent848e8e4616cd71d9fb4c220b31a20bc176f17c5d (diff)
downloadchromium_src-0015bc533d9955ab9dfcb1b2d10b62083ab6cd88.zip
chromium_src-0015bc533d9955ab9dfcb1b2d10b62083ab6cd88.tar.gz
chromium_src-0015bc533d9955ab9dfcb1b2d10b62083ab6cd88.tar.bz2
Add chromium_code:1 and fix warnings in webkit_gpu
Due to an oversight chromium_code wasn't set for this target so the warning level was lower. This fixes the warning level and issues it exposes. R=kbr@chromium.org Review URL: https://codereview.chromium.org/358973002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@280339 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc7
-rw-r--r--webkit/common/gpu/webkit_gpu.gyp5
2 files changed, 4 insertions, 8 deletions
diff --git a/webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc b/webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc
index 3ce34fe..5f3ae33 100644
--- a/webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc
+++ b/webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc
@@ -33,13 +33,6 @@ namespace gpu {
namespace {
-const int32 kCommandBufferSize = 1024 * 1024;
-// TODO(kbr): make the transfer buffer size configurable via context
-// creation attributes.
-const size_t kStartTransferBufferSize = 4 * 1024 * 1024;
-const size_t kMinTransferBufferSize = 1 * 256 * 1024;
-const size_t kMaxTransferBufferSize = 16 * 1024 * 1024;
-
// Singleton used to initialize and terminate the gles2 library.
class GLES2Initializer {
public:
diff --git a/webkit/common/gpu/webkit_gpu.gyp b/webkit/common/gpu/webkit_gpu.gyp
index 7388e18..fcbdb30 100644
--- a/webkit/common/gpu/webkit_gpu.gyp
+++ b/webkit/common/gpu/webkit_gpu.gyp
@@ -13,7 +13,10 @@
# GN version: //webkit/common/gpu
'target_name': 'webkit_gpu',
'type': '<(component)',
- 'variables': { 'enable_wexit_time_destructors': 1, },
+ 'variables': {
+ 'chromium_code': 1,
+ 'enable_wexit_time_destructors': 1,
+ },
'dependencies': [
'<(DEPTH)/base/base.gyp:base',
'<(DEPTH)/cc/cc.gyp:cc',