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 3077 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
3088 if (webview()) { | 3088 if (webview()) { |
3089 webview()->hidePopups(); | 3089 webview()->hidePopups(); |
3090 if (send_preferred_size_changes_) { | 3090 if (send_preferred_size_changes_) { |
3091 webview()->mainFrame()->setCanHaveScrollbars( | 3091 webview()->mainFrame()->setCanHaveScrollbars( |
3092 ShouldDisplayScrollbars(params.new_size.width(), | 3092 ShouldDisplayScrollbars(params.new_size.width(), |
3093 params.new_size.height())); | 3093 params.new_size.height())); |
3094 } | 3094 } |
3095 UpdateScrollState(webview()->mainFrame()); | 3095 UpdateScrollState(webview()->mainFrame()); |
3096 } | 3096 } |
3097 | 3097 |
3098 gfx::Size old_visible_viewport_size_ = visible_viewport_size_; | |
aelias_OOO_until_Jul13
2014/05/23 23:26:18
Shouldn't be an underscore on the local variable h
| |
3099 | |
3098 RenderWidget::OnResize(params); | 3100 RenderWidget::OnResize(params); |
3101 | |
3102 if (old_visible_viewport_size_ != visible_viewport_size_) | |
3103 has_scrolled_focused_editable_node_into_rect_ = false; | |
3099 } | 3104 } |
3100 | 3105 |
3101 void RenderViewImpl::DidInitiatePaint() { | 3106 void RenderViewImpl::DidInitiatePaint() { |
3102 #if defined(ENABLE_PLUGINS) | 3107 #if defined(ENABLE_PLUGINS) |
3103 // Notify all instances that we painted. The same caveats apply as for | 3108 // Notify all instances that we painted. The same caveats apply as for |
3104 // ViewFlushedPaint regarding instances closing themselves, so we take | 3109 // ViewFlushedPaint regarding instances closing themselves, so we take |
3105 // similar precautions. | 3110 // similar precautions. |
3106 PepperPluginSet plugins = active_pepper_instances_; | 3111 PepperPluginSet plugins = active_pepper_instances_; |
3107 for (PepperPluginSet::iterator i = plugins.begin(); i != plugins.end(); ++i) { | 3112 for (PepperPluginSet::iterator i = plugins.begin(); i != plugins.end(); ++i) { |
3108 if (active_pepper_instances_.find(*i) != active_pepper_instances_.end()) | 3113 if (active_pepper_instances_.find(*i) != active_pepper_instances_.end()) |
(...skipping 978 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
4087 std::vector<gfx::Size> sizes; | 4092 std::vector<gfx::Size> sizes; |
4088 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); | 4093 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); |
4089 if (!url.isEmpty()) | 4094 if (!url.isEmpty()) |
4090 urls.push_back( | 4095 urls.push_back( |
4091 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); | 4096 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); |
4092 } | 4097 } |
4093 SendUpdateFaviconURL(urls); | 4098 SendUpdateFaviconURL(urls); |
4094 } | 4099 } |
4095 | 4100 |
4096 } // namespace content | 4101 } // namespace content |
OLD | NEW |