196473 2019-04-01 17:18:20 -0700 Remove some unused iOS scrolling-related code in Frame 2019-04-01 20:18:16 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 simon.fraser simon.fraser simon.fraser webkit-bug-importer zalan oldest_to_newest 1523149 0 simon.fraser 2019-04-01 17:18:20 -0700 Remove some unused iOS scrolling-related code in Frame 1523150 1 366447 simon.fraser 2019-04-01 17:18:45 -0700 Created attachment 366447 Patch 1523200 2 simon.fraser 2019-04-01 20:17:57 -0700 https://trac.webkit.org/changeset/243735/webkit 1523201 3 webkit-bug-importer 2019-04-01 20:18:16 -0700 <rdar://problem/49506832> 366447 2019-04-01 17:18:45 -0700 2019-04-01 17:20:28 -0700 Patch bug-196473-20190401171844.patch text/plain 9894 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjQzNzAxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNGRjNWU4NTI5MTA0MDQz ZDM2YTk3YTI0Y2MyZTE3OTVlOWNjYzVkMS4uYWUyNjI2YzJmYjI1NzBmZDU3ZmM2NDEwY2YyOWNi MmYxNWU2MDBhMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDE5LTA0LTAxICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIFJlbW92ZSBzb21l IHVudXNlZCBpT1Mgc2Nyb2xsaW5nLXJlbGF0ZWQgY29kZSBpbiBGcmFtZQorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk2NDczCisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhpcyBjb2RlIGhhcyBubyBjYWxs ZXJzLgorCisgICAgICAgICogcGFnZS9GcmFtZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGcmFt ZTo6RnJhbWUpOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWU6OnNjcm9sbE92ZXJmbG93TGF5ZXIp OiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6RnJhbWU6Om92ZXJmbG93QXV0b1Njcm9sbFRp bWVyRmlyZWQpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6RnJhbWU6OnN0YXJ0T3ZlcmZs b3dBdXRvU2Nyb2xsKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lOjpjaGVja092 ZXJmbG93U2Nyb2xsKTogRGVsZXRlZC4KKyAgICAgICAgKiBwYWdlL0ZyYW1lLmg6CisKIDIwMTkt MDQtMDEgIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CiAKICAgICAgICAg UGx1bWIgdGhyb3VnaCBhIFNjcm9sbFR5cGUgdmFsdWUgdGhhdCBpbmRpY2F0ZXMgd2hldGhlciBh IHNjcm9sbCB3YXMgYSB1c2VyIG9yIHByb2dyYW1tYXRpYyBzY3JvbGwKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWUuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZS5j cHAKaW5kZXggOGE1OGFlYWQwYzg0OTE5MTJjZDAxZDA4ZGIxMmY0ZWJhODBlOTg4ZS4uNjE1ZTY5 MTgwMzcwZjM2YmZlZTZmY2JiMzljMTFiZDFiZDFiNDM2NyAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvcGFnZS9GcmFtZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZS5jcHAK QEAgLTE1MiwxMyArMTUyLDggQEAgRnJhbWU6OkZyYW1lKFBhZ2UmIHBhZ2UsIEhUTUxGcmFtZU93 bmVyRWxlbWVudCogb3duZXJFbGVtZW50LCBGcmFtZUxvYWRlckNsaWVudCYKICAgICAsIG1fZWRp dG9yKG1ha2VVbmlxdWVSZWY8RWRpdG9yPigqdGhpcykpCiAgICAgLCBtX3NlbGVjdGlvbihtYWtl VW5pcXVlUmVmPEZyYW1lU2VsZWN0aW9uPih0aGlzKSkKICAgICAsIG1fYW5pbWF0aW9uQ29udHJv bGxlcihtYWtlVW5pcXVlUmVmPENTU0FuaW1hdGlvbkNvbnRyb2xsZXI+KCp0aGlzKSkKLSNpZiBQ TEFURk9STShJT1NfRkFNSUxZKQotICAgICwgbV9vdmVyZmxvd0F1dG9TY3JvbGxUaW1lcigqdGhp cywgJkZyYW1lOjpvdmVyZmxvd0F1dG9TY3JvbGxUaW1lckZpcmVkKQotICAgICwgbV9zZWxlY3Rp b25DaGFuZ2VDYWxsYmFja3NEaXNhYmxlZChmYWxzZSkKLSNlbmRpZgogICAgICwgbV9wYWdlWm9v bUZhY3RvcihwYXJlbnRQYWdlWm9vbUZhY3Rvcih0aGlzKSkKICAgICAsIG1fdGV4dFpvb21GYWN0 b3IocGFyZW50VGV4dFpvb21GYWN0b3IodGhpcykpCi0gICAgLCBtX2FjdGl2ZURPTU9iamVjdHNB bmRBbmltYXRpb25zU3VzcGVuZGVkQ291bnQoMCkKICAgICAsIG1fZXZlbnRIYW5kbGVyKG1ha2VV bmlxdWVSZWY8RXZlbnRIYW5kbGVyPigqdGhpcykpCiB7CiAgICAgUHJvY2Vzc1dhcm1pbmc6Omlu aXRpYWxpemVOYW1lcygpOwpAQCAtNTAwLDE0OSArNDk1LDYgQEAgU3RyaW5nIEZyYW1lOjptYXRj aExhYmVsc0FnYWluc3RFbGVtZW50KGNvbnN0IFZlY3RvcjxTdHJpbmc+JiBsYWJlbHMsIEVsZW1l bnQqIGUKIH0KIAogI2lmIFBMQVRGT1JNKElPU19GQU1JTFkpCi12b2lkIEZyYW1lOjpzY3JvbGxP dmVyZmxvd0xheWVyKFJlbmRlckxheWVyKiBsYXllciwgY29uc3QgSW50UmVjdCYgdmlzaWJsZVJl Y3QsIGNvbnN0IEludFJlY3QmIGV4cG9zZVJlY3QpCi17Ci0gICAgaWYgKCFsYXllcikKLSAgICAg ICAgcmV0dXJuOwotCi0gICAgUmVuZGVyQm94KiBib3ggPSBsYXllci0+cmVuZGVyQm94KCk7Ci0g ICAgaWYgKCFib3gpCi0gICAgICAgIHJldHVybjsKLQotICAgIGlmICh2aXNpYmxlUmVjdC5pbnRl cnNlY3RzKGV4cG9zZVJlY3QpKQotICAgICAgICByZXR1cm47Ci0KLSAgICAvLyBGSVhNRTogV2h5 IGlzbid0IHRoaXMganVzdCBjYWxsaW5nIFJlbmRlckxheWVyOjpzY3JvbGxSZWN0VG9WaXNpYmxl KCk/Ci0gICAgU2Nyb2xsT2Zmc2V0IHNjcm9sbE9mZnNldCA9IGxheWVyLT5zY3JvbGxPZmZzZXQo KTsKLSAgICBpbnQgZXhwb3NlTGVmdCA9IGV4cG9zZVJlY3QueCgpOwotICAgIGludCBleHBvc2VS aWdodCA9IGV4cG9zZUxlZnQgKyBleHBvc2VSZWN0LndpZHRoKCk7Ci0gICAgaW50IGNsaWVudFdp ZHRoID0gcm91bmRUb0ludChib3gtPmNsaWVudFdpZHRoKCkpOwotICAgIGlmIChleHBvc2VMZWZ0 IDw9IDApCi0gICAgICAgIHNjcm9sbE9mZnNldC5zZXRYKHN0ZDo6bWF4KDAsIHNjcm9sbE9mZnNl dC54KCkgKyBleHBvc2VMZWZ0IC0gY2xpZW50V2lkdGggLyAyKSk7Ci0gICAgZWxzZSBpZiAoZXhw b3NlUmlnaHQgPj0gY2xpZW50V2lkdGgpCi0gICAgICAgIHNjcm9sbE9mZnNldC5zZXRYKHN0ZDo6 bWluKGJveC0+c2Nyb2xsV2lkdGgoKSAtIGNsaWVudFdpZHRoLCBzY3JvbGxPZmZzZXQueCgpICsg Y2xpZW50V2lkdGggLyAyKSk7Ci0KLSAgICBpbnQgZXhwb3NlVG9wID0gZXhwb3NlUmVjdC55KCk7 Ci0gICAgaW50IGV4cG9zZUJvdHRvbSA9IGV4cG9zZVRvcCArIGV4cG9zZVJlY3QuaGVpZ2h0KCk7 Ci0gICAgaW50IGNsaWVudEhlaWdodCA9IHJvdW5kVG9JbnQoYm94LT5jbGllbnRIZWlnaHQoKSk7 Ci0gICAgaWYgKGV4cG9zZVRvcCA8PSAwKQotICAgICAgICBzY3JvbGxPZmZzZXQuc2V0WShzdGQ6 Om1heCgwLCBzY3JvbGxPZmZzZXQueSgpICsgZXhwb3NlVG9wIC0gY2xpZW50SGVpZ2h0IC8gMikp OwotICAgIGVsc2UgaWYgKGV4cG9zZUJvdHRvbSA+PSBjbGllbnRIZWlnaHQpCi0gICAgICAgIHNj cm9sbE9mZnNldC5zZXRZKHN0ZDo6bWluKGJveC0+c2Nyb2xsSGVpZ2h0KCkgLSBjbGllbnRIZWln aHQsIHNjcm9sbE9mZnNldC55KCkgKyBjbGllbnRIZWlnaHQgLyAyKSk7Ci0KLSAgICBsYXllci0+ c2Nyb2xsVG9PZmZzZXQoc2Nyb2xsT2Zmc2V0LCBTY3JvbGxDbGFtcGluZzo6VW5jbGFtcGVkKTsK LSAgICBzZWxlY3Rpb24oKS5zZXRDYXJldFJlY3ROZWVkc1VwZGF0ZSgpOwotICAgIHNlbGVjdGlv bigpLnVwZGF0ZUFwcGVhcmFuY2UoKTsKLX0KLQotdm9pZCBGcmFtZTo6b3ZlcmZsb3dBdXRvU2Ny b2xsVGltZXJGaXJlZCgpCi17Ci0gICAgaWYgKCFldmVudEhhbmRsZXIoKS5tb3VzZVByZXNzZWQo KSB8fCBjaGVja092ZXJmbG93U2Nyb2xsKFBlcmZvcm1PdmVyZmxvd1Njcm9sbCkgPT0gT3ZlcmZs b3dTY3JvbGxOb25lKSB7Ci0gICAgICAgIGlmIChtX292ZXJmbG93QXV0b1Njcm9sbFRpbWVyLmlz QWN0aXZlKCkpCi0gICAgICAgICAgICBtX292ZXJmbG93QXV0b1Njcm9sbFRpbWVyLnN0b3AoKTsK LSAgICB9Ci19Ci0KLXZvaWQgRnJhbWU6OnN0YXJ0T3ZlcmZsb3dBdXRvU2Nyb2xsKGNvbnN0IElu dFBvaW50JiBtb3VzZVBvc2l0aW9uKQotewotICAgIG1fb3ZlcmZsb3dBdXRvU2Nyb2xsUG9zID0g bW91c2VQb3NpdGlvbjsKLQotICAgIGlmIChtX292ZXJmbG93QXV0b1Njcm9sbFRpbWVyLmlzQWN0 aXZlKCkpCi0gICAgICAgIHJldHVybjsKLQotICAgIGlmIChjaGVja092ZXJmbG93U2Nyb2xsKERv Tm90UGVyZm9ybU92ZXJmbG93U2Nyb2xsKSA9PSBPdmVyZmxvd1Njcm9sbE5vbmUpCi0gICAgICAg IHJldHVybjsKLQotICAgIG1fb3ZlcmZsb3dBdXRvU2Nyb2xsVGltZXIuc3RhcnRSZXBlYXRpbmco c2Nyb2xsRnJlcXVlbmN5KTsKLSAgICBtX292ZXJmbG93QXV0b1Njcm9sbERlbHRhID0gMzsKLX0K LQotaW50IEZyYW1lOjpjaGVja092ZXJmbG93U2Nyb2xsKE92ZXJmbG93U2Nyb2xsQWN0aW9uIGFj dGlvbikKLXsKLSAgICBQb3NpdGlvbiBleHRlbnQgPSBzZWxlY3Rpb24oKS5zZWxlY3Rpb24oKS5l eHRlbnQoKTsKLSAgICBpZiAoZXh0ZW50LmlzTnVsbCgpKQotICAgICAgICByZXR1cm4gT3ZlcmZs b3dTY3JvbGxOb25lOwotCi0gICAgUmVuZGVyT2JqZWN0KiByZW5kZXJlciA9IGV4dGVudC5kZXBy ZWNhdGVkTm9kZSgpLT5yZW5kZXJlcigpOwotICAgIGlmICghcmVuZGVyZXIpCi0gICAgICAgIHJl dHVybiBPdmVyZmxvd1Njcm9sbE5vbmU7Ci0KLSAgICBGcmFtZVZpZXcqIHZpZXcgPSB0aGlzLT52 aWV3KCk7Ci0gICAgaWYgKCF2aWV3KQotICAgICAgICByZXR1cm4gT3ZlcmZsb3dTY3JvbGxOb25l OwotCi0gICAgUmVuZGVyQmxvY2sqIGNvbnRhaW5pbmdCbG9jayA9IHJlbmRlcmVyLT5jb250YWlu aW5nQmxvY2soKTsKLSAgICBpZiAoIWNvbnRhaW5pbmdCbG9jayB8fCAhY29udGFpbmluZ0Jsb2Nr LT5oYXNPdmVyZmxvd0NsaXAoKSkKLSAgICAgICAgcmV0dXJuIE92ZXJmbG93U2Nyb2xsTm9uZTsK LSAgICBSZW5kZXJMYXllciogbGF5ZXIgPSBjb250YWluaW5nQmxvY2stPmxheWVyKCk7Ci0gICAg QVNTRVJUKGxheWVyKTsKLQotICAgIEludFJlY3QgdmlzaWJsZVJlY3QgPSBJbnRSZWN0KHZpZXct PnNjcm9sbFgoKSwgdmlldy0+c2Nyb2xsWSgpLCB2aWV3LT52aXNpYmxlV2lkdGgoKSwgdmlldy0+ dmlzaWJsZUhlaWdodCgpKTsKLSAgICBJbnRQb2ludCBwb3NpdGlvbiA9IG1fb3ZlcmZsb3dBdXRv U2Nyb2xsUG9zOwotICAgIGlmICh2aXNpYmxlUmVjdC5jb250YWlucyhwb3NpdGlvbi54KCksIHBv c2l0aW9uLnkoKSkpCi0gICAgICAgIHJldHVybiBPdmVyZmxvd1Njcm9sbE5vbmU7Ci0KLSAgICBp bnQgc2Nyb2xsVHlwZSA9IDA7Ci0gICAgaW50IGRlbHRhWCA9IDA7Ci0gICAgaW50IGRlbHRhWSA9 IDA7Ci0gICAgSW50UG9pbnQgc2VsZWN0aW9uUG9zaXRpb247Ci0KLSAgICAvLyBUaGlzIGNvbnN0 YW50IHdpbGwgbWFrZSB0aGUgc2VsZWN0aW9uIGRyYXcgYSBsaXR0bGUgYml0IGJleW9uZCB0aGUg ZWRnZSBvZiB0aGUgdmlzaWJsZSBhcmVhLgotICAgIC8vIFRoaXMgcHJldmVudHMgYSB2aXN1YWwg Z2xpdGNoLCBpbiB0aGF0IHlvdSBjYW4gZmFpbCB0byBzZWxlY3QgYSBwb3J0aW9uIG9mIGEgY2hh cmFjdGVyIHRoYXQKLSAgICAvLyBpcyBiZWluZyByZW5kZXJlZCByaWdodCBhdCB0aGUgZWRnZSBv ZiB0aGUgdmlzaWJsZSByZWN0YW5nbGUuCi0gICAgLy8gRklYTUU6IFRoaXMgcHJvYmFibHkgbmVl ZHMgaW1wcm92ZW1lbnQsIGFuZCBtYXkgbmVlZCB0byB0YWtlIHRoZSBmb250IHNpemUgaW50byBh Y2NvdW50LgotICAgIHN0YXRpYyBjb25zdCBpbnQgc2Nyb2xsQm91bmRzQWRqdXN0bWVudCA9IDM7 Ci0KLSAgICAvLyBGSVhNRTogTWFrZSBhIHNtYWxsIGJ1ZmZlciBhdCB0aGUgZW5kIG9mIGEgdmlz aWJsZSByZWN0YW5nbGUgc28gdGhhdCBhdXRvc2Nyb2xsaW5nIHdvcmtzIAotICAgIC8vIGV2ZW4g aWYgdGhlIHZpc2libGUgZXh0ZW5kcyB0byB0aGUgbGltaXRzIG9mIHRoZSBzY3JlZW4uCi0gICAg aWYgKHBvc2l0aW9uLngoKSA8IHZpc2libGVSZWN0LngoKSkgewotICAgICAgICBzY3JvbGxUeXBl IHw9IE92ZXJmbG93U2Nyb2xsTGVmdDsKLSAgICAgICAgaWYgKGFjdGlvbiA9PSBQZXJmb3JtT3Zl cmZsb3dTY3JvbGwpIHsKLSAgICAgICAgICAgIGRlbHRhWCAtPSBzdGF0aWNfY2FzdDxpbnQ+KG1f b3ZlcmZsb3dBdXRvU2Nyb2xsRGVsdGEpOwotICAgICAgICAgICAgc2VsZWN0aW9uUG9zaXRpb24u c2V0WCh2aWV3LT5zY3JvbGxYKCkgLSBzY3JvbGxCb3VuZHNBZGp1c3RtZW50KTsKLSAgICAgICAg fQotICAgIH0gZWxzZSBpZiAocG9zaXRpb24ueCgpID4gdmlzaWJsZVJlY3QubWF4WCgpKSB7Ci0g ICAgICAgIHNjcm9sbFR5cGUgfD0gT3ZlcmZsb3dTY3JvbGxSaWdodDsKLSAgICAgICAgaWYgKGFj dGlvbiA9PSBQZXJmb3JtT3ZlcmZsb3dTY3JvbGwpIHsKLSAgICAgICAgICAgIGRlbHRhWCArPSBz dGF0aWNfY2FzdDxpbnQ+KG1fb3ZlcmZsb3dBdXRvU2Nyb2xsRGVsdGEpOwotICAgICAgICAgICAg c2VsZWN0aW9uUG9zaXRpb24uc2V0WCh2aWV3LT5zY3JvbGxYKCkgKyB2aWV3LT52aXNpYmxlV2lk dGgoKSArIHNjcm9sbEJvdW5kc0FkanVzdG1lbnQpOwotICAgICAgICB9Ci0gICAgfQotCi0gICAg aWYgKHBvc2l0aW9uLnkoKSA8IHZpc2libGVSZWN0LnkoKSkgewotICAgICAgICBzY3JvbGxUeXBl IHw9IE92ZXJmbG93U2Nyb2xsVXA7Ci0gICAgICAgIGlmIChhY3Rpb24gPT0gUGVyZm9ybU92ZXJm bG93U2Nyb2xsKSB7Ci0gICAgICAgICAgICBkZWx0YVkgLT0gc3RhdGljX2Nhc3Q8aW50PihtX292 ZXJmbG93QXV0b1Njcm9sbERlbHRhKTsKLSAgICAgICAgICAgIHNlbGVjdGlvblBvc2l0aW9uLnNl dFkodmlldy0+c2Nyb2xsWSgpIC0gc2Nyb2xsQm91bmRzQWRqdXN0bWVudCk7Ci0gICAgICAgIH0K LSAgICB9IGVsc2UgaWYgKHBvc2l0aW9uLnkoKSA+IHZpc2libGVSZWN0Lm1heFkoKSkgewotICAg ICAgICBzY3JvbGxUeXBlIHw9IE92ZXJmbG93U2Nyb2xsRG93bjsKLSAgICAgICAgaWYgKGFjdGlv biA9PSBQZXJmb3JtT3ZlcmZsb3dTY3JvbGwpIHsKLSAgICAgICAgICAgIGRlbHRhWSArPSBzdGF0 aWNfY2FzdDxpbnQ+KG1fb3ZlcmZsb3dBdXRvU2Nyb2xsRGVsdGEpOwotICAgICAgICAgICAgc2Vs ZWN0aW9uUG9zaXRpb24uc2V0WSh2aWV3LT5zY3JvbGxZKCkgKyB2aWV3LT52aXNpYmxlSGVpZ2h0 KCkgKyBzY3JvbGxCb3VuZHNBZGp1c3RtZW50KTsKLSAgICAgICAgfQotICAgIH0KLQotICAgIFJl ZjxGcmFtZT4gcHJvdGVjdGVkVGhpcygqdGhpcyk7Ci0KLSAgICBpZiAoYWN0aW9uID09IFBlcmZv cm1PdmVyZmxvd1Njcm9sbCAmJiAoZGVsdGFYIHx8IGRlbHRhWSkpIHsKLSAgICAgICAgbGF5ZXIt PnNjcm9sbFRvT2Zmc2V0KGxheWVyLT5zY3JvbGxPZmZzZXQoKSArIEludFNpemUoZGVsdGFYLCBk ZWx0YVkpLCBTY3JvbGxDbGFtcGluZzo6VW5jbGFtcGVkKTsKLQotICAgICAgICAvLyBIYW5kbGUg bWFraW5nIHNlbGVjdGlvbi4KLSAgICAgICAgVmlzaWJsZVBvc2l0aW9uIHZpc2libGVQb3NpdGlv bihyZW5kZXJlci0+cG9zaXRpb25Gb3JQb2ludChzZWxlY3Rpb25Qb3NpdGlvbiwgbnVsbHB0cikp OwotICAgICAgICBpZiAodmlzaWJsZVBvc2l0aW9uLmlzTm90TnVsbCgpKSB7Ci0gICAgICAgICAg ICBWaXNpYmxlU2VsZWN0aW9uIHZpc2libGVTZWxlY3Rpb24gPSBzZWxlY3Rpb24oKS5zZWxlY3Rp b24oKTsKLSAgICAgICAgICAgIHZpc2libGVTZWxlY3Rpb24uc2V0RXh0ZW50KHZpc2libGVQb3Np dGlvbik7Ci0gICAgICAgICAgICBpZiAoc2VsZWN0aW9uKCkuZ3JhbnVsYXJpdHkoKSAhPSBDaGFy YWN0ZXJHcmFudWxhcml0eSkKLSAgICAgICAgICAgICAgICB2aXNpYmxlU2VsZWN0aW9uLmV4cGFu ZFVzaW5nR3JhbnVsYXJpdHkoc2VsZWN0aW9uKCkuZ3JhbnVsYXJpdHkoKSk7Ci0gICAgICAgICAg ICBpZiAoc2VsZWN0aW9uKCkuc2hvdWxkQ2hhbmdlU2VsZWN0aW9uKHZpc2libGVTZWxlY3Rpb24p KQotICAgICAgICAgICAgICAgIHNlbGVjdGlvbigpLnNldFNlbGVjdGlvbih2aXNpYmxlU2VsZWN0 aW9uKTsKLSAgICAgICAgfQotCi0gICAgICAgIG1fb3ZlcmZsb3dBdXRvU2Nyb2xsRGVsdGEgKj0g MS4wMmY7IC8vIEFjY2VsZXJhdGUgdGhlIHNjcm9sbAotICAgIH0KLSAgICByZXR1cm4gc2Nyb2xs VHlwZTsKLX0KIAogdm9pZCBGcmFtZTo6c2V0U2VsZWN0aW9uQ2hhbmdlQ2FsbGJhY2tzRGlzYWJs ZWQoYm9vbCBzZWxlY3Rpb25DaGFuZ2VDYWxsYmFja3NEaXNhYmxlZCkKIHsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWUuaCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWUu aAppbmRleCBkZDcxZDhkNTFiMGE5YWE0ODllNTFhMTc5ZTM0NmE1YjFjNWM3ZDdlLi5iMzNiZGUz Zjc3MDAxMDlmMDZmMGUwMTg1NGI4ZWNkNDhiNDkxZTFkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9wYWdlL0ZyYW1lLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZS5oCkBAIC0y NTgsOSArMjU4LDYgQEAgcHVibGljOgogICAgIFN0cmluZyBtYXRjaExhYmVsc0FnYWluc3RFbGVt ZW50KGNvbnN0IFZlY3RvcjxTdHJpbmc+JiBsYWJlbHMsIEVsZW1lbnQqKTsKIAogI2lmIFBMQVRG T1JNKElPU19GQU1JTFkpCi0gICAgLy8gU2Nyb2xsIHRoZSBzZWxlY3Rpb24gaW4gYW4gb3ZlcmZs b3cgbGF5ZXIuCi0gICAgdm9pZCBzY3JvbGxPdmVyZmxvd0xheWVyKFJlbmRlckxheWVyKiwgY29u c3QgSW50UmVjdCYgdmlzaWJsZVJlY3QsIGNvbnN0IEludFJlY3QmIGV4cG9zZVJlY3QpOwotCiAg ICAgV0VCQ09SRV9FWFBPUlQgaW50IHByZWZlcnJlZEhlaWdodCgpIGNvbnN0OwogICAgIFdFQkNP UkVfRVhQT1JUIHZvaWQgdXBkYXRlTGF5b3V0KCkgY29uc3Q7CiAgICAgV0VCQ09SRV9FWFBPUlQg TlNSZWN0IGNhcmV0UmVjdCgpOwpAQCAtMzMzLDE3ICszMzAsMTAgQEAgcHJpdmF0ZToKICAgICBi b29sIGhpdFRlc3RSZXN1bHRBdFZpZXdwb3J0TG9jYXRpb24oY29uc3QgRmxvYXRQb2ludCYgdmll d3BvcnRMb2NhdGlvbiwgSGl0VGVzdFJlc3VsdCYsIEludFBvaW50JiBjZW50ZXIpOwogICAgIE5v ZGUqIHF1YWxpZnlpbmdOb2RlQXRWaWV3cG9ydExvY2F0aW9uKGNvbnN0IEZsb2F0UG9pbnQmIHZp ZXdwb3J0TG9jYXRpb24sIEZsb2F0UG9pbnQmIGFkanVzdGVkVmlld3BvcnRMb2NhdGlvbiwgY29u c3QgTm9kZVF1YWxpZmllciYsIGJvb2wgc2hvdWxkQXBwcm94aW1hdGUpOwogCi0gICAgdm9pZCBv dmVyZmxvd0F1dG9TY3JvbGxUaW1lckZpcmVkKCk7Ci0gICAgdm9pZCBzdGFydE92ZXJmbG93QXV0 b1Njcm9sbChjb25zdCBJbnRQb2ludCYpOwotICAgIGludCBjaGVja092ZXJmbG93U2Nyb2xsKE92 ZXJmbG93U2Nyb2xsQWN0aW9uKTsKLQogICAgIHZvaWQgc2V0VGltZXJzUGF1c2VkSW50ZXJuYWwo Ym9vbCk7CiAKLSAgICBUaW1lciBtX292ZXJmbG93QXV0b1Njcm9sbFRpbWVyOwotICAgIGZsb2F0 IG1fb3ZlcmZsb3dBdXRvU2Nyb2xsRGVsdGE7Ci0gICAgSW50UG9pbnQgbV9vdmVyZmxvd0F1dG9T Y3JvbGxQb3M7CiAgICAgVmlld3BvcnRBcmd1bWVudHMgbV92aWV3cG9ydEFyZ3VtZW50czsKLSAg ICBib29sIG1fc2VsZWN0aW9uQ2hhbmdlQ2FsbGJhY2tzRGlzYWJsZWQ7CisgICAgYm9vbCBtX3Nl bGVjdGlvbkNoYW5nZUNhbGxiYWNrc0Rpc2FibGVkIHsgZmFsc2UgfTsKICAgICBWaXNpYmxlU2Vs ZWN0aW9uIG1fcmFuZ2VkU2VsZWN0aW9uQmFzZTsKICAgICBWaXNpYmxlU2VsZWN0aW9uIG1fcmFu Z2VkU2VsZWN0aW9uSW5pdGlhbEV4dGVudDsKICNlbmRpZgpAQCAtMzUxLDcgKzM0MSw3IEBAIHBy aXZhdGU6CiAgICAgZmxvYXQgbV9wYWdlWm9vbUZhY3RvcjsKICAgICBmbG9hdCBtX3RleHRab29t RmFjdG9yOwogCi0gICAgaW50IG1fYWN0aXZlRE9NT2JqZWN0c0FuZEFuaW1hdGlvbnNTdXNwZW5k ZWRDb3VudDsKKyAgICBpbnQgbV9hY3RpdmVET01PYmplY3RzQW5kQW5pbWF0aW9uc1N1c3BlbmRl ZENvdW50IHsgMCB9OwogICAgIGJvb2wgbV9kb2N1bWVudElzQmVpbmdSZXBsYWNlZCB7IGZhbHNl IH07CiAgICAgdW5zaWduZWQgbV9uYXZpZ2F0aW9uRGlzYWJsZUNvdW50IHsgMCB9OwogICAgIHVu c2lnbmVkIG1fc2VsZk9ubHlSZWZDb3VudCB7IDAgfTsK