| 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 938 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 949 ShouldUseTransitionCompositing(device_scale_factor_)); | 949 ShouldUseTransitionCompositing(device_scale_factor_)); |
| 950 webview()->settings()->setAcceleratedCompositingForFixedRootBackgroundEnabled( | 950 webview()->settings()->setAcceleratedCompositingForFixedRootBackgroundEnabled( |
| 951 ShouldUseAcceleratedFixedRootBackground(device_scale_factor_)); | 951 ShouldUseAcceleratedFixedRootBackground(device_scale_factor_)); |
| 952 webview()->settings()->setAcceleratedCompositingForScrollableFramesEnabled( | 952 webview()->settings()->setAcceleratedCompositingForScrollableFramesEnabled( |
| 953 ShouldUseAcceleratedCompositingForScrollableFrames(device_scale_factor_)); | 953 ShouldUseAcceleratedCompositingForScrollableFrames(device_scale_factor_)); |
| 954 webview()->settings()->setCompositedScrollingForFramesEnabled( | 954 webview()->settings()->setCompositedScrollingForFramesEnabled( |
| 955 ShouldUseCompositedScrollingForFrames(device_scale_factor_)); | 955 ShouldUseCompositedScrollingForFrames(device_scale_factor_)); |
| 956 | 956 |
| 957 ApplyWebPreferences(webkit_preferences_, webview()); | 957 ApplyWebPreferences(webkit_preferences_, webview()); |
| 958 | 958 |
| 959 main_render_frame_.reset( | 959 main_render_frame_ = |
| 960 RenderFrameImpl::Create(this, params->main_frame_routing_id)); | 960 RenderFrameImpl::Create(this, params->main_frame_routing_id); |
| 961 // The main frame WebFrame object is closed by | 961 // The main frame WebFrame object is closed by |
| 962 // RenderViewImpl::frameDetached(). | 962 // RenderViewImpl::frameDetached(). |
| 963 webview()->setMainFrame(WebFrame::create(main_render_frame_.get())); | 963 webview()->setMainFrame(WebFrame::create(main_render_frame_)); |
| 964 | 964 |
| 965 if (switches::IsTouchDragDropEnabled()) | 965 if (switches::IsTouchDragDropEnabled()) |
| 966 webview()->settings()->setTouchDragDropEnabled(true); | 966 webview()->settings()->setTouchDragDropEnabled(true); |
| 967 | 967 |
| 968 if (switches::IsTouchEditingEnabled()) | 968 if (switches::IsTouchEditingEnabled()) |
| 969 webview()->settings()->setTouchEditingEnabled(true); | 969 webview()->settings()->setTouchEditingEnabled(true); |
| 970 | 970 |
| 971 if (!params->frame_name.empty()) | 971 if (!params->frame_name.empty()) |
| 972 webview()->mainFrame()->setName(params->frame_name); | 972 webview()->mainFrame()->setName(params->frame_name); |
| 973 | 973 |
| (...skipping 1544 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2518 int id = enumeration_completion_id_++; | 2518 int id = enumeration_completion_id_++; |
| 2519 enumeration_completions_[id] = chooser_completion; | 2519 enumeration_completions_[id] = chooser_completion; |
| 2520 return Send(new ViewHostMsg_EnumerateDirectory( | 2520 return Send(new ViewHostMsg_EnumerateDirectory( |
| 2521 routing_id_, | 2521 routing_id_, |
| 2522 id, | 2522 id, |
| 2523 base::FilePath::FromUTF16Unsafe(path))); | 2523 base::FilePath::FromUTF16Unsafe(path))); |
| 2524 } | 2524 } |
| 2525 | 2525 |
| 2526 void RenderViewImpl::initializeHelperPluginWebFrame( | 2526 void RenderViewImpl::initializeHelperPluginWebFrame( |
| 2527 WebKit::WebHelperPlugin* plugin) { | 2527 WebKit::WebHelperPlugin* plugin) { |
| 2528 plugin->initializeFrame(main_render_frame_.get()); | 2528 plugin->initializeFrame(main_render_frame_); |
| 2529 } | 2529 } |
| 2530 | 2530 |
| 2531 void RenderViewImpl::didStartLoading() { | 2531 void RenderViewImpl::didStartLoading() { |
| 2532 if (is_loading_) { | 2532 if (is_loading_) { |
| 2533 DVLOG(1) << "didStartLoading called while loading"; | 2533 DVLOG(1) << "didStartLoading called while loading"; |
| 2534 return; | 2534 return; |
| 2535 } | 2535 } |
| 2536 | 2536 |
| 2537 is_loading_ = true; | 2537 is_loading_ = true; |
| 2538 | 2538 |
| (...skipping 4052 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 6591 for (size_t i = 0; i < icon_urls.size(); i++) { | 6591 for (size_t i = 0; i < icon_urls.size(); i++) { |
| 6592 WebURL url = icon_urls[i].iconURL(); | 6592 WebURL url = icon_urls[i].iconURL(); |
| 6593 if (!url.isEmpty()) | 6593 if (!url.isEmpty()) |
| 6594 urls.push_back(FaviconURL(url, | 6594 urls.push_back(FaviconURL(url, |
| 6595 ToFaviconType(icon_urls[i].iconType()))); | 6595 ToFaviconType(icon_urls[i].iconType()))); |
| 6596 } | 6596 } |
| 6597 SendUpdateFaviconURL(urls); | 6597 SendUpdateFaviconURL(urls); |
| 6598 } | 6598 } |
| 6599 | 6599 |
| 6600 } // namespace content | 6600 } // namespace content |
| OLD | NEW |