| 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 902 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 913 OnExtendSelectionAndDelete) | 913 OnExtendSelectionAndDelete) |
| 914 IPC_MESSAGE_HANDLER(InputMsg_SetCompositionFromExistingText, | 914 IPC_MESSAGE_HANDLER(InputMsg_SetCompositionFromExistingText, |
| 915 OnSetCompositionFromExistingText) | 915 OnSetCompositionFromExistingText) |
| 916 IPC_MESSAGE_HANDLER(InputMsg_ExecuteNoValueEditCommand, | 916 IPC_MESSAGE_HANDLER(InputMsg_ExecuteNoValueEditCommand, |
| 917 OnExecuteNoValueEditCommand) | 917 OnExecuteNoValueEditCommand) |
| 918 IPC_MESSAGE_HANDLER(FrameMsg_CSSInsertRequest, OnCSSInsertRequest) | 918 IPC_MESSAGE_HANDLER(FrameMsg_CSSInsertRequest, OnCSSInsertRequest) |
| 919 IPC_MESSAGE_HANDLER(FrameMsg_JavaScriptExecuteRequest, | 919 IPC_MESSAGE_HANDLER(FrameMsg_JavaScriptExecuteRequest, |
| 920 OnJavaScriptExecuteRequest) | 920 OnJavaScriptExecuteRequest) |
| 921 IPC_MESSAGE_HANDLER(FrameMsg_JavaScriptExecuteRequestForTests, | 921 IPC_MESSAGE_HANDLER(FrameMsg_JavaScriptExecuteRequestForTests, |
| 922 OnJavaScriptExecuteRequestForTests) | 922 OnJavaScriptExecuteRequestForTests) |
| 923 IPC_MESSAGE_HANDLER(FrameMsg_FlushVisualStateRequest, |
| 924 OnFlushVisualStateRequest) |
| 923 IPC_MESSAGE_HANDLER(FrameMsg_SetEditableSelectionOffsets, | 925 IPC_MESSAGE_HANDLER(FrameMsg_SetEditableSelectionOffsets, |
| 924 OnSetEditableSelectionOffsets) | 926 OnSetEditableSelectionOffsets) |
| 925 IPC_MESSAGE_HANDLER(FrameMsg_SetupTransitionView, OnSetupTransitionView) | 927 IPC_MESSAGE_HANDLER(FrameMsg_SetupTransitionView, OnSetupTransitionView) |
| 926 IPC_MESSAGE_HANDLER(FrameMsg_BeginExitTransition, OnBeginExitTransition) | 928 IPC_MESSAGE_HANDLER(FrameMsg_BeginExitTransition, OnBeginExitTransition) |
| 927 IPC_MESSAGE_HANDLER(FrameMsg_RevertExitTransition, OnRevertExitTransition) | 929 IPC_MESSAGE_HANDLER(FrameMsg_RevertExitTransition, OnRevertExitTransition) |
| 928 IPC_MESSAGE_HANDLER(FrameMsg_HideTransitionElements, | 930 IPC_MESSAGE_HANDLER(FrameMsg_HideTransitionElements, |
| 929 OnHideTransitionElements) | 931 OnHideTransitionElements) |
| 930 IPC_MESSAGE_HANDLER(FrameMsg_ShowTransitionElements, | 932 IPC_MESSAGE_HANDLER(FrameMsg_ShowTransitionElements, |
| 931 OnShowTransitionElements) | 933 OnShowTransitionElements) |
| 932 IPC_MESSAGE_HANDLER(FrameMsg_Reload, OnReload) | 934 IPC_MESSAGE_HANDLER(FrameMsg_Reload, OnReload) |
| (...skipping 446 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1379 converter.SetRegExpAllowed(true); | 1381 converter.SetRegExpAllowed(true); |
| 1380 base::Value* result_value = converter.FromV8Value(result, context); | 1382 base::Value* result_value = converter.FromV8Value(result, context); |
| 1381 list.Set(0, result_value ? result_value : base::Value::CreateNullValue()); | 1383 list.Set(0, result_value ? result_value : base::Value::CreateNullValue()); |
| 1382 } else { | 1384 } else { |
| 1383 list.Set(0, base::Value::CreateNullValue()); | 1385 list.Set(0, base::Value::CreateNullValue()); |
| 1384 } | 1386 } |
| 1385 Send(new FrameHostMsg_JavaScriptExecuteResponse(routing_id_, id, list)); | 1387 Send(new FrameHostMsg_JavaScriptExecuteResponse(routing_id_, id, list)); |
| 1386 } | 1388 } |
| 1387 } | 1389 } |
| 1388 | 1390 |
| 1391 void RenderFrameImpl::OnFlushVisualStateRequest(int id) { |
| 1392 GetRenderWidget()->QueueMessage( |
| 1393 new FrameHostMsg_FlushVisualStateResponse(routing_id_, id), |
| 1394 MESSAGE_DELIVERY_POLICY_WITH_VISUAL_STATE); |
| 1395 } |
| 1396 |
| 1389 void RenderFrameImpl::OnSetEditableSelectionOffsets(int start, int end) { | 1397 void RenderFrameImpl::OnSetEditableSelectionOffsets(int start, int end) { |
| 1390 base::AutoReset<bool> handling_select_range(&handling_select_range_, true); | 1398 base::AutoReset<bool> handling_select_range(&handling_select_range_, true); |
| 1391 if (!GetRenderWidget()->ShouldHandleImeEvent()) | 1399 if (!GetRenderWidget()->ShouldHandleImeEvent()) |
| 1392 return; | 1400 return; |
| 1393 ImeEventGuard guard(GetRenderWidget()); | 1401 ImeEventGuard guard(GetRenderWidget()); |
| 1394 frame_->setEditableSelectionOffsets(start, end); | 1402 frame_->setEditableSelectionOffsets(start, end); |
| 1395 } | 1403 } |
| 1396 | 1404 |
| 1397 void RenderFrameImpl::OnSetCompositionFromExistingText( | 1405 void RenderFrameImpl::OnSetCompositionFromExistingText( |
| 1398 int start, int end, | 1406 int start, int end, |
| (...skipping 2916 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4315 | 4323 |
| 4316 #if defined(ENABLE_BROWSER_CDMS) | 4324 #if defined(ENABLE_BROWSER_CDMS) |
| 4317 RendererCdmManager* RenderFrameImpl::GetCdmManager() { | 4325 RendererCdmManager* RenderFrameImpl::GetCdmManager() { |
| 4318 if (!cdm_manager_) | 4326 if (!cdm_manager_) |
| 4319 cdm_manager_ = new RendererCdmManager(this); | 4327 cdm_manager_ = new RendererCdmManager(this); |
| 4320 return cdm_manager_; | 4328 return cdm_manager_; |
| 4321 } | 4329 } |
| 4322 #endif // defined(ENABLE_BROWSER_CDMS) | 4330 #endif // defined(ENABLE_BROWSER_CDMS) |
| 4323 | 4331 |
| 4324 } // namespace content | 4332 } // namespace content |
| OLD | NEW |