155323 2016-03-10 14:05:54 -0800 Web Automation: report the browsing context's window frame (size and origin) 2016-03-28 11:52:14 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 155349 1 bburg bburg bburg graouts joepeck mattbaker nvasilyev timothy webkit-bug-importer oldest_to_newest 1173328 0 bburg 2016-03-10 14:05:54 -0800 . 1173329 1 webkit-bug-importer 2016-03-10 14:06:22 -0800 <rdar://problem/25094089> 1173760 2 273740 bburg 2016-03-11 09:51:33 -0800 Created attachment 273740 Proposed Fix 1178481 3 bburg 2016-03-28 11:52:14 -0700 Committed r198754: <http://trac.webkit.org/changeset/198754> 273740 2016-03-11 09:51:33 -0800 2016-03-11 13:00:28 -0800 Proposed Fix bug-155323-20160311095120.patch text/plain 11808 bburg U3VidmVyc2lvbiBSZXZpc2lvbjogMTk4MDIyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggZmQwYWNjNDljNWJjMmE2 OWFiMzJhZDI2NzcwM2JjZDg4MmIzODFlMy4uN2JjNWI1NzU0YWRiNTE0ZGMxYTAxNjYwNDNlYzFi NjkwN2IyZDUwMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM5IEBACisyMDE2LTAzLTExICBCcmlh biBCdXJnICA8YmJ1cmdAYXBwbGUuY29tPgorCisgICAgICAgIFdlYiBBdXRvbWF0aW9uOiByZXBv cnQgdGhlIGJyb3dzaW5nIGNvbnRleHQncyB3aW5kb3cgZnJhbWUgKHNpemUgYW5kIG9yaWdpbikK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1NTMyMwor ICAgICAgICA8cmRhcjovL3Byb2JsZW0vMjUwOTQwODk+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVG8gcHJlcGFyZSBmb3IgaW1wbGVtZW50aW5nIHJl c2l6ZSBhbmQgbW92ZSBjb21tYW5kcywgYWRkIGEKKyAgICAgICAgd2luZG93RnJhbWUgbWVtYmVy IHRvIHRoZSBicm93c2luZyBjb250ZXh0IHByb3RvY29sIHR5cGUuCisKKyAgICAgICAgKiBVSVBy b2Nlc3MvQXV0b21hdGlvbi9BdXRvbWF0aW9uLmpzb246CisgICAgICAgIEFkZCBSZWN0LCBQb2lu dCwgYW5kIFNpemUgb2JqZWN0cy4gVGhlc2UgY29ycmVzcG9uZCB0byB0aGUKKyAgICAgICAgQ0cv TlMgYW5kIFdlYkNvcmUgZ2VvbWV0cnkgc3RydWN0cy4gQWRkIGEgZnJhbWUgUmVjdCB0bworICAg ICAgICBCcm93c2luZ0NvbnRleHQuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQXV0b21hdGlvbi9X ZWJBdXRvbWF0aW9uU2Vzc2lvbi5jcHA6CisgICAgICAgIFRpZ2h0ZW4gdXAgdHlwZXMgYnkgdXNp bmcgcmVmZXJlbmNlcyB3aGVyZSBwb3NzaWJsZS4KKworICAgICAgICAoV2ViS2l0OjpXZWJBdXRv bWF0aW9uU2Vzc2lvbjo6aGFuZGxlRm9yV2ViUGFnZVByb3h5KToKKyAgICAgICAgKFdlYktpdDo6 V2ViQXV0b21hdGlvblNlc3Npb246OmJ1aWxkQnJvd3NpbmdDb250ZXh0Rm9yUGFnZSk6CisgICAg ICAgIEV4dHJhY3QgdGhlIGNvZGUgdG8gYnVpbGQgYSBCcm93c2luZ0NvbnRleHQgb2JqZWN0LiBB ZGQKKyAgICAgICAgY29kZSB0byBjYWxjdWxhdGUgYW5kIGluc2VydCB0aGUgcGFnZSdzIHdpbmRv dyBmcmFtZSBzaXplLgorCisgICAgICAgIChXZWJLaXQ6OldlYkF1dG9tYXRpb25TZXNzaW9uOjpn ZXRCcm93c2luZ0NvbnRleHRzKToKKyAgICAgICAgKFdlYktpdDo6V2ViQXV0b21hdGlvblNlc3Np b246OmdldEJyb3dzaW5nQ29udGV4dCk6CisgICAgICAgIChXZWJLaXQ6OldlYkF1dG9tYXRpb25T ZXNzaW9uOjpjcmVhdGVCcm93c2luZ0NvbnRleHQpOgorICAgICAgICAoV2ViS2l0OjpXZWJBdXRv bWF0aW9uU2Vzc2lvbjo6Y2xvc2VCcm93c2luZ0NvbnRleHQpOgorICAgICAgICAoV2ViS2l0OjpX ZWJBdXRvbWF0aW9uU2Vzc2lvbjo6c3dpdGNoVG9Ccm93c2luZ0NvbnRleHQpOgorICAgICAgICBS ZWZhY3RvcmluZyBhcyBhYm92ZS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BdXRvbWF0aW9uL1dl YkF1dG9tYXRpb25TZXNzaW9uLmg6CisgICAgICAgIEFkanVzdCBzaWduYXR1cmVzLgorCisgICAg ICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oOiBNYWtlIGdldFdpbmRvd0ZyYW1lIHB1Ymxp Yy4KKwogMjAxNi0wMy0xMCAgRGF2aWQgS2lsemVyICA8ZGRraWx6ZXJAYXBwbGUuY29tPgogCiAg ICAgICAgIFJFR1JFU1NJT04gKHIxOTc5ODYpOiBEb24ndCB0cnkgdG8gbGluayB0byB1bmRlZmlu ZWQgJChXRUJLSVRfU1lTVEVNX0lOVEVSRkFDRV9MSUJSQVJZKQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0F1dG9tYXRpb24vQXV0b21hdGlvbi5qc29uIGIvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL0F1dG9tYXRpb24vQXV0b21hdGlvbi5qc29uCmluZGV4IGM3MDg5NDYz YzUxYmRlMzcyYTA5NGY3OWFmNjYwM2VhY2E5MTFlZTAuLjdkMWNlYmI4YTE0ZTE3NTJhODQ0OWI4 OTA5YTNiODE4MTE1ZTA1OTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9B dXRvbWF0aW9uL0F1dG9tYXRpb24uanNvbgorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv QXV0b21hdGlvbi9BdXRvbWF0aW9uLmpzb24KQEAgLTMsNiArMywzMCBAQAogICAgICJkZXNjcmlw dGlvbiI6ICJBdXRvbWF0aW9uIGRvbWFpbiBleHBvc2VzIGNvbW1hbmRzIGZvciBhdXRvbWF0aW5n IHVzZXIgaW50ZXJhY3Rpb25zIHdpdGggdGhlIGJyb3dzZXIuIiwKICAgICAidHlwZXMiOiBbCiAg ICAgICAgIHsKKyAgICAgICAgICAgICJpZCI6ICJQb2ludCIsCisgICAgICAgICAgICAidHlwZSI6 ICJvYmplY3QiLAorICAgICAgICAgICAgInByb3BlcnRpZXMiOiBbCisgICAgICAgICAgICAgICAg eyAibmFtZSI6ICJ4IiwgInR5cGUiOiAibnVtYmVyIiB9LAorICAgICAgICAgICAgICAgIHsgIm5h bWUiOiAieSIsICJ0eXBlIjogIm51bWJlciIgfQorICAgICAgICAgICAgXQorICAgICAgICB9LAor ICAgICAgICB7CisgICAgICAgICAgICAiaWQiOiAiU2l6ZSIsCisgICAgICAgICAgICAidHlwZSI6 ICJvYmplY3QiLAorICAgICAgICAgICAgInByb3BlcnRpZXMiOiBbCisgICAgICAgICAgICAgICAg eyAibmFtZSI6ICJ3aWR0aCIsICJ0eXBlIjogIm51bWJlciIgfSwKKyAgICAgICAgICAgICAgICB7 ICJuYW1lIjogImhlaWdodCIsICJ0eXBlIjogIm51bWJlciIgfQorICAgICAgICAgICAgXQorICAg ICAgICB9LAorICAgICAgICB7CisgICAgICAgICAgICAiaWQiOiAiUmVjdCIsCisgICAgICAgICAg ICAidHlwZSI6ICJvYmplY3QiLAorICAgICAgICAgICAgInByb3BlcnRpZXMiOiBbCisgICAgICAg ICAgICAgICAgeyAibmFtZSI6ICJvcmlnaW4iLCAiJHJlZiI6ICJQb2ludCIgfSwKKyAgICAgICAg ICAgICAgICB7ICJuYW1lIjogInNpemUiLCAiJHJlZiI6ICJTaXplIiB9CisgICAgICAgICAgICBd CisgICAgICAgIH0sCisgICAgICAgIHsKICAgICAgICAgICAgICJpZCI6ICJCcm93c2luZ0NvbnRl eHRIYW5kbGUiLAogICAgICAgICAgICAgInR5cGUiOiAic3RyaW5nIiwKICAgICAgICAgICAgICJk ZXNjcmlwdGlvbiI6ICJBbiBvcGFxdWUgaWRlbnRpZmllciBmb3IgYSBicm93c2luZyBjb250ZXh0 LiIKQEAgLTI0LDcgKzQ4LDggQEAKICAgICAgICAgICAgICJwcm9wZXJ0aWVzIjogWwogICAgICAg ICAgICAgICAgIHsgIm5hbWUiOiAiaGFuZGxlIiwgIiRyZWYiOiAiQnJvd3NpbmdDb250ZXh0SGFu ZGxlIiwgImRlc2NyaXB0aW9uIjogIk9wYXF1ZSBoYW5kbGUgZm9yIGEgYnJvd3NpbmcgY29udGV4 dCAod2luZG93IG9yIHRhYikuIFVzZWQgYXMgYSBrZXkgZm9yIHdpbmRvdy1yZWxhdGVkIGNvbW1h bmRzLiIgfSwKICAgICAgICAgICAgICAgICB7ICJuYW1lIjogImFjdGl2ZSIsICJ0eXBlIjogImJv b2xlYW4iLCAiZGVzY3JpcHRpb24iOiAiV2hldGhlciB0aGUgYnJvd3NpbmcgY29udGV4dCBoYXMg Zm9jdXMgYXQgdGhlIHRpbWUgdGhlIGNvbW1hbmQgaXMgaGFuZGxlZC4iIH0sCi0gICAgICAgICAg ICAgICAgeyAibmFtZSI6ICJ1cmwiLCAidHlwZSI6ICJzdHJpbmciLCAiZGVzY3JpcHRpb24iOiAi VGhlIFVSTCBsb2FkZWQgYnkgdGhlIGJyb3dzaW5nIGNvbnRleHQgYXQgdGhlIHRpbWUgdGhlIGNv bW1hbmQgaXMgaGFuZGxlZC4iIH0KKyAgICAgICAgICAgICAgICB7ICJuYW1lIjogInVybCIsICJ0 eXBlIjogInN0cmluZyIsICJkZXNjcmlwdGlvbiI6ICJUaGUgVVJMIGxvYWRlZCBieSB0aGUgYnJv d3NpbmcgY29udGV4dCBhdCB0aGUgdGltZSB0aGUgY29tbWFuZCBpcyBoYW5kbGVkLiIgfSwKKyAg ICAgICAgICAgICAgICB7ICJuYW1lIjogIndpbmRvd0ZyYW1lIiwgIiRyZWYiOiAiUmVjdCIsICJk ZXNjcmlwdGlvbiI6ICJUaGUgY3VycmVudCBmcmFtZSAocG9zaXRpb24gYW5kIHNpemUpIG9mIHRo ZSBicm93c2luZyBjb250ZXh0J3Mgd2luZG93LiIgfQogICAgICAgICAgICAgXQogICAgICAgICB9 CiAgICAgXSwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BdXRvbWF0aW9u L1dlYkF1dG9tYXRpb25TZXNzaW9uLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BdXRv bWF0aW9uL1dlYkF1dG9tYXRpb25TZXNzaW9uLmNwcAppbmRleCA5NDZkNDAxODExNDM3NDU0Yzc3 NTNiOTlmOTJhZDhjZGFlZWI5OWYzLi4zNjkwYjg1MjRlYzBiMThmYTJiYzZkMWJlODZhZTAxNzU3 MGQ2OWExIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQXV0b21hdGlvbi9X ZWJBdXRvbWF0aW9uU2Vzc2lvbi5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0F1 dG9tYXRpb24vV2ViQXV0b21hdGlvblNlc3Npb24uY3BwCkBAIC0xMDksNjEgKzEwOSw4MSBAQCBX ZWJQYWdlUHJveHkqIFdlYkF1dG9tYXRpb25TZXNzaW9uOjp3ZWJQYWdlUHJveHlGb3JIYW5kbGUo Y29uc3QgU3RyaW5nJiBoYW5kbGUpCiAgICAgcmV0dXJuIFdlYlByb2Nlc3NQcm94eTo6d2ViUGFn ZShpdGVyLT52YWx1ZSk7CiB9CiAKLVN0cmluZyBXZWJBdXRvbWF0aW9uU2Vzc2lvbjo6aGFuZGxl Rm9yV2ViUGFnZVByb3h5KFdlYlBhZ2VQcm94eSogd2ViUGFnZVByb3h5KQorU3RyaW5nIFdlYkF1 dG9tYXRpb25TZXNzaW9uOjpoYW5kbGVGb3JXZWJQYWdlUHJveHkoY29uc3QgV2ViUGFnZVByb3h5 JiB3ZWJQYWdlUHJveHkpCiB7Ci0gICAgYXV0byBpdGVyID0gbV93ZWJQYWdlSGFuZGxlTWFwLmZp bmQod2ViUGFnZVByb3h5LT5wYWdlSUQoKSk7CisgICAgYXV0byBpdGVyID0gbV93ZWJQYWdlSGFu ZGxlTWFwLmZpbmQod2ViUGFnZVByb3h5LnBhZ2VJRCgpKTsKICAgICBpZiAoaXRlciAhPSBtX3dl YlBhZ2VIYW5kbGVNYXAuZW5kKCkpCiAgICAgICAgIHJldHVybiBpdGVyLT52YWx1ZTsKIAogICAg IFN0cmluZyBoYW5kbGUgPSBXZWJDb3JlOjpjcmVhdGVDYW5vbmljYWxVVUlEU3RyaW5nKCkuY29u dmVydFRvQVNDSUlVcHBlcmNhc2UoKTsKIAotICAgIGF1dG8gZmlyc3RBZGRSZXN1bHQgPSBtX3dl YlBhZ2VIYW5kbGVNYXAuYWRkKHdlYlBhZ2VQcm94eS0+cGFnZUlEKCksIGhhbmRsZSk7CisgICAg YXV0byBmaXJzdEFkZFJlc3VsdCA9IG1fd2ViUGFnZUhhbmRsZU1hcC5hZGQod2ViUGFnZVByb3h5 LnBhZ2VJRCgpLCBoYW5kbGUpOwogICAgIFJFTEVBU0VfQVNTRVJUKGZpcnN0QWRkUmVzdWx0Lmlz TmV3RW50cnkpOwogCi0gICAgYXV0byBzZWNvbmRBZGRSZXN1bHQgPSBtX2hhbmRsZVdlYlBhZ2VN YXAuYWRkKGhhbmRsZSwgd2ViUGFnZVByb3h5LT5wYWdlSUQoKSk7CisgICAgYXV0byBzZWNvbmRB ZGRSZXN1bHQgPSBtX2hhbmRsZVdlYlBhZ2VNYXAuYWRkKGhhbmRsZSwgd2ViUGFnZVByb3h5LnBh Z2VJRCgpKTsKICAgICBSRUxFQVNFX0FTU0VSVChzZWNvbmRBZGRSZXN1bHQuaXNOZXdFbnRyeSk7 CiAKICAgICByZXR1cm4gaGFuZGxlOwogfQogCitSZWZQdHI8SW5zcGVjdG9yOjpQcm90b2NvbDo6 QXV0b21hdGlvbjo6QnJvd3NpbmdDb250ZXh0PiBXZWJBdXRvbWF0aW9uU2Vzc2lvbjo6YnVpbGRC cm93c2luZ0NvbnRleHRGb3JQYWdlKFdlYlBhZ2VQcm94eSYgcGFnZSkKK3sKKyAgICBXZWJDb3Jl OjpGbG9hdFJlY3Qgd2luZG93RnJhbWU7CisgICAgcGFnZS5nZXRXaW5kb3dGcmFtZSh3aW5kb3dG cmFtZSk7CisKKyAgICBhdXRvIG9yaWdpbk9iamVjdCA9IEluc3BlY3Rvcjo6UHJvdG9jb2w6OkF1 dG9tYXRpb246OlBvaW50OjpjcmVhdGUoKQorICAgICAgICAuc2V0WCh3aW5kb3dGcmFtZS54KCkp CisgICAgICAgIC5zZXRZKHdpbmRvd0ZyYW1lLnkoKSkKKyAgICAgICAgLnJlbGVhc2UoKTsKKyAg ICAKKyAgICBhdXRvIHNpemVPYmplY3QgPSBJbnNwZWN0b3I6OlByb3RvY29sOjpBdXRvbWF0aW9u OjpTaXplOjpjcmVhdGUoKQorICAgICAgICAuc2V0V2lkdGgod2luZG93RnJhbWUud2lkdGgoKSkK KyAgICAgICAgLnNldEhlaWdodCh3aW5kb3dGcmFtZS5oZWlnaHQoKSkKKyAgICAgICAgLnJlbGVh c2UoKTsKKworICAgIGF1dG8gd2luZG93RnJhbWVPYmplY3QgPSBJbnNwZWN0b3I6OlByb3RvY29s OjpBdXRvbWF0aW9uOjpSZWN0OjpjcmVhdGUoKQorICAgICAgICAuc2V0T3JpZ2luKFdURk1vdmUo b3JpZ2luT2JqZWN0KSkKKyAgICAgICAgLnNldFNpemUoV1RGTW92ZShzaXplT2JqZWN0KSkKKyAg ICAgICAgLnJlbGVhc2UoKTsKKworICAgIFN0cmluZyBoYW5kbGUgPSBoYW5kbGVGb3JXZWJQYWdl UHJveHkocGFnZSk7CisKKyAgICByZXR1cm4gSW5zcGVjdG9yOjpQcm90b2NvbDo6QXV0b21hdGlv bjo6QnJvd3NpbmdDb250ZXh0OjpjcmVhdGUoKQorICAgICAgICAuc2V0SGFuZGxlKGhhbmRsZSkK KyAgICAgICAgLnNldEFjdGl2ZShtX2FjdGl2ZUJyb3dzaW5nQ29udGV4dEhhbmRsZSA9PSBoYW5k bGUpCisgICAgICAgIC5zZXRVcmwocGFnZS5wYWdlTG9hZFN0YXRlKCkuYWN0aXZlVVJMKCkpCisg ICAgICAgIC5zZXRXaW5kb3dGcmFtZShXVEZNb3ZlKHdpbmRvd0ZyYW1lT2JqZWN0KSkKKyAgICAg ICAgLnJlbGVhc2UoKTsKK30KKwogLy8gSW5zcGVjdG9yOjpBdXRvbWF0aW9uQmFja2VuZERpc3Bh dGNoZXJIYW5kbGVyIEFQSQogCi12b2lkIFdlYkF1dG9tYXRpb25TZXNzaW9uOjpnZXRCcm93c2lu Z0NvbnRleHRzKEluc3BlY3Rvcjo6RXJyb3JTdHJpbmcmIGVycm9yU3RyaW5nLCBSZWZQdHI8SW5z cGVjdG9yOjpQcm90b2NvbDo6QXJyYXk8SW5zcGVjdG9yOjpQcm90b2NvbDo6QXV0b21hdGlvbjo6 QnJvd3NpbmdDb250ZXh0Pj4mIGNvbnRleHRzKQordm9pZCBXZWJBdXRvbWF0aW9uU2Vzc2lvbjo6 Z2V0QnJvd3NpbmdDb250ZXh0cyhFcnJvclN0cmluZyYgZXJyb3JTdHJpbmcsIFJlZlB0cjxJbnNw ZWN0b3I6OlByb3RvY29sOjpBcnJheTxJbnNwZWN0b3I6OlByb3RvY29sOjpBdXRvbWF0aW9uOjpC cm93c2luZ0NvbnRleHQ+PiYgY29udGV4dHMpCiB7CiAgICAgY29udGV4dHMgPSBJbnNwZWN0b3I6 OlByb3RvY29sOjpBcnJheTxJbnNwZWN0b3I6OlByb3RvY29sOjpBdXRvbWF0aW9uOjpCcm93c2lu Z0NvbnRleHQ+OjpjcmVhdGUoKTsKIAogICAgIGZvciAoYXV0byYgcHJvY2VzcyA6IG1fcHJvY2Vz c1Bvb2wtPnByb2Nlc3NlcygpKSB7Ci0gICAgICAgIGZvciAoYXV0byYgcGFnZSA6IHByb2Nlc3Mt PnBhZ2VzKCkpIHsKKyAgICAgICAgZm9yIChhdXRvKiBwYWdlIDogcHJvY2Vzcy0+cGFnZXMoKSkg eworICAgICAgICAgICAgQVNTRVJUKHBhZ2UpOworCiAgICAgICAgICAgICBpZiAoIXBhZ2UtPmlz Q29udHJvbGxlZEJ5QXV0b21hdGlvbigpKQogICAgICAgICAgICAgICAgIGNvbnRpbnVlOwogCi0g ICAgICAgICAgICBTdHJpbmcgaGFuZGxlID0gaGFuZGxlRm9yV2ViUGFnZVByb3h5KHBhZ2UpOwot Ci0gICAgICAgICAgICBhdXRvIGJyb3dzaW5nQ29udGV4dCA9IEluc3BlY3Rvcjo6UHJvdG9jb2w6 OkF1dG9tYXRpb246OkJyb3dzaW5nQ29udGV4dDo6Y3JlYXRlKCkKLSAgICAgICAgICAgICAgICAu c2V0SGFuZGxlKGhhbmRsZUZvcldlYlBhZ2VQcm94eShwYWdlKSkKLSAgICAgICAgICAgICAgICAu c2V0QWN0aXZlKG1fYWN0aXZlQnJvd3NpbmdDb250ZXh0SGFuZGxlID09IGhhbmRsZSkKLSAgICAg ICAgICAgICAgICAuc2V0VXJsKHBhZ2UtPnBhZ2VMb2FkU3RhdGUoKS5hY3RpdmVVUkwoKSkKLSAg ICAgICAgICAgICAgICAucmVsZWFzZSgpOwotCi0gICAgICAgICAgICBjb250ZXh0cy0+YWRkSXRl bShicm93c2luZ0NvbnRleHQuY29weVJlZigpKTsKKyAgICAgICAgICAgIGNvbnRleHRzLT5hZGRJ dGVtKGJ1aWxkQnJvd3NpbmdDb250ZXh0Rm9yUGFnZSgqcGFnZSkpOwogICAgICAgICB9CiAgICAg fQogfQogCi12b2lkIFdlYkF1dG9tYXRpb25TZXNzaW9uOjpnZXRCcm93c2luZ0NvbnRleHQoSW5z cGVjdG9yOjpFcnJvclN0cmluZyYgZXJyb3JTdHJpbmcsIGNvbnN0IFN0cmluZyYgaGFuZGxlLCBS ZWZQdHI8SW5zcGVjdG9yOjpQcm90b2NvbDo6QXV0b21hdGlvbjo6QnJvd3NpbmdDb250ZXh0PiYg Y29udGV4dCkKK3ZvaWQgV2ViQXV0b21hdGlvblNlc3Npb246OmdldEJyb3dzaW5nQ29udGV4dChF cnJvclN0cmluZyYgZXJyb3JTdHJpbmcsIGNvbnN0IFN0cmluZyYgaGFuZGxlLCBSZWZQdHI8SW5z cGVjdG9yOjpQcm90b2NvbDo6QXV0b21hdGlvbjo6QnJvd3NpbmdDb250ZXh0PiYgY29udGV4dCkK IHsKICAgICBXZWJQYWdlUHJveHkqIHBhZ2UgPSB3ZWJQYWdlUHJveHlGb3JIYW5kbGUoaGFuZGxl KTsKICAgICBpZiAoIXBhZ2UpCiAgICAgICAgIEZBSUxfV0lUSF9QUkVERUZJTkVEX0VSUk9SX01F U1NBR0UoV2luZG93Tm90Rm91bmQpOwogCi0gICAgY29udGV4dCA9IEluc3BlY3Rvcjo6UHJvdG9j b2w6OkF1dG9tYXRpb246OkJyb3dzaW5nQ29udGV4dDo6Y3JlYXRlKCkKLSAgICAgICAgLnNldEhh bmRsZShoYW5kbGVGb3JXZWJQYWdlUHJveHkocGFnZSkpCi0gICAgICAgIC5zZXRBY3RpdmUobV9h Y3RpdmVCcm93c2luZ0NvbnRleHRIYW5kbGUgPT0gaGFuZGxlKQotICAgICAgICAuc2V0VXJsKHBh Z2UtPnBhZ2VMb2FkU3RhdGUoKS5hY3RpdmVVUkwoKSkKLSAgICAgICAgLnJlbGVhc2UoKTsKKyAg ICBjb250ZXh0ID0gYnVpbGRCcm93c2luZ0NvbnRleHRGb3JQYWdlKCpwYWdlKTsKIH0KIAotdm9p ZCBXZWJBdXRvbWF0aW9uU2Vzc2lvbjo6Y3JlYXRlQnJvd3NpbmdDb250ZXh0KEluc3BlY3Rvcjo6 RXJyb3JTdHJpbmcmIGVycm9yU3RyaW5nLCBTdHJpbmcqIGhhbmRsZSkKK3ZvaWQgV2ViQXV0b21h dGlvblNlc3Npb246OmNyZWF0ZUJyb3dzaW5nQ29udGV4dChFcnJvclN0cmluZyYgZXJyb3JTdHJp bmcsIFN0cmluZyogaGFuZGxlKQogewogICAgIEFTU0VSVChtX2NsaWVudCk7CiAgICAgaWYgKCFt X2NsaWVudCkKQEAgLTE3MywxMCArMTkzLDExIEBAIHZvaWQgV2ViQXV0b21hdGlvblNlc3Npb246 OmNyZWF0ZUJyb3dzaW5nQ29udGV4dChJbnNwZWN0b3I6OkVycm9yU3RyaW5nJiBlcnJvclN0CiAg ICAgaWYgKCFwYWdlKQogICAgICAgICBGQUlMX1dJVEhfUFJFREVGSU5FRF9FUlJPUl9NRVNTQUdF KEludGVybmFsRXJyb3IpOwogCi0gICAgbV9hY3RpdmVCcm93c2luZ0NvbnRleHRIYW5kbGUgPSAq aGFuZGxlID0gaGFuZGxlRm9yV2ViUGFnZVByb3h5KHBhZ2UpOworICAgIG1fYWN0aXZlQnJvd3Np bmdDb250ZXh0SGFuZGxlID0gaGFuZGxlRm9yV2ViUGFnZVByb3h5KCpwYWdlKTsKKyAgICAqaGFu ZGxlID0gbV9hY3RpdmVCcm93c2luZ0NvbnRleHRIYW5kbGU7CiB9CiAKLXZvaWQgV2ViQXV0b21h dGlvblNlc3Npb246OmNsb3NlQnJvd3NpbmdDb250ZXh0KEluc3BlY3Rvcjo6RXJyb3JTdHJpbmcm IGVycm9yU3RyaW5nLCBjb25zdCBTdHJpbmcmIGhhbmRsZSkKK3ZvaWQgV2ViQXV0b21hdGlvblNl c3Npb246OmNsb3NlQnJvd3NpbmdDb250ZXh0KEVycm9yU3RyaW5nJiBlcnJvclN0cmluZywgY29u c3QgU3RyaW5nJiBoYW5kbGUpCiB7CiAgICAgV2ViUGFnZVByb3h5KiBwYWdlID0gd2ViUGFnZVBy b3h5Rm9ySGFuZGxlKGhhbmRsZSk7CiAgICAgaWYgKCFwYWdlKQpAQCAtMTg4LDcgKzIwOSw3IEBA IHZvaWQgV2ViQXV0b21hdGlvblNlc3Npb246OmNsb3NlQnJvd3NpbmdDb250ZXh0KEluc3BlY3Rv cjo6RXJyb3JTdHJpbmcmIGVycm9yU3RyCiAgICAgcGFnZS0+Y2xvc2VQYWdlKGZhbHNlKTsKIH0K IAotdm9pZCBXZWJBdXRvbWF0aW9uU2Vzc2lvbjo6c3dpdGNoVG9Ccm93c2luZ0NvbnRleHQoSW5z cGVjdG9yOjpFcnJvclN0cmluZyYgZXJyb3JTdHJpbmcsIGNvbnN0IFN0cmluZyYgaGFuZGxlKQor dm9pZCBXZWJBdXRvbWF0aW9uU2Vzc2lvbjo6c3dpdGNoVG9Ccm93c2luZ0NvbnRleHQoRXJyb3JT dHJpbmcmIGVycm9yU3RyaW5nLCBjb25zdCBTdHJpbmcmIGhhbmRsZSkKIHsKICAgICBXZWJQYWdl UHJveHkqIHBhZ2UgPSB3ZWJQYWdlUHJveHlGb3JIYW5kbGUoaGFuZGxlKTsKICAgICBpZiAoIXBh Z2UpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQXV0b21hdGlvbi9XZWJB dXRvbWF0aW9uU2Vzc2lvbi5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0F1dG9tYXRpb24v V2ViQXV0b21hdGlvblNlc3Npb24uaAppbmRleCAyZmQ4YWE1NDEwZTE5MmVhZDRkNWJhMTNmODNm NzU3YjE5N2Y2NGM5Li5hZDZiMjUzNGJkOGZmMjU4M2NkZWMyODNkNDFhYWJhNjBjZGM3NjUwIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQXV0b21hdGlvbi9XZWJBdXRvbWF0 aW9uU2Vzc2lvbi5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BdXRvbWF0aW9uL1dl YkF1dG9tYXRpb25TZXNzaW9uLmgKQEAgLTkxLDcgKzkxLDkgQEAgcHVibGljOgogCiBwcml2YXRl OgogICAgIFdlYktpdDo6V2ViUGFnZVByb3h5KiB3ZWJQYWdlUHJveHlGb3JIYW5kbGUoY29uc3Qg U3RyaW5nJik7Ci0gICAgU3RyaW5nIGhhbmRsZUZvcldlYlBhZ2VQcm94eShXZWJLaXQ6OldlYlBh Z2VQcm94eSopOworICAgIFN0cmluZyBoYW5kbGVGb3JXZWJQYWdlUHJveHkoY29uc3QgV2ViUGFn ZVByb3h5Jik7CisKKyAgICBSZWZQdHI8SW5zcGVjdG9yOjpQcm90b2NvbDo6QXV0b21hdGlvbjo6 QnJvd3NpbmdDb250ZXh0PiBidWlsZEJyb3dzaW5nQ29udGV4dEZvclBhZ2UoV2ViUGFnZVByb3h5 Jik7CiAKICAgICBXZWJLaXQ6OldlYlByb2Nlc3NQb29sKiBtX3Byb2Nlc3NQb29sIHsgbnVsbHB0 ciB9OwogICAgIHN0ZDo6dW5pcXVlX3B0cjxBUEk6OkF1dG9tYXRpb25TZXNzaW9uQ2xpZW50PiBt X2NsaWVudDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJv eHkuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAppbmRleCA4Mjkx NmI1NDc5ODIwYWQ2NTBlNTU1NzQ4MGJmYzM5OGZjOTIzNjNiLi4wYmFhZWMwMmI3ZTY5YjhkZDk3 NzE0ZWJmNzVjM2IxNWNlNTU2OWQ2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvV2ViUGFnZVByb3h5LmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQ cm94eS5oCkBAIC0xMDk2LDYgKzEwOTYsNyBAQCBwdWJsaWM6CiAgICAgdm9pZCBkaWRSZXN0b3Jl U2Nyb2xsUG9zaXRpb24oKTsKIAogICAgIHZvaWQgc2V0Rm9jdXMoYm9vbCBmb2N1c2VkKTsKKyAg ICB2b2lkIGdldFdpbmRvd0ZyYW1lKFdlYkNvcmU6OkZsb2F0UmVjdCYpOwogCiBwcml2YXRlOgog ICAgIFdlYlBhZ2VQcm94eShQYWdlQ2xpZW50JiwgV2ViUHJvY2Vzc1Byb3h5JiwgdWludDY0X3Qg cGFnZUlELCBSZWY8QVBJOjpQYWdlQ29uZmlndXJhdGlvbj4mJik7CkBAIC0xMTk3LDcgKzExOTgs NiBAQCBwcml2YXRlOgogICAgIHZvaWQgc2V0SXNSZXNpemFibGUoYm9vbCBpc1Jlc2l6YWJsZSk7 CiAgICAgdm9pZCBnZXRJc1Jlc2l6YWJsZShib29sJiBpc1Jlc2l6YWJsZSk7CiAgICAgdm9pZCBz ZXRXaW5kb3dGcmFtZShjb25zdCBXZWJDb3JlOjpGbG9hdFJlY3QmKTsKLSAgICB2b2lkIGdldFdp bmRvd0ZyYW1lKFdlYkNvcmU6OkZsb2F0UmVjdCYpOwogICAgIHZvaWQgc2NyZWVuVG9Sb290Vmll dyhjb25zdCBXZWJDb3JlOjpJbnRQb2ludCYgc2NyZWVuUG9pbnQsIFdlYkNvcmU6OkludFBvaW50 JiB3aW5kb3dQb2ludCk7CiAgICAgdm9pZCByb290Vmlld1RvU2NyZWVuKGNvbnN0IFdlYkNvcmU6 OkludFJlY3QmIHZpZXdSZWN0LCBXZWJDb3JlOjpJbnRSZWN0JiByZXN1bHQpOwogI2lmIFBMQVRG T1JNKElPUykK