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

Issue 747313004: Revert of Change clear() to respect the clip

Created:
6 years ago by reed2
Modified:
6 years ago
CC:
reviews_skia.org
Base URL:
https://skia.googlesource.com/skia.git@master
Project:
skia
Visibility:
Public.

Description

Revert of Change clear() to respect the clip (patchset #8 id:140001 of https://codereview.chromium.org/772533004/) Reason for revert: failing win unittests Original issue's description: > Change clear() to respect the clip > > patch from issue 769703002 at patchset 1 (http://crrev.com/769703002#ps1) > > BUG=skia: > > Committed: https://skia.googlesource.com/skia/+/3729469d6a12266037b697c2192768545e097ab0 TBR=robertphillips@google.com,mtklein@google.com,reed@google.com NOTREECHECKS=true NOTRY=true BUG=skia:

Patch Set 1 #

Unified diffs Side-by-side diffs Delta from patch set Stats (+200 lines, -37 lines) Patch
M include/core/SkBitmapDevice.h View 1 chunk +5 lines, -0 lines 0 comments Download
M include/core/SkCanvas.h View 1 chunk +18 lines, -6 lines 0 comments Download
M include/core/SkDevice.h View 1 chunk +2 lines, -3 lines 0 comments Download
M include/core/SkPicture.h View 1 chunk +1 line, -1 line 0 comments Download
M include/pdf/SkPDFDevice.h View 1 chunk +2 lines, -0 lines 0 comments Download
M include/utils/SkDeferredCanvas.h View 1 chunk +1 line, -0 lines 0 comments Download
M include/utils/SkNWayCanvas.h View 1 chunk +1 line, -0 lines 0 comments Download
M src/core/SkBitmapDevice.cpp View 1 chunk +4 lines, -0 lines 0 comments Download
M src/core/SkCanvas.cpp View 1 chunk +8 lines, -0 lines 0 comments Download
M src/core/SkDevice.cpp View 1 chunk +0 lines, -5 lines 0 comments Download
M src/core/SkPictureRecord.h View 1 chunk +1 line, -0 lines 0 comments Download
M src/core/SkPictureRecord.cpp View 1 chunk +8 lines, -0 lines 0 comments Download
M src/core/SkRecordDraw.h View 2 chunks +27 lines, -2 lines 0 comments Download
M src/core/SkRecordDraw.cpp View 1 chunk +2 lines, -1 line 0 comments Download
M src/core/SkRecorder.h View 1 chunk +1 line, -0 lines 0 comments Download
M src/core/SkRecorder.cpp View 1 chunk +4 lines, -0 lines 0 comments Download
M src/core/SkRecords.h View 1 chunk +0 lines, -1 line 0 comments Download
M src/gpu/GrLayerHoister.cpp View 5 chunks +10 lines, -3 lines 0 comments Download
M src/gpu/SkGpuDevice.h View 1 chunk +1 line, -3 lines 0 comments Download
M src/gpu/SkGpuDevice.cpp View 4 chunks +9 lines, -10 lines 0 comments Download
M src/image/SkSurface_Gpu.cpp View 1 chunk +1 line, -1 line 0 comments Download
M src/pdf/SkPDFDevice.cpp View 1 chunk +14 lines, -0 lines 0 comments Download
M src/pipe/SkGPipeWrite.cpp View 2 chunks +15 lines, -0 lines 0 comments Download
M src/utils/SkDeferredCanvas.cpp View 2 chunks +12 lines, -0 lines 0 comments Download
M src/utils/SkGatherPixelRefsAndRects.h View 1 chunk +3 lines, -0 lines 0 comments Download
M src/utils/SkNWayCanvas.cpp View 1 chunk +7 lines, -0 lines 0 comments Download
M src/utils/SkPictureUtils.cpp View 1 chunk +4 lines, -0 lines 0 comments Download
M src/utils/debugger/SkDebugCanvas.h View 1 chunk +2 lines, -0 lines 0 comments Download
M src/utils/debugger/SkDebugCanvas.cpp View 1 chunk +4 lines, -0 lines 0 comments Download
M tests/DeferredCanvasTest.cpp View 1 chunk +8 lines, -0 lines 0 comments Download
M tests/RecordDrawTest.cpp View 2 chunks +25 lines, -1 line 0 comments Download

Messages

Total messages: 4 (1 generated)
reed2
Created Revert of Change clear() to respect the clip
6 years ago (2014-12-03 03:12:30 UTC) #1
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/747313004/1
6 years ago (2014-12-03 03:13:25 UTC) #2
commit-bot: I haz the power
6 years ago (2014-12-03 03:13:37 UTC) #4
Failed to apply patch for include/core/SkPicture.h:
While running git apply --index -3 -p1;
  error: patch failed: include/core/SkPicture.h:245
  Falling back to three-way merge...
  Applied patch to 'include/core/SkPicture.h' with conflicts.
  U include/core/SkPicture.h

Patch:       include/core/SkPicture.h
Index: include/core/SkPicture.h
diff --git a/include/core/SkPicture.h b/include/core/SkPicture.h
index
b3bdda1354fc9658d50e136469e5e4a7e857f694..c63a201cd880478d9f33e44e163a502ed490536e
100644
--- a/include/core/SkPicture.h
+++ b/include/core/SkPicture.h
@@ -245,7 +245,7 @@
     // V34: Add SkTextBlob serialization.
     // V35: Store SkRect (rather then width & height) in header
     // V36: Remove (obsolete) alphatype from SkColorTable
-    // V37: Added shadow only option to SkDropShadowImageFilter (last version
to record CLEAR)
+    // V37: Added shadow only option to SkDropShadowImageFilter
 
     // Note: If the picture version needs to be increased then please follow
the
     // steps to generate new SKPs in (only accessible to Googlers):
http://goo.gl/qATVcw

Powered by Google App Engine
This is Rietveld 408576698