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

Side by Side Diff: content/browser/renderer_host/render_widget_host_view_aura.cc

Issue 2896753002: DO NOT SUBMIT: Debug logging for crbug.com/714771
Patch Set: . Created 3 years, 7 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 | « no previous file | content/browser/renderer_host/render_widget_host_view_mac.mm » ('j') | 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/browser/renderer_host/render_widget_host_view_aura.h" 5 #include "content/browser/renderer_host/render_widget_host_view_aura.h"
6 6
7 #include <set> 7 #include <set>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/auto_reset.h" 10 #include "base/auto_reset.h"
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
118 118
119 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) 119 #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
120 #include "ui/base/ime/linux/text_edit_command_auralinux.h" 120 #include "ui/base/ime/linux/text_edit_command_auralinux.h"
121 #include "ui/base/ime/linux/text_edit_key_bindings_delegate_auralinux.h" 121 #include "ui/base/ime/linux/text_edit_key_bindings_delegate_auralinux.h"
122 #endif 122 #endif
123 123
124 #if defined(OS_CHROMEOS) 124 #if defined(OS_CHROMEOS)
125 #include "ui/wm/core/ime_util_chromeos.h" 125 #include "ui/wm/core/ime_util_chromeos.h"
126 #endif 126 #endif
127 127
128 #include "content/public/browser/web_contents.h"
129
128 using gfx::RectToSkIRect; 130 using gfx::RectToSkIRect;
129 using gfx::SkIRectToRect; 131 using gfx::SkIRectToRect;
130 132
131 using blink::WebInputEvent; 133 using blink::WebInputEvent;
132 using blink::WebGestureEvent; 134 using blink::WebGestureEvent;
133 using blink::WebTouchEvent; 135 using blink::WebTouchEvent;
134 136
135 namespace content { 137 namespace content {
136 138
137 namespace { 139 namespace {
(...skipping 2176 matching lines...) Expand 10 before | Expand all | Expand 10 after
2314 GetInputMethod()->OnTextInputTypeChanged(this); 2316 GetInputMethod()->OnTextInputTypeChanged(this);
2315 2317
2316 const TextInputState* state = text_input_manager_->GetTextInputState(); 2318 const TextInputState* state = text_input_manager_->GetTextInputState();
2317 if (state && state->show_ime_if_needed && 2319 if (state && state->show_ime_if_needed &&
2318 GetInputMethod()->GetTextInputClient() == this) { 2320 GetInputMethod()->GetTextInputClient() == this) {
2319 GetInputMethod()->ShowImeIfNeeded(); 2321 GetInputMethod()->ShowImeIfNeeded();
2320 } 2322 }
2321 2323
2322 if (auto* render_widget_host = 2324 if (auto* render_widget_host =
2323 RenderWidgetHostImpl::From(updated_view->GetRenderWidgetHost())) { 2325 RenderWidgetHostImpl::From(updated_view->GetRenderWidgetHost())) {
2326 LOG(ERROR) << "OnUpdateTextInputStateCalled(): RequestCompositionUpdates("
2327 << (state && (state->type != ui::TEXT_INPUT_TYPE_NONE))
2328 << ", \""
2329 << WebContents::FromRenderViewHost(RenderViewHost::From(render_wi dget_host))->GetLastCommittedURL().spec()
2330 << "\")";
2331
2324 // Monitor the composition information if there is a focused editable node. 2332 // Monitor the composition information if there is a focused editable node.
2325 render_widget_host->RequestCompositionUpdates( 2333 render_widget_host->RequestCompositionUpdates(
2326 false /* immediate_request */, 2334 false /* immediate_request */,
2327 state && 2335 state &&
2328 (state->type != ui::TEXT_INPUT_TYPE_NONE) /* monitor_updates */); 2336 (state->type != ui::TEXT_INPUT_TYPE_NONE) /* monitor_updates */);
2329 } 2337 }
2330 } 2338 }
2331 2339
2332 void RenderWidgetHostViewAura::OnImeCancelComposition( 2340 void RenderWidgetHostViewAura::OnImeCancelComposition(
2333 TextInputManager* text_input_manager, 2341 TextInputManager* text_input_manager,
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
2387 } 2395 }
2388 2396
2389 void RenderWidgetHostViewAura::UpdateNeedsBeginFramesInternal() { 2397 void RenderWidgetHostViewAura::UpdateNeedsBeginFramesInternal() {
2390 if (!delegated_frame_host_) 2398 if (!delegated_frame_host_)
2391 return; 2399 return;
2392 delegated_frame_host_->SetNeedsBeginFrames(needs_begin_frames_ || 2400 delegated_frame_host_->SetNeedsBeginFrames(needs_begin_frames_ ||
2393 needs_flush_input_); 2401 needs_flush_input_);
2394 } 2402 }
2395 2403
2396 } // namespace content 2404 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | content/browser/renderer_host/render_widget_host_view_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698