| 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 3178 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3189 DCHECK(disable_scrollbars_size_limit_.IsEmpty()); | 3189 DCHECK(disable_scrollbars_size_limit_.IsEmpty()); |
| 3190 if (!webview()) | 3190 if (!webview()) |
| 3191 return; | 3191 return; |
| 3192 auto_resize_mode_ = false; | 3192 auto_resize_mode_ = false; |
| 3193 webview()->disableAutoResizeMode(); | 3193 webview()->disableAutoResizeMode(); |
| 3194 | 3194 |
| 3195 if (!new_size.IsEmpty()) { | 3195 if (!new_size.IsEmpty()) { |
| 3196 Resize(new_size, | 3196 Resize(new_size, |
| 3197 physical_backing_size_, | 3197 physical_backing_size_, |
| 3198 overdraw_bottom_height_, | 3198 overdraw_bottom_height_, |
| 3199 visible_viewport_size_, |
| 3199 resizer_rect_, | 3200 resizer_rect_, |
| 3200 is_fullscreen_, | 3201 is_fullscreen_, |
| 3201 NO_RESIZE_ACK); | 3202 NO_RESIZE_ACK); |
| 3202 } | 3203 } |
| 3203 } | 3204 } |
| 3204 | 3205 |
| 3205 void RenderViewImpl::OnEnablePreferredSizeChangedMode() { | 3206 void RenderViewImpl::OnEnablePreferredSizeChangedMode() { |
| 3206 if (send_preferred_size_changes_) | 3207 if (send_preferred_size_changes_) |
| 3207 return; | 3208 return; |
| 3208 send_preferred_size_changes_ = true; | 3209 send_preferred_size_changes_ = true; |
| (...skipping 1233 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4442 std::vector<gfx::Size> sizes; | 4443 std::vector<gfx::Size> sizes; |
| 4443 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); | 4444 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); |
| 4444 if (!url.isEmpty()) | 4445 if (!url.isEmpty()) |
| 4445 urls.push_back( | 4446 urls.push_back( |
| 4446 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); | 4447 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); |
| 4447 } | 4448 } |
| 4448 SendUpdateFaviconURL(urls); | 4449 SendUpdateFaviconURL(urls); |
| 4449 } | 4450 } |
| 4450 | 4451 |
| 4451 } // namespace content | 4452 } // namespace content |
| OLD | NEW |