219678 2020-12-09 05:44:49 -0800 Font loads are triggered too late 2020-12-09 11:31:03 -0800 1 1 1 Unclassified WebKit Page Loading WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 koivisto webkit-unassigned beidson cdumez esprehn+autocc ews-watchlist ggaren glenn gyuyoung.kim kangil.han macpherson menard webkit-bug-importer oldest_to_newest 1713112 0 koivisto 2020-12-09 05:44:49 -0800 CSSFontSelector triggers font loads on zero duration timer after style resolution. This can get delayed substantially and all sorts of less important loads may go out first. 1713126 1 415751 koivisto 2020-12-09 06:41:10 -0800 Created attachment 415751 wip 1713185 2 415766 koivisto 2020-12-09 09:09:32 -0800 Created attachment 415766 patch 1713229 3 415766 ggaren 2020-12-09 11:07:58 -0800 Comment on attachment 415766 patch r=me 1713239 4 ews-feeder 2020-12-09 11:30:35 -0800 Committed r270590: <https://trac.webkit.org/changeset/270590> All reviewed patches have been landed. Closing bug and clearing flags on attachment 415766. 415751 2020-12-09 06:41:10 -0800 2020-12-09 09:09:32 -0800 wip font-load-trigger.patch text/plain 2769 koivisto ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NGb250U2VsZWN0b3IuY3BwIGIvU291 cmNlL1dlYkNvcmUvY3NzL0NTU0ZvbnRTZWxlY3Rvci5jcHAKaW5kZXggNDBlOWNiNmIxZTE3Li4w NzcwMzc1YTA3ZGUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NGb250U2VsZWN0 b3IuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NGb250U2VsZWN0b3IuY3BwCkBAIC0z NzQsOCArMzc0LDExIEBAIHZvaWQgQ1NTRm9udFNlbGVjdG9yOjpzdXNwZW5kRm9udExvYWRpbmdU aW1lcigpCiAgICAgc3VzcGVuZChSZWFzb25Gb3JTdXNwZW5zaW9uOjpQYWdlV2lsbEJlU3VzcGVu ZGVkKTsKIH0KIAotdm9pZCBDU1NGb250U2VsZWN0b3I6OmZvbnRMb2FkaW5nVGltZXJGaXJlZCgp Cit2b2lkIENTU0ZvbnRTZWxlY3Rvcjo6bG9hZFBlbmRpbmdGb250cygpCiB7CisgICAgaWYgKG1f Zm9udExvYWRpbmdUaW1lcklzU3VzcGVuZGVkKQorICAgICAgICByZXR1cm47CisKICAgICBWZWN0 b3I8Q2FjaGVkUmVzb3VyY2VIYW5kbGU8Q2FjaGVkRm9udD4+IGZvbnRzVG9CZWdpbkxvYWRpbmc7 CiAgICAgZm9udHNUb0JlZ2luTG9hZGluZy5zd2FwKG1fZm9udHNUb0JlZ2luTG9hZGluZyk7CiAK QEAgLTM4OCwxNyArMzkxLDI1IEBAIHZvaWQgQ1NTRm9udFNlbGVjdG9yOjpmb250TG9hZGluZ1Rp bWVyRmlyZWQoKQogICAgICAgICAvLyBCYWxhbmNlcyBpbmNyZW1lbnRSZXF1ZXN0Q291bnQoKSBp biBiZWdpbkxvYWRpbmdGb250U29vbigpLgogICAgICAgICBjYWNoZWRSZXNvdXJjZUxvYWRlci5k ZWNyZW1lbnRSZXF1ZXN0Q291bnQoKmZvbnRIYW5kbGUpOwogICAgIH0KK30KKwordm9pZCBDU1NG b250U2VsZWN0b3I6OmZvbnRMb2FkaW5nVGltZXJGaXJlZCgpCit7CisgICAgUmVmPENTU0ZvbnRT ZWxlY3Rvcj4gcHJvdGVjdGVkVGhpcygqdGhpcyk7CisKKyAgICBsb2FkUGVuZGluZ0ZvbnRzKCk7 CisKICAgICAvLyBGSVhNRTogVXNlIFN1YnJlc291cmNlTG9hZGVyIGluc3RlYWQuCiAgICAgLy8g Q2FsbCBGcmFtZUxvYWRlcjo6bG9hZERvbmUgYmVmb3JlIEZyYW1lTG9hZGVyOjpzdWJyZXNvdXJj ZUxvYWREb25lIHRvIG1hdGNoIHRoZSBvcmRlciBpbiBTdWJyZXNvdXJjZUxvYWRlcjo6bm90aWZ5 RG9uZS4KLSAgICBjYWNoZWRSZXNvdXJjZUxvYWRlci5sb2FkRG9uZShMb2FkQ29tcGxldGlvblR5 cGU6OkZpbmlzaCk7CisgICAgbV9kb2N1bWVudC0+Y2FjaGVkUmVzb3VyY2VMb2FkZXIoKS5sb2Fk RG9uZShMb2FkQ29tcGxldGlvblR5cGU6OkZpbmlzaCk7CiAgICAgLy8gRW5zdXJlIHRoYXQgaWYg dGhlIHJlcXVlc3QgY291bnQgcmVhY2hlcyB6ZXJvLCB0aGUgZnJhbWUgbG9hZGVyIHdpbGwga25v dyBhYm91dCBpdC4KICAgICAvLyBOZXcgZm9udCBsb2FkcyBtYXkgYmUgdHJpZ2dlcmVkIGJ5IGxh eW91dCBhZnRlciB0aGUgZG9jdW1lbnQgbG9hZCBpcyBjb21wbGV0ZSBidXQgYmVmb3JlIHdlIGhh dmUgZGlzcGF0Y2hlZAogICAgIC8vIGRpZEZpbmlzaExvYWRpbmcgZm9yIHRoZSBmcmFtZS4gTWFr ZSBzdXJlIHRoZSBkZWxlZ2F0ZSBpcyBhbHdheXMgZGlzcGF0Y2hlZCBieSBjaGVja2luZyBleHBs aWNpdGx5LgorCiAgICAgaWYgKG1fZG9jdW1lbnQgJiYgbV9kb2N1bWVudC0+ZnJhbWUoKSkKICAg ICAgICAgbV9kb2N1bWVudC0+ZnJhbWUoKS0+bG9hZGVyKCkuY2hlY2tMb2FkQ29tcGxldGUoKTsK IH0KIAotCiBzaXplX3QgQ1NTRm9udFNlbGVjdG9yOjpmYWxsYmFja0ZvbnRDb3VudCgpCiB7CiAg ICAgaWYgKCFtX2RvY3VtZW50KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL0NTU0Zv bnRTZWxlY3Rvci5oIGIvU291cmNlL1dlYkNvcmUvY3NzL0NTU0ZvbnRTZWxlY3Rvci5oCmluZGV4 IGU4NDIzZmQwN2JkYy4uODFlMGZkMzg2MWU1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9j c3MvQ1NTRm9udFNlbGVjdG9yLmgKKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL0NTU0ZvbnRTZWxl Y3Rvci5oCkBAIC04OSw2ICs4OSw4IEBAIHB1YmxpYzoKICAgICB2b2lkIGluY3JlbWVudElzQ29t cHV0aW5nUm9vdFN0eWxlRm9udCgpIHsgKyttX2NvbXB1dGluZ1Jvb3RTdHlsZUZvbnRDb3VudDsg fQogICAgIHZvaWQgZGVjcmVtZW50SXNDb21wdXRpbmdSb290U3R5bGVGb250KCkgeyAtLW1fY29t cHV0aW5nUm9vdFN0eWxlRm9udENvdW50OyB9CiAKKyAgICB2b2lkIGxvYWRQZW5kaW5nRm9udHMo KTsKKwogcHJpdmF0ZToKICAgICBleHBsaWNpdCBDU1NGb250U2VsZWN0b3IoRG9jdW1lbnQmKTsK IApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcCBiL1NvdXJjZS9X ZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAKaW5kZXggOGQzMmIwNDg2YTExLi5kYjg3ZmExMzQ3ZDQg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcApAQCAtMjAzNSw2ICsyMDM1LDggQEAgdm9pZCBEb2N1 bWVudDo6cmVzb2x2ZVN0eWxlKFJlc29sdmVTdHlsZVR5cGUgdHlwZSkKIAogICAgICAgICBtX2lu U3R5bGVSZWNhbGMgPSBmYWxzZTsKIAorICAgICAgICBmb250U2VsZWN0b3IoKS5sb2FkUGVuZGlu Z0ZvbnRzKCk7CisKICAgICAgICAgaWYgKHN0eWxlVXBkYXRlKSB7CiAgICAgICAgICAgICB1cGRh dGVSZW5kZXJUcmVlKFdURk1vdmUoc3R5bGVVcGRhdGUpKTsKICAgICAgICAgICAgIGZyYW1lVmll dy5zdHlsZUFuZFJlbmRlclRyZWVEaWRDaGFuZ2UoKTsK 415766 2020-12-09 09:09:32 -0800 2020-12-09 11:30:36 -0800 patch font-load-trigger-2.patch text/plain 7148 koivisto ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCAwMjgxNjlhOWJiNDguLmQ2ZjlkYzMyODliYiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVz dHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEyIEBA CisyMDIwLTEyLTA5ICBBbnR0aSBLb2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAg ICBGb250IGxvYWRzIGFyZSB0cmlnZ2VyZWQgdG9vIGxhdGUKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxOTY3OAorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogZmFzdC90ZXh0L3dlYi1mb250LWxvYWQtZmFs bGJhY2stZHVyaW5nLWxvYWRpbmctbm8tbXVsdGlwbGUtZXhwZWN0ZWQudHh0OgorCiAyMDIwLTEy LTA4ICBZb3Vlbm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KIAogICAgICAgICBBbGxvdyBS VENSdHBTRnJhbWVUcmFuc2Zvcm0gdG8gaGFuZGxlIG11bHRpcGxlIGtleXMKZGlmZiAtLWdpdCBh L0xheW91dFRlc3RzL2Zhc3QvdGV4dC93ZWItZm9udC1sb2FkLWZhbGxiYWNrLWR1cmluZy1sb2Fk aW5nLW5vLW11bHRpcGxlLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2Zhc3QvdGV4dC93ZWIt Zm9udC1sb2FkLWZhbGxiYWNrLWR1cmluZy1sb2FkaW5nLW5vLW11bHRpcGxlLWV4cGVjdGVkLnR4 dAppbmRleCA3MjhkYzlmODZiZDIuLjFjOWExNDg0OTU1ZiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVz dHMvZmFzdC90ZXh0L3dlYi1mb250LWxvYWQtZmFsbGJhY2stZHVyaW5nLWxvYWRpbmctbm8tbXVs dGlwbGUtZXhwZWN0ZWQudHh0CisrKyBiL0xheW91dFRlc3RzL2Zhc3QvdGV4dC93ZWItZm9udC1s b2FkLWZhbGxiYWNrLWR1cmluZy1sb2FkaW5nLW5vLW11bHRpcGxlLWV4cGVjdGVkLnR4dApAQCAt MSw1ICsxLDUgQEAKLXdlYi1mb250LWxvYWQtZmFsbGJhY2stZHVyaW5nLWxvYWRpbmctbm8tbXVs dGlwbGUuaHRtbCAtIGRpZEZpbmlzaExvYWRpbmcKIEFoZW0udHRmIC0gd2lsbFNlbmRSZXF1ZXN0 IDxOU1VSTFJlcXVlc3QgVVJMIEFoZW0udHRmLCBtYWluIGRvY3VtZW50IFVSTCB3ZWItZm9udC1s b2FkLWZhbGxiYWNrLWR1cmluZy1sb2FkaW5nLW5vLW11bHRpcGxlLmh0bWwsIGh0dHAgbWV0aG9k IEdFVD4gcmVkaXJlY3RSZXNwb25zZSAobnVsbCkKK3dlYi1mb250LWxvYWQtZmFsbGJhY2stZHVy aW5nLWxvYWRpbmctbm8tbXVsdGlwbGUuaHRtbCAtIGRpZEZpbmlzaExvYWRpbmcKIEFoZW0udHRm IC0gZGlkUmVjZWl2ZVJlc3BvbnNlIDxOU1VSTFJlc3BvbnNlIEFoZW0udHRmLCBodHRwIHN0YXR1 cyBjb2RlIDA+CiBBaGVtLnR0ZiAtIGRpZEZpbmlzaExvYWRpbmcKIFRoaXMgdGVzdCBtYWtlcyBz dXJlIHRoYXQgbXVsdGlwbGUgcmVtb3RlIGZvbnRzIGFyZW4ndCByZXF1ZXN0ZWQgY29uY3VycmVu dGx5IGR1ZSB0byB0aW1lb3V0cy4gVGhlIHRlc3QgcGFzc2VzIGlmIG9ubHkgb25lIHJlbW90ZSBm b250IGlzIHJlcXVlc3RlZC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBi L1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA5NTg0ZDA0YjgyYjMuLmU1YTM2NGVlY2Iy NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJD b3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMyIEBACisyMDIwLTEyLTA5ICBBbnR0aSBLb2l2aXN0 byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBGb250IGxvYWRzIGFyZSB0cmlnZ2VyZWQg dG9vIGxhdGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTIxOTY3OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IENTU0ZvbnRTZWxlY3RvciB0cmlnZ2VycyBmb250IGxvYWRzIG9uIHplcm8gZHVyYXRpb24gdGlt ZXIgYWZ0ZXIgc3R5bGUgcmVzb2x1dGlvbi4KKyAgICAgICAgVGhpcyBjYW4gZ2V0IGRlbGF5ZWQg c3Vic3RhbnRpYWxseSBhbmQgYWxsIHNvcnRzIG9mIGxlc3MgaW1wb3J0YW50IGxvYWRzIChmb3Ig ZXhhbXBsZQorICAgICAgICBDU1MgaW1hZ2VzIHRyaWdnZXJlZCBkdXJpbmcgcmVuZGVyIHRyZWUg YnVpbGRpbmcpIG1heSBnbyBvdXQgZmlyc3QuCisKKyAgICAgICAgKiBjc3MvQ1NTRm9udFNlbGVj dG9yLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNTU0ZvbnRTZWxlY3Rvcjo6YmVnaW5Mb2FkaW5n Rm9udFNvb24pOgorICAgICAgICAoV2ViQ29yZTo6Q1NTRm9udFNlbGVjdG9yOjpsb2FkUGVuZGlu Z0ZvbnRzKToKKworICAgICAgICBGYWN0b3IgdGhlIGFjdHVhbCBsb2FkIHRyaWdnZXJpbmcgaW50 byBhIGZ1bmN0aW9uLgorCisgICAgICAgIChXZWJDb3JlOjpDU1NGb250U2VsZWN0b3I6OmZvbnRM b2FkaW5nVGltZXJGaXJlZCk6CisKKyAgICAgICAgVGltZXIgc3RpbGwgdGFrZXMgY2FyZSBvZiB0 aGUgY2hlY2tMb2FkQ29tcGxldGUuCisKKyAgICAgICAgKFdlYkNvcmU6OkNTU0ZvbnRTZWxlY3Rv cjo6c3VzcGVuZCk6CisgICAgICAgIChXZWJDb3JlOjpDU1NGb250U2VsZWN0b3I6OnJlc3VtZSk6 CisgICAgICAgICogY3NzL0NTU0ZvbnRTZWxlY3Rvci5oOgorICAgICAgICAqIGRvbS9Eb2N1bWVu dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpEb2N1bWVudDo6cmVzb2x2ZVN0eWxlKToKKworICAg ICAgICBUcmlnZ2VyIGZvbnQgbG9hZHMgcmlnaHQgYWZ0ZXIgc3R5bGUgcmVzb2x1dGlvbiwgYmVm b3JlIHJlbmRlciB0cmVlIGJ1aWxkaW5nLgorCiAyMDIwLTEyLTA4ICBBbnR0aSBLb2l2aXN0byAg PGFudHRpQGFwcGxlLmNvbT4KIAogICAgICAgICBbTEZDXVtJbnRlZ3JhdGlvbl0gRG9uJ3QgYXNz dW1lIGVuc3VyZUxpbmVCb3hlcyBjYW4gYmUgY2FsbGVkIG9uIGRpcmVjdCBwYXJlbnQKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NGb250U2VsZWN0b3IuY3BwIGIvU291cmNlL1dl YkNvcmUvY3NzL0NTU0ZvbnRTZWxlY3Rvci5jcHAKaW5kZXggNDBlOWNiNmIxZTE3Li5kMjc4NTJj NDg3NjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NGb250U2VsZWN0b3IuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NGb250U2VsZWN0b3IuY3BwCkBAIC0zNjUsNyAr MzY1LDcgQEAgdm9pZCBDU1NGb250U2VsZWN0b3I6OmJlZ2luTG9hZGluZ0ZvbnRTb29uKENhY2hl ZEZvbnQmIGZvbnQpCiAgICAgLy8gZGVjcmVtZW50UmVxdWVzdENvdW50KCkgaW4gZm9udExvYWRp bmdUaW1lckZpcmVkKCkgYW5kIGluIGNsZWFyRG9jdW1lbnQoKS4KICAgICBtX2RvY3VtZW50LT5j YWNoZWRSZXNvdXJjZUxvYWRlcigpLmluY3JlbWVudFJlcXVlc3RDb3VudChmb250KTsKIAotICAg IGlmICghbV9mb250TG9hZGluZ1RpbWVySXNTdXNwZW5kZWQpCisgICAgaWYgKCFtX2lzRm9udExv YWRpbmdTdXNwZW5kZWQgJiYgIW1fZm9udExvYWRpbmdUaW1lci5pc0FjdGl2ZSgpKQogICAgICAg ICBtX2ZvbnRMb2FkaW5nVGltZXIuc3RhcnRPbmVTaG90KDBfcyk7CiB9CiAKQEAgLTM3NCw4ICsz NzQsMTEgQEAgdm9pZCBDU1NGb250U2VsZWN0b3I6OnN1c3BlbmRGb250TG9hZGluZ1RpbWVyKCkK ICAgICBzdXNwZW5kKFJlYXNvbkZvclN1c3BlbnNpb246OlBhZ2VXaWxsQmVTdXNwZW5kZWQpOwog fQogCi12b2lkIENTU0ZvbnRTZWxlY3Rvcjo6Zm9udExvYWRpbmdUaW1lckZpcmVkKCkKK3ZvaWQg Q1NTRm9udFNlbGVjdG9yOjpsb2FkUGVuZGluZ0ZvbnRzKCkKIHsKKyAgICBpZiAobV9pc0ZvbnRM b2FkaW5nU3VzcGVuZGVkKQorICAgICAgICByZXR1cm47CisKICAgICBWZWN0b3I8Q2FjaGVkUmVz b3VyY2VIYW5kbGU8Q2FjaGVkRm9udD4+IGZvbnRzVG9CZWdpbkxvYWRpbmc7CiAgICAgZm9udHNU b0JlZ2luTG9hZGluZy5zd2FwKG1fZm9udHNUb0JlZ2luTG9hZGluZyk7CiAKQEAgLTM4OCw5ICsz OTEsMTcgQEAgdm9pZCBDU1NGb250U2VsZWN0b3I6OmZvbnRMb2FkaW5nVGltZXJGaXJlZCgpCiAg ICAgICAgIC8vIEJhbGFuY2VzIGluY3JlbWVudFJlcXVlc3RDb3VudCgpIGluIGJlZ2luTG9hZGlu Z0ZvbnRTb29uKCkuCiAgICAgICAgIGNhY2hlZFJlc291cmNlTG9hZGVyLmRlY3JlbWVudFJlcXVl c3RDb3VudCgqZm9udEhhbmRsZSk7CiAgICAgfQorfQorCit2b2lkIENTU0ZvbnRTZWxlY3Rvcjo6 Zm9udExvYWRpbmdUaW1lckZpcmVkKCkKK3sKKyAgICBSZWY8Q1NTRm9udFNlbGVjdG9yPiBwcm90 ZWN0ZWRUaGlzKCp0aGlzKTsKKworICAgIGxvYWRQZW5kaW5nRm9udHMoKTsKKwogICAgIC8vIEZJ WE1FOiBVc2UgU3VicmVzb3VyY2VMb2FkZXIgaW5zdGVhZC4KICAgICAvLyBDYWxsIEZyYW1lTG9h ZGVyOjpsb2FkRG9uZSBiZWZvcmUgRnJhbWVMb2FkZXI6OnN1YnJlc291cmNlTG9hZERvbmUgdG8g bWF0Y2ggdGhlIG9yZGVyIGluIFN1YnJlc291cmNlTG9hZGVyOjpub3RpZnlEb25lLgotICAgIGNh Y2hlZFJlc291cmNlTG9hZGVyLmxvYWREb25lKExvYWRDb21wbGV0aW9uVHlwZTo6RmluaXNoKTsK KyAgICBtX2RvY3VtZW50LT5jYWNoZWRSZXNvdXJjZUxvYWRlcigpLmxvYWREb25lKExvYWRDb21w bGV0aW9uVHlwZTo6RmluaXNoKTsKICAgICAvLyBFbnN1cmUgdGhhdCBpZiB0aGUgcmVxdWVzdCBj b3VudCByZWFjaGVzIHplcm8sIHRoZSBmcmFtZSBsb2FkZXIgd2lsbCBrbm93IGFib3V0IGl0Lgog ICAgIC8vIE5ldyBmb250IGxvYWRzIG1heSBiZSB0cmlnZ2VyZWQgYnkgbGF5b3V0IGFmdGVyIHRo ZSBkb2N1bWVudCBsb2FkIGlzIGNvbXBsZXRlIGJ1dCBiZWZvcmUgd2UgaGF2ZSBkaXNwYXRjaGVk CiAgICAgLy8gZGlkRmluaXNoTG9hZGluZyBmb3IgdGhlIGZyYW1lLiBNYWtlIHN1cmUgdGhlIGRl bGVnYXRlIGlzIGFsd2F5cyBkaXNwYXRjaGVkIGJ5IGNoZWNraW5nIGV4cGxpY2l0bHkuCkBAIC0z OTgsNyArNDA5LDYgQEAgdm9pZCBDU1NGb250U2VsZWN0b3I6OmZvbnRMb2FkaW5nVGltZXJGaXJl ZCgpCiAgICAgICAgIG1fZG9jdW1lbnQtPmZyYW1lKCktPmxvYWRlcigpLmNoZWNrTG9hZENvbXBs ZXRlKCk7CiB9CiAKLQogc2l6ZV90IENTU0ZvbnRTZWxlY3Rvcjo6ZmFsbGJhY2tGb250Q291bnQo KQogewogICAgIGlmICghbV9kb2N1bWVudCkKQEAgLTQzMSwyNCArNDQxLDIyIEBAIHZvaWQgQ1NT Rm9udFNlbGVjdG9yOjpzdG9wKCkKIAogdm9pZCBDU1NGb250U2VsZWN0b3I6OnN1c3BlbmQoUmVh c29uRm9yU3VzcGVuc2lvbikKIHsKLSAgICBpZiAobV9mb250TG9hZGluZ1RpbWVySXNTdXNwZW5k ZWQpIHsKLSAgICAgICAgQVNTRVJUKCFtX2ZvbnRMb2FkaW5nVGltZXIuaXNBY3RpdmUoKSk7Cisg ICAgaWYgKG1faXNGb250TG9hZGluZ1N1c3BlbmRlZCkKICAgICAgICAgcmV0dXJuOwotICAgIH0K IAotICAgIG1fZm9udExvYWRpbmdUaW1lcklzU3VzcGVuZGVkID0gbV9mb250TG9hZGluZ1RpbWVy LmlzQWN0aXZlKCk7CisgICAgbV9pc0ZvbnRMb2FkaW5nU3VzcGVuZGVkID0gdHJ1ZTsKICAgICBt X2ZvbnRMb2FkaW5nVGltZXIuc3RvcCgpOwogfQogCiB2b2lkIENTU0ZvbnRTZWxlY3Rvcjo6cmVz dW1lKCkKIHsKLSAgICBpZiAoIW1fZm9udExvYWRpbmdUaW1lcklzU3VzcGVuZGVkKQorICAgIGlm ICghbV9pc0ZvbnRMb2FkaW5nU3VzcGVuZGVkKQogICAgICAgICByZXR1cm47CiAKICAgICBpZiAo IW1fZm9udHNUb0JlZ2luTG9hZGluZy5pc0VtcHR5KCkpCiAgICAgICAgIG1fZm9udExvYWRpbmdU aW1lci5zdGFydE9uZVNob3QoMF9zKTsKIAotICAgIG1fZm9udExvYWRpbmdUaW1lcklzU3VzcGVu ZGVkID0gZmFsc2U7CisgICAgbV9pc0ZvbnRMb2FkaW5nU3VzcGVuZGVkID0gZmFsc2U7CiB9CiAK IH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NGb250U2VsZWN0b3IuaCBiL1Nv dXJjZS9XZWJDb3JlL2Nzcy9DU1NGb250U2VsZWN0b3IuaAppbmRleCBlODQyM2ZkMDdiZGMuLmRk NTcwYzYxODhlYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY3NzL0NTU0ZvbnRTZWxlY3Rv ci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NGb250U2VsZWN0b3IuaApAQCAtODksNiAr ODksOCBAQCBwdWJsaWM6CiAgICAgdm9pZCBpbmNyZW1lbnRJc0NvbXB1dGluZ1Jvb3RTdHlsZUZv bnQoKSB7ICsrbV9jb21wdXRpbmdSb290U3R5bGVGb250Q291bnQ7IH0KICAgICB2b2lkIGRlY3Jl bWVudElzQ29tcHV0aW5nUm9vdFN0eWxlRm9udCgpIHsgLS1tX2NvbXB1dGluZ1Jvb3RTdHlsZUZv bnRDb3VudDsgfQogCisgICAgdm9pZCBsb2FkUGVuZGluZ0ZvbnRzKCk7CisKIHByaXZhdGU6CiAg ICAgZXhwbGljaXQgQ1NTRm9udFNlbGVjdG9yKERvY3VtZW50Jik7CiAKQEAgLTEyMiw3ICsxMjQs NyBAQCBwcml2YXRlOgogICAgIEhhc2hTZXQ8UmVmUHRyPFN0eWxlUnVsZUZvbnRGYWNlPj4gbV9j c3NDb25uZWN0aW9uc0VuY291bnRlcmVkRHVyaW5nQnVpbGQ7CiAKICAgICBUaW1lciBtX2ZvbnRM b2FkaW5nVGltZXI7Ci0gICAgYm9vbCBtX2ZvbnRMb2FkaW5nVGltZXJJc1N1c3BlbmRlZCB7IGZh bHNlIH07CisgICAgYm9vbCBtX2lzRm9udExvYWRpbmdTdXNwZW5kZWQgeyBmYWxzZSB9OwogCiAg ICAgdW5zaWduZWQgbV91bmlxdWVJZDsKICAgICB1bnNpZ25lZCBtX3ZlcnNpb247CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvZG9t L0RvY3VtZW50LmNwcAppbmRleCA4ZDMyYjA0ODZhMTEuLmRiODdmYTEzNDdkNCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9k b20vRG9jdW1lbnQuY3BwCkBAIC0yMDM1LDYgKzIwMzUsOCBAQCB2b2lkIERvY3VtZW50OjpyZXNv bHZlU3R5bGUoUmVzb2x2ZVN0eWxlVHlwZSB0eXBlKQogCiAgICAgICAgIG1faW5TdHlsZVJlY2Fs YyA9IGZhbHNlOwogCisgICAgICAgIGZvbnRTZWxlY3RvcigpLmxvYWRQZW5kaW5nRm9udHMoKTsK KwogICAgICAgICBpZiAoc3R5bGVVcGRhdGUpIHsKICAgICAgICAgICAgIHVwZGF0ZVJlbmRlclRy ZWUoV1RGTW92ZShzdHlsZVVwZGF0ZSkpOwogICAgICAgICAgICAgZnJhbWVWaWV3LnN0eWxlQW5k UmVuZGVyVHJlZURpZENoYW5nZSgpOwo=