| 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_view_impl.h" | 5 #include "content/renderer/render_view_impl.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <cmath> | 8 #include <cmath> |
| 9 #include <memory> | 9 #include <memory> |
| 10 #include <utility> | 10 #include <utility> |
| (...skipping 1862 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1873 bool RenderViewImpl::HasAddedInputHandler() const { | 1873 bool RenderViewImpl::HasAddedInputHandler() const { |
| 1874 return has_added_input_handler_; | 1874 return has_added_input_handler_; |
| 1875 } | 1875 } |
| 1876 | 1876 |
| 1877 void RenderViewImpl::CheckPreferredSize() { | 1877 void RenderViewImpl::CheckPreferredSize() { |
| 1878 // We don't always want to send the change messages over IPC, only if we've | 1878 // We don't always want to send the change messages over IPC, only if we've |
| 1879 // been put in that mode by getting a |ViewMsg_EnablePreferredSizeChangedMode| | 1879 // been put in that mode by getting a |ViewMsg_EnablePreferredSizeChangedMode| |
| 1880 // message. | 1880 // message. |
| 1881 if (!send_preferred_size_changes_ || !webview()) | 1881 if (!send_preferred_size_changes_ || !webview()) |
| 1882 return; | 1882 return; |
| 1883 | 1883 blink::WebSize tmp_size = webview()->ContentsPreferredMinimumSize(); |
| 1884 gfx::Size size = webview()->ContentsPreferredMinimumSize(); | 1884 blink::WebRect tmp_rect(0, 0, tmp_size.width, tmp_size.height); |
| 1885 ConvertViewportToWindow(&tmp_rect); |
| 1886 gfx::Size size(tmp_rect.width, tmp_rect.height); |
| 1885 if (size == preferred_size_) | 1887 if (size == preferred_size_) |
| 1886 return; | 1888 return; |
| 1887 | 1889 |
| 1888 preferred_size_ = size; | 1890 preferred_size_ = size; |
| 1889 Send(new ViewHostMsg_DidContentsPreferredSizeChange(GetRoutingID(), | 1891 Send(new ViewHostMsg_DidContentsPreferredSizeChange(GetRoutingID(), |
| 1890 preferred_size_)); | 1892 preferred_size_)); |
| 1891 } | 1893 } |
| 1892 | 1894 |
| 1893 blink::WebString RenderViewImpl::AcceptLanguages() { | 1895 blink::WebString RenderViewImpl::AcceptLanguages() { |
| 1894 return WebString::FromUTF8(renderer_preferences_.accept_languages); | 1896 return WebString::FromUTF8(renderer_preferences_.accept_languages); |
| (...skipping 668 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2563 std::move(callback).Run(INPUT_EVENT_ACK_STATE_NOT_CONSUMED, latency_info, | 2565 std::move(callback).Run(INPUT_EVENT_ACK_STATE_NOT_CONSUMED, latency_info, |
| 2564 nullptr); | 2566 nullptr); |
| 2565 return; | 2567 return; |
| 2566 } | 2568 } |
| 2567 idle_user_detector_->ActivityDetected(); | 2569 idle_user_detector_->ActivityDetected(); |
| 2568 RenderWidget::HandleInputEvent(input_event, latency_info, | 2570 RenderWidget::HandleInputEvent(input_event, latency_info, |
| 2569 std::move(callback)); | 2571 std::move(callback)); |
| 2570 } | 2572 } |
| 2571 | 2573 |
| 2572 } // namespace content | 2574 } // namespace content |
| OLD | NEW |