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 864 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
875 | 875 |
876 g_view_map.Get().insert(std::make_pair(webview(), this)); | 876 g_view_map.Get().insert(std::make_pair(webview(), this)); |
877 g_routing_id_view_map.Get().insert(std::make_pair(routing_id_, this)); | 877 g_routing_id_view_map.Get().insert(std::make_pair(routing_id_, this)); |
878 webview()->setDeviceScaleFactor(device_scale_factor_); | 878 webview()->setDeviceScaleFactor(device_scale_factor_); |
879 webview()->settings()->setAcceleratedCompositingForFixedPositionEnabled( | 879 webview()->settings()->setAcceleratedCompositingForFixedPositionEnabled( |
880 ShouldUseFixedPositionCompositing(device_scale_factor_)); | 880 ShouldUseFixedPositionCompositing(device_scale_factor_)); |
881 webview()->settings()->setAcceleratedCompositingForTransitionEnabled( | 881 webview()->settings()->setAcceleratedCompositingForTransitionEnabled( |
882 ShouldUseTransitionCompositing(device_scale_factor_)); | 882 ShouldUseTransitionCompositing(device_scale_factor_)); |
883 | 883 |
884 webkit_glue::ApplyWebPreferences(webkit_preferences_, webview()); | 884 webkit_glue::ApplyWebPreferences(webkit_preferences_, webview()); |
885 webview()->initializeMainFrame(this); | 885 webview()->initializeMainFrame(main_render_frame_.get()); |
Charlie Reis
2013/06/12 20:32:29
Does RenderViewImpl still need to derive from WebF
nasko
2013/06/12 21:36:00
I didn't want to touch the header file for RenderV
Charlie Reis
2013/06/12 22:16:10
I think we might as well. It's conceptually tied
| |
886 | 886 |
887 if (switches::IsTouchDragDropEnabled()) | 887 if (switches::IsTouchDragDropEnabled()) |
888 webview()->settings()->setTouchDragDropEnabled(true); | 888 webview()->settings()->setTouchDragDropEnabled(true); |
889 | 889 |
890 if (switches::IsTouchEditingEnabled()) | 890 if (switches::IsTouchEditingEnabled()) |
891 webview()->settings()->setTouchEditingEnabled(true); | 891 webview()->settings()->setTouchEditingEnabled(true); |
892 | 892 |
893 if (!params->frame_name.empty()) | 893 if (!params->frame_name.empty()) |
894 webview()->mainFrame()->setName(params->frame_name); | 894 webview()->mainFrame()->setName(params->frame_name); |
895 | 895 |
(...skipping 5833 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
6729 WebURL url = icon_urls[i].iconURL(); | 6729 WebURL url = icon_urls[i].iconURL(); |
6730 if (!url.isEmpty()) | 6730 if (!url.isEmpty()) |
6731 urls.push_back(FaviconURL(url, | 6731 urls.push_back(FaviconURL(url, |
6732 ToFaviconType(icon_urls[i].iconType()))); | 6732 ToFaviconType(icon_urls[i].iconType()))); |
6733 } | 6733 } |
6734 SendUpdateFaviconURL(urls); | 6734 SendUpdateFaviconURL(urls); |
6735 } | 6735 } |
6736 | 6736 |
6737 | 6737 |
6738 } // namespace content | 6738 } // namespace content |
OLD | NEW |