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

Unified Diff: cc/surfaces/display.h

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
« no previous file with comments | « cc/output/renderer_unittest.cc ('k') | cc/surfaces/display.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/surfaces/display.h
diff --git a/cc/surfaces/display.h b/cc/surfaces/display.h
index 24942a92402b606d4fab4f97d6a8f70adf58d99a..0fc2fb0a7484bf5f6a4853c93ef61022cb655521 100644
--- a/cc/surfaces/display.h
+++ b/cc/surfaces/display.h
@@ -115,6 +115,7 @@ class CC_SURFACES_EXPORT Display : public DisplaySchedulerClient,
}
bool has_scheduler() const { return !!scheduler_; }
+ DirectRenderer* renderer_for_testing() const { return renderer_.get(); }
private:
void InitializeRenderer();
@@ -124,8 +125,8 @@ class CC_SURFACES_EXPORT Display : public DisplaySchedulerClient,
gpu::GpuMemoryBufferManager* const gpu_memory_buffer_manager_;
const RendererSettings settings_;
- DisplayClient* client_;
- SurfaceManager* surface_manager_;
+ DisplayClient* client_ = nullptr;
+ SurfaceManager* surface_manager_ = nullptr;
uint32_t compositor_surface_namespace_;
SurfaceId current_surface_id_;
gfx::Size current_surface_size_;
« no previous file with comments | « cc/output/renderer_unittest.cc ('k') | cc/surfaces/display.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698