Move WebCache memory dump provider to blink for sub-allocation edges.

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

 /*
  * Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com)
  * Copyright (C) 2004, 2005, 2006, 2008 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 17 matching lines @@
 #include "platform/graphics/BitmapImage.h"
 
 #include "platform/PlatformInstrumentation.h"
 #include "platform/Timer.h"
 #include "platform/TraceEvent.h"
 #include "platform/geometry/FloatRect.h"
 #include "platform/graphics/DeferredImageDecoder.h"
 #include "platform/graphics/ImageObserver.h"
 #include "platform/graphics/StaticBitmapImage.h"
 #include "platform/graphics/skia/SkiaUtils.h"
+#include "public/platform/WebProcessMemoryDump.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "wtf/PassRefPtr.h"
 #include "wtf/text/WTFString.h"
 
 namespace blink {
 
 PassRefPtr<BitmapImage> BitmapImage::createWithOrientationForTesting(const SkBitmap& bitmap, ImageOrientation orientation)
 {
     if (bitmap.isNull()) {
         return BitmapImage::create();
@@ skipping 15 matching lines @@
     , m_desiredFrameStartTime(0)
     , m_frameCount(0)
     , m_animationPolicy(ImageAnimationPolicyAllowed)
     , m_animationFinished(false)
     , m_allDataReceived(false)
     , m_haveSize(false)
     , m_sizeAvailable(false)
     , m_hasUniformFrameSize(true)
     , m_haveFrameCount(false)
 {
+    Platform::current()->registerMemoryDumpProvider(this);
 }
 
 BitmapImage::BitmapImage(const SkBitmap& bitmap, ImageObserver* observer)
     : Image(observer)
     , m_size(bitmap.width(), bitmap.height())
     , m_currentFrame(0)
     , m_repetitionCount(cAnimationNone)
     , m_repetitionCountStatus(Unknown)
     , m_repetitionsComplete(0)
     , m_frameCount(1)
     , m_animationPolicy(ImageAnimationPolicyAllowed)
     , m_animationFinished(true)
     , m_allDataReceived(true)
     , m_haveSize(true)
     , m_sizeAvailable(true)
     , m_haveFrameCount(true)
 {
     // Since we don't have a decoder, we can't figure out the image orientation.
     // Set m_sizeRespectingOrientation to be the same as m_size so it's not 0x0.
     m_sizeRespectingOrientation = m_size;
 
     m_frames.grow(1);
     m_frames[0].m_hasAlpha = !bitmap.isOpaque();
     m_frames[0].m_frame = adoptRef(SkImage::NewFromBitmap(bitmap));
     m_frames[0].m_haveMetadata = true;
+    Platform::current()->registerMemoryDumpProvider(this);
 }
 
 BitmapImage::~BitmapImage()
 {
+    Platform::current()->unregisterMemoryDumpProvider(this);
     stopAnimation();
 }
 
 bool BitmapImage::isBitmapImage() const
 {
     return true;
 }
 
 bool BitmapImage::currentFrameHasSingleSecurityOrigin() const
 {
@@ skipping 337 matching lines @@
 {
     RefPtr<SkImage> image = frameAtIndex(currentFrame());
     return image && image->isLazyGenerated();
 }
 
 ImageOrientation BitmapImage::currentFrameOrientation()
 {
     return frameOrientationAtIndex(currentFrame());
 }
 
+bool BitmapImage::onMemoryDump(WebMemoryDumpLevelOfDetail levelOfDetail, WebProcessMemoryDump* memoryDump)
+{
+    String prefix("web_cache/images/decoded/");
+    SkTraceMemoryDump* dump = memoryDump->CreateSkiaTraceMemoryDump(prefix);
+    ASSERT(dump);
+    for (size_t i = 0; i < m_frames.size(); ++i) {
+        if (m_frames[i].m_frame)
+            m_frames[i].m_frame->dumpMemoryStatistics(dump);
+    }
+    return true;
+}
+
 ImageOrientation BitmapImage::frameOrientationAtIndex(size_t index)
 {
     if (m_frames.size() <= index)
         return DefaultImageOrientation;
 
     if (m_frames[index].m_haveMetadata)
         return m_frames[index].m_orientation;
 
     return m_source.orientationAtIndex(index);
 }
@@ skipping 194 matching lines @@
     destroyDecodedDataIfNecessary();
 
     // We need to draw this frame if we advanced to it while not skipping, or if
     // while trying to skip frames we hit the last frame and thus had to stop.
     if (skippingFrames != advancedAnimation)
         imageObserver()->animationAdvanced(this);
     return advancedAnimation;
 }
 
 } // namespace blink