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

Unified Diff: content/renderer/gpu/render_widget_compositor_unittest.cc

Issue 2193293004: cc: Make LayerTreeTests use a DelegatingRenderer and Display. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: display-layertreetest: withperftestsfix Created 4 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
Index: content/renderer/gpu/render_widget_compositor_unittest.cc
diff --git a/content/renderer/gpu/render_widget_compositor_unittest.cc b/content/renderer/gpu/render_widget_compositor_unittest.cc
index 47c1e21037ff386675320256ff881f63947ccf9e..3246db3a8e01c5adecd493027759266b64c3ae58 100644
--- a/content/renderer/gpu/render_widget_compositor_unittest.cc
+++ b/content/renderer/gpu/render_widget_compositor_unittest.cc
@@ -14,14 +14,16 @@
#include "base/threading/thread_task_runner_handle.h"
#include "cc/output/begin_frame_args.h"
#include "cc/output/copy_output_request.h"
-#include "cc/test/failure_output_surface.h"
#include "cc/test/fake_external_begin_frame_source.h"
+#include "cc/test/fake_output_surface.h"
+#include "cc/test/test_context_provider.h"
#include "cc/trees/layer_tree_host.h"
#include "components/scheduler/renderer/renderer_scheduler.h"
#include "content/public/test/mock_render_thread.h"
#include "content/renderer/render_widget.h"
#include "content/test/fake_compositor_dependencies.h"
#include "content/test/fake_renderer_scheduler.h"
+#include "gpu/GLES2/gl2extchromium.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "third_party/WebKit/public/platform/WebScreenInfo.h"
@@ -80,18 +82,20 @@ class FakeRenderWidgetCompositorDelegate
RenderWidgetCompositor::OUTPUT_SURFACE_RETRIES_BEFORE_FALLBACK,
fallback);
last_create_was_fallback_ = fallback;
+
bool success = num_failures_ >= num_failures_before_success_;
- if (success) {
- std::unique_ptr<cc::TestWebGraphicsContext3D> context =
- cc::TestWebGraphicsContext3D::Create();
- // Image support required for synchronous compositing.
- context->set_support_image(true);
- // Create delegating surface so that max_pending_frames = 1.
- return cc::FakeOutputSurface::CreateDelegating3d(std::move(context));
+ if (!success && use_null_output_surface_)
+ return nullptr;
+
+ auto context_provider = cc::TestContextProvider::Create();
+ if (!success) {
+ context_provider->UnboundTestContext3d()->loseContextCHROMIUM(
+ GL_GUILTY_CONTEXT_RESET_ARB, GL_INNOCENT_CONTEXT_RESET_ARB);
}
- return use_null_output_surface_
- ? nullptr
- : base::WrapUnique(new cc::FailureOutputSurface(true));
+
+ // Create delegating surface so that max_pending_frames = 1.
+ return cc::FakeOutputSurface::CreateDelegating3d(
+ std::move(context_provider));
}
std::unique_ptr<cc::BeginFrameSource> CreateExternalBeginFrameSource()
« no previous file with comments | « content/renderer/android/synchronous_compositor_output_surface.h ('k') | content/test/layouttest_support.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698