Chromium Code Reviews| 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 964 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 975 OnExtendSelectionAndDelete) | 975 OnExtendSelectionAndDelete) |
| 976 IPC_MESSAGE_HANDLER(InputMsg_SetCompositionFromExistingText, | 976 IPC_MESSAGE_HANDLER(InputMsg_SetCompositionFromExistingText, |
| 977 OnSetCompositionFromExistingText) | 977 OnSetCompositionFromExistingText) |
| 978 IPC_MESSAGE_HANDLER(InputMsg_ExecuteNoValueEditCommand, | 978 IPC_MESSAGE_HANDLER(InputMsg_ExecuteNoValueEditCommand, |
| 979 OnExecuteNoValueEditCommand) | 979 OnExecuteNoValueEditCommand) |
| 980 IPC_MESSAGE_HANDLER(FrameMsg_CSSInsertRequest, OnCSSInsertRequest) | 980 IPC_MESSAGE_HANDLER(FrameMsg_CSSInsertRequest, OnCSSInsertRequest) |
| 981 IPC_MESSAGE_HANDLER(FrameMsg_JavaScriptExecuteRequest, | 981 IPC_MESSAGE_HANDLER(FrameMsg_JavaScriptExecuteRequest, |
| 982 OnJavaScriptExecuteRequest) | 982 OnJavaScriptExecuteRequest) |
| 983 IPC_MESSAGE_HANDLER(FrameMsg_JavaScriptExecuteRequestForTests, | 983 IPC_MESSAGE_HANDLER(FrameMsg_JavaScriptExecuteRequestForTests, |
| 984 OnJavaScriptExecuteRequestForTests) | 984 OnJavaScriptExecuteRequestForTests) |
| 985 IPC_MESSAGE_HANDLER(FrameMsg_FlushVisualStateRequest, | |
| 986 OnFlushVisualStateRequest) | |
| 985 IPC_MESSAGE_HANDLER(FrameMsg_SetEditableSelectionOffsets, | 987 IPC_MESSAGE_HANDLER(FrameMsg_SetEditableSelectionOffsets, |
| 986 OnSetEditableSelectionOffsets) | 988 OnSetEditableSelectionOffsets) |
| 987 IPC_MESSAGE_HANDLER(FrameMsg_SetupTransitionView, OnSetupTransitionView) | 989 IPC_MESSAGE_HANDLER(FrameMsg_SetupTransitionView, OnSetupTransitionView) |
| 988 IPC_MESSAGE_HANDLER(FrameMsg_BeginExitTransition, OnBeginExitTransition) | 990 IPC_MESSAGE_HANDLER(FrameMsg_BeginExitTransition, OnBeginExitTransition) |
| 989 IPC_MESSAGE_HANDLER(FrameMsg_RevertExitTransition, OnRevertExitTransition) | 991 IPC_MESSAGE_HANDLER(FrameMsg_RevertExitTransition, OnRevertExitTransition) |
| 990 IPC_MESSAGE_HANDLER(FrameMsg_HideTransitionElements, | 992 IPC_MESSAGE_HANDLER(FrameMsg_HideTransitionElements, |
| 991 OnHideTransitionElements) | 993 OnHideTransitionElements) |
| 992 IPC_MESSAGE_HANDLER(FrameMsg_ShowTransitionElements, | 994 IPC_MESSAGE_HANDLER(FrameMsg_ShowTransitionElements, |
| 993 OnShowTransitionElements) | 995 OnShowTransitionElements) |
| 994 IPC_MESSAGE_HANDLER(FrameMsg_Reload, OnReload) | 996 IPC_MESSAGE_HANDLER(FrameMsg_Reload, OnReload) |
| (...skipping 446 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1441 converter.SetRegExpAllowed(true); | 1443 converter.SetRegExpAllowed(true); |
| 1442 base::Value* result_value = converter.FromV8Value(result, context); | 1444 base::Value* result_value = converter.FromV8Value(result, context); |
| 1443 list.Set(0, result_value ? result_value : base::Value::CreateNullValue()); | 1445 list.Set(0, result_value ? result_value : base::Value::CreateNullValue()); |
| 1444 } else { | 1446 } else { |
| 1445 list.Set(0, base::Value::CreateNullValue()); | 1447 list.Set(0, base::Value::CreateNullValue()); |
| 1446 } | 1448 } |
| 1447 Send(new FrameHostMsg_JavaScriptExecuteResponse(routing_id_, id, list)); | 1449 Send(new FrameHostMsg_JavaScriptExecuteResponse(routing_id_, id, list)); |
| 1448 } | 1450 } |
| 1449 } | 1451 } |
| 1450 | 1452 |
| 1453 void RenderFrameImpl::OnFlushVisualStateRequest(int id) { | |
|
mkosiba (inactive)
2015/01/27 22:07:20
int64?
Ignacio Solla
2015/02/05 16:00:38
Done.
Ignacio Solla
2015/02/05 16:00:38
Done.
| |
| 1454 GetRenderWidget()->QueueMessage( | |
| 1455 new FrameHostMsg_FlushVisualStateResponse(routing_id_, id), | |
| 1456 MESSAGE_DELIVERY_POLICY_WITH_VISUAL_STATE); | |
| 1457 } | |
| 1458 | |
| 1451 void RenderFrameImpl::OnSetEditableSelectionOffsets(int start, int end) { | 1459 void RenderFrameImpl::OnSetEditableSelectionOffsets(int start, int end) { |
| 1452 base::AutoReset<bool> handling_select_range(&handling_select_range_, true); | 1460 base::AutoReset<bool> handling_select_range(&handling_select_range_, true); |
| 1453 if (!GetRenderWidget()->ShouldHandleImeEvent()) | 1461 if (!GetRenderWidget()->ShouldHandleImeEvent()) |
| 1454 return; | 1462 return; |
| 1455 ImeEventGuard guard(GetRenderWidget()); | 1463 ImeEventGuard guard(GetRenderWidget()); |
| 1456 frame_->setEditableSelectionOffsets(start, end); | 1464 frame_->setEditableSelectionOffsets(start, end); |
| 1457 } | 1465 } |
| 1458 | 1466 |
| 1459 void RenderFrameImpl::OnSetCompositionFromExistingText( | 1467 void RenderFrameImpl::OnSetCompositionFromExistingText( |
| 1460 int start, int end, | 1468 int start, int end, |
| (...skipping 2942 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 4403 | 4411 |
| 4404 #if defined(ENABLE_BROWSER_CDMS) | 4412 #if defined(ENABLE_BROWSER_CDMS) |
| 4405 RendererCdmManager* RenderFrameImpl::GetCdmManager() { | 4413 RendererCdmManager* RenderFrameImpl::GetCdmManager() { |
| 4406 if (!cdm_manager_) | 4414 if (!cdm_manager_) |
| 4407 cdm_manager_ = new RendererCdmManager(this); | 4415 cdm_manager_ = new RendererCdmManager(this); |
| 4408 return cdm_manager_; | 4416 return cdm_manager_; |
| 4409 } | 4417 } |
| 4410 #endif // defined(ENABLE_BROWSER_CDMS) | 4418 #endif // defined(ENABLE_BROWSER_CDMS) |
| 4411 | 4419 |
| 4412 } // namespace content | 4420 } // namespace content |
| OLD | NEW |