From 1cbd6ccf9b92458fb0e2222ca133259d75db81bf Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 6 Jun 2018 17:53:11 +0530
Subject: [PATCH] E-book viewer: Fix very slow loading for HTML files with very
 many images on Linux. Fixes #1774884 [loading flow for some ebooks takes
 painfully long in linux](https://bugs.launchpad.net/calibre/+bug/1774884)

For some reason setting column break inside on the images was
causing a re-layout only on Linux.
---
 resources/compiled_coffeescript.zip         | Bin 102965 -> 103225 bytes
 src/calibre/ebooks/oeb/display/paged.coffee |   9 +++++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/resources/compiled_coffeescript.zip b/resources/compiled_coffeescript.zip
index 0f7aacacfacf00fd9b45426e1dda635e2ac25886..0a42b604c860efe4a440b00cacf165293f3cf68d 100644
GIT binary patch
delta 1115
zcmZWoZA?>F80IZ_`$emWI681Slu#<I&23Af0?sY|(8Ohl#%wXog6-wDwDodHZ<(kd
zOE!rKD<E&kiG%1LHQA!U<i-&fgScfHM1S~0i68v%mr`Qfza?V9bNitXPjYVFd(QJd
z=Q;2Doa-048<)9je@<;YFnH&i7su~i`AR7&(q>f=J)43Gb$)6yU{9L?mu`jd?K{&*
ztPX#jwv@zvXf~lYS*~82ehxTrYCVqq?JNL%eH+!1e{OI%J@Xkz>Z6(4fV*z8+<Lq_
zYvr_DLh$@T-N^lV+7kmS8Zs9AtG{YwvBZ+-Ix3P~Bq4^qfjD;DKZEzuCYvv}<ntUA
zJ0i*UW+IUm!eSr3PTMSmbSC7^JOs-YE7U^|5=NZwG|<*#V8pq{LP0?3cSgFt8#drm
zd!;%)HxGE|=Q2FM!XZAfslPv|wc>!X0iVA#;U%RKmtU3^Grb6JY^vjxA98Z9_B$}O
zV1YP}E$r9yRp<5jKhejOVrlvdkkFOB05Z;|KR3%c?fzyW<9}&8TmAY$x$0PaZ8k^|
zH;K7PT&?>5ZgD}gCu7zHVk%jB3V5Nv49yvnRxRW+W+s6wMJOSl$3HTnPKwZ)UZ_CF
zvKt3}@zULT;MTEP24Xn4JZqJ^I@+Qgk=BGLBo#M)zrq`$QlvE*j3{_|g=}&YDcIe5
zEZUZA&xY(Pqq_2AZD>s<t8^gSM8d`gg5hWNqbI<^>Sy`LI<C}YMYs#FK(75-CLwES
zJ)K=jyORO&$j(aBR?Q{a=pD6#r!Oogh%?Ggj<d<THG{CA!1|%?JZZ_AhwNs+mMp4?
zMPF)BGtu%_AzZFFX(HRU#kZ1^`NOjJSw$R(<}Nxq1HYB6mCLp!PXYW?qB(#XI4F1K
zUFl_Acez%RYIe@D1|y;pkmw!`{soyD^{}O22OqNo_3EJ-<jHUKaHIxelM_xjmw!7P
z_;6gQr9BN`WIO#0@KCU>eYR8_gu}WzADteAy~W{uK>PMWHFXR@gKqW!Jvam&!(0lA
zCUht5_+qpirJ#wXhG7pK8-iCjKV{(UO~mf^Zg1m-;C5bY6vdFR!zcK~#zs*H3E@yM
h=naXyC<r_sw!2A|hEAM?)5YwELJDm3@i25l?|T_Nj+g)d

delta 881
zcmZuvT}YE*6!vV>&HY)qY|GNuVT#+Z{e*6)Wfx%=1xXOtlG^5UpYuyu%M4SxF(@>b
z2YHP`DZ(g%gpVA?P$@!0tt3c{B7|yl6?q{9nc6oeq0xJF-gD0Loag)u^(Q^KmozXq
ztYn*mM^5%Eek%4QBozB-i5WCB&<PUm^RN<t!Nm~<dxrL6`=~<1R2E6m<WJ=WM&HL`
z9nT8ZVqXTgaiZr#Ndm@zp>Z`gGd=>C-mAdcQ8~UGRO8r$GARZo1bgTAbWP@BNl1y3
zWd)uJWeR=g>kuN_@#16)z3c_)E;A`1K6kY_zs`NO#_uU2UQ$eW+ss?I5KT)Vq`_C;
zu%2c2atEi{l7XQIE`b_9zO`?vEkBVg=E>}QeVo>2akpnaz`9Tj%xbttvqZTDm<=ni
z{=OPl!g66O8GdNEoQMT*GAzXhSGMw6HP|t)pjY)E$Nu@!O=2zo6)TTsfEV@AK45Vo
zx>Lr+8?h7-mTyFhrBf;{=j(Tw#6TFf#z1Ph^q*tGP5SefWdb|Hk)?OAVQT4UT$W+x
zl83&|1u;Hcb|<b;plW6RM!1ZpjnB!>;PsUWTABhPWLI@~XEh_m(RBI(Q|0#<2<vF_
z7-)GSq+)p0NlgH`cxWiQyMuRZ*ktlwI{FIWu8{xY8JjlPE`UZ+Y*11YUyWfMHSTkG
zJfx*oF({#ymWkm7{`xJYX%bN7ZCIyXpGTVcyNJIydt)4L_g2zu0UQqAlE98EV1is8
z++4dWTA>F8T6@*BRSz;ga!n7@u76LN>4XYlmI<h-6IAqD03>v-6LcbH86?n!E=Z@k
z0O*8c$ACu4VK?;$V2k8UJ0v_7G;49LJ2i%h(7pg1rBAz{l@8wkt-)$`x*UZjo6+T}
nvN#=Xm(A*MTa5*_eKx1lXsmWv-Gvr&flX^5agxj~XoHqNJ{3%f

diff --git a/src/calibre/ebooks/oeb/display/paged.coffee b/src/calibre/ebooks/oeb/display/paged.coffee
index 8d43850e61..fd06913547 100644
--- a/src/calibre/ebooks/oeb/display/paged.coffee
+++ b/src/calibre/ebooks/oeb/display/paged.coffee
@@ -348,11 +348,16 @@ class PagedDisplay
         # force a relayout if the render tree is dirty.
         images = []
         vimages = []
+        bounding_rects = []
+        img_tags = document.getElementsByTagName('img')
+        for img in img_tags
+            bounding_rects.push(img.getBoundingClientRect())
         maxh = this.current_page_height
-        for img in document.getElementsByTagName('img')
+        for i in [0...img_tags.length]
+            img = img_tags[i]
             previously_limited = calibre_utils.retrieve(img, 'width-limited', false)
             data = calibre_utils.retrieve(img, 'img-data', null)
-            br = img.getBoundingClientRect()
+            br = bounding_rects[i]
             if data == null
                 data = {'left':br.left, 'right':br.right, 'height':br.height, 'display': img.style.display}
                 calibre_utils.store(img, 'img-data', data)