DrawingBuffer cleanup: Merge structures

third_party/WebKit/Source/platform/graphics/gpu/DrawingBufferTest.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 308 matching lines @@
   EXPECT_TRUE(m_drawingBuffer->PrepareTextureMailbox(&textureMailbox,
                                                      &releaseCallback));
   EXPECT_EQ(initialSize, m_gl->mostRecentlyProducedSize());
   EXPECT_TRUE(textureMailbox.is_overlay_candidate());
   testing::Mock::VerifyAndClearExpectations(m_gl);
 
   GLuint m_imageId2 = m_gl->nextImageIdToBeCreated();
   EXPECT_CALL(*m_gl, BindTexImage2DMock(m_imageId2)).Times(1);
   EXPECT_CALL(*m_gl, DestroyImageMock(m_imageId0)).Times(1);
   EXPECT_CALL(*m_gl, ReleaseTexImage2DMock(m_imageId0)).Times(1);
-  EXPECT_CALL(*m_gl, DestroyImageMock(m_imageId1)).Times(1);
-  EXPECT_CALL(*m_gl, ReleaseTexImage2DMock(m_imageId1)).Times(1);
   // Resize to 100x50.
   m_drawingBuffer->reset(alternateSize);
   releaseCallback->Run(gpu::SyncToken(), false /* lostResource */);
   testing::Mock::VerifyAndClearExpectations(m_gl);
 
   GLuint m_imageId3 = m_gl->nextImageIdToBeCreated();
   EXPECT_CALL(*m_gl, BindTexImage2DMock(m_imageId3)).Times(1);
   // Produce a mailbox at this size.
   m_drawingBuffer->markContentsChanged();
+  EXPECT_CALL(*m_gl, DestroyImageMock(m_imageId1)).Times(1);
+  EXPECT_CALL(*m_gl, ReleaseTexImage2DMock(m_imageId1)).Times(1);
   EXPECT_TRUE(m_drawingBuffer->PrepareTextureMailbox(&textureMailbox,
                                                      &releaseCallback));
   EXPECT_EQ(alternateSize, m_gl->mostRecentlyProducedSize());
   EXPECT_TRUE(textureMailbox.is_overlay_candidate());
   testing::Mock::VerifyAndClearExpectations(m_gl);
 
   GLuint m_imageId4 = m_gl->nextImageIdToBeCreated();
   EXPECT_CALL(*m_gl, BindTexImage2DMock(m_imageId4)).Times(1);
   EXPECT_CALL(*m_gl, DestroyImageMock(m_imageId2)).Times(1);
   EXPECT_CALL(*m_gl, ReleaseTexImage2DMock(m_imageId2)).Times(1);
-  EXPECT_CALL(*m_gl, DestroyImageMock(m_imageId3)).Times(1);
-  EXPECT_CALL(*m_gl, ReleaseTexImage2DMock(m_imageId3)).Times(1);
   // Reset to initial size.
   m_drawingBuffer->reset(initialSize);
   releaseCallback->Run(gpu::SyncToken(), false /* lostResource */);
   testing::Mock::VerifyAndClearExpectations(m_gl);
 
   GLuint m_imageId5 = m_gl->nextImageIdToBeCreated();
   EXPECT_CALL(*m_gl, BindTexImage2DMock(m_imageId5)).Times(1);
   // Prepare another mailbox and verify that it's the correct size.
   m_drawingBuffer->markContentsChanged();
+  EXPECT_CALL(*m_gl, DestroyImageMock(m_imageId3)).Times(1);
+  EXPECT_CALL(*m_gl, ReleaseTexImage2DMock(m_imageId3)).Times(1);
   EXPECT_TRUE(m_drawingBuffer->PrepareTextureMailbox(&textureMailbox,
                                                      &releaseCallback));
   EXPECT_EQ(initialSize, m_gl->mostRecentlyProducedSize());
   EXPECT_TRUE(textureMailbox.is_overlay_candidate());
   testing::Mock::VerifyAndClearExpectations(m_gl);
 
   // Prepare one final mailbox and verify that it's the correct size.
   releaseCallback->Run(gpu::SyncToken(), false /* lostResource */);
   m_drawingBuffer->markContentsChanged();
   EXPECT_TRUE(m_drawingBuffer->PrepareTextureMailbox(&textureMailbox,
@@ skipping 218 matching lines @@
   m_drawingBuffer->setIsHidden(true);
   releaseCallback->Run(waitSyncToken, false /* lostResource */);
   // m_drawingBuffer deletes mailbox immediately when hidden.
 
   EXPECT_EQ(waitSyncToken, m_gl->mostRecentlyWaitedSyncToken());
 
   m_drawingBuffer->beginDestruction();
 }
 
 }  // namespace blink