96785 2012-09-14 07:32:50 -0700 [GTK] Don't use the C API internally in WebKitWindowProperties 2012-10-18 06:40:02 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) PC Linux RESOLVED FIXED Gtk P2 Normal --- 96784 96766 96786 99705 1 cgarcia webkit-unassigned mario oldest_to_newest 720753 0 cgarcia 2012-09-14 07:32:50 -0700 Use the C++ classes instead. 720754 1 164150 cgarcia 2012-09-14 07:34:04 -0700 Created attachment 164150 Patch 733452 2 164150 mario 2012-10-03 01:50:01 -0700 Comment on attachment 164150 Patch Looks good to me 745221 3 cgarcia 2012-10-18 06:40:02 -0700 Committed r131742: <http://trac.webkit.org/changeset/131742> 164150 2012-09-14 07:34:04 -0700 2012-10-18 06:26:47 -0700 Patch wk2-no-c-api-window-props.diff text/plain 9210 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCBmZjY2M2ZiLi42M2Y3YjMxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAg QEAKKzIwMTItMDktMTQgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgorCisgICAgICAgIFtHVEtdIERvbid0IHVzZSB0aGUgQyBBUEkgaW50ZXJuYWxseSBpbiBXZWJL aXRXaW5kb3dQcm9wZXJ0aWVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD05Njc4NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIFVzaW5nIHRoZSBDKysgY2xhc3NlcyBkaXJlY3RseSBpbnN0ZWFkIG9mIHRoZSBD IEFQSSB3cmFwcGVycyB3ZQorICAgICAgICBhdm9pZCBhIGxvdCBvZiB0b0ltcGwvdG9BUEkgY2Fz dHMsIHN0cmluZyBjb252ZXJzaW9ucyBhbmQKKyAgICAgICAgYWxsb2NhdGlvbnMuIFRoZSBjb2Rl IGlzIGFsc28gYSBsb3Qgc2ltcGxlciBhbmQgZWFzaWVyIHRvIHJlYWQuCisKKyAgICAgICAgKiBV SVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJWaWV3LmNwcDoKKyAgICAgICAgKHdlYmtpdFdlYlZp ZXdDcmVhdGVOZXdQYWdlKToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXaW5k b3dQcm9wZXJ0aWVzLmNwcDoKKyAgICAgICAgKHdlYmtpdFdpbmRvd1Byb3BlcnRpZXNVcGRhdGVG cm9tV2ViV2luZG93RmVhdHVyZXMpOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZ3RrL1dlYktp dFdpbmRvd1Byb3BlcnRpZXNQcml2YXRlLmg6CisKIDIwMTItMDktMTIgIFNoZXJpZmYgQm90ICA8 d2Via2l0LnJldmlldy5ib3RAZ21haWwuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQsIHJvbGxp bmcgb3V0IHIxMjc4NzYuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJ L2d0ay9XZWJLaXRXZWJWaWV3LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3Rr L1dlYktpdFdlYlZpZXcuY3BwCmluZGV4IDFiZTI5ZWUuLjViMjQyOWQgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXcuY3BwCisrKyBiL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXcuY3BwCkBAIC0xMjAy LDcgKzEyMDIsNyBAQCBXZWJQYWdlUHJveHkqIHdlYmtpdFdlYlZpZXdDcmVhdGVOZXdQYWdlKFdl YktpdFdlYlZpZXcqIHdlYlZpZXcsIEltbXV0YWJsZURpY3RpbwogICAgIGlmICghbmV3V2ViVmll dykKICAgICAgICAgcmV0dXJuIDA7CiAKLSAgICB3ZWJraXRXaW5kb3dQcm9wZXJ0aWVzVXBkYXRl RnJvbVdLV2luZG93RmVhdHVyZXMobmV3V2ViVmlldy0+cHJpdi0+d2luZG93UHJvcGVydGllcy5n ZXQoKSwgdG9BUEkod2luZG93RmVhdHVyZXMpKTsKKyAgICB3ZWJraXRXaW5kb3dQcm9wZXJ0aWVz VXBkYXRlRnJvbVdlYldpbmRvd0ZlYXR1cmVzKG5ld1dlYlZpZXctPnByaXYtPndpbmRvd1Byb3Bl cnRpZXMuZ2V0KCksIHdpbmRvd0ZlYXR1cmVzKTsKIAogICAgIFJlZlB0cjxXZWJQYWdlUHJveHk+ IG5ld1BhZ2UgPSBnZXRQYWdlKG5ld1dlYlZpZXcpOwogICAgIHJldHVybiBuZXdQYWdlLnJlbGVh c2UoKS5sZWFrUmVmKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJ L2d0ay9XZWJLaXRXaW5kb3dQcm9wZXJ0aWVzLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9BUEkvZ3RrL1dlYktpdFdpbmRvd1Byb3BlcnRpZXMuY3BwCmluZGV4IDI0MmI3NTMuLmE4M2Rh OGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdp bmRvd1Byb3BlcnRpZXMuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3Rr L1dlYktpdFdpbmRvd1Byb3BlcnRpZXMuY3BwCkBAIC0yMCw4ICsyMCwxMCBAQAogI2luY2x1ZGUg ImNvbmZpZy5oIgogI2luY2x1ZGUgIldlYktpdFdpbmRvd1Byb3BlcnRpZXMuaCIKIAorI2luY2x1 ZGUgIkltbXV0YWJsZURpY3Rpb25hcnkuaCIKICNpbmNsdWRlICJXZWJLaXRQcml2YXRlLmgiCiAj aW5jbHVkZSAiV2ViS2l0V2luZG93UHJvcGVydGllc1ByaXZhdGUuaCIKKyNpbmNsdWRlICJXZWJO dW1iZXIuaCIKICNpbmNsdWRlICJXZWJVUkxSZXF1ZXN0LmgiCiAjaW5jbHVkZSA8V2ViQ29yZS9J bnRSZWN0Lmg+CiAjaW5jbHVkZSA8Z2xpYi9naTE4bi1saWIuaD4KQEAgLTM4OCw1NiArMzkwLDU0 IEBAIHZvaWQgd2Via2l0V2luZG93UHJvcGVydGllc1NldEZ1bGxzY3JlZW4oV2ViS2l0V2luZG93 UHJvcGVydGllcyogd2luZG93UHJvcGVydGllCiAgICAgZ19vYmplY3Rfbm90aWZ5KEdfT0JKRUNU KHdpbmRvd1Byb3BlcnRpZXMpLCAiZnVsbHNjcmVlbiIpOwogfQogCi12b2lkIHdlYmtpdFdpbmRv d1Byb3BlcnRpZXNVcGRhdGVGcm9tV0tXaW5kb3dGZWF0dXJlcyhXZWJLaXRXaW5kb3dQcm9wZXJ0 aWVzKiB3aW5kb3dQcm9wZXJ0aWVzLCBXS0RpY3Rpb25hcnlSZWYgd2tGZWF0dXJlcykKK3ZvaWQg d2Via2l0V2luZG93UHJvcGVydGllc1VwZGF0ZUZyb21XZWJXaW5kb3dGZWF0dXJlcyhXZWJLaXRX aW5kb3dQcm9wZXJ0aWVzKiB3aW5kb3dQcm9wZXJ0aWVzLCBJbW11dGFibGVEaWN0aW9uYXJ5KiBm ZWF0dXJlcykKIHsKICAgICBHZGtSZWN0YW5nbGUgZ2VvbWV0cnkgPSB3aW5kb3dQcm9wZXJ0aWVz LT5wcml2LT5nZW9tZXRyeTsKIAotICAgIFdLRG91YmxlUmVmIGRvdWJsZVZhbHVlOwotICAgIFdL UmV0YWluUHRyPFdLU3RyaW5nUmVmPiB4S2V5KEFkb3B0V0ssIFdLU3RyaW5nQ3JlYXRlV2l0aFVU RjhDU3RyaW5nKCJ4IikpOwotICAgIGlmIChkb3VibGVWYWx1ZSA9IHN0YXRpY19jYXN0PFdLRG91 YmxlUmVmPihXS0RpY3Rpb25hcnlHZXRJdGVtRm9yS2V5KHdrRmVhdHVyZXMsIHhLZXkuZ2V0KCkp KSkKLSAgICAgICAgZ2VvbWV0cnkueCA9IFdLRG91YmxlR2V0VmFsdWUoZG91YmxlVmFsdWUpOwor ICAgIFdlYkRvdWJsZSogZG91YmxlVmFsdWUgPSBzdGF0aWNfY2FzdDxXZWJEb3VibGUqPihmZWF0 dXJlcy0+Z2V0KCJ4IikpOworICAgIGlmIChkb3VibGVWYWx1ZSkKKyAgICAgICAgZ2VvbWV0cnku eCA9IGRvdWJsZVZhbHVlLT52YWx1ZSgpOwogCi0gICAgV0tSZXRhaW5QdHI8V0tTdHJpbmdSZWY+ IHlLZXkoQWRvcHRXSywgV0tTdHJpbmdDcmVhdGVXaXRoVVRGOENTdHJpbmcoInkiKSk7Ci0gICAg aWYgKGRvdWJsZVZhbHVlID0gc3RhdGljX2Nhc3Q8V0tEb3VibGVSZWY+KFdLRGljdGlvbmFyeUdl dEl0ZW1Gb3JLZXkod2tGZWF0dXJlcywgeUtleS5nZXQoKSkpKQotICAgICAgICBnZW9tZXRyeS55 ID0gV0tEb3VibGVHZXRWYWx1ZShkb3VibGVWYWx1ZSk7CisgICAgZG91YmxlVmFsdWUgPSBzdGF0 aWNfY2FzdDxXZWJEb3VibGUqPihmZWF0dXJlcy0+Z2V0KCJ5IikpOworICAgIGlmIChkb3VibGVW YWx1ZSkKKyAgICAgICAgZ2VvbWV0cnkueSA9IGRvdWJsZVZhbHVlLT52YWx1ZSgpOwogCi0gICAg V0tSZXRhaW5QdHI8V0tTdHJpbmdSZWY+IHdpZHRoS2V5KEFkb3B0V0ssIFdLU3RyaW5nQ3JlYXRl V2l0aFVURjhDU3RyaW5nKCJ3aWR0aCIpKTsKLSAgICBpZiAoZG91YmxlVmFsdWUgPSBzdGF0aWNf Y2FzdDxXS0RvdWJsZVJlZj4oV0tEaWN0aW9uYXJ5R2V0SXRlbUZvcktleSh3a0ZlYXR1cmVzLCB3 aWR0aEtleS5nZXQoKSkpKQotICAgICAgICBnZW9tZXRyeS53aWR0aCA9IFdLRG91YmxlR2V0VmFs dWUoZG91YmxlVmFsdWUpOworICAgIGRvdWJsZVZhbHVlID0gc3RhdGljX2Nhc3Q8V2ViRG91Ymxl Kj4oZmVhdHVyZXMtPmdldCgid2lkdGgiKSk7CisgICAgaWYgKGRvdWJsZVZhbHVlKQorICAgICAg ICBnZW9tZXRyeS53aWR0aCA9IGRvdWJsZVZhbHVlLT52YWx1ZSgpOwogCi0gICAgV0tSZXRhaW5Q dHI8V0tTdHJpbmdSZWY+IGhlaWdodEtleShBZG9wdFdLLCBXS1N0cmluZ0NyZWF0ZVdpdGhVVEY4 Q1N0cmluZygiaGVpZ2h0IikpOwotICAgIGlmIChkb3VibGVWYWx1ZSA9IHN0YXRpY19jYXN0PFdL RG91YmxlUmVmPihXS0RpY3Rpb25hcnlHZXRJdGVtRm9yS2V5KHdrRmVhdHVyZXMsIGhlaWdodEtl eS5nZXQoKSkpKQotICAgICAgICBnZW9tZXRyeS5oZWlnaHQgPSBXS0RvdWJsZUdldFZhbHVlKGRv dWJsZVZhbHVlKTsKKyAgICBkb3VibGVWYWx1ZSA9IHN0YXRpY19jYXN0PFdlYkRvdWJsZSo+KGZl YXR1cmVzLT5nZXQoImhlaWdodCIpKTsKKyAgICBpZiAoZG91YmxlVmFsdWUpCisgICAgICAgIGdl b21ldHJ5LmhlaWdodCA9IGRvdWJsZVZhbHVlLT52YWx1ZSgpOwogICAgIHdlYmtpdFdpbmRvd1By b3BlcnRpZXNTZXRHZW9tZXRyeSh3aW5kb3dQcm9wZXJ0aWVzLCAmZ2VvbWV0cnkpOwogCi0gICAg V0tCb29sZWFuUmVmIGJvb2xlYW5WYWx1ZTsKLSAgICBXS1JldGFpblB0cjxXS1N0cmluZ1JlZj4g bWVudUJhclZpc2libGVLZXkoQWRvcHRXSywgV0tTdHJpbmdDcmVhdGVXaXRoVVRGOENTdHJpbmco Im1lbnVCYXJWaXNpYmxlIikpOwotICAgIGlmIChib29sZWFuVmFsdWUgPSBzdGF0aWNfY2FzdDxX S0Jvb2xlYW5SZWY+KFdLRGljdGlvbmFyeUdldEl0ZW1Gb3JLZXkod2tGZWF0dXJlcywgbWVudUJh clZpc2libGVLZXkuZ2V0KCkpKSkKLSAgICAgICAgd2Via2l0V2luZG93UHJvcGVydGllc1NldE1l bnViYXJWaXNpYmxlKHdpbmRvd1Byb3BlcnRpZXMsIFdLQm9vbGVhbkdldFZhbHVlKGJvb2xlYW5W YWx1ZSkpOworICAgIFdlYkJvb2xlYW4qIGJvb2xlYW5WYWx1ZSA9IHN0YXRpY19jYXN0PFdlYkJv b2xlYW4qPihmZWF0dXJlcy0+Z2V0KCJtZW51QmFyVmlzaWJsZSIpKTsKKyAgICBpZiAoYm9vbGVh blZhbHVlKQorICAgICAgICB3ZWJraXRXaW5kb3dQcm9wZXJ0aWVzU2V0TWVudWJhclZpc2libGUo d2luZG93UHJvcGVydGllcywgYm9vbGVhblZhbHVlLT52YWx1ZSgpKTsKIAotICAgIFdLUmV0YWlu UHRyPFdLU3RyaW5nUmVmPiBzdGF0dXNCYXJWaXNpYmxlS2V5KEFkb3B0V0ssIFdLU3RyaW5nQ3Jl YXRlV2l0aFVURjhDU3RyaW5nKCJzdGF0dXNCYXJWaXNpYmxlIikpOwotICAgIGlmIChib29sZWFu VmFsdWUgPSBzdGF0aWNfY2FzdDxXS0Jvb2xlYW5SZWY+KFdLRGljdGlvbmFyeUdldEl0ZW1Gb3JL ZXkod2tGZWF0dXJlcywgc3RhdHVzQmFyVmlzaWJsZUtleS5nZXQoKSkpKQotICAgICAgICB3ZWJr aXRXaW5kb3dQcm9wZXJ0aWVzU2V0U3RhdHVzYmFyVmlzaWJsZSh3aW5kb3dQcm9wZXJ0aWVzLCBX S0Jvb2xlYW5HZXRWYWx1ZShib29sZWFuVmFsdWUpKTsKKyAgICBib29sZWFuVmFsdWUgPSBzdGF0 aWNfY2FzdDxXZWJCb29sZWFuKj4oZmVhdHVyZXMtPmdldCgic3RhdHVzQmFyVmlzaWJsZSIpKTsK KyAgICBpZiAoYm9vbGVhblZhbHVlKQorICAgICAgICB3ZWJraXRXaW5kb3dQcm9wZXJ0aWVzU2V0 U3RhdHVzYmFyVmlzaWJsZSh3aW5kb3dQcm9wZXJ0aWVzLCBib29sZWFuVmFsdWUtPnZhbHVlKCkp OwogCi0gICAgV0tSZXRhaW5QdHI8V0tTdHJpbmdSZWY+IHRvb2xCYXJWaXNpYmxlS2V5KEFkb3B0 V0ssIFdLU3RyaW5nQ3JlYXRlV2l0aFVURjhDU3RyaW5nKCJ0b29sQmFyVmlzaWJsZSIpKTsKLSAg ICBpZiAoYm9vbGVhblZhbHVlID0gc3RhdGljX2Nhc3Q8V0tCb29sZWFuUmVmPihXS0RpY3Rpb25h cnlHZXRJdGVtRm9yS2V5KHdrRmVhdHVyZXMsIHRvb2xCYXJWaXNpYmxlS2V5LmdldCgpKSkpCi0g ICAgICAgIHdlYmtpdFdpbmRvd1Byb3BlcnRpZXNTZXRUb29sYmFyVmlzaWJsZSh3aW5kb3dQcm9w ZXJ0aWVzLCBXS0Jvb2xlYW5HZXRWYWx1ZShib29sZWFuVmFsdWUpKTsKKyAgICBib29sZWFuVmFs dWUgPSBzdGF0aWNfY2FzdDxXZWJCb29sZWFuKj4oZmVhdHVyZXMtPmdldCgidG9vbEJhclZpc2li bGUiKSk7CisgICAgaWYgKGJvb2xlYW5WYWx1ZSkKKyAgICAgICAgd2Via2l0V2luZG93UHJvcGVy dGllc1NldFRvb2xiYXJWaXNpYmxlKHdpbmRvd1Byb3BlcnRpZXMsIGJvb2xlYW5WYWx1ZS0+dmFs dWUoKSk7CiAKLSAgICBXS1JldGFpblB0cjxXS1N0cmluZ1JlZj4gbG9jYXRpb25CYXJWaXNpYmxl S2V5KEFkb3B0V0ssIFdLU3RyaW5nQ3JlYXRlV2l0aFVURjhDU3RyaW5nKCJsb2NhdGlvbkJhclZp c2libGUiKSk7Ci0gICAgaWYgKGJvb2xlYW5WYWx1ZSA9IHN0YXRpY19jYXN0PFdLQm9vbGVhblJl Zj4oV0tEaWN0aW9uYXJ5R2V0SXRlbUZvcktleSh3a0ZlYXR1cmVzLCBsb2NhdGlvbkJhclZpc2li bGVLZXkuZ2V0KCkpKSkKLSAgICAgICAgd2Via2l0V2luZG93UHJvcGVydGllc1NldExvY2F0aW9u YmFyVmlzaWJsZSh3aW5kb3dQcm9wZXJ0aWVzLCBXS0Jvb2xlYW5HZXRWYWx1ZShib29sZWFuVmFs dWUpKTsKKyAgICBib29sZWFuVmFsdWUgPSBzdGF0aWNfY2FzdDxXZWJCb29sZWFuKj4oZmVhdHVy ZXMtPmdldCgibG9jYXRpb25CYXJWaXNpYmxlIikpOworICAgIGlmIChib29sZWFuVmFsdWUpCisg ICAgICAgIHdlYmtpdFdpbmRvd1Byb3BlcnRpZXNTZXRMb2NhdGlvbmJhclZpc2libGUod2luZG93 UHJvcGVydGllcywgYm9vbGVhblZhbHVlLT52YWx1ZSgpKTsKIAotICAgIFdLUmV0YWluUHRyPFdL U3RyaW5nUmVmPiBzY3JvbGxiYXJzVmlzaWJsZUtleShBZG9wdFdLLCBXS1N0cmluZ0NyZWF0ZVdp dGhVVEY4Q1N0cmluZygic2Nyb2xsYmFyc1Zpc2libGUiKSk7Ci0gICAgaWYgKGJvb2xlYW5WYWx1 ZSA9IHN0YXRpY19jYXN0PFdLQm9vbGVhblJlZj4oV0tEaWN0aW9uYXJ5R2V0SXRlbUZvcktleSh3 a0ZlYXR1cmVzLCBzY3JvbGxiYXJzVmlzaWJsZUtleS5nZXQoKSkpKQotICAgICAgICB3ZWJraXRX aW5kb3dQcm9wZXJ0aWVzU2V0U2Nyb2xsYmFyc1Zpc2libGUod2luZG93UHJvcGVydGllcywgV0tC b29sZWFuR2V0VmFsdWUoYm9vbGVhblZhbHVlKSk7CisgICAgYm9vbGVhblZhbHVlID0gc3RhdGlj X2Nhc3Q8V2ViQm9vbGVhbio+KGZlYXR1cmVzLT5nZXQoInNjcm9sbGJhcnNWaXNpYmxlIikpOwor ICAgIGlmIChib29sZWFuVmFsdWUpCisgICAgICAgIHdlYmtpdFdpbmRvd1Byb3BlcnRpZXNTZXRT Y3JvbGxiYXJzVmlzaWJsZSh3aW5kb3dQcm9wZXJ0aWVzLCBib29sZWFuVmFsdWUtPnZhbHVlKCkp OwogCi0gICAgV0tSZXRhaW5QdHI8V0tTdHJpbmdSZWY+IHJlc2l6YWJsZUtleShBZG9wdFdLLCBX S1N0cmluZ0NyZWF0ZVdpdGhVVEY4Q1N0cmluZygicmVzaXphYmxlIikpOwotICAgIGlmIChib29s ZWFuVmFsdWUgPSBzdGF0aWNfY2FzdDxXS0Jvb2xlYW5SZWY+KFdLRGljdGlvbmFyeUdldEl0ZW1G b3JLZXkod2tGZWF0dXJlcywgcmVzaXphYmxlS2V5LmdldCgpKSkpCi0gICAgICAgIHdlYmtpdFdp bmRvd1Byb3BlcnRpZXNTZXRSZXNpemFibGUod2luZG93UHJvcGVydGllcywgV0tCb29sZWFuR2V0 VmFsdWUoYm9vbGVhblZhbHVlKSk7CisgICAgYm9vbGVhblZhbHVlID0gc3RhdGljX2Nhc3Q8V2Vi Qm9vbGVhbio+KGZlYXR1cmVzLT5nZXQoInJlc2l6YWJsZSIpKTsKKyAgICBpZiAoYm9vbGVhblZh bHVlKQorICAgICAgICB3ZWJraXRXaW5kb3dQcm9wZXJ0aWVzU2V0UmVzaXphYmxlKHdpbmRvd1By b3BlcnRpZXMsIGJvb2xlYW5WYWx1ZS0+dmFsdWUoKSk7CiAKLSAgICBXS1JldGFpblB0cjxXS1N0 cmluZ1JlZj4gZnVsbHNjcmVlbktleShBZG9wdFdLLCBXS1N0cmluZ0NyZWF0ZVdpdGhVVEY4Q1N0 cmluZygiZnVsbHNjcmVlbiIpKTsKLSAgICBpZiAoYm9vbGVhblZhbHVlID0gc3RhdGljX2Nhc3Q8 V0tCb29sZWFuUmVmPihXS0RpY3Rpb25hcnlHZXRJdGVtRm9yS2V5KHdrRmVhdHVyZXMsIGZ1bGxz Y3JlZW5LZXkuZ2V0KCkpKSkKLSAgICAgICAgd2Via2l0V2luZG93UHJvcGVydGllc1NldEZ1bGxz Y3JlZW4od2luZG93UHJvcGVydGllcywgV0tCb29sZWFuR2V0VmFsdWUoYm9vbGVhblZhbHVlKSk7 CisgICAgYm9vbGVhblZhbHVlID0gc3RhdGljX2Nhc3Q8V2ViQm9vbGVhbio+KGZlYXR1cmVzLT5n ZXQoImZ1bGxzY3JlZW4iKSk7CisgICAgaWYgKGJvb2xlYW5WYWx1ZSkKKyAgICAgICAgd2Via2l0 V2luZG93UHJvcGVydGllc1NldEZ1bGxzY3JlZW4od2luZG93UHJvcGVydGllcywgYm9vbGVhblZh bHVlLT52YWx1ZSgpKTsKIH0KIAogLyoqCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQVBJL2d0ay9XZWJLaXRXaW5kb3dQcm9wZXJ0aWVzUHJpdmF0ZS5oIGIvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2luZG93UHJvcGVydGllc1ByaXZhdGUuaApp bmRleCA3YjE3ODk1Li42OWQ0MzQwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvQVBJL2d0ay9XZWJLaXRXaW5kb3dQcm9wZXJ0aWVzUHJpdmF0ZS5oCisrKyBiL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdpbmRvd1Byb3BlcnRpZXNQcml2YXRlLmgK QEAgLTI3LDExICsyNywxMyBAQAogI2lmbmRlZiBXZWJLaXRXaW5kb3dQcm9wZXJ0aWVzUHJpdmF0 ZV9oCiAjZGVmaW5lIFdlYktpdFdpbmRvd1Byb3BlcnRpZXNQcml2YXRlX2gKIAorI2luY2x1ZGUg IldlYktpdFByaXZhdGUuaCIKICNpbmNsdWRlICJXZWJLaXRXaW5kb3dQcm9wZXJ0aWVzLmgiCi0j aW5jbHVkZSA8V2ViS2l0Mi9XS0Jhc2UuaD4KKwordXNpbmcgbmFtZXNwYWNlIFdlYktpdDsKIAog V2ViS2l0V2luZG93UHJvcGVydGllcyogd2Via2l0V2luZG93UHJvcGVydGllc0NyZWF0ZSgpOwot dm9pZCB3ZWJraXRXaW5kb3dQcm9wZXJ0aWVzVXBkYXRlRnJvbVdLV2luZG93RmVhdHVyZXMoV2Vi S2l0V2luZG93UHJvcGVydGllcyosIFdLRGljdGlvbmFyeVJlZiB3a0ZlYXR1cmVzKTsKK3ZvaWQg d2Via2l0V2luZG93UHJvcGVydGllc1VwZGF0ZUZyb21XZWJXaW5kb3dGZWF0dXJlcyhXZWJLaXRX aW5kb3dQcm9wZXJ0aWVzKiwgSW1tdXRhYmxlRGljdGlvbmFyeSogZmVhdHVyZXMpOwogdm9pZCB3 ZWJraXRXaW5kb3dQcm9wZXJ0aWVzU2V0R2VvbWV0cnkoV2ViS2l0V2luZG93UHJvcGVydGllcyos IEdka1JlY3RhbmdsZSopOwogdm9pZCB3ZWJraXRXaW5kb3dQcm9wZXJ0aWVzU2V0VG9vbGJhclZp c2libGUoV2ViS2l0V2luZG93UHJvcGVydGllcyosIGJvb2wgdG9vbGJhcnNWaXNpYmxlKTsKIHZv aWQgd2Via2l0V2luZG93UHJvcGVydGllc1NldE1lbnViYXJWaXNpYmxlKFdlYktpdFdpbmRvd1By b3BlcnRpZXMqLCBib29sIG1lbnVCYXJWaXNpYmxlKTsK