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 518 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
561 willUse(); | 562 willUse(); |
562 m_canvas->flush(); | 563 m_canvas->flush(); |
563 context()->flush(); | 564 context()->flush(); |
564 GrRenderTarget* renderTarget = m_canvas->getTopDevice()->accessRenderTarget(
); | 565 GrRenderTarget* renderTarget = m_canvas->getTopDevice()->accessRenderTarget(
); |
565 if (renderTarget) { | 566 if (renderTarget) { |
566 return renderTarget->asTexture()->getTextureHandle(); | 567 return renderTarget->asTexture()->getTextureHandle(); |
567 } | 568 } |
568 return 0; | 569 return 0; |
569 } | 570 } |
570 | 571 |
| 572 PassRefPtr<SkImage> Canvas2DLayerBridge::newImageSnapshot() |
| 573 { |
| 574 return adoptRef(m_canvas->newImageSnapshot()); |
| 575 } |
| 576 |
571 Canvas2DLayerBridge::MailboxInfo::MailboxInfo(const MailboxInfo& other) { | 577 Canvas2DLayerBridge::MailboxInfo::MailboxInfo(const MailboxInfo& other) { |
572 // This copy constructor should only be used for Vector reallocation | 578 // This copy constructor should only be used for Vector reallocation |
573 // Assuming 'other' is to be destroyed, we transfer m_image ownership | 579 // Assuming 'other' is to be destroyed, we transfer m_image ownership |
574 // rather than do a refcount dance. | 580 // rather than do a refcount dance. |
575 memcpy(&m_mailbox, &other.m_mailbox, sizeof(m_mailbox)); | 581 memcpy(&m_mailbox, &other.m_mailbox, sizeof(m_mailbox)); |
576 m_image = const_cast<MailboxInfo*>(&other)->m_image.release(); | 582 m_image = const_cast<MailboxInfo*>(&other)->m_image.release(); |
577 m_status = other.m_status; | 583 m_status = other.m_status; |
578 } | 584 } |
579 | 585 |
580 } | 586 } |
OLD | NEW |