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

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

 /*
  * Copyright (C) 2011 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 43 matching lines @@
 void LayerTextureUpdaterCanvas::paintContents(GraphicsContext& context, const IntRect& contentRect)
 {
     context.translate(-contentRect.x(), -contentRect.y());
     {
         TRACE_EVENT("LayerTextureUpdaterCanvas::paint", this, 0);
         m_painter->paint(context, contentRect);
     }
     m_contentRect = contentRect;
 }
 
-PassOwnPtr<LayerTextureUpdaterBitmap> LayerTextureUpdaterBitmap::create(PassOwnPtr<LayerPainterChromium> painter, bool useMapTexSubImage)
+PassRefPtr<LayerTextureUpdaterBitmap> LayerTextureUpdaterBitmap::create(PassOwnPtr<LayerPainterChromium> painter, bool useMapTexSubImage)
 {
-    return adoptPtr(new LayerTextureUpdaterBitmap(painter, useMapTexSubImage));
+    return adoptRef(new LayerTextureUpdaterBitmap(painter, useMapTexSubImage));
 }
 
 LayerTextureUpdaterBitmap::LayerTextureUpdaterBitmap(PassOwnPtr<LayerPainterChromium> painter, bool useMapTexSubImage)
     : LayerTextureUpdaterCanvas(painter)
     , m_texSubImage(useMapTexSubImage)
 {
 }
 
 LayerTextureUpdater::SampledTexelFormat LayerTextureUpdaterBitmap::sampledTexelFormat(GC3Denum textureFormat)
 {
@@ skipping 19 matching lines @@
 void LayerTextureUpdaterBitmap::updateTextureRect(GraphicsContext3D* context, ManagedTexture* texture, const IntRect& sourceRect, const IntRect& destRect)
 {
     PlatformCanvas::AutoLocker locker(&m_canvas);
 
     texture->bindTexture(context);
     m_texSubImage.upload(locker.pixels(), contentRect(), sourceRect, destRect, texture->format(), context);
 }
 
 #if !USE(THREADED_COMPOSITING)
 #if USE(SKIA)
-PassOwnPtr<LayerTextureUpdaterSkPicture> LayerTextureUpdaterSkPicture::create(PassOwnPtr<LayerPainterChromium> painter)
+PassRefPtr<LayerTextureUpdaterSkPicture> LayerTextureUpdaterSkPicture::create(PassOwnPtr<LayerPainterChromium> painter)
 {
-    return adoptPtr(new LayerTextureUpdaterSkPicture(painter));
+    return adoptRef(new LayerTextureUpdaterSkPicture(painter));
 }
 
 LayerTextureUpdaterSkPicture::LayerTextureUpdaterSkPicture(PassOwnPtr<LayerPainterChromium> painter)
     : LayerTextureUpdaterCanvas(painter)
     , m_context(0)
     , m_createFrameBuffer(false)
     , m_fbo(0)
     , m_depthStencilBuffer(0)
 {
 }
@@ skipping 133 matching lines @@
     m_canvas = adoptPtr(new SkCanvas(device.get()));
 
     context()->bindFramebuffer(GraphicsContext3D::FRAMEBUFFER, 0);
     return true;
 }
 #endif // SKIA
 #endif // !THREADED_COMPOSITING
 
 } // namespace WebCore
 #endif // USE(ACCELERATED_COMPOSITING)