Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(106)

Unified Diff: Source/platform/graphics/Canvas2DLayerBridge.cpp

Issue 369043003: Let canvas decide how to handle the case of resource lost reported by client: 2D part (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: not use lostResource flag Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/platform/graphics/Canvas2DLayerBridge.cpp
diff --git a/Source/platform/graphics/Canvas2DLayerBridge.cpp b/Source/platform/graphics/Canvas2DLayerBridge.cpp
index 5e2f83c293a99350ea6c8b818abf25026147f5bf..dce52df4a7abc11bf5baaa9da0e62b53a43b7493 100644
--- a/Source/platform/graphics/Canvas2DLayerBridge.cpp
+++ b/Source/platform/graphics/Canvas2DLayerBridge.cpp
@@ -489,28 +489,38 @@ Canvas2DLayerBridge::MailboxInfo* Canvas2DLayerBridge::createMailboxInfo() {
return mailboxInfo;
}
-void Canvas2DLayerBridge::mailboxReleased(const blink::WebExternalTextureMailbox& mailbox)
+void Canvas2DLayerBridge::mailboxReleased(const blink::WebExternalTextureMailbox& mailbox, bool lostResource)
danakj 2014/07/03 15:09:02 why is this bool never used? If it's true just del
Hongbo Min 2014/07/07 04:30:28 See comments in DrawingBuffer.
{
freeReleasedMailbox(); // Never have more than one mailbox in the released state.
+ bool contextLost = m_contextProvider->context3d()->isContextLost() || !m_isSurfaceValid;
Vector<MailboxInfo>::iterator mailboxInfo;
for (mailboxInfo = m_mailboxes.begin(); mailboxInfo < m_mailboxes.end(); ++mailboxInfo) {
if (nameEquals(mailboxInfo->m_mailbox, mailbox)) {
mailboxInfo->m_mailbox.syncPoint = mailbox.syncPoint;
ASSERT(mailboxInfo->m_status == MailboxInUse);
- mailboxInfo->m_status = MailboxReleased;
// Trigger Canvas2DLayerBridge self-destruction if this is the
// last live mailbox and the layer bridge is not externally
// referenced.
- m_releasedMailboxInfoIndex = mailboxInfo - m_mailboxes.begin();
- m_framesSinceMailboxRelease = 0;
- if (isHidden()) {
- freeReleasedMailbox();
- } else {
- ASSERT(!m_destructionInProgress);
- Canvas2DLayerManager::get().layerTransientResourceAllocationChanged(this);
- }
ASSERT(mailboxInfo->m_parentLayerBridge.get() == this);
mailboxInfo->m_parentLayerBridge.clear();
+
+ if (contextLost) {
+ // No need to clean up the mailbox resource, but make sure the
+ // mailbox can also be reusable once the context is restored.
+ mailboxInfo->m_status = MailboxAvailable;
+ m_releasedMailboxInfoIndex = InvalidMailboxIndex;
+ Canvas2DLayerManager::get().layerTransientResourceAllocationChanged(this);
+ } else {
+ mailboxInfo->m_status = MailboxReleased;
+ m_releasedMailboxInfoIndex = mailboxInfo - m_mailboxes.begin();
+ m_framesSinceMailboxRelease = 0;
+ if (isHidden()) {
+ freeReleasedMailbox();
+ } else {
+ ASSERT(!m_destructionInProgress);
+ Canvas2DLayerManager::get().layerTransientResourceAllocationChanged(this);
+ }
+ }
return;
}
}

Powered by Google App Engine
This is Rietveld 408576698