Index: remoting/test/test_video_renderer.h |
diff --git a/remoting/test/test_video_renderer.h b/remoting/test/test_video_renderer.h |
index b9a84f7ff697e02520984054ba5366c7b7fb9b7b..bb87b72e2210995693d74890f31ed2b82456491b 100644 |
--- a/remoting/test/test_video_renderer.h |
+++ b/remoting/test/test_video_renderer.h |
@@ -23,8 +23,6 @@ class DesktopFrame; |
class DesktopRect; |
} |
-typedef uint32 RgbaColor; |
- |
namespace remoting { |
namespace test { |
@@ -49,8 +47,8 @@ class TestVideoRenderer : public VideoRenderer, public protocol::VideoStub { |
// Initialize a decoder to decode video packets. |
void SetCodecForDecoding(const protocol::ChannelConfig::Codec codec); |
- // Returns a copy of the current buffer. |
- scoped_ptr<webrtc::DesktopFrame> GetBufferForTest() const; |
+ // Returns a copy of the current frame. |
+ scoped_ptr<webrtc::DesktopFrame> GetCurrentFrameForTest() const; |
// Gets a weak pointer for this object. |
base::WeakPtr<TestVideoRenderer> GetWeakPtr() { |
@@ -61,7 +59,7 @@ class TestVideoRenderer : public VideoRenderer, public protocol::VideoStub { |
// when the pattern is matched. |
void SetImagePatternAndMatchedCallback( |
Sergey Ulanov
2015/07/13 19:42:18
Maybe call this differently to reflect actual beha
liaoyuke
2015/07/13 20:43:18
Totally agree with your idea to move matching code
liaoyuke
2015/07/13 20:43:18
Done.
|
const webrtc::DesktopRect& expected_rect, |
- const RgbaColor& expected_color, |
+ uint32_t expected_color, |
Sergey Ulanov
2015/07/13 19:42:18
call this expected_average_color and document it i
liaoyuke
2015/07/13 20:43:19
Done.
|
const base::Closure& image_pattern_matched_callback); |
private: |