Commit 0da5e028 authored by kouhei's avatar kouhei Committed by Commit Bot

Remove unused BlinkPlatformImpl::main_thread_task_runner_

Bug: None
Change-Id: Icc2e54d85b33c0ddd5110fd5e3921503c2655a5d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2291305
Commit-Queue: Kouhei Ueno <kouhei@chromium.org>
Commit-Queue: Kentaro Hara <haraken@chromium.org>
Auto-Submit: Kouhei Ueno <kouhei@chromium.org>
Reviewed-by: default avatarKentaro Hara <haraken@chromium.org>
Cr-Commit-Position: refs/heads/master@{#787623}
parent b39fabb9
...@@ -155,17 +155,11 @@ class ThreadSafeBrowserInterfaceBrokerProxyImpl ...@@ -155,17 +155,11 @@ class ThreadSafeBrowserInterfaceBrokerProxyImpl
// TODO(skyostil): Ensure that we always have an active task runner when // TODO(skyostil): Ensure that we always have an active task runner when
// constructing the platform. // constructing the platform.
BlinkPlatformImpl::BlinkPlatformImpl() BlinkPlatformImpl::BlinkPlatformImpl() : BlinkPlatformImpl(nullptr) {}
: BlinkPlatformImpl(base::ThreadTaskRunnerHandle::IsSet()
? base::ThreadTaskRunnerHandle::Get()
: nullptr,
nullptr) {}
BlinkPlatformImpl::BlinkPlatformImpl( BlinkPlatformImpl::BlinkPlatformImpl(
scoped_refptr<base::SingleThreadTaskRunner> main_thread_task_runner,
scoped_refptr<base::SingleThreadTaskRunner> io_thread_task_runner) scoped_refptr<base::SingleThreadTaskRunner> io_thread_task_runner)
: main_thread_task_runner_(std::move(main_thread_task_runner)), : io_thread_task_runner_(std::move(io_thread_task_runner)),
io_thread_task_runner_(std::move(io_thread_task_runner)),
browser_interface_broker_proxy_( browser_interface_broker_proxy_(
base::MakeRefCounted<ThreadSafeBrowserInterfaceBrokerProxyImpl>()), base::MakeRefCounted<ThreadSafeBrowserInterfaceBrokerProxyImpl>()),
native_theme_engine_(GetWebThemeEngine()) {} native_theme_engine_(GetWebThemeEngine()) {}
......
...@@ -29,7 +29,6 @@ class CONTENT_EXPORT BlinkPlatformImpl : public blink::Platform { ...@@ -29,7 +29,6 @@ class CONTENT_EXPORT BlinkPlatformImpl : public blink::Platform {
public: public:
BlinkPlatformImpl(); BlinkPlatformImpl();
explicit BlinkPlatformImpl( explicit BlinkPlatformImpl(
scoped_refptr<base::SingleThreadTaskRunner> main_thread_task_runner,
scoped_refptr<base::SingleThreadTaskRunner> io_thread_task_runner); scoped_refptr<base::SingleThreadTaskRunner> io_thread_task_runner);
~BlinkPlatformImpl() override; ~BlinkPlatformImpl() override;
...@@ -63,7 +62,6 @@ class CONTENT_EXPORT BlinkPlatformImpl : public blink::Platform { ...@@ -63,7 +62,6 @@ class CONTENT_EXPORT BlinkPlatformImpl : public blink::Platform {
const override; const override;
private: private:
scoped_refptr<base::SingleThreadTaskRunner> main_thread_task_runner_;
scoped_refptr<base::SingleThreadTaskRunner> io_thread_task_runner_; scoped_refptr<base::SingleThreadTaskRunner> io_thread_task_runner_;
const scoped_refptr<blink::ThreadSafeBrowserInterfaceBrokerProxy> const scoped_refptr<blink::ThreadSafeBrowserInterfaceBrokerProxy>
browser_interface_broker_proxy_; browser_interface_broker_proxy_;
......
...@@ -159,14 +159,12 @@ gpu::ContextType ToGpuContextType(blink::Platform::ContextType type) { ...@@ -159,14 +159,12 @@ gpu::ContextType ToGpuContextType(blink::Platform::ContextType type) {
RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( RendererBlinkPlatformImpl::RendererBlinkPlatformImpl(
blink::scheduler::WebThreadScheduler* main_thread_scheduler) blink::scheduler::WebThreadScheduler* main_thread_scheduler)
: BlinkPlatformImpl(main_thread_scheduler->DefaultTaskRunner(), : BlinkPlatformImpl(RenderThreadImpl::current()
RenderThreadImpl::current()
? RenderThreadImpl::current()->GetIOTaskRunner() ? RenderThreadImpl::current()->GetIOTaskRunner()
: nullptr), : nullptr),
sudden_termination_disables_(0), sudden_termination_disables_(0),
is_locked_to_site_(false), is_locked_to_site_(false),
main_thread_scheduler_(main_thread_scheduler) { main_thread_scheduler_(main_thread_scheduler) {
// RenderThread may not exist in some tests. // RenderThread may not exist in some tests.
if (RenderThreadImpl::current()) { if (RenderThreadImpl::current()) {
#if defined(OS_LINUX) #if defined(OS_LINUX)
...@@ -366,8 +364,8 @@ void RendererBlinkPlatformImpl::SuddenTerminationChanged(bool enabled) { ...@@ -366,8 +364,8 @@ void RendererBlinkPlatformImpl::SuddenTerminationChanged(bool enabled) {
// We should not get more enables than disables, but we want it to be a // We should not get more enables than disables, but we want it to be a
// non-fatal error if it does happen. // non-fatal error if it does happen.
DCHECK_GT(sudden_termination_disables_, 0); DCHECK_GT(sudden_termination_disables_, 0);
sudden_termination_disables_ = std::max(sudden_termination_disables_ - 1, sudden_termination_disables_ =
0); std::max(sudden_termination_disables_ - 1, 0);
if (sudden_termination_disables_ != 0) if (sudden_termination_disables_ != 0)
return; return;
} else { } else {
...@@ -689,9 +687,8 @@ RendererBlinkPlatformImpl::GetVideoCaptureImplManager() { ...@@ -689,9 +687,8 @@ RendererBlinkPlatformImpl::GetVideoCaptureImplManager() {
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
static void Collect3DContextInformation( static void Collect3DContextInformation(blink::Platform::GraphicsInfo* gl_info,
blink::Platform::GraphicsInfo* gl_info, const gpu::GPUInfo& gpu_info) {
const gpu::GPUInfo& gpu_info) {
DCHECK(gl_info); DCHECK(gl_info);
const gpu::GPUInfo::GPUDevice& active_gpu = gpu_info.active_gpu(); const gpu::GPUInfo::GPUDevice& active_gpu = gpu_info.active_gpu();
gl_info->vendor_id = active_gpu.vendor_id; gl_info->vendor_id = active_gpu.vendor_id;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment