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

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

Issue 11264058: Disable force compositing mode when disabling compositing, re-enter in DoDeferredUpdate (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix threaded mode Created 8 years, 1 month 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_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/bind.h" 10 #include "base/bind.h"
(...skipping 5700 matching lines...) Expand 10 before | Expand all | Expand 10 after
5711 bool RenderViewImpl::SupportsAsynchronousSwapBuffers() { 5711 bool RenderViewImpl::SupportsAsynchronousSwapBuffers() {
5712 // Contexts using the command buffer support asynchronous swapbuffers. 5712 // Contexts using the command buffer support asynchronous swapbuffers.
5713 // See RenderViewImpl::createOutputSurface(). 5713 // See RenderViewImpl::createOutputSurface().
5714 if (WebWidgetHandlesCompositorScheduling() || 5714 if (WebWidgetHandlesCompositorScheduling() ||
5715 CommandLine::ForCurrentProcess()->HasSwitch(switches::kInProcessWebGL)) 5715 CommandLine::ForCurrentProcess()->HasSwitch(switches::kInProcessWebGL))
5716 return false; 5716 return false;
5717 5717
5718 return true; 5718 return true;
5719 } 5719 }
5720 5720
5721 bool RenderViewImpl::ForceCompositingModeEnabled() {
5722 return webkit_preferences_.force_compositing_mode;
5723 }
5724
5721 void RenderViewImpl::OnSetFocus(bool enable) { 5725 void RenderViewImpl::OnSetFocus(bool enable) {
5722 RenderWidget::OnSetFocus(enable); 5726 RenderWidget::OnSetFocus(enable);
5723 5727
5724 if (webview() && webview()->isActive()) { 5728 if (webview() && webview()->isActive()) {
5725 // Notify all NPAPI plugins. 5729 // Notify all NPAPI plugins.
5726 std::set<WebPluginDelegateProxy*>::iterator plugin_it; 5730 std::set<WebPluginDelegateProxy*>::iterator plugin_it;
5727 for (plugin_it = plugin_delegates_.begin(); 5731 for (plugin_it = plugin_delegates_.begin();
5728 plugin_it != plugin_delegates_.end(); ++plugin_it) { 5732 plugin_it != plugin_delegates_.end(); ++plugin_it) {
5729 #if defined(OS_MACOSX) 5733 #if defined(OS_MACOSX)
5730 // RenderWidget's call to setFocus can cause the underlying webview's 5734 // RenderWidget's call to setFocus can cause the underlying webview's
(...skipping 607 matching lines...) Expand 10 before | Expand all | Expand 10 after
6338 } 6342 }
6339 #endif 6343 #endif
6340 6344
6341 void RenderViewImpl::OnReleaseDisambiguationPopupDIB( 6345 void RenderViewImpl::OnReleaseDisambiguationPopupDIB(
6342 TransportDIB::Handle dib_handle) { 6346 TransportDIB::Handle dib_handle) {
6343 TransportDIB* dib = TransportDIB::CreateWithHandle(dib_handle); 6347 TransportDIB* dib = TransportDIB::CreateWithHandle(dib_handle);
6344 RenderProcess::current()->ReleaseTransportDIB(dib); 6348 RenderProcess::current()->ReleaseTransportDIB(dib);
6345 } 6349 }
6346 6350
6347 } // namespace content 6351 } // 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