Remove GLImage::Destroy().

ui/accelerated_widget_mac/ca_layer_tree_unittest_mac.mm

 // Copyright 2016 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 <AVFoundation/AVFoundation.h>
 #include <memory>
 
 #include "base/mac/sdk_forward_declarations.h"
 #include "gpu/GLES2/gl2extchromium.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/gtest_mac.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/accelerated_widget_mac/ca_renderer_layer_tree.h"
 #include "ui/gfx/geometry/dip_util.h"
 #include "ui/gfx/mac/io_surface.h"
 #include "ui/gl/ca_renderer_layer_params.h"
 #include "ui/gl/gl_image_io_surface.h"
 
 namespace gpu {
 
 namespace {
 
 struct CALayerProperties {
   CALayerProperties() {}
-  ~CALayerProperties() {
-    if (gl_image)
-      gl_image->Destroy(true);
-  }
+  ~CALayerProperties() {}
 
   bool is_clipped = true;
   gfx::Rect clip_rect;
   int sorting_context_id = 0;
   gfx::Transform transform;
   gfx::RectF contents_rect = gfx::RectF(0.0f, 0.0f, 1.0f, 1.0f);
   gfx::Rect rect = gfx::Rect(0, 0, 256, 256);
   unsigned background_color = SkColorSetARGB(0xFF, 0xFF, 0xFF, 0xFF);
   unsigned edge_aa_mask = 0;
   float opacity = 1.0f;
@@ skipping 222 matching lines @@
                 [[clip_and_sorting_layer sublayers] objectAtIndex:0]);
       EXPECT_EQ(1u, [[transform_layer sublayers] count]);
       EXPECT_EQ(content_layer, [[transform_layer sublayers] objectAtIndex:0]);
 
       // Validate the content layer. Note that top and bottom edges flip.
       EXPECT_EQ(kCALayerBottomEdge, [content_layer edgeAntialiasingMask]);
     }
 
     // Change the contents and commit.
     {
-      properties.gl_image->Destroy(true);
       properties.gl_image = nullptr;
       UpdateCALayerTree(ca_layer_tree, &properties, superlayer_);
 
       // Validate the tree structure.
       EXPECT_EQ(1u, [[superlayer_ sublayers] count]);
       EXPECT_EQ(root_layer, [[superlayer_ sublayers] objectAtIndex:0]);
       EXPECT_EQ(1u, [[root_layer sublayers] count]);
       EXPECT_EQ(clip_and_sorting_layer,
                 [[root_layer sublayers] objectAtIndex:0]);
       EXPECT_EQ(1u, [[clip_and_sorting_layer sublayers] count]);
@@ skipping 180 matching lines @@
                                        properties.rect.origin()),
                 gfx::Point([content_layer position]));
       EXPECT_EQ(gfx::ConvertRectToDIP(properties.scale_factor,
                                       gfx::Rect(properties.rect.size())),
                 gfx::Rect([content_layer bounds]));
       EXPECT_EQ(kCALayerBottomEdge, [content_layer edgeAntialiasingMask]);
       EXPECT_EQ(properties.opacity, [content_layer opacity]);
       if ([content_layer respondsToSelector:(@selector(contentsScale))])
         EXPECT_EQ(properties.scale_factor, [content_layer contentsScale]);
     }
-
-    properties.gl_image->Destroy(true);
   }
 };
 
 TEST_F(CALayerTreePropertyUpdatesTest, AllowSolidColors) {
   RunTest(true);
 }
 
 TEST_F(CALayerTreePropertyUpdatesTest, DisallowSolidColors) {
   RunTest(false);
 }
@@ skipping 78 matching lines @@
   EXPECT_EQ(static_cast<id>(gl_images[0]->io_surface().get()),
             [content_layer_0 contents]);
   EXPECT_EQ(static_cast<id>(gl_images[1]->io_surface().get()),
             [content_layer_1 contents]);
   EXPECT_EQ(static_cast<id>(gl_images[2]->io_surface().get()),
             [content_layer_2 contents]);
   EXPECT_EQ(static_cast<id>(gl_images[3]->io_surface().get()),
             [content_layer_3 contents]);
   EXPECT_EQ(static_cast<id>(gl_images[4]->io_surface().get()),
             [content_layer_4 contents]);
