summaryrefslogtreecommitdiffstats
path: root/cc/test/fake_video_frame_provider.h
diff options
context:
space:
mode:
authorscherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-29 04:27:38 +0000
committerscherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-29 04:27:38 +0000
commit69fb3d53a0799a578d3564fd3735eb6e8c34d5b8 (patch)
treeadc2667d80b02b0f0183f20adace0163bc101658 /cc/test/fake_video_frame_provider.h
parent8035e22f828c698aad23f8d44c9656f8a8aa97ee (diff)
downloadchromium_src-69fb3d53a0799a578d3564fd3735eb6e8c34d5b8.zip
chromium_src-69fb3d53a0799a578d3564fd3735eb6e8c34d5b8.tar.gz
chromium_src-69fb3d53a0799a578d3564fd3735eb6e8c34d5b8.tar.bz2
Initialize cc::VideoFrameProviderClientImpl::active_video_layer_.
As of r259048, WebMediaPlayerImpl now notifies the compositor of new frames directly on the compositing thread. If VideoFrameProviderClientImpl::DidRecieveFrame() is called before VideoLayerImpl::DidBecomeActive() is called, VideoFrameProviderClientImpl may attempt to call VideoLayerImpl::SetNeedsRedraw() using an uninitialized pointer. BUG=357145 R=enne@chromium.org Review URL: https://codereview.chromium.org/214543011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@260360 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/test/fake_video_frame_provider.h')
-rw-r--r--cc/test/fake_video_frame_provider.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/cc/test/fake_video_frame_provider.h b/cc/test/fake_video_frame_provider.h
index 972d8f8..fc462e4 100644
--- a/cc/test/fake_video_frame_provider.h
+++ b/cc/test/fake_video_frame_provider.h
@@ -21,6 +21,8 @@ class FakeVideoFrameProvider : public VideoFrameProvider {
virtual void PutCurrentFrame(const scoped_refptr<media::VideoFrame>&)
OVERRIDE {}
+ Client* client() { return client_; }
+
void set_frame(const scoped_refptr<media::VideoFrame>& frame) {
frame_ = frame;
}