121714 2013-09-20 14:07:37 -0700 Scrollbars don't appear on long pages after r155660 2013-09-20 14:47:29 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 simon.fraser simon.fraser bdakin commit-queue esprehn+autocc glenn kondapallykalyan simon.fraser thorton oldest_to_newest 931577 0 simon.fraser 2013-09-20 14:07:37 -0700 Scrollbars don't appear on long pages after r155660 931580 1 simon.fraser 2013-09-20 14:13:41 -0700 <rdar://problem/15042478> 931581 2 212216 simon.fraser 2013-09-20 14:13:46 -0700 Created attachment 212216 Patch 931606 3 simon.fraser 2013-09-20 14:47:29 -0700 https://trac.webkit.org/r156201 212216 2013-09-20 14:13:46 -0700 2013-09-20 14:20:12 -0700 Patch bug-121714-20130920141345.patch text/plain 12507 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMTU2MDc4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzA2ZDQ3MjRmN2MzOWE3 NmMwMzc2ZjEwOGRjZmMwNGE5ZmJkY2MxNi4uMTQyZjJmZGM3YWRhYjdhNDhjY2MxMDk2ZGZhOTE2 NjJkMjVjOWQ0YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDQxIEBACiAyMDEzLTA5LTIwICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCisgICAgICAgIFNjcm9sbGJhcnMg ZG9uJ3QgYXBwZWFyIG9uIGxvbmcgcGFnZXMgYWZ0ZXIgcjE1NTY2MAorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTIxNzE0CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisgICAgICAgIAorICAgICAgICBBZnRlciByMTU1NjYwLCB3 ZSBkb24ndCBkbyBhbnkgYWRkaXRpb25hbCBsYXlvdXRzIHdoZW4gc2Nyb2xsYmFycyBhcmUgCisg ICAgICAgIGFkZGVkIG9yIHJlbW92ZWQuIFRoYXQgY2F1c2VkIHVzIHRvIG5vdCBlbnRlciB0aGUg Y29kZSB0aGF0IGNyZWF0ZXMgb3IKKyAgICAgICAgZGVzdHJveXMgY29tcG9zdGluZyBsYXllcnMg Zm9yIHNjcm9sbGJhcnMgaW4gUmVuZGVyTGF5ZXJDb21wb3NpdG9yLCByZXN1bHRpbmcKKyAgICAg ICAgaW4gbWlzc2luZyBzY3JvbGxiYXJzLgorICAgICAgICAKKyAgICAgICAgRml4IGJ5IGhhdmlu ZyBTY3JvbGxWaWV3Ojp1cGRhdGVTY3JvbGxiYXJzKCkgY2FsbCBhZGRlZE9yUmVtb3ZlZFNjcm9s bGJhcigpCisgICAgICAgIHdoZW4gYSBzY3JvbGxiYXIgd2FzIGFkZGVkIG9yIHJlbW92ZWQsIHdo aWNoIGlzIG92ZXJyaWRkZW4gaW4gRnJhbWVWaWV3CisgICAgICAgIHRvIGNhbGwgdGhyb3VnaCB0 byBSZW5kZXJMYXllckNvbXBvc2l0b3I6OmZyYW1lVmlld0RpZEFkZE9yUmVtb3ZlU2Nyb2xsYmFy cygpLgorCisgICAgICAgIE5vdCB0ZXN0YWJsZSBzaW5jZSBzY3JvbGxiYXIgbGF5ZXJzIGFyZW4n dCBjb250YWluZWQgaW4gbGF5ZXIgdHJlZSBkdW1wcworICAgICAgICAodG8gcmVkdWNlIGRpZmZz IGJldHdlZW4gcGxhdGZvcm1zKS4KKworICAgICAgICAqIHBhZ2UvRnJhbWVWaWV3LmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OkZyYW1lVmlldzo6YWRkZWRPclJlbW92ZWRTY3JvbGxiYXIpOiBOZXcg ZnVuY3Rpb24gdG8gdGVsbCB0aGUgY29tcG9zaXRvcgorICAgICAgICB0aGF0IHNjcm9sbGJhcnMg Y2hhbmdlZC4KKyAgICAgICAgKiBwYWdlL0ZyYW1lVmlldy5oOgorICAgICAgICAqIHBsYXRmb3Jt L1Njcm9sbFZpZXcuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsVmlldzo6c2V0SGFzSG9y aXpvbnRhbFNjcm9sbGJhcik6IENoYW5nZSB0aGUgbWVhbmluZyBvZiB0aGUgcmV0dXJuCisgICAg ICAgIHZhbHVlIHRvIHNheSBpZiB0aGUgc2Nyb2xsYmFyIHdhcyBhZGRlZCBvciByZW1vdmVkLiBB ZGQgYW4gb3V0IHBhcmFtIHRoYXQgaW5kaWNhdGVzCisgICAgICAgIHdoZXRoZXIgdGhlIHNjcm9s bGJhciBjaGFuZ2UgYWZmZWN0cyBjb250ZW50IHNpemUgKG5vdCB0cnVlIGZvciBvdmVybGF5IHNj cm9sbGJhcnMpLgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsVmlldzo6c2V0SGFzVmVydGljYWxT Y3JvbGxiYXIpOiBEaXR0by4KKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbFZpZXc6OnVwZGF0ZVNj cm9sbGJhcnMpOiBLZWVwIHRyYWNrIG9mIHdoZXRoZXIgc2Nyb2xsYmFycyB3ZXJlCisgICAgICAg IGFkZGVkIG9yIHJlbW92ZWQsIGFuZCBjYWxsIGFkZGVkT3JSZW1vdmVkU2Nyb2xsYmFyKCkgaWYg dHJ1ZS4KKyAgICAgICAgKiBwbGF0Zm9ybS9TY3JvbGxWaWV3Lmg6CisgICAgICAgICogcmVuZGVy aW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJM YXllckNvbXBvc2l0b3I6OmZyYW1lVmlld0RpZEFkZE9yUmVtb3ZlU2Nyb2xsYmFycyk6IENhbGwg dXBkYXRlT3ZlcmZsb3dDb250cm9sc0xheWVycygpLgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVy TGF5ZXJDb21wb3NpdG9yOjp1cGRhdGVPdmVyZmxvd0NvbnRyb2xzTGF5ZXJzKToKKyAgICAgICAg KiByZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmg6CisKKzIwMTMtMDktMjAgIFNpbW9u IEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CisKICAgICAgICAgRW5zdXJlIHRoYXQg VGlsZUNvbnRyb2xsZXIgdGlsZSBjb3ZlcmFnZSBpcyB1cGRhdGVkIG9uIHNjcm9sbGluZyBldmVu IHdoZW4gd2UgZG9uJ3QgaGF2ZSBzY3JvbGxiYXJzCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjE3MDAKICAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzE1 MDMwNTg5PgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwIGIv U291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwCmluZGV4IDgwZmRkNjQxZGY1ZDY1NjJk MGM1MmI0N2YzZDY5ZjU2NDI2MTQyMGEuLjg3NjVhMDBhMjdjZDBjYThhMTcwYmVjNmEyNGNiMjkz MjE3M2E2ZTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5jcHAKQEAgLTIxODEsNiArMjE4MSwx NiBAQCB2b2lkIEZyYW1lVmlldzo6dmlzaWJsZUNvbnRlbnRzUmVzaXplZCgpCiAjZW5kaWYKIH0K IAordm9pZCBGcmFtZVZpZXc6OmFkZGVkT3JSZW1vdmVkU2Nyb2xsYmFyKCkKK3sKKyNpZiBVU0Uo QUNDRUxFUkFURURfQ09NUE9TSVRJTkcpCisgICAgaWYgKFJlbmRlclZpZXcqIHJlbmRlclZpZXcg PSB0aGlzLT5yZW5kZXJWaWV3KCkpIHsKKyAgICAgICAgaWYgKHJlbmRlclZpZXctPnVzZXNDb21w b3NpdGluZygpKQorICAgICAgICAgICAgcmVuZGVyVmlldy0+Y29tcG9zaXRvcigpLmZyYW1lVmll d0RpZEFkZE9yUmVtb3ZlU2Nyb2xsYmFycygpOworICAgIH0KKyNlbmRpZgorfQorCiB2b2lkIEZy YW1lVmlldzo6YmVnaW5EZWZlcnJlZFJlcGFpbnRzKCkKIHsKICAgICBQYWdlKiBwYWdlID0gZnJh bWUoKS5wYWdlKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5o IGIvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuaAppbmRleCA3YzhjMzdhMjhhMDA2Mjcw MWRiY2U2MThlNzRmZjlmZmJmYTBkNGM5Li43NzNiODQwZjA3M2ZmZWUyMjE1NmM5NDBmNzZlMjcz NmE5ZWI4NTM4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5oCisr KyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmgKQEAgLTQ4Myw2ICs0ODMsNyBAQCBw cml2YXRlOgogICAgIHZpcnR1YWwgdm9pZCByZXBhaW50Q29udGVudFJlY3RhbmdsZShjb25zdCBJ bnRSZWN0JiwgYm9vbCBpbW1lZGlhdGUpIE9WRVJSSURFOwogICAgIHZpcnR1YWwgdm9pZCBjb250 ZW50c1Jlc2l6ZWQoKSBPVkVSUklERTsKICAgICB2aXJ0dWFsIHZvaWQgdmlzaWJsZUNvbnRlbnRz UmVzaXplZCgpIE9WRVJSSURFOworICAgIHZpcnR1YWwgdm9pZCBhZGRlZE9yUmVtb3ZlZFNjcm9s bGJhcigpIE9WRVJSSURFOwogICAgIHZpcnR1YWwgdm9pZCBmaXhlZExheW91dFNpemVDaGFuZ2Vk KCkgT1ZFUlJJREU7CiAKICAgICB2aXJ0dWFsIHZvaWQgZGVsZWdhdGVzU2Nyb2xsaW5nRGlkQ2hh bmdlKCkgT1ZFUlJJREU7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3Jv bGxWaWV3LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbFZpZXcuY3BwCmluZGV4 IDA4MTNkM2EwYTMyNTRlM2QxYTlkMTg5YzIwNjQ2ODJkMDhiMGRmMDkuLmIzODU2NWM3YzY2MDAz NTYzZjJkMWFlNjY2YTg3OGNjYTdmNmY0MjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL1Njcm9sbFZpZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9s bFZpZXcuY3BwCkBAIC04NCw3ICs4NCw3IEBAIHZvaWQgU2Nyb2xsVmlldzo6cmVtb3ZlQ2hpbGQo V2lkZ2V0KiBjaGlsZCkKICAgICAgICAgcGxhdGZvcm1SZW1vdmVDaGlsZChjaGlsZCk7CiB9CiAK LWJvb2wgU2Nyb2xsVmlldzo6c2V0SGFzSG9yaXpvbnRhbFNjcm9sbGJhcihib29sIGhhc0JhcikK K2Jvb2wgU2Nyb2xsVmlldzo6c2V0SGFzSG9yaXpvbnRhbFNjcm9sbGJhcihib29sIGhhc0Jhciwg Ym9vbCogY29udGVudFNpemVBZmZlY3RlZCkKIHsKICAgICBBU1NFUlQoIWhhc0JhciB8fCAhYXZv aWRTY3JvbGxiYXJDcmVhdGlvbigpKTsKICAgICBpZiAoaGFzQmFyICYmICFtX2hvcml6b250YWxT Y3JvbGxiYXIpIHsKQEAgLTkyLDcgKzkyLDkgQEAgYm9vbCBTY3JvbGxWaWV3OjpzZXRIYXNIb3Jp em9udGFsU2Nyb2xsYmFyKGJvb2wgaGFzQmFyKQogICAgICAgICBhZGRDaGlsZChtX2hvcml6b250 YWxTY3JvbGxiYXIuZ2V0KCkpOwogICAgICAgICBkaWRBZGRTY3JvbGxiYXIobV9ob3Jpem9udGFs U2Nyb2xsYmFyLmdldCgpLCBIb3Jpem9udGFsU2Nyb2xsYmFyKTsKICAgICAgICAgbV9ob3Jpem9u dGFsU2Nyb2xsYmFyLT5zdHlsZUNoYW5nZWQoKTsKLSAgICAgICAgcmV0dXJuICFtX2hvcml6b250 YWxTY3JvbGxiYXItPmlzT3ZlcmxheVNjcm9sbGJhcigpOworICAgICAgICBpZiAoY29udGVudFNp emVBZmZlY3RlZCkKKyAgICAgICAgICAgICpjb250ZW50U2l6ZUFmZmVjdGVkID0gIW1faG9yaXpv bnRhbFNjcm9sbGJhci0+aXNPdmVybGF5U2Nyb2xsYmFyKCk7CisgICAgICAgIHJldHVybiB0cnVl OwogICAgIH0KICAgICAKICAgICBpZiAoIWhhc0JhciAmJiBtX2hvcml6b250YWxTY3JvbGxiYXIp IHsKQEAgLTEwMCwxMyArMTAyLDE1IEBAIGJvb2wgU2Nyb2xsVmlldzo6c2V0SGFzSG9yaXpvbnRh bFNjcm9sbGJhcihib29sIGhhc0JhcikKICAgICAgICAgd2lsbFJlbW92ZVNjcm9sbGJhcihtX2hv cml6b250YWxTY3JvbGxiYXIuZ2V0KCksIEhvcml6b250YWxTY3JvbGxiYXIpOwogICAgICAgICBy ZW1vdmVDaGlsZChtX2hvcml6b250YWxTY3JvbGxiYXIuZ2V0KCkpOwogICAgICAgICBtX2hvcml6 b250YWxTY3JvbGxiYXIgPSAwOwotICAgICAgICByZXR1cm4gIXdhc092ZXJsYXlTY3JvbGxiYXI7 CisgICAgICAgIGlmIChjb250ZW50U2l6ZUFmZmVjdGVkKQorICAgICAgICAgICAgKmNvbnRlbnRT aXplQWZmZWN0ZWQgPSAhd2FzT3ZlcmxheVNjcm9sbGJhcjsKKyAgICAgICAgcmV0dXJuIHRydWU7 CiAgICAgfQogCiAgICAgcmV0dXJuIGZhbHNlOwogfQogCi1ib29sIFNjcm9sbFZpZXc6OnNldEhh c1ZlcnRpY2FsU2Nyb2xsYmFyKGJvb2wgaGFzQmFyKQorYm9vbCBTY3JvbGxWaWV3OjpzZXRIYXNW ZXJ0aWNhbFNjcm9sbGJhcihib29sIGhhc0JhciwgYm9vbCogY29udGVudFNpemVBZmZlY3RlZCkK IHsKICAgICBBU1NFUlQoIWhhc0JhciB8fCAhYXZvaWRTY3JvbGxiYXJDcmVhdGlvbigpKTsKICAg ICBpZiAoaGFzQmFyICYmICFtX3ZlcnRpY2FsU2Nyb2xsYmFyKSB7CkBAIC0xMTQsNyArMTE4LDkg QEAgYm9vbCBTY3JvbGxWaWV3OjpzZXRIYXNWZXJ0aWNhbFNjcm9sbGJhcihib29sIGhhc0JhcikK ICAgICAgICAgYWRkQ2hpbGQobV92ZXJ0aWNhbFNjcm9sbGJhci5nZXQoKSk7CiAgICAgICAgIGRp ZEFkZFNjcm9sbGJhcihtX3ZlcnRpY2FsU2Nyb2xsYmFyLmdldCgpLCBWZXJ0aWNhbFNjcm9sbGJh cik7CiAgICAgICAgIG1fdmVydGljYWxTY3JvbGxiYXItPnN0eWxlQ2hhbmdlZCgpOwotICAgICAg ICByZXR1cm4gIW1fdmVydGljYWxTY3JvbGxiYXItPmlzT3ZlcmxheVNjcm9sbGJhcigpOworICAg ICAgICBpZiAoY29udGVudFNpemVBZmZlY3RlZCkKKyAgICAgICAgICAgICpjb250ZW50U2l6ZUFm ZmVjdGVkID0gIW1fdmVydGljYWxTY3JvbGxiYXItPmlzT3ZlcmxheVNjcm9sbGJhcigpOworICAg ICAgICByZXR1cm4gdHJ1ZTsKICAgICB9CiAgICAgCiAgICAgaWYgKCFoYXNCYXIgJiYgbV92ZXJ0 aWNhbFNjcm9sbGJhcikgewpAQCAtMTIyLDcgKzEyOCw5IEBAIGJvb2wgU2Nyb2xsVmlldzo6c2V0 SGFzVmVydGljYWxTY3JvbGxiYXIoYm9vbCBoYXNCYXIpCiAgICAgICAgIHdpbGxSZW1vdmVTY3Jv bGxiYXIobV92ZXJ0aWNhbFNjcm9sbGJhci5nZXQoKSwgVmVydGljYWxTY3JvbGxiYXIpOwogICAg ICAgICByZW1vdmVDaGlsZChtX3ZlcnRpY2FsU2Nyb2xsYmFyLmdldCgpKTsKICAgICAgICAgbV92 ZXJ0aWNhbFNjcm9sbGJhciA9IDA7Ci0gICAgICAgIHJldHVybiAhd2FzT3ZlcmxheVNjcm9sbGJh cjsKKyAgICAgICAgaWYgKGNvbnRlbnRTaXplQWZmZWN0ZWQpCisgICAgICAgICAgICAqY29udGVu dFNpemVBZmZlY3RlZCA9ICF3YXNPdmVybGF5U2Nyb2xsYmFyOworICAgICAgICByZXR1cm4gdHJ1 ZTsKICAgICB9CiAKICAgICByZXR1cm4gZmFsc2U7CkBAIC01MjIsMTEgKzUzMCwxOCBAQCB2b2lk IFNjcm9sbFZpZXc6OnVwZGF0ZVNjcm9sbGJhcnMoY29uc3QgSW50U2l6ZSYgZGVzaXJlZE9mZnNl dCkKICAgICBpZiAodlNjcm9sbCAhPSBTY3JvbGxiYXJBdXRvKQogICAgICAgICBuZXdIYXNWZXJ0 aWNhbFNjcm9sbGJhciA9ICh2U2Nyb2xsID09IFNjcm9sbGJhckFsd2F5c09uKTsKIAorICAgIGJv b2wgc2Nyb2xsYmFyQWRkZWRPclJlbW92ZWQgPSBmYWxzZTsKKwogICAgIGlmIChtX3Njcm9sbGJh cnNTdXBwcmVzc2VkIHx8IChoU2Nyb2xsICE9IFNjcm9sbGJhckF1dG8gJiYgdlNjcm9sbCAhPSBT Y3JvbGxiYXJBdXRvKSkgewotICAgICAgICBpZiAoaGFzSG9yaXpvbnRhbFNjcm9sbGJhciAhPSBu ZXdIYXNIb3Jpem9udGFsU2Nyb2xsYmFyICYmIChoYXNIb3Jpem9udGFsU2Nyb2xsYmFyIHx8ICFh dm9pZFNjcm9sbGJhckNyZWF0aW9uKCkpKQotICAgICAgICAgICAgc2V0SGFzSG9yaXpvbnRhbFNj cm9sbGJhcihuZXdIYXNIb3Jpem9udGFsU2Nyb2xsYmFyKTsKLSAgICAgICAgaWYgKGhhc1ZlcnRp Y2FsU2Nyb2xsYmFyICE9IG5ld0hhc1ZlcnRpY2FsU2Nyb2xsYmFyICYmIChoYXNWZXJ0aWNhbFNj cm9sbGJhciB8fCAhYXZvaWRTY3JvbGxiYXJDcmVhdGlvbigpKSkKLSAgICAgICAgICAgIHNldEhh c1ZlcnRpY2FsU2Nyb2xsYmFyKG5ld0hhc1ZlcnRpY2FsU2Nyb2xsYmFyKTsKKyAgICAgICAgaWYg KGhhc0hvcml6b250YWxTY3JvbGxiYXIgIT0gbmV3SGFzSG9yaXpvbnRhbFNjcm9sbGJhciAmJiAo aGFzSG9yaXpvbnRhbFNjcm9sbGJhciB8fCAhYXZvaWRTY3JvbGxiYXJDcmVhdGlvbigpKSkgewor ICAgICAgICAgICAgaWYgKHNldEhhc0hvcml6b250YWxTY3JvbGxiYXIobmV3SGFzSG9yaXpvbnRh bFNjcm9sbGJhcikpCisgICAgICAgICAgICAgICAgc2Nyb2xsYmFyQWRkZWRPclJlbW92ZWQgPSB0 cnVlOworICAgICAgICB9CisKKyAgICAgICAgaWYgKGhhc1ZlcnRpY2FsU2Nyb2xsYmFyICE9IG5l d0hhc1ZlcnRpY2FsU2Nyb2xsYmFyICYmIChoYXNWZXJ0aWNhbFNjcm9sbGJhciB8fCAhYXZvaWRT Y3JvbGxiYXJDcmVhdGlvbigpKSkgeworICAgICAgICAgICAgaWYgKHNldEhhc1ZlcnRpY2FsU2Ny b2xsYmFyKG5ld0hhc1ZlcnRpY2FsU2Nyb2xsYmFyKSkKKyAgICAgICAgICAgICAgICBzY3JvbGxi YXJBZGRlZE9yUmVtb3ZlZCA9IHRydWU7CisgICAgICAgIH0KICAgICB9IGVsc2UgewogICAgICAg ICBib29sIHNlbmRDb250ZW50UmVzaXplZE5vdGlmaWNhdGlvbiA9IGZhbHNlOwogICAgICAgICAK QEAgLTU1Nyw3ICs1NzIsMTEgQEAgdm9pZCBTY3JvbGxWaWV3Ojp1cGRhdGVTY3JvbGxiYXJzKGNv bnN0IEludFNpemUmIGRlc2lyZWRPZmZzZXQpCiAgICAgICAgICAgICBpZiAobV9ob3Jpem9udGFs U2Nyb2xsYmFyKQogICAgICAgICAgICAgICAgIG1faG9yaXpvbnRhbFNjcm9sbGJhci0+aW52YWxp ZGF0ZSgpOwogCi0gICAgICAgICAgICBzZW5kQ29udGVudFJlc2l6ZWROb3RpZmljYXRpb24gPSBz ZXRIYXNIb3Jpem9udGFsU2Nyb2xsYmFyKG5ld0hhc0hvcml6b250YWxTY3JvbGxiYXIpOworICAg ICAgICAgICAgYm9vbCBjaGFuZ2VBZmZlY3RzQ29udGVudFNpemUgPSBmYWxzZTsKKyAgICAgICAg ICAgIGlmIChzZXRIYXNIb3Jpem9udGFsU2Nyb2xsYmFyKG5ld0hhc0hvcml6b250YWxTY3JvbGxi YXIsICZjaGFuZ2VBZmZlY3RzQ29udGVudFNpemUpKSB7CisgICAgICAgICAgICAgICAgc2Nyb2xs YmFyQWRkZWRPclJlbW92ZWQgPSB0cnVlOworICAgICAgICAgICAgICAgIHNlbmRDb250ZW50UmVz aXplZE5vdGlmaWNhdGlvbiB8PSBjaGFuZ2VBZmZlY3RzQ29udGVudFNpemU7CisgICAgICAgICAg ICB9CiAgICAgICAgIH0KIAogICAgICAgICBpZiAoaGFzVmVydGljYWxTY3JvbGxiYXIgIT0gbmV3 SGFzVmVydGljYWxTY3JvbGxiYXIgJiYgKGhhc1ZlcnRpY2FsU2Nyb2xsYmFyIHx8ICFhdm9pZFNj cm9sbGJhckNyZWF0aW9uKCkpKSB7CkBAIC01NjYsNyArNTg1LDExIEBAIHZvaWQgU2Nyb2xsVmll dzo6dXBkYXRlU2Nyb2xsYmFycyhjb25zdCBJbnRTaXplJiBkZXNpcmVkT2Zmc2V0KQogICAgICAg ICAgICAgaWYgKG1fdmVydGljYWxTY3JvbGxiYXIpCiAgICAgICAgICAgICAgICAgbV92ZXJ0aWNh bFNjcm9sbGJhci0+aW52YWxpZGF0ZSgpOwogCi0gICAgICAgICAgICBzZW5kQ29udGVudFJlc2l6 ZWROb3RpZmljYXRpb24gPSBzZXRIYXNWZXJ0aWNhbFNjcm9sbGJhcihuZXdIYXNWZXJ0aWNhbFNj cm9sbGJhcik7CisgICAgICAgICAgICBib29sIGNoYW5nZUFmZmVjdHNDb250ZW50U2l6ZSA9IGZh bHNlOworICAgICAgICAgICAgaWYgKHNldEhhc1ZlcnRpY2FsU2Nyb2xsYmFyKG5ld0hhc1ZlcnRp Y2FsU2Nyb2xsYmFyLCAmY2hhbmdlQWZmZWN0c0NvbnRlbnRTaXplKSkgeworICAgICAgICAgICAg ICAgIHNjcm9sbGJhckFkZGVkT3JSZW1vdmVkID0gdHJ1ZTsKKyAgICAgICAgICAgICAgICBzZW5k Q29udGVudFJlc2l6ZWROb3RpZmljYXRpb24gfD0gY2hhbmdlQWZmZWN0c0NvbnRlbnRTaXplOwor ICAgICAgICAgICAgfQogICAgICAgICB9CiAKICAgICAgICAgaWYgKHNlbmRDb250ZW50UmVzaXpl ZE5vdGlmaWNhdGlvbiAmJiBtX3VwZGF0ZVNjcm9sbGJhcnNQYXNzIDwgY01heFVwZGF0ZVNjcm9s bGJhcnNQYXNzKSB7CkBAIC01ODIsNiArNjA1LDkgQEAgdm9pZCBTY3JvbGxWaWV3Ojp1cGRhdGVT Y3JvbGxiYXJzKGNvbnN0IEludFNpemUmIGRlc2lyZWRPZmZzZXQpCiAgICAgICAgICAgICB9CiAg ICAgICAgICAgICBtX3VwZGF0ZVNjcm9sbGJhcnNQYXNzLS07CiAgICAgICAgIH0KKworICAgICAg ICBpZiAoc2Nyb2xsYmFyQWRkZWRPclJlbW92ZWQpCisgICAgICAgICAgICBhZGRlZE9yUmVtb3Zl ZFNjcm9sbGJhcigpOwogICAgIH0KICAgICAKICAgICAvLyBTZXQgdXAgdGhlIHJhbmdlIChhbmQg cGFnZSBzdGVwL2xpbmUgc3RlcCksIGJ1dCBvbmx5IGRvIHRoaXMgaWYgd2UncmUgbm90IGluIGEg bmVzdGVkIGNhbGwgKHRvIGF2b2lkCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9TY3JvbGxWaWV3LmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxWaWV3LmgKaW5k ZXggOGRlMDRmYjNmZTA4MzdkMGI3NTYwMDFmN2EzYTBlNDMzMWRkYTM5Zi4uZmE2OTlkNDg3MWNj NjkxZDBmY2Y3YmY2MmVjMDliNThiYjYzZjM2ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vU2Nyb2xsVmlldy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9s bFZpZXcuaApAQCAtMzExLDEzICszMTEsMTQgQEAgcHJvdGVjdGVkOgogICAgIHZpcnR1YWwgdm9p ZCBwYWludE92ZXJoYW5nQXJlYXMoR3JhcGhpY3NDb250ZXh0KiwgY29uc3QgSW50UmVjdCYgaG9y aXpvbnRhbE92ZXJoYW5nQXJlYSwgY29uc3QgSW50UmVjdCYgdmVydGljYWxPdmVyaGFuZ0FyZWEs IGNvbnN0IEludFJlY3QmIGRpcnR5UmVjdCk7CiAKICAgICB2aXJ0dWFsIHZvaWQgdmlzaWJsZUNv bnRlbnRzUmVzaXplZCgpID0gMDsKKyAgICB2aXJ0dWFsIHZvaWQgYWRkZWRPclJlbW92ZWRTY3Jv bGxiYXIoKSA9IDA7CiAgICAgdmlydHVhbCB2b2lkIGRlbGVnYXRlc1Njcm9sbGluZ0RpZENoYW5n ZSgpIHsgfQogICAgIHZpcnR1YWwgdm9pZCBmaXhlZExheW91dFNpemVDaGFuZ2VkKCk7CiAKICAg ICAvLyBUaGVzZSBmdW5jdGlvbnMgYXJlIHVzZWQgdG8gY3JlYXRlL2Rlc3Ryb3kgc2Nyb2xsYmFy cy4KLSAgICAvLyBUaGV5IHJldHVybiB0cnVlIGlmIHRoZSBzcGFjZSB0YWtlbiB1cCBieSB0aGUg c2Nyb2xsYmFyIGNoYW5nZWQuCi0gICAgYm9vbCBzZXRIYXNIb3Jpem9udGFsU2Nyb2xsYmFyKGJv b2wpOwotICAgIGJvb2wgc2V0SGFzVmVydGljYWxTY3JvbGxiYXIoYm9vbCk7CisgICAgLy8gVGhl eSByZXR1cm4gdHJ1ZSBpZiB0aGUgc2Nyb2xsYmFyIHdhcyBhZGRlZCBvciByZW1vdmVkLgorICAg IGJvb2wgc2V0SGFzSG9yaXpvbnRhbFNjcm9sbGJhcihib29sLCBib29sKiBjb250ZW50U2l6ZUFm ZmVjdGVkID0gMCk7CisgICAgYm9vbCBzZXRIYXNWZXJ0aWNhbFNjcm9sbGJhcihib29sLCBib29s KiBjb250ZW50U2l6ZUFmZmVjdGVkID0gMCk7CiAKICAgICB2aXJ0dWFsIHZvaWQgdXBkYXRlU2Ny b2xsQ29ybmVyKCk7CiAgICAgdmlydHVhbCB2b2lkIGludmFsaWRhdGVTY3JvbGxDb3JuZXJSZWN0 KGNvbnN0IEludFJlY3QmKSBPVkVSUklERTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5jcHAKaW5kZXggNTVmY2Y2N2RiNDM1MmM5MmI5NmRl YWVlODg4Mjg4NGE0MDJlNjFmYy4uMmU2YTIyNTAwOWFkZTM2NGIxODNiMjAxMTM2NTI3ZGRhYzM1 NWRkOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQ29t cG9zaXRvci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQ29t cG9zaXRvci5jcHAKQEAgLTEzNDAsNiArMTM0MCwxMSBAQCB2b2lkIFJlbmRlckxheWVyQ29tcG9z aXRvcjo6ZnJhbWVWaWV3RGlkU2Nyb2xsKCkKICAgICAgICAgZml4ZWRCYWNrZ3JvdW5kTGF5ZXIt PnNldFBvc2l0aW9uKEludFBvaW50KGZyYW1lVmlldy5zY3JvbGxPZmZzZXRGb3JGaXhlZFBvc2l0 aW9uKCkpKTsKIH0KIAordm9pZCBSZW5kZXJMYXllckNvbXBvc2l0b3I6OmZyYW1lVmlld0RpZEFk ZE9yUmVtb3ZlU2Nyb2xsYmFycygpCit7CisgICAgdXBkYXRlT3ZlcmZsb3dDb250cm9sc0xheWVy cygpOworfQorCiB2b2lkIFJlbmRlckxheWVyQ29tcG9zaXRvcjo6ZnJhbWVWaWV3RGlkTGF5b3V0 KCkKIHsKICAgICBSZW5kZXJMYXllckJhY2tpbmcqIHJlbmRlclZpZXdCYWNraW5nID0gbV9yZW5k ZXJWaWV3LmxheWVyKCktPmJhY2tpbmcoKTsKQEAgLTI3NDAsNyArMjc0NSw3IEBAIHZvaWQgUmVu ZGVyTGF5ZXJDb21wb3NpdG9yOjp1cGRhdGVPdmVyZmxvd0NvbnRyb2xzTGF5ZXJzKCkKICAgICAg ICAgICAgIG1fbGF5ZXJGb3JWZXJ0aWNhbFNjcm9sbGJhci0+c2V0TmFtZSgidmVydGljYWwgc2Ny b2xsYmFyIik7CiAjZW5kaWYKICNpZiBQTEFURk9STShNQUMpICYmIFVTRShDQSkKLSAgICAgICAg bV9sYXllckZvclZlcnRpY2FsU2Nyb2xsYmFyLT5zZXRBY2NlbGVyYXRlc0RyYXdpbmcoYWNjZWxl cmF0ZWREcmF3aW5nRW5hYmxlZCgpKTsKKyAgICAgICAgICAgIG1fbGF5ZXJGb3JWZXJ0aWNhbFNj cm9sbGJhci0+c2V0QWNjZWxlcmF0ZXNEcmF3aW5nKGFjY2VsZXJhdGVkRHJhd2luZ0VuYWJsZWQo KSk7CiAjZW5kaWYKICAgICAgICAgICAgIG1fb3ZlcmZsb3dDb250cm9sc0hvc3RMYXllci0+YWRk Q2hpbGQobV9sYXllckZvclZlcnRpY2FsU2Nyb2xsYmFyLmdldCgpKTsKIApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5oIGIvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5oCmluZGV4IDhlNjYyMzZh MGZkMzZjYWQwY2JmMGNmNDgyZWFhMWI2MGYxNGI1NGIuLjU5NTRlMDkwN2Q3ZThlMTBmYjQwMGRi YTI5YTE1NjkzY2JkOTRjNjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJMYXllckNvbXBvc2l0b3IuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyTGF5ZXJDb21wb3NpdG9yLmgKQEAgLTIzNSw2ICsyMzUsNyBAQCBwdWJsaWM6CiAgICAgdm9p ZCBmcmFtZVZpZXdEaWRDaGFuZ2VMb2NhdGlvbihjb25zdCBJbnRQb2ludCYgY29udGVudHNPZmZz ZXQpOwogICAgIHZvaWQgZnJhbWVWaWV3RGlkQ2hhbmdlU2l6ZSgpOwogICAgIHZvaWQgZnJhbWVW aWV3RGlkU2Nyb2xsKCk7CisgICAgdm9pZCBmcmFtZVZpZXdEaWRBZGRPclJlbW92ZVNjcm9sbGJh cnMoKTsKICAgICB2b2lkIGZyYW1lVmlld0RpZExheW91dCgpOwogICAgIHZvaWQgcm9vdEZpeGVk QmFja2dyb3VuZHNDaGFuZ2VkKCk7CiAK