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

Unified Diff: content/browser/compositor/gpu_process_transport_factory.cc

Issue 2879463002: Initialize RendererSettings in ContextFactory (Closed)
Patch Set: const RendererSettings Created 3 years, 7 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 | « content/browser/compositor/gpu_process_transport_factory.h ('k') | ui/aura/mus/mus_context_factory.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/compositor/gpu_process_transport_factory.cc
diff --git a/content/browser/compositor/gpu_process_transport_factory.cc b/content/browser/compositor/gpu_process_transport_factory.cc
index 47b95f6d9a1cf6a028e24cf2a3a0b0df8102c612..1017d5626a89c6725154943e87101a229ea5956c 100644
--- a/content/browser/compositor/gpu_process_transport_factory.cc
+++ b/content/browser/compositor/gpu_process_transport_factory.cc
@@ -19,6 +19,7 @@
#include "base/threading/thread_task_runner_handle.h"
#include "build/build_config.h"
#include "cc/base/histograms.h"
+#include "cc/base/switches.h"
#include "cc/output/texture_mailbox_deleter.h"
#include "cc/output/vulkan_in_process_context_provider.h"
#include "cc/raster/single_thread_task_graph_runner.h"
@@ -57,7 +58,9 @@
#include "ui/compositor/compositor.h"
#include "ui/compositor/compositor_constants.h"
#include "ui/compositor/compositor_switches.h"
+#include "ui/compositor/compositor_util.h"
#include "ui/compositor/layer.h"
+#include "ui/display/display_switches.h"
#include "ui/display/types/display_snapshot.h"
#include "ui/gfx/geometry/size.h"
#include "ui/gfx/switches.h"
@@ -197,6 +200,8 @@ struct GpuProcessTransportFactory::PerCompositorData {
GpuProcessTransportFactory::GpuProcessTransportFactory()
: frame_sink_id_allocator_(kDefaultClientId),
+ renderer_settings_(
+ ui::CreateRendererSettings(&gpu::GetImageTextureTarget)),
task_graph_runner_(new cc::SingleThreadTaskGraphRunner),
callback_factory_(this) {
cc::SetClientNameForMetrics("Browser");
@@ -601,7 +606,7 @@ void GpuProcessTransportFactory::EstablishedGpuChannel(
// The Display owns and uses the |display_output_surface| created above.
data->display = base::MakeUnique<cc::Display>(
display_compositor::HostSharedBitmapManager::current(),
- GetGpuMemoryBufferManager(), compositor->GetRendererSettings(),
+ GetGpuMemoryBufferManager(), renderer_settings_,
compositor->frame_sink_id(), begin_frame_source,
std::move(display_output_surface), std::move(scheduler),
base::MakeUnique<cc::TextureMailboxDeleter>(
@@ -695,12 +700,6 @@ double GpuProcessTransportFactory::GetRefreshRate() const {
return 60.0;
}
-uint32_t GpuProcessTransportFactory::GetImageTextureTarget(
- gfx::BufferFormat format,
- gfx::BufferUsage usage) {
- return gpu::GetImageTextureTarget(format, usage);
-}
-
gpu::GpuMemoryBufferManager*
GpuProcessTransportFactory::GetGpuMemoryBufferManager() {
return gpu_channel_factory_->GetGpuMemoryBufferManager();
@@ -803,6 +802,11 @@ void GpuProcessTransportFactory::SetOutputIsSecure(ui::Compositor* compositor,
data->display->SetOutputIsSecure(secure);
}
+const cc::RendererSettings& GpuProcessTransportFactory::GetRendererSettings()
+ const {
+ return renderer_settings_;
+}
+
void GpuProcessTransportFactory::AddObserver(
ui::ContextFactoryObserver* observer) {
observer_list_.AddObserver(observer);
« no previous file with comments | « content/browser/compositor/gpu_process_transport_factory.h ('k') | ui/aura/mus/mus_context_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698