Changeset 57888 in webkit

Timestamp:

Apr 20, 2010 6:44:32 AM (14 years ago)

Author:

eric@webkit.org

Message:

2010-04-20 Evan Stade <​estade@chromium.org>

Reviewed by David Levin.

[chromium] crash when dragging images
​https://bugs.webkit.org/show_bug.cgi?id=37715

NULL check the return value of nativeImageForCurrentFrame(),
and NULL check Image just for good measure.

Tested by new DragImageTest unit test.

• platform/chromium/DragImageChromiumSkia.cpp: (WebCore::createDragImageFromImage):

2010-04-20 Evan Stade <​estade@chromium.org>

Reviewed by David Levin.

[chromium] crash when dragging images
​https://bugs.webkit.org/show_bug.cgi?id=37715

Added unit tests for DragImageChromiumSkia.

• WebKit.gyp:
• tests/DragImageTest.cpp: Added. (WebCore::TestImage::TestImage): (WebCore::TestImage::~TestImage): (WebCore::TestImage::size): (WebCore::TestImage::nativeImageForCurrentFrame): (WebCore::TestImage::destroyDecodedData): (WebCore::TestImage::decodedSize): (WebCore::TestImage::draw): (WebCore::TEST):

Location:

trunk

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/chromium/DragImageChromiumSkia.cpp (modified) (1 diff)
• WebKit/chromium/ChangeLog (modified) (1 diff)
• WebKit/chromium/WebKit.gyp (modified) (2 diffs)
• WebKit/chromium/tests/DragImageTest.cpp (added)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-04-20  Evan Stade  <estade@chromium.org>
+
+        Reviewed by David Levin.
+
+        [chromium] crash when dragging images
+        https://bugs.webkit.org/show_bug.cgi?id=37715
+
+        NULL check the return value of nativeImageForCurrentFrame(),
+        and NULL check Image just for good measure.
+
+        Tested by new DragImageTest unit test.
+
+        * platform/chromium/DragImageChromiumSkia.cpp:
+        (WebCore::createDragImageFromImage):
+
 2010-04-20  Dirk Schulze  <krit@webkit.org>
 

trunk/WebCore/platform/chromium/DragImageChromiumSkia.cpp

@@ -77 +77 @@
 DragImageRef createDragImageFromImage(Image* image)
 {
-    return new SkBitmap(*image->nativeImageForCurrentFrame());
+    if (!image)
+        return 0;
+
+    NativeImageSkia* bitmap = image->nativeImageForCurrentFrame();
+    return bitmap ? new SkBitmap(*bitmap) : 0;
 }
 

trunk/WebKit/chromium/ChangeLog

@@ +1 @@
+2010-04-20  Evan Stade  <estade@chromium.org>
+
+        Reviewed by David Levin.
+
+        [chromium] crash when dragging images
+        https://bugs.webkit.org/show_bug.cgi?id=37715
+
+        Added unit tests for DragImageChromiumSkia.
+
+        * WebKit.gyp:
+        * tests/DragImageTest.cpp: Added.
+        (WebCore::TestImage::TestImage):
+        (WebCore::TestImage::~TestImage):
+        (WebCore::TestImage::size):
+        (WebCore::TestImage::nativeImageForCurrentFrame):
+        (WebCore::TestImage::destroyDecodedData):
+        (WebCore::TestImage::decodedSize):
+        (WebCore::TestImage::draw):
+        (WebCore::TEST):
+
 2010-04-20  Stuart Morgan  <stuartmorgan@chromium.org>
 

trunk/WebKit/chromium/WebKit.gyp

@@ -503 +503 @@
             ],
             'sources': [
+                'tests/DragImageTest.cpp',
                 'tests/KeyboardTest.cpp',
                 'tests/KURLTest.cpp',
@@ -514 +515 @@
                         'tests/TransparencyWinTest.cpp',
                         'tests/UniscribeHelperTest.cpp',
+                    ],
+                }],
+                ['OS=="mac"', {
+                    'sources!': [
+                        # FIXME: Port DragImageTest to Mac.
+                        'tests/DragImageTest.cpp',
                     ],
                 }],