Revert 261972 "Revert 261817 "cc: Remove all usage of GetArea() ..."

r261817 falsely accused! Reverting the revert, sorry for the noise.

> Revert 261817 "cc: Remove all usage of GetArea() from production..."
> 
> Suspected of causing failures on Linux CrOS ASan LSan:
> 
> http://build.chromium.org/p/chromium.memory/builders/Linux%20Chromium%20OS%20ASan%2BLSan%20Tests%20%283%29/builds/702
> 
> http://build.chromium.org/p/chromium.memory/builders/Linux%20Chromium%20OS%20ASan%2BLSan%20Tests%20%282%29/builds/664
> 
> http://build.chromium.org/p/chromium.memory/builders/Linux%20Chromium%20OS%20ASan%2BLSan%20Tests%20%281%29/builds/702
> 
> 
> > cc: Remove all usage of GetArea() from production code in cc
> > 
> > Consolidate the calls to turn gfx::Size into a number of bytes onto
> > the cc::SharedBitmap class. The class offers the following methods:
> > 1. Get a size_t bytes and bool saying if you overflowed or not.
> > 2. Get a size_t bytes and crash if you overflow.
> > 3. Get a size_t bytes and don't check for overflow.
> > 4. Tell me if the gfx::Size would overflow to create the size_t bytes.
> > 
> > These were the use cases I found in the existing code, plus the
> > addition of case 2. A few places that were finding the size_t bytes
> > without looking for overflow (case 3), from a previously-unchecked
> > gfx::Size, were changed to crash on overflow instead (case 2).
> > 
> > R=jbauman@chromium.org, piman@chromium.org
> > BUG=348332
> > 
> > Review URL: https://codereview.chromium.org/221523003
> 
> TBR=danakj@chromium.org
> 
> Review URL: https://codereview.chromium.org/226693005

TBR=scottmg@chromium.org, danakj@chromium.org

Review URL: https://codereview.chromium.org/226693007

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@262022 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 1 insertions, 1 deletions

diff --git a/content/child/child_shared_bitmap_manager.cc b/content/child/child_shared_bitmap_manager.cc
index 7325789..3b1800d 100644
--- a/content/child/child_shared_bitmap_manager.cc
+++ b/content/child/child_shared_bitmap_manager.cc
@@ -25,7 +25,7 @@ scoped_ptr<cc::SharedBitmap> ChildSharedBitmapManager::AllocateSharedBitmap(
                "height",
                size.height());
   size_t memory_size;
-  if (!cc::SharedBitmap::GetSizeInBytes(size, &memory_size))
+  if (!cc::SharedBitmap::SizeInBytes(size, &memory_size))
     return scoped_ptr<cc::SharedBitmap>();
   cc::SharedBitmapId id = cc::SharedBitmap::GenerateId();
   scoped_ptr<base::SharedMemory> memory;