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

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

Issue 83883002: cc: Allow TEXTURE_RECTANGLE_ARB to be used for tile textures. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 1 month 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/resources/image_raster_worker_pool.h" 5 #include "cc/resources/image_raster_worker_pool.h"
6 6
7 #include "base/debug/trace_event.h" 7 #include "base/debug/trace_event.h"
8 #include "base/values.h" 8 #include "base/values.h"
9 #include "cc/debug/traced_value.h" 9 #include "cc/debug/traced_value.h"
10 #include "cc/resources/resource.h" 10 #include "cc/resources/resource.h"
11 #include "gpu/GLES2/gl2extchromium.h"
11 #include "third_party/skia/include/core/SkBitmapDevice.h" 12 #include "third_party/skia/include/core/SkBitmapDevice.h"
12 13
13 namespace cc { 14 namespace cc {
14 15
15 namespace { 16 namespace {
16 17
17 class ImageWorkerPoolTaskImpl : public internal::WorkerPoolTask { 18 class ImageWorkerPoolTaskImpl : public internal::WorkerPoolTask {
18 public: 19 public:
19 typedef base::Callback<void(bool was_canceled)> Reply; 20 typedef base::Callback<void(bool was_canceled)> Reply;
20 21
(...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after
147 148
148 set_raster_finished_task(new_raster_finished_task); 149 set_raster_finished_task(new_raster_finished_task);
149 set_raster_required_for_activation_finished_task( 150 set_raster_required_for_activation_finished_task(
150 new_raster_required_for_activation_finished_task); 151 new_raster_required_for_activation_finished_task);
151 152
152 TRACE_EVENT_ASYNC_STEP_INTO1( 153 TRACE_EVENT_ASYNC_STEP_INTO1(
153 "cc", "ScheduledTasks", this, "rasterizing", 154 "cc", "ScheduledTasks", this, "rasterizing",
154 "state", TracedValue::FromValue(StateAsValue().release())); 155 "state", TracedValue::FromValue(StateAsValue().release()));
155 } 156 }
156 157
158 GLenum ImageRasterWorkerPool::GetResourceTarget() const {
159 // Note: we should instead ask the resource provider what target to use
160 // if it needs to be different on some platform.
161 return GL_TEXTURE_RECTANGLE_ARB;
kaanb 2013/11/23 02:02:20 I guess this may break webview if we land it in th
reveman 2013/11/23 10:29:12 Done.
162 }
163
157 ResourceFormat ImageRasterWorkerPool::GetResourceFormat() const { 164 ResourceFormat ImageRasterWorkerPool::GetResourceFormat() const {
158 return resource_provider()->best_texture_format(); 165 return resource_provider()->best_texture_format();
159 } 166 }
160 167
161 void ImageRasterWorkerPool::OnRasterTasksFinished() { 168 void ImageRasterWorkerPool::OnRasterTasksFinished() {
162 DCHECK(raster_tasks_pending_); 169 DCHECK(raster_tasks_pending_);
163 raster_tasks_pending_ = false; 170 raster_tasks_pending_ = false;
164 TRACE_EVENT_ASYNC_END0("cc", "ScheduledTasks", this); 171 TRACE_EVENT_ASYNC_END0("cc", "ScheduledTasks", this);
165 client()->DidFinishRunningTasks(); 172 client()->DidFinishRunningTasks();
166 } 173 }
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
219 if (is_required_for_activation) { 226 if (is_required_for_activation) {
220 raster_required_for_activation_finished_node->add_dependency(); 227 raster_required_for_activation_finished_node->add_dependency();
221 image_node->add_dependent(raster_required_for_activation_finished_node); 228 image_node->add_dependent(raster_required_for_activation_finished_node);
222 } 229 }
223 230
224 raster_finished_node->add_dependency(); 231 raster_finished_node->add_dependency();
225 image_node->add_dependent(raster_finished_node); 232 image_node->add_dependent(raster_finished_node);
226 } 233 }
227 234
228 } // namespace cc 235 } // namespace cc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698