Changeset 62812 in webkit

Timestamp:

Jul 8, 2010 11:46:08 AM (14 years ago)

Author:

vitalyr@chromium.org

Message:

2010-07-08 Vitaly Repeshko <​vitalyr@chromium.org>

Reviewed by Pavel Feldman.

[chromium] Fix deletion has begun assertion in TestImage destructor.
​https://bugs.webkit.org/show_bug.cgi?id=41883

• tests/DragImageTest.cpp: (WebCore::TestImage::create): (WebCore::TEST):

Location:

trunk/WebKit/chromium

Files:

• ChangeLog (modified) (1 diff)
• tests/DragImageTest.cpp (modified) (3 diffs)

trunk/WebKit/chromium/ChangeLog

@@ +1 @@
+2010-07-08  Vitaly Repeshko  <vitalyr@chromium.org>
+
+        Reviewed by Pavel Feldman.
+
+        [chromium] Fix deletion has begun assertion in TestImage destructor.
+        https://bugs.webkit.org/show_bug.cgi?id=41883
+
+        * tests/DragImageTest.cpp:
+        (WebCore::TestImage::create):
+        (WebCore::TEST):
+
 2010-07-08  Vitaly Repeshko  <vitalyr@chromium.org>
 

trunk/WebKit/chromium/tests/DragImageTest.cpp

@@ -43 +43 @@
 class TestImage : public Image {
 public:
+
+    static PassRefPtr<TestImage> create(const IntSize& size)
+    {
+        return adoptRef(new TestImage(size));
+    }
 
     explicit TestImage(const IntSize& size)
@@ -109 +114 @@
 TEST(DragImageTest, NonNullHandling)
 {
-    TestImage testImage(IntSize(2, 2));
-    DragImageRef dragImage = createDragImageFromImage(&testImage);
+    RefPtr<TestImage> testImage(TestImage::create(IntSize(2, 2)));
+    DragImageRef dragImage = createDragImageFromImage(testImage.get());
     ASSERT_TRUE(dragImage);
 
@@ -130 +135 @@
         // Tests that the DrageImage implementation doesn't choke on null values
         // of nativeImageForCurrentFrame().
-        TestImage testImage((IntSize()));
-        EXPECT_FALSE(createDragImageFromImage(&testImage));
+        RefPtr<TestImage> testImage(TestImage::create(IntSize()));
+        EXPECT_FALSE(createDragImageFromImage(testImage.get()));
     }
 
     {
         // Tests that the drag image is a deep copy.
-        TestImage testImage(IntSize(1, 1));
-        DragImageRef dragImage = createDragImageFromImage(&testImage);
+        RefPtr<TestImage> testImage(TestImage::create(IntSize(1, 1)));
+        DragImageRef dragImage = createDragImageFromImage(testImage.get());
         ASSERT_TRUE(dragImage);
-        SkAutoLockPixels lock1(*dragImage), lock2(*testImage.nativeImageForCurrentFrame());
-        EXPECT_NE(dragImage->getPixels(), testImage.nativeImageForCurrentFrame()->getPixels());
+        SkAutoLockPixels lock1(*dragImage), lock2(*(testImage->nativeImageForCurrentFrame()));
+        EXPECT_NE(dragImage->getPixels(), testImage->nativeImageForCurrentFrame()->getPixels());
     }
 }