| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (c) 2010, Google Inc. All rights reserved. | 2 * Copyright (c) 2010, 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 are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * 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 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 258 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 269 markLayerComposited(); | 269 markLayerComposited(); |
| 270 | 270 |
| 271 // set m_parentDrawingBuffer to make sure 'this' stays alive as long as it h
as live mailboxes | 271 // set m_parentDrawingBuffer to make sure 'this' stays alive as long as it h
as live mailboxes |
| 272 ASSERT(!frontColorBufferMailbox->m_parentDrawingBuffer); | 272 ASSERT(!frontColorBufferMailbox->m_parentDrawingBuffer); |
| 273 frontColorBufferMailbox->m_parentDrawingBuffer = this; | 273 frontColorBufferMailbox->m_parentDrawingBuffer = this; |
| 274 *outMailbox = frontColorBufferMailbox->mailbox; | 274 *outMailbox = frontColorBufferMailbox->mailbox; |
| 275 m_frontColorBuffer = frontColorBufferMailbox->textureInfo; | 275 m_frontColorBuffer = frontColorBufferMailbox->textureInfo; |
| 276 return true; | 276 return true; |
| 277 } | 277 } |
| 278 | 278 |
| 279 void DrawingBuffer::mailboxReleased(const blink::WebExternalTextureMailbox& mail
box) | 279 void DrawingBuffer::mailboxReleased(const blink::WebExternalTextureMailbox& mail
box, bool lostResource) |
| 280 { | 280 { |
| 281 if (m_destructionInProgress) { | 281 if (m_destructionInProgress && !m_context->isContextLost()) { |
| 282 mailboxReleasedWhileDestructionInProgress(mailbox); | 282 mailboxReleasedWhileDestructionInProgress(mailbox); |
| 283 return; | 283 return; |
| 284 } | 284 } |
| 285 | 285 |
| 286 for (size_t i = 0; i < m_textureMailboxes.size(); i++) { | 286 for (size_t i = 0; i < m_textureMailboxes.size(); i++) { |
| 287 RefPtr<MailboxInfo> mailboxInfo = m_textureMailboxes[i]; | 287 RefPtr<MailboxInfo> mailboxInfo = m_textureMailboxes[i]; |
| 288 if (nameEquals(mailboxInfo->mailbox, mailbox)) { | 288 if (nameEquals(mailboxInfo->mailbox, mailbox)) { |
| 289 mailboxInfo->mailbox.syncPoint = mailbox.syncPoint; | 289 mailboxInfo->mailbox.syncPoint = mailbox.syncPoint; |
| 290 ASSERT(mailboxInfo->m_parentDrawingBuffer.get() == this); | 290 ASSERT(mailboxInfo->m_parentDrawingBuffer.get() == this); |
| 291 mailboxInfo->m_parentDrawingBuffer.clear(); | 291 mailboxInfo->m_parentDrawingBuffer.clear(); |
| 292 m_recycledMailboxQueue.prepend(mailboxInfo->mailbox); | 292 if (!m_context->isContextLost()) |
| 293 m_recycledMailboxQueue.prepend(mailboxInfo->mailbox); |
| 293 return; | 294 return; |
| 294 } | 295 } |
| 295 } | 296 } |
| 296 ASSERT_NOT_REACHED(); | 297 ASSERT_NOT_REACHED(); |
| 297 } | 298 } |
| 298 | 299 |
| 299 void DrawingBuffer::mailboxReleasedWhileDestructionInProgress(const blink::WebEx
ternalTextureMailbox& mailbox) | 300 void DrawingBuffer::mailboxReleasedWhileDestructionInProgress(const blink::WebEx
ternalTextureMailbox& mailbox) |
| 300 { | 301 { |
| 301 ASSERT(m_textureMailboxes.size()); | 302 ASSERT(m_textureMailboxes.size()); |
| 302 m_context->makeContextCurrent(); | 303 m_context->makeContextCurrent(); |
| (...skipping 760 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1063 void DrawingBuffer::deleteChromiumImageForTexture(TextureInfo* info) | 1064 void DrawingBuffer::deleteChromiumImageForTexture(TextureInfo* info) |
| 1064 { | 1065 { |
| 1065 if (info->imageId) { | 1066 if (info->imageId) { |
| 1066 m_context->releaseTexImage2DCHROMIUM(GL_TEXTURE_2D, info->imageId); | 1067 m_context->releaseTexImage2DCHROMIUM(GL_TEXTURE_2D, info->imageId); |
| 1067 m_context->destroyImageCHROMIUM(info->imageId); | 1068 m_context->destroyImageCHROMIUM(info->imageId); |
| 1068 info->imageId = 0; | 1069 info->imageId = 0; |
| 1069 } | 1070 } |
| 1070 } | 1071 } |
| 1071 | 1072 |
| 1072 } // namespace WebCore | 1073 } // namespace WebCore |
| OLD | NEW |