Title: [112193] trunk/Source/WebCore
- Revision
- 112193
- Author
- [email protected]
- Date
- 2012-03-26 19:13:08 -0700 (Mon, 26 Mar 2012)
Log Message
[Skia] Remove use of deprecated Skia constant and struct field names
https://bugs.webkit.org/show_bug.cgi?id=81034
Patch by Brian Salomon <[email protected]> on 2012-03-26
Reviewed by James Robinson.
No behavior change, so no tests. The modified code is executed by many existing tests.
* platform/graphics/chromium/FrameBufferSkPictureCanvasLayerTextureUpdater.cpp:
(WebCore::createAcceleratedCanvas):
* platform/graphics/chromium/cc/CCRenderSurfaceFilters.cpp:
(WebCore::CCRenderSurfaceFilters::apply):
* platform/graphics/skia/ImageBufferSkia.cpp:
(WebCore::createAcceleratedCanvas):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (112192 => 112193)
--- trunk/Source/WebCore/ChangeLog 2012-03-27 02:03:47 UTC (rev 112192)
+++ trunk/Source/WebCore/ChangeLog 2012-03-27 02:13:08 UTC (rev 112193)
@@ -1,3 +1,19 @@
+2012-03-26 Brian Salomon <[email protected]>
+
+ [Skia] Remove use of deprecated Skia constant and struct field names
+ https://bugs.webkit.org/show_bug.cgi?id=81034
+
+ Reviewed by James Robinson.
+
+ No behavior change, so no tests. The modified code is executed by many existing tests.
+
+ * platform/graphics/chromium/FrameBufferSkPictureCanvasLayerTextureUpdater.cpp:
+ (WebCore::createAcceleratedCanvas):
+ * platform/graphics/chromium/cc/CCRenderSurfaceFilters.cpp:
+ (WebCore::CCRenderSurfaceFilters::apply):
+ * platform/graphics/skia/ImageBufferSkia.cpp:
+ (WebCore::createAcceleratedCanvas):
+
2012-03-26 Nat Duca <[email protected]>
[chromium] Add isInputThrottled/didBecomeReadyForAdditionalInput to WebWidget
Modified: trunk/Source/WebCore/platform/graphics/chromium/FrameBufferSkPictureCanvasLayerTextureUpdater.cpp (112192 => 112193)
--- trunk/Source/WebCore/platform/graphics/chromium/FrameBufferSkPictureCanvasLayerTextureUpdater.cpp 2012-03-27 02:03:47 UTC (rev 112192)
+++ trunk/Source/WebCore/platform/graphics/chromium/FrameBufferSkPictureCanvasLayerTextureUpdater.cpp 2012-03-27 02:13:08 UTC (rev 112193)
@@ -49,7 +49,7 @@
textureDesc.fFlags = kRenderTarget_GrPlatformTextureFlag;
textureDesc.fWidth = canvasSize.width();
textureDesc.fHeight = canvasSize.height();
- textureDesc.fConfig = kRGBA_8888_GrPixelConfig;
+ textureDesc.fConfig = kSkia8888_PM_GrPixelConfig;
textureDesc.fTextureHandle = texture->textureId();
SkAutoTUnref<GrTexture> target(grContext->createPlatformTexture(textureDesc));
SkAutoTUnref<SkDevice> device(new SkGpuDevice(grContext, target.get()));
Modified: trunk/Source/WebCore/platform/graphics/chromium/cc/CCRenderSurfaceFilters.cpp (112192 => 112193)
--- trunk/Source/WebCore/platform/graphics/chromium/cc/CCRenderSurfaceFilters.cpp 2012-03-27 02:03:47 UTC (rev 112192)
+++ trunk/Source/WebCore/platform/graphics/chromium/cc/CCRenderSurfaceFilters.cpp 2012-03-27 02:13:08 UTC (rev 112193)
@@ -203,7 +203,7 @@
desc.fSampleCnt = 0;
desc.fWidth = size.width();
desc.fHeight = size.height();
- desc.fConfig = kRGBA_8888_GrPixelConfig;
+ desc.fConfig = kSkia8888_PM_GrPixelConfig;
// FIXME: could we use approximate match, and fix texcoords on draw
dest = gr->lockScratchTexture(desc, GrContext::kExact_ScratchTexMatch);
if (!dest.texture())
Modified: trunk/Source/WebCore/platform/graphics/skia/ImageBufferSkia.cpp (112192 => 112193)
--- trunk/Source/WebCore/platform/graphics/skia/ImageBufferSkia.cpp 2012-03-27 02:03:47 UTC (rev 112192)
+++ trunk/Source/WebCore/platform/graphics/skia/ImageBufferSkia.cpp 2012-03-27 02:13:08 UTC (rev 112193)
@@ -94,10 +94,10 @@
gr->resetContext();
GrTextureDesc desc;
desc.fFlags = kRenderTarget_GrTextureFlagBit;
- desc.fAALevel = kNone_GrAALevel;
+ desc.fSampleCnt = 0;
desc.fWidth = size.width();
desc.fHeight = size.height();
- desc.fConfig = kRGBA_8888_GrPixelConfig;
+ desc.fConfig = kSkia8888_PM_GrPixelConfig;
SkAutoTUnref<GrTexture> texture(gr->createUncachedTexture(desc, 0, 0));
if (!texture.get())
return 0;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
