69490 2011-10-05 17:34:45 -0700 Make zoom multiplier float instead of double to match RenderStyle::effectiveZoom etc. and thus avoid unnecessary precision conversions. 2012-01-23 18:36:45 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 macpherson macpherson bdakin dbates kling koivisto macpherson simon.fraser webkit.review.bot oldest_to_newest 478819 0 macpherson 2011-10-05 17:34:45 -0700 Make zoom multiplier float instead of double to match RenderStyle::effectiveZoom etc. and thus avoid unnecessary precision conversions. 478823 1 109891 macpherson 2011-10-05 17:36:39 -0700 Created attachment 109891 Patch 478832 2 macpherson 2011-10-05 17:49:27 -0700 The motivation for this was seeing cycles wasted in the profiler output doing precision conversion from float to double. This is especially wasteful because the value is later discarded when zoom is 1.0. 479763 3 macpherson 2011-10-06 20:28:31 -0700 FYI, the performance difference isn't noticeable on PerformanceTests/Parser/html5-full-render.html ToT: Testing 6092696 byte document in 13 500000 byte chunks. Running 20 times Ignoring warm-up run (43051) 42380 42317 42440 42383 42279 42400 42350 42404 42390 42406 42224 42464 42225 42859 42056 42281 42751 42235 42230 42451 avg 42376.25 median 42381.5 stdev 174.0677669759683 min 42056 max 42859 With float patch: Testing 6092696 byte document in 13 500000 byte chunks. Running 20 times Ignoring warm-up run (42785) 42227 42249 42308 42343 42462 42386 42531 42521 42463 42367 42502 42122 42512 42245 42244 42572 42313 42514 42091 42463 avg 42371.75 median 42376.5 stdev 139.20735433158694 min 42091 max 42572 539605 4 109891 kling 2012-01-20 10:24:17 -0800 Comment on attachment 109891 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=109891&action=review r=me assuming this still applies. > Source/WebCore/ChangeLog:16 > + Change type signatures of computeLenght template prototype. Typo, computeLength. 540334 5 123503 macpherson 2012-01-22 17:05:26 -0800 Created attachment 123503 Patch for landing 541067 6 123503 webkit.review.bot 2012-01-23 18:36:38 -0800 Comment on attachment 123503 Patch for landing Clearing flags on attachment: 123503 Committed r105678: <http://trac.webkit.org/changeset/105678> 541068 7 webkit.review.bot 2012-01-23 18:36:45 -0800 All reviewed patches have been landed. Closing bug. 109891 2011-10-05 17:36:39 -0700 2012-01-22 17:05:18 -0800 Patch bug-69490-20111006113636.patch text/plain 5818 macpherson SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDk2NzczKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTEtMTAtMDUgIEx1a2UgTWFj cGhlcnNvbiAgIDxtYWNwaGVyc29uQGNocm9taXVtLm9yZz4KKworICAgICAgICBNYWtlIHpvb20g bXVsdGlwbGllciBmbG9hdCBpbnN0ZWFkIG9mIGRvdWJsZSB0byBtYXRjaCBSZW5kZXJTdHlsZTo6 ZWZmZWN0aXZlWm9vbSBldGMuIGFuZCB0aHVzIGF2b2lkIHVubmVjZXNzYXJ5IHByZWNpc2lvbiBj b252ZXJzaW9ucy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTY5NDkwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgQ292ZXJlZCBieSBleGlzdGluZyB0ZXN0cy4KKworICAgICAgICAqIGNzcy9DU1NQcmltaXRp dmVWYWx1ZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDU1NQcmltaXRpdmVWYWx1ZTo6Y29tcHV0 ZUxlbmd0aCk6CisgICAgICAgIFVzZSBmbG9hdCBtdWx0aXBsaWVyIGluc3RlYWQgb2YgZG91Ymxl LgorICAgICAgICAoV2ViQ29yZTo6Q1NTUHJpbWl0aXZlVmFsdWU6OmNvbXB1dGVMZW5ndGhEb3Vi bGUpOgorICAgICAgICBVc2UgZmxvYXQgbXVsdGlwbGllciBpbnN0ZWFkIG9mIGRvdWJsZS4KKyAg ICAgICAgKiBjc3MvQ1NTUHJpbWl0aXZlVmFsdWUuaDoKKyAgICAgICAgQ2hhbmdlIHR5cGUgc2ln bmF0dXJlcyBvZiBjb21wdXRlTGVuZ2h0IHRlbXBsYXRlIHByb3RvdHlwZS4KKwogMjAxMS0xMC0w MyAgT2phbiBWYWZhaSAgPG9qYW5AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFtmbGV4Ym94XSB0 YWtlIG1hcmdpbkJlZm9yZUZvckNoaWxkIGludG8gYWNjb3VudCB3aGVuIHBvc2l0aW9uaW5nIGNo aWxkcmVuCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9jc3MvQ1NTUHJpbWl0aXZlVmFsdWUuY3BwCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQcmltaXRpdmVWYWx1ZS5jcHAJKHJl dmlzaW9uIDk2NzY0KQorKysgU291cmNlL1dlYkNvcmUvY3NzL0NTU1ByaW1pdGl2ZVZhbHVlLmNw cAkod29ya2luZyBjb3B5KQpAQCAtMzI0LDM4ICszMjQsMzggQEAgdm9pZCBDU1NQcmltaXRpdmVW YWx1ZTo6Y2xlYW51cCgpCiAgICAgfQogfQogCi10ZW1wbGF0ZTw+IGludCBDU1NQcmltaXRpdmVW YWx1ZTo6Y29tcHV0ZUxlbmd0aChSZW5kZXJTdHlsZSogc3R5bGUsIFJlbmRlclN0eWxlKiByb290 U3R5bGUsIGRvdWJsZSBtdWx0aXBsaWVyLCBib29sIGNvbXB1dGluZ0ZvbnRTaXplKQordGVtcGxh dGU8PiBpbnQgQ1NTUHJpbWl0aXZlVmFsdWU6OmNvbXB1dGVMZW5ndGgoUmVuZGVyU3R5bGUqIHN0 eWxlLCBSZW5kZXJTdHlsZSogcm9vdFN0eWxlLCBmbG9hdCBtdWx0aXBsaWVyLCBib29sIGNvbXB1 dGluZ0ZvbnRTaXplKQogewogICAgIHJldHVybiByb3VuZEZvckltcHJlY2lzZUNvbnZlcnNpb248 aW50LCBJTlRfTUFYLCBJTlRfTUlOPihjb21wdXRlTGVuZ3RoRG91YmxlKHN0eWxlLCByb290U3R5 bGUsIG11bHRpcGxpZXIsIGNvbXB1dGluZ0ZvbnRTaXplKSk7CiB9CiAKLXRlbXBsYXRlPD4gTGVu Z3RoIENTU1ByaW1pdGl2ZVZhbHVlOjpjb21wdXRlTGVuZ3RoKFJlbmRlclN0eWxlKiBzdHlsZSwg UmVuZGVyU3R5bGUqIHJvb3RTdHlsZSwgZG91YmxlIG11bHRpcGxpZXIsIGJvb2wgY29tcHV0aW5n Rm9udFNpemUpCit0ZW1wbGF0ZTw+IExlbmd0aCBDU1NQcmltaXRpdmVWYWx1ZTo6Y29tcHV0ZUxl bmd0aChSZW5kZXJTdHlsZSogc3R5bGUsIFJlbmRlclN0eWxlKiByb290U3R5bGUsIGZsb2F0IG11 bHRpcGxpZXIsIGJvb2wgY29tcHV0aW5nRm9udFNpemUpCiB7CiAgICAgLy8gRklYTUU6IExlbmd0 aC5oIG5vIGxvbmdlciBleHBlY3RzIDI4IGJpdCBpbnRlZ2Vycywgc28gdGhlc2UgYm91bmRzIHNo b3VsZCBiZSBJTlRfTUFYIGFuZCBJTlRfTUlOCiAgICAgcmV0dXJuIExlbmd0aChyb3VuZEZvcklt cHJlY2lzZUNvbnZlcnNpb248aW50LCBpbnRNYXhGb3JMZW5ndGgsIGludE1pbkZvckxlbmd0aD4o Y29tcHV0ZUxlbmd0aERvdWJsZShzdHlsZSwgcm9vdFN0eWxlLCBtdWx0aXBsaWVyLCBjb21wdXRp bmdGb250U2l6ZSkpLCBGaXhlZCk7CiB9CiAKLXRlbXBsYXRlPD4gc2hvcnQgQ1NTUHJpbWl0aXZl VmFsdWU6OmNvbXB1dGVMZW5ndGgoUmVuZGVyU3R5bGUqIHN0eWxlLCBSZW5kZXJTdHlsZSogcm9v dFN0eWxlLCBkb3VibGUgbXVsdGlwbGllciwgYm9vbCBjb21wdXRpbmdGb250U2l6ZSkKK3RlbXBs YXRlPD4gc2hvcnQgQ1NTUHJpbWl0aXZlVmFsdWU6OmNvbXB1dGVMZW5ndGgoUmVuZGVyU3R5bGUq IHN0eWxlLCBSZW5kZXJTdHlsZSogcm9vdFN0eWxlLCBmbG9hdCBtdWx0aXBsaWVyLCBib29sIGNv bXB1dGluZ0ZvbnRTaXplKQogewogICAgIHJldHVybiByb3VuZEZvckltcHJlY2lzZUNvbnZlcnNp b248c2hvcnQsIFNIUlRfTUFYLCBTSFJUX01JTj4oY29tcHV0ZUxlbmd0aERvdWJsZShzdHlsZSwg cm9vdFN0eWxlLCBtdWx0aXBsaWVyLCBjb21wdXRpbmdGb250U2l6ZSkpOwogfQogCi10ZW1wbGF0 ZTw+IHVuc2lnbmVkIHNob3J0IENTU1ByaW1pdGl2ZVZhbHVlOjpjb21wdXRlTGVuZ3RoKFJlbmRl clN0eWxlKiBzdHlsZSwgUmVuZGVyU3R5bGUqIHJvb3RTdHlsZSwgZG91YmxlIG11bHRpcGxpZXIs IGJvb2wgY29tcHV0aW5nRm9udFNpemUpCit0ZW1wbGF0ZTw+IHVuc2lnbmVkIHNob3J0IENTU1By aW1pdGl2ZVZhbHVlOjpjb21wdXRlTGVuZ3RoKFJlbmRlclN0eWxlKiBzdHlsZSwgUmVuZGVyU3R5 bGUqIHJvb3RTdHlsZSwgZmxvYXQgbXVsdGlwbGllciwgYm9vbCBjb21wdXRpbmdGb250U2l6ZSkK IHsKICAgICByZXR1cm4gcm91bmRGb3JJbXByZWNpc2VDb252ZXJzaW9uPHVuc2lnbmVkIHNob3J0 LCBVU0hSVF9NQVgsIDA+KGNvbXB1dGVMZW5ndGhEb3VibGUoc3R5bGUsIHJvb3RTdHlsZSwgbXVs dGlwbGllciwgY29tcHV0aW5nRm9udFNpemUpKTsKIH0KIAotdGVtcGxhdGU8PiBmbG9hdCBDU1NQ cmltaXRpdmVWYWx1ZTo6Y29tcHV0ZUxlbmd0aChSZW5kZXJTdHlsZSogc3R5bGUsIFJlbmRlclN0 eWxlKiByb290U3R5bGUsIGRvdWJsZSBtdWx0aXBsaWVyLCBib29sIGNvbXB1dGluZ0ZvbnRTaXpl KQordGVtcGxhdGU8PiBmbG9hdCBDU1NQcmltaXRpdmVWYWx1ZTo6Y29tcHV0ZUxlbmd0aChSZW5k ZXJTdHlsZSogc3R5bGUsIFJlbmRlclN0eWxlKiByb290U3R5bGUsIGZsb2F0IG11bHRpcGxpZXIs IGJvb2wgY29tcHV0aW5nRm9udFNpemUpCiB7CiAgICAgcmV0dXJuIHN0YXRpY19jYXN0PGZsb2F0 Pihjb21wdXRlTGVuZ3RoRG91YmxlKHN0eWxlLCByb290U3R5bGUsIG11bHRpcGxpZXIsIGNvbXB1 dGluZ0ZvbnRTaXplKSk7CiB9CiAKLXRlbXBsYXRlPD4gZG91YmxlIENTU1ByaW1pdGl2ZVZhbHVl Ojpjb21wdXRlTGVuZ3RoKFJlbmRlclN0eWxlKiBzdHlsZSwgUmVuZGVyU3R5bGUqIHJvb3RTdHls ZSwgZG91YmxlIG11bHRpcGxpZXIsIGJvb2wgY29tcHV0aW5nRm9udFNpemUpCit0ZW1wbGF0ZTw+ IGRvdWJsZSBDU1NQcmltaXRpdmVWYWx1ZTo6Y29tcHV0ZUxlbmd0aChSZW5kZXJTdHlsZSogc3R5 bGUsIFJlbmRlclN0eWxlKiByb290U3R5bGUsIGZsb2F0IG11bHRpcGxpZXIsIGJvb2wgY29tcHV0 aW5nRm9udFNpemUpCiB7CiAgICAgcmV0dXJuIGNvbXB1dGVMZW5ndGhEb3VibGUoc3R5bGUsIHJv b3RTdHlsZSwgbXVsdGlwbGllciwgY29tcHV0aW5nRm9udFNpemUpOwogfQogCi1kb3VibGUgQ1NT UHJpbWl0aXZlVmFsdWU6OmNvbXB1dGVMZW5ndGhEb3VibGUoUmVuZGVyU3R5bGUqIHN0eWxlLCBS ZW5kZXJTdHlsZSogcm9vdFN0eWxlLCBkb3VibGUgbXVsdGlwbGllciwgYm9vbCBjb21wdXRpbmdG b250U2l6ZSkKK2RvdWJsZSBDU1NQcmltaXRpdmVWYWx1ZTo6Y29tcHV0ZUxlbmd0aERvdWJsZShS ZW5kZXJTdHlsZSogc3R5bGUsIFJlbmRlclN0eWxlKiByb290U3R5bGUsIGZsb2F0IG11bHRpcGxp ZXIsIGJvb2wgY29tcHV0aW5nRm9udFNpemUpCiB7CiAgICAgdW5zaWduZWQgc2hvcnQgdHlwZSA9 IHByaW1pdGl2ZVR5cGUoKTsKIApAQCAtNDA2LDcgKzQwNiw3IEBAIGRvdWJsZSBDU1NQcmltaXRp dmVWYWx1ZTo6Y29tcHV0ZUxlbmd0aEQKICAgICB9CiAKICAgICBkb3VibGUgcmVzdWx0ID0gZ2V0 RG91YmxlVmFsdWUoKSAqIGZhY3RvcjsKLSAgICBpZiAoIWFwcGx5Wm9vbU11bHRpcGxpZXIgfHwg bXVsdGlwbGllciA9PSAxLjApCisgICAgaWYgKCFhcHBseVpvb21NdWx0aXBsaWVyIHx8IG11bHRp cGxpZXIgPT0gMS4wZikKICAgICAgICAgcmV0dXJuIHJlc3VsdDsKICAgICAgCiAgICAgLy8gQW55 IG9yaWdpbmFsIHJlc3VsdCB0aGF0IHdhcyA+PSAxIHNob3VsZCBub3QgYmUgYWxsb3dlZCB0byBm YWxsIGJlbG93IDEuICBUaGlzIGtlZXBzIGJvcmRlciBsaW5lcyBmcm9tCkluZGV4OiBTb3VyY2Uv V2ViQ29yZS9jc3MvQ1NTUHJpbWl0aXZlVmFsdWUuaAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9jc3MvQ1NTUHJpbWl0aXZlVmFsdWUuaAkocmV2aXNpb24gOTY3NjQpCisrKyBTb3VyY2Uv V2ViQ29yZS9jc3MvQ1NTUHJpbWl0aXZlVmFsdWUuaAkod29ya2luZyBjb3B5KQpAQCAtMTQ4LDcg KzE0OCw3IEBAIHB1YmxpYzoKICAgICAgKiB0aGlzIGlzIHNjcmVlbi9wcmludGVyIGRlcGVuZGVu dCwgc28gd2UgcHJvYmFibHkgbmVlZCBhIGNvbmZpZyBvcHRpb24gZm9yIHRoaXMsCiAgICAgICog YW5kIHNvbWUgdG9vbCB0byBjYWxpYnJhdGUuCiAgICAgICovCi0gICAgdGVtcGxhdGU8dHlwZW5h bWUgVD4gVCBjb21wdXRlTGVuZ3RoKFJlbmRlclN0eWxlKiBjdXJyU3R5bGUsIFJlbmRlclN0eWxl KiByb290U3R5bGUsIGRvdWJsZSBtdWx0aXBsaWVyID0gMS4wLCBib29sIGNvbXB1dGluZ0ZvbnRT aXplID0gZmFsc2UpOworICAgIHRlbXBsYXRlPHR5cGVuYW1lIFQ+IFQgY29tcHV0ZUxlbmd0aChS ZW5kZXJTdHlsZSogY3VyclN0eWxlLCBSZW5kZXJTdHlsZSogcm9vdFN0eWxlLCBmbG9hdCBtdWx0 aXBsaWVyID0gMS4wZiwgYm9vbCBjb21wdXRpbmdGb250U2l6ZSA9IGZhbHNlKTsKIAogICAgIC8v IHVzZSB3aXRoIGNhcmUhISEKICAgICB2b2lkIHNldFByaW1pdGl2ZVR5cGUodW5zaWduZWQgc2hv cnQgdHlwZSkgeyBtX3R5cGUgPSB0eXBlOyB9CkBAIC0yMzcsNyArMjM3LDcgQEAgcHJpdmF0ZToK IAogICAgIGJvb2wgZ2V0RG91YmxlVmFsdWVJbnRlcm5hbChVbml0VHlwZXMgdGFyZ2V0VW5pdFR5 cGUsIGRvdWJsZSogcmVzdWx0KSBjb25zdDsKIAotICAgIGRvdWJsZSBjb21wdXRlTGVuZ3RoRG91 YmxlKFJlbmRlclN0eWxlKiBjdXJyZW50U3R5bGUsIFJlbmRlclN0eWxlKiByb290U3R5bGUsIGRv dWJsZSBtdWx0aXBsaWVyLCBib29sIGNvbXB1dGluZ0ZvbnRTaXplKTsKKyAgICBkb3VibGUgY29t cHV0ZUxlbmd0aERvdWJsZShSZW5kZXJTdHlsZSogY3VycmVudFN0eWxlLCBSZW5kZXJTdHlsZSog cm9vdFN0eWxlLCBmbG9hdCBtdWx0aXBsaWVyLCBib29sIGNvbXB1dGluZ0ZvbnRTaXplKTsKIAog ICAgIHZpcnR1YWwgYm9vbCBpc1ByaW1pdGl2ZVZhbHVlKCkgY29uc3QgeyByZXR1cm4gdHJ1ZTsg fQogCg== 123503 2012-01-22 17:05:26 -0800 2012-01-23 18:36:38 -0800 Patch for landing bug-69490-20120123120524.patch text/plain 6244 macpherson SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEwNTU5MSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIwIEBACisyMDExLTEwLTA1ICBMdWtlIE1h Y3BoZXJzb24gICA8bWFjcGhlcnNvbkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgTWFrZSB6b29t IG11bHRpcGxpZXIgZmxvYXQgaW5zdGVhZCBvZiBkb3VibGUgdG8gbWF0Y2ggUmVuZGVyU3R5bGU6 OmVmZmVjdGl2ZVpvb20gZXRjLiBhbmQgdGh1cyBhdm9pZCB1bm5lY2Vzc2FyeSBwcmVjaXNpb24g Y29udmVyc2lvbnMuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD02OTQ5MAorCisgICAgICAgIFJldmlld2VkIGJ5IEFuZHJlYXMgS2xpbmcuCisKKyAgICAg ICAgQ292ZXJlZCBieSBleGlzdGluZyB0ZXN0cy4KKworICAgICAgICAqIGNzcy9DU1NQcmltaXRp dmVWYWx1ZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDU1NQcmltaXRpdmVWYWx1ZTo6Y29tcHV0 ZUxlbmd0aCk6CisgICAgICAgIFVzZSBmbG9hdCBtdWx0aXBsaWVyIGluc3RlYWQgb2YgZG91Ymxl LgorICAgICAgICAoV2ViQ29yZTo6Q1NTUHJpbWl0aXZlVmFsdWU6OmNvbXB1dGVMZW5ndGhEb3Vi bGUpOgorICAgICAgICBVc2UgZmxvYXQgbXVsdGlwbGllciBpbnN0ZWFkIG9mIGRvdWJsZS4KKyAg ICAgICAgKiBjc3MvQ1NTUHJpbWl0aXZlVmFsdWUuaDoKKyAgICAgICAgQ2hhbmdlIHR5cGUgc2ln bmF0dXJlcyBvZiBjb21wdXRlTGVuZ3RoIHRlbXBsYXRlIHByb3RvdHlwZS4KKwogMjAxMi0wMS0y MiAgTWFyaW8gU2FuY2hleiBQcmFkYSAgPG1zYW5jaGV6QGlnYWxpYS5jb20+CiAKICAgICAgICAg W0dUS10gQVRLIHRleHQtY2FyZXQtbW92ZWQgYW5kIHRleHQtc2VsZWN0aW9uLWNoYW5nZWQgZXZl bnRzIG5vdCBiZWluZyBlbWl0dGVkCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9jc3MvQ1NTUHJpbWl0 aXZlVmFsdWUuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQcmltaXRp dmVWYWx1ZS5jcHAJKHJldmlzaW9uIDEwNTU5MSkKKysrIFNvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQ cmltaXRpdmVWYWx1ZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTM1NSw0MyArMzU1LDQzIEBAIGRv dWJsZSBDU1NQcmltaXRpdmVWYWx1ZTo6Y29tcHV0ZURlZ3JlZXMKICAgICB9CiB9CiAKLXRlbXBs YXRlPD4gaW50IENTU1ByaW1pdGl2ZVZhbHVlOjpjb21wdXRlTGVuZ3RoKFJlbmRlclN0eWxlKiBz dHlsZSwgUmVuZGVyU3R5bGUqIHJvb3RTdHlsZSwgZG91YmxlIG11bHRpcGxpZXIsIGJvb2wgY29t cHV0aW5nRm9udFNpemUpCit0ZW1wbGF0ZTw+IGludCBDU1NQcmltaXRpdmVWYWx1ZTo6Y29tcHV0 ZUxlbmd0aChSZW5kZXJTdHlsZSogc3R5bGUsIFJlbmRlclN0eWxlKiByb290U3R5bGUsIGZsb2F0 IG11bHRpcGxpZXIsIGJvb2wgY29tcHV0aW5nRm9udFNpemUpCiB7CiAgICAgcmV0dXJuIHJvdW5k Rm9ySW1wcmVjaXNlQ29udmVyc2lvbjxpbnQsIElOVF9NQVgsIElOVF9NSU4+KGNvbXB1dGVMZW5n dGhEb3VibGUoc3R5bGUsIHJvb3RTdHlsZSwgbXVsdGlwbGllciwgY29tcHV0aW5nRm9udFNpemUp KTsKIH0KIAotdGVtcGxhdGU8PiB1bnNpZ25lZCBDU1NQcmltaXRpdmVWYWx1ZTo6Y29tcHV0ZUxl bmd0aChSZW5kZXJTdHlsZSogc3R5bGUsIFJlbmRlclN0eWxlKiByb290U3R5bGUsIGRvdWJsZSBt dWx0aXBsaWVyLCBib29sIGNvbXB1dGluZ0ZvbnRTaXplKQordGVtcGxhdGU8PiB1bnNpZ25lZCBD U1NQcmltaXRpdmVWYWx1ZTo6Y29tcHV0ZUxlbmd0aChSZW5kZXJTdHlsZSogc3R5bGUsIFJlbmRl clN0eWxlKiByb290U3R5bGUsIGZsb2F0IG11bHRpcGxpZXIsIGJvb2wgY29tcHV0aW5nRm9udFNp emUpCiB7CiAgICAgcmV0dXJuIHJvdW5kRm9ySW1wcmVjaXNlQ29udmVyc2lvbjx1bnNpZ25lZCwg VUlOVF9NQVgsIDA+KGNvbXB1dGVMZW5ndGhEb3VibGUoc3R5bGUsIHJvb3RTdHlsZSwgbXVsdGlw bGllciwgY29tcHV0aW5nRm9udFNpemUpKTsKIH0KIAotdGVtcGxhdGU8PiBMZW5ndGggQ1NTUHJp bWl0aXZlVmFsdWU6OmNvbXB1dGVMZW5ndGgoUmVuZGVyU3R5bGUqIHN0eWxlLCBSZW5kZXJTdHls ZSogcm9vdFN0eWxlLCBkb3VibGUgbXVsdGlwbGllciwgYm9vbCBjb21wdXRpbmdGb250U2l6ZSkK K3RlbXBsYXRlPD4gTGVuZ3RoIENTU1ByaW1pdGl2ZVZhbHVlOjpjb21wdXRlTGVuZ3RoKFJlbmRl clN0eWxlKiBzdHlsZSwgUmVuZGVyU3R5bGUqIHJvb3RTdHlsZSwgZmxvYXQgbXVsdGlwbGllciwg Ym9vbCBjb21wdXRpbmdGb250U2l6ZSkKIHsKICAgICAvLyBGSVhNRTogTGVuZ3RoLmggbm8gbG9u Z2VyIGV4cGVjdHMgMjggYml0IGludGVnZXJzLCBzbyB0aGVzZSBib3VuZHMgc2hvdWxkIGJlIElO VF9NQVggYW5kIElOVF9NSU4KICAgICByZXR1cm4gTGVuZ3RoKHJvdW5kRm9ySW1wcmVjaXNlQ29u dmVyc2lvbjxpbnQsIGludE1heEZvckxlbmd0aCwgaW50TWluRm9yTGVuZ3RoPihjb21wdXRlTGVu Z3RoRG91YmxlKHN0eWxlLCByb290U3R5bGUsIG11bHRpcGxpZXIsIGNvbXB1dGluZ0ZvbnRTaXpl KSksIEZpeGVkKTsKIH0KIAotdGVtcGxhdGU8PiBzaG9ydCBDU1NQcmltaXRpdmVWYWx1ZTo6Y29t cHV0ZUxlbmd0aChSZW5kZXJTdHlsZSogc3R5bGUsIFJlbmRlclN0eWxlKiByb290U3R5bGUsIGRv dWJsZSBtdWx0aXBsaWVyLCBib29sIGNvbXB1dGluZ0ZvbnRTaXplKQordGVtcGxhdGU8PiBzaG9y dCBDU1NQcmltaXRpdmVWYWx1ZTo6Y29tcHV0ZUxlbmd0aChSZW5kZXJTdHlsZSogc3R5bGUsIFJl bmRlclN0eWxlKiByb290U3R5bGUsIGZsb2F0IG11bHRpcGxpZXIsIGJvb2wgY29tcHV0aW5nRm9u dFNpemUpCiB7CiAgICAgcmV0dXJuIHJvdW5kRm9ySW1wcmVjaXNlQ29udmVyc2lvbjxzaG9ydCwg U0hSVF9NQVgsIFNIUlRfTUlOPihjb21wdXRlTGVuZ3RoRG91YmxlKHN0eWxlLCByb290U3R5bGUs IG11bHRpcGxpZXIsIGNvbXB1dGluZ0ZvbnRTaXplKSk7CiB9CiAKLXRlbXBsYXRlPD4gdW5zaWdu ZWQgc2hvcnQgQ1NTUHJpbWl0aXZlVmFsdWU6OmNvbXB1dGVMZW5ndGgoUmVuZGVyU3R5bGUqIHN0 eWxlLCBSZW5kZXJTdHlsZSogcm9vdFN0eWxlLCBkb3VibGUgbXVsdGlwbGllciwgYm9vbCBjb21w dXRpbmdGb250U2l6ZSkKK3RlbXBsYXRlPD4gdW5zaWduZWQgc2hvcnQgQ1NTUHJpbWl0aXZlVmFs dWU6OmNvbXB1dGVMZW5ndGgoUmVuZGVyU3R5bGUqIHN0eWxlLCBSZW5kZXJTdHlsZSogcm9vdFN0 eWxlLCBmbG9hdCBtdWx0aXBsaWVyLCBib29sIGNvbXB1dGluZ0ZvbnRTaXplKQogewogICAgIHJl dHVybiByb3VuZEZvckltcHJlY2lzZUNvbnZlcnNpb248dW5zaWduZWQgc2hvcnQsIFVTSFJUX01B WCwgMD4oY29tcHV0ZUxlbmd0aERvdWJsZShzdHlsZSwgcm9vdFN0eWxlLCBtdWx0aXBsaWVyLCBj b21wdXRpbmdGb250U2l6ZSkpOwogfQogCi10ZW1wbGF0ZTw+IGZsb2F0IENTU1ByaW1pdGl2ZVZh bHVlOjpjb21wdXRlTGVuZ3RoKFJlbmRlclN0eWxlKiBzdHlsZSwgUmVuZGVyU3R5bGUqIHJvb3RT dHlsZSwgZG91YmxlIG11bHRpcGxpZXIsIGJvb2wgY29tcHV0aW5nRm9udFNpemUpCit0ZW1wbGF0 ZTw+IGZsb2F0IENTU1ByaW1pdGl2ZVZhbHVlOjpjb21wdXRlTGVuZ3RoKFJlbmRlclN0eWxlKiBz dHlsZSwgUmVuZGVyU3R5bGUqIHJvb3RTdHlsZSwgZmxvYXQgbXVsdGlwbGllciwgYm9vbCBjb21w dXRpbmdGb250U2l6ZSkKIHsKICAgICByZXR1cm4gc3RhdGljX2Nhc3Q8ZmxvYXQ+KGNvbXB1dGVM ZW5ndGhEb3VibGUoc3R5bGUsIHJvb3RTdHlsZSwgbXVsdGlwbGllciwgY29tcHV0aW5nRm9udFNp emUpKTsKIH0KIAotdGVtcGxhdGU8PiBkb3VibGUgQ1NTUHJpbWl0aXZlVmFsdWU6OmNvbXB1dGVM ZW5ndGgoUmVuZGVyU3R5bGUqIHN0eWxlLCBSZW5kZXJTdHlsZSogcm9vdFN0eWxlLCBkb3VibGUg bXVsdGlwbGllciwgYm9vbCBjb21wdXRpbmdGb250U2l6ZSkKK3RlbXBsYXRlPD4gZG91YmxlIENT U1ByaW1pdGl2ZVZhbHVlOjpjb21wdXRlTGVuZ3RoKFJlbmRlclN0eWxlKiBzdHlsZSwgUmVuZGVy U3R5bGUqIHJvb3RTdHlsZSwgZmxvYXQgbXVsdGlwbGllciwgYm9vbCBjb21wdXRpbmdGb250U2l6 ZSkKIHsKICAgICByZXR1cm4gY29tcHV0ZUxlbmd0aERvdWJsZShzdHlsZSwgcm9vdFN0eWxlLCBt dWx0aXBsaWVyLCBjb21wdXRpbmdGb250U2l6ZSk7CiB9CiAKLWRvdWJsZSBDU1NQcmltaXRpdmVW YWx1ZTo6Y29tcHV0ZUxlbmd0aERvdWJsZShSZW5kZXJTdHlsZSogc3R5bGUsIFJlbmRlclN0eWxl KiByb290U3R5bGUsIGRvdWJsZSBtdWx0aXBsaWVyLCBib29sIGNvbXB1dGluZ0ZvbnRTaXplKQor ZG91YmxlIENTU1ByaW1pdGl2ZVZhbHVlOjpjb21wdXRlTGVuZ3RoRG91YmxlKFJlbmRlclN0eWxl KiBzdHlsZSwgUmVuZGVyU3R5bGUqIHJvb3RTdHlsZSwgZmxvYXQgbXVsdGlwbGllciwgYm9vbCBj b21wdXRpbmdGb250U2l6ZSkKIHsKICAgICB1bnNpZ25lZCBzaG9ydCB0eXBlID0gcHJpbWl0aXZl VHlwZSgpOwogCkBAIC00NDIsNyArNDQyLDcgQEAgZG91YmxlIENTU1ByaW1pdGl2ZVZhbHVlOjpj b21wdXRlTGVuZ3RoRAogICAgIH0KIAogICAgIGRvdWJsZSByZXN1bHQgPSBnZXREb3VibGVWYWx1 ZSgpICogZmFjdG9yOwotICAgIGlmICghYXBwbHlab29tTXVsdGlwbGllciB8fCBtdWx0aXBsaWVy ID09IDEuMCkKKyAgICBpZiAoIWFwcGx5Wm9vbU11bHRpcGxpZXIgfHwgbXVsdGlwbGllciA9PSAx LjBmKQogICAgICAgICByZXR1cm4gcmVzdWx0OwogCiAgICAgLy8gQW55IG9yaWdpbmFsIHJlc3Vs dCB0aGF0IHdhcyA+PSAxIHNob3VsZCBub3QgYmUgYWxsb3dlZCB0byBmYWxsIGJlbG93IDEuICBU aGlzIGtlZXBzIGJvcmRlciBsaW5lcyBmcm9tCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9jc3MvQ1NT UHJpbWl0aXZlVmFsdWUuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9jc3MvQ1NTUHJp bWl0aXZlVmFsdWUuaAkocmV2aXNpb24gMTA1NTkxKQorKysgU291cmNlL1dlYkNvcmUvY3NzL0NT U1ByaW1pdGl2ZVZhbHVlLmgJKHdvcmtpbmcgY29weSkKQEAgLTIwMSw3ICsyMDEsNyBAQCBwdWJs aWM6CiAgICAgICogdGhpcyBpcyBzY3JlZW4vcHJpbnRlciBkZXBlbmRlbnQsIHNvIHdlIHByb2Jh Ymx5IG5lZWQgYSBjb25maWcgb3B0aW9uIGZvciB0aGlzLAogICAgICAqIGFuZCBzb21lIHRvb2wg dG8gY2FsaWJyYXRlLgogICAgICAqLwotICAgIHRlbXBsYXRlPHR5cGVuYW1lIFQ+IFQgY29tcHV0 ZUxlbmd0aChSZW5kZXJTdHlsZSogY3VyclN0eWxlLCBSZW5kZXJTdHlsZSogcm9vdFN0eWxlLCBk b3VibGUgbXVsdGlwbGllciA9IDEuMCwgYm9vbCBjb21wdXRpbmdGb250U2l6ZSA9IGZhbHNlKTsK KyAgICB0ZW1wbGF0ZTx0eXBlbmFtZSBUPiBUIGNvbXB1dGVMZW5ndGgoUmVuZGVyU3R5bGUqIGN1 cnJTdHlsZSwgUmVuZGVyU3R5bGUqIHJvb3RTdHlsZSwgZmxvYXQgbXVsdGlwbGllciA9IDEuMGYs IGJvb2wgY29tcHV0aW5nRm9udFNpemUgPSBmYWxzZSk7CiAKICAgICAvLyB1c2Ugd2l0aCBjYXJl ISEhCiAgICAgdm9pZCBzZXRQcmltaXRpdmVUeXBlKHVuc2lnbmVkIHNob3J0IHR5cGUpIHsgbV9w cmltaXRpdmVVbml0VHlwZSA9IHR5cGU7IH0KQEAgLTMwMSw3ICszMDEsNyBAQCBwcml2YXRlOgog CiAgICAgYm9vbCBnZXREb3VibGVWYWx1ZUludGVybmFsKFVuaXRUeXBlcyB0YXJnZXRVbml0VHlw ZSwgZG91YmxlKiByZXN1bHQpIGNvbnN0OwogCi0gICAgZG91YmxlIGNvbXB1dGVMZW5ndGhEb3Vi bGUoUmVuZGVyU3R5bGUqIGN1cnJlbnRTdHlsZSwgUmVuZGVyU3R5bGUqIHJvb3RTdHlsZSwgZG91 YmxlIG11bHRpcGxpZXIsIGJvb2wgY29tcHV0aW5nRm9udFNpemUpOworICAgIGRvdWJsZSBjb21w dXRlTGVuZ3RoRG91YmxlKFJlbmRlclN0eWxlKiBjdXJyZW50U3R5bGUsIFJlbmRlclN0eWxlKiBy b290U3R5bGUsIGZsb2F0IG11bHRpcGxpZXIsIGJvb2wgY29tcHV0aW5nRm9udFNpemUpOwogCiAg ICAgdW5pb24gewogICAgICAgICBpbnQgaWRlbnQ7Cg==