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

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

Issue 951673002: Revert "Pull chromium at 2c3ffb2355a27c32f45e508ef861416b820c823b" (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 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
« no previous file with comments | « cc/resources/ui_resource_request.h ('k') | cc/resources/video_resource_updater.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 #ifndef CC_RESOURCES_VIDEO_RESOURCE_UPDATER_H_ 5 #ifndef CC_RESOURCES_VIDEO_RESOURCE_UPDATER_H_
6 #define CC_RESOURCES_VIDEO_RESOURCE_UPDATER_H_ 6 #define CC_RESOURCES_VIDEO_RESOURCE_UPDATER_H_
7 7
8 #include <list> 8 #include <list>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after
124 BlockingTaskRunner* main_thread_task_runner); 124 BlockingTaskRunner* main_thread_task_runner);
125 static void ReturnTexture(base::WeakPtr<VideoResourceUpdater> updater, 125 static void ReturnTexture(base::WeakPtr<VideoResourceUpdater> updater,
126 const scoped_refptr<media::VideoFrame>& video_frame, 126 const scoped_refptr<media::VideoFrame>& video_frame,
127 uint32 sync_point, 127 uint32 sync_point,
128 bool lost_resource, 128 bool lost_resource,
129 BlockingTaskRunner* main_thread_task_runner); 129 BlockingTaskRunner* main_thread_task_runner);
130 130
131 ContextProvider* context_provider_; 131 ContextProvider* context_provider_;
132 ResourceProvider* resource_provider_; 132 ResourceProvider* resource_provider_;
133 scoped_ptr<media::SkCanvasVideoRenderer> video_renderer_; 133 scoped_ptr<media::SkCanvasVideoRenderer> video_renderer_;
134 std::vector<uint8_t> upload_pixels_;
135 134
136 // Recycle resources so that we can reduce the number of allocations and 135 // Recycle resources so that we can reduce the number of allocations and
137 // data transfers. 136 // data transfers.
138 ResourceList all_resources_; 137 ResourceList all_resources_;
139 138
140 DISALLOW_COPY_AND_ASSIGN(VideoResourceUpdater); 139 DISALLOW_COPY_AND_ASSIGN(VideoResourceUpdater);
141 }; 140 };
142 141
143 } // namespace cc 142 } // namespace cc
144 143
145 #endif // CC_RESOURCES_VIDEO_RESOURCE_UPDATER_H_ 144 #endif // CC_RESOURCES_VIDEO_RESOURCE_UPDATER_H_
OLDNEW
« no previous file with comments | « cc/resources/ui_resource_request.h ('k') | cc/resources/video_resource_updater.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698