Move SoftwareFrameData overflow checks to the IPC code.

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"
@@ skipping 79 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())) {
-    base::CheckedNumeric<size_t> size_in_bytes_checked =
-        base::CheckedNumeric<size_t>(4) *
-        base::CheckedNumeric<size_t>(frame_data->size.width()) *
-        base::CheckedNumeric<size_t>(frame_data->size.height());
-    if (!size_in_bytes_checked.IsValid()) {
-      DLOG(ERROR) << "Integer overflow when computing bytes to map.";
-      return false;
-    }
-    size_t size_in_bytes = size_in_bytes_checked.ValueOrDie();
+    DCHECK(frame_data->CheckedSizeInBytes().IsValid())
+        << "Integer overflow when computing bytes to map.";
+    size_t size_in_bytes = frame_data->SizeInBytes();
 #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