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 void ImageBitmap::neuter() | |
| 185 { | |
| 186 if (m_imageElement) | |
| 187 m_imageElement.clear(); | |
| 188 if (m_bitmap) | |
| 189 m_bitmap.clear(); | |
| 190 | |
| 191 m_isNeutered = true; | |
| 192 | |
| 193 m_bitmapRect.setLocation(IntPoint(0, 0)); | |
|
Justin Novosad
2015/10/23 13:30:04
Setting the rects and offset to 0 is overkill.
| |
| 194 m_bitmapRect.setSize(IntSize(0, 0)); | |
| 195 m_cropRect = m_bitmapRect; | |
| 196 m_bitmapOffset.setX(0); | |
| 197 m_bitmapOffset.setY(0); | |
| 198 } | |
| 199 | |
| 200 PassRefPtr<ImageBitmap> ImageBitmap::transfer() | |
| 201 { | |
| 202 return adoptRef(new ImageBitmap(this, m_cropRect)); | |
|
Justin Novosad
2015/10/23 13:30:04
Not oilpan compatible.
| |
| 203 } | |
| 204 | |
| 184 void ImageBitmap::notifyImageSourceChanged() | 205 void ImageBitmap::notifyImageSourceChanged() |
| 185 { | 206 { |
| 186 m_bitmap = cropImage(m_imageElement->cachedImage()->image(), m_cropRect); | 207 m_bitmap = cropImage(m_imageElement->cachedImage()->image(), m_cropRect); |
| 187 m_bitmapOffset = IntPoint(); | 208 m_bitmapOffset = IntPoint(); |
| 188 m_imageElement = nullptr; | 209 m_imageElement = nullptr; |
| 189 } | 210 } |
| 190 | 211 |
| 191 PassRefPtr<Image> ImageBitmap::bitmapImage() const | 212 PassRefPtr<Image> ImageBitmap::bitmapImage() const |
| 192 { | 213 { |
| 193 ASSERT((m_imageElement || m_bitmap || !m_bitmapRect.width() || !m_bitmapRect .height()) && (!m_imageElement || !m_bitmap)); | 214 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()); | 241 return FloatSize(width(), height()); |
| 221 } | 242 } |
| 222 | 243 |
| 223 DEFINE_TRACE(ImageBitmap) | 244 DEFINE_TRACE(ImageBitmap) |
| 224 { | 245 { |
| 225 visitor->trace(m_imageElement); | 246 visitor->trace(m_imageElement); |
| 226 ImageLoaderClient::trace(visitor); | 247 ImageLoaderClient::trace(visitor); |
| 227 } | 248 } |
| 228 | 249 |
| 229 } // namespace blink | 250 } // namespace blink |
| OLD | NEW |