| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "sky/engine/config.h" | |
| 6 #include "sky/engine/core/frame/ImageBitmap.h" | 5 #include "sky/engine/core/frame/ImageBitmap.h" |
| 7 | 6 |
| 8 #include "sky/engine/core/html/ImageData.h" | 7 #include "sky/engine/core/html/ImageData.h" |
| 9 #include "sky/engine/platform/graphics/BitmapImage.h" | 8 #include "sky/engine/platform/graphics/BitmapImage.h" |
| 10 #include "sky/engine/platform/graphics/GraphicsContext.h" | 9 #include "sky/engine/platform/graphics/GraphicsContext.h" |
| 11 #include "sky/engine/platform/graphics/ImageBuffer.h" | 10 #include "sky/engine/platform/graphics/ImageBuffer.h" |
| 12 #include "sky/engine/wtf/RefPtr.h" | 11 #include "sky/engine/wtf/RefPtr.h" |
| 13 | 12 |
| 14 namespace blink { | 13 namespace blink { |
| 15 | 14 |
| (...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 134 | 133 |
| 135 PassRefPtr<Image> ImageBitmap::bitmapImage() const | 134 PassRefPtr<Image> ImageBitmap::bitmapImage() const |
| 136 { | 135 { |
| 137 ASSERT((m_imageElement || m_bitmap || !m_bitmapRect.width() || !m_bitmapRect
.height()) && (!m_imageElement || !m_bitmap)); | 136 ASSERT((m_imageElement || m_bitmap || !m_bitmapRect.width() || !m_bitmapRect
.height()) && (!m_imageElement || !m_bitmap)); |
| 138 if (m_imageElement) | 137 if (m_imageElement) |
| 139 return m_imageElement->cachedImage()->image(); | 138 return m_imageElement->cachedImage()->image(); |
| 140 return m_bitmap; | 139 return m_bitmap; |
| 141 } | 140 } |
| 142 | 141 |
| 143 } | 142 } |
| OLD | NEW |