From ca1c0751792d981bb74828a0f6ebef0d8e10e567 Mon Sep 17 00:00:00 2001 From: James Robinson Date: Sun, 26 Oct 2014 23:50:52 -0700 Subject: [PATCH] Update DEPS for chromium roll, fix few sky issues This updates DEPS to match the recent chromium roll and applies the following changes to sky to accomodate the skia roll: https://src.chromium.org/viewvc/blink?revision=184191&view=revision https://src.chromium.org/viewvc/blink?revision=184289&view=revision as well as adding #include to WTFString.h so it compiles for translation units that include this without #including themselves, which currently happens in a number of files in the android build. TBR=abarth@chromium.org Review URL: https://codereview.chromium.org/682573003 --- engine/platform/graphics/Canvas2DLayerBridge.cpp | 8 +++----- engine/wtf/text/WTFString.h | 1 + 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/engine/platform/graphics/Canvas2DLayerBridge.cpp b/engine/platform/graphics/Canvas2DLayerBridge.cpp index 3df94ff34..d61c62ca5 100644 --- a/engine/platform/graphics/Canvas2DLayerBridge.cpp +++ b/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(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(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(); diff --git a/engine/wtf/text/WTFString.h b/engine/wtf/text/WTFString.h index 62c7a25fa..6c35990b4 100644 --- a/engine/wtf/text/WTFString.h +++ b/engine/wtf/text/WTFString.h @@ -24,6 +24,7 @@ // This file would be called String.h, but that conflicts with // on systems without case-sensitive file systems. +#include #include "wtf/HashTableDeletedValueType.h" #include "wtf/WTFExport.h" -- GitLab