| 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 100 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 111 #ifndef NDEBUG | 111 #ifndef NDEBUG |
| 112 canvas2DLayerBridgeInstanceCounter.increment(); | 112 canvas2DLayerBridgeInstanceCounter.increment(); |
| 113 #endif | 113 #endif |
| 114 } | 114 } |
| 115 | 115 |
| 116 Canvas2DLayerBridge::~Canvas2DLayerBridge() | 116 Canvas2DLayerBridge::~Canvas2DLayerBridge() |
| 117 { | 117 { |
| 118 ASSERT(m_destructionInProgress); | 118 ASSERT(m_destructionInProgress); |
| 119 m_layer.clear(); | 119 m_layer.clear(); |
| 120 freeReleasedMailbox(); | 120 freeReleasedMailbox(); |
| 121 #if !ASSERT_DISABLED | 121 #if ASSERT_ENABLED |
| 122 Vector<MailboxInfo>::iterator mailboxInfo; | 122 Vector<MailboxInfo>::iterator mailboxInfo; |
| 123 for (mailboxInfo = m_mailboxes.begin(); mailboxInfo < m_mailboxes.end(); ++m
ailboxInfo) { | 123 for (mailboxInfo = m_mailboxes.begin(); mailboxInfo < m_mailboxes.end(); ++m
ailboxInfo) { |
| 124 ASSERT(mailboxInfo->m_status != MailboxInUse); | 124 ASSERT(mailboxInfo->m_status != MailboxInUse); |
| 125 ASSERT(mailboxInfo->m_status != MailboxReleased || m_contextProvider->co
ntext3d()->isContextLost() || !m_isSurfaceValid); | 125 ASSERT(mailboxInfo->m_status != MailboxReleased || m_contextProvider->co
ntext3d()->isContextLost() || !m_isSurfaceValid); |
| 126 } | 126 } |
| 127 #endif | 127 #endif |
| 128 m_mailboxes.clear(); | 128 m_mailboxes.clear(); |
| 129 #ifndef NDEBUG | 129 #ifndef NDEBUG |
| 130 canvas2DLayerBridgeInstanceCounter.decrement(); | 130 canvas2DLayerBridgeInstanceCounter.decrement(); |
| 131 #endif | 131 #endif |
| (...skipping 401 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 533 Canvas2DLayerBridge::MailboxInfo::MailboxInfo(const MailboxInfo& other) { | 533 Canvas2DLayerBridge::MailboxInfo::MailboxInfo(const MailboxInfo& other) { |
| 534 // This copy constructor should only be used for Vector reallocation | 534 // This copy constructor should only be used for Vector reallocation |
| 535 // Assuming 'other' is to be destroyed, we transfer m_image ownership | 535 // Assuming 'other' is to be destroyed, we transfer m_image ownership |
| 536 // rather than do a refcount dance. | 536 // rather than do a refcount dance. |
| 537 memcpy(&m_mailbox, &other.m_mailbox, sizeof(m_mailbox)); | 537 memcpy(&m_mailbox, &other.m_mailbox, sizeof(m_mailbox)); |
| 538 m_image = const_cast<MailboxInfo*>(&other)->m_image.release(); | 538 m_image = const_cast<MailboxInfo*>(&other)->m_image.release(); |
| 539 m_status = other.m_status; | 539 m_status = other.m_status; |
| 540 } | 540 } |
| 541 | 541 |
| 542 } | 542 } |
| OLD | NEW |