| 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 | 9 |
| 10 #include "base/auto_reset.h" | 10 #include "base/auto_reset.h" |
| (...skipping 963 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 974 OnExtendSelectionAndDelete) | 974 OnExtendSelectionAndDelete) |
| 975 IPC_MESSAGE_HANDLER(InputMsg_SetCompositionFromExistingText, | 975 IPC_MESSAGE_HANDLER(InputMsg_SetCompositionFromExistingText, |
| 976 OnSetCompositionFromExistingText) | 976 OnSetCompositionFromExistingText) |
| 977 IPC_MESSAGE_HANDLER(InputMsg_ExecuteNoValueEditCommand, | 977 IPC_MESSAGE_HANDLER(InputMsg_ExecuteNoValueEditCommand, |
| 978 OnExecuteNoValueEditCommand) | 978 OnExecuteNoValueEditCommand) |
| 979 IPC_MESSAGE_HANDLER(FrameMsg_CSSInsertRequest, OnCSSInsertRequest) | 979 IPC_MESSAGE_HANDLER(FrameMsg_CSSInsertRequest, OnCSSInsertRequest) |
| 980 IPC_MESSAGE_HANDLER(FrameMsg_JavaScriptExecuteRequest, | 980 IPC_MESSAGE_HANDLER(FrameMsg_JavaScriptExecuteRequest, |
| 981 OnJavaScriptExecuteRequest) | 981 OnJavaScriptExecuteRequest) |
| 982 IPC_MESSAGE_HANDLER(FrameMsg_JavaScriptExecuteRequestForTests, | 982 IPC_MESSAGE_HANDLER(FrameMsg_JavaScriptExecuteRequestForTests, |
| 983 OnJavaScriptExecuteRequestForTests) | 983 OnJavaScriptExecuteRequestForTests) |
| 984 IPC_MESSAGE_HANDLER(FrameMsg_FlushVisualStateRequest, |
| 985 OnFlushVisualStateRequest) |
| 984 IPC_MESSAGE_HANDLER(FrameMsg_SetEditableSelectionOffsets, | 986 IPC_MESSAGE_HANDLER(FrameMsg_SetEditableSelectionOffsets, |
| 985 OnSetEditableSelectionOffsets) | 987 OnSetEditableSelectionOffsets) |
| 986 IPC_MESSAGE_HANDLER(FrameMsg_SetupTransitionView, OnSetupTransitionView) | 988 IPC_MESSAGE_HANDLER(FrameMsg_SetupTransitionView, OnSetupTransitionView) |
| 987 IPC_MESSAGE_HANDLER(FrameMsg_BeginExitTransition, OnBeginExitTransition) | 989 IPC_MESSAGE_HANDLER(FrameMsg_BeginExitTransition, OnBeginExitTransition) |
| 988 IPC_MESSAGE_HANDLER(FrameMsg_RevertExitTransition, OnRevertExitTransition) | 990 IPC_MESSAGE_HANDLER(FrameMsg_RevertExitTransition, OnRevertExitTransition) |
| 989 IPC_MESSAGE_HANDLER(FrameMsg_HideTransitionElements, | 991 IPC_MESSAGE_HANDLER(FrameMsg_HideTransitionElements, |
| 990 OnHideTransitionElements) | 992 OnHideTransitionElements) |
| 991 IPC_MESSAGE_HANDLER(FrameMsg_ShowTransitionElements, | 993 IPC_MESSAGE_HANDLER(FrameMsg_ShowTransitionElements, |
| 992 OnShowTransitionElements) | 994 OnShowTransitionElements) |
| 993 IPC_MESSAGE_HANDLER(FrameMsg_Reload, OnReload) | 995 IPC_MESSAGE_HANDLER(FrameMsg_Reload, OnReload) |
| (...skipping 446 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1440 converter.SetRegExpAllowed(true); | 1442 converter.SetRegExpAllowed(true); |
| 1441 base::Value* result_value = converter.FromV8Value(result, context); | 1443 base::Value* result_value = converter.FromV8Value(result, context); |
| 1442 list.Set(0, result_value ? result_value : base::Value::CreateNullValue()); | 1444 list.Set(0, result_value ? result_value : base::Value::CreateNullValue()); |
| 1443 } else { | 1445 } else { |
| 1444 list.Set(0, base::Value::CreateNullValue()); | 1446 list.Set(0, base::Value::CreateNullValue()); |
| 1445 } | 1447 } |
| 1446 Send(new FrameHostMsg_JavaScriptExecuteResponse(routing_id_, id, list)); | 1448 Send(new FrameHostMsg_JavaScriptExecuteResponse(routing_id_, id, list)); |
| 1447 } | 1449 } |
| 1448 } | 1450 } |
| 1449 | 1451 |
| 1452 void RenderFrameImpl::OnFlushVisualStateRequest(int id) { |
| 1453 GetRenderWidget()->QueueMessage( |
| 1454 new FrameHostMsg_FlushVisualStateResponse(routing_id_, id), |
| 1455 MESSAGE_DELIVERY_POLICY_WITH_VISUAL_STATE); |
| 1456 } |
| 1457 |
| 1450 void RenderFrameImpl::OnSetEditableSelectionOffsets(int start, int end) { | 1458 void RenderFrameImpl::OnSetEditableSelectionOffsets(int start, int end) { |
| 1451 base::AutoReset<bool> handling_select_range(&handling_select_range_, true); | 1459 base::AutoReset<bool> handling_select_range(&handling_select_range_, true); |
| 1452 if (!GetRenderWidget()->ShouldHandleImeEvent()) | 1460 if (!GetRenderWidget()->ShouldHandleImeEvent()) |
| 1453 return; | 1461 return; |
| 1454 ImeEventGuard guard(GetRenderWidget()); | 1462 ImeEventGuard guard(GetRenderWidget()); |
| 1455 frame_->setEditableSelectionOffsets(start, end); | 1463 frame_->setEditableSelectionOffsets(start, end); |
| 1456 } | 1464 } |
| 1457 | 1465 |
| 1458 void RenderFrameImpl::OnSetCompositionFromExistingText( | 1466 void RenderFrameImpl::OnSetCompositionFromExistingText( |
| 1459 int start, int end, | 1467 int start, int end, |
| (...skipping 2931 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4391 | 4399 |
| 4392 #if defined(ENABLE_BROWSER_CDMS) | 4400 #if defined(ENABLE_BROWSER_CDMS) |
| 4393 RendererCdmManager* RenderFrameImpl::GetCdmManager() { | 4401 RendererCdmManager* RenderFrameImpl::GetCdmManager() { |
| 4394 if (!cdm_manager_) | 4402 if (!cdm_manager_) |
| 4395 cdm_manager_ = new RendererCdmManager(this); | 4403 cdm_manager_ = new RendererCdmManager(this); |
| 4396 return cdm_manager_; | 4404 return cdm_manager_; |
| 4397 } | 4405 } |
| 4398 #endif // defined(ENABLE_BROWSER_CDMS) | 4406 #endif // defined(ENABLE_BROWSER_CDMS) |
| 4399 | 4407 |
| 4400 } // namespace content | 4408 } // namespace content |
| OLD | NEW |