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

Unified Diff: chrome/browser/renderer_host/render_widget_host_unittest.cc

Issue 126101: Adds kind-of-live thumbnail generation for a potential tab switcher. (Closed)
Patch Set: For Checking hopefully Created 11 years, 6 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
Index: chrome/browser/renderer_host/render_widget_host_unittest.cc
diff --git a/chrome/browser/renderer_host/render_widget_host_unittest.cc b/chrome/browser/renderer_host/render_widget_host_unittest.cc
index 083434dfc5f3f5078d8b11ef0602171d4e7a7ed7..f41aa29c55d2c2ea34e064eb1ebe5c0491cad93c 100644
--- a/chrome/browser/renderer_host/render_widget_host_unittest.cc
+++ b/chrome/browser/renderer_host/render_widget_host_unittest.cc
@@ -100,7 +100,7 @@ bool RenderWidgetHostProcess::WaitForPaintMsg(int render_widget_id,
// This test view allows us to specify the size.
class TestView : public TestRenderWidgetHostView {
public:
- TestView() {}
+ TestView(RenderWidgetHost* rwh) : TestRenderWidgetHostView(rwh) {}
// Sets the bounds returned by GetViewBounds.
void set_bounds(const gfx::Rect& bounds) {
@@ -112,10 +112,6 @@ class TestView : public TestRenderWidgetHostView {
return bounds_;
}
- BackingStore* AllocBackingStore(const gfx::Size& size) {
- return new BackingStore(size);
- }
-
protected:
gfx::Rect bounds_;
DISALLOW_COPY_AND_ASSIGN(TestView);
@@ -160,7 +156,7 @@ class RenderWidgetHostTest : public testing::Test {
profile_.reset(new TestingProfile());
process_ = new RenderWidgetHostProcess(profile_.get());
host_.reset(new MockRenderWidgetHost(process_, 1));
- view_.reset(new TestView);
+ view_.reset(new TestView(host_.get()));
host_->set_view(view_.get());
host_->Init();
}
@@ -303,7 +299,7 @@ TEST_F(RenderWidgetHostTest, GetBackingStore_NoRepaintAck) {
// We don't currently have a backing store, and if the renderer doesn't send
// one in time, we should get nothing.
process_->set_paint_msg_should_reply(false);
- BackingStore* backing = host_->GetBackingStore();
+ BackingStore* backing = host_->GetBackingStore(true);
EXPECT_FALSE(backing);
// The widget host should have sent a request for a repaint, and there should
// be no paint ACK.
@@ -315,7 +311,7 @@ TEST_F(RenderWidgetHostTest, GetBackingStore_NoRepaintAck) {
process_->sink().ClearMessages();
process_->set_paint_msg_should_reply(true);
process_->set_paint_msg_reply_flags(0);
- backing = host_->GetBackingStore();
+ backing = host_->GetBackingStore(true);
EXPECT_TRUE(backing);
// The widget host should NOT have sent a request for a repaint, since there
// was an ACK already pending.
@@ -331,7 +327,7 @@ TEST_F(RenderWidgetHostTest, GetBackingStore_RepaintAck) {
process_->set_paint_msg_should_reply(true);
process_->set_paint_msg_reply_flags(
ViewHostMsg_PaintRect_Flags::IS_REPAINT_ACK);
- BackingStore* backing = host_->GetBackingStore();
+ BackingStore* backing = host_->GetBackingStore(true);
EXPECT_TRUE(backing);
// We still should not have sent out a repaint request since the last flags
// didn't have the repaint ack set, and the pending flag will still be set.
@@ -342,7 +338,7 @@ TEST_F(RenderWidgetHostTest, GetBackingStore_RepaintAck) {
// Asking again for the backing store should just re-use the existing one
// and not send any messagse.
process_->sink().ClearMessages();
- backing = host_->GetBackingStore();
+ backing = host_->GetBackingStore(true);
EXPECT_TRUE(backing);
EXPECT_FALSE(process_->sink().GetUniqueMessageMatching(ViewMsg_Repaint::ID));
EXPECT_FALSE(process_->sink().GetUniqueMessageMatching(

Powered by Google App Engine
This is Rietveld 408576698