AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "Restore old SkBitmapDeviceFilteredSurfaceProps"

Browse Source 
This reverts commit 3d5b83bf95.

Reason for revert: Need to revert to revert previous change

Original change's description:
> Restore old SkBitmapDeviceFilteredSurfaceProps
> 
> The old seemingly unnecessary assignment is needed, otherwise
> skbug.com/7909 won't be fixed, and we will also introduce some
> unexpected gold changes.
> 
> Ben: did you remember why you originally have that additional
> assignment? Probably related with SkTLazy?
> 
> Bug: skia:7909
> TBR: bungeman@google.com
> Change-Id: I20293b76bb448733d3ab4a90d40282b1420000d0
> Reviewed-on: https://skia-review.googlesource.com/126204
> Reviewed-by: Yuqian Li <liyuqian@google.com>
> Commit-Queue: Yuqian Li <liyuqian@google.com>

TBR=bungeman@google.com,liyuqian@google.com

# Not skipping CQ checks because original CL landed > 1 day ago.

Bug: skia:7909
Change-Id: I27841ba2040ad026e67402e3b11a2b0ba5a55cb9
Reviewed-on: https://skia-review.googlesource.com/126321
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Greg Daniel <egdaniel@google.com>
This commit is contained in:
Greg Daniel 2018-05-06 13:45:43 +00:00
parent 32d8f883bd
commit 963d1ef8ac
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/core/SkBitmapDevice.h
View File

@ -182,20 +182,17 @@ private:
class SkBitmapDeviceFilteredSurfaceProps { class SkBitmapDeviceFilteredSurfaceProps {
public: public:
SkBitmapDeviceFilteredSurfaceProps(const SkBitmap& bitmap, const SkPaint& paint, SkBitmapDeviceFilteredSurfaceProps(const SkBitmap& bitmap, const SkPaint& paint,
const SkSurfaceProps& surfaceProps) { const SkSurfaceProps& surfaceProps)
if (kN32_SkColorType != bitmap.colorType() || !paint.isSrcOver()) { : fSurfaceProps((kN32_SkColorType != bitmap.colorType() || !paint.isSrcOver())
SkSurfaceProps* newProps = fLazy.init(surfaceProps.flags(), kUnknown_SkPixelGeometry); ? fLazy.init(surfaceProps.flags(), kUnknown_SkPixelGeometry)
fSurfaceProps = newProps; : &surfaceProps)
} else { { }
fSurfaceProps = &surfaceProps;
}
}
const SkSurfaceProps& operator()() const { return *fSurfaceProps; } const SkSurfaceProps& operator()() const { return *fSurfaceProps; }
private: private:
const SkSurfaceProps* fSurfaceProps;
SkTLazy<SkSurfaceProps> fLazy; SkTLazy<SkSurfaceProps> fLazy;
SkSurfaceProps const * const fSurfaceProps;
}; };
#endif // SkBitmapDevice_DEFINED #endif // SkBitmapDevice_DEFINED