Revert 281866 "Mac ÜC: Make resize smooth"

trunk/src/content/browser/renderer_host/render_widget_host_view_mac.mm

 // 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_mac.h"
 
 #import <objc/runtime.h>
 #include <OpenGL/gl.h>
 #include <QuartzCore/QuartzCore.h>
 
@@ skipping 395 matching lines @@
 ui::Layer* RenderWidgetHostViewMac::GetLayer() {
   return root_layer_.get();
 }
 
 RenderWidgetHostImpl* RenderWidgetHostViewMac::GetHost() {
   return render_widget_host_;
 }
 
 void RenderWidgetHostViewMac::SchedulePaintInRect(
     const gfx::Rect& damage_rect_in_dip) {
-  // Do not paint immediately because this is being called from deep inside
-  // DelegatedFrameHost, and not all of its state is set up yet.
-  if (browser_compositor_view_ && !browser_compositor_has_pending_paint_) {
-    browser_compositor_has_pending_paint_ = true;
-    base::MessageLoop::current()->PostTask(FROM_HERE,
-        base::Bind(&RenderWidgetHostViewMac::DoBrowserCompositorPendingPaint,
-                   weak_factory_.GetWeakPtr()));
-  }
-}
-
-void RenderWidgetHostViewMac::DoBrowserCompositorPendingPaint() {
-  if (browser_compositor_has_pending_paint_) {
-    browser_compositor_view_->GetCompositor()->Draw();
-    browser_compositor_has_pending_paint_ = false;
-  }
+  if (browser_compositor_view_)
+    browser_compositor_view_->GetCompositor()->ScheduleFullRedraw();
 }
 
 bool RenderWidgetHostViewMac::IsVisible() {
   return !render_widget_host_->is_hidden();
 }
 
 gfx::Size RenderWidgetHostViewMac::DesiredFrameSize() {
   return GetViewBounds().size();
 }
 
@@ skipping 33 matching lines @@
 }
 
 NSView* RenderWidgetHostViewMac::BrowserCompositorSuperview() {
   return cocoa_view_;
 }
 
 ui::Layer* RenderWidgetHostViewMac::BrowserCompositorRootLayer() {
   return root_layer_.get();
 }
 
