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

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

Issue 628443002: replace OVERRIDE and FINAL with override and final in cc/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master Created 6 years, 2 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/tile_manager.h ('k') | cc/resources/tile_manager_perftest.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 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/resources/tile_manager.h" 5 #include "cc/resources/tile_manager.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <limits> 8 #include <limits>
9 #include <string> 9 #include <string>
10 10
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 contents_scale_(contents_scale), 52 contents_scale_(contents_scale),
53 tile_resolution_(tile_resolution), 53 tile_resolution_(tile_resolution),
54 layer_id_(layer_id), 54 layer_id_(layer_id),
55 tile_id_(tile_id), 55 tile_id_(tile_id),
56 source_frame_number_(source_frame_number), 56 source_frame_number_(source_frame_number),
57 analyze_picture_(analyze_picture), 57 analyze_picture_(analyze_picture),
58 rendering_stats_(rendering_stats), 58 rendering_stats_(rendering_stats),
59 reply_(reply) {} 59 reply_(reply) {}
60 60
61 // Overridden from Task: 61 // Overridden from Task:
62 virtual void RunOnWorkerThread() OVERRIDE { 62 virtual void RunOnWorkerThread() override {
63 TRACE_EVENT0("cc", "RasterizerTaskImpl::RunOnWorkerThread"); 63 TRACE_EVENT0("cc", "RasterizerTaskImpl::RunOnWorkerThread");
64 64
65 DCHECK(picture_pile_.get()); 65 DCHECK(picture_pile_.get());
66 DCHECK(raster_buffer_); 66 DCHECK(raster_buffer_);
67 67
68 if (analyze_picture_) { 68 if (analyze_picture_) {
69 Analyze(picture_pile_.get()); 69 Analyze(picture_pile_.get());
70 if (analysis_.is_solid_color) 70 if (analysis_.is_solid_color)
71 return; 71 return;
72 } 72 }
73 73
74 Raster(picture_pile_.get()); 74 Raster(picture_pile_.get());
75 } 75 }
76 76
77 // Overridden from RasterizerTask: 77 // Overridden from RasterizerTask:
78 virtual void ScheduleOnOriginThread(RasterizerTaskClient* client) OVERRIDE { 78 virtual void ScheduleOnOriginThread(RasterizerTaskClient* client) override {
79 DCHECK(!raster_buffer_); 79 DCHECK(!raster_buffer_);
80 raster_buffer_ = client->AcquireBufferForRaster(resource()); 80 raster_buffer_ = client->AcquireBufferForRaster(resource());
81 } 81 }
82 virtual void CompleteOnOriginThread(RasterizerTaskClient* client) OVERRIDE { 82 virtual void CompleteOnOriginThread(RasterizerTaskClient* client) override {
83 client->ReleaseBufferForRaster(raster_buffer_.Pass()); 83 client->ReleaseBufferForRaster(raster_buffer_.Pass());
84 } 84 }
85 virtual void RunReplyOnOriginThread() OVERRIDE { 85 virtual void RunReplyOnOriginThread() override {
86 DCHECK(!raster_buffer_); 86 DCHECK(!raster_buffer_);
87 reply_.Run(analysis_, !HasFinishedRunning()); 87 reply_.Run(analysis_, !HasFinishedRunning());
88 } 88 }
89 89
90 protected: 90 protected:
91 virtual ~RasterTaskImpl() { DCHECK(!raster_buffer_); } 91 virtual ~RasterTaskImpl() { DCHECK(!raster_buffer_); }
92 92
93 private: 93 private:
94 void Analyze(const PicturePileImpl* picture_pile) { 94 void Analyze(const PicturePileImpl* picture_pile) {
95 frame_viewer_instrumentation::ScopedAnalyzeTask analyze_task( 95 frame_viewer_instrumentation::ScopedAnalyzeTask analyze_task(
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
165 ImageDecodeTaskImpl(SkPixelRef* pixel_ref, 165 ImageDecodeTaskImpl(SkPixelRef* pixel_ref,
166 int layer_id, 166 int layer_id,
167 RenderingStatsInstrumentation* rendering_stats, 167 RenderingStatsInstrumentation* rendering_stats,
168 const base::Callback<void(bool was_canceled)>& reply) 168 const base::Callback<void(bool was_canceled)>& reply)
169 : pixel_ref_(skia::SharePtr(pixel_ref)), 169 : pixel_ref_(skia::SharePtr(pixel_ref)),
170 layer_id_(layer_id), 170 layer_id_(layer_id),
171 rendering_stats_(rendering_stats), 171 rendering_stats_(rendering_stats),
172 reply_(reply) {} 172 reply_(reply) {}
173 173
174 // Overridden from Task: 174 // Overridden from Task:
175 virtual void RunOnWorkerThread() OVERRIDE { 175 virtual void RunOnWorkerThread() override {
176 TRACE_EVENT0("cc", "ImageDecodeTaskImpl::RunOnWorkerThread"); 176 TRACE_EVENT0("cc", "ImageDecodeTaskImpl::RunOnWorkerThread");
177 177
178 devtools_instrumentation::ScopedImageDecodeTask image_decode_task( 178 devtools_instrumentation::ScopedImageDecodeTask image_decode_task(
179 pixel_ref_.get()); 179 pixel_ref_.get());
180 // This will cause the image referred to by pixel ref to be decoded. 180 // This will cause the image referred to by pixel ref to be decoded.
181 pixel_ref_->lockPixels(); 181 pixel_ref_->lockPixels();
182 pixel_ref_->unlockPixels(); 182 pixel_ref_->unlockPixels();
183 } 183 }
184 184
185 // Overridden from RasterizerTask: 185 // Overridden from RasterizerTask:
186 virtual void ScheduleOnOriginThread(RasterizerTaskClient* client) OVERRIDE {} 186 virtual void ScheduleOnOriginThread(RasterizerTaskClient* client) override {}
187 virtual void CompleteOnOriginThread(RasterizerTaskClient* client) OVERRIDE {} 187 virtual void CompleteOnOriginThread(RasterizerTaskClient* client) override {}
188 virtual void RunReplyOnOriginThread() OVERRIDE { 188 virtual void RunReplyOnOriginThread() override {
189 reply_.Run(!HasFinishedRunning()); 189 reply_.Run(!HasFinishedRunning());
190 } 190 }
191 191
192 protected: 192 protected:
193 virtual ~ImageDecodeTaskImpl() {} 193 virtual ~ImageDecodeTaskImpl() {}
194 194
195 private: 195 private:
196 skia::RefPtr<SkPixelRef> pixel_ref_; 196 skia::RefPtr<SkPixelRef> pixel_ref_;
197 int layer_id_; 197 int layer_id_;
198 RenderingStatsInstrumentation* rendering_stats_; 198 RenderingStatsInstrumentation* rendering_stats_;
(...skipping 919 matching lines...) Expand 10 before | Expand all | Expand 10 after
1118 TRACE_EVENT0("cc", "TileManager::CheckIfReadyToActivate"); 1118 TRACE_EVENT0("cc", "TileManager::CheckIfReadyToActivate");
1119 1119
1120 rasterizer_->CheckForCompletedTasks(); 1120 rasterizer_->CheckForCompletedTasks();
1121 did_check_for_completed_tasks_since_last_schedule_tasks_ = true; 1121 did_check_for_completed_tasks_since_last_schedule_tasks_ = true;
1122 1122
1123 if (IsReadyToActivate()) 1123 if (IsReadyToActivate())
1124 client_->NotifyReadyToActivate(); 1124 client_->NotifyReadyToActivate();
1125 } 1125 }
1126 1126
1127 } // namespace cc 1127 } // namespace cc
OLDNEW
« no previous file with comments | « cc/resources/tile_manager.h ('k') | cc/resources/tile_manager_perftest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698