Merge 95506 - [chromium] ContentLayer's texture updater deleted during paint when compositing tur...

Source/WebCore/platform/graphics/chromium/ImageLayerChromium.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 27 matching lines @@
 #include "LayerTextureSubImage.h"
 #include "LayerTextureUpdater.h"
 #include "ManagedTexture.h"
 #include "PlatformColor.h"
 #include "cc/CCLayerImpl.h"
 #include "cc/CCLayerTreeHost.h"
 
 namespace WebCore {
 
 class ImageLayerTextureUpdater : public LayerTextureUpdater {
-    WTF_MAKE_NONCOPYABLE(ImageLayerTextureUpdater);
 public:
-    static PassOwnPtr<ImageLayerTextureUpdater> create(bool useMapTexSubImage)
+    static PassRefPtr<ImageLayerTextureUpdater> create(bool useMapTexSubImage)
     {
-        return adoptPtr(new ImageLayerTextureUpdater(useMapTexSubImage));
+        return adoptRef(new ImageLayerTextureUpdater(useMapTexSubImage));
     }
 
     virtual ~ImageLayerTextureUpdater() { }
 
     virtual Orientation orientation() { return LayerTextureUpdater::BottomUpOrientation; }
 
     virtual SampledTexelFormat sampledTexelFormat(GC3Denum textureFormat)
     {
         return PlatformColor::sameComponentOrder(textureFormat) ?
                 LayerTextureUpdater::SampledTexelFormatRGBA : LayerTextureUpdater::SampledTexelFormatBGRA;
@@ skipping 116 matching lines @@
     return m_contents && TiledLayerChromium::drawsContent();
 }
 
 void ImageLayerChromium::createTextureUpdater(const CCLayerTreeHost* host)
 {
     m_textureUpdater = ImageLayerTextureUpdater::create(host->layerRendererCapabilities().usingMapSub);
 }
 
 }
 #endif // USE(ACCELERATED_COMPOSITING)