[Skia] Remove use of deprecated Skia constant and struct field names
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 27 Mar 2012 02:13:08 +0000 (02:13 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 27 Mar 2012 02:13:08 +0000 (02:13 +0000)
https://bugs.webkit.org/show_bug.cgi?id=81034

Patch by Brian Salomon <bsalomon@google.com> 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):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@112193 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/platform/graphics/chromium/FrameBufferSkPictureCanvasLayerTextureUpdater.cpp
Source/WebCore/platform/graphics/chromium/cc/CCRenderSurfaceFilters.cpp
Source/WebCore/platform/graphics/skia/ImageBufferSkia.cpp

index bb8f1f7..5a2f1af 100644 (file)
@@ -1,3 +1,19 @@
+2012-03-26  Brian Salomon  <bsalomon@google.com>
+
+        [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  <nduca@chromium.org>
 
         [chromium] Add isInputThrottled/didBecomeReadyForAdditionalInput to WebWidget
index be217d9..0ca354d 100644 (file)
@@ -49,7 +49,7 @@ static PassOwnPtr<SkCanvas> createAcceleratedCanvas(GraphicsContext3D* context,
     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()));
index 513b461..35cf6ab 100644 (file)
@@ -203,7 +203,7 @@ SkBitmap CCRenderSurfaceFilters::apply(const FilterOperations& filters, unsigned
         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())
index 8b32239..8932046 100644 (file)
@@ -94,10 +94,10 @@ static SkCanvas* createAcceleratedCanvas(const IntSize& size, ImageBufferData* d
     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;