Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(568)

Issue 2142183003: Revert of Added the framework for having canvas/recorder/picture record depth_set's. (Closed)

Created:
4 years, 5 months ago by mtklein
Modified:
4 years, 5 months ago
CC:
reviews_skia.org
Base URL:
https://skia.googlesource.com/skia@master
Target Ref:
refs/heads/master
Project:
skia
Visibility:
Public.

Description

Revert of Added the framework for having canvas/recorder/picture record depth_set's. (patchset #16 id:300001 of https://codereview.chromium.org/2127233002/ ) Reason for revert: our bots are segfaulting inside the .skp-loading code, so this seems like the likely candidate. Original issue's description: > Added the framework for having canvas/recorder/picture record depth_set's. > GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2127233002 > > Committed: https://skia.googlesource.com/skia/+/6d3fb898d5f73a82e36f11c712a633c3921ed518 TBR=jvanverth@google.com,robertphillips@google.com,brianosman@google.com,reed@google.com,bsalomon@google.com,vjiaoblack@google.com # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true

Patch Set 1 #

Unified diffs Side-by-side diffs Delta from patch set Stats (+4 lines, -139 lines) Patch
M include/core/SkCanvas.h View 3 chunks +0 lines, -12 lines 0 comments Download
M include/private/SkRecords.h View 2 chunks +0 lines, -3 lines 0 comments Download
M src/core/SkCanvas.cpp View 2 chunks +1 line, -16 lines 0 comments Download
M src/core/SkPictureFlat.h View 1 chunk +0 lines, -1 line 0 comments Download
M src/core/SkPictureRecord.h View 1 chunk +0 lines, -2 lines 0 comments Download
M src/core/SkPictureRecord.cpp View 1 chunk +0 lines, -9 lines 0 comments Download
M src/core/SkRecordDraw.cpp View 2 chunks +0 lines, -4 lines 0 comments Download
M src/core/SkRecorder.h View 1 chunk +0 lines, -1 line 0 comments Download
M src/core/SkRecorder.cpp View 1 chunk +0 lines, -4 lines 0 comments Download
M tests/CanvasTest.cpp View 2 chunks +1 line, -27 lines 0 comments Download
M tools/debugger/SkDebugCanvas.h View 1 chunk +0 lines, -2 lines 0 comments Download
M tools/debugger/SkDebugCanvas.cpp View 1 chunk +0 lines, -5 lines 0 comments Download
M tools/debugger/SkDrawCommand.h View 3 chunks +2 lines, -16 lines 0 comments Download
M tools/debugger/SkDrawCommand.cpp View 6 chunks +0 lines, -37 lines 0 comments Download

Messages

Total messages: 6 (3 generated)
mtklein
Created Revert of Added the framework for having canvas/recorder/picture record depth_set's.
4 years, 5 months ago (2016-07-12 22:16:55 UTC) #2
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.org/2142183003/1
4 years, 5 months ago (2016-07-12 22:17:07 UTC) #3
commit-bot: I haz the power
4 years, 5 months ago (2016-07-12 22:17:15 UTC) #5
Failed to apply patch for tests/CanvasTest.cpp:
While running git apply --index -3 -p1;
  error: patch failed: tests/CanvasTest.cpp:833
  error: repository lacks the necessary blob to fall back on 3-way merge.
  error: tests/CanvasTest.cpp: patch does not apply

Patch:       tests/CanvasTest.cpp
Index: tests/CanvasTest.cpp
diff --git a/tests/CanvasTest.cpp b/tests/CanvasTest.cpp
index
afbaf8650936d016b759de6368b7b389dd93726e..70c2c04ffabf511239239fe8fe3cf91ab78582af
100644
--- a/tests/CanvasTest.cpp
+++ b/tests/CanvasTest.cpp
@@ -779,27 +779,6 @@
     canvas.restore();
 }
 
-class SkTestCanvas : public SkCanvas {
-public:
-    void testUpdateDepth(skiatest::Reporter* reporter) {
-        // set some depths (with picture enabled), then check them as they get
set
-
-        REPORTER_ASSERT(reporter, this->getZ() == 0);
-        this->translateZ(-10);
-        REPORTER_ASSERT(reporter, this->getZ() == -10);
-
-        this->save();
-        this->translateZ(20);
-        REPORTER_ASSERT(reporter, this->getZ() == 10);
-
-        this->restore();
-        REPORTER_ASSERT(reporter, this->getZ() == -10);
-
-        this->translateZ(13.14f);
-        REPORTER_ASSERT(reporter, SkScalarNearlyEqual(this->getZ(),3.14f));
-    }
-};
-
 namespace {
 
 class MockFilterCanvas : public SkPaintFilterCanvas {
@@ -833,9 +812,4 @@
     REPORTER_ASSERT(reporter, canvas.getTotalMatrix() ==
filterCanvas.getTotalMatrix());
     REPORTER_ASSERT(reporter, canvas.getClipBounds(&clip1) ==
filterCanvas.getClipBounds(&clip2));
     REPORTER_ASSERT(reporter, clip1 == clip2);
-
-    SkTestCanvas* tCanvas;
-
-    tCanvas = (SkTestCanvas*) new SkCanvas(100,100);
-    tCanvas->testUpdateDepth(reporter);
-}
+}

Powered by Google App Engine
This is Rietveld 408576698