96283 2012-09-10 09:48:06 -0700 [Qt][WK2] Fix the build with recent Qt5 2012-09-11 02:18:08 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 abecsi abecsi cmarcelo hausmann menard webkit.review.bot zoltan oldest_to_newest 716177 0 abecsi 2012-09-10 09:48:06 -0700 [Qt][WK2] Fix the build with recent Qt5 716178 1 163153 abecsi 2012-09-10 09:50:26 -0700 Created attachment 163153 Patch 716964 2 163153 abecsi 2012-09-11 02:18:03 -0700 Comment on attachment 163153 Patch Clearing flags on attachment: 163153 Committed r128158: <http://trac.webkit.org/changeset/128158> 716965 3 abecsi 2012-09-11 02:18:08 -0700 All reviewed patches have been landed. Closing bug. 163153 2012-09-10 09:50:26 -0700 2012-09-11 02:18:03 -0700 Patch bug-96283-20120910185010.patch text/plain 19592 abecsi U3VidmVyc2lvbiBSZXZpc2lvbjogMTI4MDY2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L3F0 L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nCmluZGV4IDFhZTQzYzc3YWMy YzBhNjYzM2ZlY2I2NmQ1ZmEwNWUzZTI0MDA3ZTEuLjI0NDY5MmFkODE1N2JjZGY5NWZiY2Y5M2Y0 MGM2NjE3OGNhYTdlM2UgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nCisr KyBiL1NvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzMgQEAKKzIwMTItMDkt MTAgIEFuZHJhcyBCZWNzaSAgPGFuZHJhcy5iZWNzaUBub2tpYS5jb20+CisKKyAgICAgICAgW1F0 XVtXSzJdIEZpeCB0aGUgYnVpbGQgd2l0aCByZWNlbnQgUXQ1CisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05NjI4MworCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdlIHNob3VsZCBub3QgdXNlIGRlcHJlY2F0ZWQg UXQgQVBJIGJlY2F1c2UgZG9pbmcgdGhhdCByZXN1bHRzCisgICAgICAgIGluIGJ1aWxkIGZhaWx1 cmUgc2luY2UgYWxsIHRoZSBkZXByZWNhdGVkIEFQSSB3YXMgZGlzYWJsZWQKKyAgICAgICAgaW4g cXRiYXNlIChodHRwczovL2NvZGVyZXZpZXcucXQtcHJvamVjdC5vcmcvI2NoYW5nZSwyNDg5MCku CisKKyAgICAgICAgKiB0ZXN0cy9xZ3JhcGhpY3N3ZWJ2aWV3L3RzdF9xZ3JhcGhpY3N3ZWJ2aWV3 LmNwcDoKKyAgICAgICAgKHRzdF9RR3JhcGhpY3NXZWJWaWV3Ojp3aWRnZXRzUmVuZGVyaW5nVGhy b3VnaENhY2hlKToKKyAgICAgICAgKHRzdF9RR3JhcGhpY3NXZWJWaWV3OjpzZXRQYWxldHRlKToK KyAgICAgICAgKHRzdF9RR3JhcGhpY3NXZWJWaWV3Ojpjb21wYXJlQ2FudmFzVG9JbWFnZSk6Cisg ICAgICAgICogdGVzdHMvcW9iamVjdGJyaWRnZS90c3RfcW9iamVjdGJyaWRnZS5jcHA6CisgICAg ICAgICh0c3RfUU9iamVjdEJyaWRnZTo6b3duZXJzaGlwKToKKyAgICAgICAgKiB0ZXN0cy9xd2Vi ZnJhbWUvdHN0X3F3ZWJmcmFtZS5jcHA6CisgICAgICAgICh0c3RfUVdlYkZyYW1lOjpwb3B1cEZv Y3VzKToKKyAgICAgICAgKHRzdF9RV2ViRnJhbWU6OmlucHV0RmllbGRGb2N1cyk6CisgICAgICAg ICh0c3RfUVdlYkZyYW1lOjpldmFsdWF0ZVdpbGxDYXVzZVJlcGFpbnQpOgorICAgICAgICAqIHRl c3RzL3F3ZWJwYWdlL3RzdF9xd2VicGFnZS5jcHA6CisgICAgICAgIChOYXZpZ2F0aW9uKToKKyAg ICAgICAgKFBsdWdpbkNvdW50ZXJQYWdlKToKKyAgICAgICAgKiB0ZXN0cy9xd2Vidmlldy90c3Rf cXdlYnZpZXcuY3BwOgorICAgICAgICAodHN0X1FXZWJWaWV3OjpyZXVzZVBhZ2UpOgorICAgICAg ICAodHN0X1FXZWJWaWV3Ojpmb2N1c0lucHV0VHlwZXMpOgorICAgICAgICAodHN0X1FXZWJWaWV3 OjpzZXRQYWxldHRlKToKKyAgICAgICAgKHRzdF9RV2ViVmlldzo6cmVuZGVyaW5nQWZ0ZXJNYXhB bmRCYWNrKToKKwogMjAxMi0wOS0wOSAgRW1pbCBBIEVrbHVuZCAgPGVhZUBjaHJvbWl1bS5vcmc+ CiAKICAgICAgICAgUmVuYW1lIE5vZGU6OmdldFJlY3QvZ2V0UGl4ZWxTbmFwcGVkUmVjdCBhbmQg cmVtb3ZlIENvbnRhaW5lck5vZGU6OmdldFJlY3QKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQy L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwppbmRleCA4M2NhMWQ4ZDllNWFj ZjEwODUzMjM5ODQyYTlmMjNmNmUzNTMyZTAxLi5hM2RkNGExNjc1Y2ZlN2M5Yzg1NzBkZDUxZDY3 MzliZjAxYzYwNWM1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKKysrIGIv U291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjYgQEAKKzIwMTItMDktMTAgIEFu ZHJhcyBCZWNzaSAgPGFuZHJhcy5iZWNzaUBub2tpYS5jb20+CisKKyAgICAgICAgW1F0XVtXSzJd IEZpeCB0aGUgYnVpbGQgd2l0aCByZWNlbnQgUXQ1CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD05NjI4MworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFdlIHNob3VsZCBub3QgdXNlIGRlcHJlY2F0ZWQgUXQgQVBJ IGJlY2F1c2UgZG9pbmcgdGhhdCByZXN1bHRzCisgICAgICAgIGluIGJ1aWxkIGZhaWx1cmUgc2lu Y2UgYWxsIHRoZSBkZXByZWNhdGVkIEFQSSB3YXMgZGlzYWJsZWQKKyAgICAgICAgaW4gcXRiYXNl IChodHRwczovL2NvZGVyZXZpZXcucXQtcHJvamVjdC5vcmcvI2NoYW5nZSwyNDg5MCkuCisKKyAg ICAgICAgKiBVSVByb2Nlc3MvQVBJL3F0L3F3ZWJuYXZpZ2F0aW9uaGlzdG9yeS5jcHA6CisgICAg ICAgIChRV2ViTmF2aWdhdGlvbkxpc3RNb2RlbDo6cm9sZU5hbWVzKToKKyAgICAgICAgKFFXZWJO YXZpZ2F0aW9uTGlzdE1vZGVsOjpyZXNldCk6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9xdC9x d2VibmF2aWdhdGlvbmhpc3RvcnlfcC5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvcXQvdGVz dHMvcXJhd3dlYnZpZXcvdHN0X3FyYXd3ZWJ2aWV3LmNwcDoKKyAgICAgICAgKFdlYlZpZXc6Omxv YWQpOgorICAgICAgICAqIFVJUHJvY2Vzcy9xdC9XZWJQb3B1cE1lbnVQcm94eVF0LmNwcDoKKyAg ICAgICAgKFBvcHVwTWVudUl0ZW1Nb2RlbCk6CisgICAgICAgIChXZWJLaXQ6OlBvcHVwTWVudUl0 ZW1Nb2RlbDo6UG9wdXBNZW51SXRlbU1vZGVsKToKKyAgICAgICAgKFdlYktpdDo6UG9wdXBNZW51 SXRlbU1vZGVsOjpyb2xlTmFtZXMpOgorICAgICAgICAoV2ViS2l0KToKKwogMjAxMi0wOS0xMCAg Q2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CiAKICAgICAgICAgW1NP VVBdIERvbid0IGNvbnZlcnQgdG8gVVRGLTggdGhlIHN1Z2dlc3RlZEZpbGVuYW1lIHBhc3NlZCB0 byBEb3dubG9hZDo6ZGVjaWRlRGVzdGluYXRpb25XaXRoU3VnZ2VzdGVkRmlsZW5hbWUoKQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdC9xdC90ZXN0cy9xZ3JhcGhpY3N3ZWJ2aWV3L3RzdF9xZ3Jh cGhpY3N3ZWJ2aWV3LmNwcCBiL1NvdXJjZS9XZWJLaXQvcXQvdGVzdHMvcWdyYXBoaWNzd2Vidmll dy90c3RfcWdyYXBoaWNzd2Vidmlldy5jcHAKaW5kZXggOTkyZWI5MDRiMjgyNjQzNDM1Mzg2Yjdh MDk0NDJjZmY5MDA2MzU1OS4uOWFlOTYwYjljY2MxMjA3YzQ2NjJiZmRlN2QyMjE3ZGViZjBjNjIx MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9xdC90ZXN0cy9xZ3JhcGhpY3N3ZWJ2aWV3L3Rz dF9xZ3JhcGhpY3N3ZWJ2aWV3LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L3F0L3Rlc3RzL3FncmFw aGljc3dlYnZpZXcvdHN0X3FncmFwaGljc3dlYnZpZXcuY3BwCkBAIC0xODQsNyArMTg0LDcgQEAg dm9pZCB0c3RfUUdyYXBoaWNzV2ViVmlldzo6d2lkZ2V0c1JlbmRlcmluZ1Rocm91Z2hDYWNoZSgp CiAgICAgc2NlbmUtPmFkZEl0ZW0od2ViVmlldyk7CiAgICAgdmlldy5zZXRHZW9tZXRyeShRUmVj dCgwLCAwLCA1MDAsIDUwMCkpOwogICAgIFFXaWRnZXQgKmNvbnN0IHdpZGdldCA9ICZ2aWV3Owot ICAgIFFUZXN0OjpxV2FpdEZvcldpbmRvd1Nob3duKHdpZGdldCk7CisgICAgUVRlc3Q6OnFXYWl0 Rm9yV2luZG93RXhwb3NlZCh3aWRnZXQpOwogCiAgICAgLy8gMS4gUmVmZXJlbmNlIHdpdGhvdXQg dGlsaW5nLgogICAgIHdlYlZpZXctPnNldHRpbmdzKCktPnNldEF0dHJpYnV0ZShRV2ViU2V0dGlu Z3M6OlRpbGVkQmFja2luZ1N0b3JlRW5hYmxlZCwgZmFsc2UpOwpAQCAtNDA5LDExICs0MDksMTEg QEAgdm9pZCB0c3RfUUdyYXBoaWNzV2ViVmlldzo6c2V0UGFsZXR0ZSgpCiAgICAgUVZFUklGWSh3 ZWJWaWV3MS5wYWxldHRlKCkgPT0gcGFsZXR0ZTEpOwogICAgIFFWRVJJRlkod2ViVmlldzEucGFn ZSgpLT5wYWxldHRlKCkgPT0gcGFsZXR0ZTEpOwogCi0gICAgUVRlc3Q6OnFXYWl0Rm9yV2luZG93 U2hvd24oJnZpZXcxKTsKKyAgICBRVGVzdDo6cVdhaXRGb3JXaW5kb3dFeHBvc2VkKCZ2aWV3MSk7 CiAKICAgICBpZiAoIWFjdGl2ZSkgewogICAgICAgICBjb250cm9sVmlldy5zaG93KCk7Ci0gICAg ICAgIFFUZXN0OjpxV2FpdEZvcldpbmRvd1Nob3duKCZjb250cm9sVmlldyk7CisgICAgICAgIFFU ZXN0OjpxV2FpdEZvcldpbmRvd0V4cG9zZWQoJmNvbnRyb2xWaWV3KTsKICAgICAgICAgUUFwcGxp Y2F0aW9uOjpzZXRBY3RpdmVXaW5kb3coJmNvbnRyb2xWaWV3KTsKICAgICAgICAgYWN0aXZlVmll dyA9ICZjb250cm9sVmlldzsKICAgICAgICAgY29udHJvbFZpZXcuYWN0aXZhdGVXaW5kb3coKTsK QEAgLTQ2NCwxMSArNDY0LDExIEBAIHZvaWQgdHN0X1FHcmFwaGljc1dlYlZpZXc6OnNldFBhbGV0 dGUoKQogICAgIHdlYlZpZXcyLnNldFBhbGV0dGUocGFsZXR0ZTIpOwogICAgIHZpZXcyLnNob3co KTsKIAotICAgIFFUZXN0OjpxV2FpdEZvcldpbmRvd1Nob3duKCZ2aWV3Mik7CisgICAgUVRlc3Q6 OnFXYWl0Rm9yV2luZG93RXhwb3NlZCgmdmlldzIpOwogCiAgICAgaWYgKCFhY3RpdmUpIHsKICAg ICAgICAgY29udHJvbFZpZXcuc2hvdygpOwotICAgICAgICBRVGVzdDo6cVdhaXRGb3JXaW5kb3dT aG93bigmY29udHJvbFZpZXcpOworICAgICAgICBRVGVzdDo6cVdhaXRGb3JXaW5kb3dFeHBvc2Vk KCZjb250cm9sVmlldyk7CiAgICAgICAgIFFBcHBsaWNhdGlvbjo6c2V0QWN0aXZlV2luZG93KCZj b250cm9sVmlldyk7CiAgICAgICAgIGFjdGl2ZVZpZXcgPSAmY29udHJvbFZpZXc7CiAgICAgICAg IGNvbnRyb2xWaWV3LmFjdGl2YXRlV2luZG93KCk7CkBAIC02MTAsNyArNjEwLDcgQEAgdm9pZCB0 c3RfUUdyYXBoaWNzV2ViVmlldzo6Y29tcGFyZUNhbnZhc1RvSW1hZ2UoY29uc3QgUVVybCYgdXJs LCBjb25zdCBRSW1hZ2UmIHIKIHsKICAgICBHcmFwaGljc1ZpZXcgdmlldzsKICAgICB2aWV3LnNo b3coKTsKLSAgICBRVGVzdDo6cVdhaXRGb3JXaW5kb3dTaG93bigmdmlldyk7CisgICAgUVRlc3Q6 OnFXYWl0Rm9yV2luZG93RXhwb3NlZCgmdmlldyk7CiAKICAgICBRR3JhcGhpY3NXZWJWaWV3KiBj b25zdCBncmFwaGljc1dlYlZpZXcgPSB2aWV3Lm1fd2ViVmlldzsKICAgICBncmFwaGljc1dlYlZp ZXctPmxvYWQodXJsKTsKQEAgLTYyMCw3ICs2MjAsNiBAQCB2b2lkIHRzdF9RR3JhcGhpY3NXZWJW aWV3Ojpjb21wYXJlQ2FudmFzVG9JbWFnZShjb25zdCBRVXJsJiB1cmwsIGNvbnN0IFFJbWFnZSYg cgogICAgICAgICBRUGFpbnRlciBwYWludGVyKCZwaXhtYXApOwogICAgICAgICB2aWV3LnJlbmRl cigmcGFpbnRlcik7CiAgICAgfQotICAgIFFBcHBsaWNhdGlvbjo6c3luY1goKTsKIAogICAgIGNv bnN0IFFTaXplIGltYWdlU2l6ZSA9IHJlZmVyZW5jZS5zaXplKCk7CiAKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQvcXQvdGVzdHMvcW9iamVjdGJyaWRnZS90c3RfcW9iamVjdGJyaWRnZS5jcHAg Yi9Tb3VyY2UvV2ViS2l0L3F0L3Rlc3RzL3FvYmplY3RicmlkZ2UvdHN0X3FvYmplY3RicmlkZ2Uu Y3BwCmluZGV4IDEzZDk4YWY5M2YwMmFkZDc4M2Q3OTA2NGU0M2MxMTg3MjUwNjUzZmMuLmVjOWM3 MTI4NmNmMWQxOTRhMTEyYjg5MWY1N2ZlOGY5MjAzMThkOTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQvcXQvdGVzdHMvcW9iamVjdGJyaWRnZS90c3RfcW9iamVjdGJyaWRnZS5jcHAKKysrIGIv U291cmNlL1dlYktpdC9xdC90ZXN0cy9xb2JqZWN0YnJpZGdlL3RzdF9xb2JqZWN0YnJpZGdlLmNw cApAQCAtMjAzOSw3ICsyMDM5LDcgQEAgdm9pZCB0c3RfUU9iamVjdEJyaWRnZTo6b3duZXJzaGlw KCkKIHsKICAgICAvLyB0ZXN0IG93bmVyc2hpcAogICAgIHsKLSAgICAgICAgUVdlYWtQb2ludGVy PFFPYmplY3Q+IHB0ciA9IG5ldyBRT2JqZWN0KCk7CisgICAgICAgIFFQb2ludGVyPFFPYmplY3Q+ IHB0ciA9IG5ldyBRT2JqZWN0KCk7CiAgICAgICAgIFFWRVJJRlkocHRyKTsKICAgICAgICAgewog ICAgICAgICAgICAgUVdlYlBhZ2UgcGFnZTsKQEAgLTIwNDksNyArMjA0OSw3IEBAIHZvaWQgdHN0 X1FPYmplY3RCcmlkZ2U6Om93bmVyc2hpcCgpCiAgICAgICAgIFFWRVJJRlkoIXB0cik7CiAgICAg fQogICAgIHsKLSAgICAgICAgUVdlYWtQb2ludGVyPFFPYmplY3Q+IHB0ciA9IG5ldyBRT2JqZWN0 KCk7CisgICAgICAgIFFQb2ludGVyPFFPYmplY3Q+IHB0ciA9IG5ldyBRT2JqZWN0KCk7CiAgICAg ICAgIFFWRVJJRlkocHRyKTsKICAgICAgICAgUU9iamVjdCogYmVmb3JlID0gcHRyLmRhdGEoKTsK ICAgICAgICAgewpAQCAtMjA3Myw3ICsyMDczLDcgQEAgdm9pZCB0c3RfUU9iamVjdEJyaWRnZTo6 b3duZXJzaGlwKCkKICAgICAgICAgUUNPTVBBUkUocXZhcmlhbnRfY2FzdDxRT2JqZWN0Kj4odiks IChRT2JqZWN0ICopMCk7CiAgICAgfQogICAgIHsKLSAgICAgICAgUVdlYWtQb2ludGVyPFFPYmpl Y3Q+IHB0ciA9IG5ldyBRT2JqZWN0KCk7CisgICAgICAgIFFQb2ludGVyPFFPYmplY3Q+IHB0ciA9 IG5ldyBRT2JqZWN0KCk7CiAgICAgICAgIFFWRVJJRlkocHRyKTsKICAgICAgICAgewogICAgICAg ICAgICAgUVdlYlBhZ2UgcGFnZTsKQEAgLTIwODUsNyArMjA4NSw3IEBAIHZvaWQgdHN0X1FPYmpl Y3RCcmlkZ2U6Om93bmVyc2hpcCgpCiAgICAgfQogICAgIHsKICAgICAgICAgUU9iamVjdCogcGFy ZW50ID0gbmV3IFFPYmplY3QoKTsKLSAgICAgICAgUVdlYWtQb2ludGVyPFFPYmplY3Q+IGNoaWxk ID0gbmV3IFFPYmplY3QocGFyZW50KTsKKyAgICAgICAgUVBvaW50ZXI8UU9iamVjdD4gY2hpbGQg PSBuZXcgUU9iamVjdChwYXJlbnQpOwogICAgICAgICBRVkVSSUZZKGNoaWxkKTsKICAgICAgICAg ewogICAgICAgICAgICAgUVdlYlBhZ2UgcGFnZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQv cXQvdGVzdHMvcXdlYmZyYW1lL3RzdF9xd2ViZnJhbWUuY3BwIGIvU291cmNlL1dlYktpdC9xdC90 ZXN0cy9xd2ViZnJhbWUvdHN0X3F3ZWJmcmFtZS5jcHAKaW5kZXggNGMyZDA0MmY4ZjkyNTFmODIw MmU5YjgwNzM2OWVlYjdlNTAxM2Y1Zi4uNDI2ODkzZmY5N2QxNzY5NzhlNzY4NGZhNjFhNGVjYzY4 ODg3YTYwOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9xdC90ZXN0cy9xd2ViZnJhbWUvdHN0 X3F3ZWJmcmFtZS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9xdC90ZXN0cy9xd2ViZnJhbWUvdHN0 X3F3ZWJmcmFtZS5jcHAKQEAgLTYwMSw3ICs2MDEsNyBAQCB2b2lkIHRzdF9RV2ViRnJhbWU6OnBv cHVwRm9jdXMoKQogICAgIC8vIENhbGwgc2V0Rm9jdXMgYmVmb3JlIHNob3cgdG8gd29yayBhcm91 bmQgaHR0cDovL2J1Z3JlcG9ydHMucXQubm9raWEuY29tL2Jyb3dzZS9RVEJVRy0xNDc2MgogICAg IHZpZXcuc2V0Rm9jdXMoKTsKICAgICB2aWV3LnNob3coKTsKLSAgICBRVGVzdDo6cVdhaXRGb3JX aW5kb3dTaG93bigmdmlldyk7CisgICAgUVRlc3Q6OnFXYWl0Rm9yV2luZG93RXhwb3NlZCgmdmll dyk7CiAgICAgdmlldy5hY3RpdmF0ZVdpbmRvdygpOwogICAgIFFUUllfVkVSSUZZKHZpZXcuaGFz Rm9jdXMoKSk7CiAKQEAgLTYyNSw3ICs2MjUsNyBAQCB2b2lkIHRzdF9RV2ViRnJhbWU6OmlucHV0 RmllbGRGb2N1cygpCiAgICAgdmlldy5zZXRIdG1sKCI8aHRtbD48Ym9keT48aW5wdXQgdHlwZT1c InRleHRcIj48L2lucHV0PjwvYm9keT48L2h0bWw+Iik7CiAgICAgdmlldy5yZXNpemUoNDAwLCAx MDApOwogICAgIHZpZXcuc2hvdygpOwotICAgIFFUZXN0OjpxV2FpdEZvcldpbmRvd1Nob3duKCZ2 aWV3KTsKKyAgICBRVGVzdDo6cVdhaXRGb3JXaW5kb3dFeHBvc2VkKCZ2aWV3KTsKICAgICB2aWV3 LmFjdGl2YXRlV2luZG93KCk7CiAgICAgdmlldy5zZXRGb2N1cygpOwogICAgIFFUUllfVkVSSUZZ KHZpZXcuaGFzRm9jdXMoKSk7CkBAIC0xMDI3LDcgKzEwMjcsNyBAQCB2b2lkIHRzdF9RV2ViRnJh bWU6OmV2YWx1YXRlV2lsbENhdXNlUmVwYWludCgpCiAgICAgdmlldy5zZXRIdG1sKGh0bWwpOwog ICAgIHZpZXcuc2hvdygpOwogCi0gICAgUVRlc3Q6OnFXYWl0Rm9yV2luZG93U2hvd24oJnZpZXcp OworICAgIFFUZXN0OjpxV2FpdEZvcldpbmRvd0V4cG9zZWQoJnZpZXcpOwogICAgIHZpZXcucGFn ZSgpLT5tYWluRnJhbWUoKS0+ZXZhbHVhdGVKYXZhU2NyaXB0KAogICAgICAgICAiZG9jdW1lbnQu Z2V0RWxlbWVudEJ5SWQoJ2p1bmsnKS5zdHlsZS5kaXNwbGF5ID0gJ25vbmUnOyIpOwogCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0L3F0L3Rlc3RzL3F3ZWJwYWdlL3RzdF9xd2VicGFnZS5jcHAg Yi9Tb3VyY2UvV2ViS2l0L3F0L3Rlc3RzL3F3ZWJwYWdlL3RzdF9xd2VicGFnZS5jcHAKaW5kZXgg NjdiNDViMThlZjI4ZGYzMDU3NDExMGE0NGZiNTEwMGM4YzQ5MWY5OC4uMDA5OWQ0MTBhZGRhNDA5 YzkyZjA5MWRhNDUxOWZhMmI2NzQ5ZjZjZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9xdC90 ZXN0cy9xd2VicGFnZS90c3RfcXdlYnBhZ2UuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvcXQvdGVz dHMvcXdlYnBhZ2UvdHN0X3F3ZWJwYWdlLmNwcApAQCAtMzk1LDcgKzM5NSw3IEBAIHB1YmxpYzoK ICAgICBUZXN0UGFnZShRT2JqZWN0KiBwYXJlbnQgPSAwKSA6IFFXZWJQYWdlKHBhcmVudCkge30K IAogICAgIHN0cnVjdCBOYXZpZ2F0aW9uIHsKLSAgICAgICAgUVdlYWtQb2ludGVyPFFXZWJGcmFt ZT4gZnJhbWU7CisgICAgICAgIFFQb2ludGVyPFFXZWJGcmFtZT4gZnJhbWU7CiAgICAgICAgIFFO ZXR3b3JrUmVxdWVzdCByZXF1ZXN0OwogICAgICAgICBOYXZpZ2F0aW9uVHlwZSB0eXBlOwogICAg IH07CkBAIC04OTMsNyArODkzLDcgQEAgdm9pZCB0c3RfUVdlYlBhZ2U6OmNyZWF0ZVBsdWdpbldp dGhQbHVnaW5zRGlzYWJsZWQoKQogY2xhc3MgUGx1Z2luQ291bnRlclBhZ2UgOiBwdWJsaWMgUVdl YlBhZ2UgewogcHVibGljOgogICAgIGludCBtX2NvdW50OwotICAgIFFXZWFrUG9pbnRlcjxRT2Jq ZWN0PiBtX3dpZGdldDsKKyAgICBRUG9pbnRlcjxRT2JqZWN0PiBtX3dpZGdldDsKICAgICBRT2Jq ZWN0KiBtX3BsdWdpblBhcmVudDsKICAgICBQbHVnaW5Db3VudGVyUGFnZShRT2JqZWN0KiBwYXJl bnQgPSAwKQogICAgICAgICA6IFFXZWJQYWdlKHBhcmVudCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvcXQvdGVzdHMvcXdlYnZpZXcvdHN0X3F3ZWJ2aWV3LmNwcCBiL1NvdXJjZS9XZWJLaXQv cXQvdGVzdHMvcXdlYnZpZXcvdHN0X3F3ZWJ2aWV3LmNwcAppbmRleCBjMWY4YWM2YTJhMThlZjM3 YTRjYTRhYjIzZmQ0MTM1NTIzZmJmNjg4Li44ZTY0NmUxOTZjZDI3N2U5OTFhYzU2ZmYzNjJkMzE3 NDUwNDNlZWI4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L3F0L3Rlc3RzL3F3ZWJ2aWV3L3Rz dF9xd2Vidmlldy5jcHAKKysrIGIvU291cmNlL1dlYktpdC9xdC90ZXN0cy9xd2Vidmlldy90c3Rf cXdlYnZpZXcuY3BwCkBAIC0xMzksNyArMTM5LDcgQEAgdm9pZCB0c3RfUVdlYlZpZXc6OnJldXNl UGFnZSgpCiAKICAgICBRRkVUQ0goUVN0cmluZywgaHRtbCk7CiAgICAgUVdlYlZpZXcqIHZpZXcx ID0gbmV3IFFXZWJWaWV3OwotICAgIFFXZWFrUG9pbnRlcjxRV2ViUGFnZT4gcGFnZSA9IG5ldyBR V2ViUGFnZTsKKyAgICBRUG9pbnRlcjxRV2ViUGFnZT4gcGFnZSA9IG5ldyBRV2ViUGFnZTsKICAg ICB2aWV3MS0+c2V0UGFnZShwYWdlLmRhdGEoKSk7CiAgICAgcGFnZS5kYXRhKCktPnNldHRpbmdz KCktPnNldEF0dHJpYnV0ZShRV2ViU2V0dGluZ3M6OlBsdWdpbnNFbmFibGVkLCB0cnVlKTsKICAg ICBRV2ViRnJhbWUqIG1haW5GcmFtZSA9IHBhZ2UuZGF0YSgpLT5tYWluRnJhbWUoKTsKQEAgLTE1 MCwxNCArMTUwLDE0IEBAIHZvaWQgdHN0X1FXZWJWaWV3OjpyZXVzZVBhZ2UoKQogICAgIH0KIAog ICAgIHZpZXcxLT5zaG93KCk7Ci0gICAgUVRlc3Q6OnFXYWl0Rm9yV2luZG93U2hvd24odmlldzEp OworICAgIFFUZXN0OjpxV2FpdEZvcldpbmRvd0V4cG9zZWQodmlldzEpOwogICAgIGRlbGV0ZSB2 aWV3MTsKICAgICBRVkVSSUZZKHBhZ2UgIT0gMCk7IC8vIGRlbGV0aW5nIHZpZXcgbXVzdCBub3Qg aGF2ZSBkZWxldGVkIHRoZSBwYWdlLCBzaW5jZSBpdCdzIG5vdCBhIGNoaWxkIG9mIHZpZXcKIAog ICAgIFFXZWJWaWV3ICp2aWV3MiA9IG5ldyBRV2ViVmlldzsKICAgICB2aWV3Mi0+c2V0UGFnZShw YWdlLmRhdGEoKSk7CiAgICAgdmlldzItPnNob3coKTsgLy8gaW4gV2luZG93bGVzcyBtb2RlLCB5 b3Ugc2hvdWxkIHN0aWxsIGJlIGFibGUgdG8gc2VlIHRoZSBwbHVnaW4gaGVyZQotICAgIFFUZXN0 OjpxV2FpdEZvcldpbmRvd1Nob3duKHZpZXcyKTsKKyAgICBRVGVzdDo6cVdhaXRGb3JXaW5kb3dF eHBvc2VkKHZpZXcyKTsKICAgICBkZWxldGUgdmlldzI7CiAKICAgICBkZWxldGUgcGFnZS5kYXRh KCk7IC8vIG11c3Qgbm90IGNyYXNoCkBAIC0yMzQsNyArMjM0LDcgQEAgdm9pZCB0c3RfUVdlYlZp ZXc6OmZvY3VzSW5wdXRUeXBlcygpCiB7CiAgICAgUVdlYlZpZXcgd2ViVmlldzsKICAgICB3ZWJW aWV3LnNob3coKTsKLSAgICBRVGVzdDo6cVdhaXRGb3JXaW5kb3dTaG93bigmd2ViVmlldyk7Cisg ICAgUVRlc3Q6OnFXYWl0Rm9yV2luZG93RXhwb3NlZCgmd2ViVmlldyk7CiAKICAgICBRVXJsIHVy bCgicXJjOi8vL3Jlc291cmNlcy9pbnB1dF90eXBlcy5odG1sIik7CiAgICAgUVdlYkZyYW1lKiBj b25zdCBtYWluRnJhbWUgPSB3ZWJWaWV3LnBhZ2UoKS0+bWFpbkZyYW1lKCk7CkBAIC0zNjAsMTEg KzM2MCwxMSBAQCB2b2lkIHRzdF9RV2ViVmlldzo6c2V0UGFsZXR0ZSgpCiAgICAgdmlldzEucGFn ZSgpLT5zZXRWaWV3cG9ydFNpemUodmlldzEucGFnZSgpLT5jdXJyZW50RnJhbWUoKS0+Y29udGVu dHNTaXplKCkpOwogICAgIHZpZXcxLnNob3coKTsKIAotICAgIFFUZXN0OjpxV2FpdEZvcldpbmRv d1Nob3duKCZ2aWV3MSk7CisgICAgUVRlc3Q6OnFXYWl0Rm9yV2luZG93RXhwb3NlZCgmdmlldzEp OwogCiAgICAgaWYgKCFhY3RpdmUpIHsKICAgICAgICAgY29udHJvbFZpZXcuc2hvdygpOwotICAg ICAgICBRVGVzdDo6cVdhaXRGb3JXaW5kb3dTaG93bigmY29udHJvbFZpZXcpOworICAgICAgICBR VGVzdDo6cVdhaXRGb3JXaW5kb3dFeHBvc2VkKCZjb250cm9sVmlldyk7CiAgICAgICAgIGFjdGl2 ZVZpZXcgPSAmY29udHJvbFZpZXc7CiAgICAgICAgIGNvbnRyb2xWaWV3LmFjdGl2YXRlV2luZG93 KCk7CiAgICAgfSBlbHNlIHsKQEAgLTQwNywxMSArNDA3LDExIEBAIHZvaWQgdHN0X1FXZWJWaWV3 OjpzZXRQYWxldHRlKCkKICAgICB2aWV3Mi5wYWdlKCktPnNldFZpZXdwb3J0U2l6ZSh2aWV3Mi5w YWdlKCktPmN1cnJlbnRGcmFtZSgpLT5jb250ZW50c1NpemUoKSk7CiAgICAgdmlldzIuc2hvdygp OwogCi0gICAgUVRlc3Q6OnFXYWl0Rm9yV2luZG93U2hvd24oJnZpZXcyKTsKKyAgICBRVGVzdDo6 cVdhaXRGb3JXaW5kb3dFeHBvc2VkKCZ2aWV3Mik7CiAKICAgICBpZiAoIWFjdGl2ZSkgewogICAg ICAgICBjb250cm9sVmlldy5zaG93KCk7Ci0gICAgICAgIFFUZXN0OjpxV2FpdEZvcldpbmRvd1No b3duKCZjb250cm9sVmlldyk7CisgICAgICAgIFFUZXN0OjpxV2FpdEZvcldpbmRvd0V4cG9zZWQo JmNvbnRyb2xWaWV3KTsKICAgICAgICAgYWN0aXZlVmlldyA9ICZjb250cm9sVmlldzsKICAgICAg ICAgY29udHJvbFZpZXcuYWN0aXZhdGVXaW5kb3coKTsKICAgICB9IGVsc2UgewpAQCAtNDQ5LDcg KzQ0OSw3IEBAIHZvaWQgdHN0X1FXZWJWaWV3OjpyZW5kZXJpbmdBZnRlck1heEFuZEJhY2soKQog CiAgICAgdmlldy5wYWdlKCktPnNldHRpbmdzKCktPnNldE1heGltdW1QYWdlc0luQ2FjaGUoMyk7 CiAKLSAgICBRVGVzdDo6cVdhaXRGb3JXaW5kb3dTaG93bigmdmlldyk7CisgICAgUVRlc3Q6OnFX YWl0Rm9yV2luZG93RXhwb3NlZCgmdmlldyk7CiAKICAgICBRUGl4bWFwIHJlZmVyZW5jZSh2aWV3 LnBhZ2UoKS0+dmlld3BvcnRTaXplKCkpOwogICAgIHJlZmVyZW5jZS5maWxsKFF0OjpyZWQpOwpA QCAtNDcwLDcgKzQ3MCw3IEBAIHZvaWQgdHN0X1FXZWJWaWV3OjpyZW5kZXJpbmdBZnRlck1heEFu ZEJhY2soKQogCiAgICAgdmlldy5zaG93TWF4aW1pemVkKCk7CiAKLSAgICBRVGVzdDo6cVdhaXRG b3JXaW5kb3dTaG93bigmdmlldyk7CisgICAgUVRlc3Q6OnFXYWl0Rm9yV2luZG93RXhwb3NlZCgm dmlldyk7CiAKICAgICBRUGl4bWFwIHJlZmVyZW5jZTIodmlldy5wYWdlKCktPnZpZXdwb3J0U2l6 ZSgpKTsKICAgICByZWZlcmVuY2UyLmZpbGwoUXQ6OmJsdWUpOwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xd2VibmF2aWdhdGlvbmhpc3RvcnkuY3BwIGIvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xd2VibmF2aWdhdGlvbmhpc3RvcnkuY3BwCmlu ZGV4IGIwNTc1MjZlMWU4OTQwZTM4NzdlOGMxNWQzOWUwZjk2N2VmZWVjZjQuLjBjOWY3Yjg1NjI4 ZjQxODg1YmU0YWVlN2EyOGMxMjkxZTZiMzUyY2MgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9BUEkvcXQvcXdlYm5hdmlnYXRpb25oaXN0b3J5LmNwcAorKysgYi9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3F3ZWJuYXZpZ2F0aW9uaGlzdG9yeS5jcHAKQEAgLTk2 LDEzICs5NiwxMiBAQCB2b2lkIFFXZWJOYXZpZ2F0aW9uSGlzdG9yeVByaXZhdGU6OmdvRm9yd2Fy ZFRvKGludCBpbmRleCkKICAgICAgICAgV0tQYWdlR29Ub0JhY2tGb3J3YXJkTGlzdEl0ZW0obV9w YWdlLmdldCgpLCBpdGVtUmVmLmdldCgpKTsKIH0KIAotUVdlYk5hdmlnYXRpb25MaXN0TW9kZWw6 OlFXZWJOYXZpZ2F0aW9uTGlzdE1vZGVsKCkKLSAgICA6IFFBYnN0cmFjdExpc3RNb2RlbCgpCitR SGFzaDxpbnQsIFFCeXRlQXJyYXk+IFFXZWJOYXZpZ2F0aW9uTGlzdE1vZGVsOjpyb2xlTmFtZXMo KSBjb25zdAogewogICAgIFFIYXNoPGludCwgUUJ5dGVBcnJheT4gcm9sZXM7CiAgICAgcm9sZXNb UVdlYk5hdmlnYXRpb25IaXN0b3J5OjpVcmxSb2xlXSA9ICJ1cmwiOwogICAgIHJvbGVzW1FXZWJO YXZpZ2F0aW9uSGlzdG9yeTo6VGl0bGVSb2xlXSA9ICJ0aXRsZSI7Ci0gICAgc2V0Um9sZU5hbWVz KHJvbGVzKTsKKyAgICByZXR1cm4gcm9sZXM7CiB9CiAKIFFXZWJOYXZpZ2F0aW9uTGlzdE1vZGVs Ojp+UVdlYk5hdmlnYXRpb25MaXN0TW9kZWwoKQpAQCAtMTM3LDYgKzEzNiwxMiBAQCBRVmFyaWFu dCBRV2ViTmF2aWdhdGlvbkxpc3RNb2RlbDo6ZGF0YShjb25zdCBRTW9kZWxJbmRleCYgaW5kZXgs IGludCByb2xlKSBjb25zdAogICAgIHJldHVybiBRVmFyaWFudCgpOwogfQogCit2b2lkIFFXZWJO YXZpZ2F0aW9uTGlzdE1vZGVsOjpyZXNldCgpCit7CisgICAgYmVnaW5SZXNldE1vZGVsKCk7Cisg ICAgZW5kUmVzZXRNb2RlbCgpOworfQorCiBRV2ViTmF2aWdhdGlvbkhpc3Rvcnk6OlFXZWJOYXZp Z2F0aW9uSGlzdG9yeSgpCiAgICAgOiBRT2JqZWN0KCkKIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXdlYm5hdmlnYXRpb25oaXN0b3J5X3AuaCBiL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXdlYm5hdmlnYXRpb25oaXN0b3J5X3AuaAppbmRl eCBmMWEzZTU3MmNlOTFiNGNkOWEyZDE4MzI3MzE0OWQ1YmZlOWVlMDJlLi44NGVmODY3YmUxZDli ZTI4NjE3NWJjYWVkZmVjZGUwMTk2ODU1OWZhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL3F0L3F3ZWJuYXZpZ2F0aW9uaGlzdG9yeV9wLmgKKysrIGIvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xd2VibmF2aWdhdGlvbmhpc3RvcnlfcC5oCkBAIC00OCw5 ICs0OCwxNCBAQCBwdWJsaWM6CiAKICAgICBpbnQgcm93Q291bnQoY29uc3QgUU1vZGVsSW5kZXgm IHBhcmVudCA9IFFNb2RlbEluZGV4KCkpIGNvbnN0OwogICAgIFFWYXJpYW50IGRhdGEoY29uc3Qg UU1vZGVsSW5kZXgmIGluZGV4LCBpbnQgcm9sZSkgY29uc3Q7CisgICAgUUhhc2g8aW50LCBRQnl0 ZUFycmF5PiByb2xlTmFtZXMoKSBjb25zdDsKKyAgICB2b2lkIHJlc2V0KCk7CiAKIHByaXZhdGU6 Ci0gICAgUVdlYk5hdmlnYXRpb25MaXN0TW9kZWwoKTsKKyAgICBRV2ViTmF2aWdhdGlvbkxpc3RN b2RlbCgpCisgICAgICAgIDogUUFic3RyYWN0TGlzdE1vZGVsKCkKKyAgICB7IH0KKwogICAgIFFX ZWJOYXZpZ2F0aW9uTGlzdE1vZGVsUHJpdmF0ZSogZDsKICAgICBmcmllbmQgY2xhc3MgUVdlYk5h dmlnYXRpb25MaXN0TW9kZWxQcml2YXRlOwogICAgIGZyaWVuZCBjbGFzcyBRV2ViTmF2aWdhdGlv bkhpc3Rvcnk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3Rl c3RzL3FyYXd3ZWJ2aWV3L3RzdF9xcmF3d2Vidmlldy5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQVBJL3F0L3Rlc3RzL3FyYXd3ZWJ2aWV3L3RzdF9xcmF3d2Vidmlldy5jcHAKaW5kZXgg MDMzOGVjZmY2ZTk1YmE4NDBhNjEwYWNmZTQwZWRjNDA0MjNiZjRmMi4uMzExMDJiODc2MjIyZTgx ZTg1Y2Y5MmI0MDE5YmM1Nzg2YzJiOWNhOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL0FQSS9xdC90ZXN0cy9xcmF3d2Vidmlldy90c3RfcXJhd3dlYnZpZXcuY3BwCisrKyBi L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvdGVzdHMvcXJhd3dlYnZpZXcvdHN0X3Fy YXd3ZWJ2aWV3LmNwcApAQCAtODIsNyArODIsNyBAQCBwdWJsaWM6CiAgICAgdm9pZCBsb2FkKGNv bnN0IFFTdHJpbmcmIGh0bWwpCiAgICAgewogICAgICAgICBtX2ZyYW1lTG9hZGVkID0gZmFsc2U7 Ci0gICAgICAgIFdLUGFnZUxvYWRVUkwobV93ZWJWaWV3LT5wYWdlUmVmKCksIFdLVVJMQ3JlYXRl V2l0aFVURjhDU3RyaW5nKGh0bWwudG9Bc2NpaSgpLmRhdGEoKSkpOworICAgICAgICBXS1BhZ2VM b2FkVVJMKG1fd2ViVmlldy0+cGFnZVJlZigpLCBXS1VSTENyZWF0ZVdpdGhVVEY4Q1N0cmluZyho dG1sLnRvTG9jYWw4Qml0KCkuZGF0YSgpKSk7CiAgICAgICAgIFFWRVJJRlkoOjp3YWl0Rm9yU2ln bmFsKHRoaXMsIFNJR05BTChsb2FkZWQoKSksIDUwMDApKTsKICAgICB9CiAKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9XZWJQb3B1cE1lbnVQcm94eVF0LmNwcCBiL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9XZWJQb3B1cE1lbnVQcm94eVF0LmNwcAppbmRleCAz MmVjMTg1N2I0NmVlZWJiN2FmNTc5MDQxM2ExYTk3MzBkYjBhN2QwLi4xMjgzNzlmMjZiNWFmMDJl MDIyMjc3NTVjZDQ5NDFkMWYxZGEzN2ViIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvcXQvV2ViUG9wdXBNZW51UHJveHlRdC5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL3F0L1dlYlBvcHVwTWVudVByb3h5UXQuY3BwCkBAIC01NSw2ICs1NSw3IEBAIHB1Ymxp YzoKICAgICBQb3B1cE1lbnVJdGVtTW9kZWwoY29uc3QgVmVjdG9yPFdlYlBvcHVwSXRlbT4mLCBi b29sIG11bHRpcGxlKTsKICAgICB2aXJ0dWFsIGludCByb3dDb3VudChjb25zdCBRTW9kZWxJbmRl eCYgcGFyZW50ID0gUU1vZGVsSW5kZXgoKSkgY29uc3QgeyByZXR1cm4gbV9pdGVtcy5zaXplKCk7 IH0KICAgICB2aXJ0dWFsIFFWYXJpYW50IGRhdGEoY29uc3QgUU1vZGVsSW5kZXgmLCBpbnQgcm9s ZSA9IFF0OjpEaXNwbGF5Um9sZSkgY29uc3Q7CisgICAgdmlydHVhbCBRSGFzaDxpbnQsIFFCeXRl QXJyYXk+IHJvbGVOYW1lcygpIGNvbnN0OwogCiAgICAgUV9JTlZPS0FCTEUgdm9pZCBzZWxlY3Qo aW50KTsKIApAQCAtMTY3LDExICsxNjgsMTUgQEAgUG9wdXBNZW51SXRlbU1vZGVsOjpQb3B1cE1l bnVJdGVtTW9kZWwoY29uc3QgVmVjdG9yPFdlYlBvcHVwSXRlbT4mIHdlYlBvcHVwSXRlbXMKICAg ICA6IG1fc2VsZWN0ZWRNb2RlbEluZGV4KC0xKQogICAgICwgbV9hbGxvd011bHRpcGxlcyhtdWx0 aXBsZSkKIHsKLSAgICBzdGF0aWMgUUhhc2g8aW50LCBRQnl0ZUFycmF5PiByb2xlcyA9IGNyZWF0 ZVJvbGVOYW1lc0hhc2goKTsKLSAgICBzZXRSb2xlTmFtZXMocm9sZXMpOwogICAgIGJ1aWxkSXRl bXMod2ViUG9wdXBJdGVtcyk7CiB9CiAKK1FIYXNoPGludCwgUUJ5dGVBcnJheT4gUG9wdXBNZW51 SXRlbU1vZGVsOjpyb2xlTmFtZXMoKSBjb25zdAoreworICAgIHN0YXRpYyBRSGFzaDxpbnQsIFFC eXRlQXJyYXk+IHJvbGVzID0gY3JlYXRlUm9sZU5hbWVzSGFzaCgpOworICAgIHJldHVybiByb2xl czsKK30KKwogUVZhcmlhbnQgUG9wdXBNZW51SXRlbU1vZGVsOjpkYXRhKGNvbnN0IFFNb2RlbElu ZGV4JiBpbmRleCwgaW50IHJvbGUpIGNvbnN0CiB7CiAgICAgaWYgKCFpbmRleC5pc1ZhbGlkKCkg fHwgaW5kZXgucm93KCkgPCAwIHx8IGluZGV4LnJvdygpID49IG1faXRlbXMuc2l6ZSgpKQpkaWZm IC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IDVhNjYwNDFi M2IyZmY3MGM2NmUwYTdhMDc5NzhmYThlOTM1YTQwMzYuLjNkYWFiNTg0NTFmNjA3ZTg2NTEwMGE5 ZGYzZWE4NzMyMWNjNjViYmMgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9Ub29s cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMiBAQAorMjAxMi0wOS0xMCAgQW5kcmFzIEJlY3NpICA8 YW5kcmFzLmJlY3NpQG5va2lhLmNvbT4KKworICAgICAgICBbUXRdW1dLMl0gRml4IHRoZSBidWls ZCB3aXRoIHJlY2VudCBRdDUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTk2MjgzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgV2Ugc2hvdWxkIG5vdCB1c2UgZGVwcmVjYXRlZCBRdCBBUEkgYmVjYXVzZSBkb2lu ZyB0aGF0IHJlc3VsdHMKKyAgICAgICAgaW4gYnVpbGQgZmFpbHVyZSBzaW5jZSBhbGwgdGhlIGRl cHJlY2F0ZWQgQVBJIHdhcyBkaXNhYmxlZAorICAgICAgICBpbiBxdGJhc2UgKGh0dHBzOi8vY29k ZXJldmlldy5xdC1wcm9qZWN0Lm9yZy8jY2hhbmdlLDI0ODkwKS4KKworICAgICAgICAqIER1bXBS ZW5kZXJUcmVlL3F0L21haW4uY3BwOgorICAgICAgICAobWFpbik6CisgICAgICAgICogTWluaUJy b3dzZXIvcXQvTWluaUJyb3dzZXJBcHBsaWNhdGlvbi5jcHA6CisgICAgICAgIChNaW5pQnJvd3Nl ckFwcGxpY2F0aW9uOjpub3RpZnkpOgorICAgICAgICAqIE1pbmlCcm93c2VyL3F0L3Jhdy9WaWV3 LmNwcDoKKyAgICAgICAgKFZpZXc6OmV4cG9zZUV2ZW50KToKKyAgICAgICAgKG1haW4pOgorCiAy MDEyLTA5LTEwICBUb21teSBXaWRlbmZseWNodCAgPHRvbW15d0Bnb29nbGUuY29tPgogCiAgICAg ICAgIFtjaHJvbWl1bV0gTWVkaWFTdHJlYW0gQVBJOiBSZW1vdmUgdGhlIERlc2NyaXB0b3IgcG9z dGZpeApkaWZmIC0tZ2l0IGEvVG9vbHMvRHVtcFJlbmRlclRyZWUvcXQvbWFpbi5jcHAgYi9Ub29s cy9EdW1wUmVuZGVyVHJlZS9xdC9tYWluLmNwcAppbmRleCAwZDM3ZWU4MTlkYmVlMzdhMzgxOGI5 N2QyZTRkOWY1ZjNlMDMyZjkyLi5mMjQ2OWQyMTM1YmMyNjliZTBkMjcwZTYwOGYzYTdhYTYzOTk2 NDczIDEwMDY0NAotLS0gYS9Ub29scy9EdW1wUmVuZGVyVHJlZS9xdC9tYWluLmNwcAorKysgYi9U b29scy9EdW1wUmVuZGVyVHJlZS9xdC9tYWluLmNwcApAQCAtMTE3LDcgKzExNyw2IEBAIGludCBt YWluKGludCBhcmdjLCBjaGFyKiBhcmd2W10pCiAKICAgICBXZWJLaXQ6OmluaXRpYWxpemVUZXN0 Rm9udHMoKTsKIAotICAgIFFBcHBsaWNhdGlvbjo6c2V0R3JhcGhpY3NTeXN0ZW0oInJhc3RlciIp OwogICAgIFFBcHBsaWNhdGlvbjo6c2V0U3R5bGUobmV3IFFXaW5kb3dzU3R5bGUpOwogICAgIFFB cHBsaWNhdGlvbjo6c2V0RGVza3RvcFNldHRpbmdzQXdhcmUoZmFsc2UpOwogCmRpZmYgLS1naXQg YS9Ub29scy9NaW5pQnJvd3Nlci9xdC9NaW5pQnJvd3NlckFwcGxpY2F0aW9uLmNwcCBiL1Rvb2xz L01pbmlCcm93c2VyL3F0L01pbmlCcm93c2VyQXBwbGljYXRpb24uY3BwCmluZGV4IDEyNzdhMTNi MjdkYjJlMWVmMGY2YTVlODE5MmY4ZDllYjM2Njc5MWMuLjY4MzA3YzM1MTcxYzVlMjM2ZmJiZmZh OTUzMGYxYWNmOGVhOWQ1MzkgMTAwNjQ0Ci0tLSBhL1Rvb2xzL01pbmlCcm93c2VyL3F0L01pbmlC cm93c2VyQXBwbGljYXRpb24uY3BwCisrKyBiL1Rvb2xzL01pbmlCcm93c2VyL3F0L01pbmlCcm93 c2VyQXBwbGljYXRpb24uY3BwCkBAIC05NCw3ICs5NCw3IEBAIGJvb2wgTWluaUJyb3dzZXJBcHBs aWNhdGlvbjo6bm90aWZ5KFFPYmplY3QqIHRhcmdldCwgUUV2ZW50KiBldmVudCkKICAgICBpZiAo IWV2ZW50LT5zcG9udGFuZW91cygpIHx8IG1fcmVhbFRvdWNoRXZlbnRSZWNlaXZlZCB8fCAhbV93 aW5kb3dPcHRpb25zLnRvdWNoTW9ja2luZ0VuYWJsZWQoKSkKICAgICAgICAgcmV0dXJuIFFHdWlB cHBsaWNhdGlvbjo6bm90aWZ5KHRhcmdldCwgZXZlbnQpOwogCi0gICAgaWYgKGlzVG91Y2hFdmVu dChldmVudCkgJiYgc3RhdGljX2Nhc3Q8UVRvdWNoRXZlbnQqPihldmVudCktPmRldmljZVR5cGUo KSA9PSBRVG91Y2hFdmVudDo6VG91Y2hTY3JlZW4pIHsKKyAgICBpZiAoaXNUb3VjaEV2ZW50KGV2 ZW50KSkgewogICAgICAgICBpZiAobV9wZW5kaW5nRmFrZVRvdWNoRXZlbnRDb3VudCkKICAgICAg ICAgICAgIC0tbV9wZW5kaW5nRmFrZVRvdWNoRXZlbnRDb3VudDsKICAgICAgICAgZWxzZQpkaWZm IC0tZ2l0IGEvVG9vbHMvTWluaUJyb3dzZXIvcXQvcmF3L1ZpZXcuY3BwIGIvVG9vbHMvTWluaUJy b3dzZXIvcXQvcmF3L1ZpZXcuY3BwCmluZGV4IGE3YjBhYThmOWM1ZjM5OGU5NzQyZTI2YjdhNTJk YTYwNjM0NjljOTEuLjhlMDRmZDAwYjIwYmRhZTZmNjFjNDcyZTU2Y2UxNmQ1ZDdiMDNhNjUgMTAw NjQ0Ci0tLSBhL1Rvb2xzL01pbmlCcm93c2VyL3F0L3Jhdy9WaWV3LmNwcAorKysgYi9Ub29scy9N aW5pQnJvd3Nlci9xdC9yYXcvVmlldy5jcHAKQEAgLTc4LDcgKzc4LDcgQEAgdm9pZCBWaWV3Ojpl eHBvc2VFdmVudChRRXhwb3NlRXZlbnQqIGV2ZW50KQogewogICAgIGlmICghbV9hY3RpdmUpIHsK ICAgICAgICAgbV9hY3RpdmUgPSB0cnVlOwotICAgICAgICBXS1BhZ2VMb2FkVVJMKG1fd2ViVmll dy0+cGFnZVJlZigpLCBXS1VSTENyZWF0ZVdpdGhVVEY4Q1N0cmluZyhtX3VybC50b0FzY2lpKCku ZGF0YSgpKSk7CisgICAgICAgIFdLUGFnZUxvYWRVUkwobV93ZWJWaWV3LT5wYWdlUmVmKCksIFdL VVJMQ3JlYXRlV2l0aFVURjhDU3RyaW5nKG1fdXJsLnRvTG9jYWw4Qml0KCkuZGF0YSgpKSk7CiAK ICAgICAgICAgbV93ZWJWaWV3LT5zZXRGb2N1c2VkKHRydWUpOwogICAgICAgICBtX3dlYlZpZXct PnNldFZpc2libGUodHJ1ZSk7CkBAIC0xMzEsNyArMTMxLDcgQEAgaW50IG1haW4oaW50IGFyZ2Ms IGNoYXIqKiBhcmd2KQogewogICAgIFFHdWlBcHBsaWNhdGlvbiBhcHAoYXJnYywgYXJndik7CiAK LSAgICBWaWV3IHZpZXcoYXBwLmFyZ3VtZW50cygpLnNpemUoKSA+IDEgPyBhcHAuYXJndW1lbnRz KCkuYXQoMSkgOiBRU3RyaW5nOjpmcm9tQXNjaWkoImh0dHA6Ly93d3cuZ29vZ2xlLmNvbSIpKTsK KyAgICBWaWV3IHZpZXcoYXBwLmFyZ3VtZW50cygpLnNpemUoKSA+IDEgPyBhcHAuYXJndW1lbnRz KCkuYXQoMSkgOiBRU3RyaW5nTGl0ZXJhbCgiaHR0cDovL3d3dy5nb29nbGUuY29tIikpOwogICAg IHZpZXcuc2hvdygpOwogICAgIHJldHVybiBhcHAuZXhlYygpOwogfQo=