| 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 510 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 521 if (nameEquals(releasedMailboxInfo->m_mailbox, mailbox)) { | 521 if (nameEquals(releasedMailboxInfo->m_mailbox, mailbox)) { |
| 522 break; | 522 break; |
| 523 } | 523 } |
| 524 ASSERT(releasedMailboxInfo != firstMailbox); | 524 ASSERT(releasedMailboxInfo != firstMailbox); |
| 525 } | 525 } |
| 526 | 526 |
| 527 if (!contextLost) { | 527 if (!contextLost) { |
| 528 // Invalidate texture state in case the compositor altered it since the
copy-on-write. | 528 // Invalidate texture state in case the compositor altered it since the
copy-on-write. |
| 529 if (releasedMailboxInfo->m_image) { | 529 if (releasedMailboxInfo->m_image) { |
| 530 if (mailbox.validSyncToken) { | 530 if (mailbox.validSyncToken) { |
| 531 context()->waitSyncTokenCHROMIUM(mailbox.syncToken); | 531 context()->waitSyncToken(mailbox.syncToken); |
| 532 } | 532 } |
| 533 GrTexture* texture = releasedMailboxInfo->m_image->getTexture(); | 533 GrTexture* texture = releasedMailboxInfo->m_image->getTexture(); |
| 534 if (texture) { | 534 if (texture) { |
| 535 if (lostResource) { | 535 if (lostResource) { |
| 536 texture->abandon(); | 536 texture->abandon(); |
| 537 } else { | 537 } else { |
| 538 texture->textureParamsModified(); | 538 texture->textureParamsModified(); |
| 539 } | 539 } |
| 540 } | 540 } |
| 541 } | 541 } |
| (...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 646 } | 646 } |
| 647 | 647 |
| 648 Canvas2DLayerBridge::MailboxInfo::MailboxInfo(const MailboxInfo& other) | 648 Canvas2DLayerBridge::MailboxInfo::MailboxInfo(const MailboxInfo& other) |
| 649 { | 649 { |
| 650 memcpy(&m_mailbox, &other.m_mailbox, sizeof(m_mailbox)); | 650 memcpy(&m_mailbox, &other.m_mailbox, sizeof(m_mailbox)); |
| 651 m_image = other.m_image; | 651 m_image = other.m_image; |
| 652 m_parentLayerBridge = other.m_parentLayerBridge; | 652 m_parentLayerBridge = other.m_parentLayerBridge; |
| 653 } | 653 } |
| 654 | 654 |
| 655 } // namespace blink | 655 } // namespace blink |
| OLD | NEW |