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 | 9 |
10 #include "base/auto_reset.h" | 10 #include "base/auto_reset.h" |
(...skipping 2532 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
2543 } | 2543 } |
2544 } | 2544 } |
2545 } | 2545 } |
2546 | 2546 |
2547 return false; | 2547 return false; |
2548 } | 2548 } |
2549 | 2549 |
2550 bool RenderViewImpl::NodeContainsPoint(const WebNode& node, | 2550 bool RenderViewImpl::NodeContainsPoint(const WebNode& node, |
2551 const gfx::Point& point) const { | 2551 const gfx::Point& point) const { |
2552 blink::WebHitTestResult hit_test = | 2552 blink::WebHitTestResult hit_test = |
2553 webview()->hitTestResultAt(WebPoint(point.x(), point.y())); | 2553 webview()->hitTestResultForTap(WebPoint(point.x(), point.y()), WebSize()); |
jamesr
2014/11/08 00:21:08
this is used for autofill and exposed in the conte
hush (inactive)
2014/11/08 01:00:43
This is not a behavior change.
hitTestResultAt doe
| |
2554 return node.containsIncludingShadowDOM(hit_test.node()); | 2554 return node.containsIncludingShadowDOM(hit_test.node()); |
2555 } | 2555 } |
2556 | 2556 |
2557 bool RenderViewImpl::ShouldDisplayScrollbars(int width, int height) const { | 2557 bool RenderViewImpl::ShouldDisplayScrollbars(int width, int height) const { |
2558 return (!send_preferred_size_changes_ || | 2558 return (!send_preferred_size_changes_ || |
2559 (disable_scrollbars_size_limit_.width() <= width || | 2559 (disable_scrollbars_size_limit_.width() <= width || |
2560 disable_scrollbars_size_limit_.height() <= height)); | 2560 disable_scrollbars_size_limit_.height() <= height)); |
2561 } | 2561 } |
2562 | 2562 |
2563 int RenderViewImpl::GetEnabledBindings() const { | 2563 int RenderViewImpl::GetEnabledBindings() const { |
(...skipping 1648 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
4212 std::vector<gfx::Size> sizes; | 4212 std::vector<gfx::Size> sizes; |
4213 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); | 4213 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); |
4214 if (!url.isEmpty()) | 4214 if (!url.isEmpty()) |
4215 urls.push_back( | 4215 urls.push_back( |
4216 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); | 4216 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); |
4217 } | 4217 } |
4218 SendUpdateFaviconURL(urls); | 4218 SendUpdateFaviconURL(urls); |
4219 } | 4219 } |
4220 | 4220 |
4221 } // namespace content | 4221 } // namespace content |
OLD | NEW |