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

Unified Diff: sky/engine/platform/graphics/Canvas2DLayerBridge.cpp

Issue 682573003: Update DEPS for chromium roll, fix few sky issues (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 2 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
« no previous file with comments | « DEPS ('k') | sky/engine/wtf/text/WTFString.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/platform/graphics/Canvas2DLayerBridge.cpp
diff --git a/sky/engine/platform/graphics/Canvas2DLayerBridge.cpp b/sky/engine/platform/graphics/Canvas2DLayerBridge.cpp
index 3df94ff34ad91e32ccd7235374d49669af529b17..d61c62ca567dbfa950e139f71afc48cd8c98545f 100644
--- a/sky/engine/platform/graphics/Canvas2DLayerBridge.cpp
+++ b/sky/engine/platform/graphics/Canvas2DLayerBridge.cpp
@@ -317,8 +317,6 @@ void Canvas2DLayerBridge::freeReleasedMailbox()
}
// Invalidate texture state in case the compositor altered it since the copy-on-write.
if (mailboxInfo->m_image) {
- if (isHidden() || releasedMailboxHasExpired())
- mailboxInfo->m_image->getTexture()->resetFlag(static_cast<GrTextureFlags>(GrTexture::kReturnToCache_FlagBit));
mailboxInfo->m_image->getTexture()->textureParamsModified();
mailboxInfo->m_image.clear();
}
@@ -505,9 +503,9 @@ void Canvas2DLayerBridge::mailboxReleased(const WebExternalTextureMailbox& mailb
// texture and remove the mailbox from list to avoid reusing it
// in future.
if (mailboxInfo->m_image) {
- mailboxInfo->m_image->getTexture()->resetFlag(
- static_cast<GrTextureFlags>(GrTexture::kReturnToCache_FlagBit));
- mailboxInfo->m_image->getTexture()->textureParamsModified();
+ GrTexture* texture = mailboxInfo->m_image->getTexture();
+ if (texture)
+ texture->textureParamsModified();
mailboxInfo->m_image.clear();
}
size_t i = mailboxInfo - m_mailboxes.begin();
« no previous file with comments | « DEPS ('k') | sky/engine/wtf/text/WTFString.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698