Make sure natural_size is set when a frame is cropped.

media/base/video_frame_unittest.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.
 
 #include "media/base/video_frame.h"
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/format_macros.h"
 #include "base/memory/aligned_memory.h"
@@ skipping 199 matching lines @@
   const int kWidth = 4;
   const int kHeight = 4;
   scoped_refptr<media::VideoFrame> frame;
   bool no_longer_needed_triggered = false;
   {
     scoped_refptr<media::VideoFrame> wrapped_frame =
         VideoFrame::CreateBlackFrame(gfx::Size(kWidth, kHeight));
     ASSERT_TRUE(wrapped_frame.get());
 
     gfx::Rect visible_rect(1, 1, 1, 1);
+    gfx::Size natural_size = visible_rect.size();
     frame = media::VideoFrame::WrapVideoFrame(
-        wrapped_frame, visible_rect,
+        wrapped_frame, visible_rect, natural_size,
         base::Bind(&FrameNoLongerNeededCallback, wrapped_frame,
                    &no_longer_needed_triggered));
     EXPECT_EQ(wrapped_frame->coded_size(), frame->coded_size());
     EXPECT_EQ(wrapped_frame->data(media::VideoFrame::kYPlane),
               frame->data(media::VideoFrame::kYPlane));
     EXPECT_NE(wrapped_frame->visible_rect(), frame->visible_rect());
     EXPECT_EQ(visible_rect, frame->visible_rect());
+    EXPECT_NE(wrapped_frame->natural_size(), frame->natural_size());
+    EXPECT_EQ(natural_size, frame->natural_size());
   }
 
   EXPECT_FALSE(no_longer_needed_triggered);
   frame = NULL;
   EXPECT_TRUE(no_longer_needed_triggered);
 }
 
 // Ensure each frame is properly sized and allocated.  Will trigger OOB reads
 // and writes as well as incorrect frame hashes otherwise.
 TEST(VideoFrame, CheckFrameExtents) {
@@ skipping 59 matching lines @@
     EXPECT_EQ(sync_point, mailbox_holder->sync_point);
 
     // Finish using the mailbox_holder and drop our reference.
     sync_point = 10;
     mailbox_holder->sync_point = sync_point;
   }
   EXPECT_EQ(sync_point, called_sync_point);
 }
 
 }  // namespace media