cc: Fix nine patch layer resource management bugs.

cc/nine_patch_layer.cc

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 
 #include "cc/nine_patch_layer.h"
 
 #include "cc/layer_tree_host.h"
 #include "cc/nine_patch_layer_impl.h"
@@ skipping 45 matching lines @@
     m_bitmap = bitmap;
     m_imageAperture = aperture;
     m_bitmapDirty = true;
     setNeedsDisplay();
 }
 
 void NinePatchLayer::update(ResourceUpdateQueue& queue, const OcclusionTracker* occlusion, RenderingStats& stats)
 {
     createUpdaterIfNeeded();
 
-    if (m_resource && (m_bitmapDirty || m_resource->texture()->backingResourceWasEvicted())) {
+    if (m_resource && (m_bitmapDirty || m_resource->texture()->resourceId() == 0)) {
         gfx::Rect contentRect(gfx::Point(), gfx::Size(m_bitmap.width(), m_bitmap.height()));
         ResourceUpdate upload = ResourceUpdate::Create(m_resource->texture(), &m_bitmap, contentRect, contentRect, gfx::Vector2d());
         queue.appendFullUpload(upload);
         m_bitmapDirty = false;
     }
 }
 
 void NinePatchLayer::createUpdaterIfNeeded()
 {
     if (m_updater)
         return;
 
     m_updater = ImageLayerUpdater::create();
 }
 
 bool NinePatchLayer::drawsContent() const
 {
     bool draws = !m_bitmap.isNull() && Layer::drawsContent() && m_bitmap.width() && m_bitmap.height();
     return draws;
 }
 
 void NinePatchLayer::pushPropertiesTo(LayerImpl* layer)
 {
     Layer::pushPropertiesTo(layer);
     NinePatchLayerImpl* layerImpl = static_cast<NinePatchLayerImpl*>(layer);
 
-    DCHECK(!m_bitmap.isNull());
-    DCHECK(m_resource);
-    layerImpl->setResourceId(m_resource->texture()->resourceId());
-    layerImpl->setLayout(gfx::Size(m_bitmap.width(), m_bitmap.height()), m_imageAperture);
+    if (m_resource) {
+        DCHECK(!m_bitmap.isNull());
+        layerImpl->setResourceId(m_resource->texture()->resourceId());
+        layerImpl->setLayout(gfx::Size(m_bitmap.width(), m_bitmap.height()), m_imageAperture);
+    }
 }
 
 }