| 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 1012 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1023 OnExtendSelectionAndDelete) | 1023 OnExtendSelectionAndDelete) |
| 1024 IPC_MESSAGE_HANDLER(InputMsg_SetCompositionFromExistingText, | 1024 IPC_MESSAGE_HANDLER(InputMsg_SetCompositionFromExistingText, |
| 1025 OnSetCompositionFromExistingText) | 1025 OnSetCompositionFromExistingText) |
| 1026 IPC_MESSAGE_HANDLER(InputMsg_ExecuteNoValueEditCommand, | 1026 IPC_MESSAGE_HANDLER(InputMsg_ExecuteNoValueEditCommand, |
| 1027 OnExecuteNoValueEditCommand) | 1027 OnExecuteNoValueEditCommand) |
| 1028 IPC_MESSAGE_HANDLER(FrameMsg_CSSInsertRequest, OnCSSInsertRequest) | 1028 IPC_MESSAGE_HANDLER(FrameMsg_CSSInsertRequest, OnCSSInsertRequest) |
| 1029 IPC_MESSAGE_HANDLER(FrameMsg_JavaScriptExecuteRequest, | 1029 IPC_MESSAGE_HANDLER(FrameMsg_JavaScriptExecuteRequest, |
| 1030 OnJavaScriptExecuteRequest) | 1030 OnJavaScriptExecuteRequest) |
| 1031 IPC_MESSAGE_HANDLER(FrameMsg_JavaScriptExecuteRequestForTests, | 1031 IPC_MESSAGE_HANDLER(FrameMsg_JavaScriptExecuteRequestForTests, |
| 1032 OnJavaScriptExecuteRequestForTests) | 1032 OnJavaScriptExecuteRequestForTests) |
| 1033 IPC_MESSAGE_HANDLER(FrameMsg_FlushVisualStateRequest, |
| 1034 OnFlushVisualStateRequest) |
| 1033 IPC_MESSAGE_HANDLER(FrameMsg_SetEditableSelectionOffsets, | 1035 IPC_MESSAGE_HANDLER(FrameMsg_SetEditableSelectionOffsets, |
| 1034 OnSetEditableSelectionOffsets) | 1036 OnSetEditableSelectionOffsets) |
| 1035 IPC_MESSAGE_HANDLER(FrameMsg_SetupTransitionView, OnSetupTransitionView) | 1037 IPC_MESSAGE_HANDLER(FrameMsg_SetupTransitionView, OnSetupTransitionView) |
| 1036 IPC_MESSAGE_HANDLER(FrameMsg_BeginExitTransition, OnBeginExitTransition) | 1038 IPC_MESSAGE_HANDLER(FrameMsg_BeginExitTransition, OnBeginExitTransition) |
| 1037 IPC_MESSAGE_HANDLER(FrameMsg_RevertExitTransition, OnRevertExitTransition) | 1039 IPC_MESSAGE_HANDLER(FrameMsg_RevertExitTransition, OnRevertExitTransition) |
| 1038 IPC_MESSAGE_HANDLER(FrameMsg_HideTransitionElements, | 1040 IPC_MESSAGE_HANDLER(FrameMsg_HideTransitionElements, |
| 1039 OnHideTransitionElements) | 1041 OnHideTransitionElements) |
| 1040 IPC_MESSAGE_HANDLER(FrameMsg_ShowTransitionElements, | 1042 IPC_MESSAGE_HANDLER(FrameMsg_ShowTransitionElements, |
| 1041 OnShowTransitionElements) | 1043 OnShowTransitionElements) |
| 1042 IPC_MESSAGE_HANDLER(FrameMsg_Reload, OnReload) | 1044 IPC_MESSAGE_HANDLER(FrameMsg_Reload, OnReload) |
| (...skipping 448 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1491 converter.SetRegExpAllowed(true); | 1493 converter.SetRegExpAllowed(true); |
| 1492 base::Value* result_value = converter.FromV8Value(result, context); | 1494 base::Value* result_value = converter.FromV8Value(result, context); |
| 1493 list.Set(0, result_value ? result_value : base::Value::CreateNullValue()); | 1495 list.Set(0, result_value ? result_value : base::Value::CreateNullValue()); |
| 1494 } else { | 1496 } else { |
| 1495 list.Set(0, base::Value::CreateNullValue()); | 1497 list.Set(0, base::Value::CreateNullValue()); |
| 1496 } | 1498 } |
| 1497 Send(new FrameHostMsg_JavaScriptExecuteResponse(routing_id_, id, list)); | 1499 Send(new FrameHostMsg_JavaScriptExecuteResponse(routing_id_, id, list)); |
| 1498 } | 1500 } |
| 1499 } | 1501 } |
| 1500 | 1502 |
| 1503 void RenderFrameImpl::OnFlushVisualStateRequest(uint64 id) { |
| 1504 GetRenderWidget()->QueueMessage( |
| 1505 new FrameHostMsg_FlushVisualStateResponse(routing_id_, id), |
| 1506 MESSAGE_DELIVERY_POLICY_WITH_VISUAL_STATE); |
| 1507 } |
| 1508 |
| 1501 void RenderFrameImpl::OnSetEditableSelectionOffsets(int start, int end) { | 1509 void RenderFrameImpl::OnSetEditableSelectionOffsets(int start, int end) { |
| 1502 base::AutoReset<bool> handling_select_range(&handling_select_range_, true); | 1510 base::AutoReset<bool> handling_select_range(&handling_select_range_, true); |
| 1503 if (!GetRenderWidget()->ShouldHandleImeEvent()) | 1511 if (!GetRenderWidget()->ShouldHandleImeEvent()) |
| 1504 return; | 1512 return; |
| 1505 ImeEventGuard guard(GetRenderWidget()); | 1513 ImeEventGuard guard(GetRenderWidget()); |
| 1506 frame_->setEditableSelectionOffsets(start, end); | 1514 frame_->setEditableSelectionOffsets(start, end); |
| 1507 } | 1515 } |
| 1508 | 1516 |
| 1509 void RenderFrameImpl::OnSetCompositionFromExistingText( | 1517 void RenderFrameImpl::OnSetCompositionFromExistingText( |
| 1510 int start, int end, | 1518 int start, int end, |
| (...skipping 2966 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4477 | 4485 |
| 4478 #if defined(ENABLE_BROWSER_CDMS) | 4486 #if defined(ENABLE_BROWSER_CDMS) |
| 4479 RendererCdmManager* RenderFrameImpl::GetCdmManager() { | 4487 RendererCdmManager* RenderFrameImpl::GetCdmManager() { |
| 4480 if (!cdm_manager_) | 4488 if (!cdm_manager_) |
| 4481 cdm_manager_ = new RendererCdmManager(this); | 4489 cdm_manager_ = new RendererCdmManager(this); |
| 4482 return cdm_manager_; | 4490 return cdm_manager_; |
| 4483 } | 4491 } |
| 4484 #endif // defined(ENABLE_BROWSER_CDMS) | 4492 #endif // defined(ENABLE_BROWSER_CDMS) |
| 4485 | 4493 |
| 4486 } // namespace content | 4494 } // namespace content |
| OLD | NEW |