Generate default AP stream for text annotation.

Generate default AP stream for text annotation.

This patch generates a default AP stream for text annotation. The AP stream
only draws a symbol, which represents the presence of text annotation at the
point.

Also, roll DEPS for testing/corpus to afbac94 to test text annotations.

BUG=62625
Committed: https://pdfium.googlesource.com/pdfium/+/c38de1116bbee807e4461fe8a08e4c152c0fce15

[jaepark, 2016-08-22 22:37:46]

jaepark@google.com changed reviewers:
+ dsinclair@chromium.org, thestig@chromium.org

[jaepark, 2016-08-22 22:37:47]

Test expectation is updated in https://codereview.chromium.org/2261413002 .

[Lei Zhang, 2016-08-22 22:53:38]

https://codereview.chromium.org/2270493002/diff/1/core/fpdfdoc/cpvt_generatea...
File core/fpdfdoc/cpvt_generateap.cpp (right):

https://codereview.chromium.org/2270493002/diff/1/core/fpdfdoc/cpvt_generatea...
core/fpdfdoc/cpvt_generateap.cpp:579: const FX_FLOAT fLeftBound = rect.left +
fHalfWidth;
Can we create a new FloatRect, Inflate() it, and use it's values below?

[jaepark, 2016-08-22 23:19:51]

https://codereview.chromium.org/2270493002/diff/1/core/fpdfdoc/cpvt_generatea...
File core/fpdfdoc/cpvt_generateap.cpp (right):

https://codereview.chromium.org/2270493002/diff/1/core/fpdfdoc/cpvt_generatea...
core/fpdfdoc/cpvt_generateap.cpp:579: const FX_FLOAT fLeftBound = rect.left +
fHalfWidth;
On 2016/08/22 22:53:38, Lei Zhang wrote:
> Can we create a new FloatRect, Inflate() it, and use it's values below?

Done.

[jaepark, 2016-08-23 00:20:41]

Description was changed from

==========
Generate default AP stream for text annotation.

This patch generates a default AP stream for text annotation. The AP
stream only draws a symbol, which represents the presence of text
annotation at the point.

BUG=62625
==========

to

==========
Generate default AP stream for text annotation.

This patch generates a default AP stream for text annotation. The AP stream
only draws a symbol, which represents the presence of text annotation at the
point.

Also, roll DEPS for testing/corpus to afbac94 to test text annotations.

BUG=62625
==========

[jaepark, 2016-08-23 00:21:03]

The CQ bit was checked by jaepark@google.com to run a CQ dry run

[commit-bot: I haz the power, 2016-08-23 00:21:14]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[Lei Zhang, 2016-08-23 00:23:04]

https://codereview.chromium.org/2270493002/diff/20001/core/fpdfdoc/cpvt_gener...
File core/fpdfdoc/cpvt_generateap.cpp (right):

https://codereview.chromium.org/2270493002/diff/20001/core/fpdfdoc/cpvt_gener...
core/fpdfdoc/cpvt_generateap.cpp:579: CFX_FloatRect newRect = rect;
... and if you keep going, you may end up with:

