| 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 3183 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3194 params.new_size.height())); | 3194 params.new_size.height())); |
| 3195 } | 3195 } |
| 3196 } | 3196 } |
| 3197 | 3197 |
| 3198 gfx::Size old_visible_viewport_size = visible_viewport_size_; | 3198 gfx::Size old_visible_viewport_size = visible_viewport_size_; |
| 3199 | 3199 |
| 3200 RenderWidget::OnResize(params); | 3200 RenderWidget::OnResize(params); |
| 3201 | 3201 |
| 3202 if (old_visible_viewport_size != visible_viewport_size_) | 3202 if (old_visible_viewport_size != visible_viewport_size_) |
| 3203 has_scrolled_focused_editable_node_into_rect_ = false; | 3203 has_scrolled_focused_editable_node_into_rect_ = false; |
| 3204 | |
| 3205 FOR_EACH_OBSERVER(RenderViewObserver, | |
| 3206 observers_, | |
| 3207 Resized()); | |
| 3208 } | 3204 } |
| 3209 | 3205 |
| 3210 void RenderViewImpl::DidInitiatePaint() { | 3206 void RenderViewImpl::DidInitiatePaint() { |
| 3211 #if defined(ENABLE_PLUGINS) | 3207 #if defined(ENABLE_PLUGINS) |
| 3212 // Notify all instances that we painted. The same caveats apply as for | 3208 // Notify all instances that we painted. The same caveats apply as for |
| 3213 // ViewFlushedPaint regarding instances closing themselves, so we take | 3209 // ViewFlushedPaint regarding instances closing themselves, so we take |
| 3214 // similar precautions. | 3210 // similar precautions. |
| 3215 PepperPluginSet plugins = active_pepper_instances_; | 3211 PepperPluginSet plugins = active_pepper_instances_; |
| 3216 for (PepperPluginSet::iterator i = plugins.begin(); i != plugins.end(); ++i) { | 3212 for (PepperPluginSet::iterator i = plugins.begin(); i != plugins.end(); ++i) { |
| 3217 if (active_pepper_instances_.find(*i) != active_pepper_instances_.end()) | 3213 if (active_pepper_instances_.find(*i) != active_pepper_instances_.end()) |
| (...skipping 882 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4100 std::vector<gfx::Size> sizes; | 4096 std::vector<gfx::Size> sizes; |
| 4101 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); | 4097 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); |
| 4102 if (!url.isEmpty()) | 4098 if (!url.isEmpty()) |
| 4103 urls.push_back( | 4099 urls.push_back( |
| 4104 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); | 4100 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); |
| 4105 } | 4101 } |
| 4106 SendUpdateFaviconURL(urls); | 4102 SendUpdateFaviconURL(urls); |
| 4107 } | 4103 } |
| 4108 | 4104 |
| 4109 } // namespace content | 4105 } // namespace content |
| OLD | NEW |