OLD | NEW |
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 24 matching lines...) Expand all Loading... |
35 #include "platform/image-decoders/bmp/BMPImageDecoder.h" | 35 #include "platform/image-decoders/bmp/BMPImageDecoder.h" |
36 #include "platform/image-decoders/ico/ICOImageDecoder.h" | 36 #include "platform/image-decoders/ico/ICOImageDecoder.h" |
37 #include "public/platform/Platform.h" | 37 #include "public/platform/Platform.h" |
38 #include "public/platform/WebData.h" | 38 #include "public/platform/WebData.h" |
39 #include "public/platform/WebImage.h" | 39 #include "public/platform/WebImage.h" |
40 #include "public/platform/WebSize.h" | 40 #include "public/platform/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 | 44 |
45 using namespace WebCore; | 45 using namespace blink; |
46 | 46 |
47 namespace blink { | 47 namespace blink { |
48 | 48 |
49 void WebImageDecoder::reset() | 49 void WebImageDecoder::reset() |
50 { | 50 { |
51 delete m_private; | 51 delete m_private; |
52 } | 52 } |
53 | 53 |
54 void WebImageDecoder::init(Type type) | 54 void WebImageDecoder::init(Type type) |
55 { | 55 { |
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
108 { | 108 { |
109 ASSERT(m_private); | 109 ASSERT(m_private); |
110 ImageFrame* const frameBuffer = m_private->frameBufferAtIndex(index); | 110 ImageFrame* const frameBuffer = m_private->frameBufferAtIndex(index); |
111 if (!frameBuffer) | 111 if (!frameBuffer) |
112 return WebImage(); | 112 return WebImage(); |
113 RefPtr<NativeImageSkia> image = frameBuffer->asNewNativeImage(); | 113 RefPtr<NativeImageSkia> image = frameBuffer->asNewNativeImage(); |
114 return WebImage(image->bitmap()); | 114 return WebImage(image->bitmap()); |
115 } | 115 } |
116 | 116 |
117 } // namespace blink | 117 } // namespace blink |
OLD | NEW |