Make remote CALayers work with browser compositor on Mac

content/browser/compositor/browser_compositor_view_mac.mm

 // Copyright 2014 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/compositor/browser_compositor_view_mac.h"
 
 #include "base/debug/trace_event.h"
 #include "base/lazy_instance.h"
 #include "content/browser/compositor/browser_compositor_view_private_mac.h"
-#include "content/common/gpu/surface_handle_types_mac.h"
 
 ////////////////////////////////////////////////////////////////////////////////
 // BrowserCompositorViewMac
 
 namespace content {
 namespace {
 
 // The number of placeholder objects allocated. If this reaches zero, then
 // the BrowserCompositorViewMacInternal being held on to for recycling,
 // |g_recyclable_internal_view|, will be freed.
@@ skipping 52 matching lines @@
 }
 
 // static
 void BrowserCompositorViewMac::GotAcceleratedFrame(
     gfx::AcceleratedWidget widget,
     uint64 surface_handle, int surface_id,
     const std::vector<ui::LatencyInfo>& latency_info,
     gfx::Size pixel_size, float scale_factor) {
   BrowserCompositorViewMacInternal* internal_view =
       BrowserCompositorViewMacInternal::FromAcceleratedWidget(widget);
-  if (!internal_view)
-    return;
-  IOSurfaceID io_surface_id = IOSurfaceIDFromSurfaceHandle(surface_handle);
-  internal_view->GotAcceleratedIOSurfaceFrame(
-      io_surface_id, surface_id, latency_info, pixel_size, scale_factor);
+  if (internal_view) {
+    internal_view->GotAcceleratedFrame(
+        surface_handle, surface_id, latency_info, pixel_size, scale_factor);
+  }
 }
 
 // static
 void BrowserCompositorViewMac::GotSoftwareFrame(
     gfx::AcceleratedWidget widget,
     cc::SoftwareFrameData* frame_data, float scale_factor, SkCanvas* canvas) {
   BrowserCompositorViewMacInternal* internal_view =
       BrowserCompositorViewMacInternal::FromAcceleratedWidget(widget);
-  if (!internal_view)
-    return;
-  internal_view->GotSoftwareFrame(frame_data, scale_factor, canvas);
+  if (internal_view)
+    internal_view->GotSoftwareFrame(frame_data, scale_factor, canvas);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // BrowserCompositorViewPlaceholderMac
 
 BrowserCompositorViewPlaceholderMac::BrowserCompositorViewPlaceholderMac() {
   g_placeholder_count += 1;
 }
 
 BrowserCompositorViewPlaceholderMac::~BrowserCompositorViewPlaceholderMac() {
   DCHECK_GT(g_placeholder_count, 0u);
   g_placeholder_count -= 1;
 
   // If there are no placeholders allocated, destroy the recyclable
   // BrowserCompositorViewMacInternal.
   if (!g_placeholder_count)
     g_recyclable_internal_view.Get().reset();
 }
 
 }  // namespace content