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

Unified 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 side-by-side diff with in-line comments
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 »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_view_impl.cc
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index 845c27c97b2b70268e495aeac4c4f197b7c552e6..84e4be458680761801fb793d564aea69bef0389b 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -658,6 +658,7 @@ RenderViewImpl::RenderViewImpl(RenderViewImplParams* params)
decrement_shared_popup_at_destruction_(false),
handling_select_range_(false),
next_snapshot_id_(0),
+ allow_partial_swap_(params->allow_partial_swap),
#if defined(OS_WIN)
focused_plugin_id_(-1),
#endif
@@ -891,7 +892,8 @@ RenderViewImpl* RenderViewImpl::Create(
bool swapped_out,
int32 next_page_id,
const WebKit::WebScreenInfo& screen_info,
- AccessibilityMode accessibility_mode) {
+ AccessibilityMode accessibility_mode,
+ bool allow_partial_swap) {
DCHECK(routing_id != MSG_ROUTING_NONE);
RenderViewImplParams params(
opener_id,
@@ -906,7 +908,8 @@ RenderViewImpl* RenderViewImpl::Create(
swapped_out,
next_page_id,
screen_info,
- accessibility_mode);
+ accessibility_mode,
+ allow_partial_swap);
RenderViewImpl* render_view = NULL;
if (g_create_render_view_impl)
render_view = g_create_render_view_impl(&params);
@@ -1963,7 +1966,8 @@ WebView* RenderViewImpl::createView(
false,
1,
screen_info_,
- accessibility_mode_);
+ accessibility_mode_,
+ allow_partial_swap_);
view->opened_by_user_gesture_ = params.user_gesture;
// Record whether the creator frame is trying to suppress the opener field.
@@ -6289,6 +6293,10 @@ void RenderViewImpl::InstrumentWillComposite() {
webview()->devToolsAgent()->willComposite();
}
+bool RenderViewImpl::AllowPartialSwap() const {
+ return allow_partial_swap_;
+}
+
#if defined(OS_WIN)
void RenderViewImpl::PluginFocusChanged(bool focused, int plugin_id) {
if (focused)
« 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