| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (c) 2013, Google Inc. All rights reserved. | 2 * Copyright (c) 2013, 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 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 49 #include "public/platform/Platform.h" | 49 #include "public/platform/Platform.h" |
| 50 #include "public/platform/WebThread.h" | 50 #include "public/platform/WebThread.h" |
| 51 #include "public/platform/WebTraceLocation.h" | 51 #include "public/platform/WebTraceLocation.h" |
| 52 #include <v8.h> | 52 #include <v8.h> |
| 53 | 53 |
| 54 namespace blink { | 54 namespace blink { |
| 55 | 55 |
| 56 static inline ImageBitmapSource* toImageBitmapSourceInternal(const ImageBitmapSo
urceUnion& value) | 56 static inline ImageBitmapSource* toImageBitmapSourceInternal(const ImageBitmapSo
urceUnion& value) |
| 57 { | 57 { |
| 58 if (value.isHTMLImageElement()) | 58 if (value.isHTMLImageElement()) |
| 59 return value.getAsHTMLImageElement().get(); | 59 return value.getAsHTMLImageElement(); |
| 60 if (value.isHTMLVideoElement()) | 60 if (value.isHTMLVideoElement()) |
| 61 return value.getAsHTMLVideoElement().get(); | 61 return value.getAsHTMLVideoElement(); |
| 62 if (value.isHTMLCanvasElement()) | 62 if (value.isHTMLCanvasElement()) |
| 63 return value.getAsHTMLCanvasElement().get(); | 63 return value.getAsHTMLCanvasElement(); |
| 64 if (value.isBlob()) | 64 if (value.isBlob()) |
| 65 return value.getAsBlob(); | 65 return value.getAsBlob(); |
| 66 if (value.isImageData()) | 66 if (value.isImageData()) |
| 67 return value.getAsImageData(); | 67 return value.getAsImageData(); |
| 68 if (value.isImageBitmap()) | 68 if (value.isImageBitmap()) |
| 69 return value.getAsImageBitmap().get(); | 69 return value.getAsImageBitmap(); |
| 70 ASSERT_NOT_REACHED(); | 70 ASSERT_NOT_REACHED(); |
| 71 return nullptr; | 71 return nullptr; |
| 72 } | 72 } |
| 73 | 73 |
| 74 ScriptPromise ImageBitmapFactories::createImageBitmap(ScriptState* scriptState,
EventTarget& eventTarget, const ImageBitmapSourceUnion& bitmapSource, ExceptionS
tate& exceptionState) | 74 ScriptPromise ImageBitmapFactories::createImageBitmap(ScriptState* scriptState,
EventTarget& eventTarget, const ImageBitmapSourceUnion& bitmapSource, ExceptionS
tate& exceptionState) |
| 75 { | 75 { |
| 76 UseCounter::Feature feature = UseCounter::CreateImageBitmap; | 76 UseCounter::Feature feature = UseCounter::CreateImageBitmap; |
| 77 UseCounter::count(scriptState->getExecutionContext(), feature); | 77 UseCounter::count(scriptState->getExecutionContext(), feature); |
| 78 ImageBitmapOptions options; | 78 ImageBitmapOptions options; |
| 79 return createImageBitmap(scriptState, eventTarget, bitmapSource, options, ex
ceptionState); | 79 return createImageBitmap(scriptState, eventTarget, bitmapSource, options, ex
ceptionState); |
| (...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 136 if (LocalDOMWindow* window = eventTarget.toDOMWindow()) | 136 if (LocalDOMWindow* window = eventTarget.toDOMWindow()) |
| 137 return fromInternal(*window); | 137 return fromInternal(*window); |
| 138 | 138 |
| 139 ASSERT(eventTarget.getExecutionContext()->isWorkerGlobalScope()); | 139 ASSERT(eventTarget.getExecutionContext()->isWorkerGlobalScope()); |
| 140 return ImageBitmapFactories::fromInternal(*toWorkerGlobalScope(eventTarget.g
etExecutionContext())); | 140 return ImageBitmapFactories::fromInternal(*toWorkerGlobalScope(eventTarget.g
etExecutionContext())); |
| 141 } | 141 } |
| 142 | 142 |
| 143 template<class GlobalObject> | 143 template<class GlobalObject> |
| 144 ImageBitmapFactories& ImageBitmapFactories::fromInternal(GlobalObject& object) | 144 ImageBitmapFactories& ImageBitmapFactories::fromInternal(GlobalObject& object) |
| 145 { | 145 { |
| 146 ImageBitmapFactories* supplement = static_cast<ImageBitmapFactories*>(WillBe
HeapSupplement<GlobalObject>::from(object, supplementName())); | 146 ImageBitmapFactories* supplement = static_cast<ImageBitmapFactories*>(HeapSu
pplement<GlobalObject>::from(object, supplementName())); |
| 147 if (!supplement) { | 147 if (!supplement) { |
| 148 supplement = new ImageBitmapFactories(); | 148 supplement = new ImageBitmapFactories(); |
| 149 WillBeHeapSupplement<GlobalObject>::provideTo(object, supplementName(),
adoptPtrWillBeNoop(supplement)); | 149 HeapSupplement<GlobalObject>::provideTo(object, supplementName(), adoptP
trWillBeNoop(supplement)); |
| 150 } | 150 } |
| 151 return *supplement; | 151 return *supplement; |
| 152 } | 152 } |
| 153 | 153 |
| 154 void ImageBitmapFactories::addLoader(ImageBitmapLoader* loader) | 154 void ImageBitmapFactories::addLoader(ImageBitmapLoader* loader) |
| 155 { | 155 { |
| 156 m_pendingLoaders.add(loader); | 156 m_pendingLoaders.add(loader); |
| 157 } | 157 } |
| 158 | 158 |
| 159 void ImageBitmapFactories::didFinishLoading(ImageBitmapLoader* loader) | 159 void ImageBitmapFactories::didFinishLoading(ImageBitmapLoader* loader) |
| (...skipping 12 matching lines...) Expand all Loading... |
| 172 } | 172 } |
| 173 | 173 |
| 174 void ImageBitmapFactories::ImageBitmapLoader::loadBlobAsync(ExecutionContext* co
ntext, Blob* blob) | 174 void ImageBitmapFactories::ImageBitmapLoader::loadBlobAsync(ExecutionContext* co
ntext, Blob* blob) |
| 175 { | 175 { |
| 176 m_loader.start(context, blob->blobDataHandle()); | 176 m_loader.start(context, blob->blobDataHandle()); |
| 177 } | 177 } |
| 178 | 178 |
| 179 DEFINE_TRACE(ImageBitmapFactories) | 179 DEFINE_TRACE(ImageBitmapFactories) |
| 180 { | 180 { |
| 181 visitor->trace(m_pendingLoaders); | 181 visitor->trace(m_pendingLoaders); |
| 182 WillBeHeapSupplement<LocalDOMWindow>::trace(visitor); | 182 HeapSupplement<LocalDOMWindow>::trace(visitor); |
| 183 WillBeHeapSupplement<WorkerGlobalScope>::trace(visitor); | 183 HeapSupplement<WorkerGlobalScope>::trace(visitor); |
| 184 } | 184 } |
| 185 | 185 |
| 186 void ImageBitmapFactories::ImageBitmapLoader::rejectPromise() | 186 void ImageBitmapFactories::ImageBitmapLoader::rejectPromise() |
| 187 { | 187 { |
| 188 m_resolver->reject(ScriptValue(m_resolver->getScriptState(), v8::Null(m_reso
lver->getScriptState()->isolate()))); | 188 m_resolver->reject(ScriptValue(m_resolver->getScriptState(), v8::Null(m_reso
lver->getScriptState()->isolate()))); |
| 189 m_factory->didFinishLoading(this); | 189 m_factory->didFinishLoading(this); |
| 190 } | 190 } |
| 191 | 191 |
| 192 void ImageBitmapFactories::ImageBitmapLoader::didFinishLoading() | 192 void ImageBitmapFactories::ImageBitmapLoader::didFinishLoading() |
| 193 { | 193 { |
| (...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 242 } | 242 } |
| 243 ASSERT(frame->width() && frame->height()); | 243 ASSERT(frame->width() && frame->height()); |
| 244 | 244 |
| 245 RefPtr<StaticBitmapImage> image = StaticBitmapImage::create(frame); | 245 RefPtr<StaticBitmapImage> image = StaticBitmapImage::create(frame); |
| 246 image->setOriginClean(true); | 246 image->setOriginClean(true); |
| 247 if (!m_cropRect.width() && !m_cropRect.height()) { | 247 if (!m_cropRect.width() && !m_cropRect.height()) { |
| 248 // No cropping variant was called. | 248 // No cropping variant was called. |
| 249 m_cropRect = IntRect(IntPoint(), image->size()); | 249 m_cropRect = IntRect(IntPoint(), image->size()); |
| 250 } | 250 } |
| 251 | 251 |
| 252 RefPtrWillBeRawPtr<ImageBitmap> imageBitmap = ImageBitmap::create(image, m_c
ropRect, m_options); | 252 RawPtr<ImageBitmap> imageBitmap = ImageBitmap::create(image, m_cropRect, m_o
ptions); |
| 253 if (imageBitmap && imageBitmap->bitmapImage()) { | 253 if (imageBitmap && imageBitmap->bitmapImage()) { |
| 254 m_resolver->resolve(imageBitmap.release()); | 254 m_resolver->resolve(imageBitmap.release()); |
| 255 } else { | 255 } else { |
| 256 rejectPromise(); | 256 rejectPromise(); |
| 257 return; | 257 return; |
| 258 } | 258 } |
| 259 m_factory->didFinishLoading(this); | 259 m_factory->didFinishLoading(this); |
| 260 } | 260 } |
| 261 | 261 |
| 262 DEFINE_TRACE(ImageBitmapFactories::ImageBitmapLoader) | 262 DEFINE_TRACE(ImageBitmapFactories::ImageBitmapLoader) |
| 263 { | 263 { |
| 264 visitor->trace(m_factory); | 264 visitor->trace(m_factory); |
| 265 visitor->trace(m_resolver); | 265 visitor->trace(m_resolver); |
| 266 } | 266 } |
| 267 | 267 |
| 268 } // namespace blink | 268 } // namespace blink |
| OLD | NEW |