summaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
authorsohan.jyoti <sohan.jyoti@samsung.com>2015-11-04 09:46:32 -0800
committerCommit bot <commit-bot@chromium.org>2015-11-04 17:47:13 +0000
commitdb8e72689d3a39792b54bb9d3df74d3c3f264503 (patch)
tree5b9f3198e8e7cd4568ab3d1a4789e3a7f01781f4 /ui
parentbbf21b98366f5e09df1acb379fa24c290ebaea3d (diff)
downloadchromium_src-db8e72689d3a39792b54bb9d3df74d3c3f264503.zip
chromium_src-db8e72689d3a39792b54bb9d3df74d3c3f264503.tar.gz
chromium_src-db8e72689d3a39792b54bb9d3df74d3c3f264503.tar.bz2
Set gpu memory policy in UI compositor.
Now that GpuMemoryManager doesnt decide memory limit for the tilemanager, we need to set the limits while initializing both ui and renderer compositor. BUG=546653 Review URL: https://codereview.chromium.org/1413003005 Cr-Commit-Position: refs/heads/master@{#357844}
Diffstat (limited to 'ui')
-rw-r--r--ui/compositor/compositor.cc8
1 files changed, 8 insertions, 0 deletions
diff --git a/ui/compositor/compositor.cc b/ui/compositor/compositor.cc
index 6bb5360..29ea93c 100644
--- a/ui/compositor/compositor.cc
+++ b/ui/compositor/compositor.cc
@@ -166,6 +166,14 @@ Compositor::Compositor(ui::ContextFactory* context_factory,
settings.use_compositor_animation_timelines =
command_line->HasSwitch(switches::kUIEnableCompositorAnimationTimelines);
+#if !defined(OS_ANDROID)
+ // TODO(sohanjg): Revisit this memory usage in tile manager.
+ cc::ManagedMemoryPolicy policy(
+ 512 * 1024 * 1024, gpu::MemoryAllocation::CUTOFF_ALLOW_NICE_TO_HAVE,
+ settings.memory_policy_.num_resources_limit);
+ settings.memory_policy_ = policy;
+#endif
+
base::TimeTicks before_create = base::TimeTicks::Now();
cc::LayerTreeHost::InitParams params;