Merge 94964 - [chromium] REGRESSION(94353): Compositor textures and resources leaked when tab clo...

Source/WebCore/platform/graphics/chromium/VideoLayerChromium.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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 130 matching lines @@
         if (!m_textures[i].m_texture) {
             videoLayer->setSkipsDraw(true);
             break;
         }
         videoLayer->setTexture(i, m_textures[i].m_texture->textureId(), m_textures[i].m_texture->size(), m_textures[i].m_visibleSize);
     }
 }
 
 void VideoLayerChromium::setLayerTreeHost(CCLayerTreeHost* host)
 {
-    if (layerTreeHost() != host) {
+    if (host && layerTreeHost() != host) {
         for (size_t i = 0; i < 3; ++i) {
             m_textures[i].m_visibleSize = IntSize();
             m_textures[i].m_texture = ManagedTexture::create(host->contentsTextureManager());
         }
     }
 
     LayerChromium::setLayerTreeHost(host);
 }
 
 GC3Denum VideoLayerChromium::determineTextureFormat(const VideoFrameChromium* frame)
@@ skipping 89 matching lines @@
     if (!m_currentFrame)
         return;
 
     m_provider->putCurrentFrame(m_currentFrame);
     m_currentFrame = 0;
 }
 
 } // namespace WebCore
 
 #endif // USE(ACCELERATED_COMPOSITING)