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

Side by Side Diff: cc/test/fake_video_frame_provider.h

Issue 11754003: Move VideoFrameProvider to, and remove all usage of WebVideoFrame from cc/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: gyp-depend-on-media+androidfix Created 7 years, 11 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 | Annotate | Revision Log
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 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_TEST_FAKE_VIDEO_FRAME_PROVIDER_H_ 5 #ifndef CC_TEST_FAKE_VIDEO_FRAME_PROVIDER_H_
6 #define CC_TEST_FAKE_VIDEO_FRAME_PROVIDER_H_ 6 #define CC_TEST_FAKE_VIDEO_FRAME_PROVIDER_H_
7 7
8 #include "base/memory/scoped_ptr.h" 8 #include "cc/video_frame_provider.h"
9 #include "cc/test/fake_video_frame.h" 9 #include "media/base/video_frame.h"
10 #include "third_party/WebKit/Source/Platform/chromium/public/WebVideoFrameProvid er.h"
11 10
12 namespace cc { 11 namespace cc {
13 12
14 // Fake video frame provider that always provides the same VideoFrame. 13 // Fake video frame provider that always provides the same VideoFrame.
15 class FakeVideoFrameProvider: public WebKit::WebVideoFrameProvider { 14 class FakeVideoFrameProvider: public VideoFrameProvider {
scherkus (not reviewing) 2013/01/04 16:59:35 nit: spaces around :
16 public: 15 public:
17 FakeVideoFrameProvider(); 16 FakeVideoFrameProvider();
18 virtual ~FakeVideoFrameProvider(); 17 virtual ~FakeVideoFrameProvider();
19 18
20 virtual void setVideoFrameProviderClient(Client* client) OVERRIDE; 19 virtual void SetVideoFrameProviderClient(Client* client) OVERRIDE;
21 virtual WebKit::WebVideoFrame* getCurrentFrame() OVERRIDE; 20 virtual scoped_refptr<media::VideoFrame> GetCurrentFrame() OVERRIDE;
22 virtual void putCurrentFrame(WebKit::WebVideoFrame*) OVERRIDE {} 21 virtual void PutCurrentFrame(const scoped_refptr<media::VideoFrame>&)
22 OVERRIDE {}
23 23
24 void set_frame(FakeVideoFrame* frame) { 24 void set_frame(const scoped_refptr<media::VideoFrame>& frame) {
25 frame_ = frame; 25 frame_ = frame;
26 } 26 }
27 27
28 private: 28 private:
29 FakeVideoFrame* frame_; 29 scoped_refptr<media::VideoFrame> frame_;
30 Client* client_; 30 Client* client_;
31 }; 31 };
32 32
33 } // namespace cc 33 } // namespace cc
34 34
35 #endif // CC_TEST_FAKE_VIDEO_FRAME_PROVIDER_H_ 35 #endif // CC_TEST_FAKE_VIDEO_FRAME_PROVIDER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698