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

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

Issue 2029423003: OOPIF IME: Renderer Side Changes (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Using focusedCoreFrame() instead of focusController().focusedFrame() in WebViewImpl Created 4 years, 5 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/renderer/render_view_impl.h » ('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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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_frame_impl.h" 5 #include "content/renderer/render_frame_impl.h"
6 6
7 #include <map> 7 #include <map>
8 #include <string> 8 #include <string>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 6270 matching lines...) Expand 10 before | Expand all | Expand 10 after
6281 } 6281 }
6282 } 6282 }
6283 6283
6284 void RenderFrameImpl::PepperFocusChanged(PepperPluginInstanceImpl* instance, 6284 void RenderFrameImpl::PepperFocusChanged(PepperPluginInstanceImpl* instance,
6285 bool focused) { 6285 bool focused) {
6286 if (focused) 6286 if (focused)
6287 focused_pepper_plugin_ = instance; 6287 focused_pepper_plugin_ = instance;
6288 else if (focused_pepper_plugin_ == instance) 6288 else if (focused_pepper_plugin_ == instance)
6289 focused_pepper_plugin_ = nullptr; 6289 focused_pepper_plugin_ = nullptr;
6290 6290
6291 GetRenderWidget()->set_focused_pepper_plugin(focused_pepper_plugin_);
6292
6291 GetRenderWidget()->UpdateTextInputState(ShowIme::HIDE_IME, 6293 GetRenderWidget()->UpdateTextInputState(ShowIme::HIDE_IME,
6292 ChangeSource::FROM_NON_IME); 6294 ChangeSource::FROM_NON_IME);
6293 GetRenderWidget()->UpdateSelectionBounds(); 6295 GetRenderWidget()->UpdateSelectionBounds();
6294 } 6296 }
6295 6297
6296 void RenderFrameImpl::PepperStartsPlayback(PepperPluginInstanceImpl* instance) { 6298 void RenderFrameImpl::PepperStartsPlayback(PepperPluginInstanceImpl* instance) {
6297 RenderFrameImpl* const render_frame = instance->render_frame(); 6299 RenderFrameImpl* const render_frame = instance->render_frame();
6298 if (render_frame) { 6300 if (render_frame) {
6299 render_frame->Send( 6301 render_frame->Send(
6300 new FrameHostMsg_PepperStartsPlayback( 6302 new FrameHostMsg_PepperStartsPlayback(
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
6336 // event target. Potentially a Pepper plugin will receive the event. 6338 // event target. Potentially a Pepper plugin will receive the event.
6337 // In order to tell whether a plugin gets the last mouse event and which it 6339 // In order to tell whether a plugin gets the last mouse event and which it
6338 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets 6340 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets
6339 // the event, it will notify us via DidReceiveMouseEvent() and set itself as 6341 // the event, it will notify us via DidReceiveMouseEvent() and set itself as
6340 // |pepper_last_mouse_event_target_|. 6342 // |pepper_last_mouse_event_target_|.
6341 pepper_last_mouse_event_target_ = nullptr; 6343 pepper_last_mouse_event_target_ = nullptr;
6342 #endif 6344 #endif
6343 } 6345 }
6344 6346
6345 } // namespace content 6347 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | content/renderer/render_view_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698