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

Side by Side Diff: cc/test/test_web_graphics_context_3d.cc

Issue 951673002: Revert "Pull chromium at 2c3ffb2355a27c32f45e508ef861416b820c823b" (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 10 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
« no previous file with comments | « cc/test/test_web_graphics_context_3d.h ('k') | cc/trees/layer_sorter.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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/test/test_web_graphics_context_3d.h" 5 #include "cc/test/test_web_graphics_context_3d.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 next_program_id_(1000), 57 next_program_id_(1000),
58 next_shader_id_(2000), 58 next_shader_id_(2000),
59 next_framebuffer_id_(1), 59 next_framebuffer_id_(1),
60 current_framebuffer_(0), 60 current_framebuffer_(0),
61 max_texture_size_(2048), 61 max_texture_size_(2048),
62 reshape_called_(false), 62 reshape_called_(false),
63 width_(0), 63 width_(0),
64 height_(0), 64 height_(0),
65 scale_factor_(-1.f), 65 scale_factor_(-1.f),
66 test_support_(NULL), 66 test_support_(NULL),
67 last_update_type_(NO_UPDATE), 67 last_update_type_(NoUpdate),
68 next_insert_sync_point_(1), 68 next_insert_sync_point_(1),
69 last_waited_sync_point_(0), 69 last_waited_sync_point_(0),
70 unpack_alignment_(4), 70 unpack_alignment_(4),
71 bound_buffer_(0), 71 bound_buffer_(0),
72 weak_ptr_factory_(this) { 72 weak_ptr_factory_(this) {
73 CreateNamespace(); 73 CreateNamespace();
74 } 74 }
75 75
76 TestWebGraphicsContext3D::~TestWebGraphicsContext3D() { 76 TestWebGraphicsContext3D::~TestWebGraphicsContext3D() {
77 base::AutoLock lock(g_shared_namespace_lock.Get()); 77 base::AutoLock lock(g_shared_namespace_lock.Get());
(...skipping 713 matching lines...) Expand 10 before | Expand all | Expand 10 after
791 791
792 TestWebGraphicsContext3D::Buffer::Buffer() : target(0), size(0) {} 792 TestWebGraphicsContext3D::Buffer::Buffer() : target(0), size(0) {}
793 793
794 TestWebGraphicsContext3D::Buffer::~Buffer() {} 794 TestWebGraphicsContext3D::Buffer::~Buffer() {}
795 795
796 TestWebGraphicsContext3D::Image::Image() {} 796 TestWebGraphicsContext3D::Image::Image() {}
797 797
798 TestWebGraphicsContext3D::Image::~Image() {} 798 TestWebGraphicsContext3D::Image::~Image() {}
799 799
800 } // namespace cc 800 } // namespace cc
OLDNEW
« no previous file with comments | « cc/test/test_web_graphics_context_3d.h ('k') | cc/trees/layer_sorter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698