Merge 88258 - 2011-06-07 Alok Priyadarshi <alokp@chromium.org>

Source/WebCore/platform/graphics/skia/PlatformContextSkia.cpp

 /*
  * Copyright (c) 2008, 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 732 matching lines @@
             GrTexture* drawBufTex = static_cast<GrTexture*>(gr->createPlatformSurface(drawBufDesc));
             // FIXME: This should use a smart pointer.
             SkDeviceFactory* factory = new SkGpuDeviceFactory(gr, drawBufTex);
             // FIXME: This should use a smart pointer.
             drawBufTex->unref();
 
             // FIXME: This should use a smart pointer.
             SkDevice* device = factory->newDevice(m_canvas, SkBitmap::kARGB_8888_Config, drawingBuffer->size().width(), drawingBuffer->size().height(), false, false);
             // FIXME: This should use a smart pointer.
             m_canvas->setDevice(device)->unref();
-            m_canvas->setDeviceFactory(factory);
+            m_canvas->setDeviceFactory(factory)->unref();
         } else
             m_accelerationMode = GPU;
     } else {
         syncSoftwareCanvas();
         m_uploadTexture.clear();
         m_gpuCanvas.clear();
     }
 #endif
 }
 
@@ skipping 138 matching lines @@
                 // Swizzles from RGBA -> BGRA.
                 pixels[i] = (pixel & 0xFF00FF00) | ((pixel & 0x00FF0000) >> 16) | ((pixel & 0x000000FF) << 16);
             }
         }
     }
     m_softwareDirtyRect.unite(IntRect(0, 0, width, height)); // Mark everything as dirty.
 #endif
 }
 
 } // namespace WebCore