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

Side by Side Diff: cc/surfaces/surface_display_output_surface_unittest.cc

Issue 1273163004: Revert of cc: Use worker context for one-copy tile initialization. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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 unified diff | Download patch
« no previous file with comments | « cc/surfaces/surface_display_output_surface.cc ('k') | cc/test/fake_output_surface.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 #include "cc/surfaces/surface_display_output_surface.h" 5 #include "cc/surfaces/surface_display_output_surface.h"
6 6
7 #include "cc/surfaces/onscreen_display_client.h" 7 #include "cc/surfaces/onscreen_display_client.h"
8 #include "cc/surfaces/surface_id_allocator.h" 8 #include "cc/surfaces/surface_id_allocator.h"
9 #include "cc/surfaces/surface_manager.h" 9 #include "cc/surfaces/surface_manager.h"
10 #include "cc/test/fake_output_surface.h" 10 #include "cc/test/fake_output_surface.h"
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 display_size_(1920, 1080), 53 display_size_(1920, 1080),
54 display_rect_(display_size_), 54 display_rect_(display_size_),
55 display_client_(&surface_manager_, 55 display_client_(&surface_manager_,
56 &bitmap_manager_, 56 &bitmap_manager_,
57 &gpu_memory_buffer_manager_, 57 &gpu_memory_buffer_manager_,
58 renderer_settings_, 58 renderer_settings_,
59 task_runner_), 59 task_runner_),
60 context_provider_(TestContextProvider::Create()), 60 context_provider_(TestContextProvider::Create()),
61 surface_display_output_surface_(&surface_manager_, 61 surface_display_output_surface_(&surface_manager_,
62 &allocator_, 62 &allocator_,
63 context_provider_, 63 context_provider_) {
64 nullptr) {
65 output_surface_ = display_client_.output_surface(); 64 output_surface_ = display_client_.output_surface();
66 display_client_.set_surface_output_surface( 65 display_client_.set_surface_output_surface(
67 &surface_display_output_surface_); 66 &surface_display_output_surface_);
68 surface_display_output_surface_.set_display_client(&display_client_); 67 surface_display_output_surface_.set_display_client(&display_client_);
69 surface_display_output_surface_.BindToClient( 68 surface_display_output_surface_.BindToClient(
70 &surface_display_output_surface_client_); 69 &surface_display_output_surface_client_);
71 display_client_.display()->Resize(display_size_); 70 display_client_.display()->Resize(display_size_);
72 71
73 EXPECT_FALSE(surface_display_output_surface_client_ 72 EXPECT_FALSE(surface_display_output_surface_client_
74 .did_lose_output_surface_called()); 73 .did_lose_output_surface_called());
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
141 EXPECT_EQ(1u, output_surface_->num_sent_frames()); 140 EXPECT_EQ(1u, output_surface_->num_sent_frames());
142 141
143 SwapBuffersWithDamage(gfx::Rect()); 142 SwapBuffersWithDamage(gfx::Rect());
144 EXPECT_EQ(1u, output_surface_->num_sent_frames()); 143 EXPECT_EQ(1u, output_surface_->num_sent_frames());
145 task_runner_->RunUntilIdle(); 144 task_runner_->RunUntilIdle();
146 EXPECT_EQ(1u, output_surface_->num_sent_frames()); 145 EXPECT_EQ(1u, output_surface_->num_sent_frames());
147 } 146 }
148 147
149 } // namespace 148 } // namespace
150 } // namespace cc 149 } // namespace cc
OLDNEW
« no previous file with comments | « cc/surfaces/surface_display_output_surface.cc ('k') | cc/test/fake_output_surface.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698