| 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 3303 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3314 NOTIMPLEMENTED(); | 3314 NOTIMPLEMENTED(); |
| 3315 #endif | 3315 #endif |
| 3316 } | 3316 } |
| 3317 | 3317 |
| 3318 void RenderViewImpl::OnMoveOrResizeStarted() { | 3318 void RenderViewImpl::OnMoveOrResizeStarted() { |
| 3319 if (webview()) | 3319 if (webview()) |
| 3320 webview()->hidePopups(); | 3320 webview()->hidePopups(); |
| 3321 } | 3321 } |
| 3322 | 3322 |
| 3323 void RenderViewImpl::OnResize(const ViewMsg_Resize_Params& params) { | 3323 void RenderViewImpl::OnResize(const ViewMsg_Resize_Params& params) { |
| 3324 TRACE_EVENT0("renderer", "RenderViewImpl::OnResize"); |
| 3324 if (webview()) { | 3325 if (webview()) { |
| 3325 webview()->hidePopups(); | 3326 webview()->hidePopups(); |
| 3326 if (send_preferred_size_changes_) { | 3327 if (send_preferred_size_changes_) { |
| 3327 webview()->mainFrame()->setCanHaveScrollbars( | 3328 webview()->mainFrame()->setCanHaveScrollbars( |
| 3328 ShouldDisplayScrollbars(params.new_size.width(), | 3329 ShouldDisplayScrollbars(params.new_size.width(), |
| 3329 params.new_size.height())); | 3330 params.new_size.height())); |
| 3330 } | 3331 } |
| 3331 UpdateScrollState(webview()->mainFrame()); | 3332 UpdateScrollState(webview()->mainFrame()); |
| 3332 } | 3333 } |
| 3333 | 3334 |
| (...skipping 971 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4305 std::vector<gfx::Size> sizes; | 4306 std::vector<gfx::Size> sizes; |
| 4306 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); | 4307 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); |
| 4307 if (!url.isEmpty()) | 4308 if (!url.isEmpty()) |
| 4308 urls.push_back( | 4309 urls.push_back( |
| 4309 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); | 4310 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); |
| 4310 } | 4311 } |
| 4311 SendUpdateFaviconURL(urls); | 4312 SendUpdateFaviconURL(urls); |
| 4312 } | 4313 } |
| 4313 | 4314 |
| 4314 } // namespace content | 4315 } // namespace content |
| OLD | NEW |