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

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_widget.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 667 matching lines...) Expand 10 before | Expand all | Expand 10 after
678 opener_id_ = params->opener_id; 678 opener_id_ = params->opener_id;
679 679
680 // Ensure we start with a valid next_page_id_ from the browser. 680 // Ensure we start with a valid next_page_id_ from the browser.
681 DCHECK_GE(next_page_id_, 0); 681 DCHECK_GE(next_page_id_, 0);
682 682
683 #if defined(ENABLE_NOTIFICATIONS) 683 #if defined(ENABLE_NOTIFICATIONS)
684 notification_provider_ = new NotificationProvider(this); 684 notification_provider_ = new NotificationProvider(this);
685 #else 685 #else
686 notification_provider_ = NULL; 686 notification_provider_ = NULL;
687 #endif 687 #endif
688 renderer_preferences_.allow_partial_swap =
689 params->renderer_prefs.allow_partial_swap;
alexst (slow to review) 2013/03/07 00:33:41 This needs to be set here because OnSetRendererPre
jamesr 2013/03/07 00:48:06 Hmmmm, this is getting quite tricky. Why don't yo
688 690
689 webwidget_ = WebView::create(this); 691 webwidget_ = WebView::create(this);
690 webwidget_mouse_lock_target_.reset(new WebWidgetLockTarget(webwidget_)); 692 webwidget_mouse_lock_target_.reset(new WebWidgetLockTarget(webwidget_));
691 693
692 const CommandLine& command_line = *CommandLine::ForCurrentProcess(); 694 const CommandLine& command_line = *CommandLine::ForCurrentProcess();
693 695
694 #if defined(OS_ANDROID) 696 #if defined(OS_ANDROID)
695 content::DeviceTelephonyInfo device_info; 697 content::DeviceTelephonyInfo device_info;
696 698
697 const std::string region_code = 699 const std::string region_code =
(...skipping 5580 matching lines...) Expand 10 before | Expand all | Expand 10 after
6278 } 6280 }
6279 6281
6280 void RenderViewImpl::InstrumentWillComposite() { 6282 void RenderViewImpl::InstrumentWillComposite() {
6281 if (!webview()) 6283 if (!webview())
6282 return; 6284 return;
6283 if (!webview()->devToolsAgent()) 6285 if (!webview()->devToolsAgent())
6284 return; 6286 return;
6285 webview()->devToolsAgent()->willComposite(); 6287 webview()->devToolsAgent()->willComposite();
6286 } 6288 }
6287 6289
6290 bool RenderViewImpl::AllowPartialSwap() const {
6291 return renderer_preferences_.allow_partial_swap;
6292 }
6293
6288 #if defined(OS_WIN) 6294 #if defined(OS_WIN)
6289 void RenderViewImpl::PluginFocusChanged(bool focused, int plugin_id) { 6295 void RenderViewImpl::PluginFocusChanged(bool focused, int plugin_id) {
6290 if (focused) 6296 if (focused)
6291 focused_plugin_id_ = plugin_id; 6297 focused_plugin_id_ = plugin_id;
6292 else 6298 else
6293 focused_plugin_id_ = -1; 6299 focused_plugin_id_ = -1;
6294 } 6300 }
6295 #endif 6301 #endif
6296 6302
6297 #if defined(OS_MACOSX) 6303 #if defined(OS_MACOSX)
(...skipping 449 matching lines...) Expand 10 before | Expand all | Expand 10 after
6747 TransportDIB* dib = TransportDIB::CreateWithHandle(dib_handle); 6753 TransportDIB* dib = TransportDIB::CreateWithHandle(dib_handle);
6748 RenderProcess::current()->ReleaseTransportDIB(dib); 6754 RenderProcess::current()->ReleaseTransportDIB(dib);
6749 } 6755 }
6750 6756
6751 void RenderViewImpl::DidCommitCompositorFrame() { 6757 void RenderViewImpl::DidCommitCompositorFrame() {
6752 RenderWidget::DidCommitCompositorFrame(); 6758 RenderWidget::DidCommitCompositorFrame();
6753 FOR_EACH_OBSERVER(RenderViewObserver, observers_, DidCommitCompositorFrame()); 6759 FOR_EACH_OBSERVER(RenderViewObserver, observers_, DidCommitCompositorFrame());
6754 } 6760 }
6755 6761
6756 } // namespace content 6762 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/render_view_impl.h ('k') | content/renderer/render_widget.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698