131848 2014-04-18 11:47:00 -0700 [iOS WK2] Make window.scroll() and window.scrollBy() work 2014-04-18 13:32:26 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 simon.fraser simon.fraser bdakin commit-queue esprehn+autocc gyuyoung.kim kangil.han simon.fraser oldest_to_newest 1001967 0 simon.fraser 2014-04-18 11:47:00 -0700 [iOS WK2] Make window.scroll() and window.scrollBy() work 1002001 1 229670 simon.fraser 2014-04-18 13:20:08 -0700 Created attachment 229670 Patch 1002004 2 229670 bdakin 2014-04-18 13:23:51 -0700 Comment on attachment 229670 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=229670&action=review > Source/WebCore/ChangeLog:9 > + The scrolling-related functions in DOMWindow where #ifdeffed for iOS "where" should be "were," I think. 1002005 3 simon.fraser 2014-04-18 13:32:26 -0700 https://trac.webkit.org/r167503 229670 2014-04-18 13:20:08 -0700 2014-04-18 13:23:51 -0700 Patch bug-131848-20140418131946.patch text/plain 9875 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMTY3NDI4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDk3ZWE0ZWUzZDU4Mzlh MWQ5Zjg0MzUzMDFmYzZhYmFjZjY0M2Y3Mi4uNGE0NDlhMjAxZDhiMjE5MWI0NmUzNjU5MDQ5OWJj YWE3OGFkODU5ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM3IEBACisyMDE0LTA0LTE4ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIFtpT1MgV0syXSBN YWtlIHdpbmRvdy5zY3JvbGwoKSBhbmQgd2luZG93LnNjcm9sbEJ5KCkgd29yaworICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTMxODQ4CisgICAgICAgIDxy ZGFyOi8vcHJvYmxlbS8xNjYzODMxOT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBUaGUgc2Nyb2xsaW5nLXJlbGF0ZWQgZnVuY3Rpb25zIGluIERPTVdp bmRvdyB3aGVyZSAjaWZkZWZmZWQgZm9yIGlPUworICAgICAgICB0byB1c2UgdGhlIGhhY2t5IFdL MS1zcGVjaWZpYyAiYWN0dWFsIHNjcm9sbCIgZnVuY3Rpb25zLCB3aGljaCBkbyBub3RoaW5nCisg ICAgICAgIGluIFdLMi4KKyAgICAgICAgCisgICAgICAgIEZpeCBieSBhZGRpbmcgYSBzY3JvbGwg cG9zaXRpb24gd3JhcHBlciAoY29udGVudHNTY3JvbGxQb3NpdGlvbikgd2hpY2ggZG9lcworICAg ICAgICB0aGUgcmlnaHQgdGhpbmcgb24gV0sxIGFuZCBXSzIsIGFuZCBjaGFuZ2UgYWxtb3N0IGFs bCB0aGUgcGxhY2VzIHRoYXQgdXNlZCAiYWN0dWFsU2Nyb2xsUG9zaXRpb24iCisgICAgICAgIHRv IHVzIGl0ICh3aXRoIHRoZSBleGNlcHRpb24gb2YgY29udGVudHNTY3JvbGxPZmZzZXQoKSBpbiBN b3VzZVJlbGF0ZWRFdmVudC5jcHAsIHdoaWNoIGhhcworICAgICAgICBjb25mdXNpbmcgc2NhbGlu ZyBiZWhhdmlvcikuCisKKyAgICAgICAgKiBkb20vTW91c2VSZWxhdGVkRXZlbnQuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6TW91c2VSZWxhdGVkRXZlbnQ6Ok1vdXNlUmVsYXRlZEV2ZW50KToKKyAg ICAgICAgKiBkb20vVHJlZVNjb3BlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Om5vZGVGcm9tUG9p bnQpOiBSZW1vdmUgI2lmZGVmcy4gCisgICAgICAgICogaHRtbC9IVE1MQm9keUVsZW1lbnQuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6SFRNTEJvZHlFbGVtZW50OjpzY3JvbGxMZWZ0KToKKyAgICAg ICAgKFdlYkNvcmU6OkhUTUxCb2R5RWxlbWVudDo6c2Nyb2xsVG9wKToKKyAgICAgICAgKiBwYWdl L0RPTVdpbmRvdy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpET01XaW5kb3c6OnNjcm9sbFgpOgor ICAgICAgICAoV2ViQ29yZTo6RE9NV2luZG93OjpzY3JvbGxZKToKKyAgICAgICAgKFdlYkNvcmU6 OkRPTVdpbmRvdzo6c2Nyb2xsQnkpOgorICAgICAgICAoV2ViQ29yZTo6RE9NV2luZG93OjpzY3Jv bGxUbyk6CisgICAgICAgICogcGxhdGZvcm0vU2Nyb2xsVmlldy5jcHA6CisgICAgICAgIChXZWJD b3JlOjpTY3JvbGxWaWV3Ojpjb250ZW50c1Njcm9sbFBvc2l0aW9uKToKKyAgICAgICAgKFdlYkNv cmU6OlNjcm9sbFZpZXc6OnNldENvbnRlbnRzU2Nyb2xsUG9zaXRpb24pOgorICAgICAgICAqIHBs YXRmb3JtL1Njcm9sbFZpZXcuaDoKKwogMjAxNC0wNC0xNyAgRGFyaW4gQWRsZXIgIDxkYXJpbkBh cHBsZS5jb20+CiAKICAgICAgICAgQWRkIHNlcGFyYXRlIGZsYWcgZm9yIEluZGV4ZWREYXRhYmFz ZSBpbiB3b3JrZXJzIHNpbmNlIHRoZSBjdXJyZW50IGltcGxlbWVudGF0aW9uIGlzIG5vdCB0aHJl YWRzYWZlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vTW91c2VSZWxhdGVkRXZlbnQu Y3BwIGIvU291cmNlL1dlYkNvcmUvZG9tL01vdXNlUmVsYXRlZEV2ZW50LmNwcAppbmRleCAxZGJl ZjNiNjcwMDRkMTYzODhkZWVhZDdiNTVmNWMwNmNjMWRmZTM0Li41M2Y5MTRlZjg0ODM5YmU5NGUz ZDczOTU0ZWJmY2YyODA3NTcwN2E4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vTW91 c2VSZWxhdGVkRXZlbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9Nb3VzZVJlbGF0ZWRF dmVudC5jcHAKQEAgLTc0LDExICs3NCw3IEBAIE1vdXNlUmVsYXRlZEV2ZW50OjpNb3VzZVJlbGF0 ZWRFdmVudChjb25zdCBBdG9taWNTdHJpbmcmIGV2ZW50VHlwZSwgYm9vbCBjYW5CdWJiCiAgICAg RnJhbWUqIGZyYW1lID0gdmlldygpID8gdmlldygpLT5mcmFtZSgpIDogMDsKICAgICBpZiAoZnJh bWUgJiYgIWlzU2ltdWxhdGVkKSB7CiAgICAgICAgIGlmIChGcmFtZVZpZXcqIGZyYW1lVmlldyA9 IGZyYW1lLT52aWV3KCkpIHsKLSNpZiAhUExBVEZPUk0oSU9TKQotICAgICAgICAgICAgc2Nyb2xs UG9zaXRpb24gPSBmcmFtZVZpZXctPnNjcm9sbFBvc2l0aW9uKCk7Ci0jZWxzZQotICAgICAgICAg ICAgc2Nyb2xsUG9zaXRpb24gPSBmcmFtZVZpZXctPmFjdHVhbFNjcm9sbFBvc2l0aW9uKCk7Ci0j ZW5kaWYKKyAgICAgICAgICAgIHNjcm9sbFBvc2l0aW9uID0gZnJhbWVWaWV3LT5jb250ZW50c1Nj cm9sbFBvc2l0aW9uKCk7CiAgICAgICAgICAgICBhZGp1c3RlZFBhZ2VMb2NhdGlvbiA9IGZyYW1l Vmlldy0+d2luZG93VG9Db250ZW50cyh3aW5kb3dMb2NhdGlvbik7CiAgICAgICAgICAgICBmbG9h dCBzY2FsZUZhY3RvciA9IDEgLyAoZnJhbWUtPnBhZ2Vab29tRmFjdG9yKCkgKiBmcmFtZS0+ZnJh bWVTY2FsZUZhY3RvcigpKTsKICAgICAgICAgICAgIGlmIChzY2FsZUZhY3RvciAhPSAxLjBmKSB7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vVHJlZVNjb3BlLmNwcCBiL1NvdXJjZS9X ZWJDb3JlL2RvbS9UcmVlU2NvcGUuY3BwCmluZGV4IGNmZWVmMjA2OGZhMTQ2ZmRlYjE4YzYyNGJi NjM5YzEyODNhZjYyZmQuLmNkOTcxYWU1Mzc5ODQxMTBiOWNjMjUwN2MzNzNmNWYxYmViNDRkODIg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9UcmVlU2NvcGUuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2RvbS9UcmVlU2NvcGUuY3BwCkBAIC0yMjcsMTcgKzIyNywxOSBAQCBOb2RlKiBu b2RlRnJvbVBvaW50KERvY3VtZW50KiBkb2N1bWVudCwgaW50IHgsIGludCB5LCBMYXlvdXRQb2lu dCogbG9jYWxQb2ludCkKICAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAKICAgICBmbG9hdCBzY2Fs ZUZhY3RvciA9IGZyYW1lLT5wYWdlWm9vbUZhY3RvcigpICogZnJhbWUtPmZyYW1lU2NhbGVGYWN0 b3IoKTsKLSNpZiAhUExBVEZPUk0oSU9TKQotICAgIEludFBvaW50IHBvaW50ID0gcm91bmRlZElu dFBvaW50KEZsb2F0UG9pbnQoeCAqIHNjYWxlRmFjdG9yICArIGZyYW1lVmlldy0+c2Nyb2xsWCgp LCB5ICogc2NhbGVGYWN0b3IgKyBmcmFtZVZpZXctPnNjcm9sbFkoKSkpOwogCi0gICAgaWYgKCFm cmFtZVZpZXctPnZpc2libGVDb250ZW50UmVjdCgpLmNvbnRhaW5zKHBvaW50KSkKLSAgICAgICAg cmV0dXJuIG51bGxwdHI7Ci0jZWxzZQotICAgIEludFBvaW50IHBvaW50ID0gcm91bmRlZEludFBv aW50KEZsb2F0UG9pbnQoeCAqIHNjYWxlRmFjdG9yICArIGZyYW1lVmlldy0+YWN0dWFsU2Nyb2xs WCgpLCB5ICogc2NhbGVGYWN0b3IgKyBmcmFtZVZpZXctPmFjdHVhbFNjcm9sbFkoKSkpOworICAg IEludFBvaW50IHNjcm9sbFBvc2l0aW9uID0gZnJhbWVWaWV3LT5jb250ZW50c1Njcm9sbFBvc2l0 aW9uKCk7CisgICAgSW50UG9pbnQgcG9pbnQgPSByb3VuZGVkSW50UG9pbnQoRmxvYXRQb2ludCh4 ICogc2NhbGVGYWN0b3IgICsgc2Nyb2xsUG9zaXRpb24ueCgpLCB5ICogc2NhbGVGYWN0b3IgKyBz Y3JvbGxQb3NpdGlvbi55KCkpKTsKIAotICAgIGlmICghZnJhbWVWaWV3LT51bm9ic2N1cmVkQ29u dGVudFJlY3QoKS5jb250YWlucyhwb2ludCkpCi0gICAgICAgIHJldHVybiBudWxscHRyOworICAg IEludFJlY3QgdmlzaWJsZVJlY3Q7CisjaWYgUExBVEZPUk0oSU9TKQorICAgIHZpc2libGVSZWN0 ID0gZnJhbWVWaWV3LT51bm9ic2N1cmVkQ29udGVudFJlY3QoKTsKKyNlbHNlCisgICAgdmlzaWJs ZVJlY3QgPSBmcmFtZVZpZXctPnZpc2libGVDb250ZW50UmVjdCgpOwogI2VuZGlmCisgICAgaWYg KCF2aXNpYmxlUmVjdC5jb250YWlucyhwb2ludCkpCisgICAgICAgIHJldHVybiBudWxscHRyOwor CiAgICAgSGl0VGVzdFJlcXVlc3QgcmVxdWVzdChIaXRUZXN0UmVxdWVzdDo6UmVhZE9ubHkgfCBI aXRUZXN0UmVxdWVzdDo6QWN0aXZlIHwgSGl0VGVzdFJlcXVlc3Q6OkRpc2FsbG93U2hhZG93Q29u dGVudCk7CiAgICAgSGl0VGVzdFJlc3VsdCByZXN1bHQocG9pbnQpOwogICAgIGRvY3VtZW50LT5y ZW5kZXJWaWV3KCktPmhpdFRlc3QocmVxdWVzdCwgcmVzdWx0KTsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2h0bWwvSFRNTEJvZHlFbGVtZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwv SFRNTEJvZHlFbGVtZW50LmNwcAppbmRleCBhYzI0MzU5OGRhNmZkN2VlYzVlM2UwYjNhNjFhODVm MDQyZGFhNTgyLi5kMDQxMmU2MTFiZTk2NjgxNWNmNWQ2ODYxOTI2MTczYzM4ZmVjZDhkIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxCb2R5RWxlbWVudC5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvaHRtbC9IVE1MQm9keUVsZW1lbnQuY3BwCkBAIC0yMTgsMTEgKzIxOCw3IEBA IGludCBIVE1MQm9keUVsZW1lbnQ6OnNjcm9sbExlZnQoKQogICAgIEZyYW1lVmlldyogdmlldyA9 IGZyYW1lLT52aWV3KCk7CiAgICAgaWYgKCF2aWV3KQogICAgICAgICByZXR1cm4gMDsKLSNpZiBQ TEFURk9STShJT1MpCi0gICAgcmV0dXJuIGFkanVzdEZvclpvb20odmlldy0+YWN0dWFsU2Nyb2xs WCgpLCAqZnJhbWUpOwotI2Vsc2UKLSAgICByZXR1cm4gYWRqdXN0Rm9yWm9vbSh2aWV3LT5zY3Jv bGxYKCksICpmcmFtZSk7Ci0jZW5kaWYKKyAgICByZXR1cm4gYWRqdXN0Rm9yWm9vbSh2aWV3LT5j b250ZW50c1Njcm9sbFBvc2l0aW9uKCkueCgpLCAqZnJhbWUpOwogfQogCiB2b2lkIEhUTUxCb2R5 RWxlbWVudDo6c2V0U2Nyb2xsTGVmdChpbnQgc2Nyb2xsTGVmdCkKQEAgLTI0NiwxMSArMjQyLDcg QEAgaW50IEhUTUxCb2R5RWxlbWVudDo6c2Nyb2xsVG9wKCkKICAgICBGcmFtZVZpZXcqIHZpZXcg PSBmcmFtZS0+dmlldygpOwogICAgIGlmICghdmlldykKICAgICAgICAgcmV0dXJuIDA7Ci0jaWYg UExBVEZPUk0oSU9TKQotICAgIHJldHVybiBhZGp1c3RGb3Jab29tKHZpZXctPmFjdHVhbFNjcm9s bFkoKSwgKmZyYW1lKTsKLSNlbHNlCi0gICAgcmV0dXJuIGFkanVzdEZvclpvb20odmlldy0+c2Ny b2xsWSgpLCAqZnJhbWUpOwotI2VuZGlmCisgICAgcmV0dXJuIGFkanVzdEZvclpvb20odmlldy0+ Y29udGVudHNTY3JvbGxQb3NpdGlvbigpLnkoKSwgKmZyYW1lKTsKIH0KIAogdm9pZCBIVE1MQm9k eUVsZW1lbnQ6OnNldFNjcm9sbFRvcChpbnQgc2Nyb2xsVG9wKQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcGFnZS9ET01XaW5kb3cuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9ET01XaW5k b3cuY3BwCmluZGV4IGNiYzM1NTQzODQ2ZmIxODRhYjQxMzg5ZTRlY2NjYWM4MjliNzE1N2UuLmE0 N2M2OWI3YmJiYmMzZDczMGQ0ZDE2ZGQ4MjIwODIxZTAwNWRiMzggMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3BhZ2UvRE9NV2luZG93LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0RP TVdpbmRvdy5jcHAKQEAgLTExOTIsMjIgKzExOTIsMTMgQEAgaW50IERPTVdpbmRvdzo6c2Nyb2xs WCgpIGNvbnN0CiAgICAgaWYgKCF2aWV3KQogICAgICAgICByZXR1cm4gMDsKIAotICAgIGludCBz Y3JvbGxYOwotI2lmIFBMQVRGT1JNKElPUykKLSAgICBzY3JvbGxYID0gdmlldy0+YWN0dWFsU2Ny b2xsWCgpOwotI2Vsc2UKLSAgICBzY3JvbGxYID0gdmlldy0+c2Nyb2xsWCgpOwotI2VuZGlmCisg ICAgaW50IHNjcm9sbFggPSB2aWV3LT5jb250ZW50c1Njcm9sbFBvc2l0aW9uKCkueCgpOwogICAg IGlmICghc2Nyb2xsWCkKICAgICAgICAgcmV0dXJuIDA7CiAKICAgICBtX2ZyYW1lLT5kb2N1bWVu dCgpLT51cGRhdGVMYXlvdXRJZ25vcmVQZW5kaW5nU3R5bGVzaGVldHMoKTsKIAotI2lmIFBMQVRG T1JNKElPUykKLSAgICByZXR1cm4gdmlldy0+bWFwRnJvbUxheW91dFRvQ1NTVW5pdHModmlldy0+ YWN0dWFsU2Nyb2xsWCgpKTsKLSNlbHNlCi0gICAgcmV0dXJuIHZpZXctPm1hcEZyb21MYXlvdXRU b0NTU1VuaXRzKHZpZXctPnNjcm9sbFgoKSk7Ci0jZW5kaWYKKyAgICByZXR1cm4gdmlldy0+bWFw RnJvbUxheW91dFRvQ1NTVW5pdHModmlldy0+Y29udGVudHNTY3JvbGxQb3NpdGlvbigpLngoKSk7 CiB9CiAKIGludCBET01XaW5kb3c6OnNjcm9sbFkoKSBjb25zdApAQCAtMTIxOSwyMiArMTIxMCwx MyBAQCBpbnQgRE9NV2luZG93OjpzY3JvbGxZKCkgY29uc3QKICAgICBpZiAoIXZpZXcpCiAgICAg ICAgIHJldHVybiAwOwogCi0gICAgaW50IHNjcm9sbFk7Ci0jaWYgUExBVEZPUk0oSU9TKQotICAg IHNjcm9sbFkgPSB2aWV3LT5hY3R1YWxTY3JvbGxZKCk7Ci0jZWxzZQotICAgIHNjcm9sbFkgPSB2 aWV3LT5zY3JvbGxZKCk7Ci0jZW5kaWYKKyAgICBpbnQgc2Nyb2xsWSA9IHZpZXctPmNvbnRlbnRz U2Nyb2xsUG9zaXRpb24oKS55KCk7CiAgICAgaWYgKCFzY3JvbGxZKQogICAgICAgICByZXR1cm4g MDsKIAogICAgIG1fZnJhbWUtPmRvY3VtZW50KCktPnVwZGF0ZUxheW91dElnbm9yZVBlbmRpbmdT dHlsZXNoZWV0cygpOwogCi0jaWYgUExBVEZPUk0oSU9TKQotICAgIHJldHVybiB2aWV3LT5tYXBG cm9tTGF5b3V0VG9DU1NVbml0cyh2aWV3LT5hY3R1YWxTY3JvbGxZKCkpOwotI2Vsc2UKLSAgICBy ZXR1cm4gdmlldy0+bWFwRnJvbUxheW91dFRvQ1NTVW5pdHModmlldy0+c2Nyb2xsWSgpKTsKLSNl bmRpZgorICAgIHJldHVybiB2aWV3LT5tYXBGcm9tTGF5b3V0VG9DU1NVbml0cyh2aWV3LT5jb250 ZW50c1Njcm9sbFBvc2l0aW9uKCkueSgpKTsKIH0KIAogYm9vbCBET01XaW5kb3c6OmNsb3NlZCgp IGNvbnN0CkBAIC0xNDQ2LDExICsxNDI4LDcgQEAgdm9pZCBET01XaW5kb3c6OnNjcm9sbEJ5KGlu dCB4LCBpbnQgeSkgY29uc3QKICAgICAgICAgcmV0dXJuOwogCiAgICAgSW50U2l6ZSBzY2FsZWRP ZmZzZXQodmlldy0+bWFwRnJvbUNTU1RvTGF5b3V0VW5pdHMoeCksIHZpZXctPm1hcEZyb21DU1NU b0xheW91dFVuaXRzKHkpKTsKLSNpZiBQTEFURk9STShJT1MpCi0gICAgdmlldy0+c2V0QWN0dWFs U2Nyb2xsUG9zaXRpb24odmlldy0+YWN0dWFsU2Nyb2xsUG9zaXRpb24oKSArIHNjYWxlZE9mZnNl dCk7Ci0jZWxzZQotICAgIHZpZXctPnNjcm9sbEJ5KHNjYWxlZE9mZnNldCk7Ci0jZW5kaWYKKyAg ICB2aWV3LT5zZXRDb250ZW50c1Njcm9sbFBvc2l0aW9uKHZpZXctPmNvbnRlbnRzU2Nyb2xsUG9z aXRpb24oKSArIHNjYWxlZE9mZnNldCk7CiB9CiAKIHZvaWQgRE9NV2luZG93OjpzY3JvbGxUbyhp bnQgeCwgaW50IHkpIGNvbnN0CkBAIC0xNDY0LDE1ICsxNDQyLDggQEAgdm9pZCBET01XaW5kb3c6 OnNjcm9sbFRvKGludCB4LCBpbnQgeSkgY29uc3QKICAgICBpZiAoIXZpZXcpCiAgICAgICAgIHJl dHVybjsKIAotCi0jaWYgUExBVEZPUk0oSU9TKQotICAgIGludCB6b29tZWRYID0gc3RhdGljX2Nh c3Q8aW50Pih4ICogbV9mcmFtZS0+cGFnZVpvb21GYWN0b3IoKSAqIG1fZnJhbWUtPmZyYW1lU2Nh bGVGYWN0b3IoKSk7Ci0gICAgaW50IHpvb21lZFkgPSBzdGF0aWNfY2FzdDxpbnQ+KHkgKiBtX2Zy YW1lLT5wYWdlWm9vbUZhY3RvcigpICogbV9mcmFtZS0+ZnJhbWVTY2FsZUZhY3RvcigpKTsKLSAg ICB2aWV3LT5zZXRBY3R1YWxTY3JvbGxQb3NpdGlvbihJbnRQb2ludCh6b29tZWRYLCB6b29tZWRZ KSk7Ci0jZWxzZQogICAgIEludFBvaW50IGxheW91dFBvcyh2aWV3LT5tYXBGcm9tQ1NTVG9MYXlv dXRVbml0cyh4KSwgdmlldy0+bWFwRnJvbUNTU1RvTGF5b3V0VW5pdHMoeSkpOwotICAgIHZpZXct PnNldFNjcm9sbFBvc2l0aW9uKGxheW91dFBvcyk7Ci0jZW5kaWYKKyAgICB2aWV3LT5zZXRDb250 ZW50c1Njcm9sbFBvc2l0aW9uKGxheW91dFBvcyk7CiB9CiAKIGJvb2wgRE9NV2luZG93OjphbGxv d2VkVG9DaGFuZ2VXaW5kb3dHZW9tZXRyeSgpIGNvbnN0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9TY3JvbGxWaWV3LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Nj cm9sbFZpZXcuY3BwCmluZGV4IDEwNGNiN2E3ZmU3NmMwYjI3MjA3ZjZkODc5MDNlMDM3ZjA5ZGE0 ZDkuLjg3ZTk4ZjA1NTY4NDIxNDBkNmYxNWY2MGNiMmZmZmMxNTQ2ZTUyNDEgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbFZpZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL1Njcm9sbFZpZXcuY3BwCkBAIC0yMzYsNiArMjM2LDI0IEBAIHZvaWQgU2Ny b2xsVmlldzo6c2V0RGVsZWdhdGVzU2Nyb2xsaW5nKGJvb2wgZGVsZWdhdGVzU2Nyb2xsaW5nKQog ICAgIGRlbGVnYXRlc1Njcm9sbGluZ0RpZENoYW5nZSgpOwogfQogCitJbnRQb2ludCBTY3JvbGxW aWV3Ojpjb250ZW50c1Njcm9sbFBvc2l0aW9uKCkgY29uc3QKK3sKKyNpZiBQTEFURk9STShJT1Mp CisgICAgaWYgKHBsYXRmb3JtV2lkZ2V0KCkpCisgICAgICAgIHJldHVybiBhY3R1YWxTY3JvbGxQ b3NpdGlvbigpOworI2VuZGlmCisgICAgcmV0dXJuIHNjcm9sbFBvc2l0aW9uKCk7Cit9CisKK3Zv aWQgU2Nyb2xsVmlldzo6c2V0Q29udGVudHNTY3JvbGxQb3NpdGlvbihjb25zdCBJbnRQb2ludCYg cG9zaXRpb24pCit7CisjaWYgUExBVEZPUk0oSU9TKQorICAgIGlmIChwbGF0Zm9ybVdpZGdldCgp KQorICAgICAgICBzZXRBY3R1YWxTY3JvbGxQb3NpdGlvbihwb3NpdGlvbik7CisjZW5kaWYKKyAg ICBzZXRTY3JvbGxQb3NpdGlvbihwb3NpdGlvbik7Cit9CisKICNpZiAhUExBVEZPUk0oSU9TKQog SW50UmVjdCBTY3JvbGxWaWV3Ojp1bm9ic2N1cmVkQ29udGVudFJlY3QoVmlzaWJsZUNvbnRlbnRS ZWN0SW5jbHVkZXNTY3JvbGxiYXJzIHNjcm9sbGJhckluY2x1c2lvbikgY29uc3QKIHsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbFZpZXcuaCBiL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL1Njcm9sbFZpZXcuaAppbmRleCA4OTI3YzFjNzE5MTFjOWRlMGZmN2YwNjdj OTBmODE5YzQzYWI4ZGZjLi4yZDYxYjI5NWY3OWM4YzRkYTgxYmJmMGQ3ZDY2NDg4OTQ5MDM2ZGE1 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxWaWV3LmgKKysrIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsVmlldy5oCkBAIC0yMjksNiArMjI5LDEwIEBA IHB1YmxpYzoKICAgICBpbnQgc2Nyb2xsWCgpIGNvbnN0IHsgcmV0dXJuIHNjcm9sbFBvc2l0aW9u KCkueCgpOyB9CiAgICAgaW50IHNjcm9sbFkoKSBjb25zdCB7IHJldHVybiBzY3JvbGxQb3NpdGlv bigpLnkoKTsgfQogCisgICAgLy8gU2Nyb2xsIHBvc2l0aW9uIHVzZWQgYnkgd2ViLWV4cG9zZWQg ZmVhdHVyZXMgKGhhcyBsZWdhY3kgaU9TIGJlaGF2aW9yKS4KKyAgICBJbnRQb2ludCBjb250ZW50 c1Njcm9sbFBvc2l0aW9uKCkgY29uc3Q7CisgICAgdm9pZCBzZXRDb250ZW50c1Njcm9sbFBvc2l0 aW9uKGNvbnN0IEludFBvaW50Jik7CisKICNpZiBQTEFURk9STShJT1MpCiAgICAgaW50IGFjdHVh bFNjcm9sbFgoKSBjb25zdCB7IHJldHVybiB1bm9ic2N1cmVkQ29udGVudFJlY3QoKS54KCk7IH0K ICAgICBpbnQgYWN0dWFsU2Nyb2xsWSgpIGNvbnN0IHsgcmV0dXJuIHVub2JzY3VyZWRDb250ZW50 UmVjdCgpLnkoKTsgfQo=