webkit/glue/webkit_glue.cc - Issue 12896006: mac: Clean up a few more uses of USE_SKIA

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: webkit/glue/webkit_glue.cc

Issue 12896006: mac: Clean up a few more uses of USE_SKIA (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: mac Created 7 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: webkit/glue/webkit_glue.cc

diff --git a/webkit/glue/webkit_glue.cc b/webkit/glue/webkit_glue.cc

index e8c406002178a9fd1fb255d96098cdb06d99f5d4..657259929cc71b5b505fee06ed0bb96a7467bc5d 100644

--- a/webkit/glue/webkit_glue.cc

+++ b/webkit/glue/webkit_glue.cc

@@ -267,11 +267,7 @@ bool DecodeImage(const std::string& image_data, SkBitmap* image) {

if (web_image.isNull())

return false;

-#if defined(OS_MACOSX) && !defined(USE_SKIA)

- *image = gfx::CGImageToSkBitmap(web_image.getCGImageRef());

-#else

*image = web_image.getSkBitmap();

-#endif

return true;

}