diff --git a/core/fpdfdoc/cpvt_generateap.cpp b/core/fpdfdoc/cpvt_generateap.cpp
--- a/core/fpdfdoc/cpvt_generateap.cpp
+++ b/core/fpdfdoc/cpvt_generateap.cpp
@@ -576,39 +576,39 @@ CFX_ByteString GenerateTextSymbolAP(const CFX_FloatRect&
rect) {
   const FX_FLOAT fHalfWidth = fBorderWidth / 2;
   const FX_FLOAT fTipDelta = 4;
 
-  CFX_FloatRect newRect = rect;
-  newRect.Deflate(fHalfWidth, fHalfWidth);
-
-  // Draw outer box.
-  sAppStream << newRect.left << " " << newRect.bottom + fTipDelta << " m\n"
-             << newRect.left << " " << newRect.top << " l\n"
-             << newRect.right << " " << newRect.top << " l\n"
-             << newRect.right << " " << newRect.bottom + fTipDelta << " l\n"
-             << newRect.left + (2 * fTipDelta) << " "
-             << newRect.bottom + fTipDelta << " l\n"
-             << newRect.left + fTipDelta + (fTipDelta / 2) << " "
-             << newRect.bottom << " l\n"
-             << newRect.left + fTipDelta << " " << newRect.bottom + fTipDelta
-             << " l\n"
-             << newRect.left + fTipDelta << " " << newRect.bottom + fTipDelta
-             << " l\n"
-             << newRect.left << " " << newRect.bottom + fTipDelta << " l\n";
+  CFX_FloatRect outerRect1 = rect;
+  outerRect1.Deflate(fHalfWidth, fHalfWidth);
+  outerRect1.bottom += fTipDelta;
+
+  CFX_FloatRect outerRect2 = outerRect1;
+  outerRect2.left += fTipDelta;
+  outerRect2.right = outerRect2.left + fTipDelta;
+  outerRect2.top = outerRect2.bottom - fTipDelta;
+  FX_FLOAT outerRect2Middle = (outerRect2.left + outerRect2.right) / 2;
+
+  // Draw outer boxes.
+  sAppStream << outerRect1.left << " " << outerRect1.bottom << " m\n"
+             << outerRect1.left << " " << outerRect1.top << " l\n"
+             << outerRect1.right << " " << outerRect1.top << " l\n"
+             << outerRect1.right << " " << outerRect1.bottom << " l\n"
+             << outerRect2.right << " " << outerRect2.bottom << " l\n"
+             << outerRect2Middle << " " << outerRect2.top << " l\n"
+             << outerRect2.left << " " << outerRect2.bottom << " l\n"
+             << outerRect1.left << " " << outerRect1.bottom << " l\n";
 
   // Draw inner lines.
+  CFX_FloatRect lineRect = outerRect1;
   const FX_FLOAT fXDelta = 2;
-  const FX_FLOAT fYDelta = (newRect.top - (newRect.bottom + fTipDelta)) / 4;
-  sAppStream << newRect.left + fXDelta << " " << newRect.top - fYDelta << "
m\n"
-             << newRect.right - fXDelta << " " << newRect.top - fYDelta
-             << " l\n"
-             << newRect.left + fXDelta << " " << newRect.top - (2 * fYDelta)
-             << " m\n"
-             << newRect.right - fXDelta << " " << newRect.top - (2 * fYDelta)
-             << " l\n"
-             << newRect.left + fXDelta << " " << newRect.top - (3 * fYDelta)
-             << " m\n"
-             << newRect.right - fXDelta << " " << newRect.top - (3 * fYDelta)
-             << " l\n"
-             << "B*\n";
+  const FX_FLOAT fYDelta = (lineRect.top - lineRect.bottom) / 4;
+
+  lineRect.left += fXDelta;
+  lineRect.right -= fXDelta;
+  for (int i = 0; i < 3; ++i) {
+    lineRect.top -= fYDelta;
+    sAppStream << lineRect.left << " " << lineRect.top << " m\n"
+               << lineRect.right << " " << lineRect.top << " l\n";
+  }
+  sAppStream << "B*\n";
 
   return sAppStream.MakeString();
 }

https://codereview.chromium.org/2270493002/diff/20001/core/fpdfdoc/cpvt_gener...
core/fpdfdoc/cpvt_generateap.cpp:593: << newRect.left + fTipDelta << " " <<
newRect.bottom + fTipDelta
This is a duplicate of the line above?

[commit-bot: I haz the power, 2016-08-23 00:30:44]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-08-23 00:30:44]

Dry run: This issue passed the CQ dry run.

[jaepark, 2016-08-23 00:39:32]

The CQ bit was checked by jaepark@google.com to run a CQ dry run

[commit-bot: I haz the power, 2016-08-23 00:39:42]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[jaepark, 2016-08-23 00:50:49]

https://codereview.chromium.org/2270493002/diff/20001/core/fpdfdoc/cpvt_gener...
File core/fpdfdoc/cpvt_generateap.cpp (right):

