[Oilpan] Unify memory usage reporters of Oilpan

third_party/WebKit/Source/platform/graphics/ImagePattern.cpp

 // Copyright 2014 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 "platform/graphics/ImagePattern.h"
 
 #include "platform/graphics/Image.h"
 #include "platform/graphics/skia/SkiaUtils.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkImage.h"
 #include "third_party/skia/include/core/SkShader.h"
 #include "third_party/skia/include/core/SkSurface.h"
 
 namespace blink {
 
 PassRefPtr<ImagePattern> ImagePattern::create(PassRefPtr<Image> image, RepeatMode repeatMode)
 {
     return adoptRef(new ImagePattern(image, repeatMode));
 }
 
 ImagePattern::ImagePattern(PassRefPtr<Image> image, RepeatMode repeatMode)
     : Pattern(repeatMode)
     , m_tileImage(image->imageForCurrentFrame())
 {
-    if (m_tileImage) {
-        // TODO(fmalita): mechanism to extract the actual SkImageInfo from an SkImage?
-        const SkImageInfo info =
-            SkImageInfo::MakeN32Premul(m_tileImage->width(), m_tileImage->height());
-        adjustExternalMemoryAllocated(info.getSafeSize(info.minRowBytes()));

[haraken, 2016/02/04 12:00:29]

You cannot remove this because this explains Skia's memory. In long term, we
might want to report all Skia's allocations and then remove
AdjustAmountOfMemory() for Skia's memory but that's out of the scope of this CL.

[peria, 2016/02/08 08:41:10]

Done.

-    }
 }
 
 PassRefPtr<SkShader> ImagePattern::createShader()
 {
     if (!m_tileImage)
         return adoptRef(SkShader::CreateColorShader(SK_ColorTRANSPARENT));
 
     SkMatrix localMatrix = affineTransformToSkMatrix(m_patternSpaceTransformation);
 
     if (isRepeatXY()) {
@@ skipping 30 matching lines @@
 
     return adoptRef(expandedImage->newShader(tileModeX, tileModeY, &localMatrix));
 }
 
 bool ImagePattern::isTextureBacked() const
 {
     return m_tileImage && m_tileImage->isTextureBacked();
 }
 
 } // namespace blink