cc: Remove all usage of GetArea() from production code in cc

content/browser/renderer_host/software_frame_manager.cc

 // Copyright 2013 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/renderer_host/software_frame_manager.h"
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/debug/alias.h"
 #include "base/numerics/safe_math.h"
+#include "cc/resources/shared_bitmap.h"
 #include "content/browser/renderer_host/dip_util.h"
 #include "content/public/browser/user_metrics.h"
 
 namespace {
 
 void ReleaseMailbox(scoped_refptr<content::SoftwareFrame> frame,
                     uint32 sync_point,
                     bool lost_resource) {}
 
 }  // namespace
@@ skipping 69 matching lines @@
   scoped_ptr<base::SharedMemory> shared_memory(
       new base::SharedMemory(frame_data->handle, true,
                              process_handle));
 #else
   scoped_ptr<base::SharedMemory> shared_memory(
       new base::SharedMemory(frame_data->handle, true));
 #endif
 
   // The NULL handle is used in testing.
   if (base::SharedMemory::IsHandleValid(shared_memory->handle())) {
-    DCHECK(frame_data->CheckedSizeInBytes().IsValid())
-        << "Integer overflow when computing bytes to map.";
-    size_t size_in_bytes = frame_data->SizeInBytes();
+    DCHECK(cc::SharedBitmap::VerifySizeInBytes(frame_data->size));
+    // UncheckedSizeInBytes is okay because the frame_data size was verified
+    // frame_data was received over IPC.

[piman, 2014/04/03 21:41:20]

nit: missing 'when'?

[danakj, 2014/04/03 21:43:48]

 2014/04/03 21:41:20, piman wrote:
Woops, line wrapping is hard.

+    size_t size_in_bytes =
+        cc::SharedBitmap::UncheckedSizeInBytes(frame_data->size);
 #ifdef OS_WIN
     if (!shared_memory->Map(0)) {
       DLOG(ERROR) << "Unable to map renderer memory.";
       RecordAction(
           base::UserMetricsAction("BadMessageTerminate_SharedMemoryManager1"));
       return false;
     }
 
     if (shared_memory->mapped_size() < size_in_bytes) {
       DLOG(ERROR) << "Shared memory too small for given rectangle";
@@ skipping 87 matching lines @@
 }
 
 void SoftwareFrameManager::EvictCurrentFrame() {
   DCHECK(HasCurrentFrame());
   DiscardCurrentFrame();
   if (client_)
     client_->ReleaseReferencesToSoftwareFrame();
 }
 
 }  // namespace content