From ec267de8d94f8cef3b47e4d2b240fc8f86a37253 Mon Sep 17 00:00:00 2001 From: Eric Seidel Date: Mon, 23 Feb 2015 14:42:04 -0800 Subject: [PATCH] Revert "Pull chromium at 2c3ffb2355a27c32f45e508ef861416b820c823b" This reverts commit 75d3e86468813c450c36d2320bbd7a8b2e2ba9c4. Android mojo_shell fails to run. It can'd find the AndroidHandler class. Unclear what part of this change is causing this. jamesr and I spent a while trying to figure out, but we're reverting this for now to unblock the rest of the team working on android development. Hopefully the paris team will be able to bail us out here when they wake. :) R=jamesr@chromium.org,qsr@chromium.org,davemoore@chromium.org Review URL: https://codereview.chromium.org/951673002 --- engine/platform/graphics/DecodingImageGenerator.cpp | 6 +++--- engine/platform/graphics/DecodingImageGenerator.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/engine/platform/graphics/DecodingImageGenerator.cpp b/engine/platform/graphics/DecodingImageGenerator.cpp index f2e152c17ba..599e77c51be 100644 --- a/engine/platform/graphics/DecodingImageGenerator.cpp +++ b/engine/platform/graphics/DecodingImageGenerator.cpp @@ -65,7 +65,7 @@ bool DecodingImageGenerator::onGetInfo(SkImageInfo* info) return true; } -SkImageGenerator::Result DecodingImageGenerator::onGetPixels(const SkImageInfo& info, void* pixels, size_t rowBytes, 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(m_frameIndex)); @@ -73,11 +73,11 @@ SkImageGenerator::Result DecodingImageGenerator::onGetPixels(const SkImageInfo& if (info.width() != m_imageInfo.width() || info.height() != m_imageInfo.height() || info.colorType() != m_imageInfo.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(m_imageInfo, m_frameIndex, pixels, rowBytes); - return decoded ? Result::kSuccess : Result::kInvalidInput; + return decoded; } bool DecodingImageGenerator::onGetYUV8Planes(SkISize sizes[3], void* planes[3], size_t rowBytes[3]) diff --git a/engine/platform/graphics/DecodingImageGenerator.h b/engine/platform/graphics/DecodingImageGenerator.h index a2e948e5185..3d6ae39db98 100644 --- a/engine/platform/graphics/DecodingImageGenerator.h +++ b/engine/platform/graphics/DecodingImageGenerator.h @@ -51,7 +51,7 @@ public: protected: virtual SkData* onRefEncodedData() override; virtual bool onGetInfo(SkImageInfo*) override; - virtual Result onGetPixels(const SkImageInfo&, void* pixels, size_t rowBytes, 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: