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

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

Issue 2676553003: mus: Fix creating the factory for window-tree-client in renderer. (Closed)
Patch Set: . Created 3 years, 10 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/mus/renderer_window_tree_client.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_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 373 matching lines...) Expand 10 before | Expand all | Expand 10 after
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::kNoUseMusInRenderer)) { 393 switches::kNoUseMusInRenderer)) {
394 RendererWindowTreeClient::Create(routing_id_); 394 RendererWindowTreeClient::CreateIfNecessary(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())
404 RenderProcess::current()->ReleaseProcess(); 404 RenderProcess::current()->ReleaseProcess();
(...skipping 1885 matching lines...) Expand 10 before | Expand all | Expand 10 after
2290 // browser side (https://crbug.com/669219). 2290 // browser side (https://crbug.com/669219).
2291 // If there is no WebFrameWidget, then there will be no 2291 // If there is no WebFrameWidget, then there will be no
2292 // InputMethodControllers for a WebLocalFrame. 2292 // InputMethodControllers for a WebLocalFrame.
2293 return nullptr; 2293 return nullptr;
2294 } 2294 }
2295 return static_cast<blink::WebFrameWidget*>(GetWebWidget()) 2295 return static_cast<blink::WebFrameWidget*>(GetWebWidget())
2296 ->getActiveWebInputMethodController(); 2296 ->getActiveWebInputMethodController();
2297 } 2297 }
2298 2298
2299 } // namespace content 2299 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/mus/renderer_window_tree_client.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698