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

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: Addressing lfg@'s comments. 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') | content/renderer/render_widget.h » ('J')
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 6254 matching lines...) Expand 10 before | Expand all | Expand 10 after
6265 } 6265 }
6266 } 6266 }
6267 6267
6268 void RenderFrameImpl::PepperFocusChanged(PepperPluginInstanceImpl* instance, 6268 void RenderFrameImpl::PepperFocusChanged(PepperPluginInstanceImpl* instance,
6269 bool focused) { 6269 bool focused) {
6270 if (focused) 6270 if (focused)
6271 focused_pepper_plugin_ = instance; 6271 focused_pepper_plugin_ = instance;
6272 else if (focused_pepper_plugin_ == instance) 6272 else if (focused_pepper_plugin_ == instance)
6273 focused_pepper_plugin_ = nullptr; 6273 focused_pepper_plugin_ = nullptr;
6274 6274
6275 GetRenderWidget()->set_focused_pepper_plugin(focused_pepper_plugin_);
6276
6275 GetRenderWidget()->UpdateTextInputState(ShowIme::HIDE_IME, 6277 GetRenderWidget()->UpdateTextInputState(ShowIme::HIDE_IME,
6276 ChangeSource::FROM_NON_IME); 6278 ChangeSource::FROM_NON_IME);
6277 GetRenderWidget()->UpdateSelectionBounds(); 6279 GetRenderWidget()->UpdateSelectionBounds();
6278 } 6280 }
6279 6281
6280 void RenderFrameImpl::PepperStartsPlayback(PepperPluginInstanceImpl* instance) { 6282 void RenderFrameImpl::PepperStartsPlayback(PepperPluginInstanceImpl* instance) {
6281 RenderFrameImpl* const render_frame = instance->render_frame(); 6283 RenderFrameImpl* const render_frame = instance->render_frame();
6282 if (render_frame) { 6284 if (render_frame) {
6283 render_frame->Send( 6285 render_frame->Send(
6284 new FrameHostMsg_PepperStartsPlayback( 6286 new FrameHostMsg_PepperStartsPlayback(
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
6320 // event target. Potentially a Pepper plugin will receive the event. 6322 // event target. Potentially a Pepper plugin will receive the event.
6321 // In order to tell whether a plugin gets the last mouse event and which it 6323 // In order to tell whether a plugin gets the last mouse event and which it
6322 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets 6324 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets
6323 // the event, it will notify us via DidReceiveMouseEvent() and set itself as 6325 // the event, it will notify us via DidReceiveMouseEvent() and set itself as
6324 // |pepper_last_mouse_event_target_|. 6326 // |pepper_last_mouse_event_target_|.
6325 pepper_last_mouse_event_target_ = nullptr; 6327 pepper_last_mouse_event_target_ = nullptr;
6326 #endif 6328 #endif
6327 } 6329 }
6328 6330
6329 } // namespace content 6331 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | content/renderer/render_view_impl.h » ('j') | content/renderer/render_widget.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698