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 935 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
946 webview()->settings()->setCompositedScrollingForFramesEnabled( | 946 webview()->settings()->setCompositedScrollingForFramesEnabled( |
947 ShouldUseCompositedScrollingForFrames(device_scale_factor_)); | 947 ShouldUseCompositedScrollingForFrames(device_scale_factor_)); |
948 | 948 |
949 ApplyWebPreferences(webkit_preferences_, webview()); | 949 ApplyWebPreferences(webkit_preferences_, webview()); |
950 | 950 |
951 main_render_frame_.reset( | 951 main_render_frame_.reset( |
952 RenderFrameImpl::Create(this, params->main_frame_routing_id)); | 952 RenderFrameImpl::Create(this, params->main_frame_routing_id)); |
953 // The main frame WebFrame object is closed by | 953 // The main frame WebFrame object is closed by |
954 // RenderViewImpl::frameDetached(). | 954 // RenderViewImpl::frameDetached(). |
955 webview()->setMainFrame(WebFrame::create(main_render_frame_.get())); | 955 webview()->setMainFrame(WebFrame::create(main_render_frame_.get())); |
| 956 main_render_frame_->MainWebFrameCreated(webview()->mainFrame()); |
956 | 957 |
957 if (switches::IsTouchDragDropEnabled()) | 958 if (switches::IsTouchDragDropEnabled()) |
958 webview()->settings()->setTouchDragDropEnabled(true); | 959 webview()->settings()->setTouchDragDropEnabled(true); |
959 | 960 |
960 if (switches::IsTouchEditingEnabled()) | 961 if (switches::IsTouchEditingEnabled()) |
961 webview()->settings()->setTouchEditingEnabled(true); | 962 webview()->settings()->setTouchEditingEnabled(true); |
962 | 963 |
963 if (!params->frame_name.empty()) | 964 if (!params->frame_name.empty()) |
964 webview()->mainFrame()->setName(params->frame_name); | 965 webview()->mainFrame()->setName(params->frame_name); |
965 | 966 |
(...skipping 5471 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
6437 for (size_t i = 0; i < icon_urls.size(); i++) { | 6438 for (size_t i = 0; i < icon_urls.size(); i++) { |
6438 WebURL url = icon_urls[i].iconURL(); | 6439 WebURL url = icon_urls[i].iconURL(); |
6439 if (!url.isEmpty()) | 6440 if (!url.isEmpty()) |
6440 urls.push_back(FaviconURL(url, | 6441 urls.push_back(FaviconURL(url, |
6441 ToFaviconType(icon_urls[i].iconType()))); | 6442 ToFaviconType(icon_urls[i].iconType()))); |
6442 } | 6443 } |
6443 SendUpdateFaviconURL(urls); | 6444 SendUpdateFaviconURL(urls); |
6444 } | 6445 } |
6445 | 6446 |
6446 } // namespace content | 6447 } // namespace content |
OLD | NEW |