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

Side by Side Diff: content/renderer/render_thread_impl.cc

Issue 2241083002: Revert of Always use an external begin frame source in the renderer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 unified diff | Download patch
« no previous file with comments | « content/renderer/gpu/render_widget_compositor.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 1604 matching lines...) Expand 10 before | Expand all | Expand 10 after
1615 gpu::GpuMemoryBufferManager* RenderThreadImpl::GetGpuMemoryBufferManager() { 1615 gpu::GpuMemoryBufferManager* RenderThreadImpl::GetGpuMemoryBufferManager() {
1616 return gpu_memory_buffer_manager(); 1616 return gpu_memory_buffer_manager();
1617 } 1617 }
1618 1618
1619 blink::scheduler::RendererScheduler* RenderThreadImpl::GetRendererScheduler() { 1619 blink::scheduler::RendererScheduler* RenderThreadImpl::GetRendererScheduler() {
1620 return renderer_scheduler_.get(); 1620 return renderer_scheduler_.get();
1621 } 1621 }
1622 1622
1623 std::unique_ptr<cc::BeginFrameSource> 1623 std::unique_ptr<cc::BeginFrameSource>
1624 RenderThreadImpl::CreateExternalBeginFrameSource(int routing_id) { 1624 RenderThreadImpl::CreateExternalBeginFrameSource(int routing_id) {
1625 const base::CommandLine* command_line =
1626 base::CommandLine::ForCurrentProcess();
1627
1628 if (command_line->HasSwitch(switches::kUseRemoteCompositing) ||
1629 command_line->HasSwitch(switches::kIsRunningInMash) ||
1630 command_line->HasSwitch(cc::switches::kDisableBeginFrameScheduling)) {
1631 return base::WrapUnique(new cc::DelayBasedBeginFrameSource(
1632 base::MakeUnique<cc::DelayBasedTimeSource>(
1633 compositor_task_runner_
1634 ? compositor_task_runner_.get()
1635 : main_thread_compositor_task_runner_.get())));
1636 }
1637
1638 return base::WrapUnique(new CompositorExternalBeginFrameSource( 1625 return base::WrapUnique(new CompositorExternalBeginFrameSource(
1639 compositor_message_filter_.get(), sync_message_filter(), routing_id)); 1626 compositor_message_filter_.get(), sync_message_filter(), routing_id));
1640 } 1627 }
1641 1628
1642 cc::ImageSerializationProcessor* 1629 cc::ImageSerializationProcessor*
1643 RenderThreadImpl::GetImageSerializationProcessor() { 1630 RenderThreadImpl::GetImageSerializationProcessor() {
1644 return GetContentClient()->renderer()->GetImageSerializationProcessor(); 1631 return GetContentClient()->renderer()->GetImageSerializationProcessor();
1645 } 1632 }
1646 1633
1647 cc::TaskGraphRunner* RenderThreadImpl::GetTaskGraphRunner() { 1634 cc::TaskGraphRunner* RenderThreadImpl::GetTaskGraphRunner() {
(...skipping 606 matching lines...) Expand 10 before | Expand all | Expand 10 after
2254 v8_memory_pressure_level == v8::MemoryPressureLevel::kCritical) 2241 v8_memory_pressure_level == v8::MemoryPressureLevel::kCritical)
2255 v8_memory_pressure_level = v8::MemoryPressureLevel::kModerate; 2242 v8_memory_pressure_level = v8::MemoryPressureLevel::kModerate;
2256 2243
2257 blink::mainThreadIsolate()->MemoryPressureNotification( 2244 blink::mainThreadIsolate()->MemoryPressureNotification(
2258 v8_memory_pressure_level); 2245 v8_memory_pressure_level);
2259 blink::MemoryPressureNotificationToWorkerThreadIsolates( 2246 blink::MemoryPressureNotificationToWorkerThreadIsolates(
2260 v8_memory_pressure_level); 2247 v8_memory_pressure_level);
2261 } 2248 }
2262 2249
2263 } // namespace content 2250 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/gpu/render_widget_compositor.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698