|
Revert of Revert of Fix SkTextBlob offset semantics. (patchset #1 id:1 of https://codereview.chromium.org/609223003/)
Reason for revert:
Re-landing: Chromium-side fix to be landed with the roll ( https://codereview.chromium.org/607853003/)
Original issue's description:
> Revert of Fix SkTextBlob offset semantics. (patchset #2 id:20001 of https://codereview.chromium.org/605533002/)
>
> Reason for revert:
> Breaking the Chrome builds with the error:
>
> [14:54:14.317833] ../../skia/ext/pixel_ref_utils.cc:221:16: error: 'drawPosText' marked 'override' but does not override any member functions
> [14:54:14.318022] virtual void drawPosText(const SkDraw& draw,
> [14:54:14.318082] ^
>
> Original issue's description:
> > Fix SkTextBlob offset semantics.
> >
> > Implement proper x/y drawTextBlob() handling by plumbing a
> > drawPosText() offset parameter (to act as an additional glyph pos
> > translation) throughout the device layer.
> >
> > The new offset superceeds the existing constY, with a minor semantic
> > tweak: whereas previous implementations were ignoring constY in 2D
> > positioning mode (scalarsPerGlyph == 2), now the offset is always
> > observed, in all positioning modes. We can do this because existing
> > drawPosText() clients always pass constY == 0 for full positioning mode.
> >
> > R=reed@google.com, jvanverth@google.com, robertphillips@google.com
> >
> > Committed: https://skia.googlesource.com/skia/+/c13bc571d3e61a43b87eb97f0719abd304cafaf2
>
> TBR=jvanverth@google.com,reed@google.com,bsalomon@google.com,fmalita@chromium.org
> NOTREECHECKS=true
> NOTRY=true
>
> Committed: https://skia.googlesource.com/skia/+/d46b8d2bab7cfba8458432248e1568ac377429e9
TBR=jvanverth@google.com,reed@google.com,bsalomon@google.com,robertphillips@google.com
NOTREECHECKS=true
NOTRY=true
Committed: https://skia.googlesource.com/skia/+/05c4a4322e7d4f3417b7df33825bab8603d52051
|
Unified diffs |
Side-by-side diffs |
Delta from patch set |
Stats (+111 lines, -134 lines) |
Patch |
|
M |
experimental/PdfViewer/SkTrackDevice.h
|
View
|
|
1 chunk |
+3 lines, -3 lines |
0 comments
|
Download
|
|
M |
include/core/SkBitmapDevice.h
|
View
|
|
1 chunk |
+2 lines, -2 lines |
0 comments
|
Download
|
|
M |
include/core/SkDevice.h
|
View
|
|
1 chunk |
+2 lines, -2 lines |
0 comments
|
Download
|
|
M |
include/core/SkDraw.h
|
View
|
|
2 chunks |
+4 lines, -4 lines |
0 comments
|
Download
|
|
M |
include/device/xps/SkXPSDevice.h
|
View
|
|
1 chunk |
+2 lines, -2 lines |
0 comments
|
Download
|
|
M |
include/pdf/SkPDFDevice.h
|
View
|
|
1 chunk |
+2 lines, -2 lines |
0 comments
|
Download
|
|
M |
src/core/SkBitmapDevice.cpp
|
View
|
|
1 chunk |
+3 lines, -3 lines |
0 comments
|
Download
|
|
M |
src/core/SkCanvas.cpp
|
View
|
|
2 chunks |
+7 lines, -2 lines |
0 comments
|
Download
|
|
M |
src/core/SkDevice.cpp
|
View
|
|
2 chunks |
+6 lines, -24 lines |
0 comments
|
Download
|
|
M |
src/core/SkDraw.cpp
|
View
|
|
5 chunks |
+7 lines, -9 lines |
0 comments
|
Download
|
|
M |
src/core/SkTextMapStateProc.h
|
View
|
|
2 chunks |
+14 lines, -12 lines |
0 comments
|
Download
|
|
M |
src/device/xps/SkXPSDevice.cpp
|
View
|
|
2 chunks |
+3 lines, -6 lines |
0 comments
|
Download
|
|
M |
src/gpu/GrBitmapTextContext.h
|
View
|
|
1 chunk |
+2 lines, -2 lines |
0 comments
|
Download
|
|
M |
src/gpu/GrBitmapTextContext.cpp
|
View
|
|
2 chunks |
+3 lines, -3 lines |
0 comments
|
Download
|
|
M |
src/gpu/GrDistanceFieldTextContext.h
|
View
|
|
1 chunk |
+2 lines, -2 lines |
0 comments
|
Download
|
|
M |
src/gpu/GrDistanceFieldTextContext.cpp
|
View
|
|
3 chunks |
+6 lines, -6 lines |
0 comments
|
Download
|
|
M |
src/gpu/GrStencilAndCoverTextContext.h
|
View
|
|
2 chunks |
+3 lines, -3 lines |
0 comments
|
Download
|
|
M |
src/gpu/GrStencilAndCoverTextContext.cpp
|
View
|
|
7 chunks |
+8 lines, -9 lines |
0 comments
|
Download
|
|
M |
src/gpu/GrTextContext.h
|
View
|
|
1 chunk |
+2 lines, -2 lines |
0 comments
|
Download
|
|
M |
src/gpu/SkGpuDevice.h
|
View
|
|
1 chunk |
+2 lines, -2 lines |
0 comments
|
Download
|
|
M |
src/gpu/SkGpuDevice.cpp
|
View
|
|
3 chunks |
+6 lines, -8 lines |
0 comments
|
Download
|
|
M |
src/pdf/SkPDFDevice.cpp
|
View
|
|
2 chunks |
+5 lines, -4 lines |
0 comments
|
Download
|
|
M |
src/pdf/SkPDFDeviceFlattener.h
|
View
|
|
1 chunk |
+2 lines, -2 lines |
0 comments
|
Download
|
|
M |
src/pdf/SkPDFDeviceFlattener.cpp
|
View
|
|
1 chunk |
+4 lines, -4 lines |
0 comments
|
Download
|
|
M |
src/utils/SkDeferredCanvas.cpp
|
View
|
|
1 chunk |
+2 lines, -2 lines |
0 comments
|
Download
|
|
M |
src/utils/SkGatherPixelRefsAndRects.h
|
View
|
|
2 chunks |
+7 lines, -12 lines |
0 comments
|
Download
|
|
M |
src/utils/SkPictureUtils.cpp
|
View
|
|
1 chunk |
+2 lines, -2 lines |
0 comments
|
Download
|
Total messages: 3 (0 generated)
|