| OLD | NEW |
| 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 Loading... |
| 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 image->bitmapForCurrentFrame(&bitmap); |
| 163 return WebImage(); | 163 return WebImage(bitmap); |
| 164 | |
| 165 return bitmap->bitmap(); | |
| 166 } | 164 } |
| 167 | 165 |
| 168 WebElement::WebElement(const PassRefPtrWillBeRawPtr<Element>& elem) | 166 WebElement::WebElement(const PassRefPtrWillBeRawPtr<Element>& elem) |
| 169 : WebNode(elem) | 167 : WebNode(elem) |
| 170 { | 168 { |
| 171 } | 169 } |
| 172 | 170 |
| 173 WebElement& WebElement::operator=(const PassRefPtrWillBeRawPtr<Element>& elem) | 171 WebElement& WebElement::operator=(const PassRefPtrWillBeRawPtr<Element>& elem) |
| 174 { | 172 { |
| 175 m_private = elem; | 173 m_private = elem; |
| 176 return *this; | 174 return *this; |
| 177 } | 175 } |
| 178 | 176 |
| 179 WebElement::operator PassRefPtrWillBeRawPtr<Element>() const | 177 WebElement::operator PassRefPtrWillBeRawPtr<Element>() const |
| 180 { | 178 { |
| 181 return toElement(m_private.get()); | 179 return toElement(m_private.get()); |
| 182 } | 180 } |
| 183 | 181 |
| 184 } // namespace blink | 182 } // namespace blink |
| OLD | NEW |