| 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 13 matching lines...) Expand all Loading... |
| 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
| 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
| 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 29 */ | 29 */ |
| 30 | 30 |
| 31 #include "config.h" | 31 #include "config.h" |
| 32 | 32 |
| 33 #include <algorithm> | 33 #include <algorithm> |
| 34 #include "NativeImageSkia.h" | |
| 35 #include "core/platform/SharedBuffer.h" | 34 #include "core/platform/SharedBuffer.h" |
| 36 #include "core/platform/graphics/Image.h" | 35 #include "core/platform/graphics/Image.h" |
| 36 #include "core/platform/graphics/skia/NativeImageSkia.h" |
| 37 #include "core/platform/image-decoders/ImageDecoder.h" | 37 #include "core/platform/image-decoders/ImageDecoder.h" |
| 38 #include <public/WebData.h> | 38 #include <public/WebData.h> |
| 39 #include <public/WebImage.h> | 39 #include <public/WebImage.h> |
| 40 #include <public/WebSize.h> | 40 #include <public/WebSize.h> |
| 41 #include <wtf/OwnPtr.h> | 41 #include <wtf/OwnPtr.h> |
| 42 #include <wtf/PassOwnPtr.h> | 42 #include <wtf/PassOwnPtr.h> |
| 43 #include <wtf/PassRefPtr.h> | 43 #include <wtf/PassRefPtr.h> |
| 44 #include <wtf/Vector.h> | 44 #include <wtf/Vector.h> |
| 45 | 45 |
| 46 using namespace WebCore; | 46 using namespace WebCore; |
| (...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 159 { | 159 { |
| 160 RefPtr<NativeImageSkia> p; | 160 RefPtr<NativeImageSkia> p; |
| 161 if (image && (p = image->nativeImageForCurrentFrame())) | 161 if (image && (p = image->nativeImageForCurrentFrame())) |
| 162 assign(p->bitmap()); | 162 assign(p->bitmap()); |
| 163 else | 163 else |
| 164 reset(); | 164 reset(); |
| 165 return *this; | 165 return *this; |
| 166 } | 166 } |
| 167 | 167 |
| 168 } // namespace WebKit | 168 } // namespace WebKit |
| OLD | NEW |