138890 2014-11-19 15:27:41 -0800 Remove the remaining vestiges of minimal-ui 2014-11-20 20:49:03 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 benjamin benjamin commit-queue esprehn+autocc kangil.han oldest_to_newest 1049938 0 benjamin 2014-11-19 15:27:41 -0800 Remove the remaining vestiges of minimal-ui 1049939 1 241895 benjamin 2014-11-19 15:30:20 -0800 Created attachment 241895 Patch 1049944 2 commit-queue 2014-11-19 15:32:52 -0800 Attachment 241895 did not pass style-queue: ERROR: Source/WebKit/ios/WebCoreSupport/WebChromeClientIOS.mm:171: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] Total errors found: 1 in 8 files If any of these errors are false positives, please file a bug against check-webkit-style. 1050367 3 241895 benjamin 2014-11-20 20:48:58 -0800 Comment on attachment 241895 Patch Clearing flags on attachment: 241895 Committed r176437: <http://trac.webkit.org/changeset/176437> 1050368 4 benjamin 2014-11-20 20:49:03 -0800 All reviewed patches have been landed. Closing bug. 241895 2014-11-19 15:30:20 -0800 2014-11-20 20:48:58 -0800 Patch bug-138890-20141119153034.patch text/plain 25343 benjamin U3VidmVyc2lvbiBSZXZpc2lvbjogMTc2MzMxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODZkMGFiYzlhYzAwNjE3 MWYxMTk1OTk4ZDU3YzU3Y2QyNGJhZTY2Ny4uNDAxMzAyOTQ4ODBlZjcyZTc5NTRlZjRjZDQyMmYx ZjUxZjY4YWJiMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDM4IEBACiAyMDE0LTExLTE5ICBCZW5q YW1pbiBQb3VsYWluICA8YnBvdWxhaW5AYXBwbGUuY29tPgogCisgICAgICAgIFJlbW92ZSB0aGUg cmVtYWluaW5nIHZlc3RpZ2VzIG9mIG1pbmltYWwtdWkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzODg5MAorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIEluIFZpZXdwb3J0QXJndW1lbnRzJyBzZXRWaWV3cG9y dEZlYXR1cmUoKSwgSSBza2lwIHRoZSB3YXJuaW5nIGZvciBub3cuCisKKyAgICAgICAgKiBXZWJD b3JlLmV4cC5pbjoKKyAgICAgICAgKiBkb20vVmlld3BvcnRBcmd1bWVudHMuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6c2V0Vmlld3BvcnRGZWF0dXJlKToKKyAgICAgICAgKiBkb20vVmlld3BvcnRB cmd1bWVudHMuaDoKKyAgICAgICAgKFdlYkNvcmU6OlZpZXdwb3J0QXJndW1lbnRzOjpWaWV3cG9y dEFyZ3VtZW50cyk6CisgICAgICAgIChXZWJDb3JlOjpWaWV3cG9ydEFyZ3VtZW50czo6b3BlcmF0 b3I9PSk6CisgICAgICAgICogcGFnZS9WaWV3cG9ydENvbmZpZ3VyYXRpb24uY3BwOgorICAgICAg ICAoV2ViQ29yZTo6Vmlld3BvcnRDb25maWd1cmF0aW9uOjpWaWV3cG9ydENvbmZpZ3VyYXRpb24p OgorICAgICAgICAoV2ViQ29yZTo6Vmlld3BvcnRDb25maWd1cmF0aW9uOjppbml0aWFsU2NhbGUp OgorICAgICAgICAoV2ViQ29yZTo6Vmlld3BvcnRDb25maWd1cmF0aW9uOjptaW5pbXVtU2NhbGUp OgorICAgICAgICAoV2ViQ29yZTo6Vmlld3BvcnRDb25maWd1cmF0aW9uOjp1cGRhdGVDb25maWd1 cmF0aW9uKToKKyAgICAgICAgKFdlYkNvcmU6OlZpZXdwb3J0Q29uZmlndXJhdGlvbjo6dmlld3Bv cnRBcmd1bWVudHNMZW5ndGgpOgorICAgICAgICAoV2ViQ29yZTo6Vmlld3BvcnRDb25maWd1cmF0 aW9uOjpsYXlvdXRXaWR0aCk6CisgICAgICAgIChXZWJDb3JlOjpWaWV3cG9ydENvbmZpZ3VyYXRp b246OmxheW91dEhlaWdodCk6CisgICAgICAgIChXZWJDb3JlOjpWaWV3cG9ydENvbmZpZ3VyYXRp b25UZXh0U3RyZWFtOjpvcGVyYXRvcjw8KToKKyAgICAgICAgKFdlYkNvcmU6OlZpZXdwb3J0Q29u ZmlndXJhdGlvbjo6ZGVzY3JpcHRpb24pOgorICAgICAgICAoV2ViQ29yZTo6Vmlld3BvcnRDb25m aWd1cmF0aW9uOjpzZXRNaW5pbXVtTGF5b3V0U2l6ZUZvck1pbmltYWxVSSk6IERlbGV0ZWQuCisg ICAgICAgIChXZWJDb3JlOjpWaWV3cG9ydENvbmZpZ3VyYXRpb246OmFjdGl2ZU1pbmltdW1MYXlv dXRTaXplSW5TY3JvbGxWaWV3Q29vcmRpbmF0ZXMpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29y ZTo6Vmlld3BvcnRDb25maWd1cmF0aW9uOjpyZXNldE1pbmltYWxVSSk6IERlbGV0ZWQuCisgICAg ICAgIChXZWJDb3JlOjpWaWV3cG9ydENvbmZpZ3VyYXRpb246OmRpZEZpbmlzaERvY3VtZW50TG9h ZCk6IERlbGV0ZWQuCisgICAgICAgICogcGFnZS9WaWV3cG9ydENvbmZpZ3VyYXRpb24uaDoKKyAg ICAgICAgKFdlYkNvcmU6OlZpZXdwb3J0Q29uZmlndXJhdGlvbjo6bWluaW11bUxheW91dFNpemVG b3JNaW5pbWFsVUkpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6Vmlld3BvcnRDb25maWd1 cmF0aW9uOjp1c2VzTWluaW1hbFVJKTogRGVsZXRlZC4KKworMjAxNC0xMS0xOSAgQmVuamFtaW4g UG91bGFpbiAgPGJwb3VsYWluQGFwcGxlLmNvbT4KKwogICAgICAgICBHZXQgcmlkIG9mIEFjY2Vz c2liaWxpdHlPYmplY3Q6OnNldFJvbGVWYWx1ZSgpCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzg4NjEKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dC9pb3MvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9pb3MvQ2hhbmdlTG9nCmluZGV4IGI5YjVh ZjYxZjIwMGQwYmJlMzgwNTA4YTMyMTIyNjZmZjk1MTA1NTAuLjVjYzI3NWUyOWIzMjI5ZGM1YmJm YjFkMjkzNDdiYjc5YWQyNjYxZGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvaW9zL0NoYW5n ZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L2lvcy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNCBAQAor MjAxNC0xMS0xOSAgQmVuamFtaW4gUG91bGFpbiAgPGJwb3VsYWluQGFwcGxlLmNvbT4KKworICAg ICAgICBSZW1vdmUgdGhlIHJlbWFpbmluZyB2ZXN0aWdlcyBvZiBtaW5pbWFsLXVpCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzg4OTAKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFdlYkNvcmVTdXBwb3J0 L1dlYkNocm9tZUNsaWVudElPUy5tbToKKyAgICAgICAgKGRpY3Rpb25hcnlGb3JWaWV3cG9ydEFy Z3VtZW50cyk6CisgICAgICAgICogV2ViS2l0LmlPUy5leHA6CisKIDIwMTQtMTEtMTQgIERhbmll bCBCYXRlcyAgPGRhYmF0ZXNAYXBwbGUuY29tPgogCiAgICAgICAgIFtpT1NdIENvcmVHcmFwaGlj cyBTUEkgbm90IGF2YWlsYWJsZSBpbiBwdWJsaWMgU0RLCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0L21hYy9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cKaW5kZXggZmYx MTgwNDE1YWQ4NGQzMmYzZTdmNmQwNmI2MTEyYzM5M2U4Yjk0YS4uNDExN2MwNGU1ZTQwY2E4YmY2 OTI5NDNkY2Y1ZTgyMDcxMGY0ZGIwOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9tYWMvQ2hh bmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEzIEBA CisyMDE0LTExLTE5ICBCZW5qYW1pbiBQb3VsYWluICA8YnBvdWxhaW5AYXBwbGUuY29tPgorCisg ICAgICAgIFJlbW92ZSB0aGUgcmVtYWluaW5nIHZlc3RpZ2VzIG9mIG1pbmltYWwtdWkKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzODg5MAorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogSGlzdG9yeS9XZWJI aXN0b3J5SXRlbS5tbToKKyAgICAgICAgKiBIaXN0b3J5L1dlYkhpc3RvcnlJdGVtUHJpdmF0ZS5o OgorCiAyMDE0LTExLTE4ICBEYXZpZCBLaWx6ZXIgIDxkZGtpbHplckBhcHBsZS5jb20+CiAKICAg ICAgICAgRmVhdHVyZURlZmluZXMueGNjb25maWc6IFN3aXRjaCBmcm9tIHVzaW5nIFBMQVRGT1JN X05BTUUgdG8gU0RLIHNlbGVjdG9ycwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvQ2hhbmdl TG9nIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCmluZGV4IDFmMTJhOTc5MGZlNjVmOTY3NjFl NDk4ZTE1ZDg5YWQzMDdmODZhOGQuLmY5NWY3Y2MzNjQ1MmUyYjRlYjE1YTYyMmQ2MDI1NDUwY2Fj MzBhOTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZworKysgYi9Tb3VyY2Uv V2ViS2l0Mi9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMiBAQAorMjAxNC0xMS0xOSAgQmVuamFtaW4g UG91bGFpbiAgPGJwb3VsYWluQGFwcGxlLmNvbT4KKworICAgICAgICBSZW1vdmUgdGhlIHJlbWFp bmluZyB2ZXN0aWdlcyBvZiBtaW5pbWFsLXVpCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xMzg4OTAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICAqIFdlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVM b2FkZXJDbGllbnQuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJGcmFtZUxvYWRlckNsaWVudDo6 ZGlzcGF0Y2hEaWRGaW5pc2hEb2N1bWVudExvYWQpOgorICAgICAgICAqIFdlYlByb2Nlc3MvV2Vi UGFnZS9XZWJQYWdlLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZTo6ZGlkQ29tbWl0TG9h ZCk6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6OmRpZEZpbmlzaERvY3VtZW50TG9hZCk6IERl bGV0ZWQuCisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaDoKKyAgICAgICAg KiBXZWJQcm9jZXNzL1dlYlBhZ2UvaW9zL1dlYlBhZ2VJT1MubW06CisgICAgICAgIChXZWJLaXQ6 OldlYlBhZ2U6OnNhdmVQYWdlU3RhdGUpOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlOjpyZXN0 b3JlUGFnZVN0YXRlKToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZTo6dmlld3BvcnRDb25maWd1 cmF0aW9uQ2hhbmdlZCk6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6OnVwZGF0ZVZpZXdwb3J0 U2l6ZUZvckNTU1ZpZXdwb3J0VW5pdHMpOgorCiAyMDE0LTExLTE5ICBNaWNoYWVsIENhdGFuemFy byAgPG1jYXRhbnphcm9AaWdhbGlhLmNvbT4KIAogICAgICAgICBbR1RLXSBFcnJvciBpbiBkb2N1 bWVudGF0aW9uIG9mIHdlYmtpdF9wcmludF9vcGVyYXRpb25fZ2V0X3BhZ2Vfc2V0dXAoKQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvV2ViQ29yZS5leHAuaW4gYi9Tb3VyY2UvV2ViQ29yZS9X ZWJDb3JlLmV4cC5pbgppbmRleCAzN2UwYjlkYTc2ZGM3YWExOWEwYjA4MDExMjRlNGU5ZDNjODMw YWE2Li40M2E4YmE0M2E3ZGE1ZjYwZGU4MjU5OGJjODE1ODEwNzI4NTEyOGE5IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmV4cC5pbgorKysgYi9Tb3VyY2UvV2ViQ29yZS9XZWJD b3JlLmV4cC5pbgpAQCAtOTYwLDE4ICs5NjAsMTUgQEAgX19aTjdXZWJDb3JlMjFVc2VyQ29udGVu dENvbnRyb2xsZXIzNHJlbW92ZVVzZXJNZXNzYWdlSGFuZGxlckRlc2NyaXB0b3JFUk5TXzI4VXMK IF9fWk43V2ViQ29yZTIxVXNlckNvbnRlbnRDb250cm9sbGVyNmNyZWF0ZUV2CiBfX1pON1dlYkNv cmUyMVVzZXJDb250ZW50Q29udHJvbGxlckQxRXYKIF9fWk43V2ViQ29yZTIxVXNlckNvbnRlbnRV UkxQYXR0ZXJuNXBhcnNlRVJLTjNXVEY2U3RyaW5nRQotX19aTjdXZWJDb3JlMjFWaWV3cG9ydENv bmZpZ3VyYXRpb24xNHJlc2V0TWluaW1hbFVJRXYKIF9fWk43V2ViQ29yZTIxVmlld3BvcnRDb25m aWd1cmF0aW9uMTVzZXRDb250ZW50c1NpemVFUktOU183SW50U2l6ZUUKIF9fWk43V2ViQ29yZTIx Vmlld3BvcnRDb25maWd1cmF0aW9uMTd0ZXN0aW5nUGFyYW1ldGVyc0V2CiBfX1pON1dlYkNvcmUy MVZpZXdwb3J0Q29uZmlndXJhdGlvbjE3d2VicGFnZVBhcmFtZXRlcnNFdgogX19aTjdXZWJDb3Jl MjFWaWV3cG9ydENvbmZpZ3VyYXRpb24yMHNldE1pbmltdW1MYXlvdXRTaXplRVJLTlNfOUZsb2F0 U2l6ZUUKIF9fWk43V2ViQ29yZTIxVmlld3BvcnRDb25maWd1cmF0aW9uMjBzZXRWaWV3cG9ydEFy Z3VtZW50c0VSS05TXzE3Vmlld3BvcnRBcmd1bWVudHNFCi1fX1pON1dlYkNvcmUyMVZpZXdwb3J0 Q29uZmlndXJhdGlvbjIxZGlkRmluaXNoRG9jdW1lbnRMb2FkRXYKIF9fWk43V2ViQ29yZTIxVmll d3BvcnRDb25maWd1cmF0aW9uMjF4aHRtbE1vYmlsZVBhcmFtZXRlcnNFdgogX19aTjdXZWJDb3Jl MjFWaWV3cG9ydENvbmZpZ3VyYXRpb24yMnRleHREb2N1bWVudFBhcmFtZXRlcnNFdgogX19aTjdX ZWJDb3JlMjFWaWV3cG9ydENvbmZpZ3VyYXRpb24yM2ltYWdlRG9jdW1lbnRQYXJhbWV0ZXJzRXYK IF9fWk43V2ViQ29yZTIxVmlld3BvcnRDb25maWd1cmF0aW9uMjNzZXREZWZhdWx0Q29uZmlndXJh dGlvbkVSS05TMF8xMFBhcmFtZXRlcnNFCi1fX1pON1dlYkNvcmUyMVZpZXdwb3J0Q29uZmlndXJh dGlvbjMyc2V0TWluaW11bUxheW91dFNpemVGb3JNaW5pbWFsVUlFUktOU185RmxvYXRTaXplRQog X19aTjdXZWJDb3JlMjFWaWV3cG9ydENvbmZpZ3VyYXRpb25DMUV2CiBfX1pON1dlYkNvcmUyMVdp bmRvd3NMYXRpbjFFbmNvZGluZ0V2CiBfX1pON1dlYkNvcmUyMWNyZWF0ZUNGVVJMRnJvbUJ1ZmZl ckVQS2NtUEs3X19DRlVSTApAQCAtMTkwNiw3ICsxOTAzLDYgQEAgX19aTks3V2ViQ29yZTIxVXNl ckNvbnRlbnRVUkxQYXR0ZXJuN21hdGNoZXNFUktOU18zVVJMRQogX19aTks3V2ViQ29yZTIxVmll d3BvcnRDb25maWd1cmF0aW9uMTBsYXlvdXRTaXplRXYKIF9fWk5LN1dlYkNvcmUyMVZpZXdwb3J0 Q29uZmlndXJhdGlvbjEyaW5pdGlhbFNjYWxlRXYKIF9fWk5LN1dlYkNvcmUyMVZpZXdwb3J0Q29u ZmlndXJhdGlvbjEybWluaW11bVNjYWxlRXYKLV9fWk5LN1dlYkNvcmUyMVZpZXdwb3J0Q29uZmln dXJhdGlvbjQ2YWN0aXZlTWluaW11bUxheW91dFNpemVJblNjcm9sbFZpZXdDb29yZGluYXRlc0V2 CiBfX1pOSzdXZWJDb3JlMjJXaGVlbEV2ZW50RGVsdGFUcmFja2VyMzBkb21pbmFudFNjcm9sbEdl c3R1cmVEaXJlY3Rpb25FdgogX19aTks3V2ViQ29yZTIzQXBwbGljYXRpb25DYWNoZVN0b3JhZ2Ux MW1heGltdW1TaXplRXYKIF9fWk5LN1dlYkNvcmUyM0F1dGhlbnRpY2F0aW9uQ2hhbGxlbmdlMjBh dXRoZW50aWNhdGlvbkNsaWVudEV2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vVmll d3BvcnRBcmd1bWVudHMuY3BwIGIvU291cmNlL1dlYkNvcmUvZG9tL1ZpZXdwb3J0QXJndW1lbnRz LmNwcAppbmRleCAyMGE0ZTkxZjg0ZjU4MmE5YTMzNDEwNzQxODU2YTdkNGQzYmIxMDc4Li4wZTEy NGIxZTFlZmJlMThkYzEyZWI4Nzk0Y2I0ZTU1ZTc4ZTkxOTE0IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9kb20vVmlld3BvcnRBcmd1bWVudHMuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Rv bS9WaWV3cG9ydEFyZ3VtZW50cy5jcHAKQEAgLTM5NSw3ICszOTUsOCBAQCB2b2lkIHNldFZpZXdw b3J0RmVhdHVyZShjb25zdCBTdHJpbmcmIGtleVN0cmluZywgY29uc3QgU3RyaW5nJiB2YWx1ZVN0 cmluZywgRG9jdQogICAgICAgICBhcmd1bWVudHMtPnVzZXJab29tID0gZmluZFVzZXJTY2FsYWJs ZVZhbHVlKGtleVN0cmluZywgdmFsdWVTdHJpbmcsIGRvY3VtZW50KTsKICNpZiBQTEFURk9STShJ T1MpCiAgICAgZWxzZSBpZiAoa2V5U3RyaW5nID09ICJtaW5pbWFsLXVpIikKLSAgICAgICAgYXJn dW1lbnRzLT5taW5pbWFsVUkgPSB0cnVlOworICAgICAgICAvLyBGSVhNRTogSWdub3JlIHNpbGVu dGx5IGZvciBub3cuIFRoaXMgc2hvdWxkIGV2ZW50dWFsbHkgZmFsbGJhY2sgdG8gdGhlIHdhcm5p bmcuCisgICAgICAgIHsgfQogI2VuZGlmCiAgICAgZWxzZQogICAgICAgICByZXBvcnRWaWV3cG9y dFdhcm5pbmcoZG9jdW1lbnQsIFVucmVjb2duaXplZFZpZXdwb3J0QXJndW1lbnRLZXlFcnJvciwg a2V5U3RyaW5nLCBTdHJpbmcoKSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vVmll d3BvcnRBcmd1bWVudHMuaCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9WaWV3cG9ydEFyZ3VtZW50cy5o CmluZGV4IGI2YWRlYTc3MDg1M2NkOGM5ZTFiMzRjMzkzY2MzZjlkZmQxZTc5YWYuLjkxNzlkOTEy NTI0NzQyOTdjOTcwOGQyYzRhMGZhZjA1NGYxYTJhOGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2RvbS9WaWV3cG9ydEFyZ3VtZW50cy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9WaWV3 cG9ydEFyZ3VtZW50cy5oCkBAIC04Nyw5ICs4Nyw2IEBAIHN0cnVjdCBWaWV3cG9ydEFyZ3VtZW50 cyB7CiAgICAgICAgICwgbWF4Wm9vbShWYWx1ZUF1dG8pCiAgICAgICAgICwgdXNlclpvb20oVmFs dWVBdXRvKQogICAgICAgICAsIG9yaWVudGF0aW9uKFZhbHVlQXV0bykKLSNpZiBQTEFURk9STShJ T1MpCi0gICAgICAgICwgbWluaW1hbFVJKGZhbHNlKQotI2VuZGlmCiAgICAgewogICAgIH0KIApA QCAtMTA3LDkgKzEwNCw2IEBAIHN0cnVjdCBWaWV3cG9ydEFyZ3VtZW50cyB7CiAgICAgZmxvYXQg bWF4Wm9vbTsKICAgICBmbG9hdCB1c2VyWm9vbTsKICAgICBmbG9hdCBvcmllbnRhdGlvbjsKLSNp ZiBQTEFURk9STShJT1MpCi0gICAgYm9vbCBtaW5pbWFsVUk7Ci0jZW5kaWYKIAogICAgIGJvb2wg b3BlcmF0b3I9PShjb25zdCBWaWV3cG9ydEFyZ3VtZW50cyYgb3RoZXIpIGNvbnN0CiAgICAgewpA QCAtMTI1LDkgKzExOSw2IEBAIHN0cnVjdCBWaWV3cG9ydEFyZ3VtZW50cyB7CiAgICAgICAgICAg ICAmJiBtaW5ab29tID09IG90aGVyLm1pblpvb20KICAgICAgICAgICAgICYmIG1heFpvb20gPT0g b3RoZXIubWF4Wm9vbQogICAgICAgICAgICAgJiYgdXNlclpvb20gPT0gb3RoZXIudXNlclpvb20K LSNpZiBQTEFURk9STShJT1MpCi0gICAgICAgICAgICAmJiBtaW5pbWFsVUkgPT0gb3RoZXIubWlu aW1hbFVJCi0jZW5kaWYKICAgICAgICAgICAgICYmIG9yaWVudGF0aW9uID09IG90aGVyLm9yaWVu dGF0aW9uOwogICAgIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9WaWV3cG9y dENvbmZpZ3VyYXRpb24uY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9WaWV3cG9ydENvbmZpZ3Vy YXRpb24uY3BwCmluZGV4IDM4NjM0OWQ4YzE4ZTBjOTBkODAzZjQ5ZjgwNWRkNTg1YzRmNDlhMmQu LjkxNDBhMDcwNjI0YzkzMGY3MWQ2NmQxZGYyNzgzMTU0NTYzMGQyYWIgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3BhZ2UvVmlld3BvcnRDb25maWd1cmF0aW9uLmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9wYWdlL1ZpZXdwb3J0Q29uZmlndXJhdGlvbi5jcHAKQEAgLTQ2LDkgKzQ2LDYgQEAg c3RhdGljIGJvb2wgY29uc3RyYWludHNBcmVBbGxSZWxhdGl2ZShjb25zdCBWaWV3cG9ydENvbmZp Z3VyYXRpb246OlBhcmFtZXRlcnMmIGMKIAogVmlld3BvcnRDb25maWd1cmF0aW9uOjpWaWV3cG9y dENvbmZpZ3VyYXRpb24oKQogICAgIDogbV9taW5pbXVtTGF5b3V0U2l6ZSgxMDI0LCA3NjgpCi0g ICAgLCBtX21pbmltdW1MYXlvdXRTaXplRm9yTWluaW1hbFVJKG1fbWluaW11bUxheW91dFNpemUp Ci0gICAgLCBtX3VzZXNNaW5pbWFsVUkoZmFsc2UpCi0gICAgLCBtX3BhZ2VEaWRGaW5pc2hEb2N1 bWVudExvYWQoZmFsc2UpCiB7CiAgICAgLy8gU2V0dXAgYSByZWFzb25hYmxlIGRlZmF1bHQgY29u ZmlndXJhdGlvbiB0byBhdm9pZCBjb21wdXRpbmcgaW5maW5pdGUgc2NhbGUvc2l6ZXMuCiAgICAg Ly8gVGhvc2UgYXJlIHRoZSBvcmlnaW5hbCBpUGhvbmUgY29uZmlndXJhdGlvbi4KQEAgLTg1LDIy ICs4Miw2IEBAIHZvaWQgVmlld3BvcnRDb25maWd1cmF0aW9uOjpzZXRNaW5pbXVtTGF5b3V0U2l6 ZShjb25zdCBGbG9hdFNpemUmIG1pbmltdW1MYXlvdXRTCiAgICAgdXBkYXRlQ29uZmlndXJhdGlv bigpOwogfQogCi12b2lkIFZpZXdwb3J0Q29uZmlndXJhdGlvbjo6c2V0TWluaW11bUxheW91dFNp emVGb3JNaW5pbWFsVUkoY29uc3QgRmxvYXRTaXplJiBtaW5pbXVtTGF5b3V0U2l6ZUZvck1pbmlt YWxVSSkKLXsKLSAgICBpZiAobV9taW5pbXVtTGF5b3V0U2l6ZUZvck1pbmltYWxVSSA9PSBtaW5p bXVtTGF5b3V0U2l6ZUZvck1pbmltYWxVSSkKLSAgICAgICAgcmV0dXJuOwotCi0gICAgbV9taW5p bXVtTGF5b3V0U2l6ZUZvck1pbmltYWxVSSA9IG1pbmltdW1MYXlvdXRTaXplRm9yTWluaW1hbFVJ OwotICAgIHVwZGF0ZUNvbmZpZ3VyYXRpb24oKTsKLX0KLQotY29uc3QgRmxvYXRTaXplJiBWaWV3 cG9ydENvbmZpZ3VyYXRpb246OmFjdGl2ZU1pbmltdW1MYXlvdXRTaXplSW5TY3JvbGxWaWV3Q29v cmRpbmF0ZXMoKSBjb25zdAotewotICAgIGlmIChtX3VzZXNNaW5pbWFsVUkpCi0gICAgICAgIHJl dHVybiBtX21pbmltdW1MYXlvdXRTaXplRm9yTWluaW1hbFVJOwotICAgIHJldHVybiBtX21pbmlt dW1MYXlvdXRTaXplOwotfQotCiB2b2lkIFZpZXdwb3J0Q29uZmlndXJhdGlvbjo6c2V0Vmlld3Bv cnRBcmd1bWVudHMoY29uc3QgVmlld3BvcnRBcmd1bWVudHMmIHZpZXdwb3J0QXJndW1lbnRzKQog ewogICAgIGlmIChtX3ZpZXdwb3J0QXJndW1lbnRzID09IHZpZXdwb3J0QXJndW1lbnRzKQpAQCAt MTEwLDE3ICs5MSw2IEBAIHZvaWQgVmlld3BvcnRDb25maWd1cmF0aW9uOjpzZXRWaWV3cG9ydEFy Z3VtZW50cyhjb25zdCBWaWV3cG9ydEFyZ3VtZW50cyYgdmlld3BvCiAgICAgdXBkYXRlQ29uZmln dXJhdGlvbigpOwogfQogCi12b2lkIFZpZXdwb3J0Q29uZmlndXJhdGlvbjo6cmVzZXRNaW5pbWFs VUkoKQotewotICAgIG1fdXNlc01pbmltYWxVSSA9IGZhbHNlOwotICAgIG1fcGFnZURpZEZpbmlz aERvY3VtZW50TG9hZCA9IGZhbHNlOwotfQotCi12b2lkIFZpZXdwb3J0Q29uZmlndXJhdGlvbjo6 ZGlkRmluaXNoRG9jdW1lbnRMb2FkKCkKLXsKLSAgICBtX3BhZ2VEaWRGaW5pc2hEb2N1bWVudExv YWQgPSB0cnVlOwotfQotCiBJbnRTaXplIFZpZXdwb3J0Q29uZmlndXJhdGlvbjo6bGF5b3V0U2l6 ZSgpIGNvbnN0CiB7CiAgICAgcmV0dXJuIEludFNpemUobGF5b3V0V2lkdGgoKSwgbGF5b3V0SGVp Z2h0KCkpOwpAQCAtMTM3LDcgKzEwNyw3IEBAIGRvdWJsZSBWaWV3cG9ydENvbmZpZ3VyYXRpb246 OmluaXRpYWxTY2FsZSgpIGNvbnN0CiAKICAgICAvLyBJZiBub3QsIGl0IGlzIHVwIHRvIHVzIHRv IGRldGVybWluZSB0aGUgaW5pdGlhbCBzY2FsZS4KICAgICAvLyBXZSB3YW50IGEgc2NhbGUgc21h bGwgZW5vdWdoIHRvIGZpdCB0aGUgZG9jdW1lbnQgd2lkdGgtd2lzZS4KLSAgICBjb25zdCBGbG9h dFNpemUmIG1pbmltdW1MYXlvdXRTaXplID0gYWN0aXZlTWluaW11bUxheW91dFNpemVJblNjcm9s bFZpZXdDb29yZGluYXRlcygpOworICAgIGNvbnN0IEZsb2F0U2l6ZSYgbWluaW11bUxheW91dFNp emUgPSBtX21pbmltdW1MYXlvdXRTaXplOwogICAgIGRvdWJsZSB3aWR0aCA9IG1fY29udGVudFNp emUud2lkdGgoKSA+IDAgPyBtX2NvbnRlbnRTaXplLndpZHRoKCkgOiBsYXlvdXRXaWR0aCgpOwog ICAgIGRvdWJsZSBpbml0aWFsU2NhbGUgPSAwOwogICAgIGlmICh3aWR0aCA+IDApCkBAIC0xNTks NyArMTI5LDcgQEAgZG91YmxlIFZpZXdwb3J0Q29uZmlndXJhdGlvbjo6bWluaW11bVNjYWxlKCkg Y29uc3QKICAgICAvLyBJZiBub3QsIHdlIHN0aWxsIG5lZWQgdG8gc2FuaXR5IGNoZWNrIG91ciB2 YWx1ZS4KICAgICBkb3VibGUgbWluaW11bVNjYWxlID0gbV9jb25maWd1cmF0aW9uLm1pbmltdW1T Y2FsZTsKIAotICAgIGNvbnN0IEZsb2F0U2l6ZSYgbWluaW11bUxheW91dFNpemUgPSBhY3RpdmVN aW5pbXVtTGF5b3V0U2l6ZUluU2Nyb2xsVmlld0Nvb3JkaW5hdGVzKCk7CisgICAgY29uc3QgRmxv YXRTaXplJiBtaW5pbXVtTGF5b3V0U2l6ZSA9IG1fbWluaW11bUxheW91dFNpemU7CiAgICAgZG91 YmxlIGNvbnRlbnRXaWR0aCA9IG1fY29udGVudFNpemUud2lkdGgoKTsKICAgICBpZiAoY29udGVu dFdpZHRoID4gMCAmJiBjb250ZW50V2lkdGggKiBtaW5pbXVtU2NhbGUgPCBtaW5pbXVtTGF5b3V0 U2l6ZS53aWR0aCgpKQogICAgICAgICBtaW5pbXVtU2NhbGUgPSBtaW5pbXVtTGF5b3V0U2l6ZS53 aWR0aCgpIC8gY29udGVudFdpZHRoOwpAQCAtMjg1LDE5ICsyNTUsMTQgQEAgdm9pZCBWaWV3cG9y dENvbmZpZ3VyYXRpb246OnVwZGF0ZUNvbmZpZ3VyYXRpb24oKQogCiAgICAgaWYgKHZpZXdwb3J0 QXJndW1lbnRVc2VyWm9vbUlzU2V0KG1fdmlld3BvcnRBcmd1bWVudHMudXNlclpvb20pKQogICAg ICAgICBtX2NvbmZpZ3VyYXRpb24uYWxsb3dzVXNlclNjYWxpbmcgPSBtX3ZpZXdwb3J0QXJndW1l bnRzLnVzZXJab29tICE9IDAuOwotCi0jaWYgUExBVEZPUk0oSU9TKQotICAgIGlmICghbV9wYWdl RGlkRmluaXNoRG9jdW1lbnRMb2FkKQotICAgICAgICBtX3VzZXNNaW5pbWFsVUkgPSBtX3VzZXNN aW5pbWFsVUkgfHwgbV92aWV3cG9ydEFyZ3VtZW50cy5taW5pbWFsVUk7Ci0jZW5kaWYKIH0KIAog ZG91YmxlIFZpZXdwb3J0Q29uZmlndXJhdGlvbjo6dmlld3BvcnRBcmd1bWVudHNMZW5ndGgoZG91 YmxlIGxlbmd0aCkgY29uc3QKIHsKICAgICBpZiAobGVuZ3RoID09IFZpZXdwb3J0QXJndW1lbnRz OjpWYWx1ZURldmljZVdpZHRoKQotICAgICAgICByZXR1cm4gYWN0aXZlTWluaW11bUxheW91dFNp emVJblNjcm9sbFZpZXdDb29yZGluYXRlcygpLndpZHRoKCk7CisgICAgICAgIHJldHVybiBtX21p bmltdW1MYXlvdXRTaXplLndpZHRoKCk7CiAgICAgaWYgKGxlbmd0aCA9PSBWaWV3cG9ydEFyZ3Vt ZW50czo6VmFsdWVEZXZpY2VIZWlnaHQpCi0gICAgICAgIHJldHVybiBhY3RpdmVNaW5pbXVtTGF5 b3V0U2l6ZUluU2Nyb2xsVmlld0Nvb3JkaW5hdGVzKCkuaGVpZ2h0KCk7CisgICAgICAgIHJldHVy biBtX21pbmltdW1MYXlvdXRTaXplLmhlaWdodCgpOwogICAgIHJldHVybiBsZW5ndGg7CiB9CiAK QEAgLTMwNSw3ICsyNzAsNyBAQCBpbnQgVmlld3BvcnRDb25maWd1cmF0aW9uOjpsYXlvdXRXaWR0 aCgpIGNvbnN0CiB7CiAgICAgQVNTRVJUKCFjb25zdHJhaW50c0FyZUFsbFJlbGF0aXZlKG1fY29u ZmlndXJhdGlvbikpOwogCi0gICAgY29uc3QgRmxvYXRTaXplJiBtaW5pbXVtTGF5b3V0U2l6ZSA9 IGFjdGl2ZU1pbmltdW1MYXlvdXRTaXplSW5TY3JvbGxWaWV3Q29vcmRpbmF0ZXMoKTsKKyAgICBj b25zdCBGbG9hdFNpemUmIG1pbmltdW1MYXlvdXRTaXplID0gbV9taW5pbXVtTGF5b3V0U2l6ZTsK ICAgICBpZiAobV9jb25maWd1cmF0aW9uLndpZHRoSXNTZXQpIHsKICAgICAgICAgLy8gSWYgd2Ug c2NhbGUgdG8gZml0LCB0aGVuIGFjY2VwdCB0aGUgdmlld3BvcnQgd2lkdGggd2l0aCBzYW5pdHkg Y2hlY2tpbmcuCiAgICAgICAgIGlmICghbV9jb25maWd1cmF0aW9uLmluaXRpYWxTY2FsZUlzU2V0 KSB7CkBAIC0zNDEsNyArMzA2LDcgQEAgaW50IFZpZXdwb3J0Q29uZmlndXJhdGlvbjo6bGF5b3V0 SGVpZ2h0KCkgY29uc3QKIHsKICAgICBBU1NFUlQoIWNvbnN0cmFpbnRzQXJlQWxsUmVsYXRpdmUo bV9jb25maWd1cmF0aW9uKSk7CiAKLSAgICBjb25zdCBGbG9hdFNpemUmIG1pbmltdW1MYXlvdXRT aXplID0gYWN0aXZlTWluaW11bUxheW91dFNpemVJblNjcm9sbFZpZXdDb29yZGluYXRlcygpOwor ICAgIGNvbnN0IEZsb2F0U2l6ZSYgbWluaW11bUxheW91dFNpemUgPSBtX21pbmltdW1MYXlvdXRT aXplOwogICAgIGlmIChtX2NvbmZpZ3VyYXRpb24uaGVpZ2h0SXNTZXQpIHsKICAgICAgICAgLy8g SWYgd2Ugc2NhbGUgdG8gZml0LCB0aGVuIGFjY2VwdCB0aGUgdmlld3BvcnQgaGVpZ2h0IHdpdGgg c2FuaXR5IGNoZWNraW5nLgogICAgICAgICBpZiAoIW1fY29uZmlndXJhdGlvbi5pbml0aWFsU2Nh bGVJc1NldCkgewpAQCAtNDU2LDkgKzQyMSw2IEBAIFZpZXdwb3J0Q29uZmlndXJhdGlvblRleHRT dHJlYW0mIFZpZXdwb3J0Q29uZmlndXJhdGlvblRleHRTdHJlYW06Om9wZXJhdG9yPDwoY29uCiAg ICAgdHMgPDwgIih6b29tICIgPDwgdmlld3BvcnRBcmd1bWVudHMuem9vbSA8PCAiLCBtaW5ab29t ICIgPDwgdmlld3BvcnRBcmd1bWVudHMubWluWm9vbSA8PCAiLCBtYXhab29tICIgPDwgdmlld3Bv cnRBcmd1bWVudHMubWF4Wm9vbSA8PCAiKSI7CiAgICAgdHMuZGVjcmVhc2VJbmRlbnQoKTsKIAot I2lmIFBMQVRGT1JNKElPUykKLSAgICBkdW1wUHJvcGVydHkodHMsICJtaW5pbWFsVUkiLCB2aWV3 cG9ydEFyZ3VtZW50cy5taW5pbWFsVUkpOwotI2VuZGlmCiAgICAgcmV0dXJuIHRzOwogfQogCkBA IC00OTMsOCArNDU1LDYgQEAgQ1N0cmluZyBWaWV3cG9ydENvbmZpZ3VyYXRpb246OmRlc2NyaXB0 aW9uKCkgY29uc3QKIAogICAgIGR1bXBQcm9wZXJ0eSh0cywgImNvbnRlbnRTaXplIiwgbV9jb250 ZW50U2l6ZSk7CiAgICAgZHVtcFByb3BlcnR5KHRzLCAibWluaW11bUxheW91dFNpemUiLCBtX21p bmltdW1MYXlvdXRTaXplKTsKLSAgICBkdW1wUHJvcGVydHkodHMsICJtaW5pbXVtTGF5b3V0U2l6 ZUZvck1pbmltYWxVSSIsIG1fbWluaW11bUxheW91dFNpemVGb3JNaW5pbWFsVUkpOwotICAgIHRz IDw8ICIodXNlcyBtaW5pbWFsIFVJICIgPDwgbV91c2VzTWluaW1hbFVJIDw8ICIpIjsKIAogICAg IHRzIDw8ICJcbiI7CiAgICAgdHMuaW5jcmVhc2VJbmRlbnQoKTsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3BhZ2UvVmlld3BvcnRDb25maWd1cmF0aW9uLmggYi9Tb3VyY2UvV2ViQ29yZS9w YWdlL1ZpZXdwb3J0Q29uZmlndXJhdGlvbi5oCmluZGV4IDJhMjRmZGRmNTU0ODg0NjA0NmJmNzY2 MTBmNzRkOTU2MWQ0MDU3MTMuLjg5Y2Y5ZDJlNDlhMmE1OTk0NjU3MzViYjM1NDRkODRkOGQ5ODI4 YmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvVmlld3BvcnRDb25maWd1cmF0aW9u LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9WaWV3cG9ydENvbmZpZ3VyYXRpb24uaApAQCAt NzQsMjMgKzc0LDE0IEBAIHB1YmxpYzoKICAgICBjb25zdCBGbG9hdFNpemUmIG1pbmltdW1MYXlv dXRTaXplKCkgY29uc3QgeyByZXR1cm4gbV9taW5pbXVtTGF5b3V0U2l6ZTsgfQogICAgIFdFQkNP UkVfRVhQT1JUIHZvaWQgc2V0TWluaW11bUxheW91dFNpemUoY29uc3QgRmxvYXRTaXplJik7CiAK LSAgICBjb25zdCBGbG9hdFNpemUmIG1pbmltdW1MYXlvdXRTaXplRm9yTWluaW1hbFVJKCkgY29u c3QgeyByZXR1cm4gbV9taW5pbXVtTGF5b3V0U2l6ZUZvck1pbmltYWxVSS5pc0VtcHR5KCkgPyBt X21pbmltdW1MYXlvdXRTaXplIDogbV9taW5pbXVtTGF5b3V0U2l6ZUZvck1pbmltYWxVSTsgfQot ICAgIFdFQkNPUkVfRVhQT1JUIHZvaWQgc2V0TWluaW11bUxheW91dFNpemVGb3JNaW5pbWFsVUko Y29uc3QgRmxvYXRTaXplJik7Ci0KLSAgICBXRUJDT1JFX0VYUE9SVCBjb25zdCBGbG9hdFNpemUm IGFjdGl2ZU1pbmltdW1MYXlvdXRTaXplSW5TY3JvbGxWaWV3Q29vcmRpbmF0ZXMoKSBjb25zdDsK LQogICAgIGNvbnN0IFZpZXdwb3J0QXJndW1lbnRzJiB2aWV3cG9ydEFyZ3VtZW50cygpIGNvbnN0 IHsgcmV0dXJuIG1fdmlld3BvcnRBcmd1bWVudHM7IH0KICAgICBXRUJDT1JFX0VYUE9SVCB2b2lk IHNldFZpZXdwb3J0QXJndW1lbnRzKGNvbnN0IFZpZXdwb3J0QXJndW1lbnRzJik7CiAKLSAgICBX RUJDT1JFX0VYUE9SVCB2b2lkIHJlc2V0TWluaW1hbFVJKCk7Ci0gICAgV0VCQ09SRV9FWFBPUlQg dm9pZCBkaWRGaW5pc2hEb2N1bWVudExvYWQoKTsKLQogICAgIFdFQkNPUkVfRVhQT1JUIEludFNp emUgbGF5b3V0U2l6ZSgpIGNvbnN0OwogICAgIFdFQkNPUkVfRVhQT1JUIGRvdWJsZSBpbml0aWFs U2NhbGUoKSBjb25zdDsKICAgICBXRUJDT1JFX0VYUE9SVCBkb3VibGUgbWluaW11bVNjYWxlKCkg Y29uc3Q7CiAgICAgZG91YmxlIG1heGltdW1TY2FsZSgpIGNvbnN0IHsgcmV0dXJuIG1fY29uZmln dXJhdGlvbi5tYXhpbXVtU2NhbGU7IH0KICAgICBib29sIGFsbG93c1VzZXJTY2FsaW5nKCkgY29u c3QgeyByZXR1cm4gbV9jb25maWd1cmF0aW9uLmFsbG93c1VzZXJTY2FsaW5nOyB9Ci0gICAgYm9v bCB1c2VzTWluaW1hbFVJKCkgY29uc3QgeyByZXR1cm4gbV91c2VzTWluaW1hbFVJOyB9CiAKICAg ICBXRUJDT1JFX0VYUE9SVCBzdGF0aWMgUGFyYW1ldGVycyB3ZWJwYWdlUGFyYW1ldGVycygpOwog ICAgIFdFQkNPUkVfRVhQT1JUIHN0YXRpYyBQYXJhbWV0ZXJzIHRleHREb2N1bWVudFBhcmFtZXRl cnMoKTsKQEAgLTExMywxMSArMTA0LDcgQEAgcHJpdmF0ZToKICAgICBQYXJhbWV0ZXJzIG1fZGVm YXVsdENvbmZpZ3VyYXRpb247CiAgICAgSW50U2l6ZSBtX2NvbnRlbnRTaXplOwogICAgIEZsb2F0 U2l6ZSBtX21pbmltdW1MYXlvdXRTaXplOwotICAgIEZsb2F0U2l6ZSBtX21pbmltdW1MYXlvdXRT aXplRm9yTWluaW1hbFVJOwogICAgIFZpZXdwb3J0QXJndW1lbnRzIG1fdmlld3BvcnRBcmd1bWVu dHM7Ci0KLSAgICBib29sIG1fdXNlc01pbmltYWxVSTsKLSAgICBib29sIG1fcGFnZURpZEZpbmlz aERvY3VtZW50TG9hZDsKIH07CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQvaW9zL1dlYkNvcmVTdXBwb3J0L1dlYkNocm9tZUNsaWVudElPUy5tbSBi L1NvdXJjZS9XZWJLaXQvaW9zL1dlYkNvcmVTdXBwb3J0L1dlYkNocm9tZUNsaWVudElPUy5tbQpp bmRleCA4ZDA1YjM0ZWEyOTM5Mzg4MjY2MzE3YzViOGQ1ZDY1MjlhNWRhMDFlLi43Y2I2ZGM3YTM4 YzI1MDMyN2JjOGE5NzJkMmRmZmVmZDI5OWM2ZmM5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L2lvcy9XZWJDb3JlU3VwcG9ydC9XZWJDaHJvbWVDbGllbnRJT1MubW0KKysrIGIvU291cmNlL1dl YktpdC9pb3MvV2ViQ29yZVN1cHBvcnQvV2ViQ2hyb21lQ2xpZW50SU9TLm1tCkBAIC0xNjgsOCAr MTY4LDcgQEAgc3RhdGljIGlubGluZSBOU0RpY3Rpb25hcnkqIGRpY3Rpb25hcnlGb3JWaWV3cG9y dEFyZ3VtZW50cyhjb25zdCBXZWJDb3JlOjpWaWV3cG8KICAgICAgICAgICAgICAgQCJtYXhpbXVt LXNjYWxlIjpAKGFyZ3VtZW50cy5tYXhab29tKSwKICAgICAgICAgICAgICAgQCJ1c2VyLXNjYWxh YmxlIjpAKGFyZ3VtZW50cy51c2VyWm9vbSksCiAgICAgICAgICAgICAgIEAid2lkdGgiOkAoYXJn dW1lbnRzLndpZHRoKSwKLSAgICAgICAgICAgICAgQCJoZWlnaHQiOkAoYXJndW1lbnRzLmhlaWdo dCksCi0gICAgICAgICAgICAgIEAibWluaW1hbC11aSI6QChhcmd1bWVudHMubWluaW1hbFVJKSB9 OworICAgICAgICAgICAgICBAImhlaWdodCI6QChhcmd1bWVudHMuaGVpZ2h0KSB9OwogfQogCiBG bG9hdFNpemUgV2ViQ2hyb21lQ2xpZW50SU9TOjpzY3JlZW5TaXplKCkgY29uc3QKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQvaW9zL1dlYktpdC5pT1MuZXhwIGIvU291cmNlL1dlYktpdC9pb3Mv V2ViS2l0LmlPUy5leHAKaW5kZXggZDVkYTYyYzMwMWIxZTFiZWRiMmJjZjNlMDI4Yzk3YjQxOTE4 NTE0OS4uODM0NWE0NTExMzRjNmZmMTViZTY4NTg2ZGRlNzgxZmU5NGZiNTJkNiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9pb3MvV2ViS2l0LmlPUy5leHAKKysrIGIvU291cmNlL1dlYktpdC9p b3MvV2ViS2l0LmlPUy5leHAKQEAgLTE5LDcgKzE5LDYgQEAgX1dlYlF1aWNrTG9va1VUSUtleQog X1dlYlZpZXdwb3J0SGVpZ2h0S2V5CiBfV2ViVmlld3BvcnRJbml0aWFsU2NhbGVLZXkKIF9XZWJW aWV3cG9ydE1heGltdW1TY2FsZUtleQotX1dlYlZpZXdwb3J0TWluaW1hbFVJS2V5CiBfV2ViVmll d3BvcnRNaW5pbXVtU2NhbGVLZXkKIF9XZWJWaWV3cG9ydFVzZXJTY2FsYWJsZUtleQogX1dlYlZp ZXdwb3J0V2lkdGhLZXkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvbWFjL0hpc3RvcnkvV2Vi SGlzdG9yeUl0ZW0ubW0gYi9Tb3VyY2UvV2ViS2l0L21hYy9IaXN0b3J5L1dlYkhpc3RvcnlJdGVt Lm1tCmluZGV4IDU0Y2ViZDY3ODI2Yzc1OTk5ODUwMjJjNjY1ODg4MWFjOGJkYzNmMDEuLmU2Nzdi MDFlNzNiZGNmMjI3YjI4ZjQxZjg4Y2ExNjE5NWQ5NWRjM2IgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQvbWFjL0hpc3RvcnkvV2ViSGlzdG9yeUl0ZW0ubW0KKysrIGIvU291cmNlL1dlYktpdC9t YWMvSGlzdG9yeS9XZWJIaXN0b3J5SXRlbS5tbQpAQCAtNjUsNyArNjUsNiBAQCBOU1N0cmluZyAq V2ViVmlld3BvcnRNYXhpbXVtU2NhbGVLZXkgPSBAIm1heGltdW0tc2NhbGUiOwogTlNTdHJpbmcg KldlYlZpZXdwb3J0VXNlclNjYWxhYmxlS2V5ID0gQCJ1c2VyLXNjYWxhYmxlIjsKIE5TU3RyaW5n ICpXZWJWaWV3cG9ydFdpZHRoS2V5ICAgICAgICA9IEAid2lkdGgiOwogTlNTdHJpbmcgKldlYlZp ZXdwb3J0SGVpZ2h0S2V5ICAgICAgID0gQCJoZWlnaHQiOwotTlNTdHJpbmcgKldlYlZpZXdwb3J0 TWluaW1hbFVJS2V5ICAgID0gQCJtaW5pbWFsLXVpIjsKIAogc3RhdGljIE5TU3RyaW5nICpzY2Fs ZUtleSA9IEAic2NhbGUiOwogc3RhdGljIE5TU3RyaW5nICpzY2FsZUlzSW5pdGlhbEtleSA9IEAi c2NhbGVJc0luaXRpYWwiOwpAQCAtNjIzLDcgKzYyMiw2IEBAIFdlYkhpc3RvcnlJdGVtICpraXQo SGlzdG9yeUl0ZW0qIGl0ZW0pCiAgICAgW2FyZ3VtZW50c0RpY3Rpb25hcnkgc2V0T2JqZWN0OltO U051bWJlciBudW1iZXJXaXRoRmxvYXQ6dmlld3BvcnRBcmd1bWVudHMud2lkdGhdIGZvcktleTpX ZWJWaWV3cG9ydFdpZHRoS2V5XTsKICAgICBbYXJndW1lbnRzRGljdGlvbmFyeSBzZXRPYmplY3Q6 W05TTnVtYmVyIG51bWJlcldpdGhGbG9hdDp2aWV3cG9ydEFyZ3VtZW50cy5oZWlnaHRdIGZvcktl eTpXZWJWaWV3cG9ydEhlaWdodEtleV07CiAgICAgW2FyZ3VtZW50c0RpY3Rpb25hcnkgc2V0T2Jq ZWN0OltOU051bWJlciBudW1iZXJXaXRoRmxvYXQ6dmlld3BvcnRBcmd1bWVudHMudXNlclpvb21d IGZvcktleTpXZWJWaWV3cG9ydFVzZXJTY2FsYWJsZUtleV07Ci0gICAgW2FyZ3VtZW50c0RpY3Rp b25hcnkgc2V0T2JqZWN0OltOU051bWJlciBudW1iZXJXaXRoQm9vbDp2aWV3cG9ydEFyZ3VtZW50 cy5taW5pbWFsVUldIGZvcktleTpXZWJWaWV3cG9ydE1pbmltYWxVSUtleV07CiAgICAgcmV0dXJu IGFyZ3VtZW50c0RpY3Rpb25hcnk7CiB9CiAKQEAgLTYzNiw3ICs2MzQsNiBAQCBXZWJIaXN0b3J5 SXRlbSAqa2l0KEhpc3RvcnlJdGVtKiBpdGVtKQogICAgIHZpZXdwb3J0QXJndW1lbnRzLndpZHRo ID0gW1thcmd1bWVudHMgb2JqZWN0Rm9yS2V5OldlYlZpZXdwb3J0V2lkdGhLZXldIGZsb2F0VmFs dWVdOwogICAgIHZpZXdwb3J0QXJndW1lbnRzLmhlaWdodCA9IFtbYXJndW1lbnRzIG9iamVjdEZv cktleTpXZWJWaWV3cG9ydEhlaWdodEtleV0gZmxvYXRWYWx1ZV07CiAgICAgdmlld3BvcnRBcmd1 bWVudHMudXNlclpvb20gPSBbW2FyZ3VtZW50cyBvYmplY3RGb3JLZXk6V2ViVmlld3BvcnRVc2Vy U2NhbGFibGVLZXldIGZsb2F0VmFsdWVdOwotICAgIHZpZXdwb3J0QXJndW1lbnRzLm1pbmltYWxV SSA9IFtbYXJndW1lbnRzIG9iamVjdEZvcktleTpXZWJWaWV3cG9ydE1pbmltYWxVSUtleV0gYm9v bFZhbHVlXTsKICAgICBjb3JlKF9wcml2YXRlKS0+c2V0Vmlld3BvcnRBcmd1bWVudHModmlld3Bv cnRBcmd1bWVudHMpOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L21hYy9IaXN0b3J5 L1dlYkhpc3RvcnlJdGVtUHJpdmF0ZS5oIGIvU291cmNlL1dlYktpdC9tYWMvSGlzdG9yeS9XZWJI aXN0b3J5SXRlbVByaXZhdGUuaAppbmRleCA1MTk3MDUxMTQyZGQ5ODdlMGQ5ODFmNDViYTJjOWUz ZjU2ZDJmZTM2Li43MjU0Y2IxNmQ2ZTY3MDA0Y2RkNzUzNDY3MWRmMzc5ZjRmOGJhODM2IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0L21hYy9IaXN0b3J5L1dlYkhpc3RvcnlJdGVtUHJpdmF0ZS5o CisrKyBiL1NvdXJjZS9XZWJLaXQvbWFjL0hpc3RvcnkvV2ViSGlzdG9yeUl0ZW1Qcml2YXRlLmgK QEAgLTM3LDcgKzM3LDYgQEAgZXh0ZXJuIE5TU3RyaW5nICpXZWJWaWV3cG9ydE1heGltdW1TY2Fs ZUtleTsKIGV4dGVybiBOU1N0cmluZyAqV2ViVmlld3BvcnRVc2VyU2NhbGFibGVLZXk7CiBleHRl cm4gTlNTdHJpbmcgKldlYlZpZXdwb3J0V2lkdGhLZXk7CiBleHRlcm4gTlNTdHJpbmcgKldlYlZp ZXdwb3J0SGVpZ2h0S2V5OwotZXh0ZXJuIE5TU3RyaW5nICpXZWJWaWV3cG9ydE1pbmltYWxVSUtl eTsKICNlbmRpZgogCiBAaW50ZXJmYWNlIFdlYkhpc3RvcnlJdGVtIChXZWJQcml2YXRlKQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFt ZUxvYWRlckNsaWVudC5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBw b3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmNwcAppbmRleCAxODc4MjFkMzNmMGJmZGJiYmRhNWYw NDM4MDFlY2VmMGQ4OWI0N2M4Li43NjFmNTExZjYyYzY3Y2NiMDBmN2I5MzcyY2Q2YTVlNTMyMzkx MGY1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0 L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNz L1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmNwcApAQCAtNTA3LDggKzUwNyw2 IEBAIHZvaWQgV2ViRnJhbWVMb2FkZXJDbGllbnQ6OmRpc3BhdGNoRGlkRmluaXNoRG9jdW1lbnRM b2FkKCkKICAgICBpZiAoIXdlYlBhZ2UpCiAgICAgICAgIHJldHVybjsKIAotICAgIHdlYlBhZ2Ut PmRpZEZpbmlzaERvY3VtZW50TG9hZChtX2ZyYW1lKTsKLQogICAgIFJlZlB0cjxBUEk6Ok9iamVj dD4gdXNlckRhdGE7CiAKICAgICAvLyBOb3RpZnkgdGhlIGJ1bmRsZSBjbGllbnQuCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAgYi9Tb3Vy Y2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKaW5kZXggNmU1ZDBjY2E1 ZjM1ODc1N2RlY2ZjMjUxNDA5NGJkNzk2ODg0MjBiYS4uYTAzZDJjMTA2YzVjMjczYjRkNjY2Mzgx YTA5NGZjZTQ2MzcyZGFiNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9X ZWJQYWdlL1dlYlBhZ2UuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFn ZS9XZWJQYWdlLmNwcApAQCAtNDQ4Miw3ICs0NDgyLDYgQEAgdm9pZCBXZWJQYWdlOjpkaWRDb21t aXRMb2FkKFdlYkZyYW1lKiBmcmFtZSkKICAgICBXZWJQcm9jZXNzOjpzaGFyZWQoKS5ldmVudERp c3BhdGNoZXIoKS5jbGVhclF1ZXVlZFRvdWNoRXZlbnRzRm9yUGFnZSgqdGhpcyk7CiAKICAgICBy ZXNldFZpZXdwb3J0RGVmYXVsdENvbmZpZ3VyYXRpb24oZnJhbWUpOwotICAgIG1fdmlld3BvcnRD b25maWd1cmF0aW9uLnJlc2V0TWluaW1hbFVJKCk7CiAgICAgY29uc3QgRnJhbWUqIGNvcmVGcmFt ZSA9IGZyYW1lLT5jb3JlRnJhbWUoKTsKICAgICBtX3ZpZXdwb3J0Q29uZmlndXJhdGlvbi5zZXRD b250ZW50c1NpemUoY29yZUZyYW1lLT52aWV3KCktPmNvbnRlbnRzU2l6ZSgpKTsKICAgICBtX3Zp ZXdwb3J0Q29uZmlndXJhdGlvbi5zZXRWaWV3cG9ydEFyZ3VtZW50cyhjb3JlRnJhbWUtPmRvY3Vt ZW50KCktPnZpZXdwb3J0QXJndW1lbnRzKCkpOwpAQCAtNDQ5OCwxOCArNDQ5Nyw2IEBAIHZvaWQg V2ViUGFnZTo6ZGlkQ29tbWl0TG9hZChXZWJGcmFtZSogZnJhbWUpCiAgICAgdXBkYXRlTWFpbkZy YW1lU2Nyb2xsT2Zmc2V0UGlubmluZygpOwogfQogCi12b2lkIFdlYlBhZ2U6OmRpZEZpbmlzaERv Y3VtZW50TG9hZChXZWJGcmFtZSogZnJhbWUpCi17Ci0jaWYgUExBVEZPUk0oSU9TKQotICAgIGlm ICghZnJhbWUtPmlzTWFpbkZyYW1lKCkpCi0gICAgICAgIHJldHVybjsKLQotICAgIG1fdmlld3Bv cnRDb25maWd1cmF0aW9uLmRpZEZpbmlzaERvY3VtZW50TG9hZCgpOwotI2Vsc2UKLSAgICBVTlVT RURfUEFSQU0oZnJhbWUpOwotI2VuZGlmIC8vIFBMQVRGT1JNKElPUykKLX0KLQogdm9pZCBXZWJQ YWdlOjpkaWRGaW5pc2hMb2FkKFdlYkZyYW1lKiBmcmFtZSkKIHsKICNpZiBFTkFCTEUoUFJJTUFS WV9TTkFQU0hPVFRFRF9QTFVHSU5fSEVVUklTVElDKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaCBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nl c3MvV2ViUGFnZS9XZWJQYWdlLmgKaW5kZXggMGZmYmZkYzE4OWVjOGI0MGQyMjY4NzViMzdkODc0 MzE1OTI1OGRhZi4uYmJhY2UyMjg3NGQwZTExODJmZjVlN2Q3OTdhMjMxOGI4MzNkNTI1MiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaAorKysg Yi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oCkBAIC0yNTAsNyAr MjUwLDYgQEAgcHVibGljOgogICAgIHZvaWQgZGlkU3RhcnRQYWdlVHJhbnNpdGlvbigpOwogICAg IHZvaWQgZGlkQ29tcGxldGVQYWdlVHJhbnNpdGlvbigpOwogICAgIHZvaWQgZGlkQ29tbWl0TG9h ZChXZWJGcmFtZSopOwotICAgIHZvaWQgZGlkRmluaXNoRG9jdW1lbnRMb2FkKFdlYkZyYW1lKik7 CiAgICAgdm9pZCBkaWRGaW5pc2hMb2FkKFdlYkZyYW1lKik7CiAgICAgdm9pZCBzaG93KCk7CiAg ICAgU3RyaW5nIHVzZXJBZ2VudChjb25zdCBXZWJDb3JlOjpVUkwmKSBjb25zdDsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9pb3MvV2ViUGFnZUlPUy5tbSBi L1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9pb3MvV2ViUGFnZUlPUy5tbQppbmRl eCBjOTU2ODk2M2U0ZGI1YmRmMTZlNDg3Nzc4NzBlMTgyMTBiYzA2YWFjLi45ZDhmMGRjOTM0MGQ3 ODNjZTdkOTJiNTczOWQyMjNkZmYzNzUwOWVkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9X ZWJQcm9jZXNzL1dlYlBhZ2UvaW9zL1dlYlBhZ2VJT1MubW0KKysrIGIvU291cmNlL1dlYktpdDIv V2ViUHJvY2Vzcy9XZWJQYWdlL2lvcy9XZWJQYWdlSU9TLm1tCkBAIC0xNTksNyArMTU5LDcgQEAg dm9pZCBXZWJQYWdlOjpkaWRSZWNlaXZlTW9iaWxlRG9jVHlwZShib29sIGlzTW9iaWxlRG9jdHlw ZSkKIHZvaWQgV2ViUGFnZTo6c2F2ZVBhZ2VTdGF0ZShIaXN0b3J5SXRlbSYgaGlzdG9yeUl0ZW0p CiB7CiAgICAgaGlzdG9yeUl0ZW0uc2V0U2NhbGVJc0luaXRpYWwoIW1fdXNlckhhc0NoYW5nZWRQ YWdlU2NhbGVGYWN0b3IpOwotICAgIGhpc3RvcnlJdGVtLnNldE1pbmltdW1MYXlvdXRTaXplSW5T Y3JvbGxWaWV3Q29vcmRpbmF0ZXMobV92aWV3cG9ydENvbmZpZ3VyYXRpb24uYWN0aXZlTWluaW11 bUxheW91dFNpemVJblNjcm9sbFZpZXdDb29yZGluYXRlcygpKTsKKyAgICBoaXN0b3J5SXRlbS5z ZXRNaW5pbXVtTGF5b3V0U2l6ZUluU2Nyb2xsVmlld0Nvb3JkaW5hdGVzKG1fdmlld3BvcnRDb25m aWd1cmF0aW9uLm1pbmltdW1MYXlvdXRTaXplKCkpOwogICAgIGhpc3RvcnlJdGVtLnNldENvbnRl bnRTaXplKG1fdmlld3BvcnRDb25maWd1cmF0aW9uLmNvbnRlbnRzU2l6ZSgpKTsKIH0KIApAQCAt MjE0LDcgKzIxNCw3IEBAIHZvaWQgV2ViUGFnZTo6cmVzdG9yZVBhZ2VTdGF0ZShjb25zdCBIaXN0 b3J5SXRlbSYgaGlzdG9yeUl0ZW0pCiAKICAgICBtX3VzZXJIYXNDaGFuZ2VkUGFnZVNjYWxlRmFj dG9yID0gIWhpc3RvcnlJdGVtLnNjYWxlSXNJbml0aWFsKCk7CiAKLSAgICBGbG9hdFNpemUgY3Vy cmVudE1pbmltdW1MYXlvdXRTaXplSW5TY3JvbGxWaWV3Q29vcmRpbmF0ZXMgPSBtX3ZpZXdwb3J0 Q29uZmlndXJhdGlvbi5hY3RpdmVNaW5pbXVtTGF5b3V0U2l6ZUluU2Nyb2xsVmlld0Nvb3JkaW5h dGVzKCk7CisgICAgRmxvYXRTaXplIGN1cnJlbnRNaW5pbXVtTGF5b3V0U2l6ZUluU2Nyb2xsVmll d0Nvb3JkaW5hdGVzID0gbV92aWV3cG9ydENvbmZpZ3VyYXRpb24ubWluaW11bUxheW91dFNpemUo KTsKICAgICBpZiAoaGlzdG9yeUl0ZW0ubWluaW11bUxheW91dFNpemVJblNjcm9sbFZpZXdDb29y ZGluYXRlcygpID09IGN1cnJlbnRNaW5pbXVtTGF5b3V0U2l6ZUluU2Nyb2xsVmlld0Nvb3JkaW5h dGVzKSB7CiAgICAgICAgIGZsb2F0IGJvdW5kZWRTY2FsZSA9IHN0ZDo6bWluPGZsb2F0PihtX3Zp ZXdwb3J0Q29uZmlndXJhdGlvbi5tYXhpbXVtU2NhbGUoKSwgc3RkOjptYXg8ZmxvYXQ+KG1fdmll d3BvcnRDb25maWd1cmF0aW9uLm1pbmltdW1TY2FsZSgpLCBoaXN0b3J5SXRlbS5wYWdlU2NhbGVG YWN0b3IoKSkpOwogICAgICAgICBzY2FsZVBhZ2UoYm91bmRlZFNjYWxlLCBJbnRQb2ludCgpKTsK QEAgLTI0MzQsNyArMjQzNCw3IEBAIHZvaWQgV2ViUGFnZTo6dmlld3BvcnRDb25maWd1cmF0aW9u Q2hhbmdlZCgpCiAgICAgRnJhbWVWaWV3JiBmcmFtZVZpZXcgPSAqbWFpbkZyYW1lVmlldygpOwog ICAgIEludFBvaW50IHNjcm9sbFBvc2l0aW9uID0gZnJhbWVWaWV3LnNjcm9sbFBvc2l0aW9uKCk7 CiAgICAgaWYgKCFtX2hhc1JlY2VpdmVkVmlzaWJsZUNvbnRlbnRSZWN0c0FmdGVyRGlkQ29tbWl0 TG9hZCkgewotICAgICAgICBGbG9hdFNpemUgbWluaW11bUxheW91dFNpemVJblNjcm9sbFZpZXdD b29yZGluYXRlcyA9IG1fdmlld3BvcnRDb25maWd1cmF0aW9uLmFjdGl2ZU1pbmltdW1MYXlvdXRT aXplSW5TY3JvbGxWaWV3Q29vcmRpbmF0ZXMoKTsKKyAgICAgICAgRmxvYXRTaXplIG1pbmltdW1M YXlvdXRTaXplSW5TY3JvbGxWaWV3Q29vcmRpbmF0ZXMgPSBtX3ZpZXdwb3J0Q29uZmlndXJhdGlv bi5taW5pbXVtTGF5b3V0U2l6ZSgpOwogICAgICAgICBtaW5pbXVtTGF5b3V0U2l6ZUluU2Nyb2xs Vmlld0Nvb3JkaW5hdGVzLnNjYWxlKDEgLyBzY2FsZSk7CiAgICAgICAgIEludFNpemUgbWluaW11 bUxheW91dFNpemVJbkRvY3VtZW50Q29vcmRpbmF0ZXMgPSByb3VuZGVkSW50U2l6ZShtaW5pbXVt TGF5b3V0U2l6ZUluU2Nyb2xsVmlld0Nvb3JkaW5hdGVzKTsKICAgICAgICAgZnJhbWVWaWV3LnNl dFVub2JzY3VyZWRDb250ZW50U2l6ZShtaW5pbXVtTGF5b3V0U2l6ZUluRG9jdW1lbnRDb29yZGlu YXRlcyk7CkBAIC0yNDUwLDcgKzI0NTAsNyBAQCB2b2lkIFdlYlBhZ2U6OnZpZXdwb3J0Q29uZmln dXJhdGlvbkNoYW5nZWQoKQogICAgICAgICAvLyBUaGlzIHRha2VzIHNjYWxlIGludG8gYWNjb3Vu dCwgc28gZG8gYWZ0ZXIgdGhlIHNjYWxlIGNoYW5nZS4KICAgICAgICAgZnJhbWVWaWV3LnNldEN1 c3RvbUZpeGVkUG9zaXRpb25MYXlvdXRSZWN0KGVuY2xvc2luZ0ludFJlY3QoZnJhbWVWaWV3LnZp ZXdwb3J0Q29uc3RyYWluZWRPYmplY3RzUmVjdCgpKSk7CiAKLSAgICAgICAgZnJhbWVWaWV3LnNl dEN1c3RvbVNpemVGb3JSZXNpemVFdmVudChleHBhbmRlZEludFNpemUobV92aWV3cG9ydENvbmZp Z3VyYXRpb24uYWN0aXZlTWluaW11bUxheW91dFNpemVJblNjcm9sbFZpZXdDb29yZGluYXRlcygp KSk7CisgICAgICAgIGZyYW1lVmlldy5zZXRDdXN0b21TaXplRm9yUmVzaXplRXZlbnQoZXhwYW5k ZWRJbnRTaXplKG1fdmlld3BvcnRDb25maWd1cmF0aW9uLm1pbmltdW1MYXlvdXRTaXplKCkpKTsK ICAgICB9CiB9CiAKQEAgLTI0NTgsNyArMjQ1OCw3IEBAIHZvaWQgV2ViUGFnZTo6dXBkYXRlVmll d3BvcnRTaXplRm9yQ1NTVmlld3BvcnRVbml0cygpCiB7CiAgICAgRmxvYXRTaXplIGxhcmdlc3RV bm9ic2N1cmVkUmVjdCA9IG1fbWF4aW11bVVub2JzY3VyZWRTaXplOwogICAgIGlmIChsYXJnZXN0 VW5vYnNjdXJlZFJlY3QuaXNFbXB0eSgpKQotICAgICAgICBsYXJnZXN0VW5vYnNjdXJlZFJlY3Qg PSBtX3ZpZXdwb3J0Q29uZmlndXJhdGlvbi5taW5pbXVtTGF5b3V0U2l6ZUZvck1pbmltYWxVSSgp OworICAgICAgICBsYXJnZXN0VW5vYnNjdXJlZFJlY3QgPSBtX3ZpZXdwb3J0Q29uZmlndXJhdGlv bi5taW5pbXVtTGF5b3V0U2l6ZSgpOwogCiAgICAgRnJhbWVWaWV3JiBmcmFtZVZpZXcgPSAqbWFp bkZyYW1lVmlldygpOwogICAgIGxhcmdlc3RVbm9ic2N1cmVkUmVjdC5zY2FsZSgxIC8gbV92aWV3 cG9ydENvbmZpZ3VyYXRpb24uaW5pdGlhbFNjYWxlKCkpOwo=