208020 2020-02-20 11:19:24 -0800 [First paint] Let optional style recalcs go through while in visually-non-empty state. 2020-02-20 19:40:44 -0800 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham cdumez commit-queue dbates esprehn+autocc ews-watchlist kangil.han koivisto simon.fraser webkit-bug-importer zalan oldest_to_newest 1621320 0 zalan 2020-02-20 11:19:24 -0800 and only throttle layouts 1621321 1 webkit-bug-importer 2020-02-20 11:19:39 -0800 <rdar://problem/59636549> 1621353 2 391318 zalan 2020-02-20 12:21:15 -0800 Created attachment 391318 Patch 1621368 3 391318 simon.fraser 2020-02-20 12:59:40 -0800 Comment on attachment 391318 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=391318&action=review > Source/WebCore/dom/Document.cpp:1875 > auto shouldThrottleStyleRecalc = [&] { Doesn't seem worth keeping this lambda now. > Source/WebCore/dom/Document.cpp:3137 > + if (view() && view()->isVisuallyNonEmpty()) > return false; So this prevents the zero-delay layout timer from firing? So need to get rid of that timer. Maybe this kills it for all post-visually-empty states? 1621452 4 391345 zalan 2020-02-20 15:34:45 -0800 Created attachment 391345 Patch 1621494 5 391359 zalan 2020-02-20 16:57:57 -0800 Created attachment 391359 Patch 1621544 6 391359 commit-queue 2020-02-20 19:40:42 -0800 Comment on attachment 391359 Patch Clearing flags on attachment: 391359 Committed r257126: <https://trac.webkit.org/changeset/257126> 1621545 7 commit-queue 2020-02-20 19:40:44 -0800 All reviewed patches have been landed. Closing bug. 391318 2020-02-20 12:21:15 -0800 2020-02-20 15:34:44 -0800 Patch bug-208020-20200220122114.patch text/plain 2613 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjU3MDY0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOGFhZmU3MjI4MzBjMzVm MDA4YTVlYzAwODM0ZDU1OTM1MjlkZTdlZi4uNjcyOWIzNjIxNWE0MmJlNzM3ZGFkNzE3NWQ5ZDc5 M2UyMjI3YTU4NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDIwLTAyLTIwICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0ZpcnN0IHBhaW50XSBMZXQg b3B0aW9uYWwgc3R5bGUgcmVjYWxjcyBnbyB0aHJvdWdoIHdoaWxlIGluIHZpc3VhbGx5LW5vbi1l bXB0eSBzdGF0ZS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTIwODAyMAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNTk2MzY1NDk+CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhpcyBpcyB0aGUgZmluYWwg c3RlcCB0byBlbnN1cmUgd2UgZG9uJ3QgZW5kIHVwIGRlbGF5aW5nIHRoZSBxdWFsaWZpZXNBc1Zp c3VhbGx5Tm9uRW1wdHkgY2hlY2sgd2hlbgorICAgICAgICB0aGUgcGFnZSBoYXBwZW5zIHRvIG5v dCB0cmlnZ2VyIHN5bmNocm9ub3VzIHN0eWxlIHJlY2FsY3MuCisKKyAgICAgICAgSGVyZSBpcyB0 aGUgb3B0aW1pemVkIGZsb3c6CisgICAgICAgIE9wdGlvbmFsIHN0eWxlIHJlYWxjIC0+IEZyYW1l Vmlldzo6c3R5bGVBbmRSZW5kZXJUcmVlRGlkQ2hhbmdlIC0+IHF1YWxpZmllc0FzVmlzdWFsbHlO b25FbXB0eSAtPiBEb2N1bWVudDo6c2hvdWxkU2NoZWR1bGVMYXlvdXQgdHJ1ZS4KKworICAgICAg ICBUaGlzIGNvdWxkIGJlIGEgc2xpZ2h0IHJlZ3Jlc3Npb24gaW4gY2VydGFpbiBjYXNlcyBiZWNh dXNlIG5vdyB3ZSBsZXQgdGhlIG9wdGlvbmFsIHN0eWxlIHJlY2FsY3MgdGhyb3VnaCBhbmQKKyAg ICAgICAgb25seSBkZWxheSB0aGUgcmVkdW5kYW50IGxheW91dHMgKGFzIG9wcG9zZWQgdG8gZGVs YXkgYm90aCkuCisKKyAgICAgICAgKiBkb20vRG9jdW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6RG9jdW1lbnQ6OnNjaGVkdWxlU3R5bGVSZWNhbGMpOgorICAgICAgICAoV2ViQ29yZTo6RG9j dW1lbnQ6OnNob3VsZFNjaGVkdWxlTGF5b3V0KToKKwogMjAyMC0wMi0yMCAgWmFsYW4gQnVqdGFz ICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtMRkNdIFNvbWV0aW1lcyBzdWJmcmFtZXMg ZG9uJ3QgZXZlbiBoYXZlIGRvY3VtZW50IGVsZW1lbnRzLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvZG9tL0RvY3VtZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAK aW5kZXggOWYzOGUxNDY2NjBhN2Y5OGViMzIwYzdlYzZkYzFkMzY2YzQ0YmE3Ni4uODMwYTA5NGNj ZGFjNzM2ODIyNjE4ZmY2NGE1NzI2ZmQyNGE5NjlkNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvZG9tL0RvY3VtZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3Bw CkBAIC0xODczLDExICsxODczLDcgQEAgdm9pZCBEb2N1bWVudDo6c2NoZWR1bGVTdHlsZVJlY2Fs YygpCiAKICAgICBBU1NFUlQoY2hpbGROZWVkc1N0eWxlUmVjYWxjKCkgfHwgbV9uZWVkc0Z1bGxT dHlsZVJlYnVpbGQpOwogICAgIGF1dG8gc2hvdWxkVGhyb3R0bGVTdHlsZVJlY2FsYyA9IFsmXSB7 Ci0gICAgICAgIGlmICghdmlldygpIHx8ICF2aWV3KCktPmlzVmlzdWFsbHlOb25FbXB0eSgpKQot ICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwotICAgICAgICBpZiAoIXBhZ2UoKSB8fCAhcGFnZSgp LT5jaHJvbWUoKS5jbGllbnQoKS5yZW5kZXJpbmdVcGRhdGVUaHJvdHRsaW5nSXNBY3RpdmUoKSkK LSAgICAgICAgICAgIHJldHVybiBmYWxzZTsKLSAgICAgICAgcmV0dXJuIHRydWU7CisgICAgICAg IHJldHVybiBwYWdlKCkgJiYgcGFnZSgpLT5jaHJvbWUoKS5jbGllbnQoKS5yZW5kZXJpbmdVcGRh dGVUaHJvdHRsaW5nSXNBY3RpdmUoKTsKICAgICB9OwogCiAgICAgaWYgKHNob3VsZFRocm90dGxl U3R5bGVSZWNhbGMoKSkKQEAgLTMxMzUsOSArMzEzMSwxMCBAQCBib29sIERvY3VtZW50OjpzaG91 bGRTY2hlZHVsZUxheW91dCgpCiAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICBpZiAoc3R5bGVT Y29wZSgpLmhhc1BlbmRpbmdTaGVldHNCZWZvcmVCb2R5KCkpCiAgICAgICAgIHJldHVybiBmYWxz ZTsKLSAgICBpZiAocGFnZSgpICYmIHBhZ2UoKS0+Y2hyb21lKCkuY2xpZW50KCkucmVuZGVyaW5n VXBkYXRlVGhyb3R0bGluZ0lzQWN0aXZlKCkgJiYgdmlldygpICYmIHZpZXcoKS0+aXNWaXN1YWxs eU5vbkVtcHR5KCkpCisgICAgaWYgKHBhZ2UoKSAmJiBwYWdlKCktPmNocm9tZSgpLmNsaWVudCgp LnJlbmRlcmluZ1VwZGF0ZVRocm90dGxpbmdJc0FjdGl2ZSgpKQorICAgICAgICByZXR1cm4gZmFs c2U7CisgICAgaWYgKHZpZXcoKSAmJiB2aWV3KCktPmlzVmlzdWFsbHlOb25FbXB0eSgpKQogICAg ICAgICByZXR1cm4gZmFsc2U7Ci0KICAgICByZXR1cm4gdHJ1ZTsKIH0KICAgICAK 391345 2020-02-20 15:34:45 -0800 2020-02-20 16:57:56 -0800 Patch bug-208020-20200220153445.patch text/plain 2801 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjU3MDg2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDg0ZTE5MmNjZjY3ODI2 OTI1ZWEzNmY4MzRjN2QyNDg2ZTg4Yzg1Ni4uMjJmMDk5Y2Y1MzdlNDQzZGFiNTg2MDYwMzE2ZGU4 YmQ3OGJjOWUzNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDIwLTAyLTIwICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0ZpcnN0IHBhaW50XSBMZXQg b3B0aW9uYWwgc3R5bGUgcmVjYWxjcyBnbyB0aHJvdWdoIHdoaWxlIGluIHZpc3VhbGx5LW5vbi1l bXB0eSBzdGF0ZS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTIwODAyMAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNTk2MzY1NDk+CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgU2ltb24gRnJhc2VyLgorCisgICAgICAgIFRoaXMgaXMgdGhlIGZpbmFsIHN0 ZXAgdG8gZW5zdXJlIHdlIGRvbid0IGVuZCB1cCBkZWxheWluZyB0aGUgcXVhbGlmaWVzQXNWaXN1 YWxseU5vbkVtcHR5IGNoZWNrIHdoZW4KKyAgICAgICAgdGhlIHBhZ2UgaGFwcGVucyB0byBub3Qg dHJpZ2dlciBzeW5jaHJvbm91cyBzdHlsZSByZWNhbGNzLgorCisgICAgICAgIEhlcmUgaXMgdGhl IG9wdGltaXplZCBmbG93OgorICAgICAgICBPcHRpb25hbCBzdHlsZSByZWFsYyAtPiBGcmFtZVZp ZXc6OnN0eWxlQW5kUmVuZGVyVHJlZURpZENoYW5nZSAtPiBxdWFsaWZpZXNBc1Zpc3VhbGx5Tm9u RW1wdHkgLT4gRG9jdW1lbnQ6OnNob3VsZFNjaGVkdWxlTGF5b3V0IHRydWUuCisKKyAgICAgICAg VGhpcyBjb3VsZCBiZSBhIHNsaWdodCByZWdyZXNzaW9uIGluIGNlcnRhaW4gY2FzZXMgYmVjYXVz ZSBub3cgd2UgbGV0IHRoZSBvcHRpb25hbCBzdHlsZSByZWNhbGNzIHRocm91Z2ggYW5kCisgICAg ICAgIG9ubHkgZGVsYXkgdGhlIHJlZHVuZGFudCBsYXlvdXRzIChhcyBvcHBvc2VkIHRvIGRlbGF5 IGJvdGgpLgorCisgICAgICAgICogZG9tL0RvY3VtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OkRvY3VtZW50OjpzY2hlZHVsZVN0eWxlUmVjYWxjKToKKyAgICAgICAgKFdlYkNvcmU6OkRvY3Vt ZW50OjpzaG91bGRTY2hlZHVsZUxheW91dCk6CisKIDIwMjAtMDItMjAgIFphbGFuIEJ1anRhcyAg PHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBbRmlyc3QgcGFpbnRdIExldCdzIGNoZWNrIHZp c3VhbGx5LW5vbi1lbXB0eSBzdGF0ZSBpbiBGcmFtZVZpZXc6OnN0eWxlQW5kUmVuZGVyVHJlZURp ZENoYW5nZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcCBiL1Nv dXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAKaW5kZXggOWYzOGUxNDY2NjBhN2Y5OGViMzIw YzdlYzZkYzFkMzY2YzQ0YmE3Ni4uZWFlNDRiYjdjNzAyM2UxZjA1OWY2NWMwOTllMzk3NGIyMzg0 OWMxNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwCkBAIC0xODcyLDE2ICsxODcyLDEwIEBAIHZv aWQgRG9jdW1lbnQ6OnNjaGVkdWxlU3R5bGVSZWNhbGMoKQogICAgICAgICByZXR1cm47CiAKICAg ICBBU1NFUlQoY2hpbGROZWVkc1N0eWxlUmVjYWxjKCkgfHwgbV9uZWVkc0Z1bGxTdHlsZVJlYnVp bGQpOwotICAgIGF1dG8gc2hvdWxkVGhyb3R0bGVTdHlsZVJlY2FsYyA9IFsmXSB7Ci0gICAgICAg IGlmICghdmlldygpIHx8ICF2aWV3KCktPmlzVmlzdWFsbHlOb25FbXB0eSgpKQotICAgICAgICAg ICAgcmV0dXJuIGZhbHNlOwotICAgICAgICBpZiAoIXBhZ2UoKSB8fCAhcGFnZSgpLT5jaHJvbWUo KS5jbGllbnQoKS5yZW5kZXJpbmdVcGRhdGVUaHJvdHRsaW5nSXNBY3RpdmUoKSkKLSAgICAgICAg ICAgIHJldHVybiBmYWxzZTsKLSAgICAgICAgcmV0dXJuIHRydWU7Ci0gICAgfTsKLQotICAgIGlm IChzaG91bGRUaHJvdHRsZVN0eWxlUmVjYWxjKCkpCisgICAgaWYgKHBhZ2UoKSAmJiBwYWdlKCkt PmNocm9tZSgpLmNsaWVudCgpLnJlbmRlcmluZ1VwZGF0ZVRocm90dGxpbmdJc0FjdGl2ZSgpKSB7 CisgICAgICAgIC8vIERvIG5vdCBydW4gb3B0aW9uYWwgc3R5bGUgcmVjYWxjcyB3aGlsZSB3ZSB0 aHJvdHRsZSBwYWludGluZy4KICAgICAgICAgcmV0dXJuOworICAgIH0KIAogICAgIG1fc3R5bGVS ZWNhbGNUaW1lci5zdGFydE9uZVNob3QoMF9zKTsKIApAQCAtMzEzNSw5ICszMTI5LDEwIEBAIGJv b2wgRG9jdW1lbnQ6OnNob3VsZFNjaGVkdWxlTGF5b3V0KCkKICAgICAgICAgcmV0dXJuIGZhbHNl OwogICAgIGlmIChzdHlsZVNjb3BlKCkuaGFzUGVuZGluZ1NoZWV0c0JlZm9yZUJvZHkoKSkKICAg ICAgICAgcmV0dXJuIGZhbHNlOwotICAgIGlmIChwYWdlKCkgJiYgcGFnZSgpLT5jaHJvbWUoKS5j bGllbnQoKS5yZW5kZXJpbmdVcGRhdGVUaHJvdHRsaW5nSXNBY3RpdmUoKSAmJiB2aWV3KCkgJiYg dmlldygpLT5pc1Zpc3VhbGx5Tm9uRW1wdHkoKSkKKyAgICBpZiAocGFnZSgpICYmIHBhZ2UoKS0+ Y2hyb21lKCkuY2xpZW50KCkucmVuZGVyaW5nVXBkYXRlVGhyb3R0bGluZ0lzQWN0aXZlKCkpCisg ICAgICAgIHJldHVybiBmYWxzZTsKKyAgICBpZiAodmlldygpICYmIHZpZXcoKS0+aXNWaXN1YWxs eU5vbkVtcHR5KCkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKLQogICAgIHJldHVybiB0cnVlOwog fQogICAgIAo= 391359 2020-02-20 16:57:57 -0800 2020-02-20 19:40:42 -0800 Patch bug-208020-20200220165756.patch text/plain 2802 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjU3MDg2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDg0ZTE5MmNjZjY3ODI2 OTI1ZWEzNmY4MzRjN2QyNDg2ZTg4Yzg1Ni4uMjJmMDk5Y2Y1MzdlNDQzZGFiNTg2MDYwMzE2ZGU4 YmQ3OGJjOWUzNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDIwLTAyLTIwICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0ZpcnN0IHBhaW50XSBMZXQg b3B0aW9uYWwgc3R5bGUgcmVjYWxjcyBnbyB0aHJvdWdoIHdoaWxlIGluIHZpc3VhbGx5LW5vbi1l bXB0eSBzdGF0ZS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTIwODAyMAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNTk2MzY1NDk+CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgU2ltb24gRnJhc2VyLgorCisgICAgICAgIFRoaXMgaXMgdGhlIGZpbmFsIHN0 ZXAgdG8gZW5zdXJlIHdlIGRvbid0IGVuZCB1cCBkZWxheWluZyB0aGUgcXVhbGlmaWVzQXNWaXN1 YWxseU5vbkVtcHR5IGNoZWNrIHdoZW4KKyAgICAgICAgdGhlIHBhZ2UgaGFwcGVucyB0byBub3Qg dHJpZ2dlciBzeW5jaHJvbm91cyBzdHlsZSByZWNhbGNzLgorCisgICAgICAgIEhlcmUgaXMgdGhl IG9wdGltaXplZCBmbG93OgorICAgICAgICBPcHRpb25hbCBzdHlsZSByZWFsYyAtPiBGcmFtZVZp ZXc6OnN0eWxlQW5kUmVuZGVyVHJlZURpZENoYW5nZSAtPiBxdWFsaWZpZXNBc1Zpc3VhbGx5Tm9u RW1wdHkgLT4gRG9jdW1lbnQ6OnNob3VsZFNjaGVkdWxlTGF5b3V0IHRydWUuCisKKyAgICAgICAg VGhpcyBjb3VsZCBiZSBhIHNsaWdodCByZWdyZXNzaW9uIGluIGNlcnRhaW4gY2FzZXMgYmVjYXVz ZSBub3cgd2UgbGV0IHRoZSBvcHRpb25hbCBzdHlsZSByZWNhbGNzIHRocm91Z2ggYW5kCisgICAg ICAgIG9ubHkgZGVsYXkgdGhlIHJlZHVuZGFudCBsYXlvdXRzIChhcyBvcHBvc2VkIHRvIGRlbGF5 IGJvdGgpLgorCisgICAgICAgICogZG9tL0RvY3VtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OkRvY3VtZW50OjpzY2hlZHVsZVN0eWxlUmVjYWxjKToKKyAgICAgICAgKFdlYkNvcmU6OkRvY3Vt ZW50OjpzaG91bGRTY2hlZHVsZUxheW91dCk6CisKIDIwMjAtMDItMjAgIFphbGFuIEJ1anRhcyAg PHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBbRmlyc3QgcGFpbnRdIExldCdzIGNoZWNrIHZp c3VhbGx5LW5vbi1lbXB0eSBzdGF0ZSBpbiBGcmFtZVZpZXc6OnN0eWxlQW5kUmVuZGVyVHJlZURp ZENoYW5nZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcCBiL1Nv dXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAKaW5kZXggOWYzOGUxNDY2NjBhN2Y5OGViMzIw YzdlYzZkYzFkMzY2YzQ0YmE3Ni4uYWIyYWVkODI1ZDNhMWY0ZTcxNjUyMTNlNTQ3NTc4ZTdiMjlk MDczMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwCkBAIC0xODcyLDE2ICsxODcyLDEwIEBAIHZv aWQgRG9jdW1lbnQ6OnNjaGVkdWxlU3R5bGVSZWNhbGMoKQogICAgICAgICByZXR1cm47CiAKICAg ICBBU1NFUlQoY2hpbGROZWVkc1N0eWxlUmVjYWxjKCkgfHwgbV9uZWVkc0Z1bGxTdHlsZVJlYnVp bGQpOwotICAgIGF1dG8gc2hvdWxkVGhyb3R0bGVTdHlsZVJlY2FsYyA9IFsmXSB7Ci0gICAgICAg IGlmICghdmlldygpIHx8ICF2aWV3KCktPmlzVmlzdWFsbHlOb25FbXB0eSgpKQotICAgICAgICAg ICAgcmV0dXJuIGZhbHNlOwotICAgICAgICBpZiAoIXBhZ2UoKSB8fCAhcGFnZSgpLT5jaHJvbWUo KS5jbGllbnQoKS5yZW5kZXJpbmdVcGRhdGVUaHJvdHRsaW5nSXNBY3RpdmUoKSkKLSAgICAgICAg ICAgIHJldHVybiBmYWxzZTsKLSAgICAgICAgcmV0dXJuIHRydWU7Ci0gICAgfTsKLQotICAgIGlm IChzaG91bGRUaHJvdHRsZVN0eWxlUmVjYWxjKCkpCisgICAgaWYgKHBhZ2UoKSAmJiBwYWdlKCkt PmNocm9tZSgpLmNsaWVudCgpLnJlbmRlcmluZ1VwZGF0ZVRocm90dGxpbmdJc0FjdGl2ZSgpKSB7 CisgICAgICAgIC8vIERvIG5vdCBydW4gb3B0aW9uYWwgc3R5bGUgcmVjYWxjcyB3aGlsZSB3ZSB0 aHJvdHRsZSBwYWludGluZy4KICAgICAgICAgcmV0dXJuOworICAgIH0KIAogICAgIG1fc3R5bGVS ZWNhbGNUaW1lci5zdGFydE9uZVNob3QoMF9zKTsKIApAQCAtMzEzNSw5ICszMTI5LDEwIEBAIGJv b2wgRG9jdW1lbnQ6OnNob3VsZFNjaGVkdWxlTGF5b3V0KCkKICAgICAgICAgcmV0dXJuIGZhbHNl OwogICAgIGlmIChzdHlsZVNjb3BlKCkuaGFzUGVuZGluZ1NoZWV0c0JlZm9yZUJvZHkoKSkKICAg ICAgICAgcmV0dXJuIGZhbHNlOwotICAgIGlmIChwYWdlKCkgJiYgcGFnZSgpLT5jaHJvbWUoKS5j bGllbnQoKS5yZW5kZXJpbmdVcGRhdGVUaHJvdHRsaW5nSXNBY3RpdmUoKSAmJiB2aWV3KCkgJiYg dmlldygpLT5pc1Zpc3VhbGx5Tm9uRW1wdHkoKSkKKyAgICBpZiAocGFnZSgpICYmIHBhZ2UoKS0+ Y2hyb21lKCkuY2xpZW50KCkucmVuZGVyaW5nVXBkYXRlVGhyb3R0bGluZ0lzQWN0aXZlKCkpCisg ICAgICAgIHJldHVybiBmYWxzZTsKKyAgICBpZiAodmlldygpICYmICF2aWV3KCktPmlzVmlzdWFs bHlOb25FbXB0eSgpKQogICAgICAgICByZXR1cm4gZmFsc2U7Ci0KICAgICByZXR1cm4gdHJ1ZTsK IH0KICAgICAK