Revert 171569 as it broke some browser_tests on win_aura.

content/common/gpu/image_transport_surface.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.
 
 #if defined(ENABLE_GPU)
 
 #include "content/common/gpu/image_transport_surface.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
 #include "content/common/gpu/gpu_channel.h"
 #include "content/common/gpu/gpu_channel_manager.h"
 #include "content/common/gpu/gpu_command_buffer_stub.h"
 #include "content/common/gpu/gpu_messages.h"
 #include "gpu/command_buffer/service/gpu_scheduler.h"
 #include "ui/gl/gl_switches.h"
 #include "ui/gl/gl_implementation.h"
 
 namespace content {
 
 ImageTransportSurface::ImageTransportSurface() {}
 
 ImageTransportSurface::~ImageTransportSurface() {}
 
+void ImageTransportSurface::OnSetFrontSurfaceIsProtected(
+    bool is_protected, uint32 protection_state_id) {
+}
+
 void ImageTransportSurface::GetRegionsToCopy(
     const gfx::Rect& previous_damage_rect,
     const gfx::Rect& new_damage_rect,
     std::vector<gfx::Rect>* regions) {
   gfx::Rect intersection =
       gfx::IntersectRects(previous_damage_rect, new_damage_rect);
 
   if (intersection.IsEmpty()) {
     regions->push_back(previous_damage_rect);
     return;
@@ skipping 52 matching lines @@
   return true;
 }
 
 void ImageTransportHelper::Destroy() {}
 
 bool ImageTransportHelper::OnMessageReceived(const IPC::Message& message) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(ImageTransportHelper, message)
     IPC_MESSAGE_HANDLER(AcceleratedSurfaceMsg_BufferPresented,
                         OnBufferPresented)
+    IPC_MESSAGE_HANDLER(AcceleratedSurfaceMsg_SetFrontSurfaceIsProtected,
+                        OnSetFrontSurfaceIsProtected)
     IPC_MESSAGE_HANDLER(AcceleratedSurfaceMsg_ResizeViewACK, OnResizeViewACK);
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
 void ImageTransportHelper::SendAcceleratedSurfaceNew(
     GpuHostMsg_AcceleratedSurfaceNew_Params params) {
   params.surface_id = stub_->surface_id();
   params.route_id = route_id_;
@@ skipping 90 matching lines @@
     return NULL;
   return stub_->scheduler();
 }
 
 gpu::gles2::GLES2Decoder* ImageTransportHelper::Decoder() {
   if (!stub_.get())
     return NULL;
   return stub_->decoder();
 }
 
-void ImageTransportHelper::OnBufferPresented(uint64 surface_handle,
+void ImageTransportHelper::OnSetFrontSurfaceIsProtected(
+    bool is_protected, uint32 protection_state_id) {
+  surface_->OnSetFrontSurfaceIsProtected(is_protected, protection_state_id);
+}
+
+void ImageTransportHelper::OnBufferPresented(bool presented,
                                              uint32 sync_point) {
-  surface_->OnBufferPresented(surface_handle, sync_point);
+  surface_->OnBufferPresented(presented, sync_point);
 }
 
 void ImageTransportHelper::OnResizeViewACK() {
   surface_->OnResizeViewACK();
 }
 
 void ImageTransportHelper::Resize(gfx::Size size) {
   // On windows, the surface is recreated and, in case the newly allocated
   // surface happens to have the same address, it should be invalidated on the
   // decoder so that future calls to MakeCurrent do not early out on the
@@ skipping 82 matching lines @@
 
 bool PassThroughImageTransportSurface::OnMakeCurrent(gfx::GLContext* context) {
   if (!did_set_swap_interval_) {
     ImageTransportHelper::SetSwapInterval(context);
     did_set_swap_interval_ = true;
   }
   return true;
 }
 
 void PassThroughImageTransportSurface::OnBufferPresented(
-    uint64 /* surface_handle */,
+    bool /* presented */,
     uint32 /* sync_point */) {
   DCHECK(transport_);
   helper_->SetScheduled(true);
 }
 
 void PassThroughImageTransportSurface::OnResizeViewACK() {
   DCHECK(transport_);
   Resize(new_size_);
 
   helper_->SetScheduled(true);
@@ skipping 18 matching lines @@
 
 void PassThroughImageTransportSurface::SendVSyncUpdateIfAvailable() {
   GetVSyncParameters(
       base::Bind(&ImageTransportHelper::SendUpdateVSyncParameters,
                  helper_->AsWeakPtr()));
 }
 
 }  // namespace content
 
 #endif  // defined(ENABLE_GPU)