107924 2013-01-25 00:18:38 -0800 [EFL][WK2] Use C API inside ewk_window_features 2013-01-30 08:54:17 -0800 1 1 1 Unclassified WebKit WebKit EFL 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 107657 1 cdumez cdumez ap benjamin gyuyoung.kim kenneth lucas.de.marchi mikhail.pozdnyakov naginenis rakuco webkit.review.bot oldest_to_newest 816330 0 cdumez 2013-01-25 00:18:38 -0800 As per Bug 107657, we should start using the C API internally to avoid violating layering. 816466 1 184722 cdumez 2013-01-25 04:14:28 -0800 Created attachment 184722 Patch 820237 2 184722 webkit.review.bot 2013-01-30 08:54:13 -0800 Comment on attachment 184722 Patch Clearing flags on attachment: 184722 Committed r141274: <http://trac.webkit.org/changeset/141274> 820238 3 webkit.review.bot 2013-01-30 08:54:17 -0800 All reviewed patches have been landed. Closing bug. 184722 2013-01-25 04:14:28 -0800 2013-01-30 08:54:13 -0800 Patch 107924_windowFeatures_capi.patch text/plain 11208 cdumez ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCAzNTM4MzI1Li4wNTlkNThhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzIg QEAKKzIwMTMtMDEtMjUgIENocmlzdG9waGUgRHVtZXogIDxjaHJpc3RvcGhlLmR1bWV6QGludGVs LmNvbT4KKworICAgICAgICBbRUZMXVtXSzJdIFVzZSBDIEFQSSBpbnNpZGUgZXdrX3dpbmRvd19m ZWF0dXJlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTA3OTI0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg VXNlIEMgQVBJIGluc2lkZSBld2tfd2luZG93X2ZlYXR1cmVzIGluc3RlYWQgb2YgYWNjZXNzaW5n CisgICAgICAgIGludGVybmFsIEMrKyBjbGFzc2VzIGRpcmVjdGx5LCB0byBhdm9pZCB2aW9sYXRp bmcgQVBJCisgICAgICAgIGxheWVyaW5nLgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9lZmwv RXdrVmlldy5jcHA6CisgICAgICAgIChFd2tWaWV3OjpjcmVhdGVOZXdQYWdlKToKKyAgICAgICAg KiBVSVByb2Nlc3MvQVBJL2VmbC9Fd2tWaWV3Lmg6CisgICAgICAgIChFd2tWaWV3KToKKyAgICAg ICAgKiBVSVByb2Nlc3MvQVBJL2VmbC9ld2tfd2luZG93X2ZlYXR1cmVzLmNwcDoKKyAgICAgICAg KEV3a1dpbmRvd0ZlYXR1cmVzOjpFd2tXaW5kb3dGZWF0dXJlcyk6CisgICAgICAgIChnZXRXaW5k b3dGZWF0dXJlVmFsdWUpOgorICAgICAgICAoRXdrV2luZG93RmVhdHVyZXM6OmdldFdpbmRvd0Zl YXR1cmVCb29sVmFsdWUpOgorICAgICAgICAoRXdrV2luZG93RmVhdHVyZXM6OmdldFdpbmRvd0Zl YXR1cmVEb3VibGVWYWx1ZSk6CisgICAgICAgIChld2tfd2luZG93X2ZlYXR1cmVzX2dlb21ldHJ5 X2dldCk6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9lZmwvZXdrX3dpbmRvd19mZWF0dXJlc19w cml2YXRlLmg6CisgICAgICAgIChFd2tXaW5kb3dGZWF0dXJlczo6Y3JlYXRlKToKKyAgICAgICAg KEV3a1dpbmRvd0ZlYXR1cmVzOjpnZW9tZXRyeSk6CisgICAgICAgIChFd2tXaW5kb3dGZWF0dXJl czo6c2V0R2VvbWV0cnkpOgorICAgICAgICAoRXdrV2luZG93RmVhdHVyZXMpOgorICAgICAgICAq IFVJUHJvY2Vzcy9lZmwvUGFnZVVJQ2xpZW50RWZsLmNwcDoKKyAgICAgICAgKFdlYktpdDo6UGFn ZVVJQ2xpZW50RWZsOjpjcmVhdGVOZXdQYWdlKToKKwogMjAxMy0wMS0yNCAgVGltIEhvcnRvbiAg PHRpbW90aHlfaG9ydG9uQGFwcGxlLmNvbT4KIAogICAgICAgICBbd2syXSBQYWdlIG92ZXJsYXlz IHNob3VsZCBkbyB0aGVpciBvd24gYW5pbWF0aW9uLCBpbnN0ZWFkIG9mIHJlbHlpbmcgb24gaW1w bGljaXQgYW5pbWF0aW9uCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJ L2VmbC9Fd2tWaWV3LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL0V3a1Zp ZXcuY3BwCmluZGV4IGU0NzhhODYuLjUzNGFlZDMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9BUEkvZWZsL0V3a1ZpZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9BUEkvZWZsL0V3a1ZpZXcuY3BwCkBAIC05MTMsNyArOTEzLDcgQEAgRXdrV2luZG93RmVh dHVyZXMqIEV3a1ZpZXc6OndpbmRvd0ZlYXR1cmVzKCkKICAgICByZXR1cm4gbV93aW5kb3dGZWF0 dXJlcy5nZXQoKTsKIH0KIAotV0tQYWdlUmVmIEV3a1ZpZXc6OmNyZWF0ZU5ld1BhZ2UoUGFzc1Jl ZlB0cjxFd2tVcmxSZXF1ZXN0PiByZXF1ZXN0LCBJbW11dGFibGVEaWN0aW9uYXJ5KiB3aW5kb3dG ZWF0dXJlcykKK1dLUGFnZVJlZiBFd2tWaWV3OjpjcmVhdGVOZXdQYWdlKFBhc3NSZWZQdHI8RXdr VXJsUmVxdWVzdD4gcmVxdWVzdCwgV0tEaWN0aW9uYXJ5UmVmIHdpbmRvd0ZlYXR1cmVzKQogewog ICAgIEV3a19WaWV3X1NtYXJ0X0RhdGEqIHNkID0gc21hcnREYXRhKCk7CiAgICAgQVNTRVJUKHNk LT5hcGkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvRXdr Vmlldy5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvRXdrVmlldy5oCmluZGV4 IDkyMDU1NjMuLjg5YTUwZWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9B UEkvZWZsL0V3a1ZpZXcuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9F d2tWaWV3LmgKQEAgLTE3Myw3ICsxNzMsNyBAQCBwdWJsaWM6CiAgICAgdm9pZCBkaXNtaXNzQ29s b3JQaWNrZXIoKTsKICNlbmRpZgogCi0gICAgV0tQYWdlUmVmIGNyZWF0ZU5ld1BhZ2UoUGFzc1Jl ZlB0cjxFd2tVcmxSZXF1ZXN0PiwgV2ViS2l0OjpJbW11dGFibGVEaWN0aW9uYXJ5KiB3aW5kb3dG ZWF0dXJlcyk7CisgICAgV0tQYWdlUmVmIGNyZWF0ZU5ld1BhZ2UoUGFzc1JlZlB0cjxFd2tVcmxS ZXF1ZXN0PiwgV0tEaWN0aW9uYXJ5UmVmIHdpbmRvd0ZlYXR1cmVzKTsKICAgICB2b2lkIGNsb3Nl KCk7CiAKICAgICB2b2lkIHJlcXVlc3RQb3B1cE1lbnUoV2ViS2l0OjpXZWJQb3B1cE1lbnVQcm94 eUVmbCosIGNvbnN0IFdlYkNvcmU6OkludFJlY3QmLCBXZWJDb3JlOjpUZXh0RGlyZWN0aW9uLCBk b3VibGUgcGFnZVNjYWxlRmFjdG9yLCBjb25zdCBWZWN0b3I8V2ViS2l0OjpXZWJQb3B1cEl0ZW0+ JiBpdGVtcywgaW50MzJfdCBzZWxlY3RlZEluZGV4KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a193aW5kb3dfZmVhdHVyZXMuY3BwIGIvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX3dpbmRvd19mZWF0dXJlcy5jcHAKaW5kZXggZTMw NTgzMi4uODgyNGNhZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9l ZmwvZXdrX3dpbmRvd19mZWF0dXJlcy5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L0FQSS9lZmwvZXdrX3dpbmRvd19mZWF0dXJlcy5jcHAKQEAgLTI2LDQ4ICsyNiw1MiBAQAogI2lu Y2x1ZGUgImNvbmZpZy5oIgogI2luY2x1ZGUgImV3a193aW5kb3dfZmVhdHVyZXMuaCIKIAotI2lu Y2x1ZGUgIldlYk51bWJlci5oIgorI2luY2x1ZGUgIkV3a1ZpZXcuaCIKKyNpbmNsdWRlICJXS0Rp Y3Rpb25hcnkuaCIKKyNpbmNsdWRlICJXS051bWJlci5oIgorI2luY2x1ZGUgIldLU3RyaW5nLmgi CiAjaW5jbHVkZSAiZXdrX3dpbmRvd19mZWF0dXJlc19wcml2YXRlLmgiCi0jaW5jbHVkZSA8RWlu YS5oPgogCiB1c2luZyBuYW1lc3BhY2UgV2ViS2l0OwogCi1Fd2tXaW5kb3dGZWF0dXJlczo6RXdr V2luZG93RmVhdHVyZXMoSW1tdXRhYmxlRGljdGlvbmFyeSogd2luZG93RmVhdHVyZXMsIEV3a1Zp ZXcqIHZpZXcpCitFd2tXaW5kb3dGZWF0dXJlczo6RXdrV2luZG93RmVhdHVyZXMoV0tEaWN0aW9u YXJ5UmVmIHdpbmRvd0ZlYXR1cmVzLCBFd2tWaWV3KiB2aWV3KQogICAgIDogbV92aWV3KHZpZXcp Ci0gICAgLCBtX2dlb21ldHJ5KDAsIDAsIDEwMCwgMTAwKQotICAgICwgbV90b29sYmFyVmlzaWJs ZSh0cnVlKQotICAgICwgbV9zdGF0dXNCYXJWaXNpYmxlKHRydWUpCi0gICAgLCBtX3Njcm9sbGJh cnNWaXNpYmxlKHRydWUpCi0gICAgLCBtX21lbnVCYXJWaXNpYmxlKHRydWUpCi0gICAgLCBtX2xv Y2F0aW9uQmFyVmlzaWJsZSh0cnVlKQotICAgICwgbV9yZXNpemFibGUodHJ1ZSkKLSAgICAsIG1f ZnVsbFNjcmVlbihmYWxzZSkKKyAgICAsIG1fdG9vbGJhclZpc2libGUoZ2V0V2luZG93RmVhdHVy ZUJvb2xWYWx1ZSh3aW5kb3dGZWF0dXJlcywgInRvb2xCYXJWaXNpYmxlIiwgdHJ1ZSkpCisgICAg LCBtX3N0YXR1c0JhclZpc2libGUoZ2V0V2luZG93RmVhdHVyZUJvb2xWYWx1ZSh3aW5kb3dGZWF0 dXJlcywgInN0YXR1c0JhclZpc2libGUiLCB0cnVlKSkKKyAgICAsIG1fc2Nyb2xsYmFyc1Zpc2li bGUoZ2V0V2luZG93RmVhdHVyZUJvb2xWYWx1ZSh3aW5kb3dGZWF0dXJlcywgInNjcm9sbGJhcnNW aXNpYmxlIiwgdHJ1ZSkpCisgICAgLCBtX21lbnVCYXJWaXNpYmxlKGdldFdpbmRvd0ZlYXR1cmVC b29sVmFsdWUod2luZG93RmVhdHVyZXMsICJtZW51QmFyVmlzaWJsZSIsIHRydWUpKQorICAgICwg bV9sb2NhdGlvbkJhclZpc2libGUoZ2V0V2luZG93RmVhdHVyZUJvb2xWYWx1ZSh3aW5kb3dGZWF0 dXJlcywgImxvY2F0aW9uQmFyVmlzaWJsZSIsIHRydWUpKQorICAgICwgbV9yZXNpemFibGUoZ2V0 V2luZG93RmVhdHVyZUJvb2xWYWx1ZSh3aW5kb3dGZWF0dXJlcywgInJlc2l6YWJsZSIsIHRydWUp KQorICAgICwgbV9mdWxsU2NyZWVuKGdldFdpbmRvd0ZlYXR1cmVCb29sVmFsdWUod2luZG93RmVh dHVyZXMsICJmdWxsc2NyZWVuIiwgZmFsc2UpKQogewotICAgIGlmICh3aW5kb3dGZWF0dXJlcykg ewotICAgICAgICBtX2dlb21ldHJ5LnNldFgoZ2V0V2luZG93RmVhdHVyZVZhbHVlPGRvdWJsZSwg V2ViRG91YmxlPih3aW5kb3dGZWF0dXJlcywgQVNDSUlMaXRlcmFsKCJ4IikpKTsKLSAgICAgICAg bV9nZW9tZXRyeS5zZXRZKGdldFdpbmRvd0ZlYXR1cmVWYWx1ZTxkb3VibGUsIFdlYkRvdWJsZT4o d2luZG93RmVhdHVyZXMsIEFTQ0lJTGl0ZXJhbCgieSIpKSk7Ci0gICAgICAgIG1fZ2VvbWV0cnku c2V0V2lkdGgoZ2V0V2luZG93RmVhdHVyZVZhbHVlPGRvdWJsZSwgV2ViRG91YmxlPih3aW5kb3dG ZWF0dXJlcywgQVNDSUlMaXRlcmFsKCJ3aWR0aCIpKSk7Ci0gICAgICAgIG1fZ2VvbWV0cnkuc2V0 SGVpZ2h0KGdldFdpbmRvd0ZlYXR1cmVWYWx1ZTxkb3VibGUsIFdlYkRvdWJsZT4od2luZG93RmVh dHVyZXMsIEFTQ0lJTGl0ZXJhbCgiaGVpZ2h0IikpKTsKKyAgICBtX2dlb21ldHJ5LnggPSBnZXRX aW5kb3dGZWF0dXJlRG91YmxlVmFsdWUod2luZG93RmVhdHVyZXMsICJ4IiwgMCk7CisgICAgbV9n ZW9tZXRyeS55ID0gZ2V0V2luZG93RmVhdHVyZURvdWJsZVZhbHVlKHdpbmRvd0ZlYXR1cmVzLCAi eSIsIDApOworICAgIG1fZ2VvbWV0cnkudyA9IGdldFdpbmRvd0ZlYXR1cmVEb3VibGVWYWx1ZSh3 aW5kb3dGZWF0dXJlcywgIndpZHRoIiwgMCk7CisgICAgbV9nZW9tZXRyeS5oID0gZ2V0V2luZG93 RmVhdHVyZURvdWJsZVZhbHVlKHdpbmRvd0ZlYXR1cmVzLCAiaGVpZ2h0IiwgMCk7Cit9CisKK3N0 YXRpYyBpbmxpbmUgV0tUeXBlUmVmIGdldFdpbmRvd0ZlYXR1cmVWYWx1ZShXS0RpY3Rpb25hcnlS ZWYgd2luZG93RmVhdHVyZXMsIGNvbnN0IGNoYXIqIGZlYXR1cmVOYW1lKQoreworICAgIEFTU0VS VChmZWF0dXJlTmFtZSk7CisgICAgaWYgKCF3aW5kb3dGZWF0dXJlcykKKyAgICAgICAgcmV0dXJu IDA7CiAKLSAgICAgICAgbV90b29sYmFyVmlzaWJsZSA9IGdldFdpbmRvd0ZlYXR1cmVWYWx1ZTxi b29sLCBXZWJCb29sZWFuPih3aW5kb3dGZWF0dXJlcywgQVNDSUlMaXRlcmFsKCJ0b29sQmFyVmlz aWJsZSIpKTsKLSAgICAgICAgbV9zdGF0dXNCYXJWaXNpYmxlID0gZ2V0V2luZG93RmVhdHVyZVZh bHVlPGJvb2wsIFdlYkJvb2xlYW4+KHdpbmRvd0ZlYXR1cmVzLCBBU0NJSUxpdGVyYWwoInN0YXR1 c0JhclZpc2libGUiKSk7Ci0gICAgICAgIG1fc2Nyb2xsYmFyc1Zpc2libGUgPSBnZXRXaW5kb3dG ZWF0dXJlVmFsdWU8Ym9vbCwgV2ViQm9vbGVhbj4od2luZG93RmVhdHVyZXMsIEFTQ0lJTGl0ZXJh bCgic2Nyb2xsYmFyc1Zpc2libGUiKSk7Ci0gICAgICAgIG1fbWVudUJhclZpc2libGUgPSBnZXRX aW5kb3dGZWF0dXJlVmFsdWU8Ym9vbCwgV2ViQm9vbGVhbj4od2luZG93RmVhdHVyZXMsIEFTQ0lJ TGl0ZXJhbCgibWVudUJhclZpc2libGUiKSk7Ci0gICAgICAgIG1fbG9jYXRpb25CYXJWaXNpYmxl ID0gZ2V0V2luZG93RmVhdHVyZVZhbHVlPGJvb2wsIFdlYkJvb2xlYW4+KHdpbmRvd0ZlYXR1cmVz LCBBU0NJSUxpdGVyYWwoImxvY2F0aW9uQmFyVmlzaWJsZSIpKTsKLSAgICAgICAgbV9yZXNpemFi bGUgPSBnZXRXaW5kb3dGZWF0dXJlVmFsdWU8Ym9vbCwgV2ViQm9vbGVhbj4od2luZG93RmVhdHVy ZXMsIEFTQ0lJTGl0ZXJhbCgicmVzaXphYmxlIikpOwotICAgICAgICBtX2Z1bGxTY3JlZW4gPSBn ZXRXaW5kb3dGZWF0dXJlVmFsdWU8Ym9vbCwgV2ViQm9vbGVhbj4od2luZG93RmVhdHVyZXMsIEFT Q0lJTGl0ZXJhbCgiZnVsbHNjcmVlbiIpKTsKLSAgICB9CisgICAgV0tSZXRhaW5QdHI8V0tTdHJp bmdSZWY+IGtleShBZG9wdFdLLCBXS1N0cmluZ0NyZWF0ZVdpdGhVVEY4Q1N0cmluZyhmZWF0dXJl TmFtZSkpOworICAgIHJldHVybiBXS0RpY3Rpb25hcnlHZXRJdGVtRm9yS2V5KHdpbmRvd0ZlYXR1 cmVzLCBrZXkuZ2V0KCkpOwogfQogCi10ZW1wbGF0ZSA8dHlwZW5hbWUgVDEsIHR5cGVuYW1lIFQy PgotVDEgRXdrV2luZG93RmVhdHVyZXM6OmdldFdpbmRvd0ZlYXR1cmVWYWx1ZShJbW11dGFibGVE aWN0aW9uYXJ5KiB3aW5kb3dGZWF0dXJlcywgY29uc3QgU3RyaW5nJiBmZWF0dXJlTmFtZSkKK2Jv b2wgRXdrV2luZG93RmVhdHVyZXM6OmdldFdpbmRvd0ZlYXR1cmVCb29sVmFsdWUoV0tEaWN0aW9u YXJ5UmVmIHdpbmRvd0ZlYXR1cmVzLCBjb25zdCBjaGFyKiBmZWF0dXJlTmFtZSwgYm9vbCBkZWZh dWx0VmFsdWUpCiB7Ci0gICAgVDIqIGZlYXR1cmVWYWx1ZSA9IHN0YXRpY19jYXN0PFQyKj4od2lu ZG93RmVhdHVyZXMtPmdldChmZWF0dXJlTmFtZSkpOworICAgIFdLQm9vbGVhblJlZiB2YWx1ZSA9 IHN0YXRpY19jYXN0PFdLQm9vbGVhblJlZj4oZ2V0V2luZG93RmVhdHVyZVZhbHVlKHdpbmRvd0Zl YXR1cmVzLCBmZWF0dXJlTmFtZSkpOwogCi0gICAgaWYgKCFmZWF0dXJlVmFsdWUpCi0gICAgICAg IHJldHVybiBmYWxzZTsKKyAgICByZXR1cm4gdmFsdWUgPyBXS0Jvb2xlYW5HZXRWYWx1ZSh2YWx1 ZSkgOiBkZWZhdWx0VmFsdWU7Cit9CisKK2RvdWJsZSBFd2tXaW5kb3dGZWF0dXJlczo6Z2V0V2lu ZG93RmVhdHVyZURvdWJsZVZhbHVlKFdLRGljdGlvbmFyeVJlZiB3aW5kb3dGZWF0dXJlcywgY29u c3QgY2hhciogZmVhdHVyZU5hbWUsIGRvdWJsZSBkZWZhdWx0VmFsdWUpCit7CisgICAgV0tEb3Vi bGVSZWYgdmFsdWUgPSBzdGF0aWNfY2FzdDxXS0RvdWJsZVJlZj4oZ2V0V2luZG93RmVhdHVyZVZh bHVlKHdpbmRvd0ZlYXR1cmVzLCBmZWF0dXJlTmFtZSkpOwogCi0gICAgcmV0dXJuIGZlYXR1cmVW YWx1ZS0+dmFsdWUoKTsKKyAgICByZXR1cm4gdmFsdWUgPyAgV0tEb3VibGVHZXRWYWx1ZSh2YWx1 ZSkgOiBkZWZhdWx0VmFsdWU7CiB9CiAKIHZvaWQgRXdrV2luZG93RmVhdHVyZXM6OnNldFRvb2xi YXJWaXNpYmxlKGJvb2wgdG9vbGJhclZpc2libGUpCkBAIC0xNDcsMTUgKzE1MSwxNiBAQCB2b2lk IGV3a193aW5kb3dfZmVhdHVyZXNfZ2VvbWV0cnlfZ2V0KGNvbnN0IEV3a19XaW5kb3dfRmVhdHVy ZXMqIHdpbmRvd19mZWF0dXJlcwogewogICAgIEVXS19PQkpfR0VUX0lNUExfT1JfUkVUVVJOKGNv bnN0IEV3a1dpbmRvd0ZlYXR1cmVzLCB3aW5kb3dfZmVhdHVyZXMsIGltcGwpOwogCisgICAgY29u c3QgRXZhc19Db29yZF9SZWN0YW5nbGUmIGdlb21ldHJ5ID0gaW1wbC0+Z2VvbWV0cnkoKTsKICAg ICBpZiAoeCkKLSAgICAgICAgKnggPSBzdGF0aWNfY2FzdDxFdmFzX0Nvb3JkPihpbXBsLT5nZW9t ZXRyeSgpLngoKSk7CisgICAgICAgICp4ID0gZ2VvbWV0cnkueDsKIAogICAgIGlmICh5KQotICAg ICAgICAqeSA9IHN0YXRpY19jYXN0PEV2YXNfQ29vcmQ+KGltcGwtPmdlb21ldHJ5KCkueSgpKTsK KyAgICAgICAgKnkgPSBnZW9tZXRyeS55OwogCiAgICAgaWYgKHdpZHRoKQotICAgICAgICAqd2lk dGggPSBzdGF0aWNfY2FzdDxFdmFzX0Nvb3JkPihpbXBsLT5nZW9tZXRyeSgpLndpZHRoKCkpOwor ICAgICAgICAqd2lkdGggPSBnZW9tZXRyeS53OwogCiAgICAgaWYgKGhlaWdodCkKLSAgICAgICAg KmhlaWdodCA9IHN0YXRpY19jYXN0PEV2YXNfQ29vcmQ+KGltcGwtPmdlb21ldHJ5KCkuaGVpZ2h0 KCkpOworICAgICAgICAqaGVpZ2h0ID0gZ2VvbWV0cnkuaDsKIH0KZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a193aW5kb3dfZmVhdHVyZXNfcHJpdmF0ZS5o IGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX3dpbmRvd19mZWF0dXJlc19w cml2YXRlLmgKaW5kZXggNDUzMmQxNS4uOGFlNmM5MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX3dpbmRvd19mZWF0dXJlc19wcml2YXRlLmgKKysrIGIv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX3dpbmRvd19mZWF0dXJlc19wcml2 YXRlLmgKQEAgLTI2LDExICsyNiw5IEBACiAjaWZuZGVmIGV3a193aW5kb3dfZmVhdHVyZXNfcHJp dmF0ZV9oCiAjZGVmaW5lIGV3a193aW5kb3dfZmVhdHVyZXNfcHJpdmF0ZV9oCiAKLSNpbmNsdWRl ICJFd2tWaWV3LmgiCi0jaW5jbHVkZSAiSW1tdXRhYmxlRGljdGlvbmFyeS5oIgotI2luY2x1ZGUg IldpbmRvd0ZlYXR1cmVzLmgiCiAjaW5jbHVkZSAiZXdrX29iamVjdF9wcml2YXRlLmgiCi0jaW5j bHVkZSA8V2ViQ29yZS9GbG9hdFJlY3QuaD4KKyNpbmNsdWRlIDxFdmFzLmg+CisjaW5jbHVkZSA8 V2ViS2l0Mi9XS0Jhc2UuaD4KICNpbmNsdWRlIDx3dGYvUmVmQ291bnRlZC5oPgogCiBjbGFzcyBF d2tWaWV3OwpAQCAtMzksMTMgKzM3LDEzIEBAIGNsYXNzIEV3a1dpbmRvd0ZlYXR1cmVzIDogcHVi bGljIEV3a09iamVjdCB7CiBwdWJsaWM6CiAgICAgRVdLX09CSkVDVF9ERUNMQVJFKEV3a1dpbmRv d0ZlYXR1cmVzKQogCi0gICAgc3RhdGljIFBhc3NSZWZQdHI8RXdrV2luZG93RmVhdHVyZXM+IGNy ZWF0ZShXZWJLaXQ6OkltbXV0YWJsZURpY3Rpb25hcnkqIHdpbmRvd0ZlYXR1cmVzLCBFd2tWaWV3 KiB2aWV3SW1wbCkKKyAgICBzdGF0aWMgUGFzc1JlZlB0cjxFd2tXaW5kb3dGZWF0dXJlcz4gY3Jl YXRlKFdLRGljdGlvbmFyeVJlZiB3aW5kb3dGZWF0dXJlcywgRXdrVmlldyogdmlld0ltcGwpCiAg ICAgewogICAgICAgICByZXR1cm4gYWRvcHRSZWYobmV3IEV3a1dpbmRvd0ZlYXR1cmVzKHdpbmRv d0ZlYXR1cmVzLCB2aWV3SW1wbCkpOwogICAgIH0KIAotICAgIFdlYkNvcmU6OkZsb2F0UmVjdCBn ZW9tZXRyeSgpIGNvbnN0IHsgcmV0dXJuIG1fZ2VvbWV0cnk7IH0KLSAgICB2b2lkIHNldEdlb21l dHJ5KFdlYkNvcmU6OkZsb2F0UmVjdCYgZ2VvbWV0cnkpIHsgbV9nZW9tZXRyeSA9IGdlb21ldHJ5 OyB9CisgICAgY29uc3QgRXZhc19Db29yZF9SZWN0YW5nbGUmIGdlb21ldHJ5KCkgY29uc3QgeyBy ZXR1cm4gbV9nZW9tZXRyeTsgfQorICAgIHZvaWQgc2V0R2VvbWV0cnkoY29uc3QgRXZhc19Db29y ZF9SZWN0YW5nbGUmIGdlb21ldHJ5KSB7IG1fZ2VvbWV0cnkgPSBnZW9tZXRyeTsgfQogCiAgICAg Ym9vbCB0b29sYmFyVmlzaWJsZSgpIGNvbnN0IHsgcmV0dXJuIG1fdG9vbGJhclZpc2libGU7IH0K ICAgICB2b2lkIHNldFRvb2xiYXJWaXNpYmxlKGJvb2wgdG9vbGJhclZpc2libGUpOwpAQCAtNjks MTMgKzY3LDE0IEBAIHB1YmxpYzoKICAgICB2b2lkIHNldEZ1bGxTY3JlZW4oYm9vbCBmdWxsU2Ny ZWVuKSB7IG1fZnVsbFNjcmVlbiA9IGZ1bGxTY3JlZW47IH0KIAogcHJpdmF0ZToKLSAgICBFd2tX aW5kb3dGZWF0dXJlcyhXZWJLaXQ6OkltbXV0YWJsZURpY3Rpb25hcnkqIHdpbmRvd0ZlYXR1cmVz LCBFd2tWaWV3KiB2aWV3SW1wbCk7Ci0gICAgdGVtcGxhdGUgPHR5cGVuYW1lIFQxLCB0eXBlbmFt ZSBUMj4KLSAgICBzdGF0aWMgVDEgZ2V0V2luZG93RmVhdHVyZVZhbHVlKFdlYktpdDo6SW1tdXRh YmxlRGljdGlvbmFyeSogd2luZG93RmVhdHVyZXMsIGNvbnN0IFN0cmluZyYgZmVhdHVyZU5hbWUp OworICAgIEV3a1dpbmRvd0ZlYXR1cmVzKFdLRGljdGlvbmFyeVJlZiB3aW5kb3dGZWF0dXJlcywg RXdrVmlldyogdmlld0ltcGwpOworCisgICAgc3RhdGljIGJvb2wgZ2V0V2luZG93RmVhdHVyZUJv b2xWYWx1ZShXS0RpY3Rpb25hcnlSZWYgd2luZG93RmVhdHVyZXMsIGNvbnN0IGNoYXIqIGZlYXR1 cmVOYW1lLCBib29sIGRlZmF1bHRWYWx1ZSk7CisgICAgc3RhdGljIGRvdWJsZSBnZXRXaW5kb3dG ZWF0dXJlRG91YmxlVmFsdWUoV0tEaWN0aW9uYXJ5UmVmIHdpbmRvd0ZlYXR1cmVzLCBjb25zdCBj aGFyKiBmZWF0dXJlTmFtZSwgZG91YmxlIGRlZmF1bHRWYWx1ZSk7CiAKICAgICBFd2tWaWV3KiBt X3ZpZXc7CiAKLSAgICBXZWJDb3JlOjpGbG9hdFJlY3QgbV9nZW9tZXRyeTsKKyAgICBFdmFzX0Nv b3JkX1JlY3RhbmdsZSBtX2dlb21ldHJ5OwogICAgIGJvb2wgbV90b29sYmFyVmlzaWJsZTsKICAg ICBib29sIG1fc3RhdHVzQmFyVmlzaWJsZTsKICAgICBib29sIG1fc2Nyb2xsYmFyc1Zpc2libGU7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZWZsL1BhZ2VVSUNsaWVudEVm bC5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZWZsL1BhZ2VVSUNsaWVudEVmbC5jcHAK aW5kZXggODExZGIwNi4uMWUwMDhjNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL2VmbC9QYWdlVUlDbGllbnRFZmwuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9lZmwvUGFnZVVJQ2xpZW50RWZsLmNwcApAQCAtMjA3LDcgKzIwNyw3IEBAIHZvaWQgUGFnZVVJ Q2xpZW50RWZsOjpydW5PcGVuUGFuZWwoV0tQYWdlUmVmLCBXS0ZyYW1lUmVmLCBXS09wZW5QYW5l bFBhcmFtZXRlcnNSCiBXS1BhZ2VSZWYgUGFnZVVJQ2xpZW50RWZsOjpjcmVhdGVOZXdQYWdlKFdL UGFnZVJlZiwgV0tVUkxSZXF1ZXN0UmVmIHdrUmVxdWVzdCwgV0tEaWN0aW9uYXJ5UmVmIHdrV2lu ZG93RmVhdHVyZXMsIFdLRXZlbnRNb2RpZmllcnMsIFdLRXZlbnRNb3VzZUJ1dHRvbiwgY29uc3Qg dm9pZCogY2xpZW50SW5mbykKIHsKICAgICBSZWZQdHI8RXdrVXJsUmVxdWVzdD4gcmVxdWVzdCA9 IEV3a1VybFJlcXVlc3Q6OmNyZWF0ZSh3a1JlcXVlc3QpOwotICAgIHJldHVybiB0b1BhZ2VVSUNs aWVudEVmbChjbGllbnRJbmZvKS0+bV92aWV3LT5jcmVhdGVOZXdQYWdlKHJlcXVlc3QsIHRvSW1w bCh3a1dpbmRvd0ZlYXR1cmVzKSk7CisgICAgcmV0dXJuIHRvUGFnZVVJQ2xpZW50RWZsKGNsaWVu dEluZm8pLT5tX3ZpZXctPmNyZWF0ZU5ld1BhZ2UocmVxdWVzdCwgd2tXaW5kb3dGZWF0dXJlcyk7 CiB9CiAKICNpZiBFTkFCTEUoSU5QVVRfVFlQRV9DT0xPUikK