Chromium Code Reviews| 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()) | |
|
Justin Novosad
2016/09/09 19:10:50
I think this case should throw as well.
xidachen
2016/09/09 19:23:41
Done.
| |
| 655 return; | |
| 656 // no HTMLCanvas associated, thrown InvalidStateError | |
| 657 if (getOffscreenCanvas()->getAssociatedCanvasId() == -1) { | |
| 658 exceptionState.throwDOMException(InvalidStateError, "The OffscreenCanvas has no associated HTMLCanvasElement, abort commit()."); | |
| 659 return; | |
| 660 } | |
| 661 if (!drawingBuffer()) | |
| 662 return; | |
| 663 getOffscreenCanvas()->getOrCreateFrameDispatcher()->dispatchFrame(drawingBuf fer()->transferToStaticBitmapImage()); | |
| 664 } | |
| 665 | |
| 652 PassRefPtr<Image> WebGLRenderingContextBase::getImage(AccelerationHint hint, Sna pshotReason reason) const | 666 PassRefPtr<Image> WebGLRenderingContextBase::getImage(AccelerationHint hint, Sna pshotReason reason) const |
| 653 { | 667 { |
| 654 if (!drawingBuffer()) | 668 if (!drawingBuffer()) |
| 655 return nullptr; | 669 return nullptr; |
| 656 | 670 |
| 657 drawingBuffer()->commit(); | 671 drawingBuffer()->commit(); |
| 658 IntSize size = clampedCanvasSize(); | 672 IntSize size = clampedCanvasSize(); |
| 659 OpacityMode opacityMode = creationAttributes().hasAlpha() ? NonOpaque : Opaq ue; | 673 OpacityMode opacityMode = creationAttributes().hasAlpha() ? NonOpaque : Opaq ue; |
| 660 std::unique_ptr<AcceleratedImageBufferSurface> surface = wrapUnique(new Acce leratedImageBufferSurface(size, opacityMode)); | 674 std::unique_ptr<AcceleratedImageBufferSurface> surface = wrapUnique(new Acce leratedImageBufferSurface(size, opacityMode)); |
| 661 if (!surface->isValid()) | 675 if (!surface->isValid()) |
| (...skipping 5775 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 6437 | 6451 |
| 6438 void WebGLRenderingContextBase::getHTMLOrOffscreenCanvas(HTMLCanvasElementOrOffs creenCanvas& result) const | 6452 void WebGLRenderingContextBase::getHTMLOrOffscreenCanvas(HTMLCanvasElementOrOffs creenCanvas& result) const |
| 6439 { | 6453 { |
| 6440 if (canvas()) | 6454 if (canvas()) |
| 6441 result.setHTMLCanvasElement(canvas()); | 6455 result.setHTMLCanvasElement(canvas()); |
| 6442 else | 6456 else |
| 6443 result.setOffscreenCanvas(getOffscreenCanvas()); | 6457 result.setOffscreenCanvas(getOffscreenCanvas()); |
| 6444 } | 6458 } |
| 6445 | 6459 |
| 6446 } // namespace blink | 6460 } // namespace blink |
| OLD | NEW |