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

Side by Side Diff: cc/trees/layer_tree_host_unittest_delegated.cc

Issue 138763009: Fix (or tag) uses of explicit '64' instead of GL_MAILBOX_SIZE_CHROMIUM (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 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 | Annotate | Revision Log
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/trees/layer_tree_host.h" 5 #include "cc/trees/layer_tree_host.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/location.h" 10 #include "base/location.h"
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after
129 129
130 frame->render_pass_list.push_back(root_pass.Pass()); 130 frame->render_pass_list.push_back(root_pass.Pass());
131 return frame.Pass(); 131 return frame.Pass();
132 } 132 }
133 133
134 void AddTransferableResource(DelegatedFrameData* frame, 134 void AddTransferableResource(DelegatedFrameData* frame,
135 ResourceProvider::ResourceId resource_id) { 135 ResourceProvider::ResourceId resource_id) {
136 TransferableResource resource; 136 TransferableResource resource;
137 resource.id = resource_id; 137 resource.id = resource_id;
138 resource.mailbox_holder.texture_target = GL_TEXTURE_2D; 138 resource.mailbox_holder.texture_target = GL_TEXTURE_2D;
139 GLbyte arbitrary_mailbox[64] = { 139 GLbyte arbitrary_mailbox[GL_MAILBOX_SIZE_CHROMIUM] = {
140 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 140 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2,
141 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 141 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4,
142 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 142 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4};
143 1, 2, 3, 4
144 };
145 resource.mailbox_holder.mailbox.SetName(arbitrary_mailbox); 143 resource.mailbox_holder.mailbox.SetName(arbitrary_mailbox);
146 frame->resource_list.push_back(resource); 144 frame->resource_list.push_back(resource);
147 } 145 }
148 146
149 void AddTextureQuad(DelegatedFrameData* frame, 147 void AddTextureQuad(DelegatedFrameData* frame,
150 ResourceProvider::ResourceId resource_id) { 148 ResourceProvider::ResourceId resource_id) {
151 scoped_ptr<SharedQuadState> sqs = SharedQuadState::Create(); 149 scoped_ptr<SharedQuadState> sqs = SharedQuadState::Create();
152 scoped_ptr<TextureDrawQuad> quad = TextureDrawQuad::Create(); 150 scoped_ptr<TextureDrawQuad> quad = TextureDrawQuad::Create();
153 float vertex_opacity[4] = { 1.f, 1.f, 1.f, 1.f }; 151 float vertex_opacity[4] = { 1.f, 1.f, 1.f, 1.f };
154 quad->SetNew(sqs.get(), 152 quad->SetNew(sqs.get(),
(...skipping 2180 matching lines...) Expand 10 before | Expand all | Expand 10 after
2335 } 2333 }
2336 2334
2337 scoped_refptr<DelegatedRendererLayer> delegated_thief_; 2335 scoped_refptr<DelegatedRendererLayer> delegated_thief_;
2338 }; 2336 };
2339 2337
2340 SINGLE_AND_MULTI_THREAD_TEST_F( 2338 SINGLE_AND_MULTI_THREAD_TEST_F(
2341 LayerTreeHostDelegatedTestRemoveAndChangeResources); 2339 LayerTreeHostDelegatedTestRemoveAndChangeResources);
2342 2340
2343 } // namespace 2341 } // namespace
2344 } // namespace cc 2342 } // namespace cc
OLDNEW
« no previous file with comments | « cc/test/test_web_graphics_context_3d.cc ('k') | content/browser/gpu/gpu_process_host_ui_shim.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698