Merge 116722 - Sync with impl thread when removing references to external textures

Source/WebCore/platform/graphics/chromium/TextureLayerChromium.cpp

 /*
  * Copyright (C) 2010 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 36 matching lines @@
     , m_uvRect(0, 0, 1, 1)
     , m_premultipliedAlpha(true)
     , m_rateLimitContext(false)
     , m_contextLost(false)
     , m_textureId(0)
 {
 }
 
 TextureLayerChromium::~TextureLayerChromium()
 {
-    if (m_rateLimitContext && m_client && layerTreeHost())
-        layerTreeHost()->stopRateLimiter(m_client->context());
+    if (layerTreeHost()) {
+        if (m_textureId)
+            layerTreeHost()->acquireLayerTextures();
+        if (m_rateLimitContext && m_client)
+            layerTreeHost()->stopRateLimiter(m_client->context());
+    }
 }
 
 PassOwnPtr<CCLayerImpl> TextureLayerChromium::createCCLayerImpl()
 {
     return CCTextureLayerImpl::create(m_layerId);
 }
 
 void TextureLayerChromium::setFlipped(bool flipped)
 {
     m_flipped = flipped;
@@ skipping 15 matching lines @@
 void TextureLayerChromium::setRateLimitContext(bool rateLimit)
 {
     if (!rateLimit && m_rateLimitContext && m_client && layerTreeHost())
         layerTreeHost()->stopRateLimiter(m_client->context());
 
     m_rateLimitContext = rateLimit;
 }
 
 void TextureLayerChromium::setTextureId(unsigned id)
 {
+    if (m_textureId == id)
+        return;
+    if (m_textureId && layerTreeHost())
+        layerTreeHost()->acquireLayerTextures();
     m_textureId = id;
     setNeedsCommit();
 }
 
 void TextureLayerChromium::setNeedsDisplayRect(const FloatRect& dirtyRect)
 {
     LayerChromium::setNeedsDisplayRect(dirtyRect);
 
     if (m_rateLimitContext && m_client && layerTreeHost())
         layerTreeHost()->startRateLimiter(m_client->context());
 }
 
+void TextureLayerChromium::setLayerTreeHost(CCLayerTreeHost* host)
+{
+    if (m_textureId && layerTreeHost() && host != layerTreeHost())
+        layerTreeHost()->acquireLayerTextures();
+    LayerChromium::setLayerTreeHost(host);
+}
+
 bool TextureLayerChromium::drawsContent() const
 {
     return (m_client || m_textureId) && !m_contextLost && LayerChromium::drawsContent();
 }
 
 void TextureLayerChromium::update(CCTextureUpdater& updater, const CCOcclusionTracker*)
 {
     if (m_client) {
         m_textureId = m_client->prepareTexture(updater);
         m_contextLost = m_client->context()->getExtensions()->getGraphicsResetStatusARB() != GraphicsContext3D::NO_ERROR;
     }
 
     m_needsDisplay = false;
 }
 
 void TextureLayerChromium::pushPropertiesTo(CCLayerImpl* layer)
 {
     LayerChromium::pushPropertiesTo(layer);
 
     CCTextureLayerImpl* textureLayer = static_cast<CCTextureLayerImpl*>(layer);
     textureLayer->setFlipped(m_flipped);
     textureLayer->setUVRect(m_uvRect);
     textureLayer->setPremultipliedAlpha(m_premultipliedAlpha);
     textureLayer->setTextureId(m_textureId);
 }
 
 }
 #endif // USE(ACCELERATED_COMPOSITING)