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 1297 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1308 return; | 1308 return; |
1309 GetRenderWidget()->UpdateSelectionBounds(); | 1309 GetRenderWidget()->UpdateSelectionBounds(); |
1310 } | 1310 } |
1311 | 1311 |
1312 void RenderFrameImpl::PepperCancelComposition( | 1312 void RenderFrameImpl::PepperCancelComposition( |
1313 PepperPluginInstanceImpl* instance) { | 1313 PepperPluginInstanceImpl* instance) { |
1314 if (instance != focused_pepper_plugin_) | 1314 if (instance != focused_pepper_plugin_) |
1315 return; | 1315 return; |
1316 Send(new InputHostMsg_ImeCancelComposition(render_view_->GetRoutingID())); | 1316 Send(new InputHostMsg_ImeCancelComposition(render_view_->GetRoutingID())); |
1317 #if defined(OS_MACOSX) || defined(USE_AURA) | 1317 #if defined(OS_MACOSX) || defined(USE_AURA) |
1318 GetRenderWidget()->UpdateCompositionInfo(true); | 1318 GetRenderWidget()->UpdateCompositionInfo( |
| 1319 false /* not an immediate request */); |
1319 #endif | 1320 #endif |
1320 } | 1321 } |
1321 | 1322 |
1322 void RenderFrameImpl::PepperSelectionChanged( | 1323 void RenderFrameImpl::PepperSelectionChanged( |
1323 PepperPluginInstanceImpl* instance) { | 1324 PepperPluginInstanceImpl* instance) { |
1324 if (instance != focused_pepper_plugin_) | 1325 if (instance != focused_pepper_plugin_) |
1325 return; | 1326 return; |
1326 SyncSelectionIfRequired(); | 1327 SyncSelectionIfRequired(); |
1327 } | 1328 } |
1328 | 1329 |
(...skipping 5011 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
6340 // event target. Potentially a Pepper plugin will receive the event. | 6341 // event target. Potentially a Pepper plugin will receive the event. |
6341 // In order to tell whether a plugin gets the last mouse event and which it | 6342 // In order to tell whether a plugin gets the last mouse event and which it |
6342 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets | 6343 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets |
6343 // the event, it will notify us via DidReceiveMouseEvent() and set itself as | 6344 // the event, it will notify us via DidReceiveMouseEvent() and set itself as |
6344 // |pepper_last_mouse_event_target_|. | 6345 // |pepper_last_mouse_event_target_|. |
6345 pepper_last_mouse_event_target_ = nullptr; | 6346 pepper_last_mouse_event_target_ = nullptr; |
6346 #endif | 6347 #endif |
6347 } | 6348 } |
6348 | 6349 |
6349 } // namespace content | 6350 } // namespace content |
OLD | NEW |