152633 2015-12-31 20:05:09 -0800 Change RenderLayer::scrollTo() to take a ScrollPosition 2015-12-31 23:53:55 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 simon.fraser simon.fraser commit-queue esprehn+autocc glenn kondapallykalyan oldest_to_newest 1151830 0 simon.fraser 2015-12-31 20:05:09 -0800 Change RenderLayer::scrollTo() to take a ScrollPosition 1151831 1 268065 simon.fraser 2015-12-31 20:22:44 -0800 Created attachment 268065 Patch 1151841 2 268069 simon.fraser 2015-12-31 22:28:47 -0800 Created attachment 268069 Patch 1151846 3 268069 commit-queue 2015-12-31 23:53:51 -0800 Comment on attachment 268069 Patch Clearing flags on attachment: 268069 Committed r194478: <http://trac.webkit.org/changeset/194478> 1151847 4 commit-queue 2015-12-31 23:53:55 -0800 All reviewed patches have been landed. Closing bug. 268065 2015-12-31 20:22:44 -0800 2015-12-31 22:28:44 -0800 Patch bug-152633-20151231202210.patch text/plain 4768 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMTk0NDc3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDg2MGVkZGE4ZjMyZDJm Y2Y1NWM3OTBmMTQyNGQ5ZDBhMTNjOTMyOS4uYjljMDIxMzhjODkyMjIyMDM3MWZlZTBlZDhmM2E1 ZWEyMjk0YmM5NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDIwIEBACiAyMDE1LTEyLTMxICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCisgICAgICAgIENoYW5nZSBSZW5k ZXJMYXllcjo6c2Nyb2xsVG8oKSB0byB0YWtlIGEgU2Nyb2xsUG9zaXRpb24KKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1MjYzMworCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorICAgICAgICAKKyAgICAgICAgUmVuZGVyTGF5ZXI6 OnNjcm9sbFRvKCkgdG9vayB4IGFuZCB5IG9mZnNldHMuIENoYW5nZSB0aGlzIHRvIHRha2UgYSBw b3NpdGlvbiwKKyAgICAgICAgbGlrZSBTY3JvbGxWaWV3OjpzY3JvbGxUbygpIGFuZCBmaXggdGhl IG9uZSBjYWxsZXIuCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXI6OnNjcm9sbFRvKToKKyAgICAgICAgKFdlYkNvcmU6 OlJlbmRlckxheWVyOjpzZXRTY3JvbGxPZmZzZXQpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5k ZXJMYXllci5oOgorCisyMDE1LTEyLTMxICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBw bGUuY29tPgorCiAgICAgICAgIFJlbmFtZSBkb2N1bWVudFNjcm9sbE9mZnNldFJlbGF0aXZlVG8q IGZ1bmN0aW9ucwogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTUyNjMyCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJM YXllci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwCmluZGV4 IDRlNDYyMzZmMmM0N2VhNTdkYzU1YmU4MTEyODE1MmFmNGViZjA0ZWQuLmI4MWRhY2M0OTczODIx NTg4ZTg1MWVhOGM4ZjllYTQ2NmQ1M2EzNmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJMYXllci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlckxheWVyLmNwcApAQCAtMjMyNiw5ICsyMzI2LDcgQEAgdm9pZCBSZW5kZXJMYXllcjo6c2Ny b2xsVG9PZmZzZXQoY29uc3QgU2Nyb2xsT2Zmc2V0JiBzY3JvbGxPZmZzZXQsIFNjcm9sbE9mZnNl dEMKICAgICAgICAgc2Nyb2xsVG9PZmZzZXRXaXRob3V0QW5pbWF0aW9uKG5ld1Njcm9sbE9mZnNl dCk7CiB9CiAKLS8vIHggYW5kIHkgYXJlIHNjcm9sbCBvZmZzZXQgdmFsdWVzCi0vLyBGSVhNRTog dXNlIGEgU2Nyb2xsT2Zmc2V0LCBvciBjaGFuZ2UgdGhpcyB0byB0YWtlIGEgU2Nyb2xsUG9zaXRp b24uCi12b2lkIFJlbmRlckxheWVyOjpzY3JvbGxUbyhpbnQgeCwgaW50IHkpCit2b2lkIFJlbmRl ckxheWVyOjpzY3JvbGxUbyhjb25zdCBTY3JvbGxQb3NpdGlvbiYgcG9zaXRpb24pCiB7CiAgICAg UmVuZGVyQm94KiBib3ggPSByZW5kZXJCb3goKTsKICAgICBpZiAoIWJveCkKQEAgLTIzNTYsOCAr MjM1NCw3IEBAIHZvaWQgUmVuZGVyTGF5ZXI6OnNjcm9sbFRvKGludCB4LCBpbnQgeSkKICAgICAv LyBjb21wbGljYXRlZCAoc2luY2UgaXQgd2lsbCBpbnZvbHZlIHRlc3Rpbmcgd2hldGhlciBvdXIg bGF5ZXIKICAgICAvLyBpcyBlaXRoZXIgb2NjbHVkZWQgYnkgYW5vdGhlciBsYXllciBvciBjbGlw cGVkIGJ5IGFuIGVuY2xvc2luZwogICAgIC8vIGxheWVyIG9yIGNvbnRhaW5zIGZpeGVkIGJhY2tn cm91bmRzLCBldGMuKS4KLSAgICBTY3JvbGxQb3NpdGlvbiBuZXdTY3JvbGxQb3NpdGlvbiA9IHNj cm9sbFBvc2l0aW9uRnJvbU9mZnNldChTY3JvbGxPZmZzZXQoeCwgeSkpOwotICAgIGlmIChtX3Nj cm9sbFBvc2l0aW9uID09IG5ld1Njcm9sbFBvc2l0aW9uKSB7CisgICAgaWYgKG1fc2Nyb2xsUG9z aXRpb24gPT0gcG9zaXRpb24pIHsKICNpZiBQTEFURk9STShJT1MpCiAgICAgICAgIGlmIChtX3Jl cXVpcmVzU2Nyb2xsQm91bmRzT3JpZ2luVXBkYXRlKQogICAgICAgICAgICAgdXBkYXRlQ29tcG9z aXRpbmdMYXllcnNBZnRlclNjcm9sbCgpOwpAQCAtMjM2Niw3ICsyMzYzLDcgQEAgdm9pZCBSZW5k ZXJMYXllcjo6c2Nyb2xsVG8oaW50IHgsIGludCB5KQogICAgIH0KICAgICAKICAgICBTY3JvbGxQ b3NpdGlvbiBvbGRQb3NpdGlvbiA9IEludFBvaW50KG1fc2Nyb2xsUG9zaXRpb24pOwotICAgIG1f c2Nyb2xsUG9zaXRpb24gPSBuZXdTY3JvbGxQb3NpdGlvbjsKKyAgICBtX3Njcm9sbFBvc2l0aW9u ID0gcG9zaXRpb247CiAKICAgICBSZW5kZXJWaWV3JiB2aWV3ID0gcmVuZGVyZXIoKS52aWV3KCk7 CiAKQEAgLTI0MTcsNyArMjQxNCw3IEBAIHZvaWQgUmVuZGVyTGF5ZXI6OnNjcm9sbFRvKGludCB4 LCBpbnQgeSkKICAgICAvLyBTY2hlZHVsZSB0aGUgc2Nyb2xsIGFuZCBzY3JvbGwtcmVsYXRlZCBE T00gZXZlbnRzLgogICAgIGlmIChFbGVtZW50KiBlbGVtZW50ID0gcmVuZGVyZXIoKS5lbGVtZW50 KCkpIHsKICAgICAgICAgZWxlbWVudC0+ZG9jdW1lbnQoKS5ldmVudFF1ZXVlKCkuZW5xdWV1ZU9y RGlzcGF0Y2hTY3JvbGxFdmVudCgqZWxlbWVudCk7Ci0gICAgICAgIGVsZW1lbnQtPmRvY3VtZW50 KCkuc2VuZFdpbGxSZXZlYWxFZGdlRXZlbnRzSWZOZWVkZWQob2xkUG9zaXRpb24sIG5ld1Njcm9s bFBvc2l0aW9uLCB2aXNpYmxlQ29udGVudFJlY3QoKSwgY29udGVudHNTaXplKCksIGVsZW1lbnQp OworICAgICAgICBlbGVtZW50LT5kb2N1bWVudCgpLnNlbmRXaWxsUmV2ZWFsRWRnZUV2ZW50c0lm TmVlZGVkKG9sZFBvc2l0aW9uLCBwb3NpdGlvbiwgdmlzaWJsZUNvbnRlbnRSZWN0KCksIGNvbnRl bnRzU2l6ZSgpLCBlbGVtZW50KTsKICAgICB9CiAKICAgICBpZiAoc2Nyb2xsc092ZXJmbG93KCkp CkBAIC0yNzE5LDkgKzI3MTYsOSBAQCBpbnQgUmVuZGVyTGF5ZXI6OnNjcm9sbFNpemUoU2Nyb2xs YmFyT3JpZW50YXRpb24gb3JpZW50YXRpb24pIGNvbnN0CiAgICAgcmV0dXJuIHNjcm9sbGJhciA/ IChzY3JvbGxiYXItPnRvdGFsU2l6ZSgpIC0gc2Nyb2xsYmFyLT52aXNpYmxlU2l6ZSgpKSA6IDA7 CiB9CiAKLXZvaWQgUmVuZGVyTGF5ZXI6OnNldFNjcm9sbE9mZnNldChjb25zdCBJbnRQb2ludCYg b2Zmc2V0KQordm9pZCBSZW5kZXJMYXllcjo6c2V0U2Nyb2xsT2Zmc2V0KGNvbnN0IFNjcm9sbE9m ZnNldCYgb2Zmc2V0KQogewotICAgIHNjcm9sbFRvKG9mZnNldC54KCksIG9mZnNldC55KCkpOwor ICAgIHNjcm9sbFRvKHNjcm9sbFBvc2l0aW9uRnJvbU9mZnNldChvZmZzZXQpKTsKIH0KIAogaW50 IFJlbmRlckxheWVyOjpzY3JvbGxQb3NpdGlvbihTY3JvbGxiYXIqIHNjcm9sbGJhcikgY29uc3QK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5oIGIvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmgKaW5kZXggZGQ2ZDg5OTFlZTJmOTMx YTA1OWU2OGRmNTY5N2QyOGRlYzAyNTRjYS4uY2M0NTY5MmFhODJlZDY0NjFiY2M2ODhmZjY3ODBj ZGM0Mzk4YzY5NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxh eWVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmgKQEAgLTg2 Myw3ICs4NjMsNyBAQCBwcml2YXRlOgogICAgIHZpcnR1YWwgSW50UG9pbnQgY29udmVydEZyb21T Y3JvbGxiYXJUb0NvbnRhaW5pbmdWaWV3KGNvbnN0IFNjcm9sbGJhciosIGNvbnN0IEludFBvaW50 JikgY29uc3Qgb3ZlcnJpZGU7CiAgICAgdmlydHVhbCBJbnRQb2ludCBjb252ZXJ0RnJvbUNvbnRh aW5pbmdWaWV3VG9TY3JvbGxiYXIoY29uc3QgU2Nyb2xsYmFyKiwgY29uc3QgSW50UG9pbnQmKSBj b25zdCBvdmVycmlkZTsKICAgICB2aXJ0dWFsIGludCBzY3JvbGxTaXplKFNjcm9sbGJhck9yaWVu dGF0aW9uKSBjb25zdCBvdmVycmlkZTsKLSAgICB2aXJ0dWFsIHZvaWQgc2V0U2Nyb2xsT2Zmc2V0 KGNvbnN0IEludFBvaW50Jikgb3ZlcnJpZGU7CisgICAgdmlydHVhbCB2b2lkIHNldFNjcm9sbE9m ZnNldChjb25zdCBTY3JvbGxPZmZzZXQmKSBvdmVycmlkZTsKIAogICAgIHZpcnR1YWwgU2Nyb2xs UG9zaXRpb24gc2Nyb2xsUG9zaXRpb24oKSBjb25zdCBvdmVycmlkZSB7IHJldHVybiBtX3Njcm9s bFBvc2l0aW9uOyB9CiAgICAgdmlydHVhbCBTY3JvbGxQb3NpdGlvbiBtYXhpbXVtU2Nyb2xsUG9z aXRpb24oKSBjb25zdCBvdmVycmlkZTsKQEAgLTg5Miw3ICs4OTIsNyBAQCBwcml2YXRlOgogICAg IExheW91dFJlY3Qgc2Nyb2xsQ29ybmVyQW5kUmVzaXplclJlY3QoKSBjb25zdDsKIAogICAgIC8v IE5PVEU6IFRoaXMgc2hvdWxkIG9ubHkgYmUgY2FsbGVkIGJ5IHRoZSBvdmVycmlkZW4gc2V0U2Ny b2xsT2Zmc2V0IGZyb20gU2Nyb2xsYWJsZUFyZWEuCi0gICAgdm9pZCBzY3JvbGxUbyhpbnQsIGlu dCk7CisgICAgdm9pZCBzY3JvbGxUbyhjb25zdCBTY3JvbGxQb3NpdGlvbiYpOwogICAgIHZvaWQg dXBkYXRlQ29tcG9zaXRpbmdMYXllcnNBZnRlclNjcm9sbCgpOwogCiAgICAgSW50U2l6ZSBzY3Jv bGxiYXJPZmZzZXQoY29uc3QgU2Nyb2xsYmFyKikgY29uc3Q7Cg== 268069 2015-12-31 22:28:47 -0800 2015-12-31 23:53:51 -0800 Patch bug-152633-20151231222812.patch text/plain 6531 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMTk0NDc3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDg2MGVkZGE4ZjMyZDJm Y2Y1NWM3OTBmMTQyNGQ5ZDBhMTNjOTMyOS4uMWYxZDk3OWM4ZjMzNmI4MjIzMzAxYzNmM2IxN2M1 ZTMwYjcwNDNhZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI0IEBACiAyMDE1LTEyLTMxICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCisgICAgICAgIENoYW5nZSBSZW5k ZXJMYXllcjo6c2Nyb2xsVG8oKSB0byB0YWtlIGEgU2Nyb2xsUG9zaXRpb24KKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1MjYzMworCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorICAgICAgICAKKyAgICAgICAgUmVuZGVyTGF5ZXI6 OnNjcm9sbFRvKCkgdG9vayB4IGFuZCB5IG9mZnNldHMuIENoYW5nZSB0aGlzIHRvIHRha2UgYSBw b3NpdGlvbiwKKyAgICAgICAgbGlrZSBTY3JvbGxWaWV3OjpzY3JvbGxUbygpIGFuZCBmaXggdGhl IG9uZSBjYWxsZXIuCisgICAgICAgIAorICAgICAgICBQcmVzZXJ2ZSB0aGUgZHViaW91cyBiZWhh dmlvciBvZiB0aGUgYWRqdXN0Rm9ySU9TQ2FyZXRXaGVuU2Nyb2xsaW5nKCkgY29kZSBieSBjb252 ZXJ0aW5nCisgICAgICAgIHRvIGFuZCBmcm9tIG9mZnNldHMsIGV2ZW4gdGhvdWdoIHRlc3Rpbmcg c3VnZ2VzdHMgdGhhdCB0aGlzIGNvZGUgY2FuIGp1c3QgYmUgcmVtb3ZlZCwKKyAgICAgICAgZXZl biB3aXRoIGFuIGV4dHJhIHdpZGUgY2FyZXQgZm9yIHRlc3RpbmcuCisKKyAgICAgICAgKiByZW5k ZXJpbmcvUmVuZGVyTGF5ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXI6OnNj cm9sbFRvKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyOjpzZXRTY3JvbGxPZmZzZXQp OgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJMYXllci5oOgorCisyMDE1LTEyLTMxICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCiAgICAgICAgIFJlbmFtZSBkb2N1 bWVudFNjcm9sbE9mZnNldFJlbGF0aXZlVG8qIGZ1bmN0aW9ucwogICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTUyNjMyCiAKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyTGF5ZXIuY3BwCmluZGV4IDRlNDYyMzZmMmM0N2VhNTdkYzU1YmU4MTEyODE1 MmFmNGViZjA0ZWQuLmRkNTJhYzY2OGU5MDQ3NDk2OGU4YTE5NzY4MjI2Mjg2ZjU2YzRjMjggMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcApAQCAtMjMyNiwzOCArMjMy NiwzNyBAQCB2b2lkIFJlbmRlckxheWVyOjpzY3JvbGxUb09mZnNldChjb25zdCBTY3JvbGxPZmZz ZXQmIHNjcm9sbE9mZnNldCwgU2Nyb2xsT2Zmc2V0QwogICAgICAgICBzY3JvbGxUb09mZnNldFdp dGhvdXRBbmltYXRpb24obmV3U2Nyb2xsT2Zmc2V0KTsKIH0KIAotLy8geCBhbmQgeSBhcmUgc2Ny b2xsIG9mZnNldCB2YWx1ZXMKLS8vIEZJWE1FOiB1c2UgYSBTY3JvbGxPZmZzZXQsIG9yIGNoYW5n ZSB0aGlzIHRvIHRha2UgYSBTY3JvbGxQb3NpdGlvbi4KLXZvaWQgUmVuZGVyTGF5ZXI6OnNjcm9s bFRvKGludCB4LCBpbnQgeSkKK3ZvaWQgUmVuZGVyTGF5ZXI6OnNjcm9sbFRvKGNvbnN0IFNjcm9s bFBvc2l0aW9uJiBwb3NpdGlvbikKIHsKICAgICBSZW5kZXJCb3gqIGJveCA9IHJlbmRlckJveCgp OwogICAgIGlmICghYm94KQogICAgICAgICByZXR1cm47CiAKKyAgICBTY3JvbGxQb3NpdGlvbiBu ZXdQb3NpdGlvbiA9IHBvc2l0aW9uOwogICAgIGlmIChib3gtPnN0eWxlKCkub3ZlcmZsb3dYKCkg IT0gT01BUlFVRUUpIHsKICAgICAgICAgLy8gRW5zdXJlIHRoYXQgdGhlIGRpbWVuc2lvbnMgd2ls bCBiZSBjb21wdXRlZCBpZiB0aGV5IG5lZWQgdG8gYmUgKGZvciBvdmVyZmxvdzpoaWRkZW4gYmxv Y2tzKS4KICAgICAgICAgaWYgKG1fc2Nyb2xsRGltZW5zaW9uc0RpcnR5KQogICAgICAgICAgICAg Y29tcHV0ZVNjcm9sbERpbWVuc2lvbnMoKTsKICNpZiBQTEFURk9STShJT1MpCiAgICAgICAgIGlm IChhZGp1c3RGb3JJT1NDYXJldFdoZW5TY3JvbGxpbmcoKSkgewotICAgICAgICAgICAgaW50IG1h eFggPSBzY3JvbGxXaWR0aCgpIC0gYm94LT5jbGllbnRXaWR0aCgpOwotICAgICAgICAgICAgaWYg KHggPiBtYXhYIC0gY2FyZXRXaWR0aCkgewotICAgICAgICAgICAgICAgIHggKz0gY2FyZXRXaWR0 aDsKLSAgICAgICAgICAgICAgICBpZiAoeCA8PSBjYXJldFdpZHRoKQotICAgICAgICAgICAgICAg ICAgICB4ID0gMDsKLSAgICAgICAgICAgIH0gZWxzZSBpZiAoeCA8IG1fc2Nyb2xsUG9zaXRpb24u eCgpIC0gY2FyZXRXaWR0aCkKLSAgICAgICAgICAgICAgICB4IC09IGNhcmV0V2lkdGg7CisgICAg ICAgICAgICAvLyBGSVhNRTogSXQncyBub3QgY2xlYXIgd2hhdCB0aGlzIGNvZGUgaXMgdHJ5aW5n IHRvIGRvLiBCZWhhdmlvciBzZWVtcyByZWFzb25hYmxlIHdpdGggaXQgcmVtb3ZlZC4KKyAgICAg ICAgICAgIGludCBtYXhPZmZzZXQgPSBzY3JvbGxXaWR0aCgpIC0gYm94LT5jbGllbnRXaWR0aCgp OworICAgICAgICAgICAgU2Nyb2xsT2Zmc2V0IG5ld09mZnNldCA9IHNjcm9sbE9mZnNldEZyb21Q b3NpdGlvbihuZXdQb3NpdGlvbik7CisgICAgICAgICAgICBpbnQgc2Nyb2xsWE9mZnNldCA9IG5l d09mZnNldC54KCk7CisgICAgICAgICAgICBpZiAoc2Nyb2xsWE9mZnNldCA+IG1heE9mZnNldCAt IGNhcmV0V2lkdGgpIHsKKyAgICAgICAgICAgICAgICBzY3JvbGxYT2Zmc2V0ICs9IGNhcmV0V2lk dGg7CisgICAgICAgICAgICAgICAgaWYgKHNjcm9sbFhPZmZzZXQgPD0gY2FyZXRXaWR0aCkKKyAg ICAgICAgICAgICAgICAgICAgc2Nyb2xsWE9mZnNldCA9IDA7CisgICAgICAgICAgICB9IGVsc2Ug aWYgKHNjcm9sbFhPZmZzZXQgPCBtX3Njcm9sbFBvc2l0aW9uLngoKSAtIGNhcmV0V2lkdGgpCisg ICAgICAgICAgICAgICAgc2Nyb2xsWE9mZnNldCAtPSBjYXJldFdpZHRoOworCisgICAgICAgICAg ICBuZXdPZmZzZXQuc2V0WChzY3JvbGxYT2Zmc2V0KTsKKyAgICAgICAgICAgIG5ld1Bvc2l0aW9u ID0gc2Nyb2xsUG9zaXRpb25Gcm9tT2Zmc2V0KG5ld09mZnNldCk7CiAgICAgICAgIH0KICNlbmRp ZgogICAgIH0KICAgICAKLSAgICAvLyBGSVhNRTogRXZlbnR1YWxseSwgd2Ugd2lsbCB3YW50IHRv IHBlcmZvcm0gYSBibGl0LiAgRm9yIG5vdyBuZXZlcgotICAgIC8vIGJsaXQsIHNpbmNlIHRoZSBj aGVjayBmb3IgYmxpdHRpbmcgaXMgZ29pbmcgdG8gYmUgdmVyeQotICAgIC8vIGNvbXBsaWNhdGVk IChzaW5jZSBpdCB3aWxsIGludm9sdmUgdGVzdGluZyB3aGV0aGVyIG91ciBsYXllcgotICAgIC8v IGlzIGVpdGhlciBvY2NsdWRlZCBieSBhbm90aGVyIGxheWVyIG9yIGNsaXBwZWQgYnkgYW4gZW5j bG9zaW5nCi0gICAgLy8gbGF5ZXIgb3IgY29udGFpbnMgZml4ZWQgYmFja2dyb3VuZHMsIGV0Yy4p LgotICAgIFNjcm9sbFBvc2l0aW9uIG5ld1Njcm9sbFBvc2l0aW9uID0gc2Nyb2xsUG9zaXRpb25G cm9tT2Zmc2V0KFNjcm9sbE9mZnNldCh4LCB5KSk7Ci0gICAgaWYgKG1fc2Nyb2xsUG9zaXRpb24g PT0gbmV3U2Nyb2xsUG9zaXRpb24pIHsKKyAgICBpZiAobV9zY3JvbGxQb3NpdGlvbiA9PSBuZXdQ b3NpdGlvbikgewogI2lmIFBMQVRGT1JNKElPUykKICAgICAgICAgaWYgKG1fcmVxdWlyZXNTY3Jv bGxCb3VuZHNPcmlnaW5VcGRhdGUpCiAgICAgICAgICAgICB1cGRhdGVDb21wb3NpdGluZ0xheWVy c0FmdGVyU2Nyb2xsKCk7CkBAIC0yMzY2LDcgKzIzNjUsNyBAQCB2b2lkIFJlbmRlckxheWVyOjpz Y3JvbGxUbyhpbnQgeCwgaW50IHkpCiAgICAgfQogICAgIAogICAgIFNjcm9sbFBvc2l0aW9uIG9s ZFBvc2l0aW9uID0gSW50UG9pbnQobV9zY3JvbGxQb3NpdGlvbik7Ci0gICAgbV9zY3JvbGxQb3Np dGlvbiA9IG5ld1Njcm9sbFBvc2l0aW9uOworICAgIG1fc2Nyb2xsUG9zaXRpb24gPSBuZXdQb3Np dGlvbjsKIAogICAgIFJlbmRlclZpZXcmIHZpZXcgPSByZW5kZXJlcigpLnZpZXcoKTsKIApAQCAt MjQxNyw3ICsyNDE2LDcgQEAgdm9pZCBSZW5kZXJMYXllcjo6c2Nyb2xsVG8oaW50IHgsIGludCB5 KQogICAgIC8vIFNjaGVkdWxlIHRoZSBzY3JvbGwgYW5kIHNjcm9sbC1yZWxhdGVkIERPTSBldmVu dHMuCiAgICAgaWYgKEVsZW1lbnQqIGVsZW1lbnQgPSByZW5kZXJlcigpLmVsZW1lbnQoKSkgewog ICAgICAgICBlbGVtZW50LT5kb2N1bWVudCgpLmV2ZW50UXVldWUoKS5lbnF1ZXVlT3JEaXNwYXRj aFNjcm9sbEV2ZW50KCplbGVtZW50KTsKLSAgICAgICAgZWxlbWVudC0+ZG9jdW1lbnQoKS5zZW5k V2lsbFJldmVhbEVkZ2VFdmVudHNJZk5lZWRlZChvbGRQb3NpdGlvbiwgbmV3U2Nyb2xsUG9zaXRp b24sIHZpc2libGVDb250ZW50UmVjdCgpLCBjb250ZW50c1NpemUoKSwgZWxlbWVudCk7CisgICAg ICAgIGVsZW1lbnQtPmRvY3VtZW50KCkuc2VuZFdpbGxSZXZlYWxFZGdlRXZlbnRzSWZOZWVkZWQo b2xkUG9zaXRpb24sIG5ld1Bvc2l0aW9uLCB2aXNpYmxlQ29udGVudFJlY3QoKSwgY29udGVudHNT aXplKCksIGVsZW1lbnQpOwogICAgIH0KIAogICAgIGlmIChzY3JvbGxzT3ZlcmZsb3coKSkKQEAg LTI3MTksOSArMjcxOCw5IEBAIGludCBSZW5kZXJMYXllcjo6c2Nyb2xsU2l6ZShTY3JvbGxiYXJP cmllbnRhdGlvbiBvcmllbnRhdGlvbikgY29uc3QKICAgICByZXR1cm4gc2Nyb2xsYmFyID8gKHNj cm9sbGJhci0+dG90YWxTaXplKCkgLSBzY3JvbGxiYXItPnZpc2libGVTaXplKCkpIDogMDsKIH0K IAotdm9pZCBSZW5kZXJMYXllcjo6c2V0U2Nyb2xsT2Zmc2V0KGNvbnN0IEludFBvaW50JiBvZmZz ZXQpCit2b2lkIFJlbmRlckxheWVyOjpzZXRTY3JvbGxPZmZzZXQoY29uc3QgU2Nyb2xsT2Zmc2V0 JiBvZmZzZXQpCiB7Ci0gICAgc2Nyb2xsVG8ob2Zmc2V0LngoKSwgb2Zmc2V0LnkoKSk7CisgICAg c2Nyb2xsVG8oc2Nyb2xsUG9zaXRpb25Gcm9tT2Zmc2V0KG9mZnNldCkpOwogfQogCiBpbnQgUmVu ZGVyTGF5ZXI6OnNjcm9sbFBvc2l0aW9uKFNjcm9sbGJhciogc2Nyb2xsYmFyKSBjb25zdApkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmggYi9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuaAppbmRleCBkZDZkODk5MWVlMmY5MzFhMDU5 ZTY4ZGY1Njk3ZDI4ZGVjMDI1NGNhLi5jYzQ1NjkyYWE4MmVkNjQ2MWJjYzY4OGZmNjc4MGNkYzQz OThjNjk2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIu aAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuaApAQCAtODYzLDcg Kzg2Myw3IEBAIHByaXZhdGU6CiAgICAgdmlydHVhbCBJbnRQb2ludCBjb252ZXJ0RnJvbVNjcm9s bGJhclRvQ29udGFpbmluZ1ZpZXcoY29uc3QgU2Nyb2xsYmFyKiwgY29uc3QgSW50UG9pbnQmKSBj b25zdCBvdmVycmlkZTsKICAgICB2aXJ0dWFsIEludFBvaW50IGNvbnZlcnRGcm9tQ29udGFpbmlu Z1ZpZXdUb1Njcm9sbGJhcihjb25zdCBTY3JvbGxiYXIqLCBjb25zdCBJbnRQb2ludCYpIGNvbnN0 IG92ZXJyaWRlOwogICAgIHZpcnR1YWwgaW50IHNjcm9sbFNpemUoU2Nyb2xsYmFyT3JpZW50YXRp b24pIGNvbnN0IG92ZXJyaWRlOwotICAgIHZpcnR1YWwgdm9pZCBzZXRTY3JvbGxPZmZzZXQoY29u c3QgSW50UG9pbnQmKSBvdmVycmlkZTsKKyAgICB2aXJ0dWFsIHZvaWQgc2V0U2Nyb2xsT2Zmc2V0 KGNvbnN0IFNjcm9sbE9mZnNldCYpIG92ZXJyaWRlOwogCiAgICAgdmlydHVhbCBTY3JvbGxQb3Np dGlvbiBzY3JvbGxQb3NpdGlvbigpIGNvbnN0IG92ZXJyaWRlIHsgcmV0dXJuIG1fc2Nyb2xsUG9z aXRpb247IH0KICAgICB2aXJ0dWFsIFNjcm9sbFBvc2l0aW9uIG1heGltdW1TY3JvbGxQb3NpdGlv bigpIGNvbnN0IG92ZXJyaWRlOwpAQCAtODkyLDcgKzg5Miw3IEBAIHByaXZhdGU6CiAgICAgTGF5 b3V0UmVjdCBzY3JvbGxDb3JuZXJBbmRSZXNpemVyUmVjdCgpIGNvbnN0OwogCiAgICAgLy8gTk9U RTogVGhpcyBzaG91bGQgb25seSBiZSBjYWxsZWQgYnkgdGhlIG92ZXJyaWRlbiBzZXRTY3JvbGxP ZmZzZXQgZnJvbSBTY3JvbGxhYmxlQXJlYS4KLSAgICB2b2lkIHNjcm9sbFRvKGludCwgaW50KTsK KyAgICB2b2lkIHNjcm9sbFRvKGNvbnN0IFNjcm9sbFBvc2l0aW9uJik7CiAgICAgdm9pZCB1cGRh dGVDb21wb3NpdGluZ0xheWVyc0FmdGVyU2Nyb2xsKCk7CiAKICAgICBJbnRTaXplIHNjcm9sbGJh ck9mZnNldChjb25zdCBTY3JvbGxiYXIqKSBjb25zdDsK