https://codereview.chromium.org/2270493002/diff/20001/core/fpdfdoc/cpvt_gener...
core/fpdfdoc/cpvt_generateap.cpp:579: CFX_FloatRect newRect = rect;
On 2016/08/23 00:23:03, Lei Zhang wrote:
> ... and if you keep going, you may end up with:
> 
> diff --git a/core/fpdfdoc/cpvt_generateap.cpp
b/core/fpdfdoc/cpvt_generateap.cpp
> --- a/core/fpdfdoc/cpvt_generateap.cpp
> +++ b/core/fpdfdoc/cpvt_generateap.cpp
> @@ -576,39 +576,39 @@ CFX_ByteString GenerateTextSymbolAP(const CFX_FloatRect&
> rect) {
>    const FX_FLOAT fHalfWidth = fBorderWidth / 2;
>    const FX_FLOAT fTipDelta = 4;
>  
> -  CFX_FloatRect newRect = rect;
> -  newRect.Deflate(fHalfWidth, fHalfWidth);
> -
> -  // Draw outer box.
> -  sAppStream << newRect.left << " " << newRect.bottom + fTipDelta << " m\n"
> -             << newRect.left << " " << newRect.top << " l\n"
> -             << newRect.right << " " << newRect.top << " l\n"
> -             << newRect.right << " " << newRect.bottom + fTipDelta << " l\n"
> -             << newRect.left + (2 * fTipDelta) << " "
> -             << newRect.bottom + fTipDelta << " l\n"
> -             << newRect.left + fTipDelta + (fTipDelta / 2) << " "
> -             << newRect.bottom << " l\n"
> -             << newRect.left + fTipDelta << " " << newRect.bottom + fTipDelta
> -             << " l\n"
> -             << newRect.left + fTipDelta << " " << newRect.bottom + fTipDelta
> -             << " l\n"
> -             << newRect.left << " " << newRect.bottom + fTipDelta << " l\n";
> +  CFX_FloatRect outerRect1 = rect;
> +  outerRect1.Deflate(fHalfWidth, fHalfWidth);
> +  outerRect1.bottom += fTipDelta;
> +
> +  CFX_FloatRect outerRect2 = outerRect1;
> +  outerRect2.left += fTipDelta;
> +  outerRect2.right = outerRect2.left + fTipDelta;
> +  outerRect2.top = outerRect2.bottom - fTipDelta;
> +  FX_FLOAT outerRect2Middle = (outerRect2.left + outerRect2.right) / 2;
> +
> +  // Draw outer boxes.
> +  sAppStream << outerRect1.left << " " << outerRect1.bottom << " m\n"
> +             << outerRect1.left << " " << outerRect1.top << " l\n"
> +             << outerRect1.right << " " << outerRect1.top << " l\n"
> +             << outerRect1.right << " " << outerRect1.bottom << " l\n"
> +             << outerRect2.right << " " << outerRect2.bottom << " l\n"
> +             << outerRect2Middle << " " << outerRect2.top << " l\n"
> +             << outerRect2.left << " " << outerRect2.bottom << " l\n"
> +             << outerRect1.left << " " << outerRect1.bottom << " l\n";
>  
>    // Draw inner lines.
> +  CFX_FloatRect lineRect = outerRect1;
>    const FX_FLOAT fXDelta = 2;
> -  const FX_FLOAT fYDelta = (newRect.top - (newRect.bottom + fTipDelta)) / 4;
> -  sAppStream << newRect.left + fXDelta << " " << newRect.top - fYDelta << "
> m\n"
> -             << newRect.right - fXDelta << " " << newRect.top - fYDelta
> -             << " l\n"
> -             << newRect.left + fXDelta << " " << newRect.top - (2 * fYDelta)
> -             << " m\n"
> -             << newRect.right - fXDelta << " " << newRect.top - (2 * fYDelta)
> -             << " l\n"
> -             << newRect.left + fXDelta << " " << newRect.top - (3 * fYDelta)
> -             << " m\n"
> -             << newRect.right - fXDelta << " " << newRect.top - (3 * fYDelta)
> -             << " l\n"
> -             << "B*\n";
> +  const FX_FLOAT fYDelta = (lineRect.top - lineRect.bottom) / 4;
> +
> +  lineRect.left += fXDelta;
> +  lineRect.right -= fXDelta;
> +  for (int i = 0; i < 3; ++i) {
> +    lineRect.top -= fYDelta;
> +    sAppStream << lineRect.left << " " << lineRect.top << " m\n"
> +               << lineRect.right << " " << lineRect.top << " l\n";
> +  }
> +  sAppStream << "B*\n";
>  
>    return sAppStream.MakeString();
>  }

Done.

[commit-bot: I haz the power, 2016-08-23 00:51:52]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-08-23 00:51:53]

Dry run: This issue passed the CQ dry run.

[Lei Zhang, 2016-08-23 00:53:37]

What can I say, LGTM!

[jaepark, 2016-08-23 00:54:31]

The CQ bit was checked by jaepark@google.com

[commit-bot: I haz the power, 2016-08-23 00:54:42]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-08-23 00:54:58]

Description was changed from

==========
Generate default AP stream for text annotation.

This patch generates a default AP stream for text annotation. The AP stream
only draws a symbol, which represents the presence of text annotation at the
point.

Also, roll DEPS for testing/corpus to afbac94 to test text annotations.

BUG=62625
==========

to

==========
Generate default AP stream for text annotation.

This patch generates a default AP stream for text annotation. The AP stream
only draws a symbol, which represents the presence of text annotation at the
point.

Also, roll DEPS for testing/corpus to afbac94 to test text annotations.

BUG=62625

Committed:
https://pdfium.googlesource.com/pdfium/+/c38de1116bbee807e4461fe8a08e4c152c0f...
==========

[commit-bot: I haz the power, 2016-08-23 00:54:59]

Committed patchset #4 (id:60001) as
https://pdfium.googlesource.com/pdfium/+/c38de1116bbee807e4461fe8a08e4c152c0f...