Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(955)

Side by Side Diff: Source/web/WebImageDecoder.cpp

Issue 1008243003: Nuke NativeImageSkia -- new version. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Add more WARN_UNUSED_RETURN goodness 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:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « Source/web/WebElement.cpp ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
101 return false; 101 return false;
102 return frameBuffer->status() == ImageFrame::FrameComplete; 102 return frameBuffer->status() == ImageFrame::FrameComplete;
103 } 103 }
104 104
105 WebImage WebImageDecoder::getFrameAtIndex(int index = 0) const 105 WebImage WebImageDecoder::getFrameAtIndex(int index = 0) const
106 { 106 {
107 ASSERT(m_private); 107 ASSERT(m_private);
108 ImageFrame* const frameBuffer = m_private->frameBufferAtIndex(index); 108 ImageFrame* const frameBuffer = m_private->frameBufferAtIndex(index);
109 if (!frameBuffer) 109 if (!frameBuffer)
110 return WebImage(); 110 return WebImage();
111 RefPtr<NativeImageSkia> image = frameBuffer->asNewNativeImage(); 111 return WebImage(frameBuffer->bitmap());
112 return WebImage(image->bitmap());
113 } 112 }
114 113
115 } // namespace blink 114 } // namespace blink
OLDNEW
« no previous file with comments | « Source/web/WebElement.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698