From f113320bd5ce052fe250b5c647446f7d1c994ff0 Mon Sep 17 00:00:00 2001
From: Jonas Jenwald <jonas.jenwald@gmail.com>
Date: Tue, 3 Oct 2023 20:06:19 +0200
Subject: [PATCH] Ensure that readonly TextWidget-annotations are rendered when
 forms are disabled (issue 17064)

To reduced the risk of regressing something else, given that the issue only applies to a (for the default viewer) non-default configuration, this patch is purposely limited to only TextWidget-annotations in the display layer.
---
 src/display/annotation_layer.js   |   5 +++++
 test/pdfs/.gitignore              |   1 +
 test/pdfs/issue17064_readonly.pdf | Bin 0 -> 2912 bytes
 test/test_manifest.json           |   7 +++++++
 4 files changed, 13 insertions(+)
 create mode 100644 test/pdfs/issue17064_readonly.pdf

diff --git a/src/display/annotation_layer.js b/src/display/annotation_layer.js
index df8b730ec..3c17538e2 100644
--- a/src/display/annotation_layer.js
+++ b/src/display/annotation_layer.js
@@ -1159,6 +1159,7 @@ class TextWidgetAnnotationElement extends WidgetAnnotationElement {
   constructor(parameters) {
     const isRenderable =
       parameters.renderForms ||
+      parameters.data.hasOwnCanvas ||
       (!parameters.data.hasAppearance && !!parameters.data.fieldValue);
     super(parameters, { isRenderable });
   }
@@ -1497,6 +1498,10 @@ class TextWidgetAnnotationElement extends WidgetAnnotationElement {
       element.textContent = this.data.fieldValue;
       element.style.verticalAlign = "middle";
       element.style.display = "table-cell";
+
+      if (this.data.hasOwnCanvas) {
+        element.hidden = true;
+      }
     }
 
     this._setTextStyle(element);
diff --git a/test/pdfs/.gitignore b/test/pdfs/.gitignore
index e33e13501..bcc279054 100644
--- a/test/pdfs/.gitignore
+++ b/test/pdfs/.gitignore
@@ -119,6 +119,7 @@
 !issue7891_bc0.pdf
 !issue11242_reduced.pdf
 !issue16176.pdf
+!issue17064_readonly.pdf
 !issue11279.pdf
 !issue11362.pdf
 !issue13325_reduced.pdf
diff --git a/test/pdfs/issue17064_readonly.pdf b/test/pdfs/issue17064_readonly.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..caa6f739e7cc85ea88be26ca517c35c975af26a4
GIT binary patch
literal 2912
zcmY!laB<T$)HCN&Z3F@?E^`F~h5V!}E*l#zeYeb<lGGvveYc#%l2n(}<ouLWE`6WW
zy!4U`1w%t)E;~D};*z4&#9Xe5IoeN(xE>k>FdSS|qF390WzME6lg>PGi7jUK<`(8=
zF6Q=Tbrx=&V4|n2@bYjfM_AU1gv132X?Y6-CY?@Aew3A#@hmAVYq`LrqoRwBK9xEo
zdLq<g+0M2$hi2Y|Y`bSl&zL<Ua@Nk7I~PgtF)TOLu;5C~OM%)AWPu#aWoU@xbSJ0$
z3WaE(fPsRcsiA_Ap+YQ|zHeelQ6@+jq!K6rCV}EXsm1xFMaikf3SeL7=aqmN9;rEH
zsU?}oi3)}w<v}3-0+D`5WkITfeuRHgR%&tymws?*QVCeZEx#z2K%kjgpahz6hyjC>
zv%$<cr&Bvl>9ROEvkK^VJvU<LX4}c^dTQsQ<i<B5EmgL`2FFa8dbt-lEScEo#5aAR
zrVz7BdVysjYmua;1mjf+O^K+cB|bWWJjxqp6|A$-`#XV)RXsj^!S6Xv3-p++0`DuE
zF4x(rVr&_B@Ir{93UA)-iA^i#DSBv3KYi@TnKNh4ob^*w={{}Bk}+5N!VCvJhP9JT
z6R?G_2{0I7i32HwfuV~(fGG$uV>6TxOYJq}J7mD)T0Z}fct`4TPp>esXO{#G8(Ews
z6JCD(dCnnZmi+JIVSjSgOxRjeJu&yRdCHq#HXhO6Yn;-To)&#y{a=6QQMr%dyDIxm
zaUXq`=WlhXrMFhF<8^<+EAgIylru6R#}+Mf?p(Ue(KK~}^AR79po7{)D`ro&{Q1Pm
z_?yoc)~?eALfFE_l<r|;Zh#UrXo-odAtBIeI%9;+30aMxbE2}`Da#c?Ue9bYT*jCY
zBfzTE%Og^>qesA`<J5zqM_f;s7*;-$`iaeBW_0(Mp)qPUL5cLQlhyJzZz|F2>EKk6
zIK|+-zF)R8tkvRM|I<IuPi*K|8#iC%``gn@Mjy=Ympjdtb^pEV!q24lx1UYA^hy59
z<y{rN4`yCkrpIq};Ysy%SGSljr<V9+mZ|#+8oqRO_)WfchjFKbrOM|PovRgE&Ufb?
zx;fW)Zq9iZ`R!bWj@Uv6xxA!LmM}*xcu}MMiP4440Sym<g)s95p9$6hiI(9dIuqtL
zU09sXb!^751%-|x9VSKrCmtF(T~N?!KHaH3ftw-ptc(UWzgb|9`OyNEY6Yq#QV3(M
zZ6PHmu&N0z0oE;kz-kv%!xR;lD41Eo>tZug)RJItNNoOP1CiSE>v#0OKD=S>5x=HY
zo_|kGI2N&0?3BZ05vlDgr5~s4%J}{LPPTfkx<iuC0+qhv+S=lpa~oL;I28L7nGObb
zIJyaa2;ve^F=E}5#3z{&l*q;*$SI(Bk173vtk#R~%x3jf7Y-~t8kNsn7C1HfM^C9m
z%;DSvZfW7s0tatK7Mze3-F9O}=>zq~1y34yr}dunE$$Dv^ZoXsxWk?6{O_Nyy89<H
z`PAJY^9$$IE6-IPvJ7Xs&voC>?$USVsz;j}VrLb_MDVIVzOKlx?9=O_vomCV700@Z
zt)}&HXP$;H`&WCkGSz(7YIWr`6CWDqW%t*do$%`m|F85H$2F&^*x4_vU!Lnz>0@F(
zQFj@~MxL^7ueleTFN@#za_L|B3sEaSdF9U$4|>j8(zpGHvHAqY6KuU|(<|<-|9b7s
zELEw)Qw=Sg=9*W1j=h}~IY-UL`|%X@%r?KJnh}#~_hgCRD4##sz1nW`lF9r5Z-S<W
z8k+QXbUs#9b)R2c^m4(vUez@-k4wqEiH>e@b3VELgRqtRy3+X~B8<{v(Qgan9h4VU
zWuD^FJu4P!yJCB&_zhvR<4pa(b*Gd{Je!-5bxFuhZBwD+Pp)#Y-xqq1uPx9zzVRc2
z-;U_?&2~!sEiFG+eXkMC`{{l<BIIdQbPyBg(W&X{RaSJ|GI(?){K~y|t=@YJg7?3j
z_=0=+jSn*F+~tYyObd8=qdx6SpTwK4SNgD@W14eMmQU;(*^Vufzt5j!x8>`+ugzcB
zZ{7a;bkF>)BK~!YcHFsp-~R61tH*2-S}fdBZ}7@?`7NJrd@eaBF#lEiC&|Zk=6_vJ
zrR!d?{eI=%g@<?M9SdJATDkmo-ecz`D=&{emczf<O?Gw~V<}UNKrJa)6CyaXDizpr
z05-t#^Gg(rfHFZ``kr}d`3lAmHl8dI5tNz+&j98oT>9bQcAXK>7+{OeGcP3-(*6TC
zOpqI@swY<qHW-MoUabA;Bx39#VrQH1vW+Wa!m>lVg^Q2q8Mq~|Cn|MlOgeGQEMG8G
z=a~6zty!&nV)^QG{r1f%viMqhi`hP|n~edB=ZZ@bi%KerfDSV<GdJW?Rdw}u0|2`3
BNwxq0

literal 0
HcmV?d00001

diff --git a/test/test_manifest.json b/test/test_manifest.json
index ef5bb7701..e3236b608 100644
--- a/test/test_manifest.json
+++ b/test/test_manifest.json
@@ -3143,6 +3143,13 @@
       "link": true,
       "type": "eq"
     },
+    {  "id": "issue17064_readonly",
+       "file": "pdfs/issue17064_readonly.pdf",
+       "md5": "cb84f8e8301e935a3b9ea8ef320f45bf",
+       "rounds": 1,
+       "type": "eq",
+       "annotations": true
+    },
     {  "id": "issue12714",
        "file": "pdfs/issue12714.pdf",
        "md5": "f9ee31c74f9e342e95122b0b3bc84fa0",