| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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_widget.h" | 5 #include "content/renderer/render_widget.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
| 9 #include "base/debug/trace_event.h" | 9 #include "base/debug/trace_event.h" |
| 10 #include "base/logging.h" | 10 #include "base/logging.h" |
| (...skipping 1658 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1669 } | 1669 } |
| 1670 | 1670 |
| 1671 bool RenderWidget::CanComposeInline() { | 1671 bool RenderWidget::CanComposeInline() { |
| 1672 return true; | 1672 return true; |
| 1673 } | 1673 } |
| 1674 | 1674 |
| 1675 WebScreenInfo RenderWidget::screenInfo() { | 1675 WebScreenInfo RenderWidget::screenInfo() { |
| 1676 return screen_info_; | 1676 return screen_info_; |
| 1677 } | 1677 } |
| 1678 | 1678 |
| 1679 float RenderWidget::deviceScaleFactor() { |
| 1680 return device_scale_factor_; |
| 1681 } |
| 1682 |
| 1679 void RenderWidget::resetInputMethod() { | 1683 void RenderWidget::resetInputMethod() { |
| 1680 if (!input_method_is_active_) | 1684 if (!input_method_is_active_) |
| 1681 return; | 1685 return; |
| 1682 | 1686 |
| 1683 // If the last text input type is not None, then we should finish any | 1687 // If the last text input type is not None, then we should finish any |
| 1684 // ongoing composition regardless of the new text input type. | 1688 // ongoing composition regardless of the new text input type. |
| 1685 if (text_input_type_ != ui::TEXT_INPUT_TYPE_NONE) { | 1689 if (text_input_type_ != ui::TEXT_INPUT_TYPE_NONE) { |
| 1686 // If a composition text exists, then we need to let the browser process | 1690 // If a composition text exists, then we need to let the browser process |
| 1687 // to cancel the input method's ongoing composition session. | 1691 // to cancel the input method's ongoing composition session. |
| 1688 if (webwidget_->confirmComposition()) | 1692 if (webwidget_->confirmComposition()) |
| (...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1727 } | 1731 } |
| 1728 } | 1732 } |
| 1729 | 1733 |
| 1730 bool RenderWidget::WillHandleMouseEvent(const WebKit::WebMouseEvent& event) { | 1734 bool RenderWidget::WillHandleMouseEvent(const WebKit::WebMouseEvent& event) { |
| 1731 return false; | 1735 return false; |
| 1732 } | 1736 } |
| 1733 | 1737 |
| 1734 bool RenderWidget::WebWidgetHandlesCompositorScheduling() const { | 1738 bool RenderWidget::WebWidgetHandlesCompositorScheduling() const { |
| 1735 return false; | 1739 return false; |
| 1736 } | 1740 } |
| OLD | NEW |