180313 2017-12-02 10:42:47 -0800 Web Automation: add flag to preserve legacy page screenshot behavior 2017-12-04 16:06:30 -0800 1 1 1 Unclassified WebKit WebDriver WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 bburg bburg bburg cgarcia commit-queue joepeck webkit-bug-importer oldest_to_newest 1377320 0 bburg 2017-12-02 10:42:47 -0800 For the legacy protocol supported by safaridriver, people expect a screenshot of the entire contents, not the viewport. And there is no workaround because Element Screenshot is not supported by the driver. Instead, add a legacy behavior flag. This can be removed when safaridriver only needs to support W3C protocol. 1377322 1 bburg 2017-12-02 10:43:11 -0800 <rdar://problem/34379930> 1377878 2 328385 bburg 2017-12-04 13:45:07 -0800 Created attachment 328385 Patch 1377880 3 328385 joepeck 2017-12-04 13:48:15 -0800 Comment on attachment 328385 Patch r=me 1377973 4 328385 commit-queue 2017-12-04 16:06:28 -0800 Comment on attachment 328385 Patch Clearing flags on attachment: 328385 Committed r225501: <https://trac.webkit.org/changeset/225501> 1377974 5 commit-queue 2017-12-04 16:06:30 -0800 All reviewed patches have been landed. Closing bug. 328385 2017-12-04 13:45:07 -0800 2017-12-04 16:06:28 -0800 Patch bug-180313-20171204134506.patch text/plain 14224 bburg U3VidmVyc2lvbiBSZXZpc2lvbjogMjI1NDg1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViRHJpdmVy L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJEcml2ZXIvQ2hhbmdlTG9nCmluZGV4IDY2MWMwOGE4ZGQw MWFjNTdjNWI0OTBmMDg0MzE1ZDI5YzJmNThlYzkuLjE5MDdiYjM3MzhjZmM0ODhkNDkwMTM3Mjgw NjZjNmVkYjRmMTQ2MmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJEcml2ZXIvQ2hhbmdlTG9nCisr KyBiL1NvdXJjZS9XZWJEcml2ZXIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTctMTIt MDQgIEJyaWFuIEJ1cmcgIDxiYnVyZ0BhcHBsZS5jb20+CisKKyAgICAgICAgV2ViIEF1dG9tYXRp b246IGFkZCBmbGFnIHRvIHByZXNlcnZlIGxlZ2FjeSBwYWdlIHNjcmVlbnNob3QgYmVoYXZpb3IK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4MDMxMwor ICAgICAgICA8cmRhcjovL3Byb2JsZW0vMzQzNzk5MzA+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgU2V0IHRoZSBjbGlwVG9WaWV3cG9ydCBmbGFnIHRv IHRydWUgd2hlbiBzZW5kaW5nIEF1dG9tYXRpb24udGFrZVNjcmVlbnNob3QuCisgICAgICAgIFRo aXMgcHJlc2VydmVzIHRoZSBjdXJyZW50IGJlaGF2aW9yIGZvciB0aGlzIGRyaXZlciBpbXBsZW1l bnRhdGlvbi4KKworICAgICAgICAqIFNlc3Npb24uY3BwOgorICAgICAgICAoV2ViRHJpdmVyOjpT ZXNzaW9uOjp0YWtlU2NyZWVuc2hvdCk6CisKIDIwMTctMTItMDQgIENhcmxvcyBHYXJjaWEgQ2Ft cG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgogCiAgICAgICAgIFdlYkRyaXZlcjogaW1wbGVtZW50 IGVsZW1lbnQgcHJvcGVydHkgY29tbWFuZApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9DaGFu Z2VMb2cgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwppbmRleCAzZDg1MzMxNDE0OTMyZWU1MDk4 MDcyMmI3OTZlMjRmOWRmNDhhMTI2Li5jMGVhMjE1YThmYjk3MzRlMTc5MmE3NWQxOTliMjU2MzU3 Y2QxZTYwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZworKysgYi9Tb3VyY2Uv V2ViS2l0L0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDE3LTEyLTA0ICBCcmlhbiBCdXJn ICA8YmJ1cmdAYXBwbGUuY29tPgorCisgICAgICAgIFdlYiBBdXRvbWF0aW9uOiBhZGQgZmxhZyB0 byBwcmVzZXJ2ZSBsZWdhY3kgcGFnZSBzY3JlZW5zaG90IGJlaGF2aW9yCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODAzMTMKKyAgICAgICAgPHJkYXI6 Ly9wcm9ibGVtLzM0Mzc5OTMwPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIEZvciBjb21wYXRpYmlsaXR5IHdpdGggSlNPTiBXaXJlIFByb3RvY29sIGlt cGxlbWVudGVkIGJ5IFNhZmFyaSwKKyAgICAgICAgd2UgbmVlZCB0byByZXRhaW4gdGhlIGFiaWxp dHkgdG8gcGVyZm9ybSB3aG9sZSBwYWdlIGNvbnRlbnRzCisgICAgICAgIHNuYXBzaG90cyB1c2lu ZyBBdXRvbWF0aW9uLnRha2VTY3JlZW5zaG90LiBBZGQgYW4gZXh0cmEgZmxhZywKKyAgICAgICAg Y2xpcFRvVmlld3BvcnQsIHdoaWNoIGNhbiBiZSB1c2VkIGJ5IFczQy1jb25mb3JtaW5nIGRyaXZl cnMuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQXV0b21hdGlvbi9BdXRvbWF0aW9uLmpzb246IEFk ZCBuZXcgZmxhZy4KKyAgICAgICAgKiBVSVByb2Nlc3MvQXV0b21hdGlvbi9XZWJBdXRvbWF0aW9u U2Vzc2lvbi5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9BdXRvbWF0aW9uL1dlYkF1dG9tYXRpb25T ZXNzaW9uLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViQXV0b21hdGlvblNlc3Npb246OnRha2VT Y3JlZW5zaG90KToKKyAgICAgICAgKiBXZWJQcm9jZXNzL0F1dG9tYXRpb24vV2ViQXV0b21hdGlv blNlc3Npb25Qcm94eS5oOgorICAgICAgICAqIFdlYlByb2Nlc3MvQXV0b21hdGlvbi9XZWJBdXRv bWF0aW9uU2Vzc2lvblByb3h5Lm1lc3NhZ2VzLmluOgorICAgICAgICAqIFdlYlByb2Nlc3MvQXV0 b21hdGlvbi9XZWJBdXRvbWF0aW9uU2Vzc2lvblByb3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6 c25hcHNob3RSZWN0Rm9yU2NyZWVuc2hvdCk6CisgICAgICAgIChXZWJLaXQ6OldlYkF1dG9tYXRp b25TZXNzaW9uUHJveHk6OnRha2VTY3JlZW5zaG90KToKKyAgICAgICAgSWYgdGhlIGZsYWcgaXMg ZmFsc2UsIHRha2UgYSBzY3JlZW5zaG90IG9mIHRoZSB3aG9sZSBwYWdlIGNvbnRlbnRzLgorCiAy MDE3LTExLTMwICBCcmlhbiBCdXJnICA8YmJ1cmdAYXBwbGUuY29tPgogCiAgICAgICAgIFdlYiBJ bnNwZWN0b3I6IG1vdmUgSW5zcGVjdG9yOjpQcm90b2NvbDo6QXJyYXk8VD4gdG8gSlNPTiBuYW1l c3BhY2UKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJEcml2ZXIvU2Vzc2lvbi5jcHAgYi9Tb3VyY2Uv V2ViRHJpdmVyL1Nlc3Npb24uY3BwCmluZGV4IDk4NzMzZjc1YTE0OWFmNmViYzZkMDkyNGRmYjk2 OGZmYjVkZTY4ZmYuLjU0YjQ3MmU2NmYwODc5ODlkNzA2NGU5ZTFmYTk5YWFhZTNlMGFiMDUgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJEcml2ZXIvU2Vzc2lvbi5jcHAKKysrIGIvU291cmNlL1dlYkRy aXZlci9TZXNzaW9uLmNwcApAQCAtMjEyMyw2ICsyMTIzLDggQEAgdm9pZCBTZXNzaW9uOjp0YWtl U2NyZWVuc2hvdChzdGQ6Om9wdGlvbmFsPFN0cmluZz4gZWxlbWVudElELCBzdGQ6Om9wdGlvbmFs PGJvb2wKICAgICAgICAgICAgIHBhcmFtZXRlcnMtPnNldFN0cmluZyhBU0NJSUxpdGVyYWwoImZy YW1lSGFuZGxlIiksIG1fY3VycmVudEJyb3dzaW5nQ29udGV4dC52YWx1ZSgpKTsKICAgICAgICAg aWYgKGVsZW1lbnRJRCkKICAgICAgICAgICAgIHBhcmFtZXRlcnMtPnNldFN0cmluZyhBU0NJSUxp dGVyYWwoIm5vZGVIYW5kbGUiKSwgZWxlbWVudElELnZhbHVlKCkpOworICAgICAgICBlbHNlCisg ICAgICAgICAgICBwYXJhbWV0ZXJzLT5zZXRCb29sZWFuKEFTQ0lJTGl0ZXJhbCgiY2xpcFRvVmll d3BvcnQiKSwgdHJ1ZSk7CiAgICAgICAgIGlmIChzY3JvbGxJbnRvVmlldy52YWx1ZV9vcihmYWxz ZSkpCiAgICAgICAgICAgICBwYXJhbWV0ZXJzLT5zZXRCb29sZWFuKEFTQ0lJTGl0ZXJhbCgic2Ny b2xsSW50b1ZpZXdJZk5lZWRlZCIpLCB0cnVlKTsKICAgICAgICAgbV9ob3N0LT5zZW5kQ29tbWFu ZFRvQmFja2VuZChBU0NJSUxpdGVyYWwoInRha2VTY3JlZW5zaG90IiksIFdURk1vdmUocGFyYW1l dGVycyksIFt0aGlzLCBwcm90ZWN0ZWRUaGlzID0gbWFrZVJlZigqdGhpcyksIGNvbXBsZXRpb25I YW5kbGVyID0gV1RGTW92ZShjb21wbGV0aW9uSGFuZGxlcildKFNlc3Npb25Ib3N0OjpDb21tYW5k UmVzcG9uc2UmJiByZXNwb25zZSkgbXV0YWJsZSB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9BdXRvbWF0aW9uL0F1dG9tYXRpb24uanNvbiBiL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL0F1dG9tYXRpb24vQXV0b21hdGlvbi5qc29uCmluZGV4IDk0NjdlZjNiM2FiOGMzZGMz MGJhYTA1NmY2ZTUxODdhNmEwOTEwNTMuLjNhODE2NjgxNGE4YmU0NWUzY2M2MjgwMWEwYjhhYzVm M2QxM2VkZTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0F1dG9tYXRpb24v QXV0b21hdGlvbi5qc29uCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0F1dG9tYXRpb24v QXV0b21hdGlvbi5qc29uCkBAIC00MTUsNyArNDE1LDggQEAKICAgICAgICAgICAgICAgICB7ICJu YW1lIjogImhhbmRsZSIsICIkcmVmIjogIkJyb3dzaW5nQ29udGV4dEhhbmRsZSIsICJkZXNjcmlw dGlvbiI6ICJUaGUgaGFuZGxlIGZvciB0aGUgYnJvd3NpbmcgY29udGV4dCB0byB0YWtlIGEgc2Ny ZWVuc2hvdCBvZi4iIH0sCiAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJmcmFtZUhhbmRsZSIs ICIkcmVmIjogIkZyYW1lSGFuZGxlIiwgIm9wdGlvbmFsIjogdHJ1ZSwgImRlc2NyaXB0aW9uIjog IlRoZSBoYW5kbGUgZm9yIHRoZSBmcmFtZSB0aGF0IGNvbnRhaW5zIHRoZSBlbGVtZW50LiBUaGUg bWFpbiBmcmFtZSBpcyB1c2VkIGlmIHRoaXMgcGFyYW1ldGVyIGlzIGVtcHR5IHN0cmluZyBvciBl eGNsdWRlZC4iIH0sCiAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJub2RlSGFuZGxlIiwgIiRy ZWYiOiAiTm9kZUhhbmRsZSIsICJvcHRpb25hbCI6IHRydWUsICJkZXNjcmlwdGlvbiI6ICJUaGUg aGFuZGxlIG9mIHRoZSBlbGVtZW50IHRvIHRha2UgYSBzY3JlZW5zaG90IG9mLiBUaGUgYnJvd3Np bmcgY29udGV4dCBkb2N1bWVudCBlbGVtZW50IGlzIHVzZWQgaWYgdGhpcyBwYXJhbWV0ZXIgaXMg ZXhjbHVkZWQuIiB9LAotICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAic2Nyb2xsSW50b1ZpZXdJ Zk5lZWRlZCIsICJ0eXBlIjogImJvb2xlYW4iLCAib3B0aW9uYWwiOiB0cnVlLCAiZGVzY3JpcHRp b24iOiAiSWYgdGhlIGVsZW1lbnQgc2hvdWxkIGJlIHNjcm9sbGVkIGludG8gdmlldyBiZWZvcmUg dGFraW5nIHRoZSBzY3JlZW5zaG90LiIgfQorICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAic2Ny b2xsSW50b1ZpZXdJZk5lZWRlZCIsICJ0eXBlIjogImJvb2xlYW4iLCAib3B0aW9uYWwiOiB0cnVl LCAiZGVzY3JpcHRpb24iOiAiSWYgdGhlIGVsZW1lbnQgc2hvdWxkIGJlIHNjcm9sbGVkIGludG8g dmlldyBiZWZvcmUgdGFraW5nIHRoZSBzY3JlZW5zaG90LiIgfSwKKyAgICAgICAgICAgICAgICB7 ICJuYW1lIjogImNsaXBUb1ZpZXdwb3J0IiwgInR5cGUiOiAiYm9vbGVhbiIsICJvcHRpb25hbCI6 IHRydWUsICJkZXNjcmlwdGlvbiI6ICJXaGV0aGVyIGEgc2NyZWVuc2hvdCBvZiB0aGUgZW50aXJl IHBhZ2Ugc2hvdWxkIGJlIGNsaXBwZWQgdG8gdGhlIHZpc3VhbCB2aWV3cG9ydC4gQSB2YWx1ZSBv ZiAnZmFsc2UnIHByZXNlcnZlcyBiZWhhdmlvciBmb3IgbGVnYWN5IHByb3RvY29sIHNjcmVlbnNo b3RzLiIgfQogICAgICAgICAgICAgXSwKICAgICAgICAgICAgICJyZXR1cm5zIjogWwogICAgICAg ICAgICAgICAgIHsgIm5hbWUiOiAiZGF0YSIsICJ0eXBlIjogInN0cmluZyIsICJkZXNjcmlwdGlv biI6ICJCYXNlNjQtZW5jb2RlZCBpbWFnZSBkYXRhIChQTkcpLiIgfQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvQXV0b21hdGlvbi9XZWJBdXRvbWF0aW9uU2Vzc2lvbi5jcHAg Yi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BdXRvbWF0aW9uL1dlYkF1dG9tYXRpb25TZXNzaW9u LmNwcAppbmRleCA4OTYxNjhlMDJmMzc3Yzc0NDU4Mjk2YjA4N2QyM2Q3MTFjZjZiNTQ0Li4xYWE0 YTQyYWEyMjcyMTliNzE1N2FmMDliZWU5NTgwYWUyZGQ4OTQxIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9BdXRvbWF0aW9uL1dlYkF1dG9tYXRpb25TZXNzaW9uLmNwcAorKysg Yi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BdXRvbWF0aW9uL1dlYkF1dG9tYXRpb25TZXNzaW9u LmNwcApAQCAtMTQ0OSw3ICsxNDQ5LDcgQEAgdm9pZCBXZWJBdXRvbWF0aW9uU2Vzc2lvbjo6cGVy Zm9ybUtleWJvYXJkSW50ZXJhY3Rpb25zKEVycm9yU3RyaW5nJiBlcnJvclN0cmluZywKICNlbmRp ZiAvLyBQTEFURk9STShDT0NPQSkgfHwgUExBVEZPUk0oR1RLKQogfQogCi12b2lkIFdlYkF1dG9t YXRpb25TZXNzaW9uOjp0YWtlU2NyZWVuc2hvdChFcnJvclN0cmluZyYgZXJyb3JTdHJpbmcsIGNv bnN0IFN0cmluZyYgaGFuZGxlLCBjb25zdCBTdHJpbmcqIG9wdGlvbmFsRnJhbWVIYW5kbGUsIGNv bnN0IFN0cmluZyogb3B0aW9uYWxOb2RlSGFuZGxlLCBjb25zdCBib29sKiBvcHRpb25hbFNjcm9s bEludG9WaWV3SWZOZWVkZWQsIFJlZjxUYWtlU2NyZWVuc2hvdENhbGxiYWNrPiYmIGNhbGxiYWNr KQordm9pZCBXZWJBdXRvbWF0aW9uU2Vzc2lvbjo6dGFrZVNjcmVlbnNob3QoRXJyb3JTdHJpbmcm IGVycm9yU3RyaW5nLCBjb25zdCBTdHJpbmcmIGhhbmRsZSwgY29uc3QgU3RyaW5nKiBvcHRpb25h bEZyYW1lSGFuZGxlLCBjb25zdCBTdHJpbmcqIG9wdGlvbmFsTm9kZUhhbmRsZSwgY29uc3QgYm9v bCogb3B0aW9uYWxTY3JvbGxJbnRvVmlld0lmTmVlZGVkLCBjb25zdCBib29sKiBvcHRpb25hbENs aXBUb1ZpZXdwb3J0LCBSZWY8VGFrZVNjcmVlbnNob3RDYWxsYmFjaz4mJiBjYWxsYmFjaykKIHsK ICAgICBXZWJQYWdlUHJveHkqIHBhZ2UgPSB3ZWJQYWdlUHJveHlGb3JIYW5kbGUoaGFuZGxlKTsK ICAgICBpZiAoIXBhZ2UpCkBAIC0xNDYxLDExICsxNDYxLDEyIEBAIHZvaWQgV2ViQXV0b21hdGlv blNlc3Npb246OnRha2VTY3JlZW5zaG90KEVycm9yU3RyaW5nJiBlcnJvclN0cmluZywgY29uc3Qg U3RyaW5nCiAKICAgICBib29sIHNjcm9sbEludG9WaWV3SWZOZWVkZWQgPSBvcHRpb25hbFNjcm9s bEludG9WaWV3SWZOZWVkZWQgPyAqb3B0aW9uYWxTY3JvbGxJbnRvVmlld0lmTmVlZGVkIDogZmFs c2U7CiAgICAgU3RyaW5nIG5vZGVIYW5kbGUgPSBvcHRpb25hbE5vZGVIYW5kbGUgPyAqb3B0aW9u YWxOb2RlSGFuZGxlIDogZW1wdHlTdHJpbmcoKTsKKyAgICBib29sIGNsaXBUb1ZpZXdwb3J0ID0g b3B0aW9uYWxDbGlwVG9WaWV3cG9ydCA/ICpvcHRpb25hbENsaXBUb1ZpZXdwb3J0IDogZmFsc2U7 CiAKICAgICB1aW50NjRfdCBjYWxsYmFja0lEID0gbV9uZXh0U2NyZWVuc2hvdENhbGxiYWNrSUQr KzsKICAgICBtX3NjcmVlbnNob3RDYWxsYmFja3Muc2V0KGNhbGxiYWNrSUQsIFdURk1vdmUoY2Fs bGJhY2spKTsKIAotICAgIHBhZ2UtPnByb2Nlc3MoKS5zZW5kKE1lc3NhZ2VzOjpXZWJBdXRvbWF0 aW9uU2Vzc2lvblByb3h5OjpUYWtlU2NyZWVuc2hvdChwYWdlLT5wYWdlSUQoKSwgZnJhbWVJRC52 YWx1ZSgpLCBub2RlSGFuZGxlLCBzY3JvbGxJbnRvVmlld0lmTmVlZGVkLCBjYWxsYmFja0lEKSwg MCk7CisgICAgcGFnZS0+cHJvY2VzcygpLnNlbmQoTWVzc2FnZXM6OldlYkF1dG9tYXRpb25TZXNz aW9uUHJveHk6OlRha2VTY3JlZW5zaG90KHBhZ2UtPnBhZ2VJRCgpLCBmcmFtZUlELnZhbHVlKCks IG5vZGVIYW5kbGUsIHNjcm9sbEludG9WaWV3SWZOZWVkZWQsIGNsaXBUb1ZpZXdwb3J0LCBjYWxs YmFja0lEKSwgMCk7CiB9CiAKIHZvaWQgV2ViQXV0b21hdGlvblNlc3Npb246OmRpZFRha2VTY3Jl ZW5zaG90KHVpbnQ2NF90IGNhbGxiYWNrSUQsIGNvbnN0IFNoYXJlYWJsZUJpdG1hcDo6SGFuZGxl JiBpbWFnZURhdGFIYW5kbGUsIGNvbnN0IFN0cmluZyYgZXJyb3JUeXBlKQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvQXV0b21hdGlvbi9XZWJBdXRvbWF0aW9uU2Vzc2lvbi5o IGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQXV0b21hdGlvbi9XZWJBdXRvbWF0aW9uU2Vzc2lv bi5oCmluZGV4IGIxZGIxMmIxOTNmMzUzMzFjODc1NzBkZjRkYjM4NDFhMzllMzA0YjcuLjJkYzBh NTJhMGU2OTlhMzAyM2U5MmYwMmE0ZjJhNTJhMzNhYzViMWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL0F1dG9tYXRpb24vV2ViQXV0b21hdGlvblNlc3Npb24uaAorKysgYi9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BdXRvbWF0aW9uL1dlYkF1dG9tYXRpb25TZXNzaW9uLmgK QEAgLTEzMiw3ICsxMzIsNyBAQCBwdWJsaWM6CiAgICAgdm9pZCBldmFsdWF0ZUphdmFTY3JpcHRG dW5jdGlvbihJbnNwZWN0b3I6OkVycm9yU3RyaW5nJiwgY29uc3QgU3RyaW5nJiBicm93c2luZ0Nv bnRleHRIYW5kbGUsIGNvbnN0IFN0cmluZyogb3B0aW9uYWxGcmFtZUhhbmRsZSwgY29uc3QgU3Ry aW5nJiBmdW5jdGlvbiwgY29uc3QgSlNPTjo6QXJyYXkmIGFyZ3VtZW50cywgY29uc3QgYm9vbCog b3B0aW9uYWxFeHBlY3RzSW1wbGljaXRDYWxsYmFja0FyZ3VtZW50LCBjb25zdCBpbnQqIG9wdGlv bmFsQ2FsbGJhY2tUaW1lb3V0LCBSZWY8SW5zcGVjdG9yOjpBdXRvbWF0aW9uQmFja2VuZERpc3Bh dGNoZXJIYW5kbGVyOjpFdmFsdWF0ZUphdmFTY3JpcHRGdW5jdGlvbkNhbGxiYWNrPiYmKSBvdmVy cmlkZTsKICAgICB2b2lkIHBlcmZvcm1Nb3VzZUludGVyYWN0aW9uKEluc3BlY3Rvcjo6RXJyb3JT dHJpbmcmLCBjb25zdCBTdHJpbmcmIGhhbmRsZSwgY29uc3QgSlNPTjo6T2JqZWN0JiByZXF1ZXN0 ZWRQb3NpdGlvbiwgY29uc3QgU3RyaW5nJiBtb3VzZUJ1dHRvbiwgY29uc3QgU3RyaW5nJiBtb3Vz ZUludGVyYWN0aW9uLCBjb25zdCBKU09OOjpBcnJheSYga2V5TW9kaWZpZXJzLCBSZWY8UGVyZm9y bU1vdXNlSW50ZXJhY3Rpb25DYWxsYmFjaz4mJikgZmluYWw7CiAgICAgdm9pZCBwZXJmb3JtS2V5 Ym9hcmRJbnRlcmFjdGlvbnMoSW5zcGVjdG9yOjpFcnJvclN0cmluZyYsIGNvbnN0IFN0cmluZyYg aGFuZGxlLCBjb25zdCBKU09OOjpBcnJheSYgaW50ZXJhY3Rpb25zLCBSZWY8UGVyZm9ybUtleWJv YXJkSW50ZXJhY3Rpb25zQ2FsbGJhY2s+JiYpIG92ZXJyaWRlOwotICAgIHZvaWQgdGFrZVNjcmVl bnNob3QoSW5zcGVjdG9yOjpFcnJvclN0cmluZyYsIGNvbnN0IFN0cmluZyYgaGFuZGxlLCBjb25z dCBTdHJpbmcqIG9wdGlvbmFsRnJhbWVIYW5kbGUsIGNvbnN0IFN0cmluZyogb3B0aW9uYWxOb2Rl SGFuZGxlLCBjb25zdCBib29sKiBvcHRpb25hbFNjcm9sbEludG9WaWV3SWZOZWVkZWQsIFJlZjxU YWtlU2NyZWVuc2hvdENhbGxiYWNrPiYmKSBvdmVycmlkZTsKKyAgICB2b2lkIHRha2VTY3JlZW5z aG90KEluc3BlY3Rvcjo6RXJyb3JTdHJpbmcmLCBjb25zdCBTdHJpbmcmIGhhbmRsZSwgY29uc3Qg U3RyaW5nKiBvcHRpb25hbEZyYW1lSGFuZGxlLCBjb25zdCBTdHJpbmcqIG9wdGlvbmFsTm9kZUhh bmRsZSwgY29uc3QgYm9vbCogb3B0aW9uYWxTY3JvbGxJbnRvVmlld0lmTmVlZGVkLCBjb25zdCBi b29sKiBvcHRpb25hbENsaXBUb1ZpZXdwb3J0LCBSZWY8VGFrZVNjcmVlbnNob3RDYWxsYmFjaz4m Jikgb3ZlcnJpZGU7CiAgICAgdm9pZCByZXNvbHZlQ2hpbGRGcmFtZUhhbmRsZShJbnNwZWN0b3I6 OkVycm9yU3RyaW5nJiwgY29uc3QgU3RyaW5nJiBicm93c2luZ0NvbnRleHRIYW5kbGUsIGNvbnN0 IFN0cmluZyogb3B0aW9uYWxGcmFtZUhhbmRsZSwgY29uc3QgaW50KiBvcHRpb25hbE9yZGluYWws IGNvbnN0IFN0cmluZyogb3B0aW9uYWxOYW1lLCBjb25zdCBTdHJpbmcqIG9wdGlvbmFsTm9kZUhh bmRsZSwgUmVmPFJlc29sdmVDaGlsZEZyYW1lSGFuZGxlQ2FsbGJhY2s+JiYpIG92ZXJyaWRlOwog ICAgIHZvaWQgcmVzb2x2ZVBhcmVudEZyYW1lSGFuZGxlKEluc3BlY3Rvcjo6RXJyb3JTdHJpbmcm LCBjb25zdCBTdHJpbmcmIGJyb3dzaW5nQ29udGV4dEhhbmRsZSwgY29uc3QgU3RyaW5nJiBmcmFt ZUhhbmRsZSwgUmVmPFJlc29sdmVQYXJlbnRGcmFtZUhhbmRsZUNhbGxiYWNrPiYmKSBvdmVycmlk ZTsKICAgICB2b2lkIGNvbXB1dGVFbGVtZW50TGF5b3V0KEluc3BlY3Rvcjo6RXJyb3JTdHJpbmcm LCBjb25zdCBTdHJpbmcmIGJyb3dzaW5nQ29udGV4dEhhbmRsZSwgY29uc3QgU3RyaW5nJiBmcmFt ZUhhbmRsZSwgY29uc3QgU3RyaW5nJiBub2RlSGFuZGxlLCBjb25zdCBib29sKiBvcHRpb25hbFNj cm9sbEludG9WaWV3SWZOZWVkZWQsIGNvbnN0IFN0cmluZyYgY29vcmRpbmF0ZVN5c3RlbSwgUmVm PEluc3BlY3Rvcjo6QXV0b21hdGlvbkJhY2tlbmREaXNwYXRjaGVySGFuZGxlcjo6Q29tcHV0ZUVs ZW1lbnRMYXlvdXRDYWxsYmFjaz4mJikgb3ZlcnJpZGU7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0L1dlYlByb2Nlc3MvQXV0b21hdGlvbi9XZWJBdXRvbWF0aW9uU2Vzc2lvblByb3h5LmNwcCBi L1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9BdXRvbWF0aW9uL1dlYkF1dG9tYXRpb25TZXNzaW9u UHJveHkuY3BwCmluZGV4IDA3MGE4Y2FiYTIxNTMwN2U5MThkYzk1Y2IyNzJhOTk2MGQ5NDNkYjcu LjVkMGI3M2E0OWZlNDFiNTczNzFhYWI3ODQ1NDEwMjdhYmU4MDJjNGIgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9BdXRvbWF0aW9uL1dlYkF1dG9tYXRpb25TZXNzaW9uUHJv eHkuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9BdXRvbWF0aW9uL1dlYkF1dG9t YXRpb25TZXNzaW9uUHJveHkuY3BwCkBAIC02NjIsNyArNjYyLDcgQEAgdm9pZCBXZWJBdXRvbWF0 aW9uU2Vzc2lvblByb3h5OjpzZWxlY3RPcHRpb25FbGVtZW50KHVpbnQ2NF90IHBhZ2VJRCwgdWlu dDY0X3QgZnIKICAgICBXZWJQcm9jZXNzOjpzaW5nbGV0b24oKS5wYXJlbnRQcm9jZXNzQ29ubmVj dGlvbigpLT5zZW5kKE1lc3NhZ2VzOjpXZWJBdXRvbWF0aW9uU2Vzc2lvbjo6RGlkU2VsZWN0T3B0 aW9uRWxlbWVudChjYWxsYmFja0lELCB7IH0pLCAwKTsKIH0KIAotc3RhdGljIFdlYkNvcmU6Oklu dFJlY3Qgc25hcHNob3RSZWN0Rm9yU2NyZWVuc2hvdChXZWJQYWdlJiBwYWdlLCBXZWJDb3JlOjpF bGVtZW50KiBlbGVtZW50KQorc3RhdGljIFdlYkNvcmU6OkludFJlY3Qgc25hcHNob3RSZWN0Rm9y U2NyZWVuc2hvdChXZWJQYWdlJiBwYWdlLCBXZWJDb3JlOjpFbGVtZW50KiBlbGVtZW50LCBib29s IGNsaXBUb1ZpZXdwb3J0KQogewogICAgIGlmIChlbGVtZW50KSB7CiAgICAgICAgIGlmICghZWxl bWVudC0+cmVuZGVyZXIoKSkKQEAgLTY3MywxMiArNjczLDEyIEBAIHN0YXRpYyBXZWJDb3JlOjpJ bnRSZWN0IHNuYXBzaG90UmVjdEZvclNjcmVlbnNob3QoV2ViUGFnZSYgcGFnZSwgV2ViQ29yZTo6 RWxlbWVuCiAgICAgfQogCiAgICAgaWYgKGF1dG8qIGZyYW1lVmlldyA9IHBhZ2UubWFpbkZyYW1l VmlldygpKQotICAgICAgICByZXR1cm4gZnJhbWVWaWV3LT52aXNpYmxlQ29udGVudFJlY3QoKTsK KyAgICAgICAgcmV0dXJuIGNsaXBUb1ZpZXdwb3J0ID8gZnJhbWVWaWV3LT52aXNpYmxlQ29udGVu dFJlY3QoKSA6IFdlYkNvcmU6OkludFJlY3QoV2ViQ29yZTo6SW50UG9pbnQoMCwgMCksIGZyYW1l Vmlldy0+Y29udGVudHNTaXplKCkpOwogCiAgICAgcmV0dXJuIHsgfTsKIH0KIAotdm9pZCBXZWJB dXRvbWF0aW9uU2Vzc2lvblByb3h5Ojp0YWtlU2NyZWVuc2hvdCh1aW50NjRfdCBwYWdlSUQsIHVp bnQ2NF90IGZyYW1lSUQsIFN0cmluZyBub2RlSGFuZGxlLCBib29sIHNjcm9sbEludG9WaWV3SWZO ZWVkZWQsIHVpbnQ2NF90IGNhbGxiYWNrSUQpCit2b2lkIFdlYkF1dG9tYXRpb25TZXNzaW9uUHJv eHk6OnRha2VTY3JlZW5zaG90KHVpbnQ2NF90IHBhZ2VJRCwgdWludDY0X3QgZnJhbWVJRCwgU3Ry aW5nIG5vZGVIYW5kbGUsIGJvb2wgc2Nyb2xsSW50b1ZpZXdJZk5lZWRlZCwgYm9vbCBjbGlwVG9W aWV3cG9ydCwgdWludDY0X3QgY2FsbGJhY2tJRCkKIHsKICAgICBTaGFyZWFibGVCaXRtYXA6Okhh bmRsZSBoYW5kbGU7CiAKQEAgLTcwNyw3ICs3MDcsNyBAQCB2b2lkIFdlYkF1dG9tYXRpb25TZXNz aW9uUHJveHk6OnRha2VTY3JlZW5zaG90KHVpbnQ2NF90IHBhZ2VJRCwgdWludDY0X3QgZnJhbWVJ RAogICAgIH0KIAogICAgIFN0cmluZyBzY3JlZW5zaG90RXJyb3JUeXBlID0gSW5zcGVjdG9yOjpQ cm90b2NvbDo6QXV0b21hdGlvbkhlbHBlcnM6OmdldEVudW1Db25zdGFudFZhbHVlKEluc3BlY3Rv cjo6UHJvdG9jb2w6OkF1dG9tYXRpb246OkVycm9yTWVzc2FnZTo6U2NyZWVuc2hvdEVycm9yKTsK LSAgICBXZWJDb3JlOjpJbnRSZWN0IHNuYXBzaG90UmVjdCA9IHNuYXBzaG90UmVjdEZvclNjcmVl bnNob3QoKnBhZ2UsIGNvcmVFbGVtZW50KTsKKyAgICBXZWJDb3JlOjpJbnRSZWN0IHNuYXBzaG90 UmVjdCA9IHNuYXBzaG90UmVjdEZvclNjcmVlbnNob3QoKnBhZ2UsIGNvcmVFbGVtZW50LCBjbGlw VG9WaWV3cG9ydCk7CiAgICAgaWYgKHNuYXBzaG90UmVjdC5pc0VtcHR5KCkpIHsKICAgICAgICAg V2ViUHJvY2Vzczo6c2luZ2xldG9uKCkucGFyZW50UHJvY2Vzc0Nvbm5lY3Rpb24oKS0+c2VuZChN ZXNzYWdlczo6V2ViQXV0b21hdGlvblNlc3Npb246OkRpZFRha2VTY3JlZW5zaG90KGNhbGxiYWNr SUQsIGhhbmRsZSwgc2NyZWVuc2hvdEVycm9yVHlwZSksIDApOwogICAgICAgICByZXR1cm47CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvQXV0b21hdGlvbi9XZWJBdXRvbWF0 aW9uU2Vzc2lvblByb3h5LmggYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvQXV0b21hdGlvbi9X ZWJBdXRvbWF0aW9uU2Vzc2lvblByb3h5LmgKaW5kZXggNGE3M2M3ZGFlMTI5MGM3MWM2OWZhNzdh OWNlZWFhOTY2NmIyYWMxOS4uYjUzODg2ODY4NDg3MDhmYTA2ODNiYzYxZmNiNGJiYjQxN2VlNDg3 NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0F1dG9tYXRpb24vV2ViQXV0 b21hdGlvblNlc3Npb25Qcm94eS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9BdXRv bWF0aW9uL1dlYkF1dG9tYXRpb25TZXNzaW9uUHJveHkuaApAQCAtNjYsNyArNjYsNyBAQCBwcml2 YXRlOgogICAgIHZvaWQgZm9jdXNGcmFtZSh1aW50NjRfdCBwYWdlSUQsIHVpbnQ2NF90IGZyYW1l SUQpOwogICAgIHZvaWQgY29tcHV0ZUVsZW1lbnRMYXlvdXQodWludDY0X3QgcGFnZUlELCB1aW50 NjRfdCBmcmFtZUlELCBTdHJpbmcgbm9kZUhhbmRsZSwgYm9vbCBzY3JvbGxJbnRvVmlld0lmTmVl ZGVkLCBDb29yZGluYXRlU3lzdGVtLCB1aW50NjRfdCBjYWxsYmFja0lEKTsKICAgICB2b2lkIHNl bGVjdE9wdGlvbkVsZW1lbnQodWludDY0X3QgcGFnZUlELCB1aW50NjRfdCBmcmFtZUlELCBTdHJp bmcgbm9kZUhhbmRsZSwgdWludDY0X3QgY2FsbGJhY2tJRCk7Ci0gICAgdm9pZCB0YWtlU2NyZWVu c2hvdCh1aW50NjRfdCBwYWdlSUQsIHVpbnQ2NF90IGZyYW1lSUQsIFN0cmluZyBub2RlSGFuZGxl LCBib29sIHNjcm9sbEludG9WaWV3SWZOZWVkZWQsIHVpbnQ2NF90IGNhbGxiYWNrSUQpOworICAg IHZvaWQgdGFrZVNjcmVlbnNob3QodWludDY0X3QgcGFnZUlELCB1aW50NjRfdCBmcmFtZUlELCBT dHJpbmcgbm9kZUhhbmRsZSwgYm9vbCBzY3JvbGxJbnRvVmlld0lmTmVlZGVkLCBib29sIGNsaXBU b1ZpZXdwb3J0LCB1aW50NjRfdCBjYWxsYmFja0lEKTsKICAgICB2b2lkIGdldENvb2tpZXNGb3JG cmFtZSh1aW50NjRfdCBwYWdlSUQsIHVpbnQ2NF90IGZyYW1lSUQsIHVpbnQ2NF90IGNhbGxiYWNr SUQpOwogICAgIHZvaWQgZGVsZXRlQ29va2llKHVpbnQ2NF90IHBhZ2VJRCwgdWludDY0X3QgZnJh bWVJRCwgU3RyaW5nIGNvb2tpZU5hbWUsIHVpbnQ2NF90IGNhbGxiYWNrSUQpOwogCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvQXV0b21hdGlvbi9XZWJBdXRvbWF0aW9uU2Vz c2lvblByb3h5Lm1lc3NhZ2VzLmluIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0F1dG9tYXRp b24vV2ViQXV0b21hdGlvblNlc3Npb25Qcm94eS5tZXNzYWdlcy5pbgppbmRleCA1MWIzYzI1ODY3 NzVlM2EzOTk4ZTVkODMzYTJhYjc4YjRkNTFiY2VjLi5lNWVlNDU3YjBmZDU5YTRiYTBjY2FhNDc5 OGNhMjkyNDZjMjhjMGYzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvQXV0 b21hdGlvbi9XZWJBdXRvbWF0aW9uU2Vzc2lvblByb3h5Lm1lc3NhZ2VzLmluCisrKyBiL1NvdXJj ZS9XZWJLaXQvV2ViUHJvY2Vzcy9BdXRvbWF0aW9uL1dlYkF1dG9tYXRpb25TZXNzaW9uUHJveHku bWVzc2FnZXMuaW4KQEAgLTM0LDcgKzM0LDcgQEAgQ29tcHV0ZUVsZW1lbnRMYXlvdXQodWludDY0 X3QgcGFnZUlELCB1aW50NjRfdCBmcmFtZUlELCBTdHJpbmcgbm9kZUhhbmRsZSwgYm9vbAogCiAg ICAgU2VsZWN0T3B0aW9uRWxlbWVudCh1aW50NjRfdCBwYWdlSUQsIHVpbnQ2NF90IGZyYW1lSUQs IFN0cmluZyBub2RlSGFuZGxlLCB1aW50NjRfdCBjYWxsYmFja0lEKQogCi0gICAgVGFrZVNjcmVl bnNob3QodWludDY0X3QgcGFnZUlELCB1aW50NjRfdCBmcmFtZUlELCBTdHJpbmcgbm9kZUhhbmRs ZSwgYm9vbCBzY3JvbGxJbnRvVmlld0lmTmVlZGVkLCB1aW50NjRfdCBjYWxsYmFja0lEKQorICAg IFRha2VTY3JlZW5zaG90KHVpbnQ2NF90IHBhZ2VJRCwgdWludDY0X3QgZnJhbWVJRCwgU3RyaW5n IG5vZGVIYW5kbGUsIGJvb2wgc2Nyb2xsSW50b1ZpZXdJZk5lZWRlZCwgYm9vbCBjbGlwVG9WaWV3 cG9ydCwgdWludDY0X3QgY2FsbGJhY2tJRCkKIAogICAgIEdldENvb2tpZXNGb3JGcmFtZSh1aW50 NjRfdCBwYWdlSUQsIHVpbnQ2NF90IGZyYW1lSUQsIHVpbnQ2NF90IGNhbGxiYWNrSUQpCiAgICAg RGVsZXRlQ29va2llKHVpbnQ2NF90IHBhZ2VJRCwgdWludDY0X3QgZnJhbWVJRCwgU3RyaW5nIGNv b2tpZU5hbWUsIHVpbnQ2NF90IGNhbGxiYWNrSUQpCg==