| 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 3273 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3284 params.new_size.height())); | 3284 params.new_size.height())); |
| 3285 } | 3285 } |
| 3286 } | 3286 } |
| 3287 | 3287 |
| 3288 gfx::Size old_visible_viewport_size = visible_viewport_size_; | 3288 gfx::Size old_visible_viewport_size = visible_viewport_size_; |
| 3289 | 3289 |
| 3290 RenderWidget::OnResize(params); | 3290 RenderWidget::OnResize(params); |
| 3291 | 3291 |
| 3292 if (old_visible_viewport_size != visible_viewport_size_) | 3292 if (old_visible_viewport_size != visible_viewport_size_) |
| 3293 has_scrolled_focused_editable_node_into_rect_ = false; | 3293 has_scrolled_focused_editable_node_into_rect_ = false; |
| 3294 |
| 3295 FOR_EACH_OBSERVER(RenderViewObserver, |
| 3296 observers_, |
| 3297 Resized()); |
| 3294 } | 3298 } |
| 3295 | 3299 |
| 3296 void RenderViewImpl::DidInitiatePaint() { | 3300 void RenderViewImpl::DidInitiatePaint() { |
| 3297 #if defined(ENABLE_PLUGINS) | 3301 #if defined(ENABLE_PLUGINS) |
| 3298 // Notify all instances that we painted. The same caveats apply as for | 3302 // Notify all instances that we painted. The same caveats apply as for |
| 3299 // ViewFlushedPaint regarding instances closing themselves, so we take | 3303 // ViewFlushedPaint regarding instances closing themselves, so we take |
| 3300 // similar precautions. | 3304 // similar precautions. |
| 3301 PepperPluginSet plugins = active_pepper_instances_; | 3305 PepperPluginSet plugins = active_pepper_instances_; |
| 3302 for (PepperPluginSet::iterator i = plugins.begin(); i != plugins.end(); ++i) { | 3306 for (PepperPluginSet::iterator i = plugins.begin(); i != plugins.end(); ++i) { |
| 3303 if (active_pepper_instances_.find(*i) != active_pepper_instances_.end()) | 3307 if (active_pepper_instances_.find(*i) != active_pepper_instances_.end()) |
| (...skipping 968 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4272 std::vector<gfx::Size> sizes; | 4276 std::vector<gfx::Size> sizes; |
| 4273 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); | 4277 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); |
| 4274 if (!url.isEmpty()) | 4278 if (!url.isEmpty()) |
| 4275 urls.push_back( | 4279 urls.push_back( |
| 4276 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); | 4280 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); |
| 4277 } | 4281 } |
| 4278 SendUpdateFaviconURL(urls); | 4282 SendUpdateFaviconURL(urls); |
| 4279 } | 4283 } |
| 4280 | 4284 |
| 4281 } // namespace content | 4285 } // namespace content |
| OLD | NEW |