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

Side by Side Diff: cc/resources/video_resource_updater.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_unittest.cc ('k') | cc/resources/zero_copy_raster_worker_pool.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/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 "base/debug/trace_event.h" 8 #include "base/debug/trace_event.h"
9 #include "cc/output/gl_renderer.h" 9 #include "cc/output/gl_renderer.h"
10 #include "cc/resources/resource_provider.h" 10 #include "cc/resources/resource_provider.h"
11 #include "gpu/GLES2/gl2extchromium.h" 11 #include "gpu/GLES2/gl2extchromium.h"
12 #include "gpu/command_buffer/client/gles2_interface.h" 12 #include "gpu/command_buffer/client/gles2_interface.h"
13 #include "media/base/video_frame.h" 13 #include "media/base/video_frame.h"
14 #include "media/filters/skcanvas_video_renderer.h" 14 #include "media/filters/skcanvas_video_renderer.h"
15 #include "third_party/khronos/GLES2/gl2.h" 15 #include "third_party/khronos/GLES2/gl2.h"
16 #include "third_party/khronos/GLES2/gl2ext.h" 16 #include "third_party/khronos/GLES2/gl2ext.h"
17 #include "ui/gfx/size_conversions.h" 17 #include "ui/gfx/size_conversions.h"
18 18
19 namespace cc { 19 namespace cc {
20 20
21 namespace { 21 namespace {
22 22
23 const ResourceFormat kYUVResourceFormat = LUMINANCE_8; 23 const ResourceFormat kYUVResourceFormat = LUMINANCE_8;
24 const ResourceFormat kRGBResourceFormat = RGBA_8888; 24 const ResourceFormat kRGBResourceFormat = RGBA_8888;
25 25
26 class SyncPointClientImpl : public media::VideoFrame::SyncPointClient { 26 class SyncPointClientImpl : public media::VideoFrame::SyncPointClient {
27 public: 27 public:
28 explicit SyncPointClientImpl(gpu::gles2::GLES2Interface* gl) : gl_(gl) {} 28 explicit SyncPointClientImpl(gpu::gles2::GLES2Interface* gl) : gl_(gl) {}
29 virtual ~SyncPointClientImpl() {} 29 virtual ~SyncPointClientImpl() {}
30 virtual uint32 InsertSyncPoint() OVERRIDE { 30 virtual uint32 InsertSyncPoint() override {
31 return GLC(gl_, gl_->InsertSyncPointCHROMIUM()); 31 return GLC(gl_, gl_->InsertSyncPointCHROMIUM());
32 } 32 }
33 virtual void WaitSyncPoint(uint32 sync_point) OVERRIDE { 33 virtual void WaitSyncPoint(uint32 sync_point) override {
34 GLC(gl_, gl_->WaitSyncPointCHROMIUM(sync_point)); 34 GLC(gl_, gl_->WaitSyncPointCHROMIUM(sync_point));
35 } 35 }
36 36
37 private: 37 private:
38 gpu::gles2::GLES2Interface* gl_; 38 gpu::gles2::GLES2Interface* gl_;
39 }; 39 };
40 40
41 } // namespace 41 } // namespace
42 42
43 VideoFrameExternalResources::VideoFrameExternalResources() : type(NONE) {} 43 VideoFrameExternalResources::VideoFrameExternalResources() : type(NONE) {}
(...skipping 346 matching lines...) Expand 10 before | Expand all | Expand 10 after
390 } 390 }
391 391
392 PlaneResource recycled_resource(data.resource_id, 392 PlaneResource recycled_resource(data.resource_id,
393 data.resource_size, 393 data.resource_size,
394 data.resource_format, 394 data.resource_format,
395 data.mailbox); 395 data.mailbox);
396 updater->recycled_resources_.push_back(recycled_resource); 396 updater->recycled_resources_.push_back(recycled_resource);
397 } 397 }
398 398
399 } // namespace cc 399 } // namespace cc
OLDNEW
« no previous file with comments | « cc/resources/tile_manager_unittest.cc ('k') | cc/resources/zero_copy_raster_worker_pool.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698