Changeset 86182 in webkit
- Timestamp:
- May 10, 2011 2:53:32 PM (13 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r86180 r86182 1 2011-05-10 Adam Barth <abarth@webkit.org> 2 3 Reviewed by David Levin. 4 5 Enable strict PassOwnPtr on Chromium 6 https://bugs.webkit.org/show_bug.cgi?id=60502 7 8 Technically there are a few bits in here that weren't reviewed by Dave, 9 but close enough for government work. This patch all fixes the 10 remaining strict PassOwnPtr violations on Chromium Linux. 11 12 * platform/graphics/chromium/PlatformCanvas.cpp: 13 (WebCore::PlatformCanvas::resize): 14 * platform/graphics/chromium/SimpleFontDataLinux.cpp: 15 * platform/graphics/skia/ImageBufferSkia.cpp: 16 (WebCore::ImageBuffer::ImageBuffer): 17 * platform/graphics/skia/PlatformContextSkia.cpp: 18 (WebCore::PlatformContextSkia::setSharedGraphicsContext3D): 19 1 20 2011-05-10 Brady Eidson <beidson@apple.com> 2 21 -
trunk/Source/WebCore/platform/graphics/chromium/PlatformCanvas.cpp
r85527 r86182 55 55 m_size = size; 56 56 #if USE(SKIA) 57 m_skiaCanvas = skia::CreateBitmapCanvas(size.width(), size.height(), false);57 m_skiaCanvas = adoptPtr(skia::CreateBitmapCanvas(size.width(), size.height(), false)); 58 58 #elif USE(CG) 59 59 size_t bufferSize = size.width() * size.height() * 4; -
trunk/Source/WebCore/platform/graphics/chromium/SimpleFontDataLinux.cpp
r81162 r86182 30 30 31 31 #include "config.h" 32 33 // FIXME: Remove this define! 34 #define LOOSE_PASS_OWN_PTR 35 32 36 #include "SimpleFontData.h" 33 37 -
trunk/Source/WebCore/platform/graphics/skia/ImageBufferSkia.cpp
r85135 r86182 67 67 , m_size(size) 68 68 { 69 SkCanvas* canvas = skia::CreateBitmapCanvas(size.width(), size.height(), false);69 OwnPtr<SkCanvas> canvas = adoptPtr(skia::CreateBitmapCanvas(size.width(), size.height(), false)); 70 70 if (!canvas) { 71 71 success = false; … … 73 73 } 74 74 75 m_data.m_canvas = canvas ;75 m_data.m_canvas = canvas.release(); 76 76 m_data.m_platformContext.setCanvas(m_data.m_canvas.get()); 77 77 m_context = adoptPtr(new GraphicsContext(&m_data.m_platformContext)); -
trunk/Source/WebCore/platform/graphics/skia/PlatformContextSkia.cpp
r85716 r86182 724 724 #if ENABLE(ACCELERATED_2D_CANVAS) 725 725 if (context && drawingBuffer) { 726 m_gpuCanvas = new GraphicsContextGPU(context, drawingBuffer, size);726 m_gpuCanvas = adoptPtr(new GraphicsContextGPU(context, drawingBuffer, size)); 727 727 m_uploadTexture.clear(); 728 728 drawingBuffer->setWillPublishCallback(WillPublishCallbackImpl::create(this)); … … 732 732 if (gr) { 733 733 m_accelerationMode = SkiaGPU; 734 734 735 735 context->makeContextCurrent(); 736 736 m_gpuCanvas->bindFramebuffer(); … … 742 742 drawingBuffer->getGrPlatformSurfaceDesc(&drawBufDesc); 743 743 GrTexture* drawBufTex = static_cast<GrTexture*>(gr->createPlatformSurface(drawBufDesc)); 744 // FIXME: This should use a smart pointer. 744 745 SkDeviceFactory* factory = new SkGpuDeviceFactory(gr, drawBufTex); 746 // FIXME: This should use a smart pointer. 745 747 drawBufTex->unref(); 746 748 749 // FIXME: This should use a smart pointer. 747 750 SkDevice* device = factory->newDevice(m_canvas, SkBitmap::kARGB_8888_Config, drawingBuffer->size().width(), drawingBuffer->size().height(), false, false); 751 // FIXME: This should use a smart pointer. 748 752 m_canvas->setDevice(device)->unref(); 749 753 m_canvas->setDeviceFactory(factory);
Note: See TracChangeset
for help on using the changeset viewer.