132093 2014-04-23 18:35:11 -0700 [iOS][WK2] Fix a few mistakes affecting the initial layout and the initial unobscured rect 2014-04-23 19:16:41 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 benjamin benjamin oldest_to_newest 1003455 0 benjamin 2014-04-23 18:35:11 -0700 [iOS][WK2] Fix a few mistakes affecting the initial layout and the initial unobscured rect 1003458 1 230028 benjamin 2014-04-23 18:49:43 -0700 Created attachment 230028 Patch 1003460 2 230028 thorton 2014-04-23 18:54:37 -0700 Comment on attachment 230028 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=230028&action=review > Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm:1944 > + IntSize minimumLayoutSizeInDocumentCoordinate = roundedIntSize(minimumLayoutSizeInScrollViewCoordinates); Coordinate*s* Also do we really want 'rounded'? 1003475 3 benjamin 2014-04-23 19:16:41 -0700 Committed r167735: <http://trac.webkit.org/changeset/167735> 230028 2014-04-23 18:49:43 -0700 2014-04-23 18:54:36 -0700 Patch bug-132093-20140423184918.patch text/plain 19150 benjamin U3VidmVyc2lvbiBSZXZpc2lvbjogMTY3NzI5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTFjYzdkNWViOTAyYTIy NjgyNmZlM2NmMDNhZjM2MWQ4YTgwMjQxNy4uZjE4ZWYxMDc0NDIzOTM4NjczNmExZGY1MDA2NDYw MDg0YWNlNzg2MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDE0LTA0LTIzICBCZW5q YW1pbiBQb3VsYWluICA8YnBvdWxhaW5AYXBwbGUuY29tPgorCisgICAgICAgIFtpT1NdW1dLMl0g Rml4IGEgZmV3IG1pc3Rha2VzIGFmZmVjdGluZyB0aGUgaW5pdGlhbCBsYXlvdXQgYW5kIHRoZSBp bml0aWFsIHVub2JzY3VyZWQgcmVjdAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTMyMDkzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgQ2hhbmdlIHRoZSBtaW5pbXVtIGxheW91dCBzaXplIHRvIGZsb2F0IHBv aW50IHZhbHVlcyB0byBhY2NvdW50IGZvciBzaXplIGRlZmluZWQgb24gcmV0aW5hIGRpc3BsYXlz LgorICAgICAgICBUaGUgbWluaW11bSBsYXlvdXQgc2l6ZSBzdXBwb3J0cyBoYWxmLXBpeGVscywg dGhlIHZhbHVlIGlzIHJvdW5kZWQgbGF0ZXIgd2hlbiBjb21wdXRpbmcgdGhlIGxheW91dCBzaXpl CisgICAgICAgIGluIGRvY3VtZW50IGNvb3JkaW5hdGVzLgorCisgICAgICAgICogV2ViQ29yZS5l eHAuaW46CisgICAgICAgICogcGFnZS9WaWV3cG9ydENvbmZpZ3VyYXRpb24uY3BwOgorICAgICAg ICAoV2ViQ29yZTo6Vmlld3BvcnRDb25maWd1cmF0aW9uOjpWaWV3cG9ydENvbmZpZ3VyYXRpb24p OgorICAgICAgICBTZXR0aW5nIHRoZSBpbml0aWFsIGNvbnRlbnQgc2l6ZSBpcyBpbmNvcnJlY3Qu IFRoZSBsYXlvdXQgc2l6ZSBjb21wdXRhdGlvbiBhbHJlYWR5IHRha2UgaW50byBhY2NvdW50Cisg ICAgICAgIGVtcHR5IHNpemUgZm9yIHRoZSBmaXJzdCBsYXlvdXQuCisKKyAgICAgICAgU2V0dGlu ZyB0aGUgY29udGVudCBzaXplIHVwZnJvbnQgbWFrZSB0aGUgZmlyc3QgY29tcHV0YXRpb24gaW5j b3JyZWN0IHdoZW4gdGhlIHZpZXdwb3J0IGFyZ3VtZW50cyBzcGVjaWZ5CisgICAgICAgIHRoZSBp bml0aWFsIHNjYWxlLgorCisgICAgICAgIChXZWJDb3JlOjpWaWV3cG9ydENvbmZpZ3VyYXRpb246 OnNldE1pbmltdW1MYXlvdXRTaXplKToKKyAgICAgICAgKiBwYWdlL1ZpZXdwb3J0Q29uZmlndXJh dGlvbi5oOgorICAgICAgICAoV2ViQ29yZTo6Vmlld3BvcnRDb25maWd1cmF0aW9uOjptaW5pbXVt TGF5b3V0U2l6ZSk6CisKIDIwMTQtMDQtMjMgIERhdmlkIEh5YXR0ICA8aHlhdHRAYXBwbGUuY29t PgogCiAgICAgICAgIFtOZXcgTXVsdGljb2x1bW5dIGZhc3QvbXVsdGljb2wvZml4ZWQtY29sdW1u LXBlcmNlbnQtbG9naWNhbC1oZWlnaHQtb3J0aG9nb25hbC13cml0aW5nLW1vZGUuaHRtbCBmYWls cwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdDIv Q2hhbmdlTG9nCmluZGV4IGY0ZWYxYTQzOWNjYjNiYzIwMDg5YTE1M2EzMjkwOWY2N2U3YzE1Zjgu LmVjN2ExMDdiNTg5ZmI2NDdmMzViNTYzNDA4NTcyYzc0NzVmOWFiMjkgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKQEAg LTEsMyArMSw0NiBAQAorMjAxNC0wNC0yMyAgQmVuamFtaW4gUG91bGFpbiAgPGJwb3VsYWluQGFw cGxlLmNvbT4KKworICAgICAgICBbaU9TXVtXSzJdIEZpeCBhIGZldyBtaXN0YWtlcyBhZmZlY3Rp bmcgdGhlIGluaXRpYWwgbGF5b3V0IGFuZCB0aGUgaW5pdGlhbCB1bm9ic2N1cmVkIHJlY3QKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzMjA5MworICAg ICAgICA8cmRhcjovL3Byb2JsZW0vMTY3MDMyMzc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgVGhlIHVzZXIgb2YgV0tXZWJWaWV3IGNhbiBzZXR1cCBh IHNpemUgb24gZGV2aWNlIHBpeGVscywgd2hpY2ggY2FuIGFkZCBoYWxmIGEgcG9pbnQgdG8gdGhl IG1pbmltdW0KKyAgICAgICAgbGF5b3V0IHNpemUuIEJ5IHJvdW5kaW5nIHRoaXMgdXAgYmVmb3Jl IGFwcGx5aW5nIHRoZSBwYWdlIHNjYWxlLCB3ZSBlbmRlZCB1cCB3aXRoIHJvdW5kaW5nIGVycm9y cworICAgICAgICBvbiB0aGUgbGF5b3V0IHNpemUgYW5kIHRoZSB0cmFuc2l0b3J5IHVub2JzY3Vy ZWQgY29udGVudCByZWN0LgorCisgICAgICAgIFRoaXMgcGF0Y2ggZml4ZXMgY2hhbmdlcyB0aGUg bWluaW1hbCBsYXlvdXQgc2l6ZSB0byBmbG9hdCBwb2ludCB2YWx1ZXMgdG8gcmVkdWNlIHRoZSBy b3VuZGluZyBwcm9ibGVtcy4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJW aWV3Lm1tOgorICAgICAgICAoc2V0Vmlld3BvcnRDb25maWd1cmF0aW9uTWluaW11bUxheW91dFNp emUpOgorICAgICAgICAoLVtXS1dlYlZpZXcgX3NldE1pbmltdW1MYXlvdXRTaXplT3ZlcnJpZGVG b3JNaW5pbWFsVUk6XSk6CisgICAgICAgICgtW1dLV2ViVmlldyBfYmVnaW5BbmltYXRlZFJlc2l6 ZVdpdGhVcGRhdGVzOl0pOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaDoKKyAg ICAgICAgKiBVSVByb2Nlc3MvaW9zL1dlYlBhZ2VQcm94eUlPUy5tbToKKyAgICAgICAgKFdlYktp dDo6V2ViUGFnZVByb3h5OjpkeW5hbWljVmlld3BvcnRTaXplVXBkYXRlKToKKyAgICAgICAgKFdl YktpdDo6V2ViUGFnZVByb3h5OjpzZXRWaWV3cG9ydENvbmZpZ3VyYXRpb25NaW5pbXVtTGF5b3V0 U2l6ZSk6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6c2V0TWluaW11bUxheW91dFNp emVGb3JNaW5pbWFsVUkpOgorCisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2Uu Y3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlOjpkaWRDb21taXRMb2FkKToKKyAgICAgICAg RGVmYXVsdGluZyB0aGUgY29udGVudCBzaXplIHRvIHRoZSBtaW5pbXVtIGxheW91dCBzaXplIG9u bHkgd29ya3MgaWYgdGhlIGluaXRpYWwtc2NhbGUgaXMgMS4KKyAgICAgICAgVmlld3BvcnRDb25m aWd1cmF0aW9uIGtub3dzIGV4YWN0bHkgd2hhdCB0byBkbyBiZWZvcmUgdGhlIGZpcnN0IGxheW91 dC4KKworICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmg6CisgICAgICAgICog V2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UubWVzc2FnZXMuaW46CisgICAgICAgICogV2ViUHJv Y2Vzcy9XZWJQYWdlL2lvcy9XZWJQYWdlSU9TLm1tOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdl OjpzZXRWaWV3cG9ydENvbmZpZ3VyYXRpb25NaW5pbXVtTGF5b3V0U2l6ZSk6CisgICAgICAgIChX ZWJLaXQ6OldlYlBhZ2U6OnNldE1pbmltdW1MYXlvdXRTaXplRm9yTWluaW1hbFVJKToKKyAgICAg ICAgKFdlYktpdDo6V2ViUGFnZTo6ZHluYW1pY1ZpZXdwb3J0U2l6ZVVwZGF0ZSk6CisgICAgICAg IEEgZmV3IGZpeGVzIGhlcmU6CisgICAgICAgIC1zZXRab29tZWRPdXRQYWdlU2NhbGVGYWN0b3Io KSB3YXMgaW5jb3JyZWN0bHkgdXNpbmcgdGhlIGluaXRpYWwgc2NhbGUuIDk5JSBvZiB0aGUgdGlt ZSwgaW5pdGlhbCBzY2FsZQorICAgICAgICAgYW5kIG1pbmltdW0gc2NhbGUgYXJlIGVxdWFsLCBi dXQgdGhlIHBhZ2UgY2FuIHNwZWNpZnkgc29tZXRoaW5nIGRpZmZlcmVudCB3aXRoIHRoZSB2aWV3 cG9ydCBtZXRhIHRhZy4KKyAgICAgICAgLVVzZSBmbG9hdGluZyBwb2ludCBmb3IgbWFuaXB1bGF0 aW5nIHRoZSBtaW5pbXVtIGxheW91dCBzaXplcywgdGhlbiByb3VuZCB0aGUgdmFsdWUuCisgICAg ICAgIC1taW5pbXVtTGF5b3V0U2l6ZUluRG9jdW1lbnRDb29yZGluYXRlIHdhcyBzY2FsZWQgdGhl IHdyb25nIHdheSBhcm91bmQuCisKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZTo6dmlld3BvcnRD b25maWd1cmF0aW9uQ2hhbmdlZCk6CisKIDIwMTQtMDQtMjMgIFlvbmdqdW4gWmhhbmcgIDx5b25n anVuX3poYW5nQGFwcGxlLmNvbT4KIAogICAgICAgICBTdXBwb3J0IGVuY29kaW5nL2RlY29kaW5n IE5TVUludGVnZXIgYXJndW1lbnRzIGluIFdLUmVtb3RlT2JqZWN0Q29kZXIuCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmV4cC5pbiBiL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUu ZXhwLmluCmluZGV4IDU0ZTM1YjY4NTQxMjAzYjZhZTNkMDg1Yzg3ZjIyZTUxN2M0MTAwNzEuLjFk ODdkOTQxNDZkMTgyOGI2MTUwZDJjYWE4ZTMyMmE3NjkwMmZkODEgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL1dlYkNvcmUuZXhwLmluCisrKyBiL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUuZXhw LmluCkBAIC04OTQsNyArODk0LDcgQEAgX19aTjdXZWJDb3JlMjFVUkxCeVJlbW92aW5nVXNlcklu Zm9FUDVOU1VSTAogX19aTjdXZWJDb3JlMjFVc2VyQ29udGVudFVSTFBhdHRlcm41cGFyc2VFUktO M1dURjZTdHJpbmdFCiBfX1pON1dlYkNvcmUyMVZpZXdwb3J0Q29uZmlndXJhdGlvbjE1c2V0Q29u dGVudHNTaXplRVJLTlNfN0ludFNpemVFCiBfX1pON1dlYkNvcmUyMVZpZXdwb3J0Q29uZmlndXJh dGlvbjE3d2VicGFnZVBhcmFtZXRlcnNFdgotX19aTjdXZWJDb3JlMjFWaWV3cG9ydENvbmZpZ3Vy YXRpb24yMHNldE1pbmltdW1MYXlvdXRTaXplRVJLTlNfN0ludFNpemVFCitfX1pON1dlYkNvcmUy MVZpZXdwb3J0Q29uZmlndXJhdGlvbjIwc2V0TWluaW11bUxheW91dFNpemVFUktOU185RmxvYXRT aXplRQogX19aTjdXZWJDb3JlMjFWaWV3cG9ydENvbmZpZ3VyYXRpb24yMHNldFZpZXdwb3J0QXJn dW1lbnRzRVJLTlNfMTdWaWV3cG9ydEFyZ3VtZW50c0UKIF9fWk43V2ViQ29yZTIxVmlld3BvcnRD b25maWd1cmF0aW9uMjF4aHRtbE1vYmlsZVBhcmFtZXRlcnNFdgogX19aTjdXZWJDb3JlMjFWaWV3 cG9ydENvbmZpZ3VyYXRpb24yMnRleHREb2N1bWVudFBhcmFtZXRlcnNFdgpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvcGFnZS9WaWV3cG9ydENvbmZpZ3VyYXRpb24uY3BwIGIvU291cmNlL1dl YkNvcmUvcGFnZS9WaWV3cG9ydENvbmZpZ3VyYXRpb24uY3BwCmluZGV4IGYzZDMwNWI2NjhlMjU5 Yzg1MmI4Njc0NDQ1M2EyN2EyMTViZDQ2ODEuLjVkNGE4MGJjY2FmZDllOGI0ODcwMDliZjMyODQ1 YjM5YTNmYjU1YTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvVmlld3BvcnRDb25m aWd1cmF0aW9uLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1ZpZXdwb3J0Q29uZmlndXJh dGlvbi5jcHAKQEAgLTQzLDggKzQzLDcgQEAgc3RhdGljIGJvb2wgY29uc3RyYWludHNBcmVBbGxS ZWxhdGl2ZShjb25zdCBWaWV3cG9ydENvbmZpZ3VyYXRpb246OlBhcmFtZXRlcnMmIGMKICNlbmRp ZgogCiBWaWV3cG9ydENvbmZpZ3VyYXRpb246OlZpZXdwb3J0Q29uZmlndXJhdGlvbigpCi0gICAg OiBtX2NvbnRlbnRTaXplKDEwMjQsIDc2OCkKLSAgICAsIG1fbWluaW11bUxheW91dFNpemUobV9j b250ZW50U2l6ZSkKKyAgICA6IG1fbWluaW11bUxheW91dFNpemUoMTAyNCwgNzY4KQogewogICAg IC8vIFNldHVwIGEgcmVhc29uYWJsZSBkZWZhdWx0IGNvbmZpZ3VyYXRpb24gdG8gYXZvaWQgY29t cHV0aW5nIGluZmluaXRlIHNjYWxlL3NpemVzLgogICAgIC8vIFRob3NlIGFyZSB0aGUgb3JpZ2lu YWwgaVBob25lIGNvbmZpZ3VyYXRpb24uCkBAIC03Miw3ICs3MSw3IEBAIHZvaWQgVmlld3BvcnRD b25maWd1cmF0aW9uOjpzZXRDb250ZW50c1NpemUoY29uc3QgSW50U2l6ZSYgY29udGVudFNpemUp CiAgICAgdXBkYXRlQ29uZmlndXJhdGlvbigpOwogfQogCi12b2lkIFZpZXdwb3J0Q29uZmlndXJh dGlvbjo6c2V0TWluaW11bUxheW91dFNpemUoY29uc3QgSW50U2l6ZSYgbWluaW11bUxheW91dFNp emUpCit2b2lkIFZpZXdwb3J0Q29uZmlndXJhdGlvbjo6c2V0TWluaW11bUxheW91dFNpemUoY29u c3QgRmxvYXRTaXplJiBtaW5pbXVtTGF5b3V0U2l6ZSkKIHsKICAgICBpZiAobV9taW5pbXVtTGF5 b3V0U2l6ZSA9PSBtaW5pbXVtTGF5b3V0U2l6ZSkKICAgICAgICAgcmV0dXJuOwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvcGFnZS9WaWV3cG9ydENvbmZpZ3VyYXRpb24uaCBiL1NvdXJjZS9X ZWJDb3JlL3BhZ2UvVmlld3BvcnRDb25maWd1cmF0aW9uLmgKaW5kZXggZDViZDZlYjJhNWU0NGM5 OThjMzRhMTAwNTAyZDg3OThlYTU0NDBlNi4uYzI5OTliZTAxOTNjOTMzMWFlZjBhNGMyMjY5YTVj ZDVlOGM2ZGQ1OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9WaWV3cG9ydENvbmZp Z3VyYXRpb24uaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1ZpZXdwb3J0Q29uZmlndXJhdGlv bi5oCkBAIC0yNiw2ICsyNiw3IEBACiAjaWZuZGVmIFZpZXdwb3J0Q29uZmlndXJhdGlvbl9oCiAj ZGVmaW5lIFZpZXdwb3J0Q29uZmlndXJhdGlvbl9oCiAKKyNpbmNsdWRlICJGbG9hdFNpemUuaCIK ICNpbmNsdWRlICJJbnRTaXplLmgiCiAjaW5jbHVkZSAiVmlld3BvcnRBcmd1bWVudHMuaCIKICNp bmNsdWRlIDx3dGYvTm9uY29weWFibGUuaD4KQEAgLTcwLDggKzcxLDggQEAgcHVibGljOgogICAg IGNvbnN0IEludFNpemUmIGNvbnRlbnRzU2l6ZSgpIGNvbnN0IHsgcmV0dXJuIG1fY29udGVudFNp emU7IH0KICAgICB2b2lkIHNldENvbnRlbnRzU2l6ZShjb25zdCBJbnRTaXplJik7CiAKLSAgICBj b25zdCBJbnRTaXplJiBtaW5pbXVtTGF5b3V0U2l6ZSgpIGNvbnN0IHsgcmV0dXJuIG1fbWluaW11 bUxheW91dFNpemU7IH0KLSAgICB2b2lkIHNldE1pbmltdW1MYXlvdXRTaXplKGNvbnN0IEludFNp emUmKTsKKyAgICBjb25zdCBGbG9hdFNpemUmIG1pbmltdW1MYXlvdXRTaXplKCkgY29uc3QgeyBy ZXR1cm4gbV9taW5pbXVtTGF5b3V0U2l6ZTsgfQorICAgIHZvaWQgc2V0TWluaW11bUxheW91dFNp emUoY29uc3QgRmxvYXRTaXplJik7CiAKICAgICBjb25zdCBWaWV3cG9ydEFyZ3VtZW50cyYgdmll d3BvcnRBcmd1bWVudHMoKSBjb25zdCB7IHJldHVybiBtX3ZpZXdwb3J0QXJndW1lbnRzOyB9CiAg ICAgdm9pZCBzZXRWaWV3cG9ydEFyZ3VtZW50cyhjb25zdCBWaWV3cG9ydEFyZ3VtZW50cyYpOwpA QCAtOTUsNyArOTYsNyBAQCBwcml2YXRlOgogICAgIFBhcmFtZXRlcnMgbV9jb25maWd1cmF0aW9u OwogICAgIFBhcmFtZXRlcnMgbV9kZWZhdWx0Q29uZmlndXJhdGlvbjsKICAgICBJbnRTaXplIG1f Y29udGVudFNpemU7Ci0gICAgSW50U2l6ZSBtX21pbmltdW1MYXlvdXRTaXplOworICAgIEZsb2F0 U2l6ZSBtX21pbmltdW1MYXlvdXRTaXplOwogICAgIFZpZXdwb3J0QXJndW1lbnRzIG1fdmlld3Bv cnRBcmd1bWVudHM7CiB9OwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv QVBJL0NvY29hL1dLV2ViVmlldy5tbSBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29j b2EvV0tXZWJWaWV3Lm1tCmluZGV4IDE4YTNlZTlhYzM3ZjgxMDI5N2Y3YWQzMDQyYTgyODVjYjA0 YTg3ZjUuLjVmMjljMzFiZTBjZGI4ZjA0NGFlNmZhNjRhMzQzMjgxOWNjOWUwZGEgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tCisrKyBi L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tCkBAIC03MjAs NyArNzIwLDcgQEAgc3RhdGljIFdlYkNvcmU6OkZsb2F0UG9pbnQgY29uc3RyYWluQ29udGVudE9m ZnNldChXZWJDb3JlOjpGbG9hdFBvaW50IGNvbnRlbnRPZmYKIAogc3RhdGljIGlubGluZSB2b2lk IHNldFZpZXdwb3J0Q29uZmlndXJhdGlvbk1pbmltdW1MYXlvdXRTaXplKFdlYktpdDo6V2ViUGFn ZVByb3h5JiBwYWdlLCBjb25zdCBDR1NpemUmIHNpemUpCiB7Ci0gICAgcGFnZS5zZXRWaWV3cG9y dENvbmZpZ3VyYXRpb25NaW5pbXVtTGF5b3V0U2l6ZShXZWJDb3JlOjpJbnRTaXplKENHQ2VpbGlu ZyhzaXplLndpZHRoKSwgQ0dDZWlsaW5nKHNpemUuaGVpZ2h0KSkpOworICAgIHBhZ2Uuc2V0Vmll d3BvcnRDb25maWd1cmF0aW9uTWluaW11bUxheW91dFNpemUoV2ViQ29yZTo6RmxvYXRTaXplKHNp emUpKTsKIH0KIAogLSAodm9pZClfZnJhbWVPckJvdW5kc0NoYW5nZWQKQEAgLTEyNzksNyArMTI3 OSw3IEBAIHN0YXRpYyBpbmxpbmUgV2ViS2l0OjpGaW5kT3B0aW9ucyB0b0ZpbmRPcHRpb25zKF9X S0ZpbmRPcHRpb25zIHdrRmluZE9wdGlvbnMpCiB7CiAgICAgX21pbmltdW1MYXlvdXRTaXplT3Zl cnJpZGVGb3JNaW5pbWFsVUkgPSBzaXplOwogICAgIGlmICghX2lzQW5pbWF0aW5nUmVzaXplKQot ICAgICAgICBfcGFnZS0+c2V0TWluaW11bUxheW91dFNpemVGb3JNaW5pbWFsVUkoV2ViQ29yZTo6 SW50U2l6ZShDR0NlaWxpbmcoc2l6ZS53aWR0aCksIENHQ2VpbGluZyhzaXplLmhlaWdodCkpKTsK KyAgICAgICAgX3BhZ2UtPnNldE1pbmltdW1MYXlvdXRTaXplRm9yTWluaW1hbFVJKFdlYkNvcmU6 OkZsb2F0U2l6ZShzaXplKSk7CiB9CiAKIC0gKFVJRWRnZUluc2V0cylfb2JzY3VyZWRJbnNldHMK QEAgLTEzOTMsNyArMTM5Myw3IEBAIHN0YXRpYyBpbmxpbmUgV2ViS2l0OjpGaW5kT3B0aW9ucyB0 b0ZpbmRPcHRpb25zKF9XS0ZpbmRPcHRpb25zIHdrRmluZE9wdGlvbnMpCiAgICAgQ0dSZWN0IHVu b2JzY3VyZWRSZWN0ID0gVUlFZGdlSW5zZXRzSW5zZXRSZWN0KG5ld0JvdW5kcywgX29ic2N1cmVk SW5zZXRzKTsKICAgICBDR1JlY3QgdW5vYnNjdXJlZFJlY3RJbkNvbnRlbnRDb29yZGluYXRlcyA9 IFtzZWxmIGNvbnZlcnRSZWN0OnVub2JzY3VyZWRSZWN0IHRvVmlldzpfY29udGVudFZpZXcuZ2V0 KCldOwogCi0gICAgX3BhZ2UtPmR5bmFtaWNWaWV3cG9ydFNpemVVcGRhdGUoV2ViQ29yZTo6SW50 U2l6ZShDR0NlaWxpbmcobmV3TWluaW11bUxheW91dFNpemUud2lkdGgpLCBDR0NlaWxpbmcobmV3 TWluaW11bUxheW91dFNpemUuaGVpZ2h0KSksIHZpc2libGVSZWN0SW5Db250ZW50Q29vcmRpbmF0 ZXMsIHVub2JzY3VyZWRSZWN0SW5Db250ZW50Q29vcmRpbmF0ZXMsIHRhcmdldFNjYWxlKTsKKyAg ICBfcGFnZS0+ZHluYW1pY1ZpZXdwb3J0U2l6ZVVwZGF0ZShXZWJDb3JlOjpGbG9hdFNpemUobmV3 TWluaW11bUxheW91dFNpemUud2lkdGgsIG5ld01pbmltdW1MYXlvdXRTaXplLmhlaWdodCksIHZp c2libGVSZWN0SW5Db250ZW50Q29vcmRpbmF0ZXMsIHVub2JzY3VyZWRSZWN0SW5Db250ZW50Q29v cmRpbmF0ZXMsIHRhcmdldFNjYWxlKTsKIH0KIAogLSAodm9pZClfZW5kQW5pbWF0ZWRSZXNpemUK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaCBiL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAppbmRleCBmZDk2N2E4MmY1ZDJk NTBjZGZhMTVlZTI0YzhiNjI3MmJhMGNkMTc0Li41NWQ0YTA1N2I0ZTliM2M0ODBjZDk5YTU3YWIw ZmFjNTYyM2E4YjcxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFn ZVByb3h5LmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCkBA IC01NzYsMTAgKzU3NiwxMCBAQCBwdWJsaWM6CiAgICAgdWludDY0X3QgbmV4dFZpc2libGVDb250 ZW50UmVjdFVwZGF0ZUlEKCkgY29uc3QgeyByZXR1cm4gbV9sYXN0VmlzaWJsZUNvbnRlbnRSZWN0 VXBkYXRlLnVwZGF0ZUlEKCkgKyAxOyB9CiAgICAgdWludDY0X3QgbGFzdFZpc2libGVDb250ZW50 UmVjdFVwZGF0ZUlEKCkgY29uc3QgeyByZXR1cm4gbV9sYXN0VmlzaWJsZUNvbnRlbnRSZWN0VXBk YXRlLnVwZGF0ZUlEKCk7IH0KIAotICAgIHZvaWQgZHluYW1pY1ZpZXdwb3J0U2l6ZVVwZGF0ZShj b25zdCBXZWJDb3JlOjpJbnRTaXplJiBtaW5pbXVtTGF5b3V0U2l6ZSwgY29uc3QgV2ViQ29yZTo6 RmxvYXRSZWN0JiB0YXJnZXRFeHBvc2VkQ29udGVudFJlY3QsIGNvbnN0IFdlYkNvcmU6OkZsb2F0 UmVjdCYgdGFyZ2V0VW5vYnNjdXJlZFJlY3QsIGRvdWJsZSB0YXJnZXRTY2FsZSk7CisgICAgdm9p ZCBkeW5hbWljVmlld3BvcnRTaXplVXBkYXRlKGNvbnN0IFdlYkNvcmU6OkZsb2F0U2l6ZSYgbWlu aW11bUxheW91dFNpemUsIGNvbnN0IFdlYkNvcmU6OkZsb2F0UmVjdCYgdGFyZ2V0RXhwb3NlZENv bnRlbnRSZWN0LCBjb25zdCBXZWJDb3JlOjpGbG9hdFJlY3QmIHRhcmdldFVub2JzY3VyZWRSZWN0 LCBkb3VibGUgdGFyZ2V0U2NhbGUpOwogICAgIAotICAgIHZvaWQgc2V0Vmlld3BvcnRDb25maWd1 cmF0aW9uTWluaW11bUxheW91dFNpemUoY29uc3QgV2ViQ29yZTo6SW50U2l6ZSYpOwotICAgIHZv aWQgc2V0TWluaW11bUxheW91dFNpemVGb3JNaW5pbWFsVUkoY29uc3QgV2ViQ29yZTo6SW50U2l6 ZSYpOworICAgIHZvaWQgc2V0Vmlld3BvcnRDb25maWd1cmF0aW9uTWluaW11bUxheW91dFNpemUo Y29uc3QgV2ViQ29yZTo6RmxvYXRTaXplJik7CisgICAgdm9pZCBzZXRNaW5pbXVtTGF5b3V0U2l6 ZUZvck1pbmltYWxVSShjb25zdCBXZWJDb3JlOjpGbG9hdFNpemUmKTsKICAgICB2b2lkIGRpZENv bW1pdExheWVyVHJlZShjb25zdCBXZWJLaXQ6OlJlbW90ZUxheWVyVHJlZVRyYW5zYWN0aW9uJik7 CiAKICAgICB2b2lkIHNlbGVjdFdpdGhHZXN0dXJlKGNvbnN0IFdlYkNvcmU6OkludFBvaW50LCBX ZWJDb3JlOjpUZXh0R3JhbnVsYXJpdHksIHVpbnQzMl90IGdlc3R1cmVUeXBlLCB1aW50MzJfdCBn ZXN0dXJlU3RhdGUsIFBhc3NSZWZQdHI8R2VzdHVyZUNhbGxiYWNrPik7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvaW9zL1dlYlBhZ2VQcm94eUlPUy5tbSBiL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9pb3MvV2ViUGFnZVByb3h5SU9TLm1tCmluZGV4IDJlNDgyYzU1YzA2 MTIzNGVjMzMxZTNkMzdlNjRmNDM1YzBhOGRjYzYuLmNlNzE0YjI2NjQ2YWY1ZWJhOTkzYmQxNWJk MzFlZTZmOTY1NDk4NmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9pb3Mv V2ViUGFnZVByb3h5SU9TLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9pb3MvV2Vi UGFnZVByb3h5SU9TLm1tCkBAIC0xODgsMTcgKzE4OCwxNyBAQCBib29sIFdlYlBhZ2VQcm94eTo6 dXBkYXRlVmlzaWJsZUNvbnRlbnRSZWN0cyhjb25zdCBWaXNpYmxlQ29udGVudFJlY3RVcGRhdGVJ bmZvJgogICAgIHJldHVybiB0cnVlOwogfQogCi12b2lkIFdlYlBhZ2VQcm94eTo6ZHluYW1pY1Zp ZXdwb3J0U2l6ZVVwZGF0ZShjb25zdCBJbnRTaXplJiBtaW5pbXVtTGF5b3V0U2l6ZSwgY29uc3Qg RmxvYXRSZWN0JiB0YXJnZXRFeHBvc2VkQ29udGVudFJlY3QsIGNvbnN0IEZsb2F0UmVjdCYgdGFy Z2V0VW5vYnNjdXJlZFJlY3QsIGRvdWJsZSB0YXJnZXRTY2FsZSkKK3ZvaWQgV2ViUGFnZVByb3h5 OjpkeW5hbWljVmlld3BvcnRTaXplVXBkYXRlKGNvbnN0IEZsb2F0U2l6ZSYgbWluaW11bUxheW91 dFNpemUsIGNvbnN0IEZsb2F0UmVjdCYgdGFyZ2V0RXhwb3NlZENvbnRlbnRSZWN0LCBjb25zdCBG bG9hdFJlY3QmIHRhcmdldFVub2JzY3VyZWRSZWN0LCBkb3VibGUgdGFyZ2V0U2NhbGUpCiB7CiAg ICAgbV9wcm9jZXNzLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpEeW5hbWljVmlld3BvcnRTaXpl VXBkYXRlKG1pbmltdW1MYXlvdXRTaXplLCB0YXJnZXRFeHBvc2VkQ29udGVudFJlY3QsIHRhcmdl dFVub2JzY3VyZWRSZWN0LCB0YXJnZXRTY2FsZSksIG1fcGFnZUlEKTsKIH0KIAotdm9pZCBXZWJQ YWdlUHJveHk6OnNldFZpZXdwb3J0Q29uZmlndXJhdGlvbk1pbmltdW1MYXlvdXRTaXplKGNvbnN0 IFdlYkNvcmU6OkludFNpemUmIHNpemUpCit2b2lkIFdlYlBhZ2VQcm94eTo6c2V0Vmlld3BvcnRD b25maWd1cmF0aW9uTWluaW11bUxheW91dFNpemUoY29uc3QgV2ViQ29yZTo6RmxvYXRTaXplJiBz aXplKQogewogICAgIG1fcHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6U2V0Vmlld3Bv cnRDb25maWd1cmF0aW9uTWluaW11bUxheW91dFNpemUoc2l6ZSksIG1fcGFnZUlEKTsKIH0KIAot dm9pZCBXZWJQYWdlUHJveHk6OnNldE1pbmltdW1MYXlvdXRTaXplRm9yTWluaW1hbFVJKGNvbnN0 IFdlYkNvcmU6OkludFNpemUmIHNpemUpCit2b2lkIFdlYlBhZ2VQcm94eTo6c2V0TWluaW11bUxh eW91dFNpemVGb3JNaW5pbWFsVUkoY29uc3QgV2ViQ29yZTo6RmxvYXRTaXplJiBzaXplKQogewog ICAgIG1fcHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6U2V0TWluaW11bUxheW91dFNp emVGb3JNaW5pbWFsVUkoc2l6ZSksIG1fcGFnZUlEKTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1dl YlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcAppbmRleCBhODk0ZGFjM2Q0MzZkOTc2MzNmYjU2 NWNkZmY0MGQ2NTM0OWE1NjFlLi4xYmUxM2Y4MTgxN2MzN2QwM2UwMTQ5ZGI3NDgyZGQ1YzVhZTFi MmRhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFn ZS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3Bw CkBAIC00MjYzLDcgKzQyNjMsNyBAQCB2b2lkIFdlYlBhZ2U6OmRpZENvbW1pdExvYWQoV2ViRnJh bWUqIGZyYW1lKQogICAgICAgICBtX3ZpZXdwb3J0Q29uZmlndXJhdGlvbi5zZXREZWZhdWx0Q29u ZmlndXJhdGlvbihWaWV3cG9ydENvbmZpZ3VyYXRpb246OndlYnBhZ2VQYXJhbWV0ZXJzKCkpOwog CiAgICAgbV92aWV3cG9ydENvbmZpZ3VyYXRpb24uc2V0Vmlld3BvcnRBcmd1bWVudHMoVmlld3Bv cnRBcmd1bWVudHMoKSk7Ci0gICAgbV92aWV3cG9ydENvbmZpZ3VyYXRpb24uc2V0Q29udGVudHNT aXplKG1fdmlld3BvcnRDb25maWd1cmF0aW9uLm1pbmltdW1MYXlvdXRTaXplKCkpOworICAgIG1f dmlld3BvcnRDb25maWd1cmF0aW9uLnNldENvbnRlbnRzU2l6ZShJbnRTaXplKCkpOwogICAgIHZp ZXdwb3J0Q29uZmlndXJhdGlvbkNoYW5nZWQoKTsKICNlbmRpZgogCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oIGIvU291cmNlL1dlYktpdDIv V2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaAppbmRleCA5OWY5ZWI1ZTNkYTIwZjYxOGM4MDk5 YTkzYmZkYzQ4NTViYWQxZmE4Li4yMzJiYjMwNzY0ZWMzZWY5MzNlNTQ1MTUxZjBjMDljMWNmM2Zk OTgzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFn ZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmgKQEAg LTY5NSw5ICs2OTUsOSBAQCBwdWJsaWM6CiAgICAgdm9pZCB1cGRhdGVWaXNpYmlsaXR5U3RhdGUo Ym9vbCBpc0luaXRpYWxTdGF0ZSA9IGZhbHNlKTsKIAogI2lmIFBMQVRGT1JNKElPUykKLSAgICB2 b2lkIHNldFZpZXdwb3J0Q29uZmlndXJhdGlvbk1pbmltdW1MYXlvdXRTaXplKGNvbnN0IFdlYkNv cmU6OkludFNpemUmKTsKLSAgICB2b2lkIHNldE1pbmltdW1MYXlvdXRTaXplRm9yTWluaW1hbFVJ KGNvbnN0IFdlYkNvcmU6OkludFNpemUmKTsKLSAgICB2b2lkIGR5bmFtaWNWaWV3cG9ydFNpemVV cGRhdGUoY29uc3QgV2ViQ29yZTo6SW50U2l6ZSYgbWluaW11bUxheW91dFNpemUsIGNvbnN0IFdl YkNvcmU6OkZsb2F0UmVjdCYgdGFyZ2V0RXhwb3NlZENvbnRlbnRSZWN0LCBjb25zdCBXZWJDb3Jl OjpGbG9hdFJlY3QmIHRhcmdldFVub2JzY3VyZWRSZWN0LCBkb3VibGUgc2NhbGUpOworICAgIHZv aWQgc2V0Vmlld3BvcnRDb25maWd1cmF0aW9uTWluaW11bUxheW91dFNpemUoY29uc3QgV2ViQ29y ZTo6RmxvYXRTaXplJik7CisgICAgdm9pZCBzZXRNaW5pbXVtTGF5b3V0U2l6ZUZvck1pbmltYWxV SShjb25zdCBXZWJDb3JlOjpGbG9hdFNpemUmKTsKKyAgICB2b2lkIGR5bmFtaWNWaWV3cG9ydFNp emVVcGRhdGUoY29uc3QgV2ViQ29yZTo6RmxvYXRTaXplJiBtaW5pbXVtTGF5b3V0U2l6ZSwgY29u c3QgV2ViQ29yZTo6RmxvYXRSZWN0JiB0YXJnZXRFeHBvc2VkQ29udGVudFJlY3QsIGNvbnN0IFdl YkNvcmU6OkZsb2F0UmVjdCYgdGFyZ2V0VW5vYnNjdXJlZFJlY3QsIGRvdWJsZSBzY2FsZSk7CiAg ICAgdm9pZCB2aWV3cG9ydENvbmZpZ3VyYXRpb25DaGFuZ2VkKCk7CiAgICAgdm9pZCB1cGRhdGVW aXNpYmxlQ29udGVudFJlY3RzKGNvbnN0IFZpc2libGVDb250ZW50UmVjdFVwZGF0ZUluZm8mKTsK ICAgICBib29sIHNjYWxlV2FzU2V0QnlVSVByb2Nlc3MoKSBjb25zdCB7IHJldHVybiBtX3NjYWxl V2FzU2V0QnlVSVByb2Nlc3M7IH0KQEAgLTExNjUsNyArMTE2NSw3IEBAIHByaXZhdGU6CiAgICAg V2ViQ29yZTo6RmxvYXRTaXplIG1fc2NyZWVuU2l6ZTsKICAgICBXZWJDb3JlOjpGbG9hdFNpemUg bV9hdmFpbGFibGVTY3JlZW5TaXplOwogICAgIFdlYkNvcmU6OkludFNpemUgbV9ibG9ja1NlbGVj dGlvbkRlc2lyZWRTaXplOwotICAgIFdlYkNvcmU6OkludFNpemUgbV9taW5pbXVtTGF5b3V0U2l6 ZUZvck1pbmltYWxVSTsKKyAgICBXZWJDb3JlOjpGbG9hdFNpemUgbV9taW5pbXVtTGF5b3V0U2l6 ZUZvck1pbmltYWxVSTsKICAgICBib29sIG1faW5EeW5hbWljU2l6ZVVwZGF0ZTsKICAgICBIYXNo TWFwPHN0ZDo6cGFpcjxXZWJDb3JlOjpJbnRTaXplLCBkb3VibGU+LCBXZWJDb3JlOjpJbnRQb2lu dD4gbV9keW5hbWljU2l6ZVVwZGF0ZUhpc3Rvcnk7CiAjZW5kaWYKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLm1lc3NhZ2VzLmluIGIvU291cmNl L1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UubWVzc2FnZXMuaW4KaW5kZXggMjg2 NmUwYWNkNGQ4NmIyN2Q5ZTg5MDZkZWYwYmE2YjFhYTRmMTgzYS4uZGQzNGE2ODRkYmJhZjI1YTNm NTc4YzFlZTRjMWMyNjI1MzY3NWM3YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJv Y2Vzcy9XZWJQYWdlL1dlYlBhZ2UubWVzc2FnZXMuaW4KKysrIGIvU291cmNlL1dlYktpdDIvV2Vi UHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UubWVzc2FnZXMuaW4KQEAgLTQzLDkgKzQzLDkgQEAgbWVz c2FnZXMgLT4gV2ViUGFnZSBMZWdhY3lSZWNlaXZlciB7CiAgICAgTW91c2VFdmVudFN5bmNGb3JU ZXN0aW5nKFdlYktpdDo6V2ViTW91c2VFdmVudCBldmVudCkgLT4gKGJvb2wgaGFuZGxlZCkKICAg ICBXaGVlbEV2ZW50U3luY0ZvclRlc3RpbmcoV2ViS2l0OjpXZWJXaGVlbEV2ZW50IGV2ZW50KSAt PiAoYm9vbCBoYW5kbGVkKQogI2lmIFBMQVRGT1JNKElPUykKLSAgICBTZXRWaWV3cG9ydENvbmZp Z3VyYXRpb25NaW5pbXVtTGF5b3V0U2l6ZShXZWJDb3JlOjpJbnRTaXplIHNpemUpCi0gICAgU2V0 TWluaW11bUxheW91dFNpemVGb3JNaW5pbWFsVUkoV2ViQ29yZTo6SW50U2l6ZSBzaXplKQotICAg IER5bmFtaWNWaWV3cG9ydFNpemVVcGRhdGUoV2ViQ29yZTo6SW50U2l6ZSBtaW5pbXVtTGF5b3V0 U2l6ZSwgV2ViQ29yZTo6RmxvYXRSZWN0IHRhcmdldEV4cG9zZWRDb250ZW50UmVjdCwgV2ViQ29y ZTo6RmxvYXRSZWN0IHRhcmdldFVub2JzY3VyZWRSZWN0LCBkb3VibGUgc2NhbGUpCisgICAgU2V0 Vmlld3BvcnRDb25maWd1cmF0aW9uTWluaW11bUxheW91dFNpemUoV2ViQ29yZTo6RmxvYXRTaXpl IHNpemUpCisgICAgU2V0TWluaW11bUxheW91dFNpemVGb3JNaW5pbWFsVUkoV2ViQ29yZTo6Rmxv YXRTaXplIHNpemUpCisgICAgRHluYW1pY1ZpZXdwb3J0U2l6ZVVwZGF0ZShXZWJDb3JlOjpGbG9h dFNpemUgbWluaW11bUxheW91dFNpemUsIFdlYkNvcmU6OkZsb2F0UmVjdCB0YXJnZXRFeHBvc2Vk Q29udGVudFJlY3QsIFdlYkNvcmU6OkZsb2F0UmVjdCB0YXJnZXRVbm9ic2N1cmVkUmVjdCwgZG91 YmxlIHNjYWxlKQogCiAgICAgSGFuZGxlVGFwKFdlYkNvcmU6OkludFBvaW50IHBvaW50KQogICAg IFRhcEhpZ2hsaWdodEF0UG9zaXRpb24odWludDY0X3QgcmVxdWVzdElELCBXZWJDb3JlOjpGbG9h dFBvaW50IHBvaW50KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQ YWdlL2lvcy9XZWJQYWdlSU9TLm1tIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdl L2lvcy9XZWJQYWdlSU9TLm1tCmluZGV4IDE5YTViNmZkM2RiNGExNzk2Mzc5M2YyNDE5NzdjNDhk OGJhNzlmYzkuLjljZjI5OTU2ZTEyM2UwNzliMGI4NDhiNGQ1MmNhYmE5YjBjNDkxYWQgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9pb3MvV2ViUGFnZUlPUy5t bQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvaW9zL1dlYlBhZ2VJT1Mu bW0KQEAgLTE3NTksMTkgKzE3NTksMTkgQEAgdm9pZCBXZWJQYWdlOjplbGVtZW50RGlkQmx1cihX ZWJDb3JlOjpOb2RlKiBub2RlKQogICAgIH0KIH0KIAotdm9pZCBXZWJQYWdlOjpzZXRWaWV3cG9y dENvbmZpZ3VyYXRpb25NaW5pbXVtTGF5b3V0U2l6ZShjb25zdCBJbnRTaXplJiBzaXplKQordm9p ZCBXZWJQYWdlOjpzZXRWaWV3cG9ydENvbmZpZ3VyYXRpb25NaW5pbXVtTGF5b3V0U2l6ZShjb25z dCBGbG9hdFNpemUmIHNpemUpCiB7CiAgICAgbV92aWV3cG9ydENvbmZpZ3VyYXRpb24uc2V0TWlu aW11bUxheW91dFNpemUoc2l6ZSk7CiAgICAgdmlld3BvcnRDb25maWd1cmF0aW9uQ2hhbmdlZCgp OwogfQogCi12b2lkIFdlYlBhZ2U6OnNldE1pbmltdW1MYXlvdXRTaXplRm9yTWluaW1hbFVJKGNv bnN0IEludFNpemUmIHNpemUpCit2b2lkIFdlYlBhZ2U6OnNldE1pbmltdW1MYXlvdXRTaXplRm9y TWluaW1hbFVJKGNvbnN0IEZsb2F0U2l6ZSYgc2l6ZSkKIHsKICAgICBtX21pbmltdW1MYXlvdXRT aXplRm9yTWluaW1hbFVJID0gc2l6ZTsKICAgICB2aWV3cG9ydENvbmZpZ3VyYXRpb25DaGFuZ2Vk KCk7CiB9CiAKLXZvaWQgV2ViUGFnZTo6ZHluYW1pY1ZpZXdwb3J0U2l6ZVVwZGF0ZShjb25zdCBJ bnRTaXplJiBtaW5pbXVtTGF5b3V0U2l6ZSwgY29uc3QgRmxvYXRSZWN0JiB0YXJnZXRFeHBvc2Vk Q29udGVudFJlY3QsIGNvbnN0IEZsb2F0UmVjdCYgdGFyZ2V0VW5vYnNjdXJlZFJlY3QsIGRvdWJs ZSB0YXJnZXRTY2FsZSkKK3ZvaWQgV2ViUGFnZTo6ZHluYW1pY1ZpZXdwb3J0U2l6ZVVwZGF0ZShj b25zdCBGbG9hdFNpemUmIG1pbmltdW1MYXlvdXRTaXplLCBjb25zdCBGbG9hdFJlY3QmIHRhcmdl dEV4cG9zZWRDb250ZW50UmVjdCwgY29uc3QgRmxvYXRSZWN0JiB0YXJnZXRVbm9ic2N1cmVkUmVj dCwgZG91YmxlIHRhcmdldFNjYWxlKQogewogICAgIFRlbXBvcmFyeUNoYW5nZTxib29sPiBkeW5h bWljU2l6ZVVwZGF0ZUd1YXJkKG1faW5EeW5hbWljU2l6ZVVwZGF0ZSwgdHJ1ZSk7CiAgICAgLy8g RklYTUU6IHRoaXMgZG9lcyBub3QgaGFuZGxlIHRoZSBjYXNlcyB3aGVyZSB0aGUgY29udGVudCB3 b3VsZCBjaGFuZ2UgdGhlIGNvbnRlbnQgc2l6ZSBvciBzY3JvbGwgcG9zaXRpb24gZnJvbSBKYXZh U2NyaXB0LgpAQCAtMTkzMCwxOCArMTkzMCwxOCBAQCB2b2lkIFdlYlBhZ2U6OnZpZXdwb3J0Q29u ZmlndXJhdGlvbkNoYW5nZWQoKQogICAgIGVsc2UKICAgICAgICAgc2NhbGUgPSBpbml0aWFsU2Nh bGU7CiAKLSAgICBtX3BhZ2UtPnNldFpvb21lZE91dFBhZ2VTY2FsZUZhY3Rvcihpbml0aWFsU2Nh bGUpOwotICAgIAorICAgIG1fcGFnZS0+c2V0Wm9vbWVkT3V0UGFnZVNjYWxlRmFjdG9yKG1fdmll d3BvcnRDb25maWd1cmF0aW9uLm1pbmltdW1TY2FsZSgpKTsKKwogICAgIEZyYW1lVmlldyYgZnJh bWVWaWV3ID0gKm1haW5GcmFtZVZpZXcoKTsKLSAgICBJbnRTaXplIHZpZXdwb3J0U2l6ZSA9ICFt X21pbmltdW1MYXlvdXRTaXplRm9yTWluaW1hbFVJLmlzRW1wdHkoKSA/IG1fbWluaW11bUxheW91 dFNpemVGb3JNaW5pbWFsVUkgOiBtX3ZpZXdwb3J0Q29uZmlndXJhdGlvbi5taW5pbXVtTGF5b3V0 U2l6ZSgpOworICAgIEZsb2F0U2l6ZSB2aWV3cG9ydFNpemUgPSAhbV9taW5pbXVtTGF5b3V0U2l6 ZUZvck1pbmltYWxVSS5pc0VtcHR5KCkgPyBtX21pbmltdW1MYXlvdXRTaXplRm9yTWluaW1hbFVJ IDogbV92aWV3cG9ydENvbmZpZ3VyYXRpb24ubWluaW11bUxheW91dFNpemUoKTsKICAgICB2aWV3 cG9ydFNpemUuc2NhbGUoMSAvIGluaXRpYWxTY2FsZSk7Ci0gICAgZnJhbWVWaWV3LnNldFZpZXdw b3J0U2l6ZSh2aWV3cG9ydFNpemUpOworICAgIGZyYW1lVmlldy5zZXRWaWV3cG9ydFNpemUocm91 bmRlZEludFNpemUodmlld3BvcnRTaXplKSk7CiAgICAgCiAgICAgSW50UG9pbnQgc2Nyb2xsUG9z aXRpb24gPSBmcmFtZVZpZXcuc2Nyb2xsUG9zaXRpb24oKTsKICAgICBpZiAoIW1faGFzUmVjZWl2 ZWRWaXNpYmxlQ29udGVudFJlY3RzQWZ0ZXJEaWRDb21taXRMb2FkKSB7Ci0gICAgICAgIEludFNp emUgbWluaW11bUxheW91dFNpemVJbkRvY3VtZW50Q29vcmRpbmF0ZSA9IG1fdmlld3BvcnRDb25m aWd1cmF0aW9uLm1pbmltdW1MYXlvdXRTaXplKCk7Ci0gICAgICAgIG1pbmltdW1MYXlvdXRTaXpl SW5Eb2N1bWVudENvb3JkaW5hdGUuc2NhbGUoc2NhbGUpOwotCisgICAgICAgIEZsb2F0U2l6ZSBt aW5pbXVtTGF5b3V0U2l6ZUluU2Nyb2xsVmlld0Nvb3JkaW5hdGVzID0gbV92aWV3cG9ydENvbmZp Z3VyYXRpb24ubWluaW11bUxheW91dFNpemUoKTsKKyAgICAgICAgbWluaW11bUxheW91dFNpemVJ blNjcm9sbFZpZXdDb29yZGluYXRlcy5zY2FsZSgxIC8gc2NhbGUpOworICAgICAgICBJbnRTaXpl IG1pbmltdW1MYXlvdXRTaXplSW5Eb2N1bWVudENvb3JkaW5hdGUgPSByb3VuZGVkSW50U2l6ZSht aW5pbXVtTGF5b3V0U2l6ZUluU2Nyb2xsVmlld0Nvb3JkaW5hdGVzKTsKICAgICAgICAgSW50UmVj dCB1bm9ic2N1cmVkQ29udGVudFJlY3Qoc2Nyb2xsUG9zaXRpb24sIG1pbmltdW1MYXlvdXRTaXpl SW5Eb2N1bWVudENvb3JkaW5hdGUpOwogICAgICAgICBmcmFtZVZpZXcuc2V0VW5vYnNjdXJlZENv bnRlbnRSZWN0KHVub2JzY3VyZWRDb250ZW50UmVjdCk7CiAgICAgICAgIGZyYW1lVmlldy5zZXRT Y3JvbGxWZWxvY2l0eSgwLCAwLCAwLCBtb25vdG9uaWNhbGx5SW5jcmVhc2luZ1RpbWUoKSk7Cg==