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

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

Issue 12463007: Disable partial swaps for webview guest renderer until we can figure out how to do that properly. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 7 years, 9 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
« no previous file with comments | « content/renderer/render_view_impl.h ('k') | content/renderer/render_view_impl_params.h » ('j') | 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 640 matching lines...) Expand 10 before | Expand all | Expand 10 after
651 media_player_proxy_(NULL), 651 media_player_proxy_(NULL),
652 synchronous_find_active_match_ordinal_(-1), 652 synchronous_find_active_match_ordinal_(-1),
653 enumeration_completion_id_(0), 653 enumeration_completion_id_(0),
654 ALLOW_THIS_IN_INITIALIZER_LIST( 654 ALLOW_THIS_IN_INITIALIZER_LIST(
655 load_progress_tracker_(new LoadProgressTracker(this))), 655 load_progress_tracker_(new LoadProgressTracker(this))),
656 #endif 656 #endif
657 session_storage_namespace_id_(params->session_storage_namespace_id), 657 session_storage_namespace_id_(params->session_storage_namespace_id),
658 decrement_shared_popup_at_destruction_(false), 658 decrement_shared_popup_at_destruction_(false),
659 handling_select_range_(false), 659 handling_select_range_(false),
660 next_snapshot_id_(0), 660 next_snapshot_id_(0),
661 allow_partial_swap_(params->allow_partial_swap),
661 #if defined(OS_WIN) 662 #if defined(OS_WIN)
662 focused_plugin_id_(-1), 663 focused_plugin_id_(-1),
663 #endif 664 #endif
664 updating_frame_tree_(false), 665 updating_frame_tree_(false),
665 pending_frame_tree_update_(false), 666 pending_frame_tree_update_(false),
666 target_process_id_(0), 667 target_process_id_(0),
667 target_routing_id_(0) { 668 target_routing_id_(0) {
668 } 669 }
669 670
670 void RenderViewImpl::Initialize(RenderViewImplParams* params) { 671 void RenderViewImpl::Initialize(RenderViewImplParams* params) {
(...skipping 213 matching lines...) Expand 10 before | Expand all | Expand 10 after
884 const WebPreferences& webkit_prefs, 885 const WebPreferences& webkit_prefs,
885 SharedRenderViewCounter* counter, 886 SharedRenderViewCounter* counter,
886 int32 routing_id, 887 int32 routing_id,
887 int32 surface_id, 888 int32 surface_id,
888 int64 session_storage_namespace_id, 889 int64 session_storage_namespace_id,
889 const string16& frame_name, 890 const string16& frame_name,
890 bool is_renderer_created, 891 bool is_renderer_created,
891 bool swapped_out, 892 bool swapped_out,
892 int32 next_page_id, 893 int32 next_page_id,
893 const WebKit::WebScreenInfo& screen_info, 894 const WebKit::WebScreenInfo& screen_info,
894 AccessibilityMode accessibility_mode) { 895 AccessibilityMode accessibility_mode,
896 bool allow_partial_swap) {
895 DCHECK(routing_id != MSG_ROUTING_NONE); 897 DCHECK(routing_id != MSG_ROUTING_NONE);
896 RenderViewImplParams params( 898 RenderViewImplParams params(
897 opener_id, 899 opener_id,
898 renderer_prefs, 900 renderer_prefs,
899 webkit_prefs, 901 webkit_prefs,
900 counter, 902 counter,
901 routing_id, 903 routing_id,
902 surface_id, 904 surface_id,
903 session_storage_namespace_id, 905 session_storage_namespace_id,
904 frame_name, 906 frame_name,
905 is_renderer_created, 907 is_renderer_created,
906 swapped_out, 908 swapped_out,
907 next_page_id, 909 next_page_id,
908 screen_info, 910 screen_info,
909 accessibility_mode); 911 accessibility_mode,
912 allow_partial_swap);
910 RenderViewImpl* render_view = NULL; 913 RenderViewImpl* render_view = NULL;
911 if (g_create_render_view_impl) 914 if (g_create_render_view_impl)
912 render_view = g_create_render_view_impl(&params); 915 render_view = g_create_render_view_impl(&params);
913 else 916 else
914 render_view = new RenderViewImpl(&params); 917 render_view = new RenderViewImpl(&params);
915 render_view->Initialize(&params); 918 render_view->Initialize(&params);
916 return render_view; 919 return render_view;
917 } 920 }
918 921
919 // static 922 // static
(...skipping 1036 matching lines...) Expand 10 before | Expand all | Expand 10 after
1956 webkit_preferences_, 1959 webkit_preferences_,
1957 shared_popup_counter_, 1960 shared_popup_counter_,
1958 routing_id, 1961 routing_id,
1959 surface_id, 1962 surface_id,
1960 cloned_session_storage_namespace_id, 1963 cloned_session_storage_namespace_id,
1961 string16(), // WebCore will take care of setting the correct name. 1964 string16(), // WebCore will take care of setting the correct name.
1962 true, 1965 true,
1963 false, 1966 false,
1964 1, 1967 1,
1965 screen_info_, 1968 screen_info_,
1966 accessibility_mode_); 1969 accessibility_mode_,
1970 allow_partial_swap_);
1967 view->opened_by_user_gesture_ = params.user_gesture; 1971 view->opened_by_user_gesture_ = params.user_gesture;
1968 1972
1969 // Record whether the creator frame is trying to suppress the opener field. 1973 // Record whether the creator frame is trying to suppress the opener field.
1970 view->opener_suppressed_ = params.opener_suppressed; 1974 view->opener_suppressed_ = params.opener_suppressed;
1971 1975
1972 // Copy over the alternate error page URL so we can have alt error pages in 1976 // Copy over the alternate error page URL so we can have alt error pages in
1973 // the new render view (we don't need the browser to send the URL back down). 1977 // the new render view (we don't need the browser to send the URL back down).
1974 view->alternate_error_page_url_ = alternate_error_page_url_; 1978 view->alternate_error_page_url_ = alternate_error_page_url_;
1975 1979
1976 return view->webview(); 1980 return view->webview();
(...skipping 4305 matching lines...) Expand 10 before | Expand all | Expand 10 after
6282 } 6286 }
6283 6287
6284 void RenderViewImpl::InstrumentWillComposite() { 6288 void RenderViewImpl::InstrumentWillComposite() {
6285 if (!webview()) 6289 if (!webview())
6286 return; 6290 return;
6287 if (!webview()->devToolsAgent()) 6291 if (!webview()->devToolsAgent())
6288 return; 6292 return;
6289 webview()->devToolsAgent()->willComposite(); 6293 webview()->devToolsAgent()->willComposite();
6290 } 6294 }
6291 6295
6296 bool RenderViewImpl::AllowPartialSwap() const {
6297 return allow_partial_swap_;
6298 }
6299
6292 #if defined(OS_WIN) 6300 #if defined(OS_WIN)
6293 void RenderViewImpl::PluginFocusChanged(bool focused, int plugin_id) { 6301 void RenderViewImpl::PluginFocusChanged(bool focused, int plugin_id) {
6294 if (focused) 6302 if (focused)
6295 focused_plugin_id_ = plugin_id; 6303 focused_plugin_id_ = plugin_id;
6296 else 6304 else
6297 focused_plugin_id_ = -1; 6305 focused_plugin_id_ = -1;
6298 } 6306 }
6299 #endif 6307 #endif
6300 6308
6301 #if defined(OS_MACOSX) 6309 #if defined(OS_MACOSX)
(...skipping 449 matching lines...) Expand 10 before | Expand all | Expand 10 after
6751 TransportDIB* dib = TransportDIB::CreateWithHandle(dib_handle); 6759 TransportDIB* dib = TransportDIB::CreateWithHandle(dib_handle);
6752 RenderProcess::current()->ReleaseTransportDIB(dib); 6760 RenderProcess::current()->ReleaseTransportDIB(dib);
6753 } 6761 }
6754 6762
6755 void RenderViewImpl::DidCommitCompositorFrame() { 6763 void RenderViewImpl::DidCommitCompositorFrame() {
6756 RenderWidget::DidCommitCompositorFrame(); 6764 RenderWidget::DidCommitCompositorFrame();
6757 FOR_EACH_OBSERVER(RenderViewObserver, observers_, DidCommitCompositorFrame()); 6765 FOR_EACH_OBSERVER(RenderViewObserver, observers_, DidCommitCompositorFrame());
6758 } 6766 }
6759 6767
6760 } // namespace content 6768 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/render_view_impl.h ('k') | content/renderer/render_view_impl_params.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698