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

Side by Side Diff: media/blink/video_frame_compositor_unittest.cc

Issue 1848923003: Revert of Make Android StreamTexture implement GLStreamTextureImage (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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 | « gpu/ipc/common/gpu_messages.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "base/bind.h" 5 #include "base/bind.h"
6 #include "base/macros.h" 6 #include "base/macros.h"
7 #include "base/message_loop/message_loop.h" 7 #include "base/message_loop/message_loop.h"
8 #include "base/run_loop.h" 8 #include "base/run_loop.h"
9 #include "base/test/simple_test_tick_clock.h" 9 #include "base/test/simple_test_tick_clock.h"
10 #include "cc/layers/video_frame_provider.h" 10 #include "cc/layers/video_frame_provider.h"
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 63
64 int opacity_changed_count() { return opacity_changed_count_; } 64 int opacity_changed_count() { return opacity_changed_count_; }
65 bool opaque() { return opaque_; } 65 bool opaque() { return opaque_; }
66 66
67 protected: 67 protected:
68 // cc::VideoFrameProvider::Client implementation. 68 // cc::VideoFrameProvider::Client implementation.
69 void StopUsingProvider() override {} 69 void StopUsingProvider() override {}
70 MOCK_METHOD0(StartRendering, void()); 70 MOCK_METHOD0(StartRendering, void());
71 MOCK_METHOD0(StopRendering, void()); 71 MOCK_METHOD0(StopRendering, void());
72 void DidReceiveFrame() override { ++did_receive_frame_count_; } 72 void DidReceiveFrame() override { ++did_receive_frame_count_; }
73 void DidUpdateMatrix(const float* matrix) override {}
73 74
74 // VideoRendererSink::RenderCallback implementation. 75 // VideoRendererSink::RenderCallback implementation.
75 MOCK_METHOD3(Render, 76 MOCK_METHOD3(Render,
76 scoped_refptr<VideoFrame>(base::TimeTicks, 77 scoped_refptr<VideoFrame>(base::TimeTicks,
77 base::TimeTicks, 78 base::TimeTicks,
78 bool)); 79 bool));
79 MOCK_METHOD0(OnFrameDropped, void()); 80 MOCK_METHOD0(OnFrameDropped, void());
80 81
81 void NaturalSizeChanged(gfx::Size natural_size) { 82 void NaturalSizeChanged(gfx::Size natural_size) {
82 ++natural_size_changed_count_; 83 ++natural_size_changed_count_;
(...skipping 342 matching lines...) Expand 10 before | Expand all | Expand 10 after
425 426
426 // Advancing the tick clock should allow a new frame to be requested. 427 // Advancing the tick clock should allow a new frame to be requested.
427 tick_clock_->Advance(base::TimeDelta::FromMilliseconds(10)); 428 tick_clock_->Advance(base::TimeDelta::FromMilliseconds(10));
428 ASSERT_EQ(opaque_frame_2, compositor()->GetCurrentFrameAndUpdateIfStale()); 429 ASSERT_EQ(opaque_frame_2, compositor()->GetCurrentFrameAndUpdateIfStale());
429 430
430 // Background rendering should tick another render callback. 431 // Background rendering should tick another render callback.
431 StopVideoRendererSink(false); 432 StopVideoRendererSink(false);
432 } 433 }
433 434
434 } // namespace media 435 } // namespace media
OLDNEW
« no previous file with comments | « gpu/ipc/common/gpu_messages.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698