diff options
author | skia.committer@gmail.com <skia.committer@gmail.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-04-01 03:07:47 +0000 |
---|---|---|
committer | skia.committer@gmail.com <skia.committer@gmail.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-04-01 03:07:47 +0000 |
commit | 2c48ee83c824964fbcb3dc4733055da0e75e154f (patch) | |
tree | 812044b50d04a5b8ec7de118f3025783e8d4a0e9 /src | |
parent | fa8cb1cf222f85aa898cfe979ac57da6a7b9f6f9 (diff) |
Sanitizing source files in Housekeeper-Nightly
git-svn-id: http://skia.googlecode.com/svn/trunk@14002 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src')
-rw-r--r-- | src/gpu/GrPictureUtils.cpp | 15 | ||||
-rw-r--r-- | src/gpu/SkGpuDevice.cpp | 10 |
2 files changed, 12 insertions, 13 deletions
diff --git a/src/gpu/GrPictureUtils.cpp b/src/gpu/GrPictureUtils.cpp index 20b8828d60..e8c3b504cf 100644 --- a/src/gpu/GrPictureUtils.cpp +++ b/src/gpu/GrPictureUtils.cpp @@ -8,7 +8,7 @@ #include "GrPictureUtils.h" #include "SkDevice.h" -// The GrGather device performs GPU-backend-specific preprocessing on +// The GrGather device performs GPU-backend-specific preprocessing on // a picture. The results are stored in a GPUAccelData. // // Currently the only interesting work is done in drawDevice (i.e., when a @@ -27,7 +27,7 @@ public: fInfo.fRestoreOpID = 0; fInfo.fHasNestedLayers = false; - fEmptyBitmap.setConfig(SkImageInfo::Make(fInfo.fSize.fWidth, + fEmptyBitmap.setConfig(SkImageInfo::Make(fInfo.fSize.fWidth, fInfo.fSize.fHeight, kUnknown_SkColorType, kIgnore_SkAlphaType)); @@ -187,11 +187,11 @@ private: // GrGatherDevice dev(w, h, picture, accelData); // GrGatherCanvas canvas(..., picture); // canvas.gather(); -// -// which is all just to fill in 'accelData' +// +// which is all just to fill in 'accelData' class SK_API GrGatherCanvas : public SkCanvas { public: - GrGatherCanvas(GrGatherDevice* device, SkPicture* pict) + GrGatherCanvas(GrGatherDevice* device, SkPicture* pict) : INHERITED(device) , fPicture(pict) { } @@ -232,8 +232,8 @@ private: typedef SkCanvas INHERITED; }; -// GatherGPUInfo is only intended to be called within the context of SkGpuDevice's -// EXPERIMENTAL_optimize method. +// GatherGPUInfo is only intended to be called within the context of SkGpuDevice's +// EXPERIMENTAL_optimize method. void GatherGPUInfo(SkPicture* pict, GPUAccelData* accelData) { if (0 == pict->width() || 0 == pict->height()) { return ; @@ -244,4 +244,3 @@ void GatherGPUInfo(SkPicture* pict, GPUAccelData* accelData) { canvas.gather(); } - diff --git a/src/gpu/SkGpuDevice.cpp b/src/gpu/SkGpuDevice.cpp index 1769f2b71f..052e6691a4 100644 --- a/src/gpu/SkGpuDevice.cpp +++ b/src/gpu/SkGpuDevice.cpp @@ -1983,12 +1983,12 @@ bool SkGpuDevice::EXPERIMENTAL_drawPicture(SkPicture* picture) { for (int i = 0; i < gpuData->numSaveLayers(); ++i) { const GPUAccelData::SaveLayerInfo& info = gpuData->saveLayerInfo(i); - SkDebugf("%d: Width: %d Height: %d SL: %d R: %d hasNestedLayers: %s\n", + SkDebugf("%d: Width: %d Height: %d SL: %d R: %d hasNestedLayers: %s\n", i, - info.fSize.fWidth, - info.fSize.fHeight, - info.fSaveLayerOpID, - info.fRestoreOpID, + info.fSize.fWidth, + info.fSize.fHeight, + info.fSaveLayerOpID, + info.fRestoreOpID, info.fHasNestedLayers ? "T" : "F"); } gPrintedAccelData = true; |