Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(178)

Side by Side Diff: third_party/WebKit/Source/core/html/HTMLVideoElement.cpp

Issue 1732563007: [NOT FOR COMMIT] Pass defaultObjectSize to get image size (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2007, 2008, 2009, 2010 Apple Inc. All rights reserved. 2 * Copyright (C) 2007, 2008, 2009, 2010 Apple 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 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 298 matching lines...) Expand 10 before | Expand all | Expand 10 after
309 309
310 *status = NormalSourceImageStatus; 310 *status = NormalSourceImageStatus;
311 return snapshot.release(); 311 return snapshot.release();
312 } 312 }
313 313
314 bool HTMLVideoElement::wouldTaintOrigin(SecurityOrigin* destinationSecurityOrigi n) const 314 bool HTMLVideoElement::wouldTaintOrigin(SecurityOrigin* destinationSecurityOrigi n) const
315 { 315 {
316 return !isMediaDataCORSSameOrigin(destinationSecurityOrigin); 316 return !isMediaDataCORSSameOrigin(destinationSecurityOrigin);
317 } 317 }
318 318
319 FloatSize HTMLVideoElement::elementSize() const 319 FloatSize HTMLVideoElement::elementSize(const FloatSize&) const
320 { 320 {
321 return FloatSize(videoWidth(), videoHeight()); 321 return FloatSize(videoWidth(), videoHeight());
322 } 322 }
323 323
324 IntSize HTMLVideoElement::bitmapSourceSize() const 324 IntSize HTMLVideoElement::bitmapSourceSize() const
325 { 325 {
326 return IntSize(videoWidth(), videoHeight()); 326 return IntSize(videoWidth(), videoHeight());
327 } 327 }
328 328
329 ScriptPromise HTMLVideoElement::createImageBitmap(ScriptState* scriptState, Even tTarget& eventTarget, int sx, int sy, int sw, int sh, const ImageBitmapOptions& options, ExceptionState& exceptionState) 329 ScriptPromise HTMLVideoElement::createImageBitmap(ScriptState* scriptState, Even tTarget& eventTarget, int sx, int sy, int sw, int sh, const ImageBitmapOptions& options, ExceptionState& exceptionState)
330 { 330 {
331 ASSERT(eventTarget.toDOMWindow()); 331 ASSERT(eventTarget.toDOMWindow());
332 if (networkState() == HTMLMediaElement::NETWORK_EMPTY) { 332 if (networkState() == HTMLMediaElement::NETWORK_EMPTY) {
333 exceptionState.throwDOMException(InvalidStateError, "The provided elemen t has not retrieved data."); 333 exceptionState.throwDOMException(InvalidStateError, "The provided elemen t has not retrieved data.");
334 return ScriptPromise(); 334 return ScriptPromise();
335 } 335 }
336 if (readyState() <= HTMLMediaElement::HAVE_METADATA) { 336 if (readyState() <= HTMLMediaElement::HAVE_METADATA) {
337 exceptionState.throwDOMException(InvalidStateError, "The provided elemen t's player has no current data."); 337 exceptionState.throwDOMException(InvalidStateError, "The provided elemen t's player has no current data.");
338 return ScriptPromise(); 338 return ScriptPromise();
339 } 339 }
340 if (!sw || !sh) { 340 if (!sw || !sh) {
341 exceptionState.throwDOMException(IndexSizeError, String::format("The sou rce %s provided is 0.", sw ? "height" : "width")); 341 exceptionState.throwDOMException(IndexSizeError, String::format("The sou rce %s provided is 0.", sw ? "height" : "width"));
342 return ScriptPromise(); 342 return ScriptPromise();
343 } 343 }
344 return ImageBitmapSource::fulfillImageBitmap(scriptState, ImageBitmap::creat e(this, IntRect(sx, sy, sw, sh), eventTarget.toDOMWindow()->document(), options) ); 344 return ImageBitmapSource::fulfillImageBitmap(scriptState, ImageBitmap::creat e(this, IntRect(sx, sy, sw, sh), eventTarget.toDOMWindow()->document(), options) );
345 } 345 }
346 346
347 } // namespace blink 347 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/html/HTMLVideoElement.h ('k') | third_party/WebKit/Source/core/html/ImageDocument.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698