132889 2014-05-13 15:19:09 -0700 REGRESSION (topContentInset): Searching through Facebook Messenger's chat causes scrolling in News Feed 2014-05-13 17:14:58 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 bdakin webkit-unassigned bdakin commit-queue esprehn+autocc glenn kondapallykalyan sam simon.fraser thorton oldest_to_newest 1009107 0 bdakin 2014-05-13 15:19:09 -0700 REGRESSION (topContentInset): Searching through Facebook Messenger's chat causes scrolling in News Feed <rdar://problem/16715716> 1009111 1 231412 bdakin 2014-05-13 15:33:56 -0700 Created attachment 231412 Patch 1009113 2 231412 simon.fraser 2014-05-13 15:37:11 -0700 Comment on attachment 231412 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=231412&action=review > Source/WebCore/platform/ScrollView.cpp:430 > + IntSize scrollOffset = this->scrollOffset(); > + return IntSize(scrollOffset.width(), scrollOffset.height() - headerHeight()); return scrollOffset() - IntSize(0, headerHeight) ? > Source/WebCore/platform/ScrollView.h:244 > + // scrollOffset() anchors its (0,0) point at the top end of the scolling layer. When the Page Seems odd for a comment in ScrollView.h to be talking about layers, since this is below the level of layer stuff. "at the top end" is odd too. 1009144 3 bdakin 2014-05-13 17:14:58 -0700 Thanks Simon! http://trac.webkit.org/changeset/168763 231412 2014-05-13 15:33:56 -0700 2014-05-13 15:37:10 -0700 Patch for-review.txt text/plain 12863 bdakin SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2ODc0NSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDQxIEBACisyMDE0LTA1LTEzICBCZXRoIERh a2luICA8YmRha2luQGFwcGxlLmNvbT4KKworICAgICAgICBSRUdSRVNTSU9OICh0b3BDb250ZW50 SW5zZXQpOiBTZWFyY2hpbmcgdGhyb3VnaCBGYWNlYm9vayBNZXNzZW5nZXIncyBjaGF0IGNhdXNl cyAKKyAgICAgICAgc2Nyb2xsaW5nIGluIE5ld3MgRmVlZAorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTMyODg5CisgICAgICAgIC1hbmQgY29ycmVzcG9u ZGluZy0KKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzE2NzE1NzE2PgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEZpcnN0IG9mIGFsbCwgc2Nyb2xsT2Zm c2V0UmVsYXRpdmVUb0RvY3VtZW50KCkgd2FzIHZlcnkgcG9vcmx5IG5hbWVkLiBUaGlzIHBhdGNo IAorICAgICAgICByZS1uYW1lcyBpdCB0byB0aGUgbXVjaCBtb3JlIGFjY3VyYXRlIGRvY3VtZW50 U2Nyb2xsT2Zmc2V0UmVsYXRpdmVUb1ZpZXdPcmlnaW4oKS4gCisgICAgICAgIFJlLW5hbWluZyBp dCBtYWtlcyBpdCBjbGVhciB0aGF0IE9ORSBjYWxsIHNpdGUgd2FzIG5vdCBnZXR0aW5nIHRoZSBy aWdodCBvZmZzZXQuIAorICAgICAgICBUaGF0IGNhbGwgc2l0ZSBkb2VzIG5vdCB3YW50IHRvIGtu b3cgdGhlIGRvY3VtZW504oCZcyBwb3NpdGlvbiByZWxhdGl2ZSB0byB0aGUgdmlldyAKKyAgICAg ICAgb3JpZ2luLCBidXQgcmF0aGVyIGl0IHdhbnRzIHRvIGtub3cgdGhlIERvY3VtZW504oCZcyBw b3NpdGlvbiByZWxhdGl2ZSB0byB0aGUgCisgICAgICAgIHNjcm9sbGluZyBvcmlnaW4uCisKKyAg ICAgICAgRXhwb3J0IG5ldyBuYW1lLgorICAgICAgICAqIFdlYkNvcmUuZXhwLmluOgorCisgICAg ICAgIFVzZSBuZXdseSByZS1uYW1lZCBkb2N1bWVudFNjcm9sbFBvc2l0aW9uUmVsYXRpdmVUb1Zp ZXdPcmlnaW4oKS4KKyAgICAgICAgKiBwYWdlL0ZyYW1lVmlldy5jcHA6CisgICAgICAgIChXZWJD b3JlOjpGcmFtZVZpZXc6OmNvbnZlcnRUb1JlbmRlcmVyKToKKyAgICAgICAgKiBwbGF0Zm9ybS9T Y3JvbGxWaWV3LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbFZpZXc6OmRvY3VtZW50U2Ny b2xsT2Zmc2V0UmVsYXRpdmVUb1ZpZXdPcmlnaW4pOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xs Vmlldzo6ZG9jdW1lbnRTY3JvbGxQb3NpdGlvblJlbGF0aXZlVG9WaWV3T3JpZ2luKToKKyAgICAg ICAgKFdlYkNvcmU6OlNjcm9sbFZpZXc6OmRvY3VtZW50U2Nyb2xsT2Zmc2V0UmVsYXRpdmVUb1Nj cm9sbGFibGVBcmVhT3JpZ2luKToKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbFZpZXc6OnJvb3RW aWV3VG9Db250ZW50cyk6CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxWaWV3Ojp3aW5kb3dUb0Nv bnRlbnRzKToKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbFZpZXc6OnNjcm9sbE9mZnNldFJlbGF0 aXZlVG9Eb2N1bWVudCk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxWaWV3Ojpz Y3JvbGxQb3NpdGlvblJlbGF0aXZlVG9Eb2N1bWVudCk6IERlbGV0ZWQuCisgICAgICAgICogcGxh dGZvcm0vU2Nyb2xsVmlldy5oOgorCisgICAgICAgIFRISVMgaXMgdGhlIHNwb3QgdGhhdCBuZWVk cyB0aGUgbmV3IGZ1bmN0aW9uLCAKKyAgICAgICAgZG9jdW1lbnRTY3JvbGxPZmZzZXRSZWxhdGl2 ZVRvU2Nyb2xsYWJsZUFyZWFPcmlnaW4oKSgpCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckxh eWVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyOjpzY3JvbGxSZWN0VG9WaXNp YmxlKToKKwogMjAxNC0wNS0xMyAgRW5yaWNhIENhc3VjY2kgIDxlbnJpY2FAYXBwbGUuY29tPgog CiAgICAgICAgIFJFR1JFU1NJT04gKFdlYktpdDIpOiBab29taW5nIHRvIHRleHQgZmllbGQgbGVh dmVzIGl0IHBhcnRpYWxseSBoaWRkZW4gYnkgdGhlIGZvcm0gYXNzaXN0YW50LgpJbmRleDogU291 cmNlL1dlYkNvcmUvV2ViQ29yZS5leHAuaW4KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUv V2ViQ29yZS5leHAuaW4JKHJldmlzaW9uIDE2ODY4NykKKysrIFNvdXJjZS9XZWJDb3JlL1dlYkNv cmUuZXhwLmluCSh3b3JraW5nIGNvcHkpCkBAIC0xNTA3LDcgKzE1MDcsNyBAQCBfX1pOSzdXZWJD b3JlMTBTY3JvbGxWaWV3MThjb250ZW50c1RvUm9vCiBfX1pOSzdXZWJDb3JlMTBTY3JvbGxWaWV3 MThjb250ZW50c1RvUm9vdFZpZXdFUktOU184SW50UG9pbnRFCiBfX1pOSzdXZWJDb3JlMTBTY3Jv bGxWaWV3MThyb290Vmlld1RvQ29udGVudHNFUktOU184SW50UG9pbnRFCiBfX1pOSzdXZWJDb3Jl MTBTY3JvbGxWaWV3MjNyb290Vmlld1RvVG90YWxDb250ZW50c0VSS05TXzhJbnRQb2ludEUKLV9f Wk5LN1dlYkNvcmUxMFNjcm9sbFZpZXczMHNjcm9sbE9mZnNldFJlbGF0aXZlVG9Eb2N1bWVudEV2 CitfX1pOSzdXZWJDb3JlMTBTY3JvbGxWaWV3NDBkb2N1bWVudFNjcm9sbE9mZnNldFJlbGF0aXZl VG9WaWV3T3JpZ2luRXYKIF9fWk5LN1dlYkNvcmUxMFN0b3JhZ2VNYXA2bGVuZ3RoRXYKIF9fWk5L N1dlYkNvcmUxMFN0b3JhZ2VNYXA3Z2V0SXRlbUVSS04zV1RGNlN0cmluZ0UKIF9fWk5LN1dlYkNv cmUxMFN0b3JhZ2VNYXA4Y29udGFpbnNFUktOM1dURjZTdHJpbmdFCkluZGV4OiBTb3VyY2UvV2Vi Q29yZS9wYWdlL0ZyYW1lVmlldy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGFn ZS9GcmFtZVZpZXcuY3BwCShyZXZpc2lvbiAxNjg2ODcpCisrKyBTb3VyY2UvV2ViQ29yZS9wYWdl L0ZyYW1lVmlldy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTM4NzksNyArMzg3OSw3IEBAIEludFJl Y3QgRnJhbWVWaWV3Ojpjb252ZXJ0VG9SZW5kZXJlcihjb24KICAgICAKICAgICAvLyBDb252ZXJ0 IGZyb20gRnJhbWVWaWV3IGNvb3JkcyBpbnRvIHBhZ2UgKCJhYnNvbHV0ZSIpIGNvb3JkaW5hdGVz LgogICAgIGlmICghZGVsZWdhdGVzU2Nyb2xsaW5nKCkpCi0gICAgICAgIHJlY3QubW92ZUJ5KHNj cm9sbFBvc2l0aW9uUmVsYXRpdmVUb0RvY3VtZW50KCkpOworICAgICAgICByZWN0Lm1vdmVCeShk b2N1bWVudFNjcm9sbFBvc2l0aW9uUmVsYXRpdmVUb1ZpZXdPcmlnaW4oKSk7CiAKICAgICAvLyBG SVhNRTogd2UgZG9uJ3QgaGF2ZSBhIHdheSB0byBtYXAgYW4gYWJzb2x1dGUgcmVjdCBkb3duIHRv IGEgbG9jYWwgcXVhZCwgc28ganVzdAogICAgIC8vIG1vdmUgdGhlIHJlY3QgZm9yIG5vdy4KQEAg LTM5MDMsNyArMzkwMyw3IEBAIEludFBvaW50IEZyYW1lVmlldzo6Y29udmVydFRvUmVuZGVyZXIo Y28KIAogICAgIC8vIENvbnZlcnQgZnJvbSBGcmFtZVZpZXcgY29vcmRzIGludG8gcGFnZSAoImFi c29sdXRlIikgY29vcmRpbmF0ZXMuCiAgICAgaWYgKCFkZWxlZ2F0ZXNTY3JvbGxpbmcoKSkKLSAg ICAgICAgcG9pbnQgPSBwb2ludCArIHNjcm9sbFBvc2l0aW9uUmVsYXRpdmVUb0RvY3VtZW50KCk7 CisgICAgICAgIHBvaW50ID0gcG9pbnQgKyBkb2N1bWVudFNjcm9sbFBvc2l0aW9uUmVsYXRpdmVU b1ZpZXdPcmlnaW4oKTsKIAogICAgIHJldHVybiByb3VuZGVkSW50UG9pbnQocmVuZGVyZXItPmFi c29sdXRlVG9Mb2NhbChwb2ludCwgVXNlVHJhbnNmb3JtcykpOwogfQpJbmRleDogU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vU2Nyb2xsVmlldy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vU2Nyb2xsVmlldy5jcHAJKHJldmlzaW9uIDE2ODY4NykKKysrIFNvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL1Njcm9sbFZpZXcuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00MTIsMTgg KzQxMiwyNCBAQCBJbnRQb2ludCBTY3JvbGxWaWV3OjphZGp1c3RTY3JvbGxQb3NpdGlvCiAgICAg cmV0dXJuIG5ld1Njcm9sbFBvc2l0aW9uOwogfQogCi1JbnRTaXplIFNjcm9sbFZpZXc6OnNjcm9s bE9mZnNldFJlbGF0aXZlVG9Eb2N1bWVudCgpIGNvbnN0CitJbnRTaXplIFNjcm9sbFZpZXc6OmRv Y3VtZW50U2Nyb2xsT2Zmc2V0UmVsYXRpdmVUb1ZpZXdPcmlnaW4oKSBjb25zdAogewogICAgIElu dFNpemUgc2Nyb2xsT2Zmc2V0ID0gdGhpcy0+c2Nyb2xsT2Zmc2V0KCk7CiAgICAgcmV0dXJuIElu dFNpemUoc2Nyb2xsT2Zmc2V0LndpZHRoKCksIHNjcm9sbE9mZnNldC5oZWlnaHQoKSAtIGhlYWRl ckhlaWdodCgpIC0gdG9wQ29udGVudEluc2V0KCkpOwogfQogCi1JbnRQb2ludCBTY3JvbGxWaWV3 OjpzY3JvbGxQb3NpdGlvblJlbGF0aXZlVG9Eb2N1bWVudCgpIGNvbnN0CitJbnRQb2ludCBTY3Jv bGxWaWV3Ojpkb2N1bWVudFNjcm9sbFBvc2l0aW9uUmVsYXRpdmVUb1ZpZXdPcmlnaW4oKSBjb25z dAogewogICAgIEludFBvaW50IHNjcm9sbFBvc2l0aW9uID0gdGhpcy0+c2Nyb2xsUG9zaXRpb24o KTsKICAgICByZXR1cm4gSW50UG9pbnQoc2Nyb2xsUG9zaXRpb24ueCgpLCBzY3JvbGxQb3NpdGlv bi55KCkgLSBoZWFkZXJIZWlnaHQoKSAtIHRvcENvbnRlbnRJbnNldCgpKTsKIH0KIAorSW50U2l6 ZSBTY3JvbGxWaWV3Ojpkb2N1bWVudFNjcm9sbE9mZnNldFJlbGF0aXZlVG9TY3JvbGxhYmxlQXJl YU9yaWdpbigpIGNvbnN0Cit7CisgICAgSW50U2l6ZSBzY3JvbGxPZmZzZXQgPSB0aGlzLT5zY3Jv bGxPZmZzZXQoKTsKKyAgICByZXR1cm4gSW50U2l6ZShzY3JvbGxPZmZzZXQud2lkdGgoKSwgc2Ny b2xsT2Zmc2V0LmhlaWdodCgpIC0gaGVhZGVySGVpZ2h0KCkpOworfQorCiBpbnQgU2Nyb2xsVmll dzo6c2Nyb2xsU2l6ZShTY3JvbGxiYXJPcmllbnRhdGlvbiBvcmllbnRhdGlvbikgY29uc3QKIHsK ICAgICAvLyBJZiBubyBzY3JvbGxiYXJzIGFyZSBwcmVzZW50LCBpdCBkb2VzIG5vdCBpbmRpY2F0 ZSBjb250ZW50IGlzIG5vdCBiZSBzY3JvbGxhYmxlLgpAQCAtODIyLDcgKzgyOCw3IEBAIEludFBv aW50IFNjcm9sbFZpZXc6OnJvb3RWaWV3VG9Db250ZW50cygKICAgICAgICAgcmV0dXJuIGNvbnZl cnRGcm9tUm9vdFZpZXcocm9vdFZpZXdQb2ludCk7CiAKICAgICBJbnRQb2ludCB2aWV3UG9pbnQg PSBjb252ZXJ0RnJvbVJvb3RWaWV3KHJvb3RWaWV3UG9pbnQpOwotICAgIHJldHVybiB2aWV3UG9p bnQgKyBzY3JvbGxPZmZzZXRSZWxhdGl2ZVRvRG9jdW1lbnQoKTsKKyAgICByZXR1cm4gdmlld1Bv aW50ICsgZG9jdW1lbnRTY3JvbGxPZmZzZXRSZWxhdGl2ZVRvVmlld09yaWdpbigpOwogfQogCiBJ bnRQb2ludCBTY3JvbGxWaWV3Ojpjb250ZW50c1RvUm9vdFZpZXcoY29uc3QgSW50UG9pbnQmIGNv bnRlbnRzUG9pbnQpIGNvbnN0CkBAIC04NDAsNyArODQ2LDcgQEAgSW50UmVjdCBTY3JvbGxWaWV3 Ojpyb290Vmlld1RvQ29udGVudHMoYwogICAgICAgICByZXR1cm4gY29udmVydEZyb21Sb290Vmll dyhyb290Vmlld1JlY3QpOwogCiAgICAgSW50UmVjdCB2aWV3UmVjdCA9IGNvbnZlcnRGcm9tUm9v dFZpZXcocm9vdFZpZXdSZWN0KTsKLSAgICB2aWV3UmVjdC5tb3ZlKHNjcm9sbE9mZnNldFJlbGF0 aXZlVG9Eb2N1bWVudCgpKTsKKyAgICB2aWV3UmVjdC5tb3ZlKGRvY3VtZW50U2Nyb2xsT2Zmc2V0 UmVsYXRpdmVUb1ZpZXdPcmlnaW4oKSk7CiAgICAgcmV0dXJuIHZpZXdSZWN0OwogfQogCkBAIC04 NjksNyArODc1LDcgQEAgSW50UG9pbnQgU2Nyb2xsVmlldzo6d2luZG93VG9Db250ZW50cyhjbwog ICAgICAgICByZXR1cm4gY29udmVydEZyb21Db250YWluaW5nV2luZG93KHdpbmRvd1BvaW50KTsK IAogICAgIEludFBvaW50IHZpZXdQb2ludCA9IGNvbnZlcnRGcm9tQ29udGFpbmluZ1dpbmRvdyh3 aW5kb3dQb2ludCk7Ci0gICAgcmV0dXJuIHZpZXdQb2ludCArIHNjcm9sbE9mZnNldFJlbGF0aXZl VG9Eb2N1bWVudCgpOworICAgIHJldHVybiB2aWV3UG9pbnQgKyBkb2N1bWVudFNjcm9sbE9mZnNl dFJlbGF0aXZlVG9WaWV3T3JpZ2luKCk7CiB9CiAKIEludFBvaW50IFNjcm9sbFZpZXc6OmNvbnRl bnRzVG9XaW5kb3coY29uc3QgSW50UG9pbnQmIGNvbnRlbnRzUG9pbnQpIGNvbnN0CkBAIC04ODcs NyArODkzLDcgQEAgSW50UmVjdCBTY3JvbGxWaWV3Ojp3aW5kb3dUb0NvbnRlbnRzKGNvbgogICAg ICAgICByZXR1cm4gY29udmVydEZyb21Db250YWluaW5nV2luZG93KHdpbmRvd1JlY3QpOwogCiAg ICAgSW50UmVjdCB2aWV3UmVjdCA9IGNvbnZlcnRGcm9tQ29udGFpbmluZ1dpbmRvdyh3aW5kb3dS ZWN0KTsKLSAgICB2aWV3UmVjdC5tb3ZlKHNjcm9sbE9mZnNldFJlbGF0aXZlVG9Eb2N1bWVudCgp KTsKKyAgICB2aWV3UmVjdC5tb3ZlKGRvY3VtZW50U2Nyb2xsT2Zmc2V0UmVsYXRpdmVUb1ZpZXdP cmlnaW4oKSk7CiAgICAgcmV0dXJuIHZpZXdSZWN0OwogfQogCkluZGV4OiBTb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9TY3JvbGxWaWV3LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vU2Nyb2xsVmlldy5oCShyZXZpc2lvbiAxNjg2ODcpCisrKyBTb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9TY3JvbGxWaWV3LmgJKHdvcmtpbmcgY29weSkKQEAgLTI0MSwxMiArMjQxLDIxIEBA IHB1YmxpYzoKICAgICBJbnRQb2ludCBhY3R1YWxTY3JvbGxQb3NpdGlvbigpIGNvbnN0IHsgcmV0 dXJuIHVub2JzY3VyZWRDb250ZW50UmVjdCgpLmxvY2F0aW9uKCk7IH0KICNlbmRpZgogCi0gICAg Ly8gc2Nyb2xsT2Zmc2V0KCkgYW5jaG9ycyBpdHMgKDAsMCkgcG9pbnQgYXQgdGhlIHRvcCBlbmQg b2YgdGhlIGhlYWRlciBpZiB0aGlzIFNjcm9sbGFibGVBcmVhCi0gICAgLy8gaGFzIGEgaGVhZGVy LCBzbyBpdCBpcyByZWxhdGl2ZSB0byB0aGUgdG90YWxDb250ZW50c1NpemUoKS4gc2Nyb2xsT2Zm c2V0UmVsYXRpdmVUb0RvY3VtZW50KCkKLSAgICAvLyBhbmNob3JzICgwLDApIGF0IHRoZSB0b3Ag b2YgdGhlIERvY3VtZW50LCB3aGljaCB3aWxsIGJlIGJlbmVhdGggYW55IGhlYWRlcnMsIHNvIGl0 IGlzIHJlbGF0aXZlCi0gICAgLy8gdG8gY29udGVudHNTaXplKCkuCi0gICAgSW50U2l6ZSBzY3Jv bGxPZmZzZXRSZWxhdGl2ZVRvRG9jdW1lbnQoKSBjb25zdDsKLSAgICBJbnRQb2ludCBzY3JvbGxQ b3NpdGlvblJlbGF0aXZlVG9Eb2N1bWVudCgpIGNvbnN0OworICAgIC8vIHNjcm9sbE9mZnNldCgp IGFuY2hvcnMgaXRzICgwLDApIHBvaW50IGF0IHRoZSB0b3AgZW5kIG9mIHRoZSBzY29sbGluZyBs YXllci4gV2hlbiB0aGUgUGFnZQorICAgIC8vIGhhcyBhIGhlYWRlciwgdGhlIGhlYWRlciBpcyBw b3NpdGlvbmVkIGF0ICgwLDApLCBBQk9WRSB0aGUgc3RhcnQgb2YgdGhlIERvY3VtZW50LiBTbyB3 aGVuIGEgcGFnZQorICAgIC8vIHdpdGggYSBoZWFkZXIgaXMgcGlubmVkIHRvIHRoZSB0b3AsIHRo ZSBzY3JvbGxPZmZzZXQoKSBpcyAoMCwwKSwgYnV0IHRoZSBEb2N1bWVudCBpcyBhY3R1YWxseQor ICAgIC8vIGF0ICgwLCAtaGVhZGVySGVpZ2h0KCkpLiBkb2N1bWVudFNjcm9sbE9mZnNldFJlbGF0 aXZlVG9TY3JvbGxhYmxlQXJlYU9yaWdpbigpIHdpbGwgcmV0dXJuIHRoaXMKKyAgICAvLyB2ZXJz aW9uIG9mIHRoZSBvZmZzZXQsIHdoaWNoIHRyYWNrcyB0aGUgdG9wIG9mIERvY3VtZW50IHJlbGF0 aXZlIHRvIHdoZXJlIHNjcm9sbGluZyB3YXMgYWNob3JlZC4KKyAgICBJbnRTaXplIGRvY3VtZW50 U2Nyb2xsT2Zmc2V0UmVsYXRpdmVUb1Njcm9sbGFibGVBcmVhT3JpZ2luKCkgY29uc3Q7CisKKyAg ICAvLyBzY3JvbGxPZmZzZXQoKSBhbmNob3JzIGl0cyAoMCwwKSBwb2ludCBhdCB0aGUgdG9wIGVu ZCBvZiB0aGUgc2NvbGxpbmcgbGF5ZXIuIFRoZSB0b3Agb2YgdGhlIHNjcm9sbGluZworICAgIC8v IGxheWVyIGRvZXMgbm90IHJlcHJlc2VudCB0aGUgdG9wIG9mIHRoZSB2aWV3IHdoZW4gdGhlcmUg aXMgYSB0b3BDb250ZW50SW5zZXQuIEFkZGl0aW9uYWxseSwgYXMKKyAgICAvLyBkZXRhaWxlZCBh Ym92ZSwgdGhlIG9yaWdpbiBvZiB0aGUgc2Nyb2xsaW5nIGxheWVyIGFsc28gZG9lcyBub3QgbmVj ZXNzYXJpbHkgY29ycmVzcG9uZCB3aXRoIHRoZQorICAgIC8vIHRvcCBvZiB0aGUgZG9jdW1lbnQg YW55d2F5LCBzaW5jZSB0aGVyZSBjb3VsZCBhbHNvIGJlIGhlYWRlci4gZG9jdW1lbnRTY3JvbGxP ZmZzZXRSZWxhdGl2ZVRvVmlld09yaWdpbigpCisgICAgLy8gd2lsbCByZXR1cm4gYSB2ZXJzaW9u IG9mIHRoZSBjdXJyZW50IHNjcm9sbCBvZmZzZXQgd2hpY2ggdHJhY2tzIHRoZSB0b3Agb2YgdGhl IERvY3VtZW50CisgICAgLy8gcmVsYXRpdmUgdG8gdGhlIHZlcnkgdG9wIG9mIHRoZSB2aWV3Lgor ICAgIEludFNpemUgZG9jdW1lbnRTY3JvbGxPZmZzZXRSZWxhdGl2ZVRvVmlld09yaWdpbigpIGNv bnN0OworICAgIEludFBvaW50IGRvY3VtZW50U2Nyb2xsUG9zaXRpb25SZWxhdGl2ZVRvVmlld09y aWdpbigpIGNvbnN0OwogCiAgICAgdmlydHVhbCBJbnRTaXplIG92ZXJoYW5nQW1vdW50KCkgY29u c3Qgb3ZlcnJpZGU7CiAKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXll ci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVy LmNwcAkocmV2aXNpb24gMTY4Njg3KQorKysgU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl ckxheWVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjQwOSw4ICsyNDA5LDggQEAgdm9pZCBSZW5k ZXJMYXllcjo6c2Nyb2xsUmVjdFRvVmlzaWJsZShjbwogI2lmICFQTEFURk9STShJT1MpCiAgICAg ICAgICAgICBMYXlvdXRSZWN0IHZpZXdSZWN0ID0gZnJhbWVWaWV3LnZpc2libGVDb250ZW50UmVj dCgpOwogICAgICAgICAgICAgTGF5b3V0UmVjdCB2aXNpYmxlUmVjdFJlbGF0aXZlVG9Eb2N1bWVu dCA9IHZpZXdSZWN0OwotICAgICAgICAgICAgSW50U2l6ZSBzY3JvbGxPZmZzZXRSZWxhdGl2ZVRv RG9jdW1lbnQgPSBmcmFtZVZpZXcuc2Nyb2xsT2Zmc2V0UmVsYXRpdmVUb0RvY3VtZW50KCk7Ci0g ICAgICAgICAgICB2aXNpYmxlUmVjdFJlbGF0aXZlVG9Eb2N1bWVudC5zZXRMb2NhdGlvbihJbnRQ b2ludChzY3JvbGxPZmZzZXRSZWxhdGl2ZVRvRG9jdW1lbnQud2lkdGgoKSwgc2Nyb2xsT2Zmc2V0 UmVsYXRpdmVUb0RvY3VtZW50LmhlaWdodCgpKSk7CisgICAgICAgICAgICBJbnRTaXplIGRvY3Vt ZW50U2Nyb2xsT2Zmc2V0UmVsYXRpdmVUb1Njcm9sbGFibGVBcmVhT3JpZ2luID0gZnJhbWVWaWV3 LmRvY3VtZW50U2Nyb2xsT2Zmc2V0UmVsYXRpdmVUb1Njcm9sbGFibGVBcmVhT3JpZ2luKCk7Cisg ICAgICAgICAgICB2aXNpYmxlUmVjdFJlbGF0aXZlVG9Eb2N1bWVudC5zZXRMb2NhdGlvbihJbnRQ b2ludChkb2N1bWVudFNjcm9sbE9mZnNldFJlbGF0aXZlVG9TY3JvbGxhYmxlQXJlYU9yaWdpbi53 aWR0aCgpLCBkb2N1bWVudFNjcm9sbE9mZnNldFJlbGF0aXZlVG9TY3JvbGxhYmxlQXJlYU9yaWdp bi5oZWlnaHQoKSkpOwogI2Vsc2UKICAgICAgICAgICAgIExheW91dFJlY3Qgdmlld1JlY3QgPSBm cmFtZVZpZXcudW5vYnNjdXJlZENvbnRlbnRSZWN0KCk7CiAgICAgICAgICAgICBMYXlvdXRSZWN0 IHZpc2libGVSZWN0UmVsYXRpdmVUb0RvY3VtZW50ID0gdmlld1JlY3Q7CkluZGV4OiBTb3VyY2Uv V2ViS2l0Mi9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvQ2hhbmdlTG9n CShyZXZpc2lvbiAxNjg3NDUpCisrKyBTb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cJKHdvcmtpbmcg Y29weSkKQEAgLTEsMyArMSwyMCBAQAorMjAxNC0wNS0xMyAgQmV0aCBEYWtpbiAgPGJkYWtpbkBh cHBsZS5jb20+CisKKyAgICAgICAgUkVHUkVTU0lPTiAodG9wQ29udGVudEluc2V0KTogU2VhcmNo aW5nIHRocm91Z2ggRmFjZWJvb2sgTWVzc2VuZ2VyJ3MgY2hhdCBjYXVzZXMgCisgICAgICAgIHNj cm9sbGluZyBpbiBOZXdzIEZlZWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTEzMjg4OQorICAgICAgICAtYW5kIGNvcnJlc3BvbmRpbmctCisgICAgICAg IDxyZGFyOi8vcHJvYmxlbS8xNjcxNTcxNj4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBSZS1uYW1lIHNjcm9sbE9mZnNldFJlbGF0aXZlVG9Eb2N1bWVu dCgpIHRvIAorICAgICAgICBkb2N1bWVudFNjcm9sbFBvc2l0aW9uUmVsYXRpdmVUb1ZpZXdPcmln aW4oKS4KKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvRmluZENvbnRyb2xsZXIuY3BwOgor ICAgICAgICAoV2ViS2l0OjpGaW5kQ29udHJvbGxlcjo6cmVjdHNGb3JUZXh0TWF0Y2hlcyk6Cisg ICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwOgorICAgICAgICAoV2ViS2l0 OjpXZWJQYWdlOjpkZXRlcm1pbmVQcmltYXJ5U25hcHNob3R0ZWRQbHVnSW4pOgorCiAyMDE0LTA1 LTEzICBTYW11ZWwgV2hpdGUgIDxzYW11ZWxfd2hpdGVAYXBwbGUuY29tPgogCiAgICAgICAgIEFY OiBIaXQgdGVzdGluZyBub3QgYWNjb3VudGluZyBmb3IgdG9wIGNvbnRlbnQgaW5zZXQuCkluZGV4 OiBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvRmluZENvbnRyb2xsZXIuY3BwCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9GaW5kQ29udHJv bGxlci5jcHAJKHJldmlzaW9uIDE2ODY4NykKKysrIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3Mv V2ViUGFnZS9GaW5kQ29udHJvbGxlci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQxOCw3ICs0MTgs NyBAQCBWZWN0b3I8SW50UmVjdD4gRmluZENvbnRyb2xsZXI6OnJlY3RzRm9yCiAKICAgICAgICAg SW50UmVjdCB2aXNpYmxlUmVjdCA9IGZyYW1lLT52aWV3KCktPnZpc2libGVDb250ZW50UmVjdCgp OwogICAgICAgICBWZWN0b3I8SW50UmVjdD4gZnJhbWVSZWN0cyA9IGRvY3VtZW50LT5tYXJrZXJz KCkucmVuZGVyZWRSZWN0c0Zvck1hcmtlcnMoRG9jdW1lbnRNYXJrZXI6OlRleHRNYXRjaCk7Ci0g ICAgICAgIEludFBvaW50IGZyYW1lT2Zmc2V0KC1mcmFtZS0+dmlldygpLT5zY3JvbGxPZmZzZXRS ZWxhdGl2ZVRvRG9jdW1lbnQoKS53aWR0aCgpLCAtZnJhbWUtPnZpZXcoKS0+c2Nyb2xsT2Zmc2V0 UmVsYXRpdmVUb0RvY3VtZW50KCkuaGVpZ2h0KCkpOworICAgICAgICBJbnRQb2ludCBmcmFtZU9m ZnNldCgtZnJhbWUtPnZpZXcoKS0+ZG9jdW1lbnRTY3JvbGxPZmZzZXRSZWxhdGl2ZVRvVmlld09y aWdpbigpLndpZHRoKCksIC1mcmFtZS0+dmlldygpLT5kb2N1bWVudFNjcm9sbE9mZnNldFJlbGF0 aXZlVG9WaWV3T3JpZ2luKCkuaGVpZ2h0KCkpOwogICAgICAgICBmcmFtZU9mZnNldCA9IGZyYW1l LT52aWV3KCktPmNvbnZlcnRUb0NvbnRhaW5pbmdXaW5kb3coZnJhbWVPZmZzZXQpOwogCiAgICAg ICAgIGZvciAoVmVjdG9yPEludFJlY3Q+OjppdGVyYXRvciBpdCA9IGZyYW1lUmVjdHMuYmVnaW4o KSwgZW5kID0gZnJhbWVSZWN0cy5lbmQoKTsgaXQgIT0gZW5kOyArK2l0KSB7CkluZGV4OiBTb3Vy Y2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCShyZXZpc2lvbiAx Njg2ODcpCisrKyBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAJ KHdvcmtpbmcgY29weSkKQEAgLTQzOTUsNyArNDM5NSw3IEBAIHZvaWQgV2ViUGFnZTo6ZGV0ZXJt aW5lUHJpbWFyeVNuYXBzaG90dGUKICAgICAgICAgICAgIEludFJlY3QgcGx1Z0luUmVjdFJlbGF0 aXZlVG9WaWV3ID0gcGx1Z0luSW1hZ2VFbGVtZW50LmNsaWVudFJlY3QoKTsKICAgICAgICAgICAg IGlmIChwbHVnSW5SZWN0UmVsYXRpdmVUb1ZpZXcuaXNFbXB0eSgpKQogICAgICAgICAgICAgICAg IGNvbnRpbnVlOwotICAgICAgICAgICAgSW50U2l6ZSBzY3JvbGxPZmZzZXQgPSBtYWluRnJhbWUu dmlldygpLT5zY3JvbGxPZmZzZXRSZWxhdGl2ZVRvRG9jdW1lbnQoKTsKKyAgICAgICAgICAgIElu dFNpemUgc2Nyb2xsT2Zmc2V0ID0gbWFpbkZyYW1lLnZpZXcoKS0+ZG9jdW1lbnRTY3JvbGxPZmZz ZXRSZWxhdGl2ZVRvVmlld09yaWdpbigpOwogICAgICAgICAgICAgSW50UmVjdCBwbHVnSW5SZWN0 UmVsYXRpdmVUb1RvcERvY3VtZW50KHBsdWdJblJlY3RSZWxhdGl2ZVRvVmlldy5sb2NhdGlvbigp ICsgc2Nyb2xsT2Zmc2V0LCBwbHVnSW5SZWN0UmVsYXRpdmVUb1ZpZXcuc2l6ZSgpKTsKICAgICAg ICAgICAgIGlmICghcGx1Z0luUmVjdFJlbGF0aXZlVG9Ub3BEb2N1bWVudC5pbnRlcnNlY3RzKHNl YXJjaFJlY3QpKQogICAgICAgICAgICAgICAgIGNvbnRpbnVlOwo=