Chromium Code Reviews| 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 "config.h" | 5 #include "config.h" |
| 6 #include "core/frame/ImageBitmap.h" | 6 #include "core/frame/ImageBitmap.h" |
| 7 | 7 |
| 8 #include "core/html/HTMLCanvasElement.h" | 8 #include "core/html/HTMLCanvasElement.h" |
| 9 #include "core/html/HTMLVideoElement.h" | 9 #include "core/html/HTMLVideoElement.h" |
| 10 #include "core/html/ImageData.h" | 10 #include "core/html/ImageData.h" |
| (...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 174 IntRect normalizedCropRect = normalizeRect(cropRect); | 174 IntRect normalizedCropRect = normalizeRect(cropRect); |
| 175 return adoptRefWillBeNoop(new ImageBitmap(bitmap, normalizedCropRect)); | 175 return adoptRefWillBeNoop(new ImageBitmap(bitmap, normalizedCropRect)); |
| 176 } | 176 } |
| 177 | 177 |
| 178 PassRefPtrWillBeRawPtr<ImageBitmap> ImageBitmap::create(Image* image, const IntR ect& cropRect) | 178 PassRefPtrWillBeRawPtr<ImageBitmap> ImageBitmap::create(Image* image, const IntR ect& cropRect) |
| 179 { | 179 { |
| 180 IntRect normalizedCropRect = normalizeRect(cropRect); | 180 IntRect normalizedCropRect = normalizeRect(cropRect); |
| 181 return adoptRefWillBeNoop(new ImageBitmap(image, normalizedCropRect)); | 181 return adoptRefWillBeNoop(new ImageBitmap(image, normalizedCropRect)); |
| 182 } | 182 } |
| 183 | 183 |
| 184 PassRefPtrWillBeRawPtr<ImageBitmap> ImageBitmap::transfer() | |
| 185 { | |
| 186 WTF::RawPtr<ImageBitmap> bitmap = adoptRefWillBeNoop(new ImageBitmap(this, m _cropRect)); | |
|
haraken
2015/10/26 14:57:40
RefPtrWillBeRawPtr
xidachen
2015/10/27 12:23:24
Done.
| |
| 187 if (m_imageElement) | |
| 188 m_imageElement.clear(); | |
| 189 if (m_bitmap) | |
| 190 m_bitmap.clear(); | |
| 191 return bitmap; | |
|
haraken
2015/10/26 14:57:40
bitmap.release()
xidachen
2015/10/27 12:23:24
junov@: I had to add back the code that sets the m
xidachen
2015/10/27 12:23:24
Done.
| |
| 192 } | |
| 193 | |
| 184 void ImageBitmap::notifyImageSourceChanged() | 194 void ImageBitmap::notifyImageSourceChanged() |
| 185 { | 195 { |
| 186 m_bitmap = cropImage(m_imageElement->cachedImage()->image(), m_cropRect); | 196 m_bitmap = cropImage(m_imageElement->cachedImage()->image(), m_cropRect); |
| 187 m_bitmapOffset = IntPoint(); | 197 m_bitmapOffset = IntPoint(); |
| 188 m_imageElement = nullptr; | 198 m_imageElement = nullptr; |
| 189 } | 199 } |
| 190 | 200 |
| 191 PassRefPtr<Image> ImageBitmap::bitmapImage() const | 201 PassRefPtr<Image> ImageBitmap::bitmapImage() const |
| 192 { | 202 { |
| 193 ASSERT((m_imageElement || m_bitmap || !m_bitmapRect.width() || !m_bitmapRect .height()) && (!m_imageElement || !m_bitmap)); | 203 ASSERT((m_imageElement || m_bitmap || !m_bitmapRect.width() || !m_bitmapRect .height()) && (!m_imageElement || !m_bitmap)); |
| (...skipping 26 matching lines...) Expand all Loading... | |
| 220 return FloatSize(width(), height()); | 230 return FloatSize(width(), height()); |
| 221 } | 231 } |
| 222 | 232 |
| 223 DEFINE_TRACE(ImageBitmap) | 233 DEFINE_TRACE(ImageBitmap) |
| 224 { | 234 { |
| 225 visitor->trace(m_imageElement); | 235 visitor->trace(m_imageElement); |
| 226 ImageLoaderClient::trace(visitor); | 236 ImageLoaderClient::trace(visitor); |
| 227 } | 237 } |
| 228 | 238 |
| 229 } // namespace blink | 239 } // namespace blink |
| OLD | NEW |