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 2991 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
3002 webview()->disableAutoResizeMode(); | 3002 webview()->disableAutoResizeMode(); |
3003 | 3003 |
3004 if (!new_size.IsEmpty()) { | 3004 if (!new_size.IsEmpty()) { |
3005 Resize(new_size, | 3005 Resize(new_size, |
3006 physical_backing_size_, | 3006 physical_backing_size_, |
3007 top_controls_shrink_blink_size_, | 3007 top_controls_shrink_blink_size_, |
3008 top_controls_height_, | 3008 top_controls_height_, |
3009 visible_viewport_size_, | 3009 visible_viewport_size_, |
3010 resizer_rect_, | 3010 resizer_rect_, |
3011 is_fullscreen_, | 3011 is_fullscreen_, |
3012 NO_RESIZE_ACK); | 3012 SEND_RESIZE_ACK); |
Fady Samuel
2015/01/12 23:13:56
This needs to be in a separate patch.
paulmeyer
2015/01/12 23:25:19
Acknowledged.
| |
3013 } | 3013 } |
3014 } | 3014 } |
3015 | 3015 |
3016 void RenderViewImpl::OnEnablePreferredSizeChangedMode() { | 3016 void RenderViewImpl::OnEnablePreferredSizeChangedMode() { |
3017 if (send_preferred_size_changes_) | 3017 if (send_preferred_size_changes_) |
3018 return; | 3018 return; |
3019 send_preferred_size_changes_ = true; | 3019 send_preferred_size_changes_ = true; |
3020 | 3020 |
3021 // Start off with an initial preferred size notification (in case | 3021 // Start off with an initial preferred size notification (in case |
3022 // |didUpdateLayout| was already called). | 3022 // |didUpdateLayout| was already called). |
(...skipping 1077 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
4100 std::vector<gfx::Size> sizes; | 4100 std::vector<gfx::Size> sizes; |
4101 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); | 4101 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); |
4102 if (!url.isEmpty()) | 4102 if (!url.isEmpty()) |
4103 urls.push_back( | 4103 urls.push_back( |
4104 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); | 4104 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); |
4105 } | 4105 } |
4106 SendUpdateFaviconURL(urls); | 4106 SendUpdateFaviconURL(urls); |
4107 } | 4107 } |
4108 | 4108 |
4109 } // namespace content | 4109 } // namespace content |
OLD | NEW |