aura: Don't lock resizes for auto-resize RWH

content/browser/renderer_host/render_widget_host_view_aura.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/renderer_host/render_widget_host_view_aura.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
@@ skipping 758 matching lines @@
   host_->WasResized();
   MaybeCreateResizeLock();
   if (touch_editing_client_) {
     touch_editing_client_->OnSelectionOrCursorChanged(selection_anchor_rect_,
         selection_focus_rect_);
   }
 }
 
 void RenderWidgetHostViewAura::MaybeCreateResizeLock() {
   gfx::Size desired_size = window_->bounds().size();
-  if (!resize_lock_.get() &&
+  if (!host_->should_auto_resize() &&
+      !resize_lock_.get() &&
       desired_size != current_frame_size_ &&
       host_->is_accelerated_compositing_active()) {
     aura::RootWindow* root_window = window_->GetRootWindow();
     ui::Compositor* compositor = root_window ?
         root_window->compositor() : NULL;
     if (root_window && compositor) {
       // Listen to changes in the compositor lock state.
       if (!compositor->HasObserver(this))
         compositor->AddObserver(this);
 
@@ skipping 2126 matching lines @@
     RenderWidgetHost* widget) {
   return new RenderWidgetHostViewAura(widget);
 }
 
 // static
 void RenderWidgetHostViewPort::GetDefaultScreenInfo(WebScreenInfo* results) {
   GetScreenInfoForWindow(results, NULL);
 }
 
 }  // namespace content