OLD | NEW |
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 1263 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1274 return; | 1274 return; |
1275 GetRenderWidget()->UpdateSelectionBounds(); | 1275 GetRenderWidget()->UpdateSelectionBounds(); |
1276 } | 1276 } |
1277 | 1277 |
1278 void RenderFrameImpl::PepperCancelComposition( | 1278 void RenderFrameImpl::PepperCancelComposition( |
1279 PepperPluginInstanceImpl* instance) { | 1279 PepperPluginInstanceImpl* instance) { |
1280 if (instance != focused_pepper_plugin_) | 1280 if (instance != focused_pepper_plugin_) |
1281 return; | 1281 return; |
1282 Send(new InputHostMsg_ImeCancelComposition(render_view_->GetRoutingID())); | 1282 Send(new InputHostMsg_ImeCancelComposition(render_view_->GetRoutingID())); |
1283 #if defined(OS_MACOSX) || defined(USE_AURA) | 1283 #if defined(OS_MACOSX) || defined(USE_AURA) |
1284 GetRenderWidget()->UpdateCompositionInfo(true); | 1284 GetRenderWidget()->UpdateCompositionInfo( |
| 1285 false /* not an immediate request */); |
1285 #endif | 1286 #endif |
1286 } | 1287 } |
1287 | 1288 |
1288 void RenderFrameImpl::PepperSelectionChanged( | 1289 void RenderFrameImpl::PepperSelectionChanged( |
1289 PepperPluginInstanceImpl* instance) { | 1290 PepperPluginInstanceImpl* instance) { |
1290 if (instance != focused_pepper_plugin_) | 1291 if (instance != focused_pepper_plugin_) |
1291 return; | 1292 return; |
1292 SyncSelectionIfRequired(); | 1293 SyncSelectionIfRequired(); |
1293 } | 1294 } |
1294 | 1295 |
(...skipping 5004 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
6299 // event target. Potentially a Pepper plugin will receive the event. | 6300 // event target. Potentially a Pepper plugin will receive the event. |
6300 // In order to tell whether a plugin gets the last mouse event and which it | 6301 // In order to tell whether a plugin gets the last mouse event and which it |
6301 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets | 6302 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets |
6302 // the event, it will notify us via DidReceiveMouseEvent() and set itself as | 6303 // the event, it will notify us via DidReceiveMouseEvent() and set itself as |
6303 // |pepper_last_mouse_event_target_|. | 6304 // |pepper_last_mouse_event_target_|. |
6304 pepper_last_mouse_event_target_ = nullptr; | 6305 pepper_last_mouse_event_target_ = nullptr; |
6305 #endif | 6306 #endif |
6306 } | 6307 } |
6307 | 6308 |
6308 } // namespace content | 6309 } // namespace content |
OLD | NEW |