From 72a9cafdb5bfd9773e19e8518f0f632f8a7b50dc Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sat, 11 Jun 2016 09:59:48 +0530
Subject: [PATCH] E-book viewer: Remove workaround for bug in old versions of
 WebKit that could cause incorrect rendering of chapter titles in some rare
 circumstances.

---
 resources/compiled_coffeescript.zip         | Bin 101095 -> 101036 bytes
 src/calibre/ebooks/oeb/display/paged.coffee |   5 -----
 src/pyj/read_book/paged_mode.pyj            |   5 -----
 3 files changed, 10 deletions(-)

diff --git a/resources/compiled_coffeescript.zip b/resources/compiled_coffeescript.zip
index 4bb1116a8a9fb362b4ae0cea311b2db302e79b0c..542fa626624c5479de471ec0968d050b0182709a 100644
GIT binary patch
delta 236
zcmaDpm2J&bwhiC+3Woci_Sjc=a^~SI1_lt8p6u8yHvK{;Bgba7eedNr2i)7af)_>6
zbg_2EDCU<MjME)88D*yTw=-%nYE9qO&gjA1@4-0zxd)@Hcz`!68v_t<0^wXH1_rNI
zMuzoF)zkNMGAd{!rx~QB7+4xx7$q7fCYl-<q*xlJnHnZrSejd!SQr{vf<zJxjHU;6
zF^W&VJ(YWUZzrSkbm=a}zUg;67}=+vZ)fD3zNmxIdU`?^BggcJHb%bb_8=v`9gMCJ
Rv5j4frqj=NF#0go0st7aP$mEX

delta 242
zcmZ28mF@XdwhiC+@|9c7@nBcql=Ux*f#F})bVf}^$<1>6zRQc|CKjb<=IJJ-rsWr<
zs_Q7I8>nkqZ+?IG{t8|cJ=1TuF-9?|Xihh8XLM&wonGJ0=)rW#V|qh7qsa9A9*kVm
zpSLp#aJ05EGOTB+R+_%Ql~H#3^G-(V>A78u?9&}O8C^guyXlWQ7{#W`wlVTepVi6e
zJUzC9(QmTcJ`QaqD+MK!Br{_}LrVh#V`K9aQ&U3|OA{kA^JGIybA!ZG3*%HX^R(n-
h<HYF?Iv6FUukK*%oBpALkz=|~JCHEyV$@}<1ps%|R5Jho

diff --git a/src/calibre/ebooks/oeb/display/paged.coffee b/src/calibre/ebooks/oeb/display/paged.coffee
index 0bc5f96e32..909ac15ae9 100644
--- a/src/calibre/ebooks/oeb/display/paged.coffee
+++ b/src/calibre/ebooks/oeb/display/paged.coffee
@@ -179,13 +179,8 @@ class PagedDisplay
         # above the columns, which causes them to effectively be added to the
         # page margins (the margin collapse algorithm)
         bs.setProperty('-webkit-margin-collapse', 'separate')
-        # Remove any webkit specified default margin from the first child of body
-        # Otherwise, you could end up with an effective negative margin, I dont
-        # understand exactly why, but see:
-        # https://bugs.launchpad.net/calibre/+bug/1082640 for an example
         c = first_child(document.body)
         if c != null
-            c.style.setProperty('-webkit-margin-before', '0')
             # Remove page breaks on the first few elements to prevent blank pages
             # at the start of a chapter
             c.style.setProperty('-webkit-column-break-before', 'avoid')
diff --git a/src/pyj/read_book/paged_mode.pyj b/src/pyj/read_book/paged_mode.pyj
index 4c1ed32689..cc193d6530 100644
--- a/src/pyj/read_book/paged_mode.pyj
+++ b/src/pyj/read_book/paged_mode.pyj
@@ -142,13 +142,8 @@ def layout(is_single_page):
     # above the columns, which causes them to effectively be added to the
     # page margins (the margin collapse algorithm)
     document.body.style.setProperty('-webkit-margin-collapse', 'separate')
-    # Remove any webkit specified default margin from the first child of body
-    # Otherwise, you could end up with an effective negative margin, I dont
-    # understand exactly why, but see:
-    # https://bugs.launchpad.net/calibre/+bug/1082640 for an example
     c = first_child(document.body)
     if c:
-        c.style.setProperty('-webkit-margin-before', '0')
         # Remove page breaks on the first few elements to prevent blank pages
         # at the start of a chapter
         set_css(c, break_before='avoid')