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

Side by Side Diff: cc/resources/video_resource_updater.cc

Issue 22529002: [cc] Allow resources and ui resources to specify wrap mode (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix botched resolve Created 7 years, 3 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/resources/ui_resource_bitmap.cc ('k') | cc/test/fake_scoped_ui_resource.cc » ('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/resources/video_resource_updater.h" 5 #include "cc/resources/video_resource_updater.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "cc/output/gl_renderer.h" 8 #include "cc/output/gl_renderer.h"
9 #include "cc/resources/resource_provider.h" 9 #include "cc/resources/resource_provider.h"
10 #include "gpu/GLES2/gl2extchromium.h" 10 #include "gpu/GLES2/gl2extchromium.h"
(...skipping 177 matching lines...) Expand 10 before | Expand all | Expand 10 after
188 break; 188 break;
189 } 189 }
190 } 190 }
191 191
192 if (resource_id == 0) { 192 if (resource_id == 0) {
193 // TODO(danakj): Abstract out hw/sw resource create/delete from 193 // TODO(danakj): Abstract out hw/sw resource create/delete from
194 // ResourceProvider and stop using ResourceProvider in this class. 194 // ResourceProvider and stop using ResourceProvider in this class.
195 resource_id = 195 resource_id =
196 resource_provider_->CreateResource(output_plane_resource_size, 196 resource_provider_->CreateResource(output_plane_resource_size,
197 output_resource_format, 197 output_resource_format,
198 GL_CLAMP_TO_EDGE,
198 ResourceProvider::TextureUsageAny); 199 ResourceProvider::TextureUsageAny);
199 200
200 DCHECK(mailbox.IsZero()); 201 DCHECK(mailbox.IsZero());
201 202
202 if (!software_compositor) { 203 if (!software_compositor) {
203 DCHECK(context_provider_); 204 DCHECK(context_provider_);
204 205
205 WebKit::WebGraphicsContext3D* context = 206 WebKit::WebGraphicsContext3D* context =
206 context_provider_->Context3d(); 207 context_provider_->Context3d();
207 208
(...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after
399 } 400 }
400 401
401 PlaneResource recycled_resource(data.resource_id, 402 PlaneResource recycled_resource(data.resource_id,
402 data.resource_size, 403 data.resource_size,
403 data.resource_format, 404 data.resource_format,
404 data.mailbox); 405 data.mailbox);
405 updater->recycled_resources_.push_back(recycled_resource); 406 updater->recycled_resources_.push_back(recycled_resource);
406 } 407 }
407 408
408 } // namespace cc 409 } // namespace cc
OLDNEW
« no previous file with comments | « cc/resources/ui_resource_bitmap.cc ('k') | cc/test/fake_scoped_ui_resource.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698