155841 2016-03-24 10:10:42 -0700 Web Automation: Add commands to compute layout of an element 2016-03-28 09:42:14 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Local Build All All RESOLVED FIXED InRadar P2 Normal --- 1 timothy timothy bburg graouts joepeck mattbaker nvasilyev timothy webkit-bug-importer oldest_to_newest 1177696 0 timothy 2016-03-24 10:10:42 -0700 We need a rect and to be able to scroll the element into view first. 1177697 1 webkit-bug-importer 2016-03-24 10:10:58 -0700 <rdar://problem/25340075> 1177698 2 274840 timothy 2016-03-24 10:16:31 -0700 Created attachment 274840 Patch 1178180 3 274840 bburg 2016-03-25 17:03:56 -0700 Comment on attachment 274840 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=274840&action=review r=me > Source/WebKit2/UIProcess/Automation/Automation.json:256 > + { "name": "useViewportCoordinates", "optional": true, "type": "boolean", "description": "If the result coordinates should be represented as viewport coordinates or not. Defaults to false, which is means coordinates should be represented as page coordinates." } Grammar: 'which is means' For the JSON protocol, I would prefer that this be non-optional and take an enum { PageCoordinates, ViewCoordinates }. It doesn't matter as much for the WK2 message. > Source/WebKit2/WebProcess/Automation/WebAutomationSessionProxy.cpp:415 > + String frameNotFoundErrorType = Inspector::Protocol::getEnumConstantValue(Inspector::Protocol::Automation::ErrorMessage::FrameNotFound); You can pull these error constants out to the top scope. 1178430 4 timothy 2016-03-28 09:42:14 -0700 https://trac.webkit.org/r198739 274840 2016-03-24 10:16:31 -0700 2016-03-25 17:03:56 -0700 Patch bug-155841-20160324101633.patch text/plain 16784 timothy U3VidmVyc2lvbiBSZXZpc2lvbjogMTk4MzA1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTE4ZWJiYjBmODZlMDI5 ZjkwZWJmNDk3Yzg5MjgxZTI0YTQwOTUwNS4uMDVkNjkwZWRlZTI3MTgxOGE1OWRhNjlmOWVmMDI3 ZDhjZDEyOTNmZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDE2LTAzLTI0ICBUaW1v dGh5IEhhdGNoZXIgIDx0aW1vdGh5QGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgQXV0b21hdGlv bjogQWRkIGNvbW1hbmRzIHRvIGNvbXB1dGUgbGF5b3V0IG9mIGFuIGVsZW1lbnQKKworICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTU1ODQxCisgICAgICAg IHJkYXI6Ly9wcm9ibGVtLzI1MzQwMDc1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgKiBkb20vRWxlbWVudC5oOiBNYXJrIHNjcm9sbEludG9WaWV3SWZO ZWVkZWQoKSBtZXRob2QgYXMgZXhwb3J0ZWQgc28gV0syIGNhbiB1c2UgaXQuCisgICAgICAgICog cGxhdGZvcm0vU2Nyb2xsVmlldy5oOiBNYXJrIHJvb3RWaWV3VG9Db250ZW50cyhJbnRSZWN0KSBt ZXRob2QgYXMgZXhwb3J0ZWQgc28gV0syIGNhbiB1c2UgaXQuCisKIDIwMTYtMDMtMTggIFRpbW90 aHkgSGF0Y2hlciAgPHRpbW90aHlAYXBwbGUuY29tPgogCiAgICAgICAgIFdlYiBBdXRvbWF0aW9u OiBBZGQgQXV0b21hdGlvbiBwcm90b2NvbCBjb21tYW5kcyB0byByZXNvbHZlIGZyYW1lcyBhcyBo YW5kbGVzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cKaW5kZXggYTEyNWJmNGM0NzlkNGU4M2JlNzY1YzJmYzliMDI3NzMyMGYw NzQ5Yy4uM2ZkYjQ5NzAyOWU3YWE4ZjdjZTkxMWQyOWNlMGFjYTFkNDkyMWQxMCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxv ZwpAQCAtMSwzICsxLDI3IEBACisyMDE2LTAzLTI0ICBUaW1vdGh5IEhhdGNoZXIgIDx0aW1vdGh5 QGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgQXV0b21hdGlvbjogQWRkIGNvbW1hbmRzIHRvIGNv bXB1dGUgbGF5b3V0IG9mIGFuIGVsZW1lbnQKKworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTU1ODQxCisgICAgICAgIHJkYXI6Ly9wcm9ibGVtLzI1MzQw MDc1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBV SVByb2Nlc3MvQXV0b21hdGlvbi9BdXRvbWF0aW9uLmpzb246IEFkZGVkIGNvbXB1dGVFbGVtZW50 TGF5b3V0LgorCisgICAgICAgICogVUlQcm9jZXNzL0F1dG9tYXRpb24vV2ViQXV0b21hdGlvblNl c3Npb24uY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJBdXRvbWF0aW9uU2Vzc2lvbjo6Y29tcHV0 ZUVsZW1lbnRMYXlvdXQpOiBBZGRlZC4KKyAgICAgICAgKFdlYktpdDo6V2ViQXV0b21hdGlvblNl c3Npb246OmRpZENvbXB1dGVFbGVtZW50TGF5b3V0KTogQWRkZWQuCisgICAgICAgICogVUlQcm9j ZXNzL0F1dG9tYXRpb24vV2ViQXV0b21hdGlvblNlc3Npb24uaDoKKyAgICAgICAgKiBVSVByb2Nl c3MvQXV0b21hdGlvbi9XZWJBdXRvbWF0aW9uU2Vzc2lvbi5tZXNzYWdlcy5pbjoKKyAgICAgICAg KERpZENvbXB1dGVFbGVtZW50TGF5b3V0KTogQWRkZWQuCisKKyAgICAgICAgKiBXZWJQcm9jZXNz L0F1dG9tYXRpb24vV2ViQXV0b21hdGlvblNlc3Npb25Qcm94eS5jcHA6CisgICAgICAgIChXZWJL aXQ6OldlYkF1dG9tYXRpb25TZXNzaW9uUHJveHk6OmNvbXB1dGVFbGVtZW50TGF5b3V0KTogQWRk ZWQuCisgICAgICAgICogV2ViUHJvY2Vzcy9BdXRvbWF0aW9uL1dlYkF1dG9tYXRpb25TZXNzaW9u UHJveHkuaDoKKyAgICAgICAgKiBXZWJQcm9jZXNzL0F1dG9tYXRpb24vV2ViQXV0b21hdGlvblNl c3Npb25Qcm94eS5tZXNzYWdlcy5pbjoKKyAgICAgICAgKENvbXB1dGVFbGVtZW50TGF5b3V0KTog QWRkZWQuCisKIDIwMTYtMDMtMjIgIEJyaWFuIEJ1cmcgIDxiYnVyZ0BhcHBsZS5jb20+CiAKICAg ICAgICAgV2ViIEF1dG9tYXRpb246IGltcGxlbWVudCBBdXRvbWF0aW9uLnBlcmZvcm1Nb3VzZUlu dGVyYWN0aW9uCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vRWxlbWVudC5oIGIvU291 cmNlL1dlYkNvcmUvZG9tL0VsZW1lbnQuaAppbmRleCA3NWYyNDZkNDYxYWM1Y2Q2ZTMwZWY0N2Yx ZWY5YjRmYjRhMTM1NjI5Li5lN2RkZjgyNGQ0NWE3MWU0NThmOGM1MjVhNTkxNTFlYjBjYTJiOTBj IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vRWxlbWVudC5oCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2RvbS9FbGVtZW50LmgKQEAgLTEyNCw3ICsxMjQsNyBAQCBwdWJsaWM6CiAgICAgdW5z aWduZWQgZmluZEF0dHJpYnV0ZUluZGV4QnlOYW1lKGNvbnN0IEF0b21pY1N0cmluZyYgbmFtZSwg Ym9vbCBzaG91bGRJZ25vcmVBdHRyaWJ1dGVDYXNlKSBjb25zdCB7IHJldHVybiBlbGVtZW50RGF0 YSgpLT5maW5kQXR0cmlidXRlSW5kZXhCeU5hbWUobmFtZSwgc2hvdWxkSWdub3JlQXR0cmlidXRl Q2FzZSk7IH0KIAogICAgIHZvaWQgc2Nyb2xsSW50b1ZpZXcoYm9vbCBhbGlnblRvVG9wID0gdHJ1 ZSk7Ci0gICAgdm9pZCBzY3JvbGxJbnRvVmlld0lmTmVlZGVkKGJvb2wgY2VudGVySWZOZWVkZWQg PSB0cnVlKTsKKyAgICBXRUJDT1JFX0VYUE9SVCB2b2lkIHNjcm9sbEludG9WaWV3SWZOZWVkZWQo Ym9vbCBjZW50ZXJJZk5lZWRlZCA9IHRydWUpOwogICAgIFdFQkNPUkVfRVhQT1JUIHZvaWQgc2Ny b2xsSW50b1ZpZXdJZk5vdFZpc2libGUoYm9vbCBjZW50ZXJJZk5vdFZpc2libGUgPSB0cnVlKTsK IAogICAgIHZvaWQgc2Nyb2xsQnlMaW5lcyhpbnQgbGluZXMpOwpAQCAtMTU3LDcgKzE1Nyw3IEBA IHB1YmxpYzoKIAogICAgIFJlZjxDbGllbnRSZWN0TGlzdD4gZ2V0Q2xpZW50UmVjdHMoKTsKICAg ICBSZWY8Q2xpZW50UmVjdD4gZ2V0Qm91bmRpbmdDbGllbnRSZWN0KCk7Ci0gICAgCisKICAgICAv LyBSZXR1cm5zIHRoZSBhYnNvbHV0ZSBib3VuZGluZyBib3ggdHJhbnNsYXRlZCBpbnRvIGNsaWVu dCBjb29yZGluYXRlcy4KICAgICBXRUJDT1JFX0VYUE9SVCBJbnRSZWN0IGNsaWVudFJlY3QoKSBj b25zdDsKICAgICAvLyBSZXR1cm5zIHRoZSBhYnNvbHV0ZSBib3VuZGluZyBib3ggdHJhbnNsYXRl ZCBpbnRvIHNjcmVlbiBjb29yZGluYXRlcy4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL1Njcm9sbFZpZXcuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbFZpZXcu aAppbmRleCA3ZDdkOWU4ODMyNGQwYTdiYTIzMTdmZDU0ZmU2YjI5ZDZjZTFjYmZjLi5kMWZiNjJj OWMzODJjZmQyZGM2NzVkYzQ4NGEwZTY3NGYxZTgyNzM3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9TY3JvbGxWaWV3LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v U2Nyb2xsVmlldy5oCkBAIC0yODQsNyArMjg0LDcgQEAgcHVibGljOgogCiAgICAgV0VCQ09SRV9F WFBPUlQgSW50UG9pbnQgcm9vdFZpZXdUb0NvbnRlbnRzKGNvbnN0IEludFBvaW50JikgY29uc3Q7 CiAgICAgV0VCQ09SRV9FWFBPUlQgSW50UG9pbnQgY29udGVudHNUb1Jvb3RWaWV3KGNvbnN0IElu dFBvaW50JikgY29uc3Q7Ci0gICAgSW50UmVjdCByb290Vmlld1RvQ29udGVudHMoY29uc3QgSW50 UmVjdCYpIGNvbnN0OworICAgIFdFQkNPUkVfRVhQT1JUIEludFJlY3Qgcm9vdFZpZXdUb0NvbnRl bnRzKGNvbnN0IEludFJlY3QmKSBjb25zdDsKICAgICBXRUJDT1JFX0VYUE9SVCBJbnRSZWN0IGNv bnRlbnRzVG9Sb290Vmlldyhjb25zdCBJbnRSZWN0JikgY29uc3Q7CiAKICAgICBJbnRQb2ludCB2 aWV3VG9Db250ZW50cyhjb25zdCBJbnRQb2ludCYpIGNvbnN0OwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0F1dG9tYXRpb24vQXV0b21hdGlvbi5qc29uIGIvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL0F1dG9tYXRpb24vQXV0b21hdGlvbi5qc29uCmluZGV4IGViM2EwMjg1 OTc4ZGQ2MTA0ZTc5MTM4ZjM3NmU0N2Q4YmU3NmJkY2QuLjVhMjZjY2Y3ODhhMjE2YTE2ZGRkMTE4 ZmRiZGVlOTEyMGMzY2ZiMjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9B dXRvbWF0aW9uL0F1dG9tYXRpb24uanNvbgorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv QXV0b21hdGlvbi9BdXRvbWF0aW9uLmpzb24KQEAgLTI0NCw2ICsyNDQsMjEgQEAKICAgICAgICAg ICAgICAgICB7ICJuYW1lIjogInJlc3VsdCIsICIkcmVmIjogIkZyYW1lSGFuZGxlIiwgImRlc2Ny aXB0aW9uIjogIlRoZSA8Y29kZT5GcmFtZUhhbmRsZTwvY29kZT4gZm9yIHRoZSByZXF1ZXN0ZWQg ZnJhbWUuIiB9CiAgICAgICAgICAgICBdLAogICAgICAgICAgICAgImFzeW5jIjogdHJ1ZQorICAg ICAgICB9LAorICAgICAgICB7CisgICAgICAgICAgICAibmFtZSI6ICJjb21wdXRlRWxlbWVudExh eW91dCIsCisgICAgICAgICAgICAiZGVzY3JpcHRpb24iOiAiQ29tcHV0ZXMgdGhlIGxheW91dCBm b3IgYW4gZWxlbWVudC4iLAorICAgICAgICAgICAgInBhcmFtZXRlcnMiOiBbCisgICAgICAgICAg ICAgICAgeyAibmFtZSI6ICJicm93c2luZ0NvbnRleHRIYW5kbGUiLCAiJHJlZiI6ICJCcm93c2lu Z0NvbnRleHRIYW5kbGUiLCAiZGVzY3JpcHRpb24iOiAiVGhlIGhhbmRsZSBmb3IgdGhlIGJyb3dz aW5nIGNvbnRleHQgdGhlIGZyYW1lIGlzIGxvY2F0ZWQuIiB9LAorICAgICAgICAgICAgICAgIHsg Im5hbWUiOiAiZnJhbWVIYW5kbGUiLCAiJHJlZiI6ICJGcmFtZUhhbmRsZSIsICJkZXNjcmlwdGlv biI6ICJUaGUgaGFuZGxlIGZvciB0aGUgZnJhbWUgdGhhdCBjb250YWlucyB0aGUgZWxlbWVudC4i IH0sCisgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJub2RlSGFuZGxlIiwgIiRyZWYiOiAiTm9k ZUhhbmRsZSIsICJkZXNjcmlwdGlvbiI6ICJUaGUgaGFuZGxlIG9mIHRoZSBlbGVtZW50IHRvIHVz ZS4iIH0sCisgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJzY3JvbGxJbnRvVmlld0lmTmVlZGVk IiwgIm9wdGlvbmFsIjogdHJ1ZSwgInR5cGUiOiAiYm9vbGVhbiIsICJkZXNjcmlwdGlvbiI6ICJJ ZiB0aGUgZWxlbWVudCBzaG91bGQgYmUgc2Nyb2xsZWQgaW50byB2aWV3IGJlZm9yZSBjb21wdXRp bmcgaXRzIGxheW91dC4iIH0sCisgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJ1c2VWaWV3cG9y dENvb3JkaW5hdGVzIiwgIm9wdGlvbmFsIjogdHJ1ZSwgInR5cGUiOiAiYm9vbGVhbiIsICJkZXNj cmlwdGlvbiI6ICJJZiB0aGUgcmVzdWx0IGNvb3JkaW5hdGVzIHNob3VsZCBiZSByZXByZXNlbnRl ZCBhcyB2aWV3cG9ydCBjb29yZGluYXRlcyBvciBub3QuIERlZmF1bHRzIHRvIGZhbHNlLCB3aGlj aCBpcyBtZWFucyBjb29yZGluYXRlcyBzaG91bGQgYmUgcmVwcmVzZW50ZWQgYXMgcGFnZSBjb29y ZGluYXRlcy4iIH0KKyAgICAgICAgICAgIF0sCisgICAgICAgICAgICAicmV0dXJucyI6IFsKKyAg ICAgICAgICAgICAgICB7ICJuYW1lIjogInJlY3QiLCAiJHJlZiI6ICJSZWN0IiwgImRlc2NyaXB0 aW9uIjogIlRoZSBsYXlvdXQgcmVjdCBmb3IgdGhlIHJlcXVlc3RlZCBlbGVtZW50LiBTcGVjaWZp ZWQgaW4gcGFnZSBvciB2aWV3cG9ydCBjb29yZGluYXRlcyBiYXNlZCBvbiB0aGUgdXNlVmlld3Bv cnRDb29yZGluYXRlcyBwYXJhbWV0ZXIuIiB9CisgICAgICAgICAgICBdLAorICAgICAgICAgICAg ImFzeW5jIjogdHJ1ZQogICAgICAgICB9CiAgICAgXQogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL0F1dG9tYXRpb24vV2ViQXV0b21hdGlvblNlc3Npb24uY3BwIGIvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL0F1dG9tYXRpb24vV2ViQXV0b21hdGlvblNlc3Npb24uY3Bw CmluZGV4IGJmNzYxNzEyMjg3OWRjZTUzNWNlNTNjZDhlMWE2Y2JkYzQxNTZkZTQuLjhiMDIzMzcy M2JkNzYyNDYzNjc4YTU4YTkxYmE4ZmNjYzkxZDk4ODkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9BdXRvbWF0aW9uL1dlYkF1dG9tYXRpb25TZXNzaW9uLmNwcAorKysgYi9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQXV0b21hdGlvbi9XZWJBdXRvbWF0aW9uU2Vzc2lvbi5j cHAKQEAgLTU5MSw0ICs1OTEsNTIgQEAgdm9pZCBXZWJBdXRvbWF0aW9uU2Vzc2lvbjo6ZGlkUmVz b2x2ZVBhcmVudEZyYW1lKHVpbnQ2NF90IGNhbGxiYWNrSUQsIHVpbnQ2NF90IGYKICAgICAgICAg Y2FsbGJhY2stPnNlbmRTdWNjZXNzKGhhbmRsZUZvcldlYkZyYW1lSUQoZnJhbWVJRCkpOwogfQog Cit2b2lkIFdlYkF1dG9tYXRpb25TZXNzaW9uOjpjb21wdXRlRWxlbWVudExheW91dChJbnNwZWN0 b3I6OkVycm9yU3RyaW5nJiBlcnJvclN0cmluZywgY29uc3QgU3RyaW5nJiBicm93c2luZ0NvbnRl eHRIYW5kbGUsIGNvbnN0IFN0cmluZyYgZnJhbWVIYW5kbGUsIGNvbnN0IFN0cmluZyYgbm9kZUhh bmRsZSwgY29uc3QgYm9vbCogb3B0aW9uYWxTY3JvbGxJbnRvVmlld0lmTmVlZGVkLCBjb25zdCBi b29sKiBvcHRpb25hbFVzZVZpZXdwb3J0Q29vcmRpbmF0ZXMsIFJlZjxDb21wdXRlRWxlbWVudExh eW91dENhbGxiYWNrPiYmIGNhbGxiYWNrKQoreworICAgIFdlYlBhZ2VQcm94eSogcGFnZSA9IHdl YlBhZ2VQcm94eUZvckhhbmRsZShicm93c2luZ0NvbnRleHRIYW5kbGUpOworICAgIGlmICghcGFn ZSkKKyAgICAgICAgRkFJTF9XSVRIX1BSRURFRklORURfRVJST1JfTUVTU0FHRShXaW5kb3dOb3RG b3VuZCk7CisKKyAgICBXZWJGcmFtZVByb3h5KiBmcmFtZSA9IHdlYkZyYW1lUHJveHlGb3JIYW5k bGUoZnJhbWVIYW5kbGUsICpwYWdlKTsKKyAgICBpZiAoIWZyYW1lKQorICAgICAgICBGQUlMX1dJ VEhfUFJFREVGSU5FRF9FUlJPUl9NRVNTQUdFKEZyYW1lTm90Rm91bmQpOworCisgICAgdWludDY0 X3QgY2FsbGJhY2tJRCA9IG1fbmV4dENvbXB1dGVFbGVtZW50TGF5b3V0Q2FsbGJhY2tJRCsrOwor ICAgIG1fY29tcHV0ZUVsZW1lbnRMYXlvdXRDYWxsYmFja3Muc2V0KGNhbGxiYWNrSUQsIFdURk1v dmUoY2FsbGJhY2spKTsKKworICAgIGJvb2wgc2Nyb2xsSW50b1ZpZXdJZk5lZWRlZCA9IG9wdGlv bmFsU2Nyb2xsSW50b1ZpZXdJZk5lZWRlZCA/ICpvcHRpb25hbFNjcm9sbEludG9WaWV3SWZOZWVk ZWQgOiBmYWxzZTsKKyAgICBib29sIHVzZVZpZXdwb3J0Q29vcmRpbmF0ZXMgPSBvcHRpb25hbFVz ZVZpZXdwb3J0Q29vcmRpbmF0ZXMgPyAqb3B0aW9uYWxVc2VWaWV3cG9ydENvb3JkaW5hdGVzIDog ZmFsc2U7CisKKyAgICBwYWdlLT5wcm9jZXNzKCkuc2VuZChNZXNzYWdlczo6V2ViQXV0b21hdGlv blNlc3Npb25Qcm94eTo6Q29tcHV0ZUVsZW1lbnRMYXlvdXQoZnJhbWUtPmZyYW1lSUQoKSwgbm9k ZUhhbmRsZSwgc2Nyb2xsSW50b1ZpZXdJZk5lZWRlZCwgdXNlVmlld3BvcnRDb29yZGluYXRlcywg Y2FsbGJhY2tJRCksIDApOworfQorCit2b2lkIFdlYkF1dG9tYXRpb25TZXNzaW9uOjpkaWRDb21w dXRlRWxlbWVudExheW91dCh1aW50NjRfdCBjYWxsYmFja0lELCBXZWJDb3JlOjpJbnRSZWN0IHJl Y3QsIGNvbnN0IFN0cmluZyYgZXJyb3JUeXBlKQoreworICAgIGF1dG8gY2FsbGJhY2sgPSBtX2Nv bXB1dGVFbGVtZW50TGF5b3V0Q2FsbGJhY2tzLnRha2UoY2FsbGJhY2tJRCk7CisgICAgaWYgKCFj YWxsYmFjaykKKyAgICAgICAgcmV0dXJuOworCisgICAgaWYgKCFlcnJvclR5cGUuaXNFbXB0eSgp KSB7CisgICAgICAgIGNhbGxiYWNrLT5zZW5kRmFpbHVyZShlcnJvclR5cGUpOworICAgICAgICBy ZXR1cm47CisgICAgfQorCisgICAgYXV0byBvcmlnaW5PYmplY3QgPSBJbnNwZWN0b3I6OlByb3Rv Y29sOjpBdXRvbWF0aW9uOjpQb2ludDo6Y3JlYXRlKCkKKyAgICAgICAgLnNldFgocmVjdC54KCkp CisgICAgICAgIC5zZXRZKHJlY3QueSgpKQorICAgICAgICAucmVsZWFzZSgpOworCisgICAgYXV0 byBzaXplT2JqZWN0ID0gSW5zcGVjdG9yOjpQcm90b2NvbDo6QXV0b21hdGlvbjo6U2l6ZTo6Y3Jl YXRlKCkKKyAgICAgICAgLnNldFdpZHRoKHJlY3Qud2lkdGgoKSkKKyAgICAgICAgLnNldEhlaWdo dChyZWN0LmhlaWdodCgpKQorICAgICAgICAucmVsZWFzZSgpOworCisgICAgYXV0byByZWN0T2Jq ZWN0ID0gSW5zcGVjdG9yOjpQcm90b2NvbDo6QXV0b21hdGlvbjo6UmVjdDo6Y3JlYXRlKCkKKyAg ICAgICAgLnNldE9yaWdpbihXVEZNb3ZlKG9yaWdpbk9iamVjdCkpCisgICAgICAgIC5zZXRTaXpl KFdURk1vdmUoc2l6ZU9iamVjdCkpCisgICAgICAgIC5yZWxlYXNlKCk7CisKKyAgICBjYWxsYmFj ay0+c2VuZFN1Y2Nlc3MoV1RGTW92ZShyZWN0T2JqZWN0KSk7Cit9CisKIH0gLy8gbmFtZXNwYWNl IFdlYktpdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0F1dG9tYXRpb24v V2ViQXV0b21hdGlvblNlc3Npb24uaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BdXRvbWF0 aW9uL1dlYkF1dG9tYXRpb25TZXNzaW9uLmgKaW5kZXggNDc2MjIwMDg5ZTI2MWJiZjUyOGExNjQ0 MjYyMTVmYzA2ZjgxMTMxNS4uYzAxMTExZGZhYjgxOGMwNjY5ZmE4NGJjM2Q2MGU4ZTM1ZTYwMTkz ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0F1dG9tYXRpb24vV2ViQXV0 b21hdGlvblNlc3Npb24uaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQXV0b21hdGlv bi9XZWJBdXRvbWF0aW9uU2Vzc2lvbi5oCkBAIC00Niw2ICs0Niw3IEBAIGNsYXNzIEZyb250ZW5k Um91dGVyOwogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiBjbGFzcyBJbnRQb2ludDsKK2NsYXNzIElu dFJlY3Q7CiB9CiAKIG5hbWVzcGFjZSBXZWJLaXQgewpAQCAtOTcsNiArOTgsNyBAQCBwdWJsaWM6 CiAgICAgdm9pZCBwZXJmb3JtTW91c2VJbnRlcmFjdGlvbihJbnNwZWN0b3I6OkVycm9yU3RyaW5n JiwgY29uc3QgU3RyaW5nJiBoYW5kbGUsIGNvbnN0IEluc3BlY3Rvcjo6SW5zcGVjdG9yT2JqZWN0 JiByZXF1ZXN0ZWRQb3NpdGlvbiwgY29uc3QgU3RyaW5nJiBtb3VzZUJ1dHRvbiwgY29uc3QgU3Ry aW5nJiBtb3VzZUludGVyYWN0aW9uLCBjb25zdCBJbnNwZWN0b3I6Okluc3BlY3RvckFycmF5JiBr ZXlNb2RpZmllcnMsIFJlZlB0cjxJbnNwZWN0b3I6OlByb3RvY29sOjpBdXRvbWF0aW9uOjpQb2lu dD4mIHVwZGF0ZWRQb3NpdGlvbikgb3ZlcnJpZGU7CiAgICAgdm9pZCByZXNvbHZlQ2hpbGRGcmFt ZUhhbmRsZShJbnNwZWN0b3I6OkVycm9yU3RyaW5nJiwgY29uc3QgU3RyaW5nJiBicm93c2luZ0Nv bnRleHRIYW5kbGUsIGNvbnN0IFN0cmluZyogb3B0aW9uYWxGcmFtZUhhbmRsZSwgY29uc3QgaW50 KiBvcHRpb25hbE9yZGluYWwsIGNvbnN0IFN0cmluZyogb3B0aW9uYWxOYW1lLCBjb25zdCBTdHJp bmcqIG9wdGlvbmFsTm9kZUhhbmRsZSwgUmVmPFJlc29sdmVDaGlsZEZyYW1lSGFuZGxlQ2FsbGJh Y2s+JiYpIG92ZXJyaWRlOwogICAgIHZvaWQgcmVzb2x2ZVBhcmVudEZyYW1lSGFuZGxlKEluc3Bl Y3Rvcjo6RXJyb3JTdHJpbmcmLCBjb25zdCBTdHJpbmcmIGJyb3dzaW5nQ29udGV4dEhhbmRsZSwg Y29uc3QgU3RyaW5nJiBmcmFtZUhhbmRsZSwgUmVmPFJlc29sdmVQYXJlbnRGcmFtZUhhbmRsZUNh bGxiYWNrPiYmKSBvdmVycmlkZTsKKyAgICB2b2lkIGNvbXB1dGVFbGVtZW50TGF5b3V0KEluc3Bl Y3Rvcjo6RXJyb3JTdHJpbmcmLCBjb25zdCBTdHJpbmcmIGJyb3dzaW5nQ29udGV4dEhhbmRsZSwg Y29uc3QgU3RyaW5nJiBmcmFtZUhhbmRsZSwgY29uc3QgU3RyaW5nJiBub2RlSGFuZGxlLCBjb25z dCBib29sKiBvcHRpb25hbFNjcm9sbEludG9WaWV3SWZOZWVkZWQsIGNvbnN0IGJvb2wqIHVzZVZp ZXdwb3J0Q29vcmRpbmF0ZXMsIFJlZjxJbnNwZWN0b3I6OkF1dG9tYXRpb25CYWNrZW5kRGlzcGF0 Y2hlckhhbmRsZXI6OkNvbXB1dGVFbGVtZW50TGF5b3V0Q2FsbGJhY2s+JiYpIG92ZXJyaWRlOwog CiBwcml2YXRlOgogICAgIFdlYlBhZ2VQcm94eSogd2ViUGFnZVByb3h5Rm9ySGFuZGxlKGNvbnN0 IFN0cmluZyYpOwpAQCAtMTE1LDYgKzExNyw3IEBAIHByaXZhdGU6CiAgICAgdm9pZCBkaWRFdmFs dWF0ZUphdmFTY3JpcHRGdW5jdGlvbih1aW50NjRfdCBjYWxsYmFja0lELCBjb25zdCBTdHJpbmcm IHJlc3VsdCwgY29uc3QgU3RyaW5nJiBlcnJvclR5cGUpOwogICAgIHZvaWQgZGlkUmVzb2x2ZUNo aWxkRnJhbWUodWludDY0X3QgY2FsbGJhY2tJRCwgdWludDY0X3QgZnJhbWVJRCwgY29uc3QgU3Ry aW5nJiBlcnJvclR5cGUpOwogICAgIHZvaWQgZGlkUmVzb2x2ZVBhcmVudEZyYW1lKHVpbnQ2NF90 IGNhbGxiYWNrSUQsIHVpbnQ2NF90IGZyYW1lSUQsIGNvbnN0IFN0cmluZyYgZXJyb3JUeXBlKTsK KyAgICB2b2lkIGRpZENvbXB1dGVFbGVtZW50TGF5b3V0KHVpbnQ2NF90IGNhbGxiYWNrSUQsIFdl YkNvcmU6OkludFJlY3QsIGNvbnN0IFN0cmluZyYgZXJyb3JUeXBlKTsKIAogICAgIC8vIFBsYXRm b3JtLXNwZWNpZmljIGhlbHBlciBtZXRob2RzLgogICAgIHZvaWQgcGxhdGZvcm1TaW11bGF0ZU1v dXNlSW50ZXJhY3Rpb24oV2ViUGFnZVByb3h5JiwgY29uc3QgV2ViQ29yZTo6SW50UG9pbnQmIHZp ZXdQb3NpdGlvbiwgSW5zcGVjdG9yOjpQcm90b2NvbDo6QXV0b21hdGlvbjo6TW91c2VJbnRlcmFj dGlvbiwgSW5zcGVjdG9yOjpQcm90b2NvbDo6QXV0b21hdGlvbjo6TW91c2VCdXR0b24sIFdlYkV2 ZW50OjpNb2RpZmllcnMpOwpAQCAtMTQyLDYgKzE0NSw5IEBAIHByaXZhdGU6CiAgICAgdWludDY0 X3QgbV9uZXh0UmVzb2x2ZVBhcmVudEZyYW1lQ2FsbGJhY2tJRCB7IDEgfTsKICAgICBIYXNoTWFw PHVpbnQ2NF90LCBSZWZQdHI8SW5zcGVjdG9yOjpBdXRvbWF0aW9uQmFja2VuZERpc3BhdGNoZXJI YW5kbGVyOjpSZXNvbHZlUGFyZW50RnJhbWVIYW5kbGVDYWxsYmFjaz4+IG1fcmVzb2x2ZVBhcmVu dEZyYW1lSGFuZGxlQ2FsbGJhY2tzOwogCisgICAgdWludDY0X3QgbV9uZXh0Q29tcHV0ZUVsZW1l bnRMYXlvdXRDYWxsYmFja0lEIHsgMSB9OworICAgIEhhc2hNYXA8dWludDY0X3QsIFJlZlB0cjxJ bnNwZWN0b3I6OkF1dG9tYXRpb25CYWNrZW5kRGlzcGF0Y2hlckhhbmRsZXI6OkNvbXB1dGVFbGVt ZW50TGF5b3V0Q2FsbGJhY2s+PiBtX2NvbXB1dGVFbGVtZW50TGF5b3V0Q2FsbGJhY2tzOworCiAj aWYgRU5BQkxFKFJFTU9URV9JTlNQRUNUT1IpCiAgICAgSW5zcGVjdG9yOjpGcm9udGVuZENoYW5u ZWwqIG1fcmVtb3RlQ2hhbm5lbCB7IG51bGxwdHIgfTsKICNlbmRpZgpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL0F1dG9tYXRpb24vV2ViQXV0b21hdGlvblNlc3Npb24ubWVz c2FnZXMuaW4gYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQXV0b21hdGlvbi9XZWJBdXRvbWF0 aW9uU2Vzc2lvbi5tZXNzYWdlcy5pbgppbmRleCA4NTJmZjg1OTg5NzgzZmM5YmMwNzY5M2Y5MWVh ZmUxNGVmNDQyNzk0Li43MmQ5YTkzOWE4OTM5NDM2ZjIyYzAwZmEwOWY0YmY4NGU0NDE4MzZhIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQXV0b21hdGlvbi9XZWJBdXRvbWF0 aW9uU2Vzc2lvbi5tZXNzYWdlcy5pbgorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQXV0 b21hdGlvbi9XZWJBdXRvbWF0aW9uU2Vzc2lvbi5tZXNzYWdlcy5pbgpAQCAtMjUsNCArMjUsNiBA QCBtZXNzYWdlcyAtPiBXZWJBdXRvbWF0aW9uU2Vzc2lvbiB7CiAKICAgICBEaWRSZXNvbHZlQ2hp bGRGcmFtZSh1aW50NjRfdCBjYWxsYmFja0lELCB1aW50NjRfdCBmcmFtZUlELCBTdHJpbmcgZXJy b3JUeXBlKQogICAgIERpZFJlc29sdmVQYXJlbnRGcmFtZSh1aW50NjRfdCBjYWxsYmFja0lELCB1 aW50NjRfdCBmcmFtZUlELCBTdHJpbmcgZXJyb3JUeXBlKQorCisgICAgRGlkQ29tcHV0ZUVsZW1l bnRMYXlvdXQodWludDY0X3QgY2FsbGJhY2tJRCwgV2ViQ29yZTo6SW50UmVjdCByZWN0LCBTdHJp bmcgZXJyb3JUeXBlKQogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9B dXRvbWF0aW9uL1dlYkF1dG9tYXRpb25TZXNzaW9uUHJveHkuY3BwIGIvU291cmNlL1dlYktpdDIv V2ViUHJvY2Vzcy9BdXRvbWF0aW9uL1dlYkF1dG9tYXRpb25TZXNzaW9uUHJveHkuY3BwCmluZGV4 IDhhN2EyZGE3YjY1MDE4NTMxZmZmZDkzMmNhMDM5NjcxNWUwYzQ5MWEuLmE2YjcxNjY5Mzk5YzZj OGI0YjkwZDhkNzk4NGQyZjk2MDAwOWYxMDMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dl YlByb2Nlc3MvQXV0b21hdGlvbi9XZWJBdXRvbWF0aW9uU2Vzc2lvblByb3h5LmNwcAorKysgYi9T b3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL0F1dG9tYXRpb24vV2ViQXV0b21hdGlvblNlc3Npb25Q cm94eS5jcHAKQEAgLTQxLDYgKzQxLDcgQEAKICNpbmNsdWRlIDxXZWJDb3JlL0RPTVdpbmRvdy5o PgogI2luY2x1ZGUgPFdlYkNvcmUvRnJhbWUuaD4KICNpbmNsdWRlIDxXZWJDb3JlL0ZyYW1lVHJl ZS5oPgorI2luY2x1ZGUgPFdlYkNvcmUvRnJhbWVWaWV3Lmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9I VE1MRnJhbWVFbGVtZW50QmFzZS5oPgogI2luY2x1ZGUgPFdlYkNvcmUvSlNFbGVtZW50Lmg+CiAj aW5jbHVkZSA8V2ViQ29yZS9NYWluRnJhbWUuaD4KQEAgLTQwNyw0ICs0MDgsNDUgQEAgdm9pZCBX ZWJBdXRvbWF0aW9uU2Vzc2lvblByb3h5Ojpmb2N1c0ZyYW1lKHVpbnQ2NF90IGZyYW1lSUQpCiAg ICAgY29yZURPTVdpbmRvdy0+Zm9jdXModHJ1ZSk7CiB9CiAKK3ZvaWQgV2ViQXV0b21hdGlvblNl c3Npb25Qcm94eTo6Y29tcHV0ZUVsZW1lbnRMYXlvdXQodWludDY0X3QgZnJhbWVJRCwgU3RyaW5n IG5vZGVIYW5kbGUsIGJvb2wgc2Nyb2xsSW50b1ZpZXdJZk5lZWRlZCwgYm9vbCB1c2VWaWV3cG9y dENvb3JkaW5hdGVzLCB1aW50NjRfdCBjYWxsYmFja0lEKQoreworICAgIFdlYkZyYW1lKiBmcmFt ZSA9IFdlYlByb2Nlc3M6OnNpbmdsZXRvbigpLndlYkZyYW1lKGZyYW1lSUQpOworICAgIGlmICgh ZnJhbWUpIHsKKyAgICAgICAgU3RyaW5nIGZyYW1lTm90Rm91bmRFcnJvclR5cGUgPSBJbnNwZWN0 b3I6OlByb3RvY29sOjpnZXRFbnVtQ29uc3RhbnRWYWx1ZShJbnNwZWN0b3I6OlByb3RvY29sOjpB dXRvbWF0aW9uOjpFcnJvck1lc3NhZ2U6OkZyYW1lTm90Rm91bmQpOworICAgICAgICBXZWJQcm9j ZXNzOjpzaW5nbGV0b24oKS5wYXJlbnRQcm9jZXNzQ29ubmVjdGlvbigpLT5zZW5kKE1lc3NhZ2Vz OjpXZWJBdXRvbWF0aW9uU2Vzc2lvbjo6RGlkQ29tcHV0ZUVsZW1lbnRMYXlvdXQoY2FsbGJhY2tJ RCwgV2ViQ29yZTo6SW50UmVjdCgpLCBmcmFtZU5vdEZvdW5kRXJyb3JUeXBlKSwgMCk7CisgICAg ICAgIHJldHVybjsKKyAgICB9CisKKyAgICBXZWJDb3JlOjpFbGVtZW50KiBjb3JlRWxlbWVudCA9 IGVsZW1lbnRGb3JOb2RlSGFuZGxlKCpmcmFtZSwgbm9kZUhhbmRsZSk7CisgICAgaWYgKCFjb3Jl RWxlbWVudCkgeworICAgICAgICBTdHJpbmcgbm9kZU5vdEZvdW5kRXJyb3JUeXBlID0gSW5zcGVj dG9yOjpQcm90b2NvbDo6Z2V0RW51bUNvbnN0YW50VmFsdWUoSW5zcGVjdG9yOjpQcm90b2NvbDo6 QXV0b21hdGlvbjo6RXJyb3JNZXNzYWdlOjpOb2RlTm90Rm91bmQpOworICAgICAgICBXZWJQcm9j ZXNzOjpzaW5nbGV0b24oKS5wYXJlbnRQcm9jZXNzQ29ubmVjdGlvbigpLT5zZW5kKE1lc3NhZ2Vz OjpXZWJBdXRvbWF0aW9uU2Vzc2lvbjo6RGlkQ29tcHV0ZUVsZW1lbnRMYXlvdXQoY2FsbGJhY2tJ RCwgV2ViQ29yZTo6SW50UmVjdCgpLCBub2RlTm90Rm91bmRFcnJvclR5cGUpLCAwKTsKKyAgICAg ICAgcmV0dXJuOworICAgIH0KKworICAgIGlmIChzY3JvbGxJbnRvVmlld0lmTmVlZGVkKQorICAg ICAgICBjb3JlRWxlbWVudC0+c2Nyb2xsSW50b1ZpZXdJZk5lZWRlZChmYWxzZSk7CisKKyAgICBX ZWJDb3JlOjpJbnRSZWN0IHJlY3QgPSBjb3JlRWxlbWVudC0+Y2xpZW50UmVjdCgpOworCisgICAg aWYgKCF1c2VWaWV3cG9ydENvb3JkaW5hdGVzKSB7CisgICAgICAgIFdlYkNvcmU6OkZyYW1lKiBj b3JlRnJhbWUgPSBmcmFtZS0+Y29yZUZyYW1lKCk7CisgICAgICAgIGlmICghY29yZUZyYW1lKSB7 CisgICAgICAgICAgICBTdHJpbmcgZnJhbWVOb3RGb3VuZEVycm9yVHlwZSA9IEluc3BlY3Rvcjo6 UHJvdG9jb2w6OmdldEVudW1Db25zdGFudFZhbHVlKEluc3BlY3Rvcjo6UHJvdG9jb2w6OkF1dG9t YXRpb246OkVycm9yTWVzc2FnZTo6RnJhbWVOb3RGb3VuZCk7CisgICAgICAgICAgICBXZWJQcm9j ZXNzOjpzaW5nbGV0b24oKS5wYXJlbnRQcm9jZXNzQ29ubmVjdGlvbigpLT5zZW5kKE1lc3NhZ2Vz OjpXZWJBdXRvbWF0aW9uU2Vzc2lvbjo6RGlkQ29tcHV0ZUVsZW1lbnRMYXlvdXQoY2FsbGJhY2tJ RCwgV2ViQ29yZTo6SW50UmVjdCgpLCBmcmFtZU5vdEZvdW5kRXJyb3JUeXBlKSwgMCk7CisgICAg ICAgICAgICByZXR1cm47CisgICAgICAgIH0KKworICAgICAgICBXZWJDb3JlOjpGcmFtZVZpZXcg KmNvcmVGcmFtZVZpZXcgPSBjb3JlRnJhbWUtPnZpZXcoKTsKKyAgICAgICAgaWYgKCFjb3JlRnJh bWVWaWV3KSB7CisgICAgICAgICAgICBTdHJpbmcgZnJhbWVOb3RGb3VuZEVycm9yVHlwZSA9IElu c3BlY3Rvcjo6UHJvdG9jb2w6OmdldEVudW1Db25zdGFudFZhbHVlKEluc3BlY3Rvcjo6UHJvdG9j b2w6OkF1dG9tYXRpb246OkVycm9yTWVzc2FnZTo6RnJhbWVOb3RGb3VuZCk7CisgICAgICAgICAg ICBXZWJQcm9jZXNzOjpzaW5nbGV0b24oKS5wYXJlbnRQcm9jZXNzQ29ubmVjdGlvbigpLT5zZW5k KE1lc3NhZ2VzOjpXZWJBdXRvbWF0aW9uU2Vzc2lvbjo6RGlkQ29tcHV0ZUVsZW1lbnRMYXlvdXQo Y2FsbGJhY2tJRCwgV2ViQ29yZTo6SW50UmVjdCgpLCBmcmFtZU5vdEZvdW5kRXJyb3JUeXBlKSwg MCk7CisgICAgICAgIH0KKworICAgICAgICByZWN0ID0gY29yZUZyYW1lVmlldy0+cm9vdFZpZXdU b0NvbnRlbnRzKHJlY3QpOworICAgIH0KKworICAgIFdlYlByb2Nlc3M6OnNpbmdsZXRvbigpLnBh cmVudFByb2Nlc3NDb25uZWN0aW9uKCktPnNlbmQoTWVzc2FnZXM6OldlYkF1dG9tYXRpb25TZXNz aW9uOjpEaWRDb21wdXRlRWxlbWVudExheW91dChjYWxsYmFja0lELCByZWN0LCBlbXB0eVN0cmlu ZygpKSwgMCk7Cit9CisKIH0gLy8gbmFtZXNwYWNlIFdlYktpdApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdDIvV2ViUHJvY2Vzcy9BdXRvbWF0aW9uL1dlYkF1dG9tYXRpb25TZXNzaW9uUHJveHku aCBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvQXV0b21hdGlvbi9XZWJBdXRvbWF0aW9uU2Vz c2lvblByb3h5LmgKaW5kZXggNDE0MmM5MWNmZDJjN2NlOTM4ZjY5NDRjMjc4MWU2YzhhYjFhZmQw ZC4uMzY5NjFmMjFmMmNmZDdmNjQzOWM2ODkxZDUwZWM4Yjg5NTcyYzIwYSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9BdXRvbWF0aW9uL1dlYkF1dG9tYXRpb25TZXNzaW9u UHJveHkuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL0F1dG9tYXRpb24vV2ViQXV0 b21hdGlvblNlc3Npb25Qcm94eS5oCkBAIC02Myw2ICs2Myw3IEBAIHByaXZhdGU6CiAgICAgdm9p ZCByZXNvbHZlQ2hpbGRGcmFtZVdpdGhOYW1lKHVpbnQ2NF90IGZyYW1lSUQsIGNvbnN0IFN0cmlu ZyYgbmFtZSwgdWludDY0X3QgY2FsbGJhY2tJRCk7CiAgICAgdm9pZCByZXNvbHZlUGFyZW50RnJh bWUodWludDY0X3QgZnJhbWVJRCwgdWludDY0X3QgY2FsbGJhY2tJRCk7CiAgICAgdm9pZCBmb2N1 c0ZyYW1lKHVpbnQ2NF90IGZyYW1lSUQpOworICAgIHZvaWQgY29tcHV0ZUVsZW1lbnRMYXlvdXQo dWludDY0X3QgZnJhbWVJRCwgU3RyaW5nIG5vZGVIYW5kbGUsIGJvb2wgc2Nyb2xsSW50b1ZpZXdJ Zk5lZWRlZCwgYm9vbCB1c2VWaWV3cG9ydENvb3JkaW5hdGVzLCB1aW50NjRfdCBjYWxsYmFja0lE KTsKIAogICAgIFN0cmluZyBtX3Nlc3Npb25JZGVudGlmaWVyOwogCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0Mi9XZWJQcm9jZXNzL0F1dG9tYXRpb24vV2ViQXV0b21hdGlvblNlc3Npb25Qcm94 eS5tZXNzYWdlcy5pbiBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvQXV0b21hdGlvbi9XZWJB dXRvbWF0aW9uU2Vzc2lvblByb3h5Lm1lc3NhZ2VzLmluCmluZGV4IDJhMTY0MmRhYjY0NDVhNTU2 MWE3ZDdhNGExM2I3ZmI4N2M1YzZiMzIuLmY3MjMxZTdjYzBjODM1Mjg1MzM2OWVjYTQ4YTU3ZDdm Yjc0MDUyOWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvQXV0b21hdGlv bi9XZWJBdXRvbWF0aW9uU2Vzc2lvblByb3h5Lm1lc3NhZ2VzLmluCisrKyBiL1NvdXJjZS9XZWJL aXQyL1dlYlByb2Nlc3MvQXV0b21hdGlvbi9XZWJBdXRvbWF0aW9uU2Vzc2lvblByb3h5Lm1lc3Nh Z2VzLmluCkBAIC0yOSw0ICsyOSw2IEBAIG1lc3NhZ2VzIC0+IFdlYkF1dG9tYXRpb25TZXNzaW9u UHJveHkgewogICAgIFJlc29sdmVQYXJlbnRGcmFtZSh1aW50NjRfdCBmcmFtZUlELCB1aW50NjRf dCBjYWxsYmFja0lEKQogCiAgICAgRm9jdXNGcmFtZSh1aW50NjRfdCBmcmFtZUlEKQorCisgICAg Q29tcHV0ZUVsZW1lbnRMYXlvdXQodWludDY0X3QgZnJhbWVJRCwgU3RyaW5nIG5vZGVIYW5kbGUs IGJvb2wgc2Nyb2xsSW50b1ZpZXdJZk5lZWRlZCwgYm9vbCB1c2VWaWV3cG9ydENvb3JkaW5hdGVz LCB1aW50NjRfdCBjYWxsYmFja0lEKQogfQo=