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 1291 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1302 return; | 1302 return; |
1303 GetRenderWidget()->UpdateSelectionBounds(); | 1303 GetRenderWidget()->UpdateSelectionBounds(); |
1304 } | 1304 } |
1305 | 1305 |
1306 void RenderFrameImpl::PepperCancelComposition( | 1306 void RenderFrameImpl::PepperCancelComposition( |
1307 PepperPluginInstanceImpl* instance) { | 1307 PepperPluginInstanceImpl* instance) { |
1308 if (instance != focused_pepper_plugin_) | 1308 if (instance != focused_pepper_plugin_) |
1309 return; | 1309 return; |
1310 Send(new InputHostMsg_ImeCancelComposition(render_view_->GetRoutingID())); | 1310 Send(new InputHostMsg_ImeCancelComposition(render_view_->GetRoutingID())); |
1311 #if defined(OS_MACOSX) || defined(USE_AURA) | 1311 #if defined(OS_MACOSX) || defined(USE_AURA) |
1312 GetRenderWidget()->UpdateCompositionInfo(true); | 1312 GetRenderWidget()->UpdateCompositionInfo( |
| 1313 false /* not an immediate request */); |
1313 #endif | 1314 #endif |
1314 } | 1315 } |
1315 | 1316 |
1316 void RenderFrameImpl::PepperSelectionChanged( | 1317 void RenderFrameImpl::PepperSelectionChanged( |
1317 PepperPluginInstanceImpl* instance) { | 1318 PepperPluginInstanceImpl* instance) { |
1318 if (instance != focused_pepper_plugin_) | 1319 if (instance != focused_pepper_plugin_) |
1319 return; | 1320 return; |
1320 SyncSelectionIfRequired(); | 1321 SyncSelectionIfRequired(); |
1321 } | 1322 } |
1322 | 1323 |
(...skipping 5031 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
6354 // event target. Potentially a Pepper plugin will receive the event. | 6355 // event target. Potentially a Pepper plugin will receive the event. |
6355 // In order to tell whether a plugin gets the last mouse event and which it | 6356 // In order to tell whether a plugin gets the last mouse event and which it |
6356 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets | 6357 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets |
6357 // the event, it will notify us via DidReceiveMouseEvent() and set itself as | 6358 // the event, it will notify us via DidReceiveMouseEvent() and set itself as |
6358 // |pepper_last_mouse_event_target_|. | 6359 // |pepper_last_mouse_event_target_|. |
6359 pepper_last_mouse_event_target_ = nullptr; | 6360 pepper_last_mouse_event_target_ = nullptr; |
6360 #endif | 6361 #endif |
6361 } | 6362 } |
6362 | 6363 |
6363 } // namespace content | 6364 } // namespace content |
OLD | NEW |