-bool RenderWidgetHostViewMac::BrowserCompositorShouldDrawImmediately() {
-  return is_paused_for_resize_or_repaint_;
-}
-
 ///////////////////////////////////////////////////////////////////////////////
 // RenderWidgetHostViewBase, public:
 
 // static
 void RenderWidgetHostViewBase::GetDefaultScreenInfo(
     blink::WebScreenInfo* results) {
   *results = GetWebScreenInfo(NULL);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // RenderWidgetHostViewMac, public:
 
 RenderWidgetHostViewMac::RenderWidgetHostViewMac(RenderWidgetHost* widget)
     : render_widget_host_(RenderWidgetHostImpl::From(widget)),
       text_input_type_(ui::TEXT_INPUT_TYPE_NONE),
       can_compose_inline_(true),
-      browser_compositor_has_pending_paint_(false),
       browser_compositor_view_placeholder_(
           new BrowserCompositorViewPlaceholderMac),
       backing_store_scale_factor_(1),
       is_loading_(false),
-      is_paused_for_resize_or_repaint_(false),
       weak_factory_(this),
       fullscreen_parent_host_view_(NULL),
       overlay_view_weak_factory_(this),
       software_frame_weak_ptr_factory_(this) {
   software_frame_manager_.reset(new SoftwareFrameManager(
       software_frame_weak_ptr_factory_.GetWeakPtr()));
   // |cocoa_view_| owns us and we will be deleted when |cocoa_view_|
   // goes away.  Since we autorelease it, our caller must put
   // |GetNativeView()| into the view hierarchy right after calling us.
   cocoa_view_ = [[[RenderWidgetHostViewCocoa alloc]
@@ skipping 105 matching lines @@
     return;
   if (browser_compositor_view_)
     return;
 
   TRACE_EVENT0("browser",
                "RenderWidgetHostViewMac::EnsureBrowserCompositorView");
 
   browser_compositor_view_.reset(new BrowserCompositorViewMac(this));
   delegated_frame_host_->AddedToWindow();
   delegated_frame_host_->WasShown();
-  RenderWidgetHelper::SetRenderWidgetIDForWidget(
-      browser_compositor_view_->GetView(),
-      render_widget_host_->GetProcess()->GetID(),
-      render_widget_host_->GetRoutingID());
 }
 
 void RenderWidgetHostViewMac::DestroyBrowserCompositorView() {
   TRACE_EVENT0("browser",
                "RenderWidgetHostViewMac::DestroyBrowserCompositorView");
   if (!browser_compositor_view_)
     return;
 
   delegated_frame_host_->WasHidden();
   delegated_frame_host_->RemovingFromWindow();
-  RenderWidgetHelper::ResetRenderWidgetIDForWidget(
-      browser_compositor_view_->GetView());
   browser_compositor_view_.reset();
-  browser_compositor_has_pending_paint_ = false;
 }
 
 void RenderWidgetHostViewMac::EnsureSoftwareLayer() {
   TRACE_EVENT0("browser", "RenderWidgetHostViewMac::EnsureSoftwareLayer");
   if (software_layer_)
     return;
 
   software_layer_.reset([[SoftwareLayer alloc] init]);
   DCHECK(software_layer_);
 
@@ skipping 1160 matching lines @@
   if (compositing_iosurface_) {
     return compositing_iosurface_->HasIOSurface() &&
            (desired_size.IsEmpty() ||
                compositing_iosurface_->dip_io_surface_size() == desired_size);
   }
   if (software_frame_manager_->HasCurrentFrame()) {
     return (desired_size.IsEmpty() ||
                software_frame_manager_->GetCurrentFrameSizeInDIP() ==
                    desired_size);
   }
-  if (browser_compositor_view_)
-    return browser_compositor_view_->HasFrameWithSizeInDIP(desired_size);
   return false;
 }
 
 void RenderWidgetHostViewMac::OnSwapCompositorFrame(
     uint32 output_surface_id, scoped_ptr<cc::CompositorFrame> frame) {
   TRACE_EVENT0("browser", "RenderWidgetHostViewMac::OnSwapCompositorFrame");
 
   if (frame->delegated_frame_data) {
     float scale_factor = frame->metadata.device_scale_factor;
 
@@ skipping 11 matching lines @@
           scale_factor, pixel_size);
     }
 
     SendVSyncParametersToRenderer();
 
     delegated_frame_host_->SwapDelegatedFrame(
         output_surface_id,
         frame->delegated_frame_data.Pass(),
         frame->metadata.device_scale_factor,
         frame->metadata.latency_info);
-
-    DoBrowserCompositorPendingPaint();
   } else if (frame->software_frame_data) {
     if (!software_frame_manager_->SwapToNewFrame(
             output_surface_id,
             frame->software_frame_data.get(),
             frame->metadata.device_scale_factor,
             render_widget_host_->GetProcess()->GetHandle())) {
       render_widget_host_->GetProcess()->ReceivedBadMessage();
       return;
     }
 
@@ skipping 334 matching lines @@
   RenderWidgetHostImpl::AcknowledgeBufferPresent(pending_swap_ack_->route_id,
                                                  pending_swap_ack_->gpu_host_id,
                                                  ack_params);
   pending_swap_ack_.reset();
 }
 
 void RenderWidgetHostViewMac::PauseForPendingResizeOrRepaintsAndDraw() {
   if (!render_widget_host_ || render_widget_host_->is_hidden())
     return;
 
+  // Synchronized resizing does not yet work with browser compositor.
+  // http://crbug.com/388005
+  if (delegated_frame_host_)
+    return;
+
   // Pausing for the overlay/underlay view prevents the other one from receiving
   // frames. This may lead to large delays, causing overlaps.
   // See crbug.com/352020.
   if (underlay_view_ || overlay_view_)
     return;
 
   // Ensure that all frames are acked before waiting for a frame to come in.
   // Note that we will draw a frame at the end of this function, so it is safe
   // to ack a never-drawn frame here.
   SendPendingSwapAck();
 
   // Wait for a frame of the right size to come in.
-  is_paused_for_resize_or_repaint_ = true;
   render_widget_host_->PauseForPendingResizeOrRepaints();
-  is_paused_for_resize_or_repaint_ = false;
 
   // Immediately draw any frames that haven't been drawn yet. This is necessary
   // to keep the window and the window's contents in sync.
   [cocoa_view_ displayIfNeeded];
   [software_layer_ displayIfNeeded];
   [compositing_iosurface_layer_ displayIfNeeded];
 }
 
 void RenderWidgetHostViewMac::LayoutLayers() {
   if (delegated_frame_host_) {
@@ skipping 1734 matching lines @@
 
 // "-webkit-app-region: drag | no-drag" is implemented on Mac by excluding
 // regions that are not draggable. (See ControlRegionView in
 // native_app_window_cocoa.mm). This requires the render host view to be
 // draggable by default.
 - (BOOL)mouseDownCanMoveWindow {
   return YES;
 }
 
 @end