70903 2011-10-26 04:53:07 -0700 [Qt][WK2] Rename clean-up of QtPinchGestureRecognizer and QtViewportInteractionEngine 2011-10-26 06:49:16 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED Qt P3 Normal --- 1 abecsi abecsi kenneth oldest_to_newest 490740 0 abecsi 2011-10-26 04:53:07 -0700 Rename computeTouchCenter to computePinchCenter, and use the plural form of coordinate where appropriate. 490741 1 112482 abecsi 2011-10-26 04:56:58 -0700 Created attachment 112482 proposed patch 490806 2 112482 abecsi 2011-10-26 06:49:09 -0700 Comment on attachment 112482 proposed patch Clearing flags on attachment: 112482 Committed r98474: <http://trac.webkit.org/changeset/98474> 490807 3 abecsi 2011-10-26 06:49:16 -0700 All reviewed patches have been landed. Closing bug. 112482 2011-10-26 04:56:58 -0700 2011-10-26 06:49:08 -0700 proposed patch patch.diff text/plain 10498 abecsi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCBjZjM3YmNhLi5mZDBjYTgwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjYg QEAKKzIwMTEtMTAtMjYgIEFuZHJhcyBCZWNzaSAgPGFuZHJhcy5iZWNzaUBub2tpYS5jb20+CisK KyAgICAgICAgW1F0XVtXSzJdIFJlbmFtZSBjbGVhbi11cCBvZiBRdFBpbmNoR2VzdHVyZVJlY29n bml6ZXIgYW5kIFF0Vmlld3BvcnRJbnRlcmFjdGlvbkVuZ2luZQorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzA5MDMKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZW5hbWUgY29tcHV0ZVRvdWNoQ2VudGVyIHRv IGNvbXB1dGVQaW5jaENlbnRlciwKKyAgICAgICAgYW5kIHVzZSB0aGUgcGx1cmFsIGZvcm0gb2Yg Y29vcmRpbmF0ZSB3aGVyZSBhcHByb3ByaWF0ZS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkv cXQvcXRvdWNod2Vidmlldy5jcHA6CisgICAgICAgIChRVG91Y2hXZWJWaWV3UHJpdmF0ZTo6X3Ff dmlld3BvcnRVcGRhdGVkKToKKyAgICAgICAgKiBVSVByb2Nlc3MvcXQvUXRQaW5jaEdlc3R1cmVS ZWNvZ25pemVyLmNwcDoKKyAgICAgICAgKFdlYktpdDo6Y29tcHV0ZVBpbmNoQ2VudGVyKToKKyAg ICAgICAgKFdlYktpdDo6UXRQaW5jaEdlc3R1cmVSZWNvZ25pemVyOjpyZWNvZ25pemUpOgorICAg ICAgICAqIFVJUHJvY2Vzcy9xdC9RdFZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmUuY3BwOgorICAg ICAgICAoV2ViS2l0Ojpjb250ZW50UmVjdEluVmlld3BvcnRDb29yZGluYXRlcyk6CisgICAgICAg IChXZWJLaXQ6OlF0Vmlld3BvcnRJbnRlcmFjdGlvbkVuZ2luZTo6ZXZlbnQpOgorICAgICAgICAo V2ViS2l0OjpRdFZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmU6OnBpbmNoR2VzdHVyZVN0YXJ0ZWQp OgorICAgICAgICAoV2ViS2l0OjpRdFZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmU6OnBpbmNoR2Vz dHVyZVJlcXVlc3RVcGRhdGUpOgorICAgICAgICAoV2ViS2l0OjpRdFZpZXdwb3J0SW50ZXJhY3Rp b25FbmdpbmU6OnNjYWxlQ29udGVudCk6CisgICAgICAgICogVUlQcm9jZXNzL3F0L1F0Vmlld3Bv cnRJbnRlcmFjdGlvbkVuZ2luZS5oOgorCiAyMDExLTEwLTI1ICBBbmRyYXMgQmVjc2kgIDxhbmRy YXMuYmVjc2lAbm9raWEuY29tPgogCiAgICAgICAgIFtRdF1bV0syXSBBZGQgdGhlIGFuaW1hdGlv bnMgb24gdGhlIFZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXRvdWNod2Vidmlldy5jcHAgYi9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvQVBJL3F0L3F0b3VjaHdlYnZpZXcuY3BwCmluZGV4IDhiOGY4MmQuLmUwOTY0 NjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXRvdWNod2Vi dmlldy5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xdG91Y2h3ZWJ2 aWV3LmNwcApAQCAtNDksOSArNDksOSBAQCB2b2lkIFFUb3VjaFdlYlZpZXdQcml2YXRlOjpsb2Fk RGlkQ29tbWl0KCkKIAogdm9pZCBRVG91Y2hXZWJWaWV3UHJpdmF0ZTo6X3Ffdmlld3BvcnRVcGRh dGVkKCkKIHsKLSAgICBjb25zdCBRUmVjdEYgdmlzaWJsZVJlY3RJblBhZ2VWaWV3Q29vcmRpbmF0 ZSA9IHEtPm1hcFJlY3RUb0l0ZW0ocGFnZVZpZXcuZGF0YSgpLCBxLT5ib3VuZGluZ1JlY3QoKSku aW50ZXJzZWN0ZWQocGFnZVZpZXctPmJvdW5kaW5nUmVjdCgpKTsKKyAgICBjb25zdCBRUmVjdEYg dmlzaWJsZVJlY3RJblBhZ2VWaWV3Q29vcmRpbmF0ZXMgPSBxLT5tYXBSZWN0VG9JdGVtKHBhZ2VW aWV3LmRhdGEoKSwgcS0+Ym91bmRpbmdSZWN0KCkpLmludGVyc2VjdGVkKHBhZ2VWaWV3LT5ib3Vu ZGluZ1JlY3QoKSk7CiAgICAgZmxvYXQgc2NhbGUgPSBwYWdlVmlldy0+c2NhbGUoKTsKLSAgICBw YWdlLnNldFZpc2libGVDb250ZW50UmVjdEFuZFNjYWxlKHZpc2libGVSZWN0SW5QYWdlVmlld0Nv b3JkaW5hdGUsIHNjYWxlKTsKKyAgICBwYWdlLnNldFZpc2libGVDb250ZW50UmVjdEFuZFNjYWxl KHZpc2libGVSZWN0SW5QYWdlVmlld0Nvb3JkaW5hdGVzLCBzY2FsZSk7CiB9CiAKIHZvaWQgUVRv dWNoV2ViVmlld1ByaXZhdGU6Ol9xX3ZpZXdwb3J0VHJhamVjdG9yeVZlY3RvckNoYW5nZWQoY29u c3QgUVBvaW50RiYgdHJhamVjdG9yeVZlY3RvcikKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9xdC9RdFBpbmNoR2VzdHVyZVJlY29nbml6ZXIuY3BwIGIvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL3F0L1F0UGluY2hHZXN0dXJlUmVjb2duaXplci5jcHAKaW5kZXggNjNhOWRi NS4uMTZkYjVkZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1F0UGlu Y2hHZXN0dXJlUmVjb2duaXplci5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0 L1F0UGluY2hHZXN0dXJlUmVjb2duaXplci5jcHAKQEAgLTQ0LDcgKzQ0LDcgQEAgc3RhdGljIGlu bGluZSBpbnQgZmluZFRvdWNoUG9pbnRJbmRleChjb25zdCBRTGlzdDxRVG91Y2hFdmVudDo6VG91 Y2hQb2ludD4mIHRvdWMKICAgICByZXR1cm4gLTE7CiB9CiAKLXN0YXRpYyBpbmxpbmUgUVBvaW50 RiBjb21wdXRlVG91Y2hDZW50ZXIoY29uc3QgUVRvdWNoRXZlbnQ6OlRvdWNoUG9pbnQmIHBvaW50 MSwgY29uc3QgUVRvdWNoRXZlbnQ6OlRvdWNoUG9pbnQmIHBvaW50MikKK3N0YXRpYyBpbmxpbmUg UVBvaW50RiBjb21wdXRlUGluY2hDZW50ZXIoY29uc3QgUVRvdWNoRXZlbnQ6OlRvdWNoUG9pbnQm IHBvaW50MSwgY29uc3QgUVRvdWNoRXZlbnQ6OlRvdWNoUG9pbnQmIHBvaW50MikKIHsKICAgICBy ZXR1cm4gKHBvaW50MS5wb3MoKSArIHBvaW50Mi5wb3MoKSkgLyAyLjBmOwogfQpAQCAtOTYsNyAr OTYsNyBAQCBib29sIFF0UGluY2hHZXN0dXJlUmVjb2duaXplcjo6cmVjb2duaXplKGNvbnN0IFFU b3VjaEV2ZW50KiBldmVudCkKICAgICAgICAgICAgICAgICBpZiAocGluY2hEaXN0YW5jZSA8IHBp bmNoSW5pdGlhbFRyaWdnZXJEaXN0YW5jZVRocmVzaG9sZCkKICAgICAgICAgICAgICAgICAgICAg cmV0dXJuIGZhbHNlOwogICAgICAgICAgICAgICAgIG1fc3RhdGUgPSBHZXN0dXJlUmVjb2duaXpl ZDsKLSAgICAgICAgICAgICAgICBtX3ZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmUtPnBpbmNoR2Vz dHVyZVN0YXJ0ZWQoY29tcHV0ZVRvdWNoQ2VudGVyKHBvaW50MSwgcG9pbnQyKSk7CisgICAgICAg ICAgICAgICAgbV92aWV3cG9ydEludGVyYWN0aW9uRW5naW5lLT5waW5jaEdlc3R1cmVTdGFydGVk KGNvbXB1dGVQaW5jaENlbnRlcihwb2ludDEsIHBvaW50MikpOwogCiAgICAgICAgICAgICAgICAg Ly8gV2UgcmVzZXQgdGhlIGluaXRpYWwgcG9zaXRpb24gdG8gdGhlIHByZXZpb3VzIHBvc2l0aW9u IGluIG9yZGVyIHRvIGF2b2lkIHRoZSBqdW1wIGNhdXNlZAogICAgICAgICAgICAgICAgIC8vIGJ5 IHNraXBwaW5nIGFsbCB0aGUgZXZlbnRzIGJldHdlZW4gdGhlIGJlZ2lubmluZyBhbmQgd2hlbiB0 aGUgdGhyZXNob2xkIGlzIGhpdC4KQEAgLTEwOSw4ICsxMDksOCBAQCBib29sIFF0UGluY2hHZXN0 dXJlUmVjb2duaXplcjo6cmVjb2duaXplKGNvbnN0IFFUb3VjaEV2ZW50KiBldmVudCkKICAgICAg ICAgICAgIGNvbnN0IHFyZWFsIGN1cnJlbnRTcGFuRGlzdGFuY2UgPSBRTGluZUYocG9pbnQxLnNj cmVlblBvcygpLCBwb2ludDIuc2NyZWVuUG9zKCkpLmxlbmd0aCgpOwogICAgICAgICAgICAgY29u c3QgcXJlYWwgaW5pdGlhbFNwYW5EaXN0YW5jZSA9IFFMaW5lRihtX3BvaW50MS5pbml0aWFsU2Ny ZWVuUG9zaXRpb24sIG1fcG9pbnQyLmluaXRpYWxTY3JlZW5Qb3NpdGlvbikubGVuZ3RoKCk7CiAg ICAgICAgICAgICBjb25zdCBxcmVhbCB0b3RhbFNjYWxlRmFjdG9yID0gY3VycmVudFNwYW5EaXN0 YW5jZSAvIGluaXRpYWxTcGFuRGlzdGFuY2U7Ci0gICAgICAgICAgICBjb25zdCBRUG9pbnRGIHRv dWNoQ2VudGVySW5QYWdlVmlld0Nvb3JkaW5hdGUgPSBjb21wdXRlVG91Y2hDZW50ZXIocG9pbnQx LCBwb2ludDIpOwotICAgICAgICAgICAgbV92aWV3cG9ydEludGVyYWN0aW9uRW5naW5lLT5waW5j aEdlc3R1cmVSZXF1ZXN0VXBkYXRlKHRvdWNoQ2VudGVySW5QYWdlVmlld0Nvb3JkaW5hdGUsIHRv dGFsU2NhbGVGYWN0b3IpOworICAgICAgICAgICAgY29uc3QgUVBvaW50RiB0b3VjaENlbnRlcklu UGFnZVZpZXdDb29yZGluYXRlcyA9IGNvbXB1dGVQaW5jaENlbnRlcihwb2ludDEsIHBvaW50Mik7 CisgICAgICAgICAgICBtX3ZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmUtPnBpbmNoR2VzdHVyZVJl cXVlc3RVcGRhdGUodG91Y2hDZW50ZXJJblBhZ2VWaWV3Q29vcmRpbmF0ZXMsIHRvdGFsU2NhbGVG YWN0b3IpOwogICAgICAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgICAgICAgICBicmVhazsKICAg ICAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1F0Vmlld3Bv cnRJbnRlcmFjdGlvbkVuZ2luZS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvUXRW aWV3cG9ydEludGVyYWN0aW9uRW5naW5lLmNwcAppbmRleCA1NmUyM2JmLi41YTY5ODg5IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvUXRWaWV3cG9ydEludGVyYWN0aW9u RW5naW5lLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvUXRWaWV3cG9ydElu dGVyYWN0aW9uRW5naW5lLmNwcApAQCAtMzMsNyArMzMsNyBAQCBuYW1lc3BhY2UgV2ViS2l0IHsK IAogc3RhdGljIGNvbnN0IGludCBrU2NhbGVBbmltYXRpb25EdXJhdGlvbk1pbGxpcyA9IDQwMDsK IAotc3RhdGljIGlubGluZSBRUmVjdEYgY29udGVudFJlY3RJblZpZXdwb3J0Q29vcmRpbmF0ZShj b25zdCBRU0dJdGVtKiBjb250ZW50LCBjb25zdCBRU0dJdGVtKiB2aWV3cG9ydCkKK3N0YXRpYyBp bmxpbmUgUVJlY3RGIGNvbnRlbnRSZWN0SW5WaWV3cG9ydENvb3JkaW5hdGVzKGNvbnN0IFFTR0l0 ZW0qIGNvbnRlbnQsIGNvbnN0IFFTR0l0ZW0qIHZpZXdwb3J0KQogewogICAgIHJldHVybiB2aWV3 cG9ydC0+bWFwUmVjdEZyb21JdGVtKGNvbnRlbnQsIGNvbnRlbnQtPmJvdW5kaW5nUmVjdCgpKTsK IH0KQEAgLTE1OCw3ICsxNTgsNyBAQCBib29sIFF0Vmlld3BvcnRJbnRlcmFjdGlvbkVuZ2luZTo6 ZXZlbnQoUUV2ZW50KiBldmVudCkKICAgICBjYXNlIFFFdmVudDo6U2Nyb2xsUHJlcGFyZTogewog ICAgICAgICBRU2Nyb2xsUHJlcGFyZUV2ZW50KiBwcmVwYXJlRXZlbnQgPSBzdGF0aWNfY2FzdDxR U2Nyb2xsUHJlcGFyZUV2ZW50Kj4oZXZlbnQpOwogICAgICAgICBjb25zdCBRUmVjdEYgdmlld3Bv cnRSZWN0ID0gbV92aWV3cG9ydC0+Ym91bmRpbmdSZWN0KCk7Ci0gICAgICAgIGNvbnN0IFFSZWN0 RiBjb250ZW50UmVjdCA9IGNvbnRlbnRSZWN0SW5WaWV3cG9ydENvb3JkaW5hdGUobV9jb250ZW50 LCBtX3ZpZXdwb3J0KTsKKyAgICAgICAgY29uc3QgUVJlY3RGIGNvbnRlbnRSZWN0ID0gY29udGVu dFJlY3RJblZpZXdwb3J0Q29vcmRpbmF0ZXMobV9jb250ZW50LCBtX3ZpZXdwb3J0KTsKICAgICAg ICAgY29uc3QgUVJlY3RGIGNvbnRlbnRQb3NpdGlvblJhbmdlID0gY2FsY3VsYXRlQm91bmRhcmll c0ZvclNjYWxlKGNvbnRlbnRSZWN0LnNpemUoKSwgdmlld3BvcnRSZWN0LnNpemUoKSwgMSk7CiAg ICAgICAgIHByZXBhcmVFdmVudC0+c2V0Q29udGVudFBvc1JhbmdlKGNvbnRlbnRQb3NpdGlvblJh bmdlKTsKICAgICAgICAgcHJlcGFyZUV2ZW50LT5zZXRWaWV3cG9ydFNpemUodmlld3BvcnRSZWN0 LnNpemUoKSk7CkBAIC0zMTIsMTMgKzMxMiwxMyBAQCB2b2lkIFF0Vmlld3BvcnRJbnRlcmFjdGlv bkVuZ2luZTo6cGFuR2VzdHVyZUVuZGVkKGNvbnN0IFFQb2ludEYmIHRvdWNoUG9pbnQsIHFpbgog ICAgIHNjcm9sbGVyKCktPmhhbmRsZUlucHV0KFFTY3JvbGxlcjo6SW5wdXRSZWxlYXNlLCBtX3Zp ZXdwb3J0LT5tYXBGcm9tSXRlbShtX2NvbnRlbnQsIHRvdWNoUG9pbnQpLCBldmVudFRpbWVzdGFt cE1pbGxpcyk7CiB9CiAKLXZvaWQgUXRWaWV3cG9ydEludGVyYWN0aW9uRW5naW5lOjpwaW5jaEdl c3R1cmVTdGFydGVkKGNvbnN0IFFQb2ludEYmIHBpbmNoQ2VudGVySW5Db250ZW50Q29vcmRpbmF0 ZSkKK3ZvaWQgUXRWaWV3cG9ydEludGVyYWN0aW9uRW5naW5lOjpwaW5jaEdlc3R1cmVTdGFydGVk KGNvbnN0IFFQb2ludEYmIHBpbmNoQ2VudGVySW5Db250ZW50Q29vcmRpbmF0ZXMpCiB7CiAgICAg aWYgKCFtX2NvbnN0cmFpbnRzLmlzVXNlclNjYWxhYmxlKQogICAgICAgICByZXR1cm47CiAKICAg ICBtX3BpbmNoVmlld3BvcnRVcGRhdGVEZWZlcnJlciA9IGFkb3B0UHRyKG5ldyBWaWV3cG9ydFVw ZGF0ZUd1YXJkKHRoaXMpKTsKLSAgICBtX2xhc3RQaW5jaENlbnRlckluVmlld3BvcnRDb29yZGlu YXRlcyA9IG1fdmlld3BvcnQtPm1hcEZyb21JdGVtKG1fY29udGVudCwgcGluY2hDZW50ZXJJbkNv bnRlbnRDb29yZGluYXRlKTsKKyAgICBtX2xhc3RQaW5jaENlbnRlckluVmlld3BvcnRDb29yZGlu YXRlcyA9IG1fdmlld3BvcnQtPm1hcEZyb21JdGVtKG1fY29udGVudCwgcGluY2hDZW50ZXJJbkNv bnRlbnRDb29yZGluYXRlcyk7CiAgICAgbV91c2VySW50ZXJhY3Rpb25GbGFncyB8PSBVc2VySGFz U2NhbGVkQ29udGVudDsKICAgICBtX3VzZXJJbnRlcmFjdGlvbkZsYWdzIHw9IFVzZXJIYXNNb3Zl ZENvbnRlbnQ7CiAgICAgbV9waW5jaFN0YXJ0U2NhbGUgPSBtX2NvbnRlbnQtPnNjYWxlKCk7CkBA IC0zMjcsNyArMzI3LDcgQEAgdm9pZCBRdFZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmU6OnBpbmNo R2VzdHVyZVN0YXJ0ZWQoY29uc3QgUVBvaW50RiYgcGluY2hDZW50ZXIKICAgICBlbWl0IHZpZXdw b3J0VHJhamVjdG9yeVZlY3RvckNoYW5nZWQoUVBvaW50RigpKTsKIH0KIAotdm9pZCBRdFZpZXdw b3J0SW50ZXJhY3Rpb25FbmdpbmU6OnBpbmNoR2VzdHVyZVJlcXVlc3RVcGRhdGUoY29uc3QgUVBv aW50RiYgcGluY2hDZW50ZXJJbkNvbnRlbnRDb29yZGluYXRlLCBxcmVhbCB0b3RhbFNjYWxlRmFj dG9yKQordm9pZCBRdFZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmU6OnBpbmNoR2VzdHVyZVJlcXVl c3RVcGRhdGUoY29uc3QgUVBvaW50RiYgcGluY2hDZW50ZXJJbkNvbnRlbnRDb29yZGluYXRlcywg cXJlYWwgdG90YWxTY2FsZUZhY3RvcikKIHsKICAgICBpZiAoIW1fY29uc3RyYWludHMuaXNVc2Vy U2NhbGFibGUpCiAgICAgICAgIHJldHVybjsKQEAgLTM0MSw5ICszNDEsOSBAQCB2b2lkIFF0Vmll d3BvcnRJbnRlcmFjdGlvbkVuZ2luZTo6cGluY2hHZXN0dXJlUmVxdWVzdFVwZGF0ZShjb25zdCBR UG9pbnRGJiBwaW5jaAogICAgIC8vIEFsbG93IHpvb21pbmcgb3V0IGJleW9uZCBtaW1pbXVtIHNj YWxlIG9uIHBhZ2VzIHRoYXQgZG8gbm90IGV4cGxpY2l0bHkgZGlzYWxsb3cgaXQuCiAgICAgY29u c3QgcXJlYWwgYm91bmRlZFNjYWxlID0gb3V0ZXJCb3VuZGVkU2NhbGUoc2NhbGUpOwogCi0gICAg UVBvaW50RiBwaW5jaENlbnRlckluVmlld3BvcnRDb29yZGluYXRlcyA9IG1fdmlld3BvcnQtPm1h cEZyb21JdGVtKG1fY29udGVudCwgcGluY2hDZW50ZXJJbkNvbnRlbnRDb29yZGluYXRlKTsKKyAg ICBRUG9pbnRGIHBpbmNoQ2VudGVySW5WaWV3cG9ydENvb3JkaW5hdGVzID0gbV92aWV3cG9ydC0+ bWFwRnJvbUl0ZW0obV9jb250ZW50LCBwaW5jaENlbnRlckluQ29udGVudENvb3JkaW5hdGVzKTsK IAotICAgIHNjYWxlQ29udGVudChwaW5jaENlbnRlckluQ29udGVudENvb3JkaW5hdGUsIGJvdW5k ZWRTY2FsZSk7CisgICAgc2NhbGVDb250ZW50KHBpbmNoQ2VudGVySW5Db250ZW50Q29vcmRpbmF0 ZXMsIGJvdW5kZWRTY2FsZSk7CiAKICAgICBjb25zdCBRUG9pbnRGIHBvc2l0aW9uRGlmZiA9IHBp bmNoQ2VudGVySW5WaWV3cG9ydENvb3JkaW5hdGVzIC0gbV9sYXN0UGluY2hDZW50ZXJJblZpZXdw b3J0Q29vcmRpbmF0ZXM7CiAgICAgbV9sYXN0UGluY2hDZW50ZXJJblZpZXdwb3J0Q29vcmRpbmF0 ZXMgPSBwaW5jaENlbnRlckluVmlld3BvcnRDb29yZGluYXRlczsKQEAgLTM3MCwxMSArMzcwLDEx IEBAIHZvaWQgUXRWaWV3cG9ydEludGVyYWN0aW9uRW5naW5lOjpjb250ZW50Vmlld3BvcnRDaGFu Z2VkKCkKICAgICBhbmltYXRlQ29udGVudEludG9Cb3VuZGFyaWVzSWZOZWVkZWQoKTsKIH0KIAot dm9pZCBRdFZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmU6OnNjYWxlQ29udGVudChjb25zdCBRUG9p bnRGJiBjZW50ZXJJbkNvbnRlbnRDb29yZGluYXRlLCBxcmVhbCBzY2FsZSkKK3ZvaWQgUXRWaWV3 cG9ydEludGVyYWN0aW9uRW5naW5lOjpzY2FsZUNvbnRlbnQoY29uc3QgUVBvaW50RiYgY2VudGVy SW5Db250ZW50Q29vcmRpbmF0ZXMsIHFyZWFsIHNjYWxlKQogewotICAgIFFQb2ludEYgb2xkUGlu Y2hDZW50ZXJPblBhcmVudCA9IG1fY29udGVudC0+bWFwVG9JdGVtKG1fY29udGVudC0+cGFyZW50 SXRlbSgpLCBjZW50ZXJJbkNvbnRlbnRDb29yZGluYXRlKTsKKyAgICBRUG9pbnRGIG9sZFBpbmNo Q2VudGVyT25QYXJlbnQgPSBtX2NvbnRlbnQtPm1hcFRvSXRlbShtX2NvbnRlbnQtPnBhcmVudEl0 ZW0oKSwgY2VudGVySW5Db250ZW50Q29vcmRpbmF0ZXMpOwogICAgIG1fY29udGVudC0+c2V0U2Nh bGUoc2NhbGUpOwotICAgIFFQb2ludEYgbmV3UGluY2hDZW50ZXJPblBhcmVudCA9IG1fY29udGVu dC0+bWFwVG9JdGVtKG1fY29udGVudC0+cGFyZW50SXRlbSgpLCBjZW50ZXJJbkNvbnRlbnRDb29y ZGluYXRlKTsKKyAgICBRUG9pbnRGIG5ld1BpbmNoQ2VudGVyT25QYXJlbnQgPSBtX2NvbnRlbnQt Pm1hcFRvSXRlbShtX2NvbnRlbnQtPnBhcmVudEl0ZW0oKSwgY2VudGVySW5Db250ZW50Q29vcmRp bmF0ZXMpOwogICAgIG1fY29udGVudC0+c2V0UG9zKG1fY29udGVudC0+cG9zKCkgLSAobmV3UGlu Y2hDZW50ZXJPblBhcmVudCAtIG9sZFBpbmNoQ2VudGVyT25QYXJlbnQpKTsKIH0KIApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1F0Vmlld3BvcnRJbnRlcmFjdGlvbkVu Z2luZS5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1F0Vmlld3BvcnRJbnRlcmFjdGlv bkVuZ2luZS5oCmluZGV4IDg1NTVlMzUuLjNlNGVmOTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9xdC9RdFZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmUuaAorKysgYi9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvUXRWaWV3cG9ydEludGVyYWN0aW9uRW5naW5lLmgKQEAg LTcwLDggKzcwLDggQEAgcHVibGljOgogICAgIHZvaWQgcGFuR2VzdHVyZUNhbmNlbGxlZCgpOwog ICAgIHZvaWQgcGFuR2VzdHVyZUVuZGVkKGNvbnN0IFFQb2ludEYmIHRvdWNoUG9pbnQsIHFpbnQ2 NCBldmVudFRpbWVzdGFtcE1pbGxpcyk7CiAKLSAgICB2b2lkIHBpbmNoR2VzdHVyZVN0YXJ0ZWQo Y29uc3QgUVBvaW50RiYgcGluY2hDZW50ZXJJbkNvbnRlbnRDb29yZGluYXRlKTsKLSAgICB2b2lk IHBpbmNoR2VzdHVyZVJlcXVlc3RVcGRhdGUoY29uc3QgUVBvaW50RiYgcGluY2hDZW50ZXJJbkNv bnRlbnRDb29yZGluYXRlLCBxcmVhbCB0b3RhbFNjYWxlRmFjdG9yKTsKKyAgICB2b2lkIHBpbmNo R2VzdHVyZVN0YXJ0ZWQoY29uc3QgUVBvaW50RiYgcGluY2hDZW50ZXJJbkNvbnRlbnRDb29yZGlu YXRlcyk7CisgICAgdm9pZCBwaW5jaEdlc3R1cmVSZXF1ZXN0VXBkYXRlKGNvbnN0IFFQb2ludEYm IHBpbmNoQ2VudGVySW5Db250ZW50Q29vcmRpbmF0ZXMsIHFyZWFsIHRvdGFsU2NhbGVGYWN0b3Ip OwogICAgIHZvaWQgcGluY2hHZXN0dXJlRW5kZWQoKTsKICAgICB2b2lkIHN0b3BBbmltYXRpb25z KCk7CiAKQEAgLTkxLDcgKzkxLDcgQEAgcHJpdmF0ZToKICAgICBjb25zdCBRUmVjdEYgY2FsY3Vs YXRlQm91bmRhcmllc0ZvclNjYWxlKGNvbnN0IFFTaXplRiBjb250ZW50U2l6ZSwgY29uc3QgUVNp emVGIHZpZXdwb3J0U2l6ZSwgcXJlYWwgc2NhbGUpOwogICAgIHZvaWQgYW5pbWF0ZUNvbnRlbnRJ bnRvQm91bmRhcmllc0lmTmVlZGVkKCk7CiAKLSAgICB2b2lkIHNjYWxlQ29udGVudChjb25zdCBR UG9pbnRGJiBjZW50ZXJJbkNvbnRlbnRDb29yZGluYXRlLCBxcmVhbCBzY2FsZSk7CisgICAgdm9p ZCBzY2FsZUNvbnRlbnQoY29uc3QgUVBvaW50RiYgY2VudGVySW5Db250ZW50Q29vcmRpbmF0ZXMs IHFyZWFsIHNjYWxlKTsKIAogICAgIC8vIEFzIGxvbmcgYXMgdGhlIG9iamVjdCBleGlzdHMgdGhp cyBmdW5jdGlvbiB3aWxsIGFsd2F5cyByZXR1cm4gdGhlIHNhbWUgUVNjcm9sbGVyIGluc3RhbmNl LgogICAgIFFTY3JvbGxlciogc2Nyb2xsZXIoKSB7IHJldHVybiBRU2Nyb2xsZXI6OnNjcm9sbGVy KHRoaXMpOyB9Cg==