Title: [126795] trunk/Source/WebCore
- Revision
- 126795
- Author
- [email protected]
- Date
- 2012-08-27 14:22:29 -0700 (Mon, 27 Aug 2012)
Log Message
[Skia/Chromium] Remove use of deprecated Skia names
https://bugs.webkit.org/show_bug.cgi?id=95108
Patch by Brian Salomon <[email protected]> on 2012-08-27
Reviewed by Eric Seidel.
kSkia8888_PM_GrPixelConfig has been deprecated in favor of kSkia8888_GrPixelConfig.
SkGrTexturePixelRef has been deprecated in favor of SkGrPixelRef.
Covered by existing tests (image filter and canvas tests).
* platform/graphics/chromium/FrameBufferSkPictureCanvasLayerTextureUpdater.cpp:
(WebCore::createAcceleratedCanvas):
* platform/graphics/chromium/cc/CCRenderSurfaceFilters.cpp:
* platform/graphics/skia/ImageBufferSkia.cpp:
(WebCore::createAcceleratedCanvas):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (126794 => 126795)
--- trunk/Source/WebCore/ChangeLog 2012-08-27 21:20:43 UTC (rev 126794)
+++ trunk/Source/WebCore/ChangeLog 2012-08-27 21:22:29 UTC (rev 126795)
@@ -1,3 +1,21 @@
+2012-08-27 Brian Salomon <[email protected]>
+
+ [Skia/Chromium] Remove use of deprecated Skia names
+ https://bugs.webkit.org/show_bug.cgi?id=95108
+
+ Reviewed by Eric Seidel.
+
+ kSkia8888_PM_GrPixelConfig has been deprecated in favor of kSkia8888_GrPixelConfig.
+ SkGrTexturePixelRef has been deprecated in favor of SkGrPixelRef.
+
+ Covered by existing tests (image filter and canvas tests).
+
+ * platform/graphics/chromium/FrameBufferSkPictureCanvasLayerTextureUpdater.cpp:
+ (WebCore::createAcceleratedCanvas):
+ * platform/graphics/chromium/cc/CCRenderSurfaceFilters.cpp:
+ * platform/graphics/skia/ImageBufferSkia.cpp:
+ (WebCore::createAcceleratedCanvas):
+
2012-08-27 Adrienne Walker <[email protected]>
[chromium] Unreviewed, remove OVERRIDE from non-virtual function.
Modified: trunk/Source/WebCore/platform/graphics/chromium/FrameBufferSkPictureCanvasLayerTextureUpdater.cpp (126794 => 126795)
--- trunk/Source/WebCore/platform/graphics/chromium/FrameBufferSkPictureCanvasLayerTextureUpdater.cpp 2012-08-27 21:20:43 UTC (rev 126794)
+++ trunk/Source/WebCore/platform/graphics/chromium/FrameBufferSkPictureCanvasLayerTextureUpdater.cpp 2012-08-27 21:22:29 UTC (rev 126795)
@@ -50,7 +50,7 @@
textureDesc.fFlags = kRenderTarget_GrPlatformTextureFlag;
textureDesc.fWidth = canvasSize.width();
textureDesc.fHeight = canvasSize.height();
- textureDesc.fConfig = kSkia8888_PM_GrPixelConfig;
+ textureDesc.fConfig = kSkia8888_GrPixelConfig;
textureDesc.fTextureHandle = 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 (126794 => 126795)
--- trunk/Source/WebCore/platform/graphics/chromium/cc/CCRenderSurfaceFilters.cpp 2012-08-27 21:20:43 UTC (rev 126794)
+++ trunk/Source/WebCore/platform/graphics/chromium/cc/CCRenderSurfaceFilters.cpp 2012-08-27 21:22:29 UTC (rev 126795)
@@ -34,7 +34,7 @@
#include "SkCanvas.h"
#include "SkColorMatrixFilter.h"
#include "SkGpuDevice.h"
-#include "SkGrTexturePixelRef.h"
+#include "SkGrPixelRef.h"
#include "SkMagnifierImageFilter.h"
#include <public/WebFilterOperation.h>
#include <public/WebFilterOperations.h>
@@ -265,12 +265,12 @@
GrPlatformTextureDesc platformTextureDescription;
platformTextureDescription.fWidth = size.width();
platformTextureDescription.fHeight = size.height();
- platformTextureDescription.fConfig = kSkia8888_PM_GrPixelConfig;
+ platformTextureDescription.fConfig = kSkia8888_GrPixelConfig;
platformTextureDescription.fTextureHandle = textureId;
SkAutoTUnref<GrTexture> texture(grContext->createPlatformTexture(platformTextureDescription));
// Place the platform texture inside an SkBitmap.
m_source.setConfig(SkBitmap::kARGB_8888_Config, size.width(), size.height());
- m_source.setPixelRef(new SkGrTexturePixelRef(texture.get()))->unref();
+ m_source.setPixelRef(new SkGrPixelRef(texture.get()))->unref();
}
~FilterBufferState() { }
@@ -283,7 +283,7 @@
desc.fSampleCnt = 0;
desc.fWidth = m_source.width();
desc.fHeight = m_source.height();
- desc.fConfig = kSkia8888_PM_GrPixelConfig;
+ desc.fConfig = kSkia8888_GrPixelConfig;
for (int i = 0; i < scratchCount; ++i) {
GrAutoScratchTexture scratchTexture(m_grContext, desc, GrContext::kExact_ScratchTexMatch);
m_scratchTextures[i].reset(scratchTexture.detach());
@@ -308,7 +308,7 @@
m_canvas.reset(0);
m_device.reset(0);
- m_source.setPixelRef(new SkGrTexturePixelRef(m_scratchTextures[m_currentTexture].get()))->unref();
+ m_source.setPixelRef(new SkGrPixelRef(m_scratchTextures[m_currentTexture].get()))->unref();
m_currentTexture = 1 - m_currentTexture;
}
Modified: trunk/Source/WebCore/platform/graphics/skia/ImageBufferSkia.cpp (126794 => 126795)
--- trunk/Source/WebCore/platform/graphics/skia/ImageBufferSkia.cpp 2012-08-27 21:20:43 UTC (rev 126794)
+++ trunk/Source/WebCore/platform/graphics/skia/ImageBufferSkia.cpp 2012-08-27 21:22:29 UTC (rev 126795)
@@ -85,7 +85,7 @@
desc.fSampleCnt = 0;
desc.fWidth = size.width();
desc.fHeight = size.height();
- desc.fConfig = kSkia8888_PM_GrPixelConfig;
+ desc.fConfig = kSkia8888_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/webkit-changes
