87845 2012-05-30 04:44:44 -0700 [Qt] Do renames in ViewportInteractionEngine as agreed upon 2012-05-30 06:56:20 -0700 1 1 1 Unclassified WebKit WebKit Qt 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 kenneth kenneth cmarcelo hausmann menard webkit.review.bot zalan zoltan oldest_to_newest 637108 0 kenneth 2012-05-30 04:44:44 -0700 Zalan, Simon and Kenneth agreed on how we are moving ViewportInteractionEngine forward 637110 1 144781 kenneth 2012-05-30 04:46:39 -0700 Created attachment 144781 Patch 637113 2 144781 zalan 2012-05-30 04:53:14 -0700 Comment on attachment 144781 Patch LGTM 637168 3 kenneth 2012-05-30 06:56:20 -0700 Landed in r118919 144781 2012-05-30 04:46:39 -0700 2012-05-30 06:54:43 -0700 Patch bug-87845-20120530134517.patch text/plain 20092 kenneth U3VidmVyc2lvbiBSZXZpc2lvbjogMTE4OTEwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMGEwZTIxMWUxNTZjOGY5 ZDYxNWEzOWM4YWMwMTFiOGFkZjBkYTg3Mi4uMWU1ZTgyNzUyZWFlYjZlNWM1OTg2MzIyMWMwNDg1 YTA3ZGY1Nzc0YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDQxIEBACiAyMDEyLTA1LTMwICBLZW5u ZXRoIFJvaGRlIENocmlzdGlhbnNlbiAgPGtlbm5ldGhAd2Via2l0Lm9yZz4KIAorICAgICAgICBb UXRdIERvIHJlbmFtZXMgaW4gVmlld3BvcnRJbnRlcmFjdGlvbkVuZ2luZSBhcyBhZ3JlZWQgdXBv bgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODc4NDUK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBNb3N0bHkg bW92aW5nIG1ldGhvZHMgYXJvdW5kIGFuZCByZW5hbWluZyB0aGVtIHRvIGJlIG1vcmUKKyAgICAg ICAgY29uc2lzdGVudCBhbmQgYXZvaWQgdGVybWlub2xvZ3kgY2xhc2hlcy4KKworICAgICAgICAq IFVJUHJvY2Vzcy9BUEkvcXQvcXF1aWNrd2Vidmlldy5jcHA6CisgICAgICAgIChRUXVpY2tXZWJW aWV3RmxpY2thYmxlUHJpdmF0ZTo6ZGlkQ2hhbmdlVmlld3BvcnRQcm9wZXJ0aWVzKToKKyAgICAg ICAgKFFRdWlja1dlYlZpZXdGbGlja2FibGVQcml2YXRlOjpwYWdlRGlkUmVxdWVzdFNjcm9sbCk6 CisgICAgICAgIChRUXVpY2tXZWJWaWV3RmxpY2thYmxlUHJpdmF0ZTo6ZGlkQ2hhbmdlQ29udGVu dHNTaXplKToKKyAgICAgICAgKiBVSVByb2Nlc3MvcXQvUXRWaWV3cG9ydEludGVyYWN0aW9uRW5n aW5lLmNwcDoKKyAgICAgICAgKFdlYktpdDo6Ym91bmRQb3NpdGlvbik6CisgICAgICAgIChXZWJL aXQpOgorICAgICAgICAoV2ViS2l0OjpRdFZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmU6OlF0Vmll d3BvcnRJbnRlcmFjdGlvbkVuZ2luZSk6CisgICAgICAgIChXZWJLaXQ6OlF0Vmlld3BvcnRJbnRl cmFjdGlvbkVuZ2luZTo6c2V0UGFnZUl0ZW1SZWN0VmlzaWJsZSk6CisgICAgICAgIChXZWJLaXQ6 OlF0Vmlld3BvcnRJbnRlcmFjdGlvbkVuZ2luZTo6YW5pbWF0ZVBhZ2VJdGVtUmVjdFZpc2libGUp OgorICAgICAgICAoV2ViS2l0OjpRdFZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmU6OmZsaWNrTW92 ZVN0YXJ0ZWQpOgorICAgICAgICAoV2ViS2l0OjpRdFZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmU6 OmZsaWNrTW92ZUVuZGVkKToKKyAgICAgICAgKFdlYktpdDo6UXRWaWV3cG9ydEludGVyYWN0aW9u RW5naW5lOjpwYWdlSXRlbVBvc2l0aW9uQ2hhbmdlZCk6CisgICAgICAgIChXZWJLaXQ6OlF0Vmll d3BvcnRJbnRlcmFjdGlvbkVuZ2luZTo6cGFnZUNvbnRlbnRQb3NpdGlvblJlcXVlc3QpOgorICAg ICAgICAoV2ViS2l0OjpRdFZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmU6OnNjYWxlQW5pbWF0aW9u VmFsdWVDaGFuZ2VkKToKKyAgICAgICAgKFdlYktpdDo6UXRWaWV3cG9ydEludGVyYWN0aW9uRW5n aW5lOjpjb21wdXRlUG9zUmFuZ2VGb3JQYWdlSXRlbUF0U2NhbGUpOgorICAgICAgICAoV2ViS2l0 OjpRdFZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmU6OmZvY3VzRWRpdGFibGVBcmVhKToKKyAgICAg ICAgKFdlYktpdDo6UXRWaWV3cG9ydEludGVyYWN0aW9uRW5naW5lOjp6b29tVG9BcmVhR2VzdHVy ZUVuZGVkKToKKyAgICAgICAgKFdlYktpdDo6UXRWaWV3cG9ydEludGVyYWN0aW9uRW5naW5lOjpu ZWFyZXN0VmFsaWRCb3VuZHMpOgorICAgICAgICAoV2ViS2l0OjpRdFZpZXdwb3J0SW50ZXJhY3Rp b25FbmdpbmU6OmNhbmNlbFNjcm9sbEFuaW1hdGlvbik6CisgICAgICAgIChXZWJLaXQ6OlF0Vmll d3BvcnRJbnRlcmFjdGlvbkVuZ2luZTo6cGluY2hHZXN0dXJlRW5kZWQpOgorICAgICAgICAoV2Vi S2l0OjpRdFZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmU6OnBhZ2VJdGVtU2l6ZUNoYW5nZWQpOgor ICAgICAgICAqIFVJUHJvY2Vzcy9xdC9RdFZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmUuaDoKKyAg ICAgICAgKFdlYktpdDo6UXRWaWV3cG9ydEludGVyYWN0aW9uRW5naW5lOjpzZXREZXZpY2VQaXhl bFJhdGlvKToKKyAgICAgICAgKFF0Vmlld3BvcnRJbnRlcmFjdGlvbkVuZ2luZSk6CisKKzIwMTIt MDUtMzAgIEtlbm5ldGggUm9oZGUgQ2hyaXN0aWFuc2VuICA8a2VubmV0aEB3ZWJraXQub3JnPgor CiAgICAgICAgIFtRdF0gVmFyaWFibGUgcmVuYW1pbmcgYXMgcHJlcGFyYXRpb24gb2YgZnVydGhl ciByZWZhY3RvcmluZy4KIAogICAgICAgICBSdWJiZXJzdGFtcGVkIGJ5IFNpbW9uIEhhdXNtYW5u LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xcXVpY2t3ZWJ2 aWV3LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXF1aWNrd2Vidmlldy5j cHAKaW5kZXggNDkzNmEyNWJkNGRiZjM1M2Q0NjQwZmZjMGFlZjc2MjljYWQ5ZjRhZS4uNDgwZWM4 YWY5OTNjMTVjNzQ1NmIwZDllMzAzNGU0NGFkNjkwYTBmYiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xcXVpY2t3ZWJ2aWV3LmNwcAorKysgYi9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3FxdWlja3dlYnZpZXcuY3BwCkBAIC04NzcsNyArODc3LDcg QEAgdm9pZCBRUXVpY2tXZWJWaWV3RmxpY2thYmxlUHJpdmF0ZTo6ZGlkQ2hhbmdlVmlld3BvcnRQ cm9wZXJ0aWVzKGNvbnN0IFdlYkNvcmU6OlYKICAgICAvLyBUaGlzIG5lZWRzIHRvIGJlIHJldmlz ZWQgYXQgc29tZSBwb2ludC4KICAgICBpbnRlcmFjdGlvbkVuZ2luZS0+cmVzZXQoKTsKIAotICAg IGludGVyYWN0aW9uRW5naW5lLT5zZXRDb250ZW50VG9EZXZpY2VQaXhlbFJhdGlvKGF0dHIuZGV2 aWNlUGl4ZWxSYXRpbyk7CisgICAgaW50ZXJhY3Rpb25FbmdpbmUtPnNldERldmljZVBpeGVsUmF0 aW8oYXR0ci5kZXZpY2VQaXhlbFJhdGlvKTsKIAogICAgIGludGVyYWN0aW9uRW5naW5lLT5zZXRB bGxvd3NVc2VyU2NhbGluZyghIWF0dHIudXNlclNjYWxhYmxlKTsKICAgICBpbnRlcmFjdGlvbkVu Z2luZS0+c2V0Q1NTU2NhbGVCb3VuZHMoYXR0ci5taW5pbXVtU2NhbGUsIGF0dHIubWF4aW11bVNj YWxlKTsKQEAgLTg5MCw3ICs4OTAsNyBAQCB2b2lkIFFRdWlja1dlYlZpZXdGbGlja2FibGVQcml2 YXRlOjpkaWRDaGFuZ2VWaWV3cG9ydFByb3BlcnRpZXMoY29uc3QgV2ViQ29yZTo6VgogCiAgICAg Ly8gSWYgdGhlIHdlYiBhcHAgc3VjY2Vzc2l2ZWx5IGNoYW5nZXMgdGhlIHZpZXdwb3J0IG9uIHB1 cnBvc2UKICAgICAvLyBpdCB3YW50cyB0byBiZSBpbiBjb250cm9sIGFuZCB3ZSBzaG91bGQgZGlz YWJsZSBhbmltYXRpb25zLgotICAgIGludGVyYWN0aW9uRW5naW5lLT5zZXRJdGVtUmVjdFZpc2li bGUoaW50ZXJhY3Rpb25FbmdpbmUtPm5lYXJlc3RWYWxpZEJvdW5kcygpKTsKKyAgICBpbnRlcmFj dGlvbkVuZ2luZS0+c2V0UGFnZUl0ZW1SZWN0VmlzaWJsZShpbnRlcmFjdGlvbkVuZ2luZS0+bmVh cmVzdFZhbGlkQm91bmRzKCkpOwogfQogCiB2b2lkIFFRdWlja1dlYlZpZXdGbGlja2FibGVQcml2 YXRlOjp1cGRhdGVWaWV3cG9ydFNpemUoKQpAQCAtOTU3LDcgKzk1Nyw3IEBAIHZvaWQgUVF1aWNr V2ViVmlld0ZsaWNrYWJsZVByaXZhdGU6Ol9xX3Jlc3VtZSgpCiAKIHZvaWQgUVF1aWNrV2ViVmll d0ZsaWNrYWJsZVByaXZhdGU6OnBhZ2VEaWRSZXF1ZXN0U2Nyb2xsKGNvbnN0IFFQb2ludCYgcG9z KQogewotICAgIGludGVyYWN0aW9uRW5naW5lLT5wYWdlUG9zaXRpb25SZXF1ZXN0KHBvcyk7Cisg ICAgaW50ZXJhY3Rpb25FbmdpbmUtPnBhZ2VDb250ZW50UG9zaXRpb25SZXF1ZXN0KHBvcyk7CiB9 CiAKIHZvaWQgUVF1aWNrV2ViVmlld0ZsaWNrYWJsZVByaXZhdGU6OmRpZENoYW5nZUNvbnRlbnRz U2l6ZShjb25zdCBRU2l6ZSYgbmV3U2l6ZSkKQEAgLTk4MSw3ICs5ODEsNyBAQCB2b2lkIFFRdWlj a1dlYlZpZXdGbGlja2FibGVQcml2YXRlOjpkaWRDaGFuZ2VDb250ZW50c1NpemUoY29uc3QgUVNp emUmIG5ld1NpemUpCiAKICAgICAvLyBFbWl0IGZvciB0ZXN0aW5nIHB1cnBvc2VzLCBzbyB0aGF0 IGl0IGNhbiBiZSB2ZXJpZmllZCB0aGF0CiAgICAgLy8gd2UgZGlkbid0IGRvIHNjYWxlIGFkanVz dG1lbnQuCi0gICAgaW50ZXJhY3Rpb25FbmdpbmUtPnNldEl0ZW1SZWN0VmlzaWJsZShpbnRlcmFj dGlvbkVuZ2luZS0+bmVhcmVzdFZhbGlkQm91bmRzKCkpOworICAgIGludGVyYWN0aW9uRW5naW5l LT5zZXRQYWdlSXRlbVJlY3RWaXNpYmxlKGludGVyYWN0aW9uRW5naW5lLT5uZWFyZXN0VmFsaWRC b3VuZHMoKSk7CiAgICAgZW1pdCBxLT5leHBlcmltZW50YWwoKS0+dGVzdCgpLT5jb250ZW50c1Nj YWxlQ29tbWl0dGVkKCk7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9xdC9RdFZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmUuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL3F0L1F0Vmlld3BvcnRJbnRlcmFjdGlvbkVuZ2luZS5jcHAKaW5kZXggNDVmZGE1Njky ZDVhZmZhNmQwN2VhNzA1MGJmNjQxOGE1NjMyNTUwYy4uYjM4ODUzNDJiMjM4MGYxMzc4YTc2NmUw MDEwNWU1ZWNmYWUwNjE2YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0 L1F0Vmlld3BvcnRJbnRlcmFjdGlvbkVuZ2luZS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL3F0L1F0Vmlld3BvcnRJbnRlcmFjdGlvbkVuZ2luZS5jcHAKQEAgLTExMyw2ICsxMTMs MTIgQEAgaW5saW5lIHFyZWFsIFF0Vmlld3BvcnRJbnRlcmFjdGlvbkVuZ2luZTo6aXRlbUNvb3Jk RnJvbUNTUyhxcmVhbCB2YWx1ZSkgY29uc3QKICAgICByZXR1cm4gdmFsdWUgKiBtX2RldmljZVBp eGVsUmF0aW87CiB9CiAKK3N0YXRpYyBpbmxpbmUgUVBvaW50RiBib3VuZFBvc2l0aW9uKGNvbnN0 IFFQb2ludEYgbWluUG9zaXRpb24sIGNvbnN0IFFQb2ludEYmIHBvc2l0aW9uLCBjb25zdCBRUG9p bnRGJiBtYXhQb3NpdGlvbikKK3sKKyAgICByZXR1cm4gUVBvaW50RihxQm91bmQobWluUG9zaXRp b24ueCgpLCBwb3NpdGlvbi54KCksIG1heFBvc2l0aW9uLngoKSksCisgICAgICAgICAgICAgICAg ICAgcUJvdW5kKG1pblBvc2l0aW9uLnkoKSwgcG9zaXRpb24ueSgpLCBtYXhQb3NpdGlvbi55KCkp KTsKK30KKwogaW5saW5lIFFSZWN0RiBRdFZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmU6Oml0ZW1S ZWN0RnJvbUNTUyhjb25zdCBRUmVjdEYmIGNzc1JlY3QpIGNvbnN0CiB7CiAgICAgUVJlY3RGIGl0 ZW1SZWN0OwpAQCAtMTM3LDEwICsxNDMsMTAgQEAgUXRWaWV3cG9ydEludGVyYWN0aW9uRW5naW5l OjpRdFZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmUoUVF1aWNrV2ViVmlldyogdmlld3BvcnQKIHsK ICAgICByZXNldCgpOwogCi0gICAgY29ubmVjdChtX3BhZ2VJdGVtLCBTSUdOQUwod2lkdGhDaGFu Z2VkKCkpLCBTTE9UKGl0ZW1TaXplQ2hhbmdlZCgpKSwgUXQ6OkRpcmVjdENvbm5lY3Rpb24pOwot ICAgIGNvbm5lY3QobV9wYWdlSXRlbSwgU0lHTkFMKGhlaWdodENoYW5nZWQoKSksIFNMT1QoaXRl bVNpemVDaGFuZ2VkKCkpLCBRdDo6RGlyZWN0Q29ubmVjdGlvbik7Ci0gICAgY29ubmVjdChtX3Zp ZXdwb3J0SXRlbSwgU0lHTkFMKG1vdmVtZW50U3RhcnRlZCgpKSwgU0xPVChmbGlja2FibGVNb3Zl U3RhcnRlZCgpKSwgUXQ6OkRpcmVjdENvbm5lY3Rpb24pOwotICAgIGNvbm5lY3QobV92aWV3cG9y dEl0ZW0sIFNJR05BTChtb3ZlbWVudEVuZGVkKCkpLCBTTE9UKGZsaWNrYWJsZU1vdmVFbmRlZCgp KSwgUXQ6OkRpcmVjdENvbm5lY3Rpb24pOworICAgIGNvbm5lY3QobV9wYWdlSXRlbSwgU0lHTkFM KHdpZHRoQ2hhbmdlZCgpKSwgU0xPVChwYWdlU2l6ZUNoYW5nZWQoKSksIFF0OjpEaXJlY3RDb25u ZWN0aW9uKTsKKyAgICBjb25uZWN0KG1fcGFnZUl0ZW0sIFNJR05BTChoZWlnaHRDaGFuZ2VkKCkp LCBTTE9UKHBhZ2VTaXplQ2hhbmdlZCgpKSwgUXQ6OkRpcmVjdENvbm5lY3Rpb24pOworICAgIGNv bm5lY3QobV92aWV3cG9ydEl0ZW0sIFNJR05BTChtb3ZlbWVudFN0YXJ0ZWQoKSksIFNMT1QoZmxp Y2tNb3ZlU3RhcnRlZCgpKSwgUXQ6OkRpcmVjdENvbm5lY3Rpb24pOworICAgIGNvbm5lY3QobV92 aWV3cG9ydEl0ZW0sIFNJR05BTChtb3ZlbWVudEVuZGVkKCkpLCBTTE9UKGZsaWNrTW92ZUVuZGVk KCkpLCBRdDo6RGlyZWN0Q29ubmVjdGlvbik7CiAKICAgICBjb25uZWN0KG1fc2NhbGVBbmltYXRp b24sIFNJR05BTCh2YWx1ZUNoYW5nZWQoUVZhcmlhbnQpKSwKICAgICAgICAgICAgIFNMT1Qoc2Nh bGVBbmltYXRpb25WYWx1ZUNoYW5nZWQoUVZhcmlhbnQpKSwgUXQ6OkRpcmVjdENvbm5lY3Rpb24p OwpAQCAtMTY4LDEwICsxNzQsMTAgQEAgcXJlYWwgUXRWaWV3cG9ydEludGVyYWN0aW9uRW5naW5l OjpvdXRlckJvdW5kZWRDU1NTY2FsZShxcmVhbCBjc3NTY2FsZSkgY29uc3QKICAgICByZXR1cm4g aW5uZXJCb3VuZGVkQ1NTU2NhbGUoY3NzU2NhbGUpOwogfQogCi12b2lkIFF0Vmlld3BvcnRJbnRl cmFjdGlvbkVuZ2luZTo6c2V0SXRlbVJlY3RWaXNpYmxlKGNvbnN0IFFSZWN0RiYgaXRlbVJlY3Qp Cit2b2lkIFF0Vmlld3BvcnRJbnRlcmFjdGlvbkVuZ2luZTo6c2V0UGFnZUl0ZW1SZWN0VmlzaWJs ZShjb25zdCBRUmVjdEYmIGl0ZW1SZWN0KQogewogICAgIEFTU0VSVF9XSVRIX01FU1NBR0UobV9z dXNwZW5kQ291bnQsCi0gICAgICAgICJzZXRJdGVtUmVjdFZpc2libGUgaGFzIHRvIGJlIGd1YXJk ZWQgdXNpbmcgYSBWaWV3cG9ydFVwZGF0ZURlZmVycmVyLiIpOworICAgICAgICAic2V0UGFnZUl0 ZW1SZWN0VmlzaWJsZSBoYXMgdG8gYmUgZ3VhcmRlZCB1c2luZyBhIFZpZXdwb3J0VXBkYXRlRGVm ZXJyZXIuIik7CiAKICAgICBpZiAoaXRlbVJlY3QuaXNFbXB0eSgpKQogICAgICAgICByZXR1cm47 CkBAIC0xOTMsNyArMTk5LDcgQEAgc3RhdGljIHFyZWFsIHBoeXNpY2FsT3ZlcnNob290KHFyZWFs IHQpCiAgICAgcmV0dXJuICgtdCAqICh0IC0gMikpICogMS4yNSAtICh0ICogdCkgKiAwLjI1Owog fQogCi12b2lkIFF0Vmlld3BvcnRJbnRlcmFjdGlvbkVuZ2luZTo6YW5pbWF0ZUl0ZW1SZWN0Vmlz aWJsZShjb25zdCBRUmVjdEYmIGl0ZW1SZWN0KQordm9pZCBRdFZpZXdwb3J0SW50ZXJhY3Rpb25F bmdpbmU6OmFuaW1hdGVQYWdlSXRlbVJlY3RWaXNpYmxlKGNvbnN0IFFSZWN0RiYgaXRlbVJlY3Qp CiB7CiAgICAgQVNTRVJUKG1fc2NhbGVBbmltYXRpb24tPnN0YXRlKCkgPT0gUUFic3RyYWN0QW5p bWF0aW9uOjpTdG9wcGVkKTsKIApAQCAtMjAxLDggKzIwNyw4IEBAIHZvaWQgUXRWaWV3cG9ydElu dGVyYWN0aW9uRW5naW5lOjphbmltYXRlSXRlbVJlY3RWaXNpYmxlKGNvbnN0IFFSZWN0RiYgaXRl bVJlY3QpCiAgICAgaWYgKHNjcm9sbEFuaW1hdGlvbkFjdGl2ZSgpKQogICAgICAgICByZXR1cm47 CiAKLSAgICBRUmVjdEYgY3VycmVudEl0ZW1SZWN0VmlzaWJsZSA9IG1fdmlld3BvcnRJdGVtLT5t YXBSZWN0VG9XZWJDb250ZW50KG1fdmlld3BvcnRJdGVtLT5ib3VuZGluZ1JlY3QoKSk7Ci0gICAg aWYgKGl0ZW1SZWN0ID09IGN1cnJlbnRJdGVtUmVjdFZpc2libGUpCisgICAgUVJlY3RGIGN1cnJl bnRQYWdlSXRlbVJlY3RWaXNpYmxlID0gbV92aWV3cG9ydEl0ZW0tPm1hcFJlY3RUb1dlYkNvbnRl bnQobV92aWV3cG9ydEl0ZW0tPmJvdW5kaW5nUmVjdCgpKTsKKyAgICBpZiAoaXRlbVJlY3QgPT0g Y3VycmVudFBhZ2VJdGVtUmVjdFZpc2libGUpCiAgICAgICAgIHJldHVybjsKIAogICAgIFFFYXNp bmdDdXJ2ZSBlYXNpbmdDdXJ2ZTsKQEAgLTIxMSwzNCArMjE3LDM0IEBAIHZvaWQgUXRWaWV3cG9y dEludGVyYWN0aW9uRW5naW5lOjphbmltYXRlSXRlbVJlY3RWaXNpYmxlKGNvbnN0IFFSZWN0RiYg aXRlbVJlY3QpCiAgICAgbV9zY2FsZUFuaW1hdGlvbi0+c2V0RHVyYXRpb24oa1NjYWxlQW5pbWF0 aW9uRHVyYXRpb25NaWxsaXMpOwogICAgIG1fc2NhbGVBbmltYXRpb24tPnNldEVhc2luZ0N1cnZl KGVhc2luZ0N1cnZlKTsKIAotICAgIG1fc2NhbGVBbmltYXRpb24tPnNldFN0YXJ0VmFsdWUoY3Vy cmVudEl0ZW1SZWN0VmlzaWJsZSk7CisgICAgbV9zY2FsZUFuaW1hdGlvbi0+c2V0U3RhcnRWYWx1 ZShjdXJyZW50UGFnZUl0ZW1SZWN0VmlzaWJsZSk7CiAgICAgbV9zY2FsZUFuaW1hdGlvbi0+c2V0 RW5kVmFsdWUoaXRlbVJlY3QpOwogCiAgICAgbV9zY2FsZUFuaW1hdGlvbi0+c3RhcnQoKTsKIH0K IAotdm9pZCBRdFZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmU6OmZsaWNrYWJsZU1vdmVTdGFydGVk KCkKK3ZvaWQgUXRWaWV3cG9ydEludGVyYWN0aW9uRW5naW5lOjpmbGlja01vdmVTdGFydGVkKCkK IHsKICAgICBRX0FTU0VSVChtX3ZpZXdwb3J0SXRlbS0+aXNNb3ZpbmcoKSk7CiAgICAgbV9zY3Jv bGxVcGRhdGVEZWZlcnJlciA9IGFkb3B0UHRyKG5ldyBWaWV3cG9ydFVwZGF0ZURlZmVycmVyKHRo aXMsIFZpZXdwb3J0VXBkYXRlRGVmZXJyZXI6OkRlZmVyVXBkYXRlQW5kU3VzcGVuZENvbnRlbnQp KTsKIAogICAgIG1fbGFzdFNjcm9sbFBvc2l0aW9uID0gbV92aWV3cG9ydEl0ZW0tPmNvbnRlbnRQ b3MoKTsKLSAgICBjb25uZWN0KG1fdmlld3BvcnRJdGVtLCBTSUdOQUwoY29udGVudFhDaGFuZ2Vk KCkpLCBTTE9UKGZsaWNrYWJsZU1vdmluZ1Bvc2l0aW9uVXBkYXRlKCkpKTsKLSAgICBjb25uZWN0 KG1fdmlld3BvcnRJdGVtLCBTSUdOQUwoY29udGVudFlDaGFuZ2VkKCkpLCBTTE9UKGZsaWNrYWJs ZU1vdmluZ1Bvc2l0aW9uVXBkYXRlKCkpKTsKKyAgICBjb25uZWN0KG1fdmlld3BvcnRJdGVtLCBT SUdOQUwoY29udGVudFhDaGFuZ2VkKCkpLCBTTE9UKHBhZ2VJdGVtUG9zaXRpb25DaGFuZ2VkKCkp KTsKKyAgICBjb25uZWN0KG1fdmlld3BvcnRJdGVtLCBTSUdOQUwoY29udGVudFlDaGFuZ2VkKCkp LCBTTE9UKHBhZ2VJdGVtUG9zaXRpb25DaGFuZ2VkKCkpKTsKIH0KIAotdm9pZCBRdFZpZXdwb3J0 SW50ZXJhY3Rpb25FbmdpbmU6OmZsaWNrYWJsZU1vdmVFbmRlZCgpCit2b2lkIFF0Vmlld3BvcnRJ bnRlcmFjdGlvbkVuZ2luZTo6ZmxpY2tNb3ZlRW5kZWQoKQogewogICAgIFFfQVNTRVJUKCFtX3Zp ZXdwb3J0SXRlbS0+aXNNb3ZpbmcoKSk7CiAgICAgLy8gVGhpcyBtZXRob2QgaXMgY2FsbGVkIG9u IHRoZSBlbmQgb2YgdGhlIHBhbiBvciBwYW4ga2luZXRpYyBhbmltYXRpb24uCiAgICAgbV9zY3Jv bGxVcGRhdGVEZWZlcnJlci5jbGVhcigpOwogCiAgICAgbV9sYXN0U2Nyb2xsUG9zaXRpb24gPSBR UG9pbnRGKCk7Ci0gICAgZGlzY29ubmVjdChtX3ZpZXdwb3J0SXRlbSwgU0lHTkFMKGNvbnRlbnRY Q2hhbmdlZCgpKSwgdGhpcywgU0xPVChmbGlja2FibGVNb3ZpbmdQb3NpdGlvblVwZGF0ZSgpKSk7 Ci0gICAgZGlzY29ubmVjdChtX3ZpZXdwb3J0SXRlbSwgU0lHTkFMKGNvbnRlbnRZQ2hhbmdlZCgp KSwgdGhpcywgU0xPVChmbGlja2FibGVNb3ZpbmdQb3NpdGlvblVwZGF0ZSgpKSk7CisgICAgZGlz Y29ubmVjdChtX3ZpZXdwb3J0SXRlbSwgU0lHTkFMKGNvbnRlbnRYQ2hhbmdlZCgpKSwgdGhpcywg U0xPVChwYWdlSXRlbVBvc2l0aW9uQ2hhbmdlZCgpKSk7CisgICAgZGlzY29ubmVjdChtX3ZpZXdw b3J0SXRlbSwgU0lHTkFMKGNvbnRlbnRZQ2hhbmdlZCgpKSwgdGhpcywgU0xPVChwYWdlSXRlbVBv c2l0aW9uQ2hhbmdlZCgpKSk7CiB9CiAKLXZvaWQgUXRWaWV3cG9ydEludGVyYWN0aW9uRW5naW5l OjpmbGlja2FibGVNb3ZpbmdQb3NpdGlvblVwZGF0ZSgpCit2b2lkIFF0Vmlld3BvcnRJbnRlcmFj dGlvbkVuZ2luZTo6cGFnZUl0ZW1Qb3NpdGlvbkNoYW5nZWQoKQogewogICAgIFFQb2ludEYgbmV3 UG9zaXRpb24gPSBtX3ZpZXdwb3J0SXRlbS0+Y29udGVudFBvcygpOwogCkBAIC0yNDcsNiArMjUz LDIzIEBAIHZvaWQgUXRWaWV3cG9ydEludGVyYWN0aW9uRW5naW5lOjpmbGlja2FibGVNb3ZpbmdQ b3NpdGlvblVwZGF0ZSgpCiAgICAgbV9sYXN0U2Nyb2xsUG9zaXRpb24gPSBuZXdQb3NpdGlvbjsK IH0KIAordm9pZCBRdFZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmU6OnBhZ2VDb250ZW50UG9zaXRp b25SZXF1ZXN0KGNvbnN0IFFQb2ludCYgY3NzUG9zaXRpb24pCit7CisgICAgLy8gSWdub3JlIHRo ZSByZXF1ZXN0IGlmIHN1c3BlbmRlZC4gQ2FuIG9ubHkgaGFwcGVuIGR1ZSB0byBkZWxheSBpbiBl dmVudCBkZWxpdmVyeS4KKyAgICBpZiAobV9zdXNwZW5kQ291bnQpCisgICAgICAgIHJldHVybjsK KworICAgIHFyZWFsIGVuZEl0ZW1TY2FsZSA9IG1fcGFnZUl0ZW0tPmNvbnRlbnRzU2NhbGUoKTsg Ly8gU3RheSBhdCBzYW1lIHNjYWxlLgorCisgICAgUVJlY3RGIGVuZFBvc1JhbmdlID0gY29tcHV0 ZVBvc1JhbmdlRm9yUGFnZUl0ZW1BdFNjYWxlKGVuZEl0ZW1TY2FsZSk7CisgICAgUVBvaW50RiBl bmRQb3NpdGlvbiA9IGJvdW5kUG9zaXRpb24oZW5kUG9zUmFuZ2UudG9wTGVmdCgpLCBjc3NQb3Np dGlvbiAqIGVuZEl0ZW1TY2FsZSwgZW5kUG9zUmFuZ2UuYm90dG9tUmlnaHQoKSk7CisKKyAgICBR UmVjdEYgZW5kVmlzaWJsZUNvbnRlbnRSZWN0KGVuZFBvc2l0aW9uIC8gZW5kSXRlbVNjYWxlLCBt X3ZpZXdwb3J0SXRlbS0+Ym91bmRpbmdSZWN0KCkuc2l6ZSgpIC8gZW5kSXRlbVNjYWxlKTsKKwor ICAgIFZpZXdwb3J0VXBkYXRlRGVmZXJyZXIgZ3VhcmQodGhpcyk7CisgICAgc2V0UGFnZUl0ZW1S ZWN0VmlzaWJsZShlbmRWaXNpYmxlQ29udGVudFJlY3QpOworfQorCiB2b2lkIFF0Vmlld3BvcnRJ bnRlcmFjdGlvbkVuZ2luZTo6c2NhbGVBbmltYXRpb25TdGF0ZUNoYW5nZWQoUUFic3RyYWN0QW5p bWF0aW9uOjpTdGF0ZSBuZXdTdGF0ZSwgUUFic3RyYWN0QW5pbWF0aW9uOjpTdGF0ZSAvKm9sZFN0 YXRlKi8pCiB7CiAgICAgc3dpdGNoIChuZXdTdGF0ZSkgewpAQCAtMjYzLDI3ICsyODYsOSBAQCB2 b2lkIFF0Vmlld3BvcnRJbnRlcmFjdGlvbkVuZ2luZTo6c2NhbGVBbmltYXRpb25TdGF0ZUNoYW5n ZWQoUUFic3RyYWN0QW5pbWF0aW9uOgogICAgIH0KIH0KIAotc3RhdGljIGlubGluZSBRUG9pbnRG IGJvdW5kUG9zaXRpb24oY29uc3QgUVBvaW50RiBtaW5Qb3NpdGlvbiwgY29uc3QgUVBvaW50RiYg cG9zaXRpb24sIGNvbnN0IFFQb2ludEYmIG1heFBvc2l0aW9uKQordm9pZCBRdFZpZXdwb3J0SW50 ZXJhY3Rpb25FbmdpbmU6OnNjYWxlQW5pbWF0aW9uVmFsdWVDaGFuZ2VkKFFWYXJpYW50IHZhbHVl KQogewotICAgIHJldHVybiBRUG9pbnRGKHFCb3VuZChtaW5Qb3NpdGlvbi54KCksIHBvc2l0aW9u LngoKSwgbWF4UG9zaXRpb24ueCgpKSwKLSAgICAgICAgICAgICAgICAgICBxQm91bmQobWluUG9z aXRpb24ueSgpLCBwb3NpdGlvbi55KCksIG1heFBvc2l0aW9uLnkoKSkpOwotfQotCi12b2lkIFF0 Vmlld3BvcnRJbnRlcmFjdGlvbkVuZ2luZTo6cGFnZVBvc2l0aW9uUmVxdWVzdChjb25zdCBRUG9p bnQmIHBhZ2VQb3NpdGlvbikKLXsKLSAgICAvLyBJZ25vcmUgdGhlIHJlcXVlc3QgaWYgc3VzcGVu ZGVkLiBDYW4gb25seSBoYXBwZW4gZHVlIHRvIGRlbGF5IGluIGV2ZW50IGRlbGl2ZXJ5LgotICAg IGlmIChtX3N1c3BlbmRDb3VudCkKLSAgICAgICAgcmV0dXJuOwotCi0gICAgcXJlYWwgZW5kSXRl bVNjYWxlID0gbV9wYWdlSXRlbS0+Y29udGVudHNTY2FsZSgpOyAvLyBTdGF5IGF0IHNhbWUgc2Nh bGUuCi0KLSAgICBRUmVjdEYgZW5kUG9zUmFuZ2UgPSBjb21wdXRlUG9zUmFuZ2VGb3JJdGVtQXRT Y2FsZShlbmRJdGVtU2NhbGUpOwotICAgIFFQb2ludEYgZW5kUG9zaXRpb24gPSBib3VuZFBvc2l0 aW9uKGVuZFBvc1JhbmdlLnRvcExlZnQoKSwgcGFnZVBvc2l0aW9uICogZW5kSXRlbVNjYWxlLCBl bmRQb3NSYW5nZS5ib3R0b21SaWdodCgpKTsKLQotICAgIFFSZWN0RiBlbmRWaXNpYmxlQ29udGVu dFJlY3QoZW5kUG9zaXRpb24gLyBlbmRJdGVtU2NhbGUsIG1fdmlld3BvcnRJdGVtLT5ib3VuZGlu Z1JlY3QoKS5zaXplKCkgLyBlbmRJdGVtU2NhbGUpOwotCi0gICAgVmlld3BvcnRVcGRhdGVEZWZl cnJlciBndWFyZCh0aGlzKTsKLSAgICBzZXRJdGVtUmVjdFZpc2libGUoZW5kVmlzaWJsZUNvbnRl bnRSZWN0KTsKKyAgICBzZXRQYWdlSXRlbVJlY3RWaXNpYmxlKHZhbHVlLnRvUmVjdEYoKSk7CiB9 CiAKIHZvaWQgUXRWaWV3cG9ydEludGVyYWN0aW9uRW5naW5lOjp0b3VjaEJlZ2luKCkKQEAgLTMw MCw3ICszMDUsNyBAQCB2b2lkIFF0Vmlld3BvcnRJbnRlcmFjdGlvbkVuZ2luZTo6dG91Y2hFbmQo KQogICAgIG1fdG91Y2hVcGRhdGVEZWZlcnJlci5jbGVhcigpOwogfQogCi1RUmVjdEYgUXRWaWV3 cG9ydEludGVyYWN0aW9uRW5naW5lOjpjb21wdXRlUG9zUmFuZ2VGb3JJdGVtQXRTY2FsZShxcmVh bCBpdGVtU2NhbGUpIGNvbnN0CitRUmVjdEYgUXRWaWV3cG9ydEludGVyYWN0aW9uRW5naW5lOjpj b21wdXRlUG9zUmFuZ2VGb3JQYWdlSXRlbUF0U2NhbGUocXJlYWwgaXRlbVNjYWxlKSBjb25zdAog ewogICAgIGNvbnN0IFFTaXplRiBjb250ZW50SXRlbVNpemUgPSBtX3BhZ2VJdGVtLT5jb250ZW50 c1NpemUoKSAqIGl0ZW1TY2FsZTsKICAgICBjb25zdCBRU2l6ZUYgdmlld3BvcnRJdGVtU2l6ZSA9 IG1fdmlld3BvcnRJdGVtLT5ib3VuZGluZ1JlY3QoKS5zaXplKCk7CkBAIC0zMzksMTMgKzM0NCwx MyBAQCB2b2lkIFF0Vmlld3BvcnRJbnRlcmFjdGlvbkVuZ2luZTo6Zm9jdXNFZGl0YWJsZUFyZWEo Y29uc3QgUVJlY3RGJiBjYXJldEFyZWEsIGNvbgogICAgIGNvbnN0IFFQb2ludEYgdmlld3BvcnRI b3RzcG90ID0gUVBvaW50Rih4LCAvKiBGSVhNRTogdmlzaWJsZUNlbnRlciAqLyB2aWV3cG9ydFJl Y3QuY2VudGVyKCkueSgpKTsKIAogICAgIFFQb2ludEYgZW5kUG9zaXRpb24gPSBob3RzcG90ICog ZW5kSXRlbVNjYWxlIC0gdmlld3BvcnRIb3RzcG90OwotICAgIFFSZWN0RiBlbmRQb3NSYW5nZSA9 IGNvbXB1dGVQb3NSYW5nZUZvckl0ZW1BdFNjYWxlKGVuZEl0ZW1TY2FsZSk7CisgICAgUVJlY3RG IGVuZFBvc1JhbmdlID0gY29tcHV0ZVBvc1JhbmdlRm9yUGFnZUl0ZW1BdFNjYWxlKGVuZEl0ZW1T Y2FsZSk7CiAKICAgICBlbmRQb3NpdGlvbiA9IGJvdW5kUG9zaXRpb24oZW5kUG9zUmFuZ2UudG9w TGVmdCgpLCBlbmRQb3NpdGlvbiwgZW5kUG9zUmFuZ2UuYm90dG9tUmlnaHQoKSk7CiAKICAgICBR UmVjdEYgZW5kVmlzaWJsZUNvbnRlbnRSZWN0KGVuZFBvc2l0aW9uIC8gZW5kSXRlbVNjYWxlLCB2 aWV3cG9ydFJlY3Quc2l6ZSgpIC8gZW5kSXRlbVNjYWxlKTsKIAotICAgIGFuaW1hdGVJdGVtUmVj dFZpc2libGUoZW5kVmlzaWJsZUNvbnRlbnRSZWN0KTsKKyAgICBhbmltYXRlUGFnZUl0ZW1SZWN0 VmlzaWJsZShlbmRWaXNpYmxlQ29udGVudFJlY3QpOwogfQogCiB2b2lkIFF0Vmlld3BvcnRJbnRl cmFjdGlvbkVuZ2luZTo6em9vbVRvQXJlYUdlc3R1cmVFbmRlZChjb25zdCBRUG9pbnRGJiB0b3Vj aFBvaW50LCBjb25zdCBRUmVjdEYmIHRhcmdldEFyZWEpCkBAIC0zNzcsNyArMzgyLDcgQEAgdm9p ZCBRdFZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmU6Onpvb21Ub0FyZWFHZXN0dXJlRW5kZWQoY29u c3QgUVBvaW50RiYgdG91Y2hQb2kKIAogICAgIFFQb2ludEYgZW5kUG9zaXRpb24gPSBob3RzcG90 ICogZW5kQ1NTU2NhbGUgLSB2aWV3cG9ydEhvdHNwb3Q7CiAKLSAgICBRUmVjdEYgZW5kUG9zUmFu Z2UgPSBjb21wdXRlUG9zUmFuZ2VGb3JJdGVtQXRTY2FsZShlbmRJdGVtU2NhbGUpOworICAgIFFS ZWN0RiBlbmRQb3NSYW5nZSA9IGNvbXB1dGVQb3NSYW5nZUZvclBhZ2VJdGVtQXRTY2FsZShlbmRJ dGVtU2NhbGUpOwogICAgIGVuZFBvc2l0aW9uID0gYm91bmRQb3NpdGlvbihlbmRQb3NSYW5nZS50 b3BMZWZ0KCksIGVuZFBvc2l0aW9uLCBlbmRQb3NSYW5nZS5ib3R0b21SaWdodCgpKTsKIAogICAg IFFSZWN0RiBlbmRWaXNpYmxlQ29udGVudFJlY3QoZW5kUG9zaXRpb24gLyBlbmRJdGVtU2NhbGUs IHZpZXdwb3J0UmVjdC5zaXplKCkgLyBlbmRJdGVtU2NhbGUpOwpAQCAtNDE0LDcgKzQxOSw3IEBA IHZvaWQgUXRWaWV3cG9ydEludGVyYWN0aW9uRW5naW5lOjp6b29tVG9BcmVhR2VzdHVyZUVuZGVk KGNvbnN0IFFQb2ludEYmIHRvdWNoUG9pCiAgICAgICAgIC8vIFJlY2FsY3VsYXRlIGVuZFBvc2l0 aW9uIGFuZCBib3VuZCBpdCBhY2NvcmRpbmcgdG8gbmV3IHNjYWxlLgogICAgICAgICBlbmRQb3Np dGlvbi5zZXRZKGhvdHNwb3QueSgpICogZW5kQ1NTU2NhbGUgLSB2aWV3cG9ydEhvdHNwb3QueSgp KTsKICAgICAgICAgZW5kUG9zaXRpb24uc2V0WChsYXN0U2NhbGUueFBvc2l0aW9uKTsKLSAgICAg ICAgZW5kUG9zUmFuZ2UgPSBjb21wdXRlUG9zUmFuZ2VGb3JJdGVtQXRTY2FsZShlbmRJdGVtU2Nh bGUpOworICAgICAgICBlbmRQb3NSYW5nZSA9IGNvbXB1dGVQb3NSYW5nZUZvclBhZ2VJdGVtQXRT Y2FsZShlbmRJdGVtU2NhbGUpOwogICAgICAgICBlbmRQb3NpdGlvbiA9IGJvdW5kUG9zaXRpb24o ZW5kUG9zUmFuZ2UudG9wTGVmdCgpLCBlbmRQb3NpdGlvbiwgZW5kUG9zUmFuZ2UuYm90dG9tUmln aHQoKSk7CiAgICAgICAgIGVuZFZpc2libGVDb250ZW50UmVjdCA9IFFSZWN0RihlbmRQb3NpdGlv biAvIGVuZEl0ZW1TY2FsZSwgdmlld3BvcnRSZWN0LnNpemUoKSAvIGVuZEl0ZW1TY2FsZSk7CiAg ICAgICAgIGJyZWFrOwpAQCAtNDI5LDcgKzQzNCw3IEBAIHZvaWQgUXRWaWV3cG9ydEludGVyYWN0 aW9uRW5naW5lOjp6b29tVG9BcmVhR2VzdHVyZUVuZGVkKGNvbnN0IFFQb2ludEYmIHRvdWNoUG9p CiAgICAgICAgIGJyZWFrOwogICAgIH0KIAotICAgIGFuaW1hdGVJdGVtUmVjdFZpc2libGUoZW5k VmlzaWJsZUNvbnRlbnRSZWN0KTsKKyAgICBhbmltYXRlUGFnZUl0ZW1SZWN0VmlzaWJsZShlbmRW aXNpYmxlQ29udGVudFJlY3QpOwogfQogCiBRUmVjdEYgUXRWaWV3cG9ydEludGVyYWN0aW9uRW5n aW5lOjpuZWFyZXN0VmFsaWRCb3VuZHMoKSBjb25zdApAQCAtNDQxLDcgKzQ0Niw3IEBAIFFSZWN0 RiBRdFZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmU6Om5lYXJlc3RWYWxpZEJvdW5kcygpIGNvbnN0 CiAKICAgICBRUG9pbnRGIGVuZFBvc2l0aW9uID0gbV92aWV3cG9ydEl0ZW0tPm1hcFRvV2ViQ29u dGVudCh2aWV3cG9ydEhvdHNwb3QpICogZW5kSXRlbVNjYWxlIC0gdmlld3BvcnRIb3RzcG90Owog Ci0gICAgUVJlY3RGIGVuZFBvc1JhbmdlID0gY29tcHV0ZVBvc1JhbmdlRm9ySXRlbUF0U2NhbGUo ZW5kSXRlbVNjYWxlKTsKKyAgICBRUmVjdEYgZW5kUG9zUmFuZ2UgPSBjb21wdXRlUG9zUmFuZ2VG b3JQYWdlSXRlbUF0U2NhbGUoZW5kSXRlbVNjYWxlKTsKICAgICBlbmRQb3NpdGlvbiA9IGJvdW5k UG9zaXRpb24oZW5kUG9zUmFuZ2UudG9wTGVmdCgpLCBlbmRQb3NpdGlvbiwgZW5kUG9zUmFuZ2Uu Ym90dG9tUmlnaHQoKSk7CiAKICAgICBRUmVjdEYgZW5kVmlzaWJsZUNvbnRlbnRSZWN0KGVuZFBv c2l0aW9uIC8gZW5kSXRlbVNjYWxlLCB2aWV3cG9ydFJlY3Quc2l6ZSgpIC8gZW5kSXRlbVNjYWxl KTsKQEAgLTU0OCw3ICs1NTMsNyBAQCB2b2lkIFF0Vmlld3BvcnRJbnRlcmFjdGlvbkVuZ2luZTo6 Y2FuY2VsU2Nyb2xsQW5pbWF0aW9uKCkKIAogICAgIG1fdmlld3BvcnRJdGVtLT5jYW5jZWxGbGlj aygpOwogICAgIFZpZXdwb3J0VXBkYXRlRGVmZXJyZXIgZ3VhcmQodGhpcyk7Ci0gICAgc2V0SXRl bVJlY3RWaXNpYmxlKG5lYXJlc3RWYWxpZEJvdW5kcygpKTsKKyAgICBzZXRQYWdlSXRlbVJlY3RW aXNpYmxlKG5lYXJlc3RWYWxpZEJvdW5kcygpKTsKIH0KIAogdm9pZCBRdFZpZXdwb3J0SW50ZXJh Y3Rpb25FbmdpbmU6OmludGVycnVwdFNjYWxlQW5pbWF0aW9uKCkKQEAgLTYxMCw3ICs2MTUsNyBA QCB2b2lkIFF0Vmlld3BvcnRJbnRlcmFjdGlvbkVuZ2luZTo6cGluY2hHZXN0dXJlRW5kZWQoKQog CiAgICAgbV9waW5jaFN0YXJ0U2NhbGUgPSAtMTsKIAotICAgIGFuaW1hdGVJdGVtUmVjdFZpc2li bGUobmVhcmVzdFZhbGlkQm91bmRzKCkpOworICAgIGFuaW1hdGVQYWdlSXRlbVJlY3RWaXNpYmxl KG5lYXJlc3RWYWxpZEJvdW5kcygpKTsKICAgICBtX3NjYWxlVXBkYXRlRGVmZXJyZXIuY2xlYXIo KTsgLy8gQ2xlYXIgYWZ0ZXIgc3RhcnRpbmcgcG90ZW50aWFsIGFuaW1hdGlvbiwgd2hpY2ggdGFr ZXMgb3ZlciBkZWZlcnJpbmcuCiB9CiAKQEAgLTYyNiwxMyArNjMxLDEzIEBAIHZvaWQgUXRWaWV3 cG9ydEludGVyYWN0aW9uRW5naW5lOjpwaW5jaEdlc3R1cmVDYW5jZWxsZWQoKQogICoKICAqIEZJ WE1FOiBUaGlzIGlzIGN1cnJlbnRseSBjYWxsZWQgdHdpY2UgaWYgeW91IGNvbmN1cnJlbnRseSBj aGFuZ2Ugd2lkdGggYW5kIGhlaWdodC4KICAqLwotdm9pZCBRdFZpZXdwb3J0SW50ZXJhY3Rpb25F bmdpbmU6Oml0ZW1TaXplQ2hhbmdlZCgpCit2b2lkIFF0Vmlld3BvcnRJbnRlcmFjdGlvbkVuZ2lu ZTo6cGFnZUl0ZW1TaXplQ2hhbmdlZCgpCiB7CiAgICAgaWYgKG1fc3VzcGVuZENvdW50KQogICAg ICAgICByZXR1cm47CiAKICAgICBWaWV3cG9ydFVwZGF0ZURlZmVycmVyIGd1YXJkKHRoaXMpOwot ICAgIHNldEl0ZW1SZWN0VmlzaWJsZShuZWFyZXN0VmFsaWRCb3VuZHMoKSk7CisgICAgc2V0UGFn ZUl0ZW1SZWN0VmlzaWJsZShuZWFyZXN0VmFsaWRCb3VuZHMoKSk7CiB9CiAKIHZvaWQgUXRWaWV3 cG9ydEludGVyYWN0aW9uRW5naW5lOjpzY2FsZUNvbnRlbnQoY29uc3QgUVBvaW50RiYgY2VudGVy SW5DU1NDb29yZGluYXRlcywgcXJlYWwgY3NzU2NhbGUpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvcXQvUXRWaWV3cG9ydEludGVyYWN0aW9uRW5naW5lLmggYi9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvcXQvUXRWaWV3cG9ydEludGVyYWN0aW9uRW5naW5lLmgKaW5kZXgg ZDIxNDM0ODc5NDg1NzJhZTJkYjdmZTZlNjliNTRmOWNjOWRjMTJlZi4uZWU4NGNiOTBhZWY5MTQw MDFhMDA1OWRlMDE2NGYwNjZkYjYwM2EwYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL3F0L1F0Vmlld3BvcnRJbnRlcmFjdGlvbkVuZ2luZS5oCisrKyBiL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9xdC9RdFZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmUuaApAQCAtNTgsMTQg KzU4LDE1IEBAIHB1YmxpYzoKICAgICBxcmVhbCBjdXJyZW50Q1NTU2NhbGUoKSBjb25zdDsKIAog ICAgIHZvaWQgc2V0QWxsb3dzVXNlclNjYWxpbmcoYm9vbCBhbGxvdykgeyBtX2FsbG93c1VzZXJT Y2FsaW5nID0gYWxsb3c7IH0KLSAgICB2b2lkIHNldENvbnRlbnRUb0RldmljZVBpeGVsUmF0aW8o cXJlYWwgcmF0aW8pIHttX2RldmljZVBpeGVsUmF0aW8gPSByYXRpbzsgfQorICAgIHZvaWQgc2V0 RGV2aWNlUGl4ZWxSYXRpbyhxcmVhbCByYXRpbykgeyBtX2RldmljZVBpeGVsUmF0aW8gPSByYXRp bzsgfQogCi0gICAgdm9pZCBzZXRJdGVtUmVjdFZpc2libGUoY29uc3QgUVJlY3RGJik7Ci0gICAg dm9pZCBhbmltYXRlSXRlbVJlY3RWaXNpYmxlKGNvbnN0IFFSZWN0RiYpOworICAgIHZvaWQgc2V0 UGFnZUl0ZW1SZWN0VmlzaWJsZShjb25zdCBRUmVjdEYmKTsKKyAgICB2b2lkIGFuaW1hdGVQYWdl SXRlbVJlY3RWaXNpYmxlKGNvbnN0IFFSZWN0RiYpOwogCiAgICAgUVJlY3RGIG5lYXJlc3RWYWxp ZEJvdW5kcygpIGNvbnN0OwogCi0gICAgdm9pZCBwYWdlUG9zaXRpb25SZXF1ZXN0KGNvbnN0IFFQ b2ludCYgcG9zKTsKKyAgICB2b2lkIHBhZ2VDb250ZW50UG9zaXRpb25SZXF1ZXN0KGNvbnN0IFFQ b2ludCYgcG9zKTsKKwogICAgIHZvaWQgdG91Y2hCZWdpbigpOwogICAgIHZvaWQgdG91Y2hFbmQo KTsKIApAQCAtNzMsMTEgKzc0LDkgQEAgcHVibGljOgogICAgIHZvaWQgY2FuY2VsU2Nyb2xsQW5p bWF0aW9uKCk7CiAKICAgICBib29sIHBhbkdlc3R1cmVBY3RpdmUoKSBjb25zdDsKLQogICAgIHZv aWQgcGFuR2VzdHVyZVN0YXJ0ZWQoY29uc3QgUVBvaW50RiYgcG9zaXRpb24sIHFpbnQ2NCBldmVu dFRpbWVzdGFtcE1pbGxpcyk7CiAgICAgdm9pZCBwYW5HZXN0dXJlUmVxdWVzdFVwZGF0ZShjb25z dCBRUG9pbnRGJiBwb3NpdGlvbiwgcWludDY0IGV2ZW50VGltZXN0YW1wTWlsbGlzKTsKICAgICB2 b2lkIHBhbkdlc3R1cmVFbmRlZChjb25zdCBRUG9pbnRGJiBwb3NpdGlvbiwgcWludDY0IGV2ZW50 VGltZXN0YW1wTWlsbGlzKTsKLQogICAgIHZvaWQgcGFuR2VzdHVyZUNhbmNlbGxlZCgpOwogCiAg ICAgYm9vbCBzY2FsZUFuaW1hdGlvbkFjdGl2ZSgpIGNvbnN0OwpAQCAtOTgsMTkgKzk3LDE2IEBA IFFfU0lHTkFMUzoKIAogICAgIHZvaWQgaW5mb3JtVmlzaWJsZUNvbnRlbnRDaGFuZ2UoY29uc3Qg UVBvaW50RiYgdHJhamVjdG9yeSA9IFFQb2ludEYoKSk7CiAKLSAgICB2b2lkIHZpc2libGVDb250 ZW50UmVjdEFuZFNjYWxlQ2hhbmdlZCgpOwotCiBwcml2YXRlIFFfU0xPVFM6CiAgICAgLy8gUmVz cG9uZCB0byBjaGFuZ2VzIG9mIGNvbnRlbnQgdGhhdCBhcmUgbm90IGRyaXZlbiBieSB1cywgbGlr ZSB0aGUgcGFnZSByZXNpemluZyBpdHNlbGYuCi0gICAgdm9pZCBpdGVtU2l6ZUNoYW5nZWQoKTsK LQotICAgIHZvaWQgZmxpY2thYmxlTW92aW5nUG9zaXRpb25VcGRhdGUoKTsKKyAgICB2b2lkIHBh Z2VJdGVtU2l6ZUNoYW5nZWQoKTsKKyAgICB2b2lkIHBhZ2VJdGVtUG9zaXRpb25DaGFuZ2VkKCk7 CiAKICAgICB2b2lkIHNjYWxlQW5pbWF0aW9uU3RhdGVDaGFuZ2VkKFFBYnN0cmFjdEFuaW1hdGlv bjo6U3RhdGUsIFFBYnN0cmFjdEFuaW1hdGlvbjo6U3RhdGUpOwotICAgIHZvaWQgc2NhbGVBbmlt YXRpb25WYWx1ZUNoYW5nZWQoUVZhcmlhbnQgdmFsdWUpIHsgc2V0SXRlbVJlY3RWaXNpYmxlKHZh bHVlLnRvUmVjdEYoKSk7IH0KKyAgICB2b2lkIHNjYWxlQW5pbWF0aW9uVmFsdWVDaGFuZ2VkKFFW YXJpYW50IHZhbHVlKTsKIAotICAgIHZvaWQgZmxpY2thYmxlTW92ZVN0YXJ0ZWQoKTsgLy8gQ2Fs bGVkIHdoZW4gcGFubmluZyBzdGFydHMuCi0gICAgdm9pZCBmbGlja2FibGVNb3ZlRW5kZWQoKTsg Ly8gICBDYWxsZWQgd2hlbiBwYW5uaW5nICgrIGtpbmV0aWMgYW5pbWF0aW9uKSBlbmRzLgorICAg IHZvaWQgZmxpY2tNb3ZlU3RhcnRlZCgpOyAvLyBDYWxsZWQgd2hlbiBwYW5uaW5nIHN0YXJ0cy4K KyAgICB2b2lkIGZsaWNrTW92ZUVuZGVkKCk7IC8vICAgQ2FsbGVkIHdoZW4gcGFubmluZyAoKyBr aW5ldGljIGFuaW1hdGlvbikgZW5kcy4KIAogcHJpdmF0ZToKICAgICBmcmllbmQgY2xhc3MgVmll d3BvcnRVcGRhdGVEZWZlcnJlcjsKQEAgLTEyNyw2ICsxMjMsOSBAQCBwcml2YXRlOgogICAgIHFy ZWFsIGlubmVyQm91bmRlZENTU1NjYWxlKHFyZWFsKSBjb25zdDsKICAgICBxcmVhbCBvdXRlckJv dW5kZWRDU1NTY2FsZShxcmVhbCkgY29uc3Q7CiAKKyAgICBRUmVjdEYgY29tcHV0ZVBvc1Jhbmdl Rm9yUGFnZUl0ZW1BdFNjYWxlKHFyZWFsIGl0ZW1TY2FsZSkgY29uc3Q7CisgICAgdm9pZCBzY2Fs ZUNvbnRlbnQoY29uc3QgUVBvaW50RiYgY2VudGVySW5DU1NDb29yZGluYXRlcywgcXJlYWwgY3Nz U2NhbGUpOworCiAgICAgYm9vbCBtX2FsbG93c1VzZXJTY2FsaW5nOwogICAgIHFyZWFsIG1fbWlu aW11bVNjYWxlOwogICAgIHFyZWFsIG1fbWF4aW11bVNjYWxlOwpAQCAtMTM0LDEyICsxMzMsOSBA QCBwcml2YXRlOgogCiAgICAgUVNpemUgbV9sYXlvdXRTaXplOwogCi0gICAgUVJlY3RGIGNvbXB1 dGVQb3NSYW5nZUZvckl0ZW1BdFNjYWxlKHFyZWFsIGl0ZW1TY2FsZSkgY29uc3Q7Ci0KLSAgICB2 b2lkIHNjYWxlQ29udGVudChjb25zdCBRUG9pbnRGJiBjZW50ZXJJbkNTU0Nvb3JkaW5hdGVzLCBx cmVhbCBjc3NTY2FsZSk7Ci0KICAgICBpbnQgbV9zdXNwZW5kQ291bnQ7CiAgICAgYm9vbCBtX2hh c1N1c3BlbmRlZENvbnRlbnQ7CisKICAgICBPd25QdHI8Vmlld3BvcnRVcGRhdGVEZWZlcnJlcj4g bV9zY2FsZVVwZGF0ZURlZmVycmVyOwogICAgIE93blB0cjxWaWV3cG9ydFVwZGF0ZURlZmVycmVy PiBtX3Njcm9sbFVwZGF0ZURlZmVycmVyOwogICAgIE93blB0cjxWaWV3cG9ydFVwZGF0ZURlZmVy cmVyPiBtX3RvdWNoVXBkYXRlRGVmZXJyZXI7Cg==