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

Unified Diff: content/browser/renderer_host/render_widget_host_view_aura.cc

Issue 10690168: Aura: Resize locks with --ui-enable-threaded-compositing (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Converging... Created 8 years, 5 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
Index: content/browser/renderer_host/render_widget_host_view_aura.cc
diff --git a/content/browser/renderer_host/render_widget_host_view_aura.cc b/content/browser/renderer_host/render_widget_host_view_aura.cc
index c46a867c087cdfed52fb012068d949277c9d797c..fdbe96d61a94411069eea6570e1277c8d9a39d41 100644
--- a/content/browser/renderer_host/render_widget_host_view_aura.cc
+++ b/content/browser/renderer_host/render_widget_host_view_aura.cc
@@ -167,7 +167,7 @@ class RenderWidgetHostViewAura::ResizeLock
ResizeLock(aura::RootWindow* root_window, const gfx::Size new_size)
: root_window_(root_window),
new_size_(new_size),
- compositor_lock_(root_window_->GetCompositorLock()) {
+ compositor_lock_(root_window_->compositor()->GetCompositorLock()) {
root_window_->HoldMouseMoves();
BrowserThread::PostDelayedTask(
@@ -200,7 +200,7 @@ class RenderWidgetHostViewAura::ResizeLock
private:
aura::RootWindow* root_window_;
gfx::Size new_size_;
- scoped_refptr<aura::CompositorLock> compositor_lock_;
+ scoped_refptr<ui::CompositorLock> compositor_lock_;
DISALLOW_COPY_AND_ASSIGN(ResizeLock);
};
@@ -281,7 +281,7 @@ void RenderWidgetHostViewAura::WasShown() {
if (!current_surface_ && host_->is_accelerated_compositing_active() &&
!released_front_lock_.get()) {
- released_front_lock_ = window_->GetRootWindow()->GetCompositorLock();
+ released_front_lock_ = GetCompositor()->GetCompositorLock();
}
AdjustSurfaceProtection();

Powered by Google App Engine
This is Rietveld 408576698