| OLD | NEW |
| 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 WebKit::WGC3Denum; | 15 using blink::WGC3Denum; |
| 16 using WebKit::WGC3Dint; | 16 using blink::WGC3Dint; |
| 17 using WebKit::WGC3Dsizei; | 17 using blink::WGC3Dsizei; |
| 18 using WebKit::WebGLId; | 18 using blink::WebGLId; |
| 19 using WebKit::WGC3Duint; | 19 using blink::WGC3Duint; |
| 20 | 20 |
| 21 namespace cc { | 21 namespace cc { |
| 22 namespace { | 22 namespace { |
| 23 | 23 |
| 24 class TestWebGraphicsContext3DTextureUpload : public TestWebGraphicsContext3D { | 24 class TestWebGraphicsContext3DTextureUpload : public TestWebGraphicsContext3D { |
| 25 public: | 25 public: |
| 26 TestWebGraphicsContext3DTextureUpload() | 26 TestWebGraphicsContext3DTextureUpload() |
| 27 : result_available_(0), | 27 : result_available_(0), |
| 28 unpack_alignment_(4) {} | 28 unpack_alignment_(4) {} |
| 29 | 29 |
| (...skipping 208 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 238 for (int i = 0; i < 86; ++i) { | 238 for (int i = 0; i < 86; ++i) { |
| 239 // Mark the beginning and end of each row, for the test. | 239 // Mark the beginning and end of each row, for the test. |
| 240 buffer[i * 1 * 82] = 0x1; | 240 buffer[i * 1 * 82] = 0x1; |
| 241 buffer[(i + 1) * 82 - 1] = 0x2; | 241 buffer[(i + 1) * 82 - 1] = 0x2; |
| 242 } | 242 } |
| 243 UploadTexture(uploader.get(), LUMINANCE_8, gfx::Size(82, 86), buffer); | 243 UploadTexture(uploader.get(), LUMINANCE_8, gfx::Size(82, 86), buffer); |
| 244 } | 244 } |
| 245 | 245 |
| 246 } // namespace | 246 } // namespace |
| 247 } // namespace cc | 247 } // namespace cc |
| OLD | NEW |