content/browser/renderer_host/render_widget_host_view_aura_unittest.cc - Issue 464643003: Stop painting when receiving delegated frame

Unified Diff: content/browser/renderer_host/render_widget_host_view_aura_unittest.cc

Issue 464643003: Stop painting when receiving delegated frame (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix crashes Created 6 years, 4 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 side-by-side diff with in-line comments

Download patch

« athena/wm/overview_toolbar.cc ('K') | « content/browser/renderer_host/render_widget_host_view_aura.cc ('k') | content/browser/renderer_host/render_widget_host_view_mac.h » ('j') | ui/compositor/layer.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/renderer_host/render_widget_host_view_aura_unittest.cc

diff --git a/content/browser/renderer_host/render_widget_host_view_aura_unittest.cc b/content/browser/renderer_host/render_widget_host_view_aura_unittest.cc

index 506b02e6722a184380a15963428ecd5a137d7dde..d6cb1a25fb459b5e30c8be6f023bad6b49ceec63 100644

--- a/content/browser/renderer_host/render_widget_host_view_aura_unittest.cc

+++ b/content/browser/renderer_host/render_widget_host_view_aura_unittest.cc

@@ -307,7 +307,7 @@ class FullscreenLayoutManager : public aura::LayoutManager {

class MockWindowObserver : public aura::WindowObserver {

public:

- MOCK_METHOD2(OnWindowPaintScheduled, void(aura::Window*, const gfx::Rect&));

+ MOCK_METHOD2(OnDelegatedFrameDamage, void(aura::Window*, const gfx::Rect&));

enne (OOO) 2014/08/21 20:54:19 Changed this file to use OnDelegatedFrameDamage in

enne (OOO) 2014/08/21 20:54:19 Changed this file to expect OnDelegatedFrameDamage

};

} // namespace

@@ -1231,12 +1231,12 @@ TEST_F(RenderWidgetHostViewAuraTest, SwapNotifiesWindow) {

view_->window_->AddObserver(&observer);

// Delegated renderer path

- EXPECT_CALL(observer, OnWindowPaintScheduled(view_->window_, view_rect));

+ EXPECT_CALL(observer, OnDelegatedFrameDamage(view_->window_, view_rect));

view_->OnSwapCompositorFrame(

0, MakeDelegatedFrame(1.f, view_size, view_rect));

testing::Mock::VerifyAndClearExpectations(&observer);

- EXPECT_CALL(observer, OnWindowPaintScheduled(view_->window_,

+ EXPECT_CALL(observer, OnDelegatedFrameDamage(view_->window_,

gfx::Rect(5, 5, 5, 5)));

view_->OnSwapCompositorFrame(

0, MakeDelegatedFrame(1.f, view_size, gfx::Rect(5, 5, 5, 5)));

@@ -1347,7 +1347,7 @@ TEST_F(RenderWidgetHostViewAuraTest, SkippedDelegatedFrames) {

view_->window_->AddObserver(&observer);

// A full frame of damage.

- EXPECT_CALL(observer, OnWindowPaintScheduled(view_->window_, view_rect));

+ EXPECT_CALL(observer, OnDelegatedFrameDamage(view_->window_, view_rect));

view_->OnSwapCompositorFrame(

0, MakeDelegatedFrame(1.f, frame_size, view_rect));

testing::Mock::VerifyAndClearExpectations(&observer);

@@ -1356,7 +1356,7 @@ TEST_F(RenderWidgetHostViewAuraTest, SkippedDelegatedFrames) {

// A partial damage frame.

gfx::Rect partial_view_rect(30, 30, 20, 20);

EXPECT_CALL(observer,

- OnWindowPaintScheduled(view_->window_, partial_view_rect));

+ OnDelegatedFrameDamage(view_->window_, partial_view_rect));

view_->OnSwapCompositorFrame(

0, MakeDelegatedFrame(1.f, frame_size, partial_view_rect));

testing::Mock::VerifyAndClearExpectations(&observer);

@@ -1368,14 +1368,14 @@ TEST_F(RenderWidgetHostViewAuraTest, SkippedDelegatedFrames) {

// This frame is dropped.

gfx::Rect dropped_damage_rect_1(10, 20, 30, 40);

- EXPECT_CALL(observer, OnWindowPaintScheduled(_, _)).Times(0);

+ EXPECT_CALL(observer, OnDelegatedFrameDamage(_, _)).Times(0);

view_->OnSwapCompositorFrame(

0, MakeDelegatedFrame(1.f, frame_size, dropped_damage_rect_1));

testing::Mock::VerifyAndClearExpectations(&observer);

view_->RunOnCompositingDidCommit();

gfx::Rect dropped_damage_rect_2(40, 50, 10, 20);

- EXPECT_CALL(observer, OnWindowPaintScheduled(_, _)).Times(0);

+ EXPECT_CALL(observer, OnDelegatedFrameDamage(_, _)).Times(0);

view_->OnSwapCompositorFrame(

0, MakeDelegatedFrame(1.f, frame_size, dropped_damage_rect_2));

testing::Mock::VerifyAndClearExpectations(&observer);

@@ -1386,7 +1386,7 @@ TEST_F(RenderWidgetHostViewAuraTest, SkippedDelegatedFrames) {

gfx::Rect new_damage_rect(5, 6, 10, 10);

EXPECT_CALL(observer,

- OnWindowPaintScheduled(view_->window_, view_rect));

+ OnDelegatedFrameDamage(view_->window_, view_rect));

view_->OnSwapCompositorFrame(

0, MakeDelegatedFrame(1.f, frame_size, new_damage_rect));

testing::Mock::VerifyAndClearExpectations(&observer);

@@ -1394,7 +1394,7 @@ TEST_F(RenderWidgetHostViewAuraTest, SkippedDelegatedFrames) {

// A partial damage frame, this should not be dropped.

EXPECT_CALL(observer,

- OnWindowPaintScheduled(view_->window_, partial_view_rect));

+ OnDelegatedFrameDamage(view_->window_, partial_view_rect));

view_->OnSwapCompositorFrame(

0, MakeDelegatedFrame(1.f, frame_size, partial_view_rect));

testing::Mock::VerifyAndClearExpectations(&observer);

@@ -1410,7 +1410,7 @@ TEST_F(RenderWidgetHostViewAuraTest, SkippedDelegatedFrames) {

view_->SetSize(view_rect.size());

// This frame should not be dropped.

- EXPECT_CALL(observer, OnWindowPaintScheduled(view_->window_, view_rect));

+ EXPECT_CALL(observer, OnDelegatedFrameDamage(view_->window_, view_rect));

view_->OnSwapCompositorFrame(

0, MakeDelegatedFrame(1.f, view_rect.size(), view_rect));

testing::Mock::VerifyAndClearExpectations(&observer);

@@ -1434,14 +1434,14 @@ TEST_F(RenderWidgetHostViewAuraTest, OutputSurfaceIdChange) {

view_->window_->AddObserver(&observer);

// Swap a frame.

- EXPECT_CALL(observer, OnWindowPaintScheduled(view_->window_, view_rect));

+ EXPECT_CALL(observer, OnDelegatedFrameDamage(view_->window_, view_rect));

view_->OnSwapCompositorFrame(

0, MakeDelegatedFrame(1.f, frame_size, view_rect));

testing::Mock::VerifyAndClearExpectations(&observer);

view_->RunOnCompositingDidCommit();

// Swap a frame with a different surface id.

- EXPECT_CALL(observer, OnWindowPaintScheduled(view_->window_, view_rect));

+ EXPECT_CALL(observer, OnDelegatedFrameDamage(view_->window_, view_rect));

view_->OnSwapCompositorFrame(

1, MakeDelegatedFrame(1.f, frame_size, view_rect));

testing::Mock::VerifyAndClearExpectations(&observer);

@@ -1454,7 +1454,7 @@ TEST_F(RenderWidgetHostViewAuraTest, OutputSurfaceIdChange) {

view_->RunOnCompositingDidCommit();

// Swap another frame, with a different surface id.

- EXPECT_CALL(observer, OnWindowPaintScheduled(view_->window_, view_rect));

+ EXPECT_CALL(observer, OnDelegatedFrameDamage(view_->window_, view_rect));

view_->OnSwapCompositorFrame(3,

MakeDelegatedFrame(1.f, frame_size, view_rect));

testing::Mock::VerifyAndClearExpectations(&observer);