| 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 13 matching lines...) Expand all  Loading... | 
|   24  */ |   24  */ | 
|   25  |   25  | 
|   26 #include "config.h" |   26 #include "config.h" | 
|   27  |   27  | 
|   28 #include "core/platform/graphics/Canvas2DLayerBridge.h" |   28 #include "core/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 #include "core/platform/graphics/Canvas2DLayerManager.h" |   33 #include "core/platform/graphics/Canvas2DLayerManager.h" | 
|   34 #include "core/platform/graphics/GraphicsContext3D.h" |  | 
|   35 #include "core/platform/graphics/GraphicsLayer.h" |   34 #include "core/platform/graphics/GraphicsLayer.h" | 
|   36 #include "core/platform/graphics/gpu/SharedGraphicsContext3D.h" |   35 #include "core/platform/graphics/gpu/SharedGraphicsContext3D.h" | 
|   37 #include "platform/TraceEvent.h" |   36 #include "platform/TraceEvent.h" | 
|   38 #include "public/platform/Platform.h" |   37 #include "public/platform/Platform.h" | 
|   39 #include "public/platform/WebCompositorSupport.h" |   38 #include "public/platform/WebCompositorSupport.h" | 
|   40 #include "public/platform/WebGraphicsContext3D.h" |   39 #include "public/platform/WebGraphicsContext3D.h" | 
|   41  |   40  | 
|   42 using blink::WebExternalTextureLayer; |   41 using blink::WebExternalTextureLayer; | 
|   43 using blink::WebGraphicsContext3D; |   42 using blink::WebGraphicsContext3D; | 
|   44  |   43  | 
| (...skipping 372 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  417 Canvas2DLayerBridge::MailboxInfo::MailboxInfo(const MailboxInfo& other) { |  416 Canvas2DLayerBridge::MailboxInfo::MailboxInfo(const MailboxInfo& other) { | 
|  418     // This copy constructor should only be used for Vector reallocation |  417     // This copy constructor should only be used for Vector reallocation | 
|  419     // Assuming 'other' is to be destroyed, we swap m_image ownership |  418     // Assuming 'other' is to be destroyed, we swap m_image ownership | 
|  420     // rather than do a refcount dance. |  419     // rather than do a refcount dance. | 
|  421     memcpy(&m_mailbox, &other.m_mailbox, sizeof(m_mailbox)); |  420     memcpy(&m_mailbox, &other.m_mailbox, sizeof(m_mailbox)); | 
|  422     m_image.swap(const_cast<SkAutoTUnref<SkImage>*>(&other.m_image)); |  421     m_image.swap(const_cast<SkAutoTUnref<SkImage>*>(&other.m_image)); | 
|  423     m_status = other.m_status; |  422     m_status = other.m_status; | 
|  424 } |  423 } | 
|  425  |  424  | 
|  426 } |  425 } | 
| OLD | NEW |