| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "content/renderer/render_thread_impl.h" | 5 #include "content/renderer/render_thread_impl.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <limits> | 8 #include <limits> |
| 9 #include <map> | 9 #include <map> |
| 10 #include <utility> | 10 #include <utility> |
| (...skipping 1897 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1908 if (layout_test_deps_) { | 1908 if (layout_test_deps_) { |
| 1909 return layout_test_deps_->CreateOutputSurface( | 1909 return layout_test_deps_->CreateOutputSurface( |
| 1910 std::move(gpu_channel_host), std::move(context_provider), | 1910 std::move(gpu_channel_host), std::move(context_provider), |
| 1911 std::move(worker_context_provider), this); | 1911 std::move(worker_context_provider), this); |
| 1912 } | 1912 } |
| 1913 | 1913 |
| 1914 #if defined(OS_ANDROID) | 1914 #if defined(OS_ANDROID) |
| 1915 if (sync_compositor_message_filter_) { | 1915 if (sync_compositor_message_filter_) { |
| 1916 return base::WrapUnique(new SynchronousCompositorOutputSurface( | 1916 return base::WrapUnique(new SynchronousCompositorOutputSurface( |
| 1917 std::move(context_provider), std::move(worker_context_provider), | 1917 std::move(context_provider), std::move(worker_context_provider), |
| 1918 routing_id, output_surface_id, sync_compositor_message_filter_.get(), | 1918 shared_bitmap_manager(), routing_id, output_surface_id, |
| 1919 sync_compositor_message_filter_.get(), |
| 1919 std::move(frame_swap_message_queue))); | 1920 std::move(frame_swap_message_queue))); |
| 1920 } | 1921 } |
| 1921 #endif | 1922 #endif |
| 1922 | 1923 |
| 1923 return base::WrapUnique(new CompositorOutputSurface( | 1924 return base::WrapUnique(new CompositorOutputSurface( |
| 1924 routing_id, output_surface_id, std::move(context_provider), | 1925 routing_id, output_surface_id, std::move(context_provider), |
| 1925 std::move(worker_context_provider), std::move(frame_swap_message_queue))); | 1926 std::move(worker_context_provider), std::move(frame_swap_message_queue))); |
| 1926 } | 1927 } |
| 1927 | 1928 |
| 1928 blink::WebMediaStreamCenter* RenderThreadImpl::CreateMediaStreamCenter( | 1929 blink::WebMediaStreamCenter* RenderThreadImpl::CreateMediaStreamCenter( |
| (...skipping 294 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2223 v8_memory_pressure_level == v8::MemoryPressureLevel::kCritical) | 2224 v8_memory_pressure_level == v8::MemoryPressureLevel::kCritical) |
| 2224 v8_memory_pressure_level = v8::MemoryPressureLevel::kModerate; | 2225 v8_memory_pressure_level = v8::MemoryPressureLevel::kModerate; |
| 2225 | 2226 |
| 2226 blink::mainThreadIsolate()->MemoryPressureNotification( | 2227 blink::mainThreadIsolate()->MemoryPressureNotification( |
| 2227 v8_memory_pressure_level); | 2228 v8_memory_pressure_level); |
| 2228 blink::MemoryPressureNotificationToWorkerThreadIsolates( | 2229 blink::MemoryPressureNotificationToWorkerThreadIsolates( |
| 2229 v8_memory_pressure_level); | 2230 v8_memory_pressure_level); |
| 2230 } | 2231 } |
| 2231 | 2232 |
| 2232 } // namespace content | 2233 } // namespace content |
| OLD | NEW |