| 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 154 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 165 if (!image) | 165 if (!image) |
| 166 return WebImage(); | 166 return WebImage(); |
| 167 | 167 |
| 168 RefPtr<NativeImageSkia> bitmap = image->nativeImageForCurrentFrame(); | 168 RefPtr<NativeImageSkia> bitmap = image->nativeImageForCurrentFrame(); |
| 169 if (!bitmap) | 169 if (!bitmap) |
| 170 return WebImage(); | 170 return WebImage(); |
| 171 | 171 |
| 172 return bitmap->bitmap(); | 172 return bitmap->bitmap(); |
| 173 } | 173 } |
| 174 | 174 |
| 175 WebElement::WebElement(const PassRefPtr<Element>& elem) | 175 WebElement::WebElement(const PassRefPtrWillBeRawPtr<Element>& elem) |
| 176 : WebNode(elem) | 176 : WebNode(elem) |
| 177 { | 177 { |
| 178 } | 178 } |
| 179 | 179 |
| 180 WebElement& WebElement::operator=(const PassRefPtr<Element>& elem) | 180 WebElement& WebElement::operator=(const PassRefPtrWillBeRawPtr<Element>& elem) |
| 181 { | 181 { |
| 182 m_private = elem; | 182 m_private = elem; |
| 183 return *this; | 183 return *this; |
| 184 } | 184 } |
| 185 | 185 |
| 186 WebElement::operator PassRefPtr<Element>() const | 186 WebElement::operator PassRefPtrWillBeRawPtr<Element>() const |
| 187 { | 187 { |
| 188 return toElement(m_private.get()); | 188 return toElement(m_private.get()); |
| 189 } | 189 } |
| 190 | 190 |
| 191 } // namespace blink | 191 } // namespace blink |
| OLD | NEW |