| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2012 Google Inc. All rights reserved. | 2 * Copyright (C) 2012 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 | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * | 7 * |
| 8 * 1. Redistributions of source code must retain the above copyright | 8 * 1. 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 * 2. Redistributions in binary form must reproduce the above copyright | 10 * 2. Redistributions in binary form must reproduce the above copyright |
| (...skipping 12 matching lines...) Expand all Loading... |
| 23 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 23 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 24 */ | 24 */ |
| 25 | 25 |
| 26 #include "config.h" | 26 #include "config.h" |
| 27 | 27 |
| 28 #include "platform/graphics/Canvas2DLayerBridge.h" | 28 #include "platform/graphics/Canvas2DLayerBridge.h" |
| 29 | 29 |
| 30 #include "GrContext.h" | 30 #include "GrContext.h" |
| 31 #include "SkDevice.h" | 31 #include "SkDevice.h" |
| 32 #include "SkSurface.h" | 32 #include "SkSurface.h" |
| 33 |
| 33 #include "platform/TraceEvent.h" | 34 #include "platform/TraceEvent.h" |
| 34 #include "platform/graphics/Canvas2DLayerManager.h" | 35 #include "platform/graphics/Canvas2DLayerManager.h" |
| 35 #include "platform/graphics/GraphicsLayer.h" | 36 #include "platform/graphics/GraphicsLayer.h" |
| 36 #include "public/platform/Platform.h" | 37 #include "public/platform/Platform.h" |
| 37 #include "public/platform/WebCompositorSupport.h" | 38 #include "public/platform/WebCompositorSupport.h" |
| 38 #include "public/platform/WebGraphicsContext3D.h" | 39 #include "public/platform/WebGraphicsContext3D.h" |
| 39 #include "public/platform/WebGraphicsContext3DProvider.h" | 40 #include "public/platform/WebGraphicsContext3DProvider.h" |
| 40 #include "wtf/RefCountedLeakCounter.h" | 41 #include "wtf/RefCountedLeakCounter.h" |
| 41 | 42 |
| 42 using blink::WebExternalTextureLayer; | 43 using blink::WebExternalTextureLayer; |
| (...skipping 517 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 560 return 0; | 561 return 0; |
| 561 m_canvas->flush(); | 562 m_canvas->flush(); |
| 562 context()->flush(); | 563 context()->flush(); |
| 563 GrRenderTarget* renderTarget = m_canvas->getTopDevice()->accessRenderTarget(
); | 564 GrRenderTarget* renderTarget = m_canvas->getTopDevice()->accessRenderTarget(
); |
| 564 if (renderTarget) { | 565 if (renderTarget) { |
| 565 return renderTarget->asTexture()->getTextureHandle(); | 566 return renderTarget->asTexture()->getTextureHandle(); |
| 566 } | 567 } |
| 567 return 0; | 568 return 0; |
| 568 } | 569 } |
| 569 | 570 |
| 571 PassRefPtr<SkImage> Canvas2DLayerBridge::newImageSnapshot() |
| 572 { |
| 573 return adoptRef(m_canvas->newImageSnapshot()); |
| 574 } |
| 575 |
| 570 Canvas2DLayerBridge::MailboxInfo::MailboxInfo(const MailboxInfo& other) { | 576 Canvas2DLayerBridge::MailboxInfo::MailboxInfo(const MailboxInfo& other) { |
| 571 // This copy constructor should only be used for Vector reallocation | 577 // This copy constructor should only be used for Vector reallocation |
| 572 // Assuming 'other' is to be destroyed, we transfer m_image ownership | 578 // Assuming 'other' is to be destroyed, we transfer m_image ownership |
| 573 // rather than do a refcount dance. | 579 // rather than do a refcount dance. |
| 574 memcpy(&m_mailbox, &other.m_mailbox, sizeof(m_mailbox)); | 580 memcpy(&m_mailbox, &other.m_mailbox, sizeof(m_mailbox)); |
| 575 m_image = const_cast<MailboxInfo*>(&other)->m_image.release(); | 581 m_image = const_cast<MailboxInfo*>(&other)->m_image.release(); |
| 576 m_status = other.m_status; | 582 m_status = other.m_status; |
| 577 } | 583 } |
| 578 | 584 |
| 579 } | 585 } |
| OLD | NEW |