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

Unified Diff: cc/test/layer_tree_pixel_test.cc

Issue 935333002: Update from https://crrev.com/316786 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 10 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
« no previous file with comments | « cc/test/layer_tree_pixel_test.h ('k') | cc/test/ordered_simple_task_runner.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/test/layer_tree_pixel_test.cc
diff --git a/cc/test/layer_tree_pixel_test.cc b/cc/test/layer_tree_pixel_test.cc
index 8a053fabb188072b989688452edd8d905168f1b4..f7ab9c27e36fa731563fdda72f6181d558ddd197 100644
--- a/cc/test/layer_tree_pixel_test.cc
+++ b/cc/test/layer_tree_pixel_test.cc
@@ -11,6 +11,7 @@
#include "cc/layers/texture_layer.h"
#include "cc/output/copy_output_request.h"
#include "cc/output/copy_output_result.h"
+#include "cc/output/direct_renderer.h"
#include "cc/resources/texture_mailbox.h"
#include "cc/test/paths.h"
#include "cc/test/pixel_comparator.h"
@@ -52,7 +53,8 @@ scoped_ptr<OutputSurface> LayerTreePixelTest::CreateOutputSurface() {
case PIXEL_TEST_GL: {
bool flipped_output_surface = false;
output_surface = make_scoped_ptr(new PixelTestOutputSurface(
- new TestInProcessContextProvider, flipped_output_surface));
+ new TestInProcessContextProvider, new TestInProcessContextProvider,
+ flipped_output_surface));
break;
}
}
@@ -67,6 +69,9 @@ void LayerTreePixelTest::CommitCompleteOnThread(LayerTreeHostImpl* impl) {
if (commit_tree->source_frame_number() != 0)
return;
+ DirectRenderer* renderer = static_cast<DirectRenderer*>(impl->renderer());
+ renderer->SetEnlargePassTextureAmountForTesting(enlarge_texture_amount_);
+
gfx::Rect viewport = impl->DeviceViewport();
// The viewport has a 0,0 origin without external influence.
EXPECT_EQ(gfx::Point().ToString(), viewport.origin().ToString());
« no previous file with comments | « cc/test/layer_tree_pixel_test.h ('k') | cc/test/ordered_simple_task_runner.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698