aboutsummaryrefslogtreecommitdiffhomepage
path: root/dm
diff options
context:
space:
mode:
authorGravatar caryclark <caryclark@google.com>2016-01-07 05:12:08 -0800
committerGravatar Commit bot <commit-bot@chromium.org>2016-01-07 05:12:08 -0800
commit60c0a76738f21bc856d2e35367fc703845b728af (patch)
tree8f11c530ba2ef500920a2552d558b8c48e598b34 /dm
parentfb8243717300309853ff3d881b68feddd9c7b5c9 (diff)
Revert of DM: add a pixel check to serialize (patchset #4 id:60001 of https://codereview.chromium.org/1561993003/ )
Reason for revert: breaks windows bots; additional windows specific failures need to be blacklisted Original issue's description: > DM: add a pixel check to serialize > > If we're running through serialize and then drawing into some raster target (e.g. serialize-8888 like we run on the bots), make sure the serialized version is identical to what we'd get if we just drew into the rest of the pipeline (i.e. 8888). > > Start by blacklisting all current failures. This at least prevents further regression. > > BUG=skia:4095 > GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1561993003 > > Committed: https://skia.googlesource.com/skia/+/6eb4e36a93ea695e7adb771ea9ac3326680a8e98 TBR=reed@google.com,mtklein@google.com,mtklein@chromium.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=skia:4095 Review URL: https://codereview.chromium.org/1563923003
Diffstat (limited to 'dm')
-rw-r--r--dm/DMSrcSink.cpp18
1 files changed, 0 insertions, 18 deletions
diff --git a/dm/DMSrcSink.cpp b/dm/DMSrcSink.cpp
index 82962ff692..fa600ff4eb 100644
--- a/dm/DMSrcSink.cpp
+++ b/dm/DMSrcSink.cpp
@@ -1084,15 +1084,6 @@ Error ViaRemote::draw(const Src& src, SkBitmap* bitmap, SkWStream* stream, SkStr
Error ViaSerialization::draw(
const Src& src, SkBitmap* bitmap, SkWStream* stream, SkString* log) const {
- // Draw the Src directly as a reference.
- SkBitmap reference;
- if (bitmap) {
- Error err = fSink->draw(src, &reference, nullptr, log);
- if (!err.isEmpty()) {
- return err;
- }
- }
-
// Record our Src into a picture.
auto size = src.size();
SkPictureRecorder recorder;
@@ -1111,15 +1102,6 @@ Error ViaSerialization::draw(
return draw_to_canvas(fSink, bitmap, stream, log, size, [&](SkCanvas* canvas) {
canvas->drawPicture(deserialized);
- // Check against the reference if we have one.
- if (bitmap) {
- if (reference.getSize() != bitmap->getSize()) {
- return "Serialized and direct have different dimensions.";
- }
- if (0 != memcmp(reference.getPixels(), bitmap->getPixels(), reference.getSize())) {
- return "Serialized and direct have different pixels.";
- }
- }
return "";
});
}