Source/platform/image-decoders/ImageFrame.h - Issue 1008243003: Nuke NativeImageSkia -- new version.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: Source/platform/image-decoders/ImageFrame.h

Issue 1008243003: Nuke NativeImageSkia -- new version. (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: Convert BitmapImage::createFrameAtIndex() to Skia-style Created 5 years, 9 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:

Index: Source/platform/image-decoders/ImageFrame.h

diff --git a/Source/platform/image-decoders/ImageFrame.h b/Source/platform/image-decoders/ImageFrame.h

index 0d302f2610753bf7621afa1925cd346a1918bd56..d7a00a48c98833e19f24bab5a2f7928b3d418ac9 100644

--- a/Source/platform/image-decoders/ImageFrame.h

+++ b/Source/platform/image-decoders/ImageFrame.h

@@ -29,7 +29,7 @@

#include "platform/PlatformExport.h"

#include "platform/geometry/IntRect.h"

-#include "platform/graphics/skia/NativeImageSkia.h"

+#include "third_party/skia/include/core/SkBitmap.h"

#include "wtf/Assertions.h"

#include "wtf/PassRefPtr.h"

@@ -114,7 +114,7 @@ public:

// Returns a caller-owned pointer to the underlying native image data.

// (Actual use: This pointer will be owned by BitmapImage and freed in

// FrameData::clear()).

- PassRefPtr<NativeImageSkia> asNewNativeImage() const;

+ const SkBitmap& bitmap() const;

bool hasAlpha() const;

const IntRect& originalFrameRect() const { return m_originalFrameRect; }