ImagePixelLocker now manually allocates SkPixmap

third_party/WebKit/Source/platform/graphics/skia/ImagePixelLocker.h

 // Copyright 2015 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.
 
 #ifndef ImagePixelLocker_h
 #define ImagePixelLocker_h
 
 #include "platform/heap/Heap.h"
 #include "third_party/skia/include/core/SkImageInfo.h"
 #include "third_party/skia/include/core/SkPixmap.h"
 #include "wtf/Allocator.h"
 #include "wtf/Noncopyable.h"
 #include "wtf/PassRefPtr.h"
 #include "wtf/RefPtr.h"
 
 class SkImage;
 
 namespace blink {
 
 class ImagePixelLocker final {
     DISALLOW_NEW_EXCEPT_PLACEMENT_NEW();
     WTF_MAKE_NONCOPYABLE(ImagePixelLocker);
 public:
     ImagePixelLocker(PassRefPtr<const SkImage>, SkAlphaType, SkColorType);
+    ~ImagePixelLocker();
 
     const void* pixels() const { return m_pixels; }
 
 private:
     const RefPtr<const SkImage> m_image;
     const void* m_pixels;
-    SkAutoPixmapStorage m_pixelStorage;
+    SkPixmap m_pixelStorage;

[f(malita), 2016/03/16 19:28:29]

Let's rename this to m_pixmap.

[robertphillips, 2016/03/16 19:59:10]

It is actually back to being more of a pure pixel storage object now.

 };
 
 } // namespace blink
 
 #endif