Index: cc/trees/layer_tree_host_impl.cc |
diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc |
index ab75b9c0c1139833228d89ec68da995fc9ab0077..807ec03f9c978686b2d9ce983587ceef36e4ced4 100644 |
--- a/cc/trees/layer_tree_host_impl.cc |
+++ b/cc/trees/layer_tree_host_impl.cc |
@@ -129,16 +129,6 @@ void DidVisibilityChange(LayerTreeHostImpl* id, bool visible) { |
TRACE_EVENT_ASYNC_END0("cc", "LayerTreeHostImpl::SetVisible", id); |
} |
-size_t GetDefaultMemoryAllocationLimit() { |
- // TODO(ccameron): (http://crbug.com/137094) This 64MB default is a straggler |
- // from the old texture manager and is just to give us a default memory |
- // allocation before we get a callback from the GPU memory manager. We |
- // should probaby either: |
- // - wait for the callback before rendering anything instead |
- // - push this into the GPU memory manager somehow. |
- return 64 * 1024 * 1024; |
-} |
- |
} // namespace |
LayerTreeHostImpl::FrameData::FrameData() |
@@ -187,10 +177,7 @@ LayerTreeHostImpl::LayerTreeHostImpl( |
tile_priorities_dirty_(false), |
settings_(settings), |
visible_(true), |
- cached_managed_memory_policy_( |
- GetDefaultMemoryAllocationLimit(), |
- gpu::MemoryAllocation::CUTOFF_ALLOW_EVERYTHING, |
- ManagedMemoryPolicy::kDefaultNumResourcesLimit), |
+ cached_managed_memory_policy_(settings.memory_policy_), |
is_synchronous_single_threaded_(!proxy->HasImplThread() && |
!settings.single_thread_proxy_scheduler), |
// Must be initialized after is_synchronous_single_threaded_ and proxy_. |