OLD | NEW |
---|---|
1 /* | 1 /* |
2 * Copyright (C) 2009 Apple Inc. All rights reserved. | 2 * Copyright (C) 2009 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 631 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
642 shouldFailContextCreationForTesting = true; | 642 shouldFailContextCreationForTesting = true; |
643 } | 643 } |
644 | 644 |
645 ImageBitmap* WebGLRenderingContextBase::transferToImageBitmapBase() | 645 ImageBitmap* WebGLRenderingContextBase::transferToImageBitmapBase() |
646 { | 646 { |
647 if (!drawingBuffer()) | 647 if (!drawingBuffer()) |
648 return nullptr; | 648 return nullptr; |
649 return ImageBitmap::create(drawingBuffer()->transferToStaticBitmapImage()); | 649 return ImageBitmap::create(drawingBuffer()->transferToStaticBitmapImage()); |
650 } | 650 } |
651 | 651 |
652 void WebGLRenderingContextBase::commit(ExceptionState& exceptionState) | |
653 { | |
654 if (!getOffscreenCanvas()) { | |
655 exceptionState.throwDOMException(InvalidStateError, "No OffscreenCanvas exist, abort commit()."); | |
xlai (Olivia)
2016/09/09 20:30:41
Could you add a sub-test to OffscreenCanvas-commit
Ken Russell (switch to Gerrit)
2016/09/09 21:38:17
Also, nit: exist -> exists
| |
656 return; | |
657 } | |
658 // no HTMLCanvas associated, thrown InvalidStateError | |
659 if (getOffscreenCanvas()->getAssociatedCanvasId() == -1) { | |
660 exceptionState.throwDOMException(InvalidStateError, "The OffscreenCanvas has no associated HTMLCanvasElement, abort commit()."); | |
xlai (Olivia)
2016/09/09 20:30:41
Could you change the exception message to "Commit(
| |
661 return; | |
662 } | |
663 if (!drawingBuffer()) | |
664 return; | |
665 getOffscreenCanvas()->getOrCreateFrameDispatcher()->dispatchFrame(drawingBuf fer()->transferToStaticBitmapImage()); | |
666 } | |
667 | |
652 PassRefPtr<Image> WebGLRenderingContextBase::getImage(AccelerationHint hint, Sna pshotReason reason) const | 668 PassRefPtr<Image> WebGLRenderingContextBase::getImage(AccelerationHint hint, Sna pshotReason reason) const |
653 { | 669 { |
654 if (!drawingBuffer()) | 670 if (!drawingBuffer()) |
655 return nullptr; | 671 return nullptr; |
656 | 672 |
657 drawingBuffer()->commit(); | 673 drawingBuffer()->commit(); |
658 IntSize size = clampedCanvasSize(); | 674 IntSize size = clampedCanvasSize(); |
659 OpacityMode opacityMode = creationAttributes().hasAlpha() ? NonOpaque : Opaq ue; | 675 OpacityMode opacityMode = creationAttributes().hasAlpha() ? NonOpaque : Opaq ue; |
660 std::unique_ptr<AcceleratedImageBufferSurface> surface = wrapUnique(new Acce leratedImageBufferSurface(size, opacityMode)); | 676 std::unique_ptr<AcceleratedImageBufferSurface> surface = wrapUnique(new Acce leratedImageBufferSurface(size, opacityMode)); |
661 if (!surface->isValid()) | 677 if (!surface->isValid()) |
(...skipping 5775 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
6437 | 6453 |
6438 void WebGLRenderingContextBase::getHTMLOrOffscreenCanvas(HTMLCanvasElementOrOffs creenCanvas& result) const | 6454 void WebGLRenderingContextBase::getHTMLOrOffscreenCanvas(HTMLCanvasElementOrOffs creenCanvas& result) const |
6439 { | 6455 { |
6440 if (canvas()) | 6456 if (canvas()) |
6441 result.setHTMLCanvasElement(canvas()); | 6457 result.setHTMLCanvasElement(canvas()); |
6442 else | 6458 else |
6443 result.setOffscreenCanvas(getOffscreenCanvas()); | 6459 result.setOffscreenCanvas(getOffscreenCanvas()); |
6444 } | 6460 } |
6445 | 6461 |
6446 } // namespace blink | 6462 } // namespace blink |
OLD | NEW |