152632 2015-12-31 19:02:16 -0800 Rename documentScrollOffsetRelativeTo* functions 2015-12-31 19:18:33 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 simon.fraser simon.fraser bdakin commit-queue esprehn+autocc glenn kondapallykalyan simon.fraser thorton zalan oldest_to_newest 1151822 0 simon.fraser 2015-12-31 19:02:16 -0800 Rename documentScrollOffsetRelativeTo* functions 1151823 1 268063 simon.fraser 2015-12-31 19:03:35 -0800 Created attachment 268063 Patch 1151825 2 simon.fraser 2015-12-31 19:18:25 -0800 https://trac.webkit.org/changeset/194477 268063 2015-12-31 19:03:35 -0800 2015-12-31 19:18:33 -0800 Patch bug-152632-20151231190258.patch text/plain 12347 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMTk0NDY2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNGM3N2U1MThmODZmZDA1 MzQyZmQwNmU4NGI1MjY4YjZkNDIyZTAyNC4uNThmYzczYTFlYTdlODFlYTMyNmNmOWM2OGU2Y2Yy NTgxZDAwZGEzNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI5IEBACiAyMDE1LTEyLTMxICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCisgICAgICAgIFJlbmFtZSBkb2N1 bWVudFNjcm9sbE9mZnNldFJlbGF0aXZlVG8qIGZ1bmN0aW9ucworICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTUyNjMyCisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgU2Nyb2xsVmlldzo6ZG9jdW1lbnRTY3JvbGxP ZmZzZXRSZWxhdGl2ZVRvKiBmdW5jdGlvbnMgcmV0dXJuIHNjcm9sbCBwb3NpdGlvbnMsCisgICAg ICAgIG5vdCBvZmZzZXRzLCBzbyByZW5hbWUgdGhlbSBhbmQgZml4IHRoZWlyIHJldHVybiB0eXBl cywgYW5kIGZpeCBjYWxsZXJzLiBNYWtlCisgICAgICAgIHRoZWlyIGNvZGUgbW9yZSBzaW1pbGFy LgorCisgICAgICAgICogcGxhdGZvcm0vU2Nyb2xsVmlldy5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpTY3JvbGxWaWV3Ojpkb2N1bWVudFNjcm9sbFBvc2l0aW9uUmVsYXRpdmVUb1ZpZXdPcmlnaW4p OgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsVmlldzo6ZG9jdW1lbnRTY3JvbGxQb3NpdGlvblJl bGF0aXZlVG9TY3JvbGxhYmxlQXJlYU9yaWdpbik6CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxW aWV3Ojp2aWV3VG9Db250ZW50cyk6CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxWaWV3Ojpjb250 ZW50c1RvVmlldyk6CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxWaWV3Ojpkb2N1bWVudFNjcm9s bE9mZnNldFJlbGF0aXZlVG9WaWV3T3JpZ2luKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6 OlNjcm9sbFZpZXc6OmRvY3VtZW50U2Nyb2xsT2Zmc2V0UmVsYXRpdmVUb1Njcm9sbGFibGVBcmVh T3JpZ2luKTogRGVsZXRlZC4KKyAgICAgICAgKiBwbGF0Zm9ybS9TY3JvbGxWaWV3Lmg6CisgICAg ICAgICogcmVuZGVyaW5nL1JlbmRlckJveE1vZGVsT2JqZWN0LmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OlJlbmRlckJveE1vZGVsT2JqZWN0OjpjYWxjdWxhdGVCYWNrZ3JvdW5kSW1hZ2VHZW9tZXRy eSk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OlJlbmRlckxheWVyOjpzY3JvbGxSZWN0VG9WaXNpYmxlKToKKworMjAxNS0xMi0zMSAgU2lt b24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KKwogICAgICAgICBNb3JlIHNjcm9s bE9mZnNldC9zY3JvbGxQb3NpdGlvbiBkaXNhbWJpZ3VhdGlvbiwgaW4gUmVuZGVyTGF5ZXIKICAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1MjYxNwogCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFu Z2VMb2cKaW5kZXggMTczYTU1MTE4MjNjM2E5OGJhNTIzYzdiZDA3ZGM0M2I0NmUyNjlkYS4uOTMx YjQ1ZDcxYjFkZGIyNGMxOWUwMmFjYjA3NjExN2JkNWM0NWVkYyAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwz ICsxLDE4IEBACisyMDE1LTEyLTMxICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUu Y29tPgorCisgICAgICAgIFJlbmFtZSBkb2N1bWVudFNjcm9sbE9mZnNldFJlbGF0aXZlVG8qIGZ1 bmN0aW9ucworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTUyNjMyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg U2Nyb2xsVmlldzo6ZG9jdW1lbnRTY3JvbGxPZmZzZXRSZWxhdGl2ZVRvKiBmdW5jdGlvbnMgcmV0 dXJuIHNjcm9sbCBwb3NpdGlvbnMsCisgICAgICAgIG5vdCBvZmZzZXRzLCBzbyByZW5hbWUgdGhl bSBhbmQgZml4IHRoZWlyIHJldHVybiB0eXBlcywgYW5kIGZpeCBjYWxsZXJzLiBNYWtlCisgICAg ICAgIHRoZWlyIGNvZGUgbW9yZSBzaW1pbGFyLgorCisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQ YWdlL1dlYlBhZ2UuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlOjpkZXRlcm1pbmVQcmlt YXJ5U25hcHNob3R0ZWRQbHVnSW4pOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlOjpwbHVnSW5J bnRlcnNlY3RzU2VhcmNoUmVjdCk6CisKIDIwMTUtMTItMzAgIFNpbW9uIEZyYXNlciAgPHNpbW9u LmZyYXNlckBhcHBsZS5jb20+CiAKICAgICAgICAgQWRkIGV4cGxpY2l0IGNvbnZlcnNpb25zIGJl dHdlZW4gc2Nyb2xsT2Zmc2V0IGFuZCBzY3JvbGxQb3N0aW9uLCBhbmQgdXNlIHRoZW0gaW4gYSBm ZXcgcGxhY2VzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxWaWV3 LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbFZpZXcuY3BwCmluZGV4IDc1OTdi ZjBjNDA3NzA1ZGMzYjYzMDM2YmFhODA4Yjg5NmE4OTM5MGMuLmEzNWEzNDFjMzBiZTYyMmFkNjI4 YjNhODk2YWUzZmZiZTc1MTRiOTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L1Njcm9sbFZpZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbFZpZXcu Y3BwCkBAIC00MDIsMjAgKzQwMiwxNCBAQCBTY3JvbGxQb3NpdGlvbiBTY3JvbGxWaWV3OjphZGp1 c3RTY3JvbGxQb3NpdGlvbldpdGhpblJhbmdlKGNvbnN0IFNjcm9sbFBvc2l0aW9uJgogICAgIHJl dHVybiBzY3JvbGxQb2ludC5jb25zdHJhaW5lZEJldHdlZW4obWluaW11bVNjcm9sbFBvc2l0aW9u KCksIG1heGltdW1TY3JvbGxQb3NpdGlvbigpKTsKIH0KIAotSW50U2l6ZSBTY3JvbGxWaWV3Ojpk b2N1bWVudFNjcm9sbE9mZnNldFJlbGF0aXZlVG9WaWV3T3JpZ2luKCkgY29uc3QKK1Njcm9sbFBv c2l0aW9uIFNjcm9sbFZpZXc6OmRvY3VtZW50U2Nyb2xsUG9zaXRpb25SZWxhdGl2ZVRvVmlld09y aWdpbigpIGNvbnN0CiB7Ci0gICAgcmV0dXJuIHRvSW50U2l6ZShzY3JvbGxQb3NpdGlvbigpKSAt IEludFNpemUoMCwgaGVhZGVySGVpZ2h0KCkgKyB0b3BDb250ZW50SW5zZXQoVG9wQ29udGVudElu c2V0VHlwZTo6V2ViQ29yZU9yUGxhdGZvcm1Db250ZW50SW5zZXQpKTsKKyAgICByZXR1cm4gc2Ny b2xsUG9zaXRpb24oKSAtIEludFNpemUoMCwgaGVhZGVySGVpZ2h0KCkgKyB0b3BDb250ZW50SW5z ZXQoVG9wQ29udGVudEluc2V0VHlwZTo6V2ViQ29yZU9yUGxhdGZvcm1Db250ZW50SW5zZXQpKTsK IH0KIAotSW50UG9pbnQgU2Nyb2xsVmlldzo6ZG9jdW1lbnRTY3JvbGxQb3NpdGlvblJlbGF0aXZl VG9WaWV3T3JpZ2luKCkgY29uc3QKK1Njcm9sbFBvc2l0aW9uIFNjcm9sbFZpZXc6OmRvY3VtZW50 U2Nyb2xsUG9zaXRpb25SZWxhdGl2ZVRvU2Nyb2xsYWJsZUFyZWFPcmlnaW4oKSBjb25zdAogewot ICAgIEludFBvaW50IHNjcm9sbFBvc2l0aW9uID0gdGhpcy0+c2Nyb2xsUG9zaXRpb24oKTsKLSAg ICByZXR1cm4gSW50UG9pbnQoc2Nyb2xsUG9zaXRpb24ueCgpLCBzY3JvbGxQb3NpdGlvbi55KCkg LSBoZWFkZXJIZWlnaHQoKSAtIHRvcENvbnRlbnRJbnNldChUb3BDb250ZW50SW5zZXRUeXBlOjpX ZWJDb3JlT3JQbGF0Zm9ybUNvbnRlbnRJbnNldCkpOwotfQotCi1JbnRTaXplIFNjcm9sbFZpZXc6 OmRvY3VtZW50U2Nyb2xsT2Zmc2V0UmVsYXRpdmVUb1Njcm9sbGFibGVBcmVhT3JpZ2luKCkgY29u c3QKLXsKLSAgICByZXR1cm4gdG9JbnRTaXplKHNjcm9sbFBvc2l0aW9uKCkpIC0gSW50U2l6ZSgw LCBoZWFkZXJIZWlnaHQoKSk7CisgICAgcmV0dXJuIHNjcm9sbFBvc2l0aW9uKCkgLSBJbnRTaXpl KDAsIGhlYWRlckhlaWdodCgpKTsKIH0KIAogaW50IFNjcm9sbFZpZXc6OnNjcm9sbFNpemUoU2Ny b2xsYmFyT3JpZW50YXRpb24gb3JpZW50YXRpb24pIGNvbnN0CkBAIC04NDEsMjMgKzgzNSwyMyBA QCB2b2lkIFNjcm9sbFZpZXc6OnNjcm9sbENvbnRlbnRzU2xvd1BhdGgoY29uc3QgSW50UmVjdCYg dXBkYXRlUmVjdCkKIAogSW50UG9pbnQgU2Nyb2xsVmlldzo6dmlld1RvQ29udGVudHMoY29uc3Qg SW50UG9pbnQmIHBvaW50KSBjb25zdAogewotICAgIHJldHVybiBwb2ludCArIGRvY3VtZW50U2Ny b2xsT2Zmc2V0UmVsYXRpdmVUb1ZpZXdPcmlnaW4oKTsKKyAgICByZXR1cm4gcG9pbnQgKyB0b0lu dFNpemUoZG9jdW1lbnRTY3JvbGxQb3NpdGlvblJlbGF0aXZlVG9WaWV3T3JpZ2luKCkpOwogfQog CiBJbnRQb2ludCBTY3JvbGxWaWV3Ojpjb250ZW50c1RvVmlldyhjb25zdCBJbnRQb2ludCYgcG9p bnQpIGNvbnN0CiB7Ci0gICAgcmV0dXJuIHBvaW50IC0gZG9jdW1lbnRTY3JvbGxPZmZzZXRSZWxh dGl2ZVRvVmlld09yaWdpbigpOworICAgIHJldHVybiBwb2ludCAtIHRvSW50U2l6ZShkb2N1bWVu dFNjcm9sbFBvc2l0aW9uUmVsYXRpdmVUb1ZpZXdPcmlnaW4oKSk7CiB9CiAKIEludFJlY3QgU2Ny b2xsVmlldzo6dmlld1RvQ29udGVudHMoSW50UmVjdCByZWN0KSBjb25zdAogewotICAgIHJlY3Qu bW92ZShkb2N1bWVudFNjcm9sbE9mZnNldFJlbGF0aXZlVG9WaWV3T3JpZ2luKCkpOworICAgIHJl Y3QubW92ZUJ5KGRvY3VtZW50U2Nyb2xsUG9zaXRpb25SZWxhdGl2ZVRvVmlld09yaWdpbigpKTsK ICAgICByZXR1cm4gcmVjdDsKIH0KIAogSW50UmVjdCBTY3JvbGxWaWV3Ojpjb250ZW50c1RvVmll dyhJbnRSZWN0IHJlY3QpIGNvbnN0CiB7Ci0gICAgcmVjdC5tb3ZlKC1kb2N1bWVudFNjcm9sbE9m ZnNldFJlbGF0aXZlVG9WaWV3T3JpZ2luKCkpOworICAgIHJlY3QubW92ZUJ5KC1kb2N1bWVudFNj cm9sbFBvc2l0aW9uUmVsYXRpdmVUb1ZpZXdPcmlnaW4oKSk7CiAgICAgcmV0dXJuIHJlY3Q7CiB9 CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbFZpZXcuaCBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbFZpZXcuaAppbmRleCA3ZWEzMGEyNmJiY2M2Njk5 ZjFmZjdmNmQ5ZTkxYmZmZWJlMGI5ZTU4Li42NDFmNmY0NmU2ZjA2N2JmYjI4NDQ0OWZkMmY4OTNl MmRjM2NmZGU2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxWaWV3 LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsVmlldy5oCkBAIC0yNDgsMTgg KzI0OCwxNyBAQCBwdWJsaWM6CiAgICAgLy8gc2Nyb2xsT2Zmc2V0KCkgYW5jaG9ycyBpdHMgKDAs MCkgcG9pbnQgYXQgdGhlIFNjcm9sbGFibGVBcmVhJ3Mgb3JpZ2luLiBXaGVuIHRoZSBQYWdlIGhh cyBhCiAgICAgLy8gaGVhZGVyLCB0aGUgaGVhZGVyIGlzIHBvc2l0aW9uZWQgYXQgKDAsMCksIEFC T1ZFIHRoZSBzdGFydCBvZiB0aGUgRG9jdW1lbnQuIFNvIHdoZW4gYSBwYWdlIHdpdGgKICAgICAv LyBhIGhlYWRlciBpcyBwaW5uZWQgdG8gdGhlIHRvcCwgdGhlIHNjcm9sbE9mZnNldCgpIGlzICgw LDApLCBidXQgdGhlIERvY3VtZW50IGlzIGFjdHVhbGx5IGF0Ci0gICAgLy8gKDAsIC1oZWFkZXJI ZWlnaHQoKSkuIGRvY3VtZW50U2Nyb2xsT2Zmc2V0UmVsYXRpdmVUb1Njcm9sbGFibGVBcmVhT3Jp Z2luKCkgd2lsbCByZXR1cm4gdGhpcworICAgIC8vICgwLCAtaGVhZGVySGVpZ2h0KCkpLiBkb2N1 bWVudFNjcm9sbFBvc2l0aW9uUmVsYXRpdmVUb1Njcm9sbGFibGVBcmVhT3JpZ2luKCkgd2lsbCBy ZXR1cm4gdGhpcwogICAgIC8vIHZlcnNpb24gb2YgdGhlIG9mZnNldCwgd2hpY2ggdHJhY2tzIHRo ZSB0b3Agb2YgRG9jdW1lbnQgcmVsYXRpdmUgdG8gd2hlcmUgc2Nyb2xsaW5nIHdhcyBhY2hvcmVk LgotICAgIEludFNpemUgZG9jdW1lbnRTY3JvbGxPZmZzZXRSZWxhdGl2ZVRvU2Nyb2xsYWJsZUFy ZWFPcmlnaW4oKSBjb25zdDsKKyAgICBTY3JvbGxQb3NpdGlvbiBkb2N1bWVudFNjcm9sbFBvc2l0 aW9uUmVsYXRpdmVUb1Njcm9sbGFibGVBcmVhT3JpZ2luKCkgY29uc3Q7CiAKLSAgICAvLyBzY3Jv bGxPZmZzZXQoKSBhbmNob3JzIGl0cyAoMCwwKSBwb2ludCBhdCB0aGUgU2Nyb2xsYWJsZUFyZWEn cyBvcmlnaW4uIFRoZSB0b3Agb2YgdGhlIHNjcm9sbGluZworICAgIC8vIHNjcm9sbFBvc3Rpb24o KSBhbmNob3JzIGl0cyAoMCwwKSBwb2ludCBhdCB0aGUgU2Nyb2xsYWJsZUFyZWEncyBvcmlnaW4u IFRoZSB0b3Agb2YgdGhlIHNjcm9sbGluZwogICAgIC8vIGxheWVyIGRvZXMgbm90IHJlcHJlc2Vu dCB0aGUgdG9wIG9mIHRoZSB2aWV3IHdoZW4gdGhlcmUgaXMgYSB0b3BDb250ZW50SW5zZXQuIEFk ZGl0aW9uYWxseSwgYXMKICAgICAvLyBkZXRhaWxlZCBhYm92ZSwgdGhlIG9yaWdpbiBvZiB0aGUg c2Nyb2xsaW5nIGxheWVyIGFsc28gZG9lcyBub3QgbmVjZXNzYXJpbHkgY29ycmVzcG9uZCB3aXRo IHRoZQotICAgIC8vIHRvcCBvZiB0aGUgZG9jdW1lbnQgYW55d2F5LCBzaW5jZSB0aGVyZSBjb3Vs ZCBhbHNvIGJlIGhlYWRlci4gZG9jdW1lbnRTY3JvbGxPZmZzZXRSZWxhdGl2ZVRvVmlld09yaWdp bigpCisgICAgLy8gdG9wIG9mIHRoZSBkb2N1bWVudCBhbnl3YXksIHNpbmNlIHRoZXJlIGNvdWxk IGFsc28gYmUgaGVhZGVyLiBkb2N1bWVudFNjcm9sbFBvc2l0aW9uUmVsYXRpdmVUb1ZpZXdPcmln aW4oKQogICAgIC8vIHdpbGwgcmV0dXJuIGEgdmVyc2lvbiBvZiB0aGUgY3VycmVudCBzY3JvbGwg b2Zmc2V0IHdoaWNoIHRyYWNrcyB0aGUgdG9wIG9mIHRoZSBEb2N1bWVudAogICAgIC8vIHJlbGF0 aXZlIHRvIHRoZSB2ZXJ5IHRvcCBvZiB0aGUgdmlldy4KLSAgICBXRUJDT1JFX0VYUE9SVCBJbnRT aXplIGRvY3VtZW50U2Nyb2xsT2Zmc2V0UmVsYXRpdmVUb1ZpZXdPcmlnaW4oKSBjb25zdDsKLSAg ICBJbnRQb2ludCBkb2N1bWVudFNjcm9sbFBvc2l0aW9uUmVsYXRpdmVUb1ZpZXdPcmlnaW4oKSBj b25zdDsKKyAgICBXRUJDT1JFX0VYUE9SVCBTY3JvbGxQb3NpdGlvbiBkb2N1bWVudFNjcm9sbFBv c2l0aW9uUmVsYXRpdmVUb1ZpZXdPcmlnaW4oKSBjb25zdDsKIAogICAgIHZpcnR1YWwgSW50U2l6 ZSBvdmVyaGFuZ0Ftb3VudCgpIGNvbnN0IG92ZXJyaWRlOwogCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94TW9kZWxPYmplY3QuY3BwIGIvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlckJveE1vZGVsT2JqZWN0LmNwcAppbmRleCAwNDBhMDI1NDMwODg5 NmJkNTI2MmZkM2YyMTg5Mjg3MjczZjlhNWE1Li4xOTMxNDQ5ZjU2ZDhmMTg1Y2ZlZTQ5ODI3ZTkw ZDU5MTkwZThiODY0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy Qm94TW9kZWxPYmplY3QuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJC b3hNb2RlbE9iamVjdC5jcHAKQEAgLTExMTUsMTAgKzExMTUsMTAgQEAgQmFja2dyb3VuZEltYWdl R2VvbWV0cnkgUmVuZGVyQm94TW9kZWxPYmplY3Q6OmNhbGN1bGF0ZUJhY2tncm91bmRJbWFnZUdl b21ldHJ5KGMKICAgICAgICAgICAgICAgICAvLyB0b3BDb250ZW50SW5zZXQgc28gZG8gbm90IGFk ZCBpdCB0byB0aGUgY2FsY3VsYXRpb24gYmVsb3cuCiAgICAgICAgICAgICAgICAgdmlld3BvcnRS ZWN0LnNldExvY2F0aW9uKGZyYW1lVmlldy5zY3JvbGxQb3NpdGlvbkZvckZpeGVkUG9zaXRpb24o KSk7CiAgICAgICAgICAgICB9IGVsc2UgewotICAgICAgICAgICAgICAgIC8vIGRvY3VtZW50U2Ny b2xsT2Zmc2V0UmVsYXRpdmVUb1ZpZXdPcmlnaW4oKSBpbmNsdWRlcyAtdG9wQ29udGVudEluc2V0 IGluIGl0cyBoZWlnaHQKKyAgICAgICAgICAgICAgICAvLyBkb2N1bWVudFNjcm9sbFBvc2l0aW9u UmVsYXRpdmVUb1ZpZXdPcmlnaW4oKSBpbmNsdWRlcyAtdG9wQ29udGVudEluc2V0IGluIGl0cyBo ZWlnaHQKICAgICAgICAgICAgICAgICAvLyBzbyB3ZSBuZWVkIHRvIGFjY291bnQgZm9yIHRoYXQg aW4gY2FsY3VsYXRpbmcgdGhlIHBoYXNlIHNpemUKICAgICAgICAgICAgICAgICB0b3BDb250ZW50 SW5zZXQgPSBmcmFtZVZpZXcudG9wQ29udGVudEluc2V0KFNjcm9sbFZpZXc6OlRvcENvbnRlbnRJ bnNldFR5cGU6OldlYkNvcmVPclBsYXRmb3JtQ29udGVudEluc2V0KTsKLSAgICAgICAgICAgICAg ICB2aWV3cG9ydFJlY3Quc2V0TG9jYXRpb24odG9MYXlvdXRQb2ludChmcmFtZVZpZXcuZG9jdW1l bnRTY3JvbGxPZmZzZXRSZWxhdGl2ZVRvVmlld09yaWdpbigpKSk7CisgICAgICAgICAgICAgICAg dmlld3BvcnRSZWN0LnNldExvY2F0aW9uKGZyYW1lVmlldy5kb2N1bWVudFNjcm9sbFBvc2l0aW9u UmVsYXRpdmVUb1ZpZXdPcmlnaW4oKSk7CiAgICAgICAgICAgICB9CiAKICAgICAgICAgICAgIHRv cCArPSB0b3BDb250ZW50SW5zZXQ7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyTGF5ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVy LmNwcAppbmRleCAyMjhhYmQxMWFmZGY0YjJlOGU5NzZiN2U1MGYzYWVmNzg0M2RiZmUzLi40ZTQ2 MjM2ZjJjNDdlYTU3ZGM1NWJlODExMjgxNTJhZjRlYmYwNGVkIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJMYXllci5jcHAKQEAgLTI1MjQsOCArMjUyNCw3IEBAIHZvaWQgUmVuZGVy TGF5ZXI6OnNjcm9sbFJlY3RUb1Zpc2libGUoY29uc3QgTGF5b3V0UmVjdCYgcmVjdCwgY29uc3Qg U2Nyb2xsQWxpZ25tCiAjaWYgIVBMQVRGT1JNKElPUykKICAgICAgICAgICAgIExheW91dFJlY3Qg dmlld1JlY3QgPSBmcmFtZVZpZXcudmlzaWJsZUNvbnRlbnRSZWN0KCk7CiAgICAgICAgICAgICBM YXlvdXRSZWN0IHZpc2libGVSZWN0UmVsYXRpdmVUb0RvY3VtZW50ID0gdmlld1JlY3Q7Ci0gICAg ICAgICAgICBJbnRTaXplIGRvY3VtZW50U2Nyb2xsT2Zmc2V0UmVsYXRpdmVUb1Njcm9sbGFibGVB cmVhT3JpZ2luID0gZnJhbWVWaWV3LmRvY3VtZW50U2Nyb2xsT2Zmc2V0UmVsYXRpdmVUb1Njcm9s bGFibGVBcmVhT3JpZ2luKCk7Ci0gICAgICAgICAgICB2aXNpYmxlUmVjdFJlbGF0aXZlVG9Eb2N1 bWVudC5zZXRMb2NhdGlvbihJbnRQb2ludChkb2N1bWVudFNjcm9sbE9mZnNldFJlbGF0aXZlVG9T Y3JvbGxhYmxlQXJlYU9yaWdpbi53aWR0aCgpLCBkb2N1bWVudFNjcm9sbE9mZnNldFJlbGF0aXZl VG9TY3JvbGxhYmxlQXJlYU9yaWdpbi5oZWlnaHQoKSkpOworICAgICAgICAgICAgdmlzaWJsZVJl Y3RSZWxhdGl2ZVRvRG9jdW1lbnQuc2V0TG9jYXRpb24oZnJhbWVWaWV3LmRvY3VtZW50U2Nyb2xs UG9zaXRpb25SZWxhdGl2ZVRvU2Nyb2xsYWJsZUFyZWFPcmlnaW4oKSk7CiAjZWxzZQogICAgICAg ICAgICAgTGF5b3V0UmVjdCB2aWV3UmVjdCA9IGZyYW1lVmlldy51bm9ic2N1cmVkQ29udGVudFJl Y3QoKTsKICAgICAgICAgICAgIExheW91dFJlY3QgdmlzaWJsZVJlY3RSZWxhdGl2ZVRvRG9jdW1l bnQgPSB2aWV3UmVjdDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2Vi UGFnZS9XZWJQYWdlLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQ YWdlLmNwcAppbmRleCA4ZDlhZjhhMDg1OThkNjc2MGJkMzFmZDY4OGVjM2JkMzRkMzc5MTJjLi41 OGQzZmZhNjIwZjE5NGI0ODBjYWU1YjYzZmY5NWExZTE4NTNjYTIwIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKKysrIGIvU291cmNlL1dl YktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCkBAIC00Nzk5LDggKzQ3OTksOCBA QCB2b2lkIFdlYlBhZ2U6OmRldGVybWluZVByaW1hcnlTbmFwc2hvdHRlZFBsdWdJbigpCiAgICAg ICAgICAgICAgICAgY29udGludWU7CiAKICAgICAgICAgICAgIEludFJlY3QgcGx1Z0luUmVjdFJl bGF0aXZlVG9WaWV3ID0gcGx1Z0luSW1hZ2VFbGVtZW50LmNsaWVudFJlY3QoKTsKLSAgICAgICAg ICAgIEludFNpemUgc2Nyb2xsT2Zmc2V0ID0gbWFpbkZyYW1lLnZpZXcoKS0+ZG9jdW1lbnRTY3Jv bGxPZmZzZXRSZWxhdGl2ZVRvVmlld09yaWdpbigpOwotICAgICAgICAgICAgSW50UmVjdCBwbHVn SW5SZWN0UmVsYXRpdmVUb1RvcERvY3VtZW50KHBsdWdJblJlY3RSZWxhdGl2ZVRvVmlldy5sb2Nh dGlvbigpICsgc2Nyb2xsT2Zmc2V0LCBwbHVnSW5SZWN0UmVsYXRpdmVUb1ZpZXcuc2l6ZSgpKTsK KyAgICAgICAgICAgIFNjcm9sbFBvc2l0aW9uIHNjcm9sbFBvc2l0aW9uID0gbWFpbkZyYW1lLnZp ZXcoKS0+ZG9jdW1lbnRTY3JvbGxQb3NpdGlvblJlbGF0aXZlVG9WaWV3T3JpZ2luKCk7CisgICAg ICAgICAgICBJbnRSZWN0IHBsdWdJblJlY3RSZWxhdGl2ZVRvVG9wRG9jdW1lbnQocGx1Z0luUmVj dFJlbGF0aXZlVG9WaWV3LmxvY2F0aW9uKCkgKyBzY3JvbGxQb3NpdGlvbiwgcGx1Z0luUmVjdFJl bGF0aXZlVG9WaWV3LnNpemUoKSk7CiAgICAgICAgICAgICBIaXRUZXN0UmVzdWx0IGhpdFRlc3RS ZXN1bHQocGx1Z0luUmVjdFJlbGF0aXZlVG9Ub3BEb2N1bWVudC5jZW50ZXIoKSk7CiAgICAgICAg ICAgICBtYWluUmVuZGVyVmlldy5oaXRUZXN0KHJlcXVlc3QsIGhpdFRlc3RSZXN1bHQpOwogCkBA IC00ODA5LDcgKzQ4MDksNyBAQCB2b2lkIFdlYlBhZ2U6OmRldGVybWluZVByaW1hcnlTbmFwc2hv dHRlZFBsdWdJbigpCiAgICAgICAgICAgICAgICAgY29udGludWU7CiAKICAgICAgICAgICAgIElu dFJlY3QgZWxlbWVudFJlY3RSZWxhdGl2ZVRvVmlldyA9IGVsZW1lbnQtPmNsaWVudFJlY3QoKTsK LSAgICAgICAgICAgIEludFJlY3QgZWxlbWVudFJlY3RSZWxhdGl2ZVRvVG9wRG9jdW1lbnQoZWxl bWVudFJlY3RSZWxhdGl2ZVRvVmlldy5sb2NhdGlvbigpICsgc2Nyb2xsT2Zmc2V0LCBlbGVtZW50 UmVjdFJlbGF0aXZlVG9WaWV3LnNpemUoKSk7CisgICAgICAgICAgICBJbnRSZWN0IGVsZW1lbnRS ZWN0UmVsYXRpdmVUb1RvcERvY3VtZW50KGVsZW1lbnRSZWN0UmVsYXRpdmVUb1ZpZXcubG9jYXRp b24oKSArIHNjcm9sbFBvc2l0aW9uLCBlbGVtZW50UmVjdFJlbGF0aXZlVG9WaWV3LnNpemUoKSk7 CiAgICAgICAgICAgICBMYXlvdXRSZWN0IGluZmxhdGVkUGx1Z2luUmVjdCA9IHBsdWdJblJlY3RS ZWxhdGl2ZVRvVG9wRG9jdW1lbnQ7CiAgICAgICAgICAgICBMYXlvdXRVbml0IHhPZmZzZXQgPSAo aW5mbGF0ZWRQbHVnaW5SZWN0LndpZHRoKCkgKiBvdmVybGFwcGluZ0ltYWdlQm91bmRzU2NhbGUg LSBpbmZsYXRlZFBsdWdpblJlY3Qud2lkdGgoKSkgLyAyOwogICAgICAgICAgICAgTGF5b3V0VW5p dCB5T2Zmc2V0ID0gKGluZmxhdGVkUGx1Z2luUmVjdC5oZWlnaHQoKSAqIG92ZXJsYXBwaW5nSW1h Z2VCb3VuZHNTY2FsZSAtIGluZmxhdGVkUGx1Z2luUmVjdC5oZWlnaHQoKSkgLyAyOwpAQCAtNDg3 OCw4ICs0ODc4LDggQEAgYm9vbCBXZWJQYWdlOjpwbHVnSW5JbnRlcnNlY3RzU2VhcmNoUmVjdChI VE1MUGx1Z0luSW1hZ2VFbGVtZW50JiBwbHVnSW5JbWFnZUVsZW0KICAgICBJbnRSZWN0IHBsdWdJ blJlY3RSZWxhdGl2ZVRvVmlldyA9IHBsdWdJbkltYWdlRWxlbWVudC5jbGllbnRSZWN0KCk7CiAg ICAgaWYgKHBsdWdJblJlY3RSZWxhdGl2ZVRvVmlldy5pc0VtcHR5KCkpCiAgICAgICAgIHJldHVy biBmYWxzZTsKLSAgICBJbnRTaXplIHNjcm9sbE9mZnNldCA9IG1haW5GcmFtZS52aWV3KCktPmRv Y3VtZW50U2Nyb2xsT2Zmc2V0UmVsYXRpdmVUb1ZpZXdPcmlnaW4oKTsKLSAgICBJbnRSZWN0IHBs dWdJblJlY3RSZWxhdGl2ZVRvVG9wRG9jdW1lbnQocGx1Z0luUmVjdFJlbGF0aXZlVG9WaWV3Lmxv Y2F0aW9uKCkgKyBzY3JvbGxPZmZzZXQsIHBsdWdJblJlY3RSZWxhdGl2ZVRvVmlldy5zaXplKCkp OworICAgIFNjcm9sbFBvc2l0aW9uIHNjcm9sbFBvc2l0aW9uID0gbWFpbkZyYW1lLnZpZXcoKS0+ ZG9jdW1lbnRTY3JvbGxQb3NpdGlvblJlbGF0aXZlVG9WaWV3T3JpZ2luKCk7CisgICAgSW50UmVj dCBwbHVnSW5SZWN0UmVsYXRpdmVUb1RvcERvY3VtZW50KHBsdWdJblJlY3RSZWxhdGl2ZVRvVmll dy5sb2NhdGlvbigpICsgdG9JbnRTaXplKHNjcm9sbFBvc2l0aW9uKSwgcGx1Z0luUmVjdFJlbGF0 aXZlVG9WaWV3LnNpemUoKSk7CiAKICAgICByZXR1cm4gcGx1Z0luUmVjdFJlbGF0aXZlVG9Ub3BE b2N1bWVudC5pbnRlcnNlY3RzKHNlYXJjaFJlY3QpOwogfQo=