178496 2017-10-18 18:25:14 -0700 [FrameView::layout cleanup] Group related pre-layout code to improve readability 2017-10-18 19:22:50 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham commit-queue koivisto simon.fraser webkit-bug-importer zalan oldest_to_newest 1361990 0 zalan 2017-10-18 18:25:14 -0700 asserts member variable resets etc. 1361991 1 webkit-bug-importer 2017-10-18 18:25:58 -0700 <rdar://problem/35065718> 1361994 2 324193 zalan 2017-10-18 18:34:58 -0700 Created attachment 324193 Patch 1362001 3 324193 simon.fraser 2017-10-18 18:44:31 -0700 Comment on attachment 324193 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=324193&action=review > Source/WebCore/page/FrameView.cpp:1360 > + // we shouldn't enter layout() while painting Sentence case please. > Source/WebCore/page/FrameView.cpp:1363 > + LOG(Layout, " in is disallowed, bailing"); Please change the message to distinguish this from the case above. This should say "in painting is". 1362005 4 324195 zalan 2017-10-18 18:55:44 -0700 Created attachment 324195 Patch 1362018 5 324195 commit-queue 2017-10-18 19:22:48 -0700 Comment on attachment 324195 Patch Clearing flags on attachment: 324195 Committed r223649: <https://trac.webkit.org/changeset/223649> 1362019 6 commit-queue 2017-10-18 19:22:50 -0700 All reviewed patches have been landed. Closing bug. 324193 2017-10-18 18:34:58 -0700 2017-10-18 18:55:41 -0700 Patch bug-178496-20171018183458.patch text/plain 5490 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjIzNjM0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNGI4NTRiZjI4NGRlOTY5 ZmU1MmMxYzhiMTk0NjkxMjU3YjA3Y2Y2OC4uNDJmZmZkZmQxNTFlNDhhMjE1NDllNTU5ZDI0OGZm ZTUzYTQ0NGFhNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDE3LTEwLTE4ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0ZyYW1lVmlldzo6bGF5b3V0 IGNsZWFudXBdIEdyb3VwIHJlbGF0ZWQgcHJlLWxheW91dCBjb2RlIHRvIGltcHJvdmUgcmVhZGFi aWxpdHkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3 ODQ5NgorICAgICAgICA8cmRhcjovL3Byb2JsZW0vMzUwNjU3MTg+CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRWFybHkgcmV0dXJucy9hc3NlcnRzL21l bWJlciB2YXJpYWJsZSByZXNldHMgZXRjLgorCisgICAgICAgIENvdmVyZWQgYnkgZXhpc3Rpbmcg dGVzdHMuCisKKyAgICAgICAgKiBwYWdlL0ZyYW1lVmlldy5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpGcmFtZVZpZXc6OmxheW91dCk6CisKIDIwMTctMTAtMTggIENocmlzIER1bWV6ICA8Y2R1bWV6 QGFwcGxlLmNvbT4KIAogICAgICAgICBbU2VydmljZSBXb3JrZXJdIEFkZCBzdHVicyBmb3IgQ2xp ZW50IC8gV2luZG93Q2xpZW50IC8gQ2xpZW50cwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cGFnZS9GcmFtZVZpZXcuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwCmlu ZGV4IDVlNDE3ODBiMDNhNzc1NzRjOWU5YTk1NzE5ZTUwMzFkM2FkM2U5NDAuLjc5NjA1MTMyYjg0 N2IwMDhjM2Q3OTRhMWViZjBmYzNlNzA1YmVhMDYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3BhZ2UvRnJhbWVWaWV3LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5j cHAKQEAgLTEzNTcsNTEgKzEzNTcsNDQgQEAgdm9pZCBGcmFtZVZpZXc6OmxheW91dChib29sIGFs bG93U3VidHJlZUxheW91dCkKICAgICAgICAgTE9HKExheW91dCwgIiAgbGF5b3V0IGlzIGRpc2Fs bG93ZWQsIGJhaWxpbmciKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KKyAgICAvLyB3ZSBzaG91 bGRuJ3QgZW50ZXIgbGF5b3V0KCkgd2hpbGUgcGFpbnRpbmcKKyAgICBBU1NFUlQoIWlzUGFpbnRp bmcoKSk7CisgICAgaWYgKGlzUGFpbnRpbmcoKSkgeworICAgICAgICBMT0coTGF5b3V0LCAiICBp biAgaXMgZGlzYWxsb3dlZCwgYmFpbGluZyIpOworICAgICAgICByZXR1cm47CisgICAgfQogCisg ICAgQVNTRVJUKGZyYW1lKCkudmlldygpID09IHRoaXMpOworICAgIEFTU0VSVChmcmFtZSgpLmRv Y3VtZW50KCkpOworICAgIEFTU0VSVChmcmFtZSgpLmRvY3VtZW50KCktPnBhZ2VDYWNoZVN0YXRl KCkgPT0gRG9jdW1lbnQ6Ok5vdEluUGFnZUNhY2hlKTsKICAgICAvLyBQcm90ZWN0IHRoZSB2aWV3 IGZyb20gYmVpbmcgZGVsZXRlZCBkdXJpbmcgbGF5b3V0IChpbiByZWNhbGNTdHlsZSkuCiAgICAg UmVmPEZyYW1lVmlldz4gcHJvdGVjdGVkVGhpcygqdGhpcyk7CisgICAgVHJhY2VTY29wZSB0cmFj aW5nU2NvcGUoTGF5b3V0U3RhcnQsIExheW91dEVuZCk7CisgICAgSW5zcGVjdG9ySW5zdHJ1bWVu dGF0aW9uQ29va2llIGNvb2tpZSA9IEluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6d2lsbExheW91 dChmcmFtZSgpKTsKKyAgICBBbmltYXRpb25VcGRhdGVCbG9jayBhbmltYXRpb25VcGRhdGVCbG9j aygmZnJhbWUoKS5hbmltYXRpb24oKSk7CiAKICAgICAvLyBNYW55IG9mIHRoZSB0YXNrcyBwZXJm b3JtZWQgZHVyaW5nIGxheW91dCBjYW4gY2F1c2UgdGhpcyBmdW5jdGlvbiB0byBiZSByZS1lbnRl cmVkLAogICAgIC8vIHNvIHNhdmUgdGhlIGxheW91dCBwaGFzZSBub3cgYW5kIHJlc3RvcmUgaXQg b24gZXhpdC4KICAgICBTZXRGb3JTY29wZTxMYXlvdXRQaGFzZT4gbGF5b3V0UGhhc2VSZXN0b3Jl cihtX2xheW91dFBoYXNlLCBJblByZUxheW91dCk7Ci0KICAgICAvLyBFdmVyeSBzY3JvbGwgdGhh dCBoYXBwZW5zIGR1cmluZyBsYXlvdXQgaXMgcHJvZ3JhbW1hdGljLgogICAgIFNldEZvclNjb3Bl PGJvb2w+IGNoYW5nZUluUHJvZ3JhbW1hdGljU2Nyb2xsKG1faW5Qcm9ncmFtbWF0aWNTY3JvbGws IHRydWUpOwotICAgIAotICAgIFRyYWNlU2NvcGUgdHJhY2luZ1Njb3BlKExheW91dFN0YXJ0LCBM YXlvdXRFbmQpOwotCi0gICAgaWYgKGhhbmRsZUxheW91dFdpdGhGcmFtZUZsYXR0ZW5pbmdJZk5l ZWRlZChhbGxvd1N1YnRyZWVMYXlvdXQpKQotICAgICAgICByZXR1cm47Ci0KLSNpZiBQTEFURk9S TShJT1MpCi0gICAgaWYgKHVwZGF0ZUZpeGVkUG9zaXRpb25MYXlvdXRSZWN0KCkpCi0gICAgICAg IGFsbG93U3VidHJlZUxheW91dCA9IGZhbHNlOwotI2VuZGlmCiAKICAgICBtX2xheW91dFRpbWVy LnN0b3AoKTsKICAgICBtX2RlbGF5ZWRMYXlvdXQgPSBmYWxzZTsKICAgICBtX3NldE5lZWRzTGF5 b3V0V2FzRGVmZXJyZWQgPSBmYWxzZTsKLSAgICAKLSAgICAvLyB3ZSBzaG91bGRuJ3QgZW50ZXIg bGF5b3V0KCkgd2hpbGUgcGFpbnRpbmcKLSAgICBBU1NFUlQoIWlzUGFpbnRpbmcoKSk7Ci0gICAg aWYgKGlzUGFpbnRpbmcoKSkKLSAgICAgICAgcmV0dXJuOwotCi0gICAgSW5zcGVjdG9ySW5zdHJ1 bWVudGF0aW9uQ29va2llIGNvb2tpZSA9IEluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6d2lsbExh eW91dChmcmFtZSgpKTsKLSAgICBBbmltYXRpb25VcGRhdGVCbG9jayBhbmltYXRpb25VcGRhdGVC bG9jaygmZnJhbWUoKS5hbmltYXRpb24oKSk7Ci0gICAgCiAgICAgaWYgKCFhbGxvd1N1YnRyZWVM YXlvdXQgJiYgbV9zdWJ0cmVlTGF5b3V0Um9vdCkKICAgICAgICAgY29udmVydFN1YnRyZWVMYXlv dXRUb0Z1bGxMYXlvdXQoKTsKKyNpZiBQTEFURk9STShJT1MpCisgICAgaWYgKHVwZGF0ZUZpeGVk UG9zaXRpb25MYXlvdXRSZWN0KCkpCisgICAgICAgIGFsbG93U3VidHJlZUxheW91dCA9IGZhbHNl OworI2VuZGlmCiAKLSAgICBBU1NFUlQoZnJhbWUoKS52aWV3KCkgPT0gdGhpcyk7Ci0gICAgQVNT RVJUKGZyYW1lKCkuZG9jdW1lbnQoKSk7CisgICAgaWYgKGhhbmRsZUxheW91dFdpdGhGcmFtZUZs YXR0ZW5pbmdJZk5lZWRlZChhbGxvd1N1YnRyZWVMYXlvdXQpKQorICAgICAgICByZXR1cm47CiAK ICAgICBEb2N1bWVudCYgZG9jdW1lbnQgPSAqZnJhbWUoKS5kb2N1bWVudCgpOwotICAgIEFTU0VS VChkb2N1bWVudC5wYWdlQ2FjaGVTdGF0ZSgpID09IERvY3VtZW50OjpOb3RJblBhZ2VDYWNoZSk7 CiAgICAgUmVuZGVyRWxlbWVudCogbGF5b3V0Um9vdCA9IG51bGxwdHI7Ci0gICAgUmVuZGVyTGF5 ZXIqIGxheWVyID0gbnVsbHB0cjsKICAgICBib29sIGlzU3VidHJlZUxheW91dCA9IGZhbHNlOwot CiAgICAgewogICAgICAgICBTZXRGb3JTY29wZTxib29sPiBjaGFuZ2VTY2hlZHVsaW5nRW5hYmxl ZChtX2xheW91dFNjaGVkdWxpbmdFbmFibGVkLCBmYWxzZSk7CiAKQEAgLTE0OTMsMjcgKzE0ODYs MjIgQEAgdm9pZCBGcmFtZVZpZXc6OmxheW91dChib29sIGFsbG93U3VidHJlZUxheW91dCkKICAg ICAgICAgfQogCiAgICAgICAgIEFTU0VSVChhbGxvd1N1YnRyZWVMYXlvdXQgfHwgIWlzU3VidHJl ZUxheW91dCk7Ci0gICAgICAgIGxheWVyID0gbGF5b3V0Um9vdC0+ZW5jbG9zaW5nTGF5ZXIoKTsK LSAgICAgICAgU3VidHJlZUxheW91dFN0YXRlTWFpbnRhaW5lciBzdWJ0cmVlTGF5b3V0U3RhdGVN YWludGFpbmVyKG1fc3VidHJlZUxheW91dFJvb3QpOwotCi0gICAgICAgIFJlbmRlclZpZXc6OlJl cGFpbnRSZWdpb25BY2N1bXVsYXRvciByZXBhaW50UmVnaW9uQWNjdW11bGF0b3IoJmxheW91dFJv b3QtPnZpZXcoKSk7Ci0KICAgICAgICAgQVNTRVJUKG1fbGF5b3V0UGhhc2UgPT0gSW5QcmVMYXlv dXQpOwotICAgICAgICBtX2xheW91dFBoYXNlID0gSW5SZW5kZXJUcmVlTGF5b3V0OwogCiAgICAg ICAgIGZvcmNlTGF5b3V0UGFyZW50Vmlld0lmTmVlZGVkKCk7CiAKLSAgICAgICAgQVNTRVJUKG1f bGF5b3V0UGhhc2UgPT0gSW5SZW5kZXJUcmVlTGF5b3V0KTsKKyAgICAgICAgU3VidHJlZUxheW91 dFN0YXRlTWFpbnRhaW5lciBzdWJ0cmVlTGF5b3V0U3RhdGVNYWludGFpbmVyKG1fc3VidHJlZUxh eW91dFJvb3QpOworICAgICAgICBSZW5kZXJWaWV3OjpSZXBhaW50UmVnaW9uQWNjdW11bGF0b3Ig cmVwYWludFJlZ2lvbkFjY3VtdWxhdG9yKCZsYXlvdXRSb290LT52aWV3KCkpOwogI2lmbmRlZiBO REVCVUcKICAgICAgICAgUmVuZGVyVHJlZU5lZWRzTGF5b3V0Q2hlY2tlciBjaGVja2VyKCpsYXlv dXRSb290KTsKICNlbmRpZgorICAgICAgICBtX2xheW91dFBoYXNlID0gSW5SZW5kZXJUcmVlTGF5 b3V0OwogICAgICAgICBsYXlvdXRSb290LT5sYXlvdXQoKTsKKyAgICAgICAgQVNTRVJUKG1fbGF5 b3V0UGhhc2UgPT0gSW5SZW5kZXJUcmVlTGF5b3V0KTsKIAogI2lmIEVOQUJMRShURVhUX0FVVE9T SVpJTkcpCiAgICAgICAgIGFwcGx5VGV4dFNpemluZ0lmTmVlZGVkKCpsYXlvdXRSb290KTsKICNl bmRpZgotCi0gICAgICAgIEFTU0VSVChtX2xheW91dFBoYXNlID09IEluUmVuZGVyVHJlZUxheW91 dCk7CiAgICAgICAgIG1fc3VidHJlZUxheW91dFJvb3QgPSBudWxscHRyOwogICAgICAgICAvLyBD bG9zZSBibG9jayBoZXJlIHRvIGVuZCB0aGUgc2NvcGUgb2YgY2hhbmdlU2NoZWR1bGluZ0VuYWJs ZWQgYW5kIFN1YnRyZWVMYXlvdXRTdGF0ZU1haW50YWluZXIuCiAgICAgfQpAQCAtMTUzNSw4ICsx NTIzLDggQEAgdm9pZCBGcmFtZVZpZXc6OmxheW91dChib29sIGFsbG93U3VidHJlZUxheW91dCkK ICAgICBsYXlvdXRSb290LT52aWV3KCkucmVsZWFzZVByb3RlY3RlZFJlbmRlcldpZGdldHMoKTsK IAogICAgIEFTU0VSVCghbGF5b3V0Um9vdC0+bmVlZHNMYXlvdXQoKSk7Ci0KLSAgICBsYXllci0+ dXBkYXRlTGF5ZXJQb3NpdGlvbnNBZnRlckxheW91dChyZW5kZXJWaWV3KCktPmxheWVyKCksIHVw ZGF0ZUxheWVyUG9zaXRpb25GbGFncyhsYXllciwgaXNTdWJ0cmVlTGF5b3V0LCBtX25lZWRzRnVs bFJlcGFpbnQpKTsKKyAgICBhdXRvKiBsYXlvdXRSb290RW5jbG9zaW5nTGF5ZXIgPSBsYXlvdXRS b290LT5lbmNsb3NpbmdMYXllcigpOworICAgIGxheW91dFJvb3RFbmNsb3NpbmdMYXllci0+dXBk YXRlTGF5ZXJQb3NpdGlvbnNBZnRlckxheW91dChyZW5kZXJWaWV3KCktPmxheWVyKCksIHVwZGF0 ZUxheWVyUG9zaXRpb25GbGFncyhsYXlvdXRSb290RW5jbG9zaW5nTGF5ZXIsIGlzU3VidHJlZUxh eW91dCwgbV9uZWVkc0Z1bGxSZXBhaW50KSk7CiAKICAgICB1cGRhdGVDb21wb3NpdGluZ0xheWVy c0FmdGVyTGF5b3V0KCk7CiAK 324195 2017-10-18 18:55:44 -0700 2017-10-18 19:22:48 -0700 Patch bug-178496-20171018185543.patch text/plain 5857 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjIzNjQ3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMGE2YjY5YTcxNmI1ODJj YmI2YjE5YTQ5NTA2ZDJmMDcwNzJlZTM0NS4uYzliNTY1YjAzNzFkMjM5ZTg2MTYyNzI1MzM5ZGVk MjVkYjU0NWRiYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDE3LTEwLTE4ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0ZyYW1lVmlldzo6bGF5b3V0 IGNsZWFudXBdIEdyb3VwIHJlbGF0ZWQgcHJlLWxheW91dCBjb2RlIHRvIGltcHJvdmUgcmVhZGFi aWxpdHkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3 ODQ5NgorICAgICAgICA8cmRhcjovL3Byb2JsZW0vMzUwNjU3MTg+CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgU2ltb24gRnJhc2VyLgorCisgICAgICAgIEVhcmx5IHJldHVybnMvYXNzZXJ0cy9tZW1i ZXIgdmFyaWFibGUgcmVzZXRzIGV0Yy4KKworICAgICAgICBDb3ZlcmVkIGJ5IGV4aXN0aW5nIHRl c3RzLgorCisgICAgICAgICogcGFnZS9GcmFtZVZpZXcuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 RnJhbWVWaWV3OjpsYXlvdXQpOgorCiAyMDE3LTEwLTE3ICBKaWV3ZW4gVGFuICA8amlld2VuX3Rh bkBhcHBsZS5jb20+CiAKICAgICAgICAgUmVwbGFjZSBzb21lIHN0YWNrIHJhdyBwb2ludGVycyB3 aXRoIFJlZlB0cnMgd2l0aGluIFdlYkNvcmUvaHRtbApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcGFnZS9GcmFtZVZpZXcuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuY3Bw CmluZGV4IDVlNDE3ODBiMDNhNzc1NzRjOWU5YTk1NzE5ZTUwMzFkM2FkM2U5NDAuLmRhYzg3YTZk YjFhZjU2YzdhMGQzZWQ2ODEwMThhMDQ1Y2I3YjU3NDIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3BhZ2UvRnJhbWVWaWV3LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmll dy5jcHAKQEAgLTEzNDksNTkgKzEzNDksNTEgQEAgdm9pZCBGcmFtZVZpZXc6OmxheW91dChib29s IGFsbG93U3VidHJlZUxheW91dCkKIAogICAgIExPRyhMYXlvdXQsICJGcmFtZVZpZXcgJXAgKCVk eCVkKSBsYXlvdXQsIG1haW4gZnJhbWV2aWV3ICVkLCBhbGxvd1N1YnRyZWVMYXlvdXQ9JWQiLCB0 aGlzLCBzaXplKCkud2lkdGgoKSwgc2l6ZSgpLmhlaWdodCgpLCBmcmFtZSgpLmlzTWFpbkZyYW1l KCksIGFsbG93U3VidHJlZUxheW91dCk7CiAgICAgaWYgKGlzSW5SZW5kZXJUcmVlTGF5b3V0KCkp IHsKLSAgICAgICAgTE9HKExheW91dCwgIiAgaW4gbGF5b3V0LCBiYWlsaW5nIik7CisgICAgICAg IExPRyhMYXlvdXQsICIgIGluIHJlbmRlciB0cmVlIGxheW91dCwgYmFpbGluZyIpOwogICAgICAg ICByZXR1cm47CiAgICAgfQogCiAgICAgaWYgKGxheW91dERpc2FsbG93ZWQoKSkgewotICAgICAg ICBMT0coTGF5b3V0LCAiICBsYXlvdXQgaXMgZGlzYWxsb3dlZCwgYmFpbGluZyIpOworICAgICAg ICBMT0coTGF5b3V0LCAiICBpcyBkaXNhbGxvd2VkLCBiYWlsaW5nIik7CisgICAgICAgIHJldHVy bjsKKyAgICB9CisgICAgQVNTRVJUKCFpc1BhaW50aW5nKCkpOworICAgIGlmIChpc1BhaW50aW5n KCkpIHsKKyAgICAgICAgTE9HKExheW91dCwgIiAgaW4gcGFpbnRpbmcsIGJhaWxpbmciKTsKICAg ICAgICAgcmV0dXJuOwogICAgIH0KIAorICAgIEFTU0VSVChmcmFtZSgpLnZpZXcoKSA9PSB0aGlz KTsKKyAgICBBU1NFUlQoZnJhbWUoKS5kb2N1bWVudCgpKTsKKyAgICBBU1NFUlQoZnJhbWUoKS5k b2N1bWVudCgpLT5wYWdlQ2FjaGVTdGF0ZSgpID09IERvY3VtZW50OjpOb3RJblBhZ2VDYWNoZSk7 CiAgICAgLy8gUHJvdGVjdCB0aGUgdmlldyBmcm9tIGJlaW5nIGRlbGV0ZWQgZHVyaW5nIGxheW91 dCAoaW4gcmVjYWxjU3R5bGUpLgogICAgIFJlZjxGcmFtZVZpZXc+IHByb3RlY3RlZFRoaXMoKnRo aXMpOworICAgIFRyYWNlU2NvcGUgdHJhY2luZ1Njb3BlKExheW91dFN0YXJ0LCBMYXlvdXRFbmQp OworICAgIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbkNvb2tpZSBjb29raWUgPSBJbnNwZWN0b3JJ bnN0cnVtZW50YXRpb246OndpbGxMYXlvdXQoZnJhbWUoKSk7CisgICAgQW5pbWF0aW9uVXBkYXRl QmxvY2sgYW5pbWF0aW9uVXBkYXRlQmxvY2soJmZyYW1lKCkuYW5pbWF0aW9uKCkpOwogCiAgICAg Ly8gTWFueSBvZiB0aGUgdGFza3MgcGVyZm9ybWVkIGR1cmluZyBsYXlvdXQgY2FuIGNhdXNlIHRo aXMgZnVuY3Rpb24gdG8gYmUgcmUtZW50ZXJlZCwKICAgICAvLyBzbyBzYXZlIHRoZSBsYXlvdXQg cGhhc2Ugbm93IGFuZCByZXN0b3JlIGl0IG9uIGV4aXQuCiAgICAgU2V0Rm9yU2NvcGU8TGF5b3V0 UGhhc2U+IGxheW91dFBoYXNlUmVzdG9yZXIobV9sYXlvdXRQaGFzZSwgSW5QcmVMYXlvdXQpOwot CiAgICAgLy8gRXZlcnkgc2Nyb2xsIHRoYXQgaGFwcGVucyBkdXJpbmcgbGF5b3V0IGlzIHByb2dy YW1tYXRpYy4KICAgICBTZXRGb3JTY29wZTxib29sPiBjaGFuZ2VJblByb2dyYW1tYXRpY1Njcm9s bChtX2luUHJvZ3JhbW1hdGljU2Nyb2xsLCB0cnVlKTsKLSAgICAKLSAgICBUcmFjZVNjb3BlIHRy YWNpbmdTY29wZShMYXlvdXRTdGFydCwgTGF5b3V0RW5kKTsKLQotICAgIGlmIChoYW5kbGVMYXlv dXRXaXRoRnJhbWVGbGF0dGVuaW5nSWZOZWVkZWQoYWxsb3dTdWJ0cmVlTGF5b3V0KSkKLSAgICAg ICAgcmV0dXJuOwotCi0jaWYgUExBVEZPUk0oSU9TKQotICAgIGlmICh1cGRhdGVGaXhlZFBvc2l0 aW9uTGF5b3V0UmVjdCgpKQotICAgICAgICBhbGxvd1N1YnRyZWVMYXlvdXQgPSBmYWxzZTsKLSNl bmRpZgogCiAgICAgbV9sYXlvdXRUaW1lci5zdG9wKCk7CiAgICAgbV9kZWxheWVkTGF5b3V0ID0g ZmFsc2U7CiAgICAgbV9zZXROZWVkc0xheW91dFdhc0RlZmVycmVkID0gZmFsc2U7Ci0gICAgCi0g ICAgLy8gd2Ugc2hvdWxkbid0IGVudGVyIGxheW91dCgpIHdoaWxlIHBhaW50aW5nCi0gICAgQVNT RVJUKCFpc1BhaW50aW5nKCkpOwotICAgIGlmIChpc1BhaW50aW5nKCkpCi0gICAgICAgIHJldHVy bjsKLQotICAgIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbkNvb2tpZSBjb29raWUgPSBJbnNwZWN0 b3JJbnN0cnVtZW50YXRpb246OndpbGxMYXlvdXQoZnJhbWUoKSk7Ci0gICAgQW5pbWF0aW9uVXBk YXRlQmxvY2sgYW5pbWF0aW9uVXBkYXRlQmxvY2soJmZyYW1lKCkuYW5pbWF0aW9uKCkpOwotICAg IAogICAgIGlmICghYWxsb3dTdWJ0cmVlTGF5b3V0ICYmIG1fc3VidHJlZUxheW91dFJvb3QpCiAg ICAgICAgIGNvbnZlcnRTdWJ0cmVlTGF5b3V0VG9GdWxsTGF5b3V0KCk7CisjaWYgUExBVEZPUk0o SU9TKQorICAgIGlmICh1cGRhdGVGaXhlZFBvc2l0aW9uTGF5b3V0UmVjdCgpKQorICAgICAgICBh bGxvd1N1YnRyZWVMYXlvdXQgPSBmYWxzZTsKKyNlbmRpZgogCi0gICAgQVNTRVJUKGZyYW1lKCku dmlldygpID09IHRoaXMpOwotICAgIEFTU0VSVChmcmFtZSgpLmRvY3VtZW50KCkpOworICAgIGlm IChoYW5kbGVMYXlvdXRXaXRoRnJhbWVGbGF0dGVuaW5nSWZOZWVkZWQoYWxsb3dTdWJ0cmVlTGF5 b3V0KSkKKyAgICAgICAgcmV0dXJuOwogCiAgICAgRG9jdW1lbnQmIGRvY3VtZW50ID0gKmZyYW1l KCkuZG9jdW1lbnQoKTsKLSAgICBBU1NFUlQoZG9jdW1lbnQucGFnZUNhY2hlU3RhdGUoKSA9PSBE b2N1bWVudDo6Tm90SW5QYWdlQ2FjaGUpOwogICAgIFJlbmRlckVsZW1lbnQqIGxheW91dFJvb3Qg PSBudWxscHRyOwotICAgIFJlbmRlckxheWVyKiBsYXllciA9IG51bGxwdHI7CiAgICAgYm9vbCBp c1N1YnRyZWVMYXlvdXQgPSBmYWxzZTsKLQogICAgIHsKICAgICAgICAgU2V0Rm9yU2NvcGU8Ym9v bD4gY2hhbmdlU2NoZWR1bGluZ0VuYWJsZWQobV9sYXlvdXRTY2hlZHVsaW5nRW5hYmxlZCwgZmFs c2UpOwogCkBAIC0xNDkzLDI3ICsxNDg1LDIyIEBAIHZvaWQgRnJhbWVWaWV3OjpsYXlvdXQoYm9v bCBhbGxvd1N1YnRyZWVMYXlvdXQpCiAgICAgICAgIH0KIAogICAgICAgICBBU1NFUlQoYWxsb3dT dWJ0cmVlTGF5b3V0IHx8ICFpc1N1YnRyZWVMYXlvdXQpOwotICAgICAgICBsYXllciA9IGxheW91 dFJvb3QtPmVuY2xvc2luZ0xheWVyKCk7Ci0gICAgICAgIFN1YnRyZWVMYXlvdXRTdGF0ZU1haW50 YWluZXIgc3VidHJlZUxheW91dFN0YXRlTWFpbnRhaW5lcihtX3N1YnRyZWVMYXlvdXRSb290KTsK LQotICAgICAgICBSZW5kZXJWaWV3OjpSZXBhaW50UmVnaW9uQWNjdW11bGF0b3IgcmVwYWludFJl Z2lvbkFjY3VtdWxhdG9yKCZsYXlvdXRSb290LT52aWV3KCkpOwotCiAgICAgICAgIEFTU0VSVCht X2xheW91dFBoYXNlID09IEluUHJlTGF5b3V0KTsKLSAgICAgICAgbV9sYXlvdXRQaGFzZSA9IElu UmVuZGVyVHJlZUxheW91dDsKIAogICAgICAgICBmb3JjZUxheW91dFBhcmVudFZpZXdJZk5lZWRl ZCgpOwogCi0gICAgICAgIEFTU0VSVChtX2xheW91dFBoYXNlID09IEluUmVuZGVyVHJlZUxheW91 dCk7CisgICAgICAgIFN1YnRyZWVMYXlvdXRTdGF0ZU1haW50YWluZXIgc3VidHJlZUxheW91dFN0 YXRlTWFpbnRhaW5lcihtX3N1YnRyZWVMYXlvdXRSb290KTsKKyAgICAgICAgUmVuZGVyVmlldzo6 UmVwYWludFJlZ2lvbkFjY3VtdWxhdG9yIHJlcGFpbnRSZWdpb25BY2N1bXVsYXRvcigmbGF5b3V0 Um9vdC0+dmlldygpKTsKICNpZm5kZWYgTkRFQlVHCiAgICAgICAgIFJlbmRlclRyZWVOZWVkc0xh eW91dENoZWNrZXIgY2hlY2tlcigqbGF5b3V0Um9vdCk7CiAjZW5kaWYKKyAgICAgICAgbV9sYXlv dXRQaGFzZSA9IEluUmVuZGVyVHJlZUxheW91dDsKICAgICAgICAgbGF5b3V0Um9vdC0+bGF5b3V0 KCk7CisgICAgICAgIEFTU0VSVChtX2xheW91dFBoYXNlID09IEluUmVuZGVyVHJlZUxheW91dCk7 CiAKICNpZiBFTkFCTEUoVEVYVF9BVVRPU0laSU5HKQogICAgICAgICBhcHBseVRleHRTaXppbmdJ Zk5lZWRlZCgqbGF5b3V0Um9vdCk7CiAjZW5kaWYKLQotICAgICAgICBBU1NFUlQobV9sYXlvdXRQ aGFzZSA9PSBJblJlbmRlclRyZWVMYXlvdXQpOwogICAgICAgICBtX3N1YnRyZWVMYXlvdXRSb290 ID0gbnVsbHB0cjsKICAgICAgICAgLy8gQ2xvc2UgYmxvY2sgaGVyZSB0byBlbmQgdGhlIHNjb3Bl IG9mIGNoYW5nZVNjaGVkdWxpbmdFbmFibGVkIGFuZCBTdWJ0cmVlTGF5b3V0U3RhdGVNYWludGFp bmVyLgogICAgIH0KQEAgLTE1MzUsOCArMTUyMiw4IEBAIHZvaWQgRnJhbWVWaWV3OjpsYXlvdXQo Ym9vbCBhbGxvd1N1YnRyZWVMYXlvdXQpCiAgICAgbGF5b3V0Um9vdC0+dmlldygpLnJlbGVhc2VQ cm90ZWN0ZWRSZW5kZXJXaWRnZXRzKCk7CiAKICAgICBBU1NFUlQoIWxheW91dFJvb3QtPm5lZWRz TGF5b3V0KCkpOwotCi0gICAgbGF5ZXItPnVwZGF0ZUxheWVyUG9zaXRpb25zQWZ0ZXJMYXlvdXQo cmVuZGVyVmlldygpLT5sYXllcigpLCB1cGRhdGVMYXllclBvc2l0aW9uRmxhZ3MobGF5ZXIsIGlz U3VidHJlZUxheW91dCwgbV9uZWVkc0Z1bGxSZXBhaW50KSk7CisgICAgYXV0byogbGF5b3V0Um9v dEVuY2xvc2luZ0xheWVyID0gbGF5b3V0Um9vdC0+ZW5jbG9zaW5nTGF5ZXIoKTsKKyAgICBsYXlv dXRSb290RW5jbG9zaW5nTGF5ZXItPnVwZGF0ZUxheWVyUG9zaXRpb25zQWZ0ZXJMYXlvdXQocmVu ZGVyVmlldygpLT5sYXllcigpLCB1cGRhdGVMYXllclBvc2l0aW9uRmxhZ3MobGF5b3V0Um9vdEVu Y2xvc2luZ0xheWVyLCBpc1N1YnRyZWVMYXlvdXQsIG1fbmVlZHNGdWxsUmVwYWludCkpOwogCiAg ICAgdXBkYXRlQ29tcG9zaXRpbmdMYXllcnNBZnRlckxheW91dCgpOwogCg==