DEV/flutter_flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2026-02-20 02:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Roll Skia to 2ced78866fcadd98895777c8dffe92e229775181

Browse Source 
The Skia rolls will continue until morale improves.

New version of SkMemory_new_handler.cpp from Chromium.

TBR=chinmaygarde@google.com

Review URL: https://codereview.chromium.org/1235863004 .
This commit is contained in:
Adam Barth 2015-07-13 13:20:23 -07:00
parent a68126d95d
commit b3c618b9d8
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
engine/platform/graphics/DecodingImageGenerator.cpp
View File

@ -58,7 +58,7 @@ SkData* DecodingImageGenerator::onRefEncodedData()
return 0;
}
SkImageGenerator::Result DecodingImageGenerator::onGetPixels(const SkImageInfo& info, void* pixels, size_t rowBytes, const Options& options, SkPMColor ctable[], int* ctableCount)
bool DecodingImageGenerator::onGetPixels(const SkImageInfo& info, void* pixels, size_t rowBytes, SkPMColor ctable[], int* ctableCount)
{
TRACE_EVENT1("blink", "DecodingImageGenerator::getPixels", "index", static_cast<int>(m_frameIndex));
@ -66,11 +66,10 @@ SkImageGenerator::Result DecodingImageGenerator::onGetPixels(const SkImageInfo&
if (info.width() != info.width() || info.height() != info.height() || info.colorType() != info.colorType()) {
// ImageFrame may have changed the owning SkBitmap to kOpaque_SkAlphaType after sniffing the encoded data, so if we see a request
// for opaque, that is ok even if our initial alphatype was not opaque.
return Result::kInvalidScale;
return false;
}
bool decoded = m_frameGenerator->decodeAndScale(info, m_frameIndex, pixels, rowBytes);
return decoded ? Result::kSuccess : Result::kInvalidInput;
return m_frameGenerator->decodeAndScale(info, m_frameIndex, pixels, rowBytes);
}
bool DecodingImageGenerator::onGetYUV8Planes(SkISize sizes[3], void* planes[3], size_t rowBytes[3])

2
engine/platform/graphics/DecodingImageGenerator.h
View File

@ -50,7 +50,7 @@ public:
protected:
virtual SkData* onRefEncodedData() override;
virtual Result onGetPixels(const SkImageInfo&, void* pixels, size_t rowBytes, const Options& options, SkPMColor ctable[], int* ctableCount) override;
virtual bool onGetPixels(const SkImageInfo&, void* pixels, size_t rowBytes, SkPMColor ctable[], int* ctableCount) override;
virtual bool onGetYUV8Planes(SkISize sizes[3], void* planes[3], size_t rowBytes[3]) override;
private: