| OLD | NEW | 
|    1 /* |    1 /* | 
|    2  * Copyright (C) 2010 Google Inc. All rights reserved. |    2  * Copyright (C) 2010 Google Inc. All rights reserved. | 
|    3  * |    3  * | 
|    4  * Redistribution and use in source and binary forms, with or without |    4  * Redistribution and use in source and binary forms, with or without | 
|    5  * modification, are permitted provided that the following conditions are |    5  * modification, are permitted provided that the following conditions are | 
|    6  * met: |    6  * met: | 
|    7  * |    7  * | 
|    8  *     * Redistributions of source code must retain the above copyright |    8  *     * Redistributions of source code must retain the above copyright | 
|    9  * notice, this list of conditions and the following disclaimer. |    9  * notice, this list of conditions and the following disclaimer. | 
|   10  *     * Redistributions in binary form must reproduce the above |   10  *     * Redistributions in binary form must reproduce the above | 
| (...skipping 15 matching lines...) Expand all  Loading... | 
|   26  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |   26  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 
|   27  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |   27  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 
|   28  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |   28  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 
|   29  */ |   29  */ | 
|   30  |   30  | 
|   31 #include "config.h" |   31 #include "config.h" | 
|   32  |   32  | 
|   33 #include "core/platform/DragImage.h" |   33 #include "core/platform/DragImage.h" | 
|   34  |   34  | 
|   35 #include <gtest/gtest.h> |   35 #include <gtest/gtest.h> | 
|   36 #include "NativeImageSkia.h" |  | 
|   37 #include "core/platform/graphics/Image.h" |   36 #include "core/platform/graphics/Image.h" | 
 |   37 #include "core/platform/graphics/skia/NativeImageSkia.h" | 
|   38 #include <wtf/PassOwnPtr.h> |   38 #include <wtf/PassOwnPtr.h> | 
|   39  |   39  | 
|   40 using namespace WebCore; |   40 using namespace WebCore; | 
|   41  |   41  | 
|   42 namespace { |   42 namespace { | 
|   43  |   43  | 
|   44 class TestImage : public Image { |   44 class TestImage : public Image { | 
|   45 public: |   45 public: | 
|   46  |   46  | 
|   47     static PassRefPtr<TestImage> create(const IntSize& size) |   47     static PassRefPtr<TestImage> create(const IntSize& size) | 
| (...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  143         // Tests that the drag image is a deep copy. |  143         // Tests that the drag image is a deep copy. | 
|  144         RefPtr<TestImage> testImage(TestImage::create(IntSize(1, 1))); |  144         RefPtr<TestImage> testImage(TestImage::create(IntSize(1, 1))); | 
|  145         DragImageRef dragImage = createDragImageFromImage(testImage.get()); |  145         DragImageRef dragImage = createDragImageFromImage(testImage.get()); | 
|  146         ASSERT_TRUE(dragImage); |  146         ASSERT_TRUE(dragImage); | 
|  147         SkAutoLockPixels lock1(*dragImage->bitmap), lock2(testImage->nativeImage
     ForCurrentFrame()->bitmap()); |  147         SkAutoLockPixels lock1(*dragImage->bitmap), lock2(testImage->nativeImage
     ForCurrentFrame()->bitmap()); | 
|  148         EXPECT_NE(dragImage->bitmap->getPixels(), testImage->nativeImageForCurre
     ntFrame()->bitmap().getPixels()); |  148         EXPECT_NE(dragImage->bitmap->getPixels(), testImage->nativeImageForCurre
     ntFrame()->bitmap().getPixels()); | 
|  149     } |  149     } | 
|  150 } |  150 } | 
|  151  |  151  | 
|  152 } // anonymous namespace |  152 } // anonymous namespace | 
| OLD | NEW |