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 3223 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3234 DCHECK(disable_scrollbars_size_limit_.IsEmpty()); | 3234 DCHECK(disable_scrollbars_size_limit_.IsEmpty()); |
3235 if (!webview()) | 3235 if (!webview()) |
3236 return; | 3236 return; |
3237 auto_resize_mode_ = false; | 3237 auto_resize_mode_ = false; |
3238 webview()->disableAutoResizeMode(); | 3238 webview()->disableAutoResizeMode(); |
3239 | 3239 |
3240 if (!new_size.IsEmpty()) { | 3240 if (!new_size.IsEmpty()) { |
3241 Resize(new_size, | 3241 Resize(new_size, |
3242 physical_backing_size_, | 3242 physical_backing_size_, |
3243 overdraw_bottom_height_, | 3243 overdraw_bottom_height_, |
| 3244 visible_viewport_size_, |
3244 resizer_rect_, | 3245 resizer_rect_, |
3245 is_fullscreen_, | 3246 is_fullscreen_, |
3246 NO_RESIZE_ACK); | 3247 NO_RESIZE_ACK); |
3247 } | 3248 } |
3248 } | 3249 } |
3249 | 3250 |
3250 void RenderViewImpl::OnEnablePreferredSizeChangedMode() { | 3251 void RenderViewImpl::OnEnablePreferredSizeChangedMode() { |
3251 if (send_preferred_size_changes_) | 3252 if (send_preferred_size_changes_) |
3252 return; | 3253 return; |
3253 send_preferred_size_changes_ = true; | 3254 send_preferred_size_changes_ = true; |
(...skipping 1233 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4487 std::vector<gfx::Size> sizes; | 4488 std::vector<gfx::Size> sizes; |
4488 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); | 4489 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); |
4489 if (!url.isEmpty()) | 4490 if (!url.isEmpty()) |
4490 urls.push_back( | 4491 urls.push_back( |
4491 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); | 4492 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); |
4492 } | 4493 } |
4493 SendUpdateFaviconURL(urls); | 4494 SendUpdateFaviconURL(urls); |
4494 } | 4495 } |
4495 | 4496 |
4496 } // namespace content | 4497 } // namespace content |
OLD | NEW |