| 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 1596 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1607 void RenderFrameImpl::OnVisualStateRequest(uint64 id) { | 1607 void RenderFrameImpl::OnVisualStateRequest(uint64 id) { |
| 1608 GetRenderWidget()->QueueMessage( | 1608 GetRenderWidget()->QueueMessage( |
| 1609 new FrameHostMsg_VisualStateResponse(routing_id_, id), | 1609 new FrameHostMsg_VisualStateResponse(routing_id_, id), |
| 1610 MESSAGE_DELIVERY_POLICY_WITH_VISUAL_STATE); | 1610 MESSAGE_DELIVERY_POLICY_WITH_VISUAL_STATE); |
| 1611 } | 1611 } |
| 1612 | 1612 |
| 1613 void RenderFrameImpl::OnSetEditableSelectionOffsets(int start, int end) { | 1613 void RenderFrameImpl::OnSetEditableSelectionOffsets(int start, int end) { |
| 1614 base::AutoReset<bool> handling_select_range(&handling_select_range_, true); | 1614 base::AutoReset<bool> handling_select_range(&handling_select_range_, true); |
| 1615 if (!GetRenderWidget()->ShouldHandleImeEvent()) | 1615 if (!GetRenderWidget()->ShouldHandleImeEvent()) |
| 1616 return; | 1616 return; |
| 1617 LOG(ERROR) << "XXX OnSetEditableSelectionOffsets"; |
| 1617 ImeEventGuard guard(GetRenderWidget()); | 1618 ImeEventGuard guard(GetRenderWidget()); |
| 1618 frame_->setEditableSelectionOffsets(start, end); | 1619 frame_->setEditableSelectionOffsets(start, end); |
| 1619 } | 1620 } |
| 1620 | 1621 |
| 1621 void RenderFrameImpl::OnSetCompositionFromExistingText( | 1622 void RenderFrameImpl::OnSetCompositionFromExistingText( |
| 1622 int start, int end, | 1623 int start, int end, |
| 1623 const std::vector<blink::WebCompositionUnderline>& underlines) { | 1624 const std::vector<blink::WebCompositionUnderline>& underlines) { |
| 1624 if (!GetRenderWidget()->ShouldHandleImeEvent()) | 1625 if (!GetRenderWidget()->ShouldHandleImeEvent()) |
| 1625 return; | 1626 return; |
| 1627 LOG(ERROR) << "XXX OnSetCompositionFromExistingText"; |
| 1626 ImeEventGuard guard(GetRenderWidget()); | 1628 ImeEventGuard guard(GetRenderWidget()); |
| 1627 frame_->setCompositionFromExistingText(start, end, underlines); | 1629 frame_->setCompositionFromExistingText(start, end, underlines); |
| 1628 } | 1630 } |
| 1629 | 1631 |
| 1630 void RenderFrameImpl::OnExecuteNoValueEditCommand(const std::string& name) { | 1632 void RenderFrameImpl::OnExecuteNoValueEditCommand(const std::string& name) { |
| 1631 frame_->executeCommand(WebString::fromUTF8(name), GetFocusedElement()); | 1633 frame_->executeCommand(WebString::fromUTF8(name), GetFocusedElement()); |
| 1632 } | 1634 } |
| 1633 | 1635 |
| 1634 void RenderFrameImpl::OnExtendSelectionAndDelete(int before, int after) { | 1636 void RenderFrameImpl::OnExtendSelectionAndDelete(int before, int after) { |
| 1635 if (!GetRenderWidget()->ShouldHandleImeEvent()) | 1637 if (!GetRenderWidget()->ShouldHandleImeEvent()) |
| 1636 return; | 1638 return; |
| 1637 | 1639 |
| 1638 DCHECK(!WebUserGestureIndicator::isProcessingUserGesture()); | 1640 DCHECK(!WebUserGestureIndicator::isProcessingUserGesture()); |
| 1639 | 1641 |
| 1642 LOG(ERROR) << "XXX OnExtendSelectionAndDelete"; |
| 1640 ImeEventGuard guard(GetRenderWidget()); | 1643 ImeEventGuard guard(GetRenderWidget()); |
| 1641 blink::WebScopedUserGesture gesture_indicator; | 1644 blink::WebScopedUserGesture gesture_indicator; |
| 1642 frame_->extendSelectionAndDelete(before, after); | 1645 frame_->extendSelectionAndDelete(before, after); |
| 1643 } | 1646 } |
| 1644 | 1647 |
| 1645 void RenderFrameImpl::OnSetAccessibilityMode(AccessibilityMode new_mode) { | 1648 void RenderFrameImpl::OnSetAccessibilityMode(AccessibilityMode new_mode) { |
| 1646 if (accessibility_mode_ == new_mode) | 1649 if (accessibility_mode_ == new_mode) |
| 1647 return; | 1650 return; |
| 1648 accessibility_mode_ = new_mode; | 1651 accessibility_mode_ = new_mode; |
| 1649 if (renderer_accessibility_) { | 1652 if (renderer_accessibility_) { |
| (...skipping 3469 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5119 mojo::ServiceProviderPtr service_provider; | 5122 mojo::ServiceProviderPtr service_provider; |
| 5120 mojo::URLRequestPtr request(mojo::URLRequest::New()); | 5123 mojo::URLRequestPtr request(mojo::URLRequest::New()); |
| 5121 request->url = mojo::String::From(url); | 5124 request->url = mojo::String::From(url); |
| 5122 mojo_shell_->ConnectToApplication(request.Pass(), GetProxy(&service_provider), | 5125 mojo_shell_->ConnectToApplication(request.Pass(), GetProxy(&service_provider), |
| 5123 nullptr, nullptr, | 5126 nullptr, nullptr, |
| 5124 base::Bind(&OnGotContentHandlerID)); | 5127 base::Bind(&OnGotContentHandlerID)); |
| 5125 return service_provider.Pass(); | 5128 return service_provider.Pass(); |
| 5126 } | 5129 } |
| 5127 | 5130 |
| 5128 } // namespace content | 5131 } // namespace content |
| OLD | NEW |