199360 2019-07-01 05:47:41 -0700 REGRESSION(r240047): Overflow scrollers on WK1 fail to update their content size when it changes 2019-07-01 11:09:34 -0700 1 1 1 Unclassified WebKit Scrolling WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 koivisto webkit-unassigned commit-queue simon.fraser oldest_to_newest 1549186 0 koivisto 2019-07-01 05:47:41 -0700 Overflow scrollers on WK1 fail to update their content size when it changes. 1549187 1 koivisto 2019-07-01 05:47:56 -0700 <rdar://problem/51643386> 1549203 2 373230 koivisto 2019-07-01 06:55:17 -0700 Created attachment 373230 patch 1549204 3 373231 koivisto 2019-07-01 06:58:15 -0700 Created attachment 373231 patch 1549258 4 373231 commit-queue 2019-07-01 11:09:33 -0700 Comment on attachment 373231 patch Clearing flags on attachment: 373231 Committed r247012: <https://trac.webkit.org/changeset/247012> 1549259 5 commit-queue 2019-07-01 11:09:34 -0700 All reviewed patches have been landed. Closing bug. 373230 2019-07-01 06:55:17 -0700 2019-07-01 06:58:15 -0700 patch wk1-scrolled-contents-size.patch text/plain 6154 koivisto SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDI0NzAwNSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMzIEBACisyMDE5LTA3LTAxICBBbnR0aSBL b2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBSRUdSRVNTSU9OKHIyNDAwNDcp OiBPdmVyZmxvdyBzY3JvbGxlcnMgb24gV0sxIGZhaWwgdG8gdXBkYXRlIHRoZWlyIGNvbnRlbnQg c2l6ZSB3aGVuIGl0IGNoYW5nZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTE5OTM2MAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNTE2NDMzODY+CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgcjI0MDA0NyBy ZXBsYWNlZCBkaWRDb21taXRDaGFuZ2VzRm9yTGF5ZXIoKSBtZWNoYW5pc20gYnkgYSBtb3JlIG5h cnJvdyBkaWRDaGFuZ2VQbGF0Zm9ybUxheWVyRm9yTGF5ZXIgbWVjaGFuaXNtLgorICAgICAgICBV bmZvcnR1bmF0ZWx5IG9uIFdLMSB3ZSByZWxpZWQgb24gc2Nyb2xsIGxheWVycyBiZWluZyBpbnZh bGlkYXRlZCBhZnRlciBldmVyeSBzaXplIChhbmQgc2Nyb2xsYmFyKSBjaGFuZ2UuCisgICAgICAg IFdpdGhvdXQgdGhpcyBpbnZhbGlkYXRpb24gd2UgZG9uJ3QgY2FsbCBXZWJDaHJvbWVDbGllbnRJ T1M6OmFkZE9yVXBkYXRlU2Nyb2xsaW5nTGF5ZXIgYW5kIHRoZSBVSUtpdCBkZWxlZ2F0ZQorICAg ICAgICB0aGF0IHJlc2l6ZXMgdGhlIFVJU2Nyb2xsVmlldyBjb250ZW50LgorCisgICAgICAgIEZp eCByZW1vdmluZyB0aGUgc2Nyb2xsIGxheWVyIGludmFsaWRhdGlvbiBtZWNoYW5pc20gZnJvbSBM ZWdhY3lXZWJLaXRTY3JvbGxpbmdMYXllckNvb3JkaW5hdG9yIGNvbXBsZXRlbHkgYW5kIGluc3Rl YWQKKyAgICAgICAgc2ltcGx5IHVwZGF0ZSBhbGwgc2Nyb2xsIGxheWVycyBhZnRlciBjb21taXQu IFRoZSBVSUtpdCBkZWxlZ2F0ZSBkb2Vzbid0IGRvIGFueSBzaWduaWZpY2FudCB3b3JrIGlmIG5v dGhpbmcgY2hhbmdlcywKKyAgICAgICAgdGhpcyB3YXMgbm90IGEgdmVyeSBtZWFuaW5mdWwgb3B0 aW1pemF0aW9uLgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5j cHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllckNvbXBvc2l0b3I6OnVwZGF0ZVNjcm9s bENvb3JkaW5hdGVkTGF5ZXJzQWZ0ZXJGbHVzaCk6CisKKyAgICAgICAgVXBkYXRlIGFsbCBzY3Jv bGwgbGF5ZXJzIGFmdGVyIGZsdXNoIChzaW1pbGFyIHRvIHZpZXdwb3J0IGNvbnN0cmFpbmVkIGxh eWVycykuCisKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyQ29tcG9zaXRvcjo6ZGlkQ2hh bmdlUGxhdGZvcm1MYXllckZvckxheWVyKToKKyAgICAgICAgKFdlYkNvcmU6OkxlZ2FjeVdlYktp dFNjcm9sbGluZ0xheWVyQ29vcmRpbmF0b3I6OnVwZGF0ZVNjcm9sbGluZ0xheWVyKToKKyAgICAg ICAgKFdlYkNvcmU6OkxlZ2FjeVdlYktpdFNjcm9sbGluZ0xheWVyQ29vcmRpbmF0b3I6OmFkZFNj cm9sbGluZ0xheWVyKToKKyAgICAgICAgKFdlYkNvcmU6OkxlZ2FjeVdlYktpdFNjcm9sbGluZ0xh eWVyQ29vcmRpbmF0b3I6OnJlbW92ZVNjcm9sbGluZ0xheWVyKToKKyAgICAgICAgKFdlYkNvcmU6 OkxlZ2FjeVdlYktpdFNjcm9sbGluZ0xheWVyQ29vcmRpbmF0b3I6OnJlZ2lzdGVyU2Nyb2xsaW5n TGF5ZXJzTmVlZGluZ1VwZGF0ZSk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpMZWdhY3lX ZWJLaXRTY3JvbGxpbmdMYXllckNvb3JkaW5hdG9yOjpkaWRDaGFuZ2VQbGF0Zm9ybUxheWVyRm9y TGF5ZXIpOiBEZWxldGVkLgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJMYXllckNvbXBvc2l0 b3IuaDoKKwogMjAxOS0wNy0wMSAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxp YS5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZC4gRml4IEdUSyBidWlsZCB3aXRoIEdTVFJFQU1F Ul9HTCBkaXNhYmxlZCBhZnRlciByMjQ2NzEwCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmNwcAkocmV2aXNpb24gMjQ2OTYyKQor KysgU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5jcHAJKHdv cmtpbmcgY29weSkKQEAgLTU1NywxOCArNTU3LDEzIEBAIHZvaWQgUmVuZGVyTGF5ZXJDb21wb3Np dG9yOjp1cGRhdGVTY3JvbGwKIHsKICAgICBpZiAobV9sZWdhY3lTY3JvbGxpbmdMYXllckNvb3Jk aW5hdG9yKSB7CiAgICAgICAgIG1fbGVnYWN5U2Nyb2xsaW5nTGF5ZXJDb29yZGluYXRvci0+cmVn aXN0ZXJBbGxWaWV3cG9ydENvbnN0cmFpbmVkTGF5ZXJzKCp0aGlzKTsKLSAgICAgICAgbV9sZWdh Y3lTY3JvbGxpbmdMYXllckNvb3JkaW5hdG9yLT5yZWdpc3RlclNjcm9sbGluZ0xheWVyc05lZWRp bmdVcGRhdGUoKTsKKyAgICAgICAgbV9sZWdhY3lTY3JvbGxpbmdMYXllckNvb3JkaW5hdG9yLT5y ZWdpc3RlckFsbFNjcm9sbGluZ0xheWVycygpOwogICAgIH0KIH0KICNlbmRpZgogCiB2b2lkIFJl bmRlckxheWVyQ29tcG9zaXRvcjo6ZGlkQ2hhbmdlUGxhdGZvcm1MYXllckZvckxheWVyKFJlbmRl ckxheWVyJiBsYXllciwgY29uc3QgR3JhcGhpY3NMYXllciopCiB7Ci0jaWYgUExBVEZPUk0oSU9T X0ZBTUlMWSkKLSAgICBpZiAobV9sZWdhY3lTY3JvbGxpbmdMYXllckNvb3JkaW5hdG9yKQotICAg ICAgICBtX2xlZ2FjeVNjcm9sbGluZ0xheWVyQ29vcmRpbmF0b3ItPmRpZENoYW5nZVBsYXRmb3Jt TGF5ZXJGb3JMYXllcihsYXllcik7Ci0jZW5kaWYKLQogICAgIGF1dG8qIHNjcm9sbGluZ0Nvb3Jk aW5hdG9yID0gdGhpcy0+c2Nyb2xsaW5nQ29vcmRpbmF0b3IoKTsKICAgICBpZiAoIXNjcm9sbGlu Z0Nvb3JkaW5hdG9yKQogICAgICAgICByZXR1cm47CkBAIC00Nzc3LDYgKzQ3NzIsNyBAQCB2b2lk IExlZ2FjeVdlYktpdFNjcm9sbGluZ0xheWVyQ29vcmRpbmF0CiAKICAgICBib29sIGFsbG93SG9y aXpvbnRhbFNjcm9sbGJhciA9ICFsYXllci5ob3Jpem9udGFsU2Nyb2xsYmFySGlkZGVuQnlTdHls ZSgpOwogICAgIGJvb2wgYWxsb3dWZXJ0aWNhbFNjcm9sbGJhciA9ICFsYXllci52ZXJ0aWNhbFNj cm9sbGJhckhpZGRlbkJ5U3R5bGUoKTsKKwogICAgIG1fY2hyb21lQ2xpZW50LmFkZE9yVXBkYXRl U2Nyb2xsaW5nTGF5ZXIobGF5ZXIucmVuZGVyZXIoKS5lbGVtZW50KCksIGJhY2tpbmctPnNjcm9s bENvbnRhaW5lckxheWVyKCktPnBsYXRmb3JtTGF5ZXIoKSwgYmFja2luZy0+c2Nyb2xsZWRDb250 ZW50c0xheWVyKCktPnBsYXRmb3JtTGF5ZXIoKSwKICAgICAgICAgbGF5ZXIucmVhY2hhYmxlVG90 YWxDb250ZW50c1NpemUoKSwgYWxsb3dIb3Jpem9udGFsU2Nyb2xsYmFyLCBhbGxvd1ZlcnRpY2Fs U2Nyb2xsYmFyKTsKIH0KQEAgLTQ3ODcsMTQgKzQ3ODMsNiBAQCB2b2lkIExlZ2FjeVdlYktpdFNj cm9sbGluZ0xheWVyQ29vcmRpbmF0CiAgICAgICAgIHVwZGF0ZVNjcm9sbGluZ0xheWVyKCpsYXll cik7CiB9CiAKLXZvaWQgTGVnYWN5V2ViS2l0U2Nyb2xsaW5nTGF5ZXJDb29yZGluYXRvcjo6cmVn aXN0ZXJTY3JvbGxpbmdMYXllcnNOZWVkaW5nVXBkYXRlKCkKLXsKLSAgICBmb3IgKGF1dG8qIGxh eWVyIDogbV9zY3JvbGxpbmdMYXllcnNOZWVkaW5nVXBkYXRlKQotICAgICAgICB1cGRhdGVTY3Jv bGxpbmdMYXllcigqbGF5ZXIpOwotICAgIAotICAgIG1fc2Nyb2xsaW5nTGF5ZXJzTmVlZGluZ1Vw ZGF0ZS5jbGVhcigpOwotfQotCiB2b2lkIExlZ2FjeVdlYktpdFNjcm9sbGluZ0xheWVyQ29vcmRp bmF0b3I6OnVucmVnaXN0ZXJBbGxTY3JvbGxpbmdMYXllcnMoKQogewogICAgIGZvciAoYXV0byog bGF5ZXIgOiBtX3Njcm9sbGluZ0xheWVycykgewpAQCAtNDgwNywxMiArNDc5NSwxMCBAQCB2b2lk IExlZ2FjeVdlYktpdFNjcm9sbGluZ0xheWVyQ29vcmRpbmF0CiB2b2lkIExlZ2FjeVdlYktpdFNj cm9sbGluZ0xheWVyQ29vcmRpbmF0b3I6OmFkZFNjcm9sbGluZ0xheWVyKFJlbmRlckxheWVyJiBs YXllcikKIHsKICAgICBtX3Njcm9sbGluZ0xheWVycy5hZGQoJmxheWVyKTsKLSAgICBtX3Njcm9s bGluZ0xheWVyc05lZWRpbmdVcGRhdGUuYWRkKCZsYXllcik7CiB9CiAKIHZvaWQgTGVnYWN5V2Vi S2l0U2Nyb2xsaW5nTGF5ZXJDb29yZGluYXRvcjo6cmVtb3ZlU2Nyb2xsaW5nTGF5ZXIoUmVuZGVy TGF5ZXImIGxheWVyLCBSZW5kZXJMYXllckJhY2tpbmcmIGJhY2tpbmcpCiB7Ci0gICAgbV9zY3Jv bGxpbmdMYXllcnNOZWVkaW5nVXBkYXRlLnJlbW92ZSgmbGF5ZXIpOwogICAgIGlmIChtX3Njcm9s bGluZ0xheWVycy5yZW1vdmUoJmxheWVyKSkgewogICAgICAgICBhdXRvKiBzY3JvbGxDb250YWlu ZXJMYXllciA9IGJhY2tpbmcuc2Nyb2xsQ29udGFpbmVyTGF5ZXIoKS0+cGxhdGZvcm1MYXllcigp OwogICAgICAgICBhdXRvKiBzY3JvbGxlZENvbnRlbnRzTGF5ZXIgPSBiYWNraW5nLnNjcm9sbGVk Q29udGVudHNMYXllcigpLT5wbGF0Zm9ybUxheWVyKCk7CkBAIC00ODM4LDEyICs0ODI0LDYgQEAg dm9pZCBMZWdhY3lXZWJLaXRTY3JvbGxpbmdMYXllckNvb3JkaW5hdAogICAgIG1fdmlld3BvcnRD b25zdHJhaW5lZExheWVycy5yZW1vdmUoJmxheWVyKTsKIH0KIAotdm9pZCBMZWdhY3lXZWJLaXRT Y3JvbGxpbmdMYXllckNvb3JkaW5hdG9yOjpkaWRDaGFuZ2VQbGF0Zm9ybUxheWVyRm9yTGF5ZXIo UmVuZGVyTGF5ZXImIGxheWVyKQotewotICAgIGlmIChtX3Njcm9sbGluZ0xheWVycy5jb250YWlu cygmbGF5ZXIpKQotICAgICAgICBtX3Njcm9sbGluZ0xheWVyc05lZWRpbmdVcGRhdGUuYWRkKCZs YXllcik7Ci19Ci0KICNlbmRpZgogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCkluZGV4OiBTb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmgKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5oCShyZXZp c2lvbiAyNDY5NjIpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21w b3NpdG9yLmgJKHdvcmtpbmcgY29weSkKQEAgLTExOCw3ICsxMTgsNiBAQCBwdWJsaWM6CiAgICAg dm9pZCB1bnJlZ2lzdGVyQWxsVmlld3BvcnRDb25zdHJhaW5lZExheWVycygpOwogICAgIAogICAg IHZvaWQgcmVnaXN0ZXJBbGxTY3JvbGxpbmdMYXllcnMoKTsKLSAgICB2b2lkIHJlZ2lzdGVyU2Ny b2xsaW5nTGF5ZXJzTmVlZGluZ1VwZGF0ZSgpOwogICAgIHZvaWQgdW5yZWdpc3RlckFsbFNjcm9s bGluZ0xheWVycygpOwogICAgIAogICAgIHZvaWQgYWRkU2Nyb2xsaW5nTGF5ZXIoUmVuZGVyTGF5 ZXImKTsKQEAgLTEyNyw4ICsxMjYsNiBAQCBwdWJsaWM6CiAgICAgdm9pZCBhZGRWaWV3cG9ydENv bnN0cmFpbmVkTGF5ZXIoUmVuZGVyTGF5ZXImKTsKICAgICB2b2lkIHJlbW92ZVZpZXdwb3J0Q29u c3RyYWluZWRMYXllcihSZW5kZXJMYXllciYpOwogCi0gICAgdm9pZCBkaWRDaGFuZ2VQbGF0Zm9y bUxheWVyRm9yTGF5ZXIoUmVuZGVyTGF5ZXImKTsKLQogICAgIHZvaWQgcmVtb3ZlTGF5ZXIoUmVu ZGVyTGF5ZXImKTsKIAogcHJpdmF0ZToKQEAgLTEzOSw3ICsxMzYsNiBAQCBwcml2YXRlOgogICAg IEhhc2hTZXQ8UmVuZGVyTGF5ZXIqPiBtX3Njcm9sbGluZ0xheWVyczsKICAgICBIYXNoU2V0PFJl bmRlckxheWVyKj4gbV92aWV3cG9ydENvbnN0cmFpbmVkTGF5ZXJzOwogCi0gICAgSGFzaFNldDxS ZW5kZXJMYXllcio+IG1fc2Nyb2xsaW5nTGF5ZXJzTmVlZGluZ1VwZGF0ZTsKICAgICBjb25zdCBi b29sIG1fY29vcmRpbmF0ZVZpZXdwb3J0Q29uc3RyYWluZWRMYXllcnM7CiB9OwogI2VuZGlmCg== 373231 2019-07-01 06:58:15 -0700 2019-07-01 11:09:33 -0700 patch wk1-scrolled-contents-size-2.patch text/plain 6147 koivisto SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDI0NzAwNSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMzIEBACisyMDE5LTA3LTAxICBBbnR0aSBL b2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBSRUdSRVNTSU9OKHIyNDAwNDcp OiBPdmVyZmxvdyBzY3JvbGxlcnMgb24gV0sxIGZhaWwgdG8gdXBkYXRlIHRoZWlyIGNvbnRlbnQg c2l6ZSB3aGVuIGl0IGNoYW5nZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTE5OTM2MAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNTE2NDMzODY+CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgcjI0MDA0NyBy ZXBsYWNlZCBkaWRDb21taXRDaGFuZ2VzRm9yTGF5ZXIoKSBtZWNoYW5pc20gYnkgYSBtb3JlIG5h cnJvdyBkaWRDaGFuZ2VQbGF0Zm9ybUxheWVyRm9yTGF5ZXIuCisgICAgICAgIFVuZm9ydHVuYXRl bHkgb24gV0sxIHdlIHJlbGllZCBvbiBzY3JvbGwgbGF5ZXJzIGJlaW5nIGludmFsaWRhdGVkIGFm dGVyIGV2ZXJ5IHNpemUgKGFuZCBzY3JvbGxiYXIpIGNoYW5nZS4KKyAgICAgICAgV2l0aG91dCB0 aGlzIGludmFsaWRhdGlvbiB3ZSBkb24ndCBjYWxsIFdlYkNocm9tZUNsaWVudElPUzo6YWRkT3JV cGRhdGVTY3JvbGxpbmdMYXllciBhbmQgdGhlIFVJS2l0IGRlbGVnYXRlCisgICAgICAgIHRoYXQg cmVzaXplcyB0aGUgVUlTY3JvbGxWaWV3IGNvbnRlbnQuCisKKyAgICAgICAgRml4IGJ5IHJlbW92 aW5nIHRoZSBzY3JvbGwgbGF5ZXIgaW52YWxpZGF0aW9uIG1lY2hhbmlzbSBmcm9tIExlZ2FjeVdl YktpdFNjcm9sbGluZ0xheWVyQ29vcmRpbmF0b3IgY29tcGxldGVseSBhbmQgaW5zdGVhZAorICAg ICAgICBzaW1wbHkgdXBkYXRlIGFsbCBzY3JvbGwgbGF5ZXJzIGFmdGVyIGNvbW1pdC4gVGhlIFVJ S2l0IGRlbGVnYXRlIGRvZXNuJ3QgZG8gYW55IHNpZ25pZmljYW50IHdvcmsgaWYgbm90aGluZyBj aGFuZ2VzLAorICAgICAgICB0aGlzIHdhcyBub3QgYSB2ZXJ5IG1lYW5pbmZ1bCBvcHRpbWl6YXRp b24uCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyQ29tcG9zaXRvcjo6dXBkYXRlU2Nyb2xsQ29vcmRp bmF0ZWRMYXllcnNBZnRlckZsdXNoKToKKworICAgICAgICBVcGRhdGUgYWxsIHNjcm9sbCBsYXll cnMgYWZ0ZXIgZmx1c2ggKHNpbWlsYXIgdG8gdmlld3BvcnQgY29uc3RyYWluZWQgbGF5ZXJzKS4K KworICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXJDb21wb3NpdG9yOjpkaWRDaGFuZ2VQbGF0 Zm9ybUxheWVyRm9yTGF5ZXIpOgorICAgICAgICAoV2ViQ29yZTo6TGVnYWN5V2ViS2l0U2Nyb2xs aW5nTGF5ZXJDb29yZGluYXRvcjo6dXBkYXRlU2Nyb2xsaW5nTGF5ZXIpOgorICAgICAgICAoV2Vi Q29yZTo6TGVnYWN5V2ViS2l0U2Nyb2xsaW5nTGF5ZXJDb29yZGluYXRvcjo6YWRkU2Nyb2xsaW5n TGF5ZXIpOgorICAgICAgICAoV2ViQ29yZTo6TGVnYWN5V2ViS2l0U2Nyb2xsaW5nTGF5ZXJDb29y ZGluYXRvcjo6cmVtb3ZlU2Nyb2xsaW5nTGF5ZXIpOgorICAgICAgICAoV2ViQ29yZTo6TGVnYWN5 V2ViS2l0U2Nyb2xsaW5nTGF5ZXJDb29yZGluYXRvcjo6cmVnaXN0ZXJTY3JvbGxpbmdMYXllcnNO ZWVkaW5nVXBkYXRlKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OkxlZ2FjeVdlYktpdFNj cm9sbGluZ0xheWVyQ29vcmRpbmF0b3I6OmRpZENoYW5nZVBsYXRmb3JtTGF5ZXJGb3JMYXllcik6 IERlbGV0ZWQuCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5oOgor CiAyMDE5LTA3LTAxICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4K IAogICAgICAgICBVbnJldmlld2VkLiBGaXggR1RLIGJ1aWxkIHdpdGggR1NUUkVBTUVSX0dMIGRp c2FibGVkIGFmdGVyIHIyNDY3MTAKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJMYXllckNvbXBvc2l0b3IuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuY3BwCShyZXZpc2lvbiAyNDY5NjIpCisrKyBTb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmNwcAkod29ya2luZyBj b3B5KQpAQCAtNTU3LDE4ICs1NTcsMTMgQEAgdm9pZCBSZW5kZXJMYXllckNvbXBvc2l0b3I6OnVw ZGF0ZVNjcm9sbAogewogICAgIGlmIChtX2xlZ2FjeVNjcm9sbGluZ0xheWVyQ29vcmRpbmF0b3Ip IHsKICAgICAgICAgbV9sZWdhY3lTY3JvbGxpbmdMYXllckNvb3JkaW5hdG9yLT5yZWdpc3RlckFs bFZpZXdwb3J0Q29uc3RyYWluZWRMYXllcnMoKnRoaXMpOwotICAgICAgICBtX2xlZ2FjeVNjcm9s bGluZ0xheWVyQ29vcmRpbmF0b3ItPnJlZ2lzdGVyU2Nyb2xsaW5nTGF5ZXJzTmVlZGluZ1VwZGF0 ZSgpOworICAgICAgICBtX2xlZ2FjeVNjcm9sbGluZ0xheWVyQ29vcmRpbmF0b3ItPnJlZ2lzdGVy QWxsU2Nyb2xsaW5nTGF5ZXJzKCk7CiAgICAgfQogfQogI2VuZGlmCiAKIHZvaWQgUmVuZGVyTGF5 ZXJDb21wb3NpdG9yOjpkaWRDaGFuZ2VQbGF0Zm9ybUxheWVyRm9yTGF5ZXIoUmVuZGVyTGF5ZXIm IGxheWVyLCBjb25zdCBHcmFwaGljc0xheWVyKikKIHsKLSNpZiBQTEFURk9STShJT1NfRkFNSUxZ KQotICAgIGlmIChtX2xlZ2FjeVNjcm9sbGluZ0xheWVyQ29vcmRpbmF0b3IpCi0gICAgICAgIG1f bGVnYWN5U2Nyb2xsaW5nTGF5ZXJDb29yZGluYXRvci0+ZGlkQ2hhbmdlUGxhdGZvcm1MYXllckZv ckxheWVyKGxheWVyKTsKLSNlbmRpZgotCiAgICAgYXV0byogc2Nyb2xsaW5nQ29vcmRpbmF0b3Ig PSB0aGlzLT5zY3JvbGxpbmdDb29yZGluYXRvcigpOwogICAgIGlmICghc2Nyb2xsaW5nQ29vcmRp bmF0b3IpCiAgICAgICAgIHJldHVybjsKQEAgLTQ3NzcsNiArNDc3Miw3IEBAIHZvaWQgTGVnYWN5 V2ViS2l0U2Nyb2xsaW5nTGF5ZXJDb29yZGluYXQKIAogICAgIGJvb2wgYWxsb3dIb3Jpem9udGFs U2Nyb2xsYmFyID0gIWxheWVyLmhvcml6b250YWxTY3JvbGxiYXJIaWRkZW5CeVN0eWxlKCk7CiAg ICAgYm9vbCBhbGxvd1ZlcnRpY2FsU2Nyb2xsYmFyID0gIWxheWVyLnZlcnRpY2FsU2Nyb2xsYmFy SGlkZGVuQnlTdHlsZSgpOworCiAgICAgbV9jaHJvbWVDbGllbnQuYWRkT3JVcGRhdGVTY3JvbGxp bmdMYXllcihsYXllci5yZW5kZXJlcigpLmVsZW1lbnQoKSwgYmFja2luZy0+c2Nyb2xsQ29udGFp bmVyTGF5ZXIoKS0+cGxhdGZvcm1MYXllcigpLCBiYWNraW5nLT5zY3JvbGxlZENvbnRlbnRzTGF5 ZXIoKS0+cGxhdGZvcm1MYXllcigpLAogICAgICAgICBsYXllci5yZWFjaGFibGVUb3RhbENvbnRl bnRzU2l6ZSgpLCBhbGxvd0hvcml6b250YWxTY3JvbGxiYXIsIGFsbG93VmVydGljYWxTY3JvbGxi YXIpOwogfQpAQCAtNDc4NywxNCArNDc4Myw2IEBAIHZvaWQgTGVnYWN5V2ViS2l0U2Nyb2xsaW5n TGF5ZXJDb29yZGluYXQKICAgICAgICAgdXBkYXRlU2Nyb2xsaW5nTGF5ZXIoKmxheWVyKTsKIH0K IAotdm9pZCBMZWdhY3lXZWJLaXRTY3JvbGxpbmdMYXllckNvb3JkaW5hdG9yOjpyZWdpc3RlclNj cm9sbGluZ0xheWVyc05lZWRpbmdVcGRhdGUoKQotewotICAgIGZvciAoYXV0byogbGF5ZXIgOiBt X3Njcm9sbGluZ0xheWVyc05lZWRpbmdVcGRhdGUpCi0gICAgICAgIHVwZGF0ZVNjcm9sbGluZ0xh eWVyKCpsYXllcik7Ci0gICAgCi0gICAgbV9zY3JvbGxpbmdMYXllcnNOZWVkaW5nVXBkYXRlLmNs ZWFyKCk7Ci19Ci0KIHZvaWQgTGVnYWN5V2ViS2l0U2Nyb2xsaW5nTGF5ZXJDb29yZGluYXRvcjo6 dW5yZWdpc3RlckFsbFNjcm9sbGluZ0xheWVycygpCiB7CiAgICAgZm9yIChhdXRvKiBsYXllciA6 IG1fc2Nyb2xsaW5nTGF5ZXJzKSB7CkBAIC00ODA3LDEyICs0Nzk1LDEwIEBAIHZvaWQgTGVnYWN5 V2ViS2l0U2Nyb2xsaW5nTGF5ZXJDb29yZGluYXQKIHZvaWQgTGVnYWN5V2ViS2l0U2Nyb2xsaW5n TGF5ZXJDb29yZGluYXRvcjo6YWRkU2Nyb2xsaW5nTGF5ZXIoUmVuZGVyTGF5ZXImIGxheWVyKQog ewogICAgIG1fc2Nyb2xsaW5nTGF5ZXJzLmFkZCgmbGF5ZXIpOwotICAgIG1fc2Nyb2xsaW5nTGF5 ZXJzTmVlZGluZ1VwZGF0ZS5hZGQoJmxheWVyKTsKIH0KIAogdm9pZCBMZWdhY3lXZWJLaXRTY3Jv bGxpbmdMYXllckNvb3JkaW5hdG9yOjpyZW1vdmVTY3JvbGxpbmdMYXllcihSZW5kZXJMYXllciYg bGF5ZXIsIFJlbmRlckxheWVyQmFja2luZyYgYmFja2luZykKIHsKLSAgICBtX3Njcm9sbGluZ0xh eWVyc05lZWRpbmdVcGRhdGUucmVtb3ZlKCZsYXllcik7CiAgICAgaWYgKG1fc2Nyb2xsaW5nTGF5 ZXJzLnJlbW92ZSgmbGF5ZXIpKSB7CiAgICAgICAgIGF1dG8qIHNjcm9sbENvbnRhaW5lckxheWVy ID0gYmFja2luZy5zY3JvbGxDb250YWluZXJMYXllcigpLT5wbGF0Zm9ybUxheWVyKCk7CiAgICAg ICAgIGF1dG8qIHNjcm9sbGVkQ29udGVudHNMYXllciA9IGJhY2tpbmcuc2Nyb2xsZWRDb250ZW50 c0xheWVyKCktPnBsYXRmb3JtTGF5ZXIoKTsKQEAgLTQ4MzgsMTIgKzQ4MjQsNiBAQCB2b2lkIExl Z2FjeVdlYktpdFNjcm9sbGluZ0xheWVyQ29vcmRpbmF0CiAgICAgbV92aWV3cG9ydENvbnN0cmFp bmVkTGF5ZXJzLnJlbW92ZSgmbGF5ZXIpOwogfQogCi12b2lkIExlZ2FjeVdlYktpdFNjcm9sbGlu Z0xheWVyQ29vcmRpbmF0b3I6OmRpZENoYW5nZVBsYXRmb3JtTGF5ZXJGb3JMYXllcihSZW5kZXJM YXllciYgbGF5ZXIpCi17Ci0gICAgaWYgKG1fc2Nyb2xsaW5nTGF5ZXJzLmNvbnRhaW5zKCZsYXll cikpCi0gICAgICAgIG1fc2Nyb2xsaW5nTGF5ZXJzTmVlZGluZ1VwZGF0ZS5hZGQoJmxheWVyKTsK LX0KLQogI2VuZGlmCiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKSW5kZXg6IFNvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuaAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmgJKHJldmlzaW9uIDI0 Njk2MikKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3Iu aAkod29ya2luZyBjb3B5KQpAQCAtMTE4LDcgKzExOCw2IEBAIHB1YmxpYzoKICAgICB2b2lkIHVu cmVnaXN0ZXJBbGxWaWV3cG9ydENvbnN0cmFpbmVkTGF5ZXJzKCk7CiAgICAgCiAgICAgdm9pZCBy ZWdpc3RlckFsbFNjcm9sbGluZ0xheWVycygpOwotICAgIHZvaWQgcmVnaXN0ZXJTY3JvbGxpbmdM YXllcnNOZWVkaW5nVXBkYXRlKCk7CiAgICAgdm9pZCB1bnJlZ2lzdGVyQWxsU2Nyb2xsaW5nTGF5 ZXJzKCk7CiAgICAgCiAgICAgdm9pZCBhZGRTY3JvbGxpbmdMYXllcihSZW5kZXJMYXllciYpOwpA QCAtMTI3LDggKzEyNiw2IEBAIHB1YmxpYzoKICAgICB2b2lkIGFkZFZpZXdwb3J0Q29uc3RyYWlu ZWRMYXllcihSZW5kZXJMYXllciYpOwogICAgIHZvaWQgcmVtb3ZlVmlld3BvcnRDb25zdHJhaW5l ZExheWVyKFJlbmRlckxheWVyJik7CiAKLSAgICB2b2lkIGRpZENoYW5nZVBsYXRmb3JtTGF5ZXJG b3JMYXllcihSZW5kZXJMYXllciYpOwotCiAgICAgdm9pZCByZW1vdmVMYXllcihSZW5kZXJMYXll ciYpOwogCiBwcml2YXRlOgpAQCAtMTM5LDcgKzEzNiw2IEBAIHByaXZhdGU6CiAgICAgSGFzaFNl dDxSZW5kZXJMYXllcio+IG1fc2Nyb2xsaW5nTGF5ZXJzOwogICAgIEhhc2hTZXQ8UmVuZGVyTGF5 ZXIqPiBtX3ZpZXdwb3J0Q29uc3RyYWluZWRMYXllcnM7CiAKLSAgICBIYXNoU2V0PFJlbmRlckxh eWVyKj4gbV9zY3JvbGxpbmdMYXllcnNOZWVkaW5nVXBkYXRlOwogICAgIGNvbnN0IGJvb2wgbV9j b29yZGluYXRlVmlld3BvcnRDb25zdHJhaW5lZExheWVyczsKIH07CiAjZW5kaWYK