| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com) | 2 * Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com) |
| 3 * Copyright (C) 2004, 2005, 2006 Apple Computer, Inc. All rights reserved. | 3 * Copyright (C) 2004, 2005, 2006 Apple Computer, Inc. All rights reserved. |
| 4 * | 4 * |
| 5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
| 6 * modification, are permitted provided that the following conditions | 6 * modification, are permitted provided that the following conditions |
| 7 * are met: | 7 * are met: |
| 8 * 1. Redistributions of source code must retain the above copyright | 8 * 1. 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 * 2. Redistributions in binary form must reproduce the above copyright | 10 * 2. Redistributions in binary form must reproduce the above copyright |
| (...skipping 21 matching lines...) Expand all Loading... |
| 32 #include "platform/SharedBuffer.h" | 32 #include "platform/SharedBuffer.h" |
| 33 #include "platform/TraceEvent.h" | 33 #include "platform/TraceEvent.h" |
| 34 #include "platform/geometry/FloatPoint.h" | 34 #include "platform/geometry/FloatPoint.h" |
| 35 #include "platform/geometry/FloatRect.h" | 35 #include "platform/geometry/FloatRect.h" |
| 36 #include "platform/geometry/FloatSize.h" | 36 #include "platform/geometry/FloatSize.h" |
| 37 #include "platform/graphics/BitmapImage.h" | 37 #include "platform/graphics/BitmapImage.h" |
| 38 #include "platform/graphics/GraphicsContext.h" | 38 #include "platform/graphics/GraphicsContext.h" |
| 39 #include "platform/graphics/GraphicsContextStateSaver.h" | 39 #include "platform/graphics/GraphicsContextStateSaver.h" |
| 40 #include "public/platform/Platform.h" | 40 #include "public/platform/Platform.h" |
| 41 #include "public/platform/WebData.h" | 41 #include "public/platform/WebData.h" |
| 42 #include "third_party/skia/include/core/SkImage.h" |
| 42 #include "wtf/MainThread.h" | 43 #include "wtf/MainThread.h" |
| 43 #include "wtf/StdLibExtras.h" | 44 #include "wtf/StdLibExtras.h" |
| 44 | 45 |
| 45 #include <math.h> | 46 #include <math.h> |
| 46 | 47 |
| 47 namespace blink { | 48 namespace blink { |
| 48 | 49 |
| 49 Image::Image(ImageObserver* observer) | 50 Image::Image(ImageObserver* observer) |
| 50 : m_imageObserver(observer) | 51 : m_imageObserver(observer) |
| 51 { | 52 { |
| (...skipping 185 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 237 intrinsicHeight = Length(intrinsicRatio.height(), Fixed); | 238 intrinsicHeight = Length(intrinsicRatio.height(), Fixed); |
| 238 } | 239 } |
| 239 | 240 |
| 240 PassRefPtr<Image> Image::imageForDefaultFrame() | 241 PassRefPtr<Image> Image::imageForDefaultFrame() |
| 241 { | 242 { |
| 242 RefPtr<Image> image(this); | 243 RefPtr<Image> image(this); |
| 243 | 244 |
| 244 return image.release(); | 245 return image.release(); |
| 245 } | 246 } |
| 246 | 247 |
| 248 PassRefPtr<SkImage> Image::image() |
| 249 { |
| 250 return nullptr; |
| 247 } | 251 } |
| 252 |
| 253 } |
| OLD | NEW |