Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(398)

Unified Diff: ui/accelerated_widget_mac/ca_layer_tree_unittest_mac.mm

Issue 2449993005: Remove GLImage::Destroy(). (Closed)
Patch Set: One more Destroy() call on Mac. Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/gpu/vt_video_decode_accelerator_mac.cc ('k') | ui/gl/gl_image.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/accelerated_widget_mac/ca_layer_tree_unittest_mac.mm
diff --git a/ui/accelerated_widget_mac/ca_layer_tree_unittest_mac.mm b/ui/accelerated_widget_mac/ca_layer_tree_unittest_mac.mm
index e8cabcd6d9437611691722814e45a0204594e9ed..25023b29dee622aa7013c8864f73a3aa7aab23c2 100644
--- a/ui/accelerated_widget_mac/ca_layer_tree_unittest_mac.mm
+++ b/ui/accelerated_widget_mac/ca_layer_tree_unittest_mac.mm
@@ -22,10 +22,7 @@ namespace {
struct CALayerProperties {
CALayerProperties() {}
- ~CALayerProperties() {
- if (gl_image)
- gl_image->Destroy(true);
- }
+ ~CALayerProperties() {}
bool is_clipped = true;
gfx::Rect clip_rect;
@@ -268,7 +265,6 @@ class CALayerTreePropertyUpdatesTest : public CALayerTreeTest {
// Change the contents and commit.
{
- properties.gl_image->Destroy(true);
properties.gl_image = nullptr;
UpdateCALayerTree(ca_layer_tree, &properties, superlayer_);
@@ -469,8 +465,6 @@ class CALayerTreePropertyUpdatesTest : public CALayerTreeTest {
if ([content_layer respondsToSelector:(@selector(contentsScale))])
EXPECT_EQ(properties.scale_factor, [content_layer contentsScale]);
}
-
- properties.gl_image->Destroy(true);
}
};
@@ -569,9 +563,6 @@ TEST_F(CALayerTreeTest, SplitSortingContextZero) {
[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.
@@ -638,9 +629,6 @@ TEST_F(CALayerTreeTest, SortingContexts) {
[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.
@@ -724,7 +712,6 @@ TEST_F(CALayerTreeTest, AVLayer) {
isKindOfClass:NSClassFromString(@"AVSampleBufferDisplayLayer")]);
}
- properties.gl_image->Destroy(true);
properties.gl_image = CreateGLImage(
gfx::Size(256, 256), gfx::BufferFormat::YUV_420_BIPLANAR, false);
@@ -749,7 +736,6 @@ TEST_F(CALayerTreeTest, AVLayer) {
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);
@@ -773,7 +759,6 @@ TEST_F(CALayerTreeTest, AVLayer) {
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);
« no previous file with comments | « media/gpu/vt_video_decode_accelerator_mac.cc ('k') | ui/gl/gl_image.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698