Revert 278472 "DevTools: Fix for Page.captureScreenshot"

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 2051 matching lines @@
   // calls to setNeedsDisplay and wait for their resulting display calls,
   // before reporting that the frame has reached the screen.
   bool should_defer = false;
   for (size_t i = 0; i < latency_info.size(); i++) {
     if (latency_info[i].FindLatency(
             ui::WINDOW_SNAPSHOT_FRAME_NUMBER_COMPONENT,
             render_widget_host_->GetLatencyComponentId(),
             NULL)) {
       should_defer = true;
     }
-    if (latency_info[i].FindLatency(
-            ui::WINDOW_OLD_SNAPSHOT_FRAME_NUMBER_COMPONENT,
-            render_widget_host_->GetLatencyComponentId(),
-            NULL)) {
-      should_defer = true;
-    }
   }
   if (should_defer) {
     // Multiple pending screenshot requests will work, but if every frame
     // requests a screenshot, then the delay will never expire. Assert this
     // here to avoid this.
     CHECK_EQ(pending_latency_info_delay_, 0u);
     // Wait a fixed number of frames (calls to CALayer::display) before
     // claiming that the screenshot has reached the screen. This number
     // comes from taking the first number where tests didn't fail (six),
     // and doubling it.
@@ skipping 24 matching lines @@
 
 void RenderWidgetHostViewMac::TickPendingLatencyInfoDelay() {
   if (compositing_iosurface_layer_) {
     // Keep calling gotNewFrame in a loop until enough display calls come in.
     // Each call will be separated by about a vsync.
     base::MessageLoop::current()->PostTask(
         FROM_HERE,
         base::Bind(&RenderWidgetHostViewMac::TickPendingLatencyInfoDelay,
                    pending_latency_info_delay_weak_ptr_factory_.GetWeakPtr()));
     [compositing_iosurface_layer_ gotNewFrame];
-  } else {
+  }
+  if (software_layer_) {
     // In software mode there is not an explicit setNeedsDisplay/display loop,
     // so just wait a pretend-vsync at 60 Hz.
     base::MessageLoop::current()->PostDelayedTask(
         FROM_HERE,
         base::Bind(&RenderWidgetHostViewMac::TickPendingLatencyInfoDelay,
                    pending_latency_info_delay_weak_ptr_factory_.GetWeakPtr()),
         base::TimeDelta::FromMilliseconds(1000/60));
     SendPendingLatencyInfoToHost();
   }
 }
@@ skipping 1801 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