Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / platform / graphics / test / MockDiscardablePixelRef.h

diff --git a/src/third_party/WebKit/Source/platform/graphics/test/MockDiscardablePixelRef.h b/src/third_party/WebKit/Source/platform/graphics/test/MockDiscardablePixelRef.h
index e9109cb..ec1b71f 100644 (file)
--- a/src/third_party/WebKit/Source/platform/graphics/test/MockDiscardablePixelRef.h
+++ b/src/third_party/WebKit/Source/platform/graphics/test/MockDiscardablePixelRef.h
@@ -32,8 +32,9 @@ namespace WebCore {
 
 class MockDiscardablePixelRef : public SkPixelRef {
 public:
-    MockDiscardablePixelRef(const SkImageInfo& info)
+    MockDiscardablePixelRef(const SkImageInfo& info, size_t rowbytes)
         : SkPixelRef(info)
+        , m_rowBytes(rowbytes)
         , discarded(false)
     {
         setURI("discardable");
@@ -54,7 +55,7 @@ public:
             if (!dst->asImageInfo(&info)) {
                 return false;
             }
-            SkAutoTUnref<SkPixelRef> pr(new MockDiscardablePixelRef(info));
+            SkAutoTUnref<SkPixelRef> pr(new MockDiscardablePixelRef(info, dst->rowBytes()));
             dst->setPixelRef(pr);
             return true;
         }
@@ -63,17 +64,6 @@ public:
     SK_DECLARE_UNFLATTENABLE_OBJECT()
 
 protected:
-    // SkPixelRef implementation.
-#ifdef SK_SUPPORT_LEGACY_ONLOCKPIXELS
-    virtual void* onLockPixels(SkColorTable**)
-    {
-        if (discarded)
-            return 0;
-        m_lockedMemory = &discarded;
-        return m_lockedMemory;
-    }
-#endif
-
     virtual bool onNewLockPixels(LockRec* rec)
     {
         if (discarded)
@@ -81,7 +71,7 @@ protected:
         m_lockedMemory = &discarded;
         rec->fPixels = m_lockedMemory;
         rec->fColorTable = 0;
-        rec->fRowBytes = 1;
+        rec->fRowBytes = m_rowBytes;
         return true;
     }
 
@@ -92,6 +82,7 @@ protected:
 
 private:
     void* m_lockedMemory;
+    size_t m_rowBytes;
     bool discarded;
 };