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

Side by Side Diff: Source/web/WebElement.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/DragClientImpl.cpp ('k') | Source/web/WebImageDecoder.cpp » ('j') | 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) 2009 Google Inc. All rights reserved. 2 * Copyright (C) 2009 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 140 matching lines...) Expand 10 before | Expand all | Expand 10 after
151 151
152 WebImage WebElement::imageContents() 152 WebImage WebElement::imageContents()
153 { 153 {
154 if (isNull()) 154 if (isNull())
155 return WebImage(); 155 return WebImage();
156 156
157 Image* image = unwrap<Element>()->imageContents(); 157 Image* image = unwrap<Element>()->imageContents();
158 if (!image) 158 if (!image)
159 return WebImage(); 159 return WebImage();
160 160
161 RefPtr<NativeImageSkia> bitmap = image->nativeImageForCurrentFrame(); 161 SkBitmap bitmap;
162 if (!bitmap) 162 if (!image->bitmapForCurrentFrame(&bitmap))
163 return WebImage(); 163 return WebImage();
164 164
165 return bitmap->bitmap(); 165 return WebImage(bitmap);
166 } 166 }
167 167
168 WebElement::WebElement(const PassRefPtrWillBeRawPtr<Element>& elem) 168 WebElement::WebElement(const PassRefPtrWillBeRawPtr<Element>& elem)
169 : WebNode(elem) 169 : WebNode(elem)
170 { 170 {
171 } 171 }
172 172
173 WebElement& WebElement::operator=(const PassRefPtrWillBeRawPtr<Element>& elem) 173 WebElement& WebElement::operator=(const PassRefPtrWillBeRawPtr<Element>& elem)
174 { 174 {
175 m_private = elem; 175 m_private = elem;
176 return *this; 176 return *this;
177 } 177 }
178 178
179 WebElement::operator PassRefPtrWillBeRawPtr<Element>() const 179 WebElement::operator PassRefPtrWillBeRawPtr<Element>() const
180 { 180 {
181 return toElement(m_private.get()); 181 return toElement(m_private.get());
182 } 182 }
183 183
184 } // namespace blink 184 } // namespace blink
OLDNEW
« no previous file with comments | « Source/web/DragClientImpl.cpp ('k') | Source/web/WebImageDecoder.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698