Changeset 112193 in webkit

Timestamp:

Mar 26, 2012 7:13:08 PM (12 years ago)

Author:

commit-queue@webkit.org

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 <​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):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/chromium/FrameBufferSkPictureCanvasLayerTextureUpdater.cpp (modified) (1 diff)
• platform/graphics/chromium/cc/CCRenderSurfaceFilters.cpp (modified) (1 diff)
• platform/graphics/skia/ImageBufferSkia.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+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>
 

trunk/Source/WebCore/platform/graphics/chromium/FrameBufferSkPictureCanvasLayerTextureUpdater.cpp

@@ -50 +50 @@
     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));

trunk/Source/WebCore/platform/graphics/chromium/cc/CCRenderSurfaceFilters.cpp

@@ -204 +204 @@
         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);

trunk/Source/WebCore/platform/graphics/skia/ImageBufferSkia.cpp

@@ -95 +95 @@
     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())