third_party/WebKit/Source/core/frame/ImageBitmapTest.cpp - Issue 2050123002: Remove OwnPtr from Blink.

Side by Side Diff: third_party/WebKit/Source/core/frame/ImageBitmapTest.cpp

Issue 2050123002: Remove OwnPtr from Blink. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: First attempt to land. Created 4 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch

« no previous file with comments | « third_party/WebKit/Source/core/frame/ImageBitmap.cpp ('k') | third_party/WebKit/Source/core/frame/LocalDOMWindow.h » ('j') | no next file with comments »

OLD	NEW
1 /*	1 /*

2 * Copyright (c) 2013, Google Inc. All rights reserved.	2 * Copyright (c) 2013, 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 27 matching lines...) Expand all Loading...
38 #include "core/html/HTMLImageElement.h"	38 #include "core/html/HTMLImageElement.h"

39 #include "core/html/HTMLVideoElement.h"	39 #include "core/html/HTMLVideoElement.h"

40 #include "platform/graphics/StaticBitmapImage.h"	40 #include "platform/graphics/StaticBitmapImage.h"

41 #include "platform/graphics/skia/SkiaUtils.h"	41 #include "platform/graphics/skia/SkiaUtils.h"

42 #include "platform/heap/Handle.h"	42 #include "platform/heap/Handle.h"

43 #include "platform/network/ResourceRequest.h"	43 #include "platform/network/ResourceRequest.h"

44 #include "testing/gtest/include/gtest/gtest.h"	44 #include "testing/gtest/include/gtest/gtest.h"

45 #include "third_party/skia/include/core/SkCanvas.h"	45 #include "third_party/skia/include/core/SkCanvas.h"

46 #include "third_party/skia/include/core/SkImage.h"	46 #include "third_party/skia/include/core/SkImage.h"

47 #include "third_party/skia/include/core/SkSurface.h"	47 #include "third_party/skia/include/core/SkSurface.h"

48 #include "wtf/OwnPtr.h"

49	48

50 namespace blink {	49 namespace blink {

51	50

52 class ImageBitmapTest : public ::testing::Test {	51 class ImageBitmapTest : public ::testing::Test {

53 protected:	52 protected:

54 virtual void SetUp()	53 virtual void SetUp()

55 {	54 {

56 sk_sp<SkSurface> surface = SkSurface::MakeRasterN32Premul(10, 10);	55 sk_sp<SkSurface> surface = SkSurface::MakeRasterN32Premul(10, 10);

57 surface->getCanvas()->clear(0xFFFFFFFF);	56 surface->getCanvas()->clear(0xFFFFFFFF);

58 m_image = fromSkSp(surface->makeImageSnapshot());	57 m_image = fromSkSp(surface->makeImageSnapshot());

(...skipping 79 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
138 ASSERT_NE(imageBitmap->bitmapImage()->imageForCurrentFrame(), newImageRe source->getImage()->imageForCurrentFrame());	137 ASSERT_NE(imageBitmap->bitmapImage()->imageForCurrentFrame(), newImageRe source->getImage()->imageForCurrentFrame());

139 SkImage* image1 = imageBitmap->bitmapImage()->imageForCurrentFrame().get ();	138 SkImage* image1 = imageBitmap->bitmapImage()->imageForCurrentFrame().get ();

140 ASSERT_NE(image1, nullptr);	139 ASSERT_NE(image1, nullptr);

141 SkImage* image2 = newImageResource->getImage()->imageForCurrentFrame().g et();	140 SkImage* image2 = newImageResource->getImage()->imageForCurrentFrame().g et();

142 ASSERT_NE(image2, nullptr);	141 ASSERT_NE(image2, nullptr);

143 ASSERT_NE(image1, image2);	142 ASSERT_NE(image1, image2);

144 }	143 }

145 }	144 }

146	145

147 } // namespace blink	146 } // namespace blink

OLD	NEW