| 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 722 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 733 // inherits from). | 733 // inherits from). |
| 734 AddRef(); | 734 AddRef(); |
| 735 if (RenderThreadImpl::current()) { | 735 if (RenderThreadImpl::current()) { |
| 736 RenderThreadImpl::current()->WidgetCreated(); | 736 RenderThreadImpl::current()->WidgetCreated(); |
| 737 if (is_hidden_) | 737 if (is_hidden_) |
| 738 RenderThreadImpl::current()->WidgetHidden(); | 738 RenderThreadImpl::current()->WidgetHidden(); |
| 739 } | 739 } |
| 740 | 740 |
| 741 // If this is a popup, we must wait for the CreatingNew_ACK message before | 741 // If this is a popup, we must wait for the CreatingNew_ACK message before |
| 742 // completing initialization. Otherwise, we can finish it now. | 742 // completing initialization. Otherwise, we can finish it now. |
| 743 if (opener_id_ == MSG_ROUTING_NONE) { | 743 if (opener_id_ == MSG_ROUTING_NONE) |
| 744 did_show_ = true; | 744 did_show_ = true; |
| 745 CompleteInit(); | |
| 746 } | |
| 747 | 745 |
| 748 webview()->setDeviceScaleFactor(device_scale_factor_); | 746 webview()->setDeviceScaleFactor(device_scale_factor_); |
| 749 webview()->setDisplayMode(display_mode_); | 747 webview()->setDisplayMode(display_mode_); |
| 750 webview()->settings()->setPreferCompositingToLCDTextEnabled( | 748 webview()->settings()->setPreferCompositingToLCDTextEnabled( |
| 751 PreferCompositingToLCDText(compositor_deps_, device_scale_factor_)); | 749 PreferCompositingToLCDText(compositor_deps_, device_scale_factor_)); |
| 752 webview()->settings()->setThreadedScrollingEnabled( | 750 webview()->settings()->setThreadedScrollingEnabled( |
| 753 !command_line.HasSwitch(switches::kDisableThreadedScrolling)); | 751 !command_line.HasSwitch(switches::kDisableThreadedScrolling)); |
| 754 webview()->settings()->setRootLayerScrolls( | 752 webview()->settings()->setRootLayerScrolls( |
| 755 command_line.HasSwitch(switches::kRootLayerScrolls)); | 753 command_line.HasSwitch(switches::kRootLayerScrolls)); |
| 756 | 754 |
| (...skipping 2942 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3699 std::vector<gfx::Size> sizes; | 3697 std::vector<gfx::Size> sizes; |
| 3700 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); | 3698 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); |
| 3701 if (!url.isEmpty()) | 3699 if (!url.isEmpty()) |
| 3702 urls.push_back( | 3700 urls.push_back( |
| 3703 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); | 3701 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); |
| 3704 } | 3702 } |
| 3705 SendUpdateFaviconURL(urls); | 3703 SendUpdateFaviconURL(urls); |
| 3706 } | 3704 } |
| 3707 | 3705 |
| 3708 } // namespace content | 3706 } // namespace content |
| OLD | NEW |