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

Unified Diff: media/base/mock_filters.h

Issue 8897022: Revert 113895 - <video> decode in hardware! (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/base/filters.cc ('k') | media/base/mock_filters.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/mock_filters.h
===================================================================
--- media/base/mock_filters.h (revision 113907)
+++ media/base/mock_filters.h (working copy)
@@ -188,7 +188,7 @@
// VideoDecoder implementation.
MOCK_METHOD3(Initialize, void(DemuxerStream* stream,
- const PipelineStatusCB& callback,
+ const base::Closure& callback,
const StatisticsCallback& stats_callback));
MOCK_METHOD1(Read, void(const ReadCB& callback));
MOCK_METHOD0(natural_size, const gfx::Size&());
@@ -322,7 +322,6 @@
void RunFilterCallback(::testing::Unused, const base::Closure& callback);
void RunFilterStatusCB(::testing::Unused, const FilterStatusCB& cb);
void RunPipelineStatusCB(PipelineStatus status, const PipelineStatusCB& cb);
-void RunPipelineStatusOKCB(const PipelineStatusCB& cb); // Always PIPELINE_OK.
void RunFilterCallback3(::testing::Unused, const base::Closure& callback,
::testing::Unused);
Property changes on: media/base/mock_filters.h
___________________________________________________________________
Added: svn:mergeinfo
« no previous file with comments | « media/base/filters.cc ('k') | media/base/mock_filters.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698