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

Side by Side Diff: cc/scheduler/texture_uploader_unittest.cc

Issue 12965007: Fix cpplint errors in cc/(animation|input|layers|trees|test)/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased Created 7 years, 9 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 | « cc/scheduler/scheduler_unittest.cc ('k') | cc/test/animation_test_common.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 2012 The Chromium Authors. All rights reserved. 1 // Copyright 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 "cc/scheduler/texture_uploader.h" 5 #include "cc/scheduler/texture_uploader.h"
6 6
7 #include "cc/base/util.h" 7 #include "cc/base/util.h"
8 #include "cc/resources/prioritized_resource.h" 8 #include "cc/resources/prioritized_resource.h"
9 #include "cc/test/test_web_graphics_context_3d.h" 9 #include "cc/test/test_web_graphics_context_3d.h"
10 #include "testing/gmock/include/gmock/gmock.h" 10 #include "testing/gmock/include/gmock/gmock.h"
11 #include "testing/gtest/include/gtest/gtest.h" 11 #include "testing/gtest/include/gtest/gtest.h"
12 #include "third_party/khronos/GLES2/gl2.h" 12 #include "third_party/khronos/GLES2/gl2.h"
13 #include "third_party/khronos/GLES2/gl2ext.h" 13 #include "third_party/khronos/GLES2/gl2ext.h"
14 14
15 using namespace WebKit; 15 using WebKit::WGC3Denum;
16 using WebKit::WGC3Dint;
17 using WebKit::WGC3Dsizei;
18 using WebKit::WebGLId;
19 using WebKit::WGC3Duint;
16 20
17 namespace cc { 21 namespace cc {
18 namespace { 22 namespace {
19 23
20 class TestWebGraphicsContext3DTextureUpload : public TestWebGraphicsContext3D { 24 class TestWebGraphicsContext3DTextureUpload : public TestWebGraphicsContext3D {
21 public: 25 public:
22 TestWebGraphicsContext3DTextureUpload() 26 TestWebGraphicsContext3DTextureUpload()
23 : result_available_(0), 27 : result_available_(0),
24 unpack_alignment_(4) {} 28 unpack_alignment_(4) {}
25 29
(...skipping 208 matching lines...) Expand 10 before | Expand all | Expand 10 after
234 for (int i = 0; i < 86; ++i) { 238 for (int i = 0; i < 86; ++i) {
235 // Mark the beginning and end of each row, for the test. 239 // Mark the beginning and end of each row, for the test.
236 buffer[i * 1 * 82] = 0x1; 240 buffer[i * 1 * 82] = 0x1;
237 buffer[(i + 1) * 82 - 1] = 0x2; 241 buffer[(i + 1) * 82 - 1] = 0x2;
238 } 242 }
239 UploadTexture(uploader.get(), GL_LUMINANCE, gfx::Size(82, 86), buffer); 243 UploadTexture(uploader.get(), GL_LUMINANCE, gfx::Size(82, 86), buffer);
240 } 244 }
241 245
242 } // namespace 246 } // namespace
243 } // namespace cc 247 } // namespace cc
OLDNEW
« no previous file with comments | « cc/scheduler/scheduler_unittest.cc ('k') | cc/test/animation_test_common.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698