Title: [90270] trunk/Source/WebCore
- Revision
- 90270
- Author
- [email protected]
- Date
- 2011-07-01 13:27:46 -0700 (Fri, 01 Jul 2011)
Log Message
2011-07-01 Mike Reed <[email protected]>
Stop using deprecated SkDeviceFactory API
https://bugs.webkit.org/show_bug.cgi?id=63488
Reviewed by James Robinson.
No new tests. Check-point for removing Factory API from Skia
* platform/graphics/chromium/LayerTextureUpdaterCanvas.cpp:
(WebCore::LayerTextureUpdaterSkPicture::createFrameBuffer):
* platform/graphics/skia/PlatformContextSkia.cpp:
(WebCore::PlatformContextSkia::setSharedGraphicsContext3D):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (90269 => 90270)
--- trunk/Source/WebCore/ChangeLog 2011-07-01 20:08:49 UTC (rev 90269)
+++ trunk/Source/WebCore/ChangeLog 2011-07-01 20:27:46 UTC (rev 90270)
@@ -1,3 +1,17 @@
+2011-07-01 Mike Reed <[email protected]>
+
+ Stop using deprecated SkDeviceFactory API
+ https://bugs.webkit.org/show_bug.cgi?id=63488
+
+ Reviewed by James Robinson.
+
+ No new tests. Check-point for removing Factory API from Skia
+
+ * platform/graphics/chromium/LayerTextureUpdaterCanvas.cpp:
+ (WebCore::LayerTextureUpdaterSkPicture::createFrameBuffer):
+ * platform/graphics/skia/PlatformContextSkia.cpp:
+ (WebCore::PlatformContextSkia::setSharedGraphicsContext3D):
+
2011-07-01 Jeffrey Pfau <[email protected]>
Reviewed by Adam Barth.
Modified: trunk/Source/WebCore/platform/graphics/chromium/LayerTextureUpdaterCanvas.cpp (90269 => 90270)
--- trunk/Source/WebCore/platform/graphics/chromium/LayerTextureUpdaterCanvas.cpp 2011-07-01 20:08:49 UTC (rev 90269)
+++ trunk/Source/WebCore/platform/graphics/chromium/LayerTextureUpdaterCanvas.cpp 2011-07-01 20:27:46 UTC (rev 90270)
@@ -240,10 +240,8 @@
targetDesc.fStencilBits = 8;
targetDesc.fPlatformRenderTarget = m_fbo;
SkAutoTUnref<GrRenderTarget> target(static_cast<GrRenderTarget*>(m_skiaContext->createPlatformSurface(targetDesc)));
- SkAutoTUnref<SkDeviceFactory> factory(new SkGpuDeviceFactory(m_skiaContext, target.get()));
- SkAutoTUnref<SkDevice> device(factory.get()->newDevice(0, SkBitmap::kARGB_8888_Config, m_bufferSize.width(), m_bufferSize.height(), false, false));
- m_canvas = adoptPtr(new SkCanvas(factory.get()));
- m_canvas->setDevice(device.get());
+ SkAutoTUnref<SkDevice> device(new SkGpuDevice(m_skiaContext, target.get()));
+ m_canvas = adoptPtr(new SkCanvas(device.get()));
context()->bindFramebuffer(GraphicsContext3D::FRAMEBUFFER, 0);
return true;
Modified: trunk/Source/WebCore/platform/graphics/skia/PlatformContextSkia.cpp (90269 => 90270)
--- trunk/Source/WebCore/platform/graphics/skia/PlatformContextSkia.cpp 2011-07-01 20:08:49 UTC (rev 90269)
+++ trunk/Source/WebCore/platform/graphics/skia/PlatformContextSkia.cpp 2011-07-01 20:27:46 UTC (rev 90270)
@@ -740,17 +740,8 @@
GrPlatformSurfaceDesc drawBufDesc;
drawingBuffer->getGrPlatformSurfaceDesc(&drawBufDesc);
- 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)->unref();
+ SkAutoTUnref<GrTexture> drawBufTex(static_cast<GrTexture*>(gr->createPlatformSurface(drawBufDesc)));
+ m_canvas->setDevice(new SkGpuDevice(gr, drawBufTex.get()))->unref();
} else
m_accelerationMode = GPU;
} else {
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
