Chromium Code Reviews| 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 3337 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 3348 } | 3348 } |
| 3349 | 3349 |
| 3350 void RenderViewImpl::OnMoveOrResizeStarted() { | 3350 void RenderViewImpl::OnMoveOrResizeStarted() { |
| 3351 if (webview()) | 3351 if (webview()) |
| 3352 webview()->hidePopups(); | 3352 webview()->hidePopups(); |
| 3353 } | 3353 } |
| 3354 | 3354 |
| 3355 void RenderViewImpl::OnResize(const ViewMsg_Resize_Params& params) { | 3355 void RenderViewImpl::OnResize(const ViewMsg_Resize_Params& params) { |
| 3356 TRACE_EVENT0("renderer", "RenderViewImpl::OnResize"); | 3356 TRACE_EVENT0("renderer", "RenderViewImpl::OnResize"); |
| 3357 if (webview()) { | 3357 if (webview()) { |
| 3358 webview()->hidePopups(); | 3358 webview()->hidePopups(); |
|
Evan Stade
2014/08/21 00:42:12
note similar behavior here
| |
| 3359 if (send_preferred_size_changes_) { | 3359 if (send_preferred_size_changes_) { |
| 3360 webview()->mainFrame()->setCanHaveScrollbars( | 3360 webview()->mainFrame()->setCanHaveScrollbars( |
| 3361 ShouldDisplayScrollbars(params.new_size.width(), | 3361 ShouldDisplayScrollbars(params.new_size.width(), |
| 3362 params.new_size.height())); | 3362 params.new_size.height())); |
| 3363 } | 3363 } |
| 3364 has_scrolled_main_frame_ = true; | 3364 has_scrolled_main_frame_ = true; |
| 3365 } | 3365 } |
| 3366 | 3366 |
| 3367 gfx::Size old_visible_viewport_size = visible_viewport_size_; | 3367 gfx::Size old_visible_viewport_size = visible_viewport_size_; |
| 3368 | 3368 |
| 3369 RenderWidget::OnResize(params); | 3369 RenderWidget::OnResize(params); |
| 3370 | 3370 |
| 3371 if (old_visible_viewport_size != visible_viewport_size_) | 3371 if (old_visible_viewport_size != visible_viewport_size_) |
| 3372 has_scrolled_focused_editable_node_into_rect_ = false; | 3372 has_scrolled_focused_editable_node_into_rect_ = false; |
| 3373 | |
| 3374 FOR_EACH_OBSERVER(RenderViewObserver, | |
| 3375 observers_, | |
| 3376 Resized()); | |
| 3373 } | 3377 } |
| 3374 | 3378 |
| 3375 void RenderViewImpl::DidInitiatePaint() { | 3379 void RenderViewImpl::DidInitiatePaint() { |
| 3376 #if defined(ENABLE_PLUGINS) | 3380 #if defined(ENABLE_PLUGINS) |
| 3377 // Notify all instances that we painted. The same caveats apply as for | 3381 // Notify all instances that we painted. The same caveats apply as for |
| 3378 // ViewFlushedPaint regarding instances closing themselves, so we take | 3382 // ViewFlushedPaint regarding instances closing themselves, so we take |
| 3379 // similar precautions. | 3383 // similar precautions. |
| 3380 PepperPluginSet plugins = active_pepper_instances_; | 3384 PepperPluginSet plugins = active_pepper_instances_; |
| 3381 for (PepperPluginSet::iterator i = plugins.begin(); i != plugins.end(); ++i) { | 3385 for (PepperPluginSet::iterator i = plugins.begin(); i != plugins.end(); ++i) { |
| 3382 if (active_pepper_instances_.find(*i) != active_pepper_instances_.end()) | 3386 if (active_pepper_instances_.find(*i) != active_pepper_instances_.end()) |
| (...skipping 954 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 4337 std::vector<gfx::Size> sizes; | 4341 std::vector<gfx::Size> sizes; |
| 4338 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); | 4342 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); |
| 4339 if (!url.isEmpty()) | 4343 if (!url.isEmpty()) |
| 4340 urls.push_back( | 4344 urls.push_back( |
| 4341 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); | 4345 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); |
| 4342 } | 4346 } |
| 4343 SendUpdateFaviconURL(urls); | 4347 SendUpdateFaviconURL(urls); |
| 4344 } | 4348 } |
| 4345 | 4349 |
| 4346 } // namespace content | 4350 } // namespace content |
| OLD | NEW |