Changeset 62812 in webkit
- Timestamp:
- Jul 8, 2010 11:46:08 AM (14 years ago)
- Location:
- trunk/WebKit/chromium
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebKit/chromium/ChangeLog
r62791 r62812 1 2010-07-08 Vitaly Repeshko <vitalyr@chromium.org> 2 3 Reviewed by Pavel Feldman. 4 5 [chromium] Fix deletion has begun assertion in TestImage destructor. 6 https://bugs.webkit.org/show_bug.cgi?id=41883 7 8 * tests/DragImageTest.cpp: 9 (WebCore::TestImage::create): 10 (WebCore::TEST): 11 1 12 2010-07-08 Vitaly Repeshko <vitalyr@chromium.org> 2 13 -
trunk/WebKit/chromium/tests/DragImageTest.cpp
r58641 r62812 43 43 class TestImage : public Image { 44 44 public: 45 46 static PassRefPtr<TestImage> create(const IntSize& size) 47 { 48 return adoptRef(new TestImage(size)); 49 } 45 50 46 51 explicit TestImage(const IntSize& size) … … 109 114 TEST(DragImageTest, NonNullHandling) 110 115 { 111 TestImage testImage(IntSize(2, 2));112 DragImageRef dragImage = createDragImageFromImage( &testImage);116 RefPtr<TestImage> testImage(TestImage::create(IntSize(2, 2))); 117 DragImageRef dragImage = createDragImageFromImage(testImage.get()); 113 118 ASSERT_TRUE(dragImage); 114 119 … … 130 135 // Tests that the DrageImage implementation doesn't choke on null values 131 136 // of nativeImageForCurrentFrame(). 132 TestImage testImage((IntSize()));133 EXPECT_FALSE(createDragImageFromImage( &testImage));137 RefPtr<TestImage> testImage(TestImage::create(IntSize())); 138 EXPECT_FALSE(createDragImageFromImage(testImage.get())); 134 139 } 135 140 136 141 { 137 142 // Tests that the drag image is a deep copy. 138 TestImage testImage(IntSize(1, 1));139 DragImageRef dragImage = createDragImageFromImage( &testImage);143 RefPtr<TestImage> testImage(TestImage::create(IntSize(1, 1))); 144 DragImageRef dragImage = createDragImageFromImage(testImage.get()); 140 145 ASSERT_TRUE(dragImage); 141 SkAutoLockPixels lock1(*dragImage), lock2(* testImage.nativeImageForCurrentFrame());142 EXPECT_NE(dragImage->getPixels(), testImage .nativeImageForCurrentFrame()->getPixels());146 SkAutoLockPixels lock1(*dragImage), lock2(*(testImage->nativeImageForCurrentFrame())); 147 EXPECT_NE(dragImage->getPixels(), testImage->nativeImageForCurrentFrame()->getPixels()); 143 148 } 144 149 }
Note: See TracChangeset
for help on using the changeset viewer.