-
-  for (size_t i = 0; i < 5; ++i)
-    gl_images[i]->Destroy(true);
 }
 
 // Verify that sorting contexts are allocated appropriately.
 TEST_F(CALayerTreeTest, SortingContexts) {
   CALayerProperties properties;
   properties.is_clipped = false;
   properties.clip_rect = gfx::Rect();
   properties.rect = gfx::Rect(0, 0, 256, 256);
 
   // We'll use the IOSurface contents to identify the content layers.
@@ skipping 46 matching lines @@
   EXPECT_EQ(1u, [[transform_layer_2 sublayers] count]);
   CALayer* content_layer_2 = [[transform_layer_2 sublayers] objectAtIndex:0];
 
   // Validate that the layers come out in order.
   EXPECT_EQ(static_cast<id>(gl_images[0]->io_surface().get()),
             [content_layer_0 contents]);
   EXPECT_EQ(static_cast<id>(gl_images[1]->io_surface().get()),
             [content_layer_1 contents]);
   EXPECT_EQ(static_cast<id>(gl_images[2]->io_surface().get()),
             [content_layer_2 contents]);
-
-  for (size_t i = 0; i < 3; ++i)
-    gl_images[i]->Destroy(true);
 }
 
 // Verify that sorting contexts must all have the same clipping properties.
 TEST_F(CALayerTreeTest, SortingContextMustHaveConsistentClip) {
   CALayerProperties properties;
 
   // Vary the clipping parameters within sorting contexts.
   bool is_clippeds[3] = { true, true, false};
   gfx::Rect clip_rects[3] = {
       gfx::Rect(0, 0, 16, 16),
@@ skipping 63 matching lines @@
     EXPECT_EQ(1u, [[clip_and_sorting_layer sublayers] count]);
     transform_layer = [[clip_and_sorting_layer sublayers] objectAtIndex:0];
     EXPECT_EQ(1u, [[transform_layer sublayers] count]);
     content_layer1 = [[transform_layer sublayers] objectAtIndex:0];
 
     // Validate the content layer.
     EXPECT_FALSE([content_layer1
         isKindOfClass:NSClassFromString(@"AVSampleBufferDisplayLayer")]);
   }
 
-  properties.gl_image->Destroy(true);
   properties.gl_image = CreateGLImage(
       gfx::Size(256, 256), gfx::BufferFormat::YUV_420_BIPLANAR, false);
 
   // Pass another frame. This will automatically create a CVPixelBuffer
   // behind the scenes, because the underlying buffer is YUV 420.
   {
     UpdateCALayerTree(ca_layer_tree, &properties, superlayer_);
 
     // Validate the tree structure.
     EXPECT_EQ(1u, [[superlayer_ sublayers] count]);
     root_layer = [[superlayer_ sublayers] objectAtIndex:0];
     EXPECT_EQ(1u, [[root_layer sublayers] count]);
     clip_and_sorting_layer = [[root_layer sublayers] objectAtIndex:0];
     EXPECT_EQ(1u, [[clip_and_sorting_layer sublayers] count]);
     transform_layer = [[clip_and_sorting_layer sublayers] objectAtIndex:0];
     EXPECT_EQ(1u, [[transform_layer sublayers] count]);
     content_layer2 = [[transform_layer sublayers] objectAtIndex:0];
 
     // Validate the content layer.
     EXPECT_TRUE([content_layer2
         isKindOfClass:NSClassFromString(@"AVSampleBufferDisplayLayer")]);
     EXPECT_NE(content_layer2, content_layer1);
   }
 
-  properties.gl_image->Destroy(true);
   properties.gl_image = CreateGLImage(
       gfx::Size(256, 256), gfx::BufferFormat::YUV_420_BIPLANAR, true);
 
   // Pass a frame with a CVPixelBuffer.
   {
     UpdateCALayerTree(ca_layer_tree, &properties, superlayer_);
 
     // Validate the tree structure.
     EXPECT_EQ(1u, [[superlayer_ sublayers] count]);
     root_layer = [[superlayer_ sublayers] objectAtIndex:0];
     EXPECT_EQ(1u, [[root_layer sublayers] count]);
     clip_and_sorting_layer = [[root_layer sublayers] objectAtIndex:0];
     EXPECT_EQ(1u, [[clip_and_sorting_layer sublayers] count]);
     transform_layer = [[clip_and_sorting_layer sublayers] objectAtIndex:0];
     EXPECT_EQ(1u, [[transform_layer sublayers] count]);
     content_layer3 = [[transform_layer sublayers] objectAtIndex:0];
 
     // Validate the content layer.
     EXPECT_TRUE([content_layer3
         isKindOfClass:NSClassFromString(@"AVSampleBufferDisplayLayer")]);
     EXPECT_EQ(content_layer3, content_layer2);
   }
 
-  properties.gl_image->Destroy(true);
   properties.gl_image = CreateGLImage(
       gfx::Size(256, 256), gfx::BufferFormat::YUV_420_BIPLANAR, false);
 
   // Pass a frame that is clipped.
   properties.contents_rect = gfx::RectF(0, 0, 1, 0.9);
   {
     UpdateCALayerTree(ca_layer_tree, &properties, superlayer_);
 
     // Validate the tree structure.
     EXPECT_EQ(1u, [[superlayer_ sublayers] count]);
@@ skipping 201 matching lines @@
     CALayer* content_layer = [[transform_layer sublayers] objectAtIndex:0];
 
     // Validate the content layer and fullscreen low power mode.
     EXPECT_TRUE([content_layer
         isKindOfClass:NSClassFromString(@"AVSampleBufferDisplayLayer")]);
     EXPECT_FALSE(fullscreen_low_power_valid);
   }
 }
 
 }  // namespace gpu