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

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

Issue 2648213002: mus: Use a barebone mus client-lib in chrome-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/render_thread_impl.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 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
99 #include <android/keycodes.h> 99 #include <android/keycodes.h>
100 #include "base/time/time.h" 100 #include "base/time/time.h"
101 #endif 101 #endif
102 102
103 #if defined(OS_POSIX) 103 #if defined(OS_POSIX)
104 #include "third_party/skia/include/core/SkMallocPixelRef.h" 104 #include "third_party/skia/include/core/SkMallocPixelRef.h"
105 #include "third_party/skia/include/core/SkPixelRef.h" 105 #include "third_party/skia/include/core/SkPixelRef.h"
106 #endif // defined(OS_POSIX) 106 #endif // defined(OS_POSIX)
107 107
108 #if defined(USE_AURA) 108 #if defined(USE_AURA)
109 #include "content/public/common/service_manager_connection.h" 109 #include "content/renderer/mus/renderer_window_tree_client.h"
110 #include "content/renderer/mus/render_widget_mus_connection.h"
111 #endif 110 #endif
112 111
113 #if defined(OS_MACOSX) 112 #if defined(OS_MACOSX)
114 #include "content/renderer/text_input_client_observer.h" 113 #include "content/renderer/text_input_client_observer.h"
115 #endif 114 #endif
116 115
117 using blink::WebCompositionUnderline; 116 using blink::WebCompositionUnderline;
118 using blink::WebCursorInfo; 117 using blink::WebCursorInfo;
119 using blink::WebDeviceEmulationParams; 118 using blink::WebDeviceEmulationParams;
120 using blink::WebDragOperation; 119 using blink::WebDragOperation;
(...skipping 257 matching lines...) Expand 10 before | Expand all | Expand 10 after
378 RenderProcess::current()->AddRefProcess(); 377 RenderProcess::current()->AddRefProcess();
379 DCHECK(RenderThread::Get()); 378 DCHECK(RenderThread::Get());
380 379
381 // In tests there may not be a RenderThreadImpl. 380 // In tests there may not be a RenderThreadImpl.
382 if (RenderThreadImpl::current()) { 381 if (RenderThreadImpl::current()) {
383 render_widget_scheduling_state_ = RenderThreadImpl::current() 382 render_widget_scheduling_state_ = RenderThreadImpl::current()
384 ->GetRendererScheduler() 383 ->GetRendererScheduler()
385 ->NewRenderWidgetSchedulingState(); 384 ->NewRenderWidgetSchedulingState();
386 render_widget_scheduling_state_->SetHidden(is_hidden_); 385 render_widget_scheduling_state_->SetHidden(is_hidden_);
387 } 386 }
387 #if defined(USE_AURA)
388 if (base::CommandLine::ForCurrentProcess()->HasSwitch(
389 switches::kUseMusInRenderer)) {
390 RendererWindowTreeClient::Create(routing_id_);
391 }
392 #endif
388 } 393 }
389 394
390 RenderWidget::~RenderWidget() { 395 RenderWidget::~RenderWidget() {
391 DCHECK(!webwidget_internal_) << "Leaking our WebWidget!"; 396 DCHECK(!webwidget_internal_) << "Leaking our WebWidget!";
392 397
393 // If we are swapped out, we have released already. 398 // If we are swapped out, we have released already.
394 if (!is_swapped_out_ && RenderProcess::current()) 399 if (!is_swapped_out_ && RenderProcess::current())
395 RenderProcess::current()->ReleaseProcess(); 400 RenderProcess::current()->ReleaseProcess();
396 } 401 }
397 402
(...skipping 1876 matching lines...) Expand 10 before | Expand all | Expand 10 after
2274 // browser side (https://crbug.com/669219). 2279 // browser side (https://crbug.com/669219).
2275 // If there is no WebFrameWidget, then there will be no 2280 // If there is no WebFrameWidget, then there will be no
2276 // InputMethodControllers for a WebLocalFrame. 2281 // InputMethodControllers for a WebLocalFrame.
2277 return nullptr; 2282 return nullptr;
2278 } 2283 }
2279 return static_cast<blink::WebFrameWidget*>(GetWebWidget()) 2284 return static_cast<blink::WebFrameWidget*>(GetWebWidget())
2280 ->getActiveWebInputMethodController(); 2285 ->getActiveWebInputMethodController();
2281 } 2286 }
2282 2287
2283 } // namespace content 2288 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/render_thread_impl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698