Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(224)

Side by Side Diff: content/renderer/render_view_impl.cc

Issue 16223006: Implement WebFrameClient in RenderFrameImpl and proxy all calls to RenderView. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Couple of small fixes. Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « content/renderer/render_frame_impl.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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
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());
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 1346 matching lines...) Expand 10 before | Expand all | Expand 10 after
2242 int id = enumeration_completion_id_++; 2242 int id = enumeration_completion_id_++;
2243 enumeration_completions_[id] = chooser_completion; 2243 enumeration_completions_[id] = chooser_completion;
2244 return Send(new ViewHostMsg_EnumerateDirectory( 2244 return Send(new ViewHostMsg_EnumerateDirectory(
2245 routing_id_, 2245 routing_id_,
2246 id, 2246 id,
2247 webkit_base::WebStringToFilePath(path))); 2247 webkit_base::WebStringToFilePath(path)));
2248 } 2248 }
2249 2249
2250 void RenderViewImpl::initializeHelperPluginWebFrame( 2250 void RenderViewImpl::initializeHelperPluginWebFrame(
2251 WebKit::WebHelperPlugin* plugin) { 2251 WebKit::WebHelperPlugin* plugin) {
2252 plugin->initializeFrame(this); 2252 plugin->initializeFrame(main_render_frame_.get());
2253 } 2253 }
2254 2254
2255 void RenderViewImpl::didStartLoading() { 2255 void RenderViewImpl::didStartLoading() {
2256 if (is_loading_) { 2256 if (is_loading_) {
2257 DVLOG(1) << "didStartLoading called while loading"; 2257 DVLOG(1) << "didStartLoading called while loading";
2258 return; 2258 return;
2259 } 2259 }
2260 2260
2261 is_loading_ = true; 2261 is_loading_ = true;
2262 2262
(...skipping 4466 matching lines...) Expand 10 before | Expand all | Expand 10 after
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
OLDNEW
« no previous file with comments | « content/renderer/render_frame_impl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698