| 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_widget.h" | 5 #include "content/renderer/render_widget.h" |
| 6 | 6 |
| 7 #include <memory> | 7 #include <memory> |
| 8 #include <utility> | 8 #include <utility> |
| 9 | 9 |
| 10 #include "base/auto_reset.h" | 10 #include "base/auto_reset.h" |
| (...skipping 371 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 382 DCHECK(RenderThread::Get()); | 382 DCHECK(RenderThread::Get()); |
| 383 | 383 |
| 384 // In tests there may not be a RenderThreadImpl. | 384 // In tests there may not be a RenderThreadImpl. |
| 385 if (RenderThreadImpl::current()) { | 385 if (RenderThreadImpl::current()) { |
| 386 render_widget_scheduling_state_ = RenderThreadImpl::current() | 386 render_widget_scheduling_state_ = RenderThreadImpl::current() |
| 387 ->GetRendererScheduler() | 387 ->GetRendererScheduler() |
| 388 ->NewRenderWidgetSchedulingState(); | 388 ->NewRenderWidgetSchedulingState(); |
| 389 render_widget_scheduling_state_->SetHidden(is_hidden_); | 389 render_widget_scheduling_state_->SetHidden(is_hidden_); |
| 390 } | 390 } |
| 391 #if defined(USE_AURA) | 391 #if defined(USE_AURA) |
| 392 if (base::CommandLine::ForCurrentProcess()->HasSwitch( | 392 if (!base::CommandLine::ForCurrentProcess()->HasSwitch( |
| 393 switches::kUseMusInRenderer)) { | 393 switches::kNoUseMusInRenderer)) { |
| 394 RendererWindowTreeClient::Create(routing_id_); | 394 RendererWindowTreeClient::Create(routing_id_); |
| 395 } | 395 } |
| 396 #endif | 396 #endif |
| 397 } | 397 } |
| 398 | 398 |
| 399 RenderWidget::~RenderWidget() { | 399 RenderWidget::~RenderWidget() { |
| 400 DCHECK(!webwidget_internal_) << "Leaking our WebWidget!"; | 400 DCHECK(!webwidget_internal_) << "Leaking our WebWidget!"; |
| 401 | 401 |
| 402 // If we are swapped out, we have released already. | 402 // If we are swapped out, we have released already. |
| 403 if (!is_swapped_out_ && RenderProcess::current()) | 403 if (!is_swapped_out_ && RenderProcess::current()) |
| (...skipping 1877 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2281 // browser side (https://crbug.com/669219). | 2281 // browser side (https://crbug.com/669219). |
| 2282 // If there is no WebFrameWidget, then there will be no | 2282 // If there is no WebFrameWidget, then there will be no |
| 2283 // InputMethodControllers for a WebLocalFrame. | 2283 // InputMethodControllers for a WebLocalFrame. |
| 2284 return nullptr; | 2284 return nullptr; |
| 2285 } | 2285 } |
| 2286 return static_cast<blink::WebFrameWidget*>(GetWebWidget()) | 2286 return static_cast<blink::WebFrameWidget*>(GetWebWidget()) |
| 2287 ->getActiveWebInputMethodController(); | 2287 ->getActiveWebInputMethodController(); |
| 2288 } | 2288 } |
| 2289 | 2289 |
| 2290 } // namespace content | 2290 } // namespace content |
| OLD | NEW |