136910 2014-09-18 00:57:32 -0700 Make it possible to share a bundle between the legacy and modern WebKit2 API 2014-09-25 13:55:16 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED WONTFIX P2 Normal --- 136915 1 thorton thorton andersca commit-queue mitz sam simon.fraser oldest_to_newest 1035858 0 thorton 2014-09-18 00:57:32 -0700 Make it possible to share a bundle between the legacy and modern WebKit2 API 1035859 1 238293 thorton 2014-09-18 00:57:55 -0700 Created attachment 238293 Patch 1035861 2 thorton 2014-09-18 00:58:49 -0700 This is pretty hacky and possibly less platform specific than it should be; I'm hoping Sam or Dan or Anders will chime in with a better way to do this, but at least having this working lets me try to do what I'm trying to do. 1035862 3 commit-queue 2014-09-18 01:00:27 -0700 Attachment 238293 did not pass style-queue: ERROR: Source/WebKit2/ChangeLog:1: ChangeLog entry has no bug number [changelog/bugnumber] [5] Total errors found: 1 in 9 files If any of these errors are false positives, please file a bug against check-webkit-style. 1037290 4 thorton 2014-09-25 13:55:10 -0700 Anders thinks we shouldn't do this. 238293 2014-09-18 00:57:55 -0700 2014-09-25 13:55:16 -0700 Patch bug-136910-20140918005754.patch text/plain 11005 thorton U3VidmVyc2lvbiBSZXZpc2lvbjogMTczNzE1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggZjcwNGE1YTI4YTQ4OWI0 NGMwYjRkODUwYjIyNDQ1Yjg4Y2Q4NjU2Ny4uZTQyZmE5NWNmYjY1ZjIzNWFjYzA5YTNjYTExMDUy MjY1OTU0OGUzYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM4IEBACisyMDE0LTA5LTE4ICBUaW0g SG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgorCisgICAgICAgIE1ha2UgaXQgcG9z c2libGUgdG8gc2hhcmUgYSBidW5kbGUgYmV0d2VlbiB0aGUgbGVnYWN5IGFuZCBtb2Rlcm4gV2Vi S2l0MiBBUEkKKyAgICAgICAgTmVlZCB0aGUgYnVnIFVSTCAoT09QUyEpLgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogU2hhcmVkL1dlYlByb2Nlc3ND cmVhdGlvblBhcmFtZXRlcnMuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQcm9jZXNzQ3JlYXRp b25QYXJhbWV0ZXJzOjpXZWJQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzKToKKyAgICAgICAgKFdl YktpdDo6V2ViUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVyczo6ZW5jb2RlKToKKyAgICAgICAgKFdl YktpdDo6V2ViUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVyczo6ZGVjb2RlKToKKyAgICAgICAgKiBT aGFyZWQvV2ViUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVycy5oOgorICAgICAgICAqIFdlYlByb2Nl c3MvSW5qZWN0ZWRCdW5kbGUvbWFjL0luamVjdGVkQnVuZGxlTWFjLm1tOgorICAgICAgICBQbHVt YiAiY2FuVXNlTGVnYWN5SW5qZWN0ZWRCdW5kbGVJbml0aWFsaXplciIgdGhyb3VnaCBXZWJQcm9j ZXNzQ3JlYXRpb25QYXJhbWV0ZXJzLAorICAgICAgICBhbmQgcmVzcGVjdCBpdCB3aGVuIGluaXRp YWxpemluZyB0aGUgaW5qZWN0ZWQgYnVuZGxlLCBvbmx5IGxvb2tpbmcgZm9yCisgICAgICAgIFdL QnVuZGxlSW5pdGlhbGl6ZSBpZiBpdCBpcyB0cnVlLgorCisgICAgICAgICogVUlQcm9jZXNzL0FQ SS9DL1dLQ29udGV4dENvbmZpZ3VyYXRpb25SZWYuY3BwOgorICAgICAgICAoV0tDb250ZXh0Q29u ZmlndXJhdGlvbkNyZWF0ZSk6CisgICAgICAgIFdLQ29udGV4dENvbmZpZ3VyYXRpb25DcmVhdGUg aXMgdGhlIG9ubHkgd2F5IHRvIG1ha2UgYSBXS0NvbnRleHRDb25maWd1cmF0aW9uLAorICAgICAg ICBzbyB3ZSBzZXQgY2FuVXNlTGVnYWN5SW5qZWN0ZWRCdW5kbGVJbml0aWFsaXplciB0byB0cnVl IGhlcmU7IHRoaXMgd2F5LCBhbGwgY2xpZW50cworICAgICAgICBvZiB0aGUgbGVnYWN5IEFQSSB3 aWxsIGF0dGVtcHQgdG8gdXNlIHRoZSBsZWdhY3kgaW5pdGlhbGl6ZXIuCisKKyAgICAgICAgKiBV SVByb2Nlc3MvQVBJQ29udGV4dENvbmZpZ3VyYXRpb24uY3BwOgorICAgICAgICAoQVBJOjpDb250 ZXh0Q29uZmlndXJhdGlvbjo6d2ViQ29udGV4dENvbmZpZ3VyYXRpb24pOgorICAgICAgICAqIFVJ UHJvY2Vzcy9BUElDb250ZXh0Q29uZmlndXJhdGlvbi5oOgorICAgICAgICAoQVBJOjpDb250ZXh0 Q29uZmlndXJhdGlvbjo6Y2FuVXNlTGVnYWN5SW5qZWN0ZWRCdW5kbGVJbml0aWFsaXplcik6Cisg ICAgICAgIChBUEk6OkNvbnRleHRDb25maWd1cmF0aW9uOjpzZXRDYW5Vc2VMZWdhY3lJbmplY3Rl ZEJ1bmRsZUluaXRpYWxpemVyKToKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViQ29udGV4dC5jcHA6 CisgICAgICAgIChXZWJLaXQ6OldlYkNvbnRleHQ6OldlYkNvbnRleHQpOgorICAgICAgICAoV2Vi S2l0OjpXZWJDb250ZXh0OjpjcmVhdGVOZXdXZWJQcm9jZXNzKToKKyAgICAgICAgKiBVSVByb2Nl c3MvV2ViQ29udGV4dC5oOgorICAgICAgICBQbHVtYiAiY2FuVXNlTGVnYWN5SW5qZWN0ZWRCdW5k bGVJbml0aWFsaXplciIgdGhyb3VnaCB0aGUgY29udGV4dCBhbmQKKyAgICAgICAgaW50byB0aGUg V2ViUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVycy4KKwogMjAxNC0wOS0xNyAgVGltIEhvcnRvbiAg PHRpbW90aHlfaG9ydG9uQGFwcGxlLmNvbT4KIAogICAgICAgICBPY2Nhc2lvbmFsIHVucmVwcm9k dWNpYmxlIGNyYXNoZXMgaW4gTWVzc2FnZVJlY2VpdmVyTWFwOjpkaXNwYXRjaE1lc3NhZ2UKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9XZWJQcm9jZXNzQ3JlYXRpb25QYXJhbWV0 ZXJzLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9XZWJQcm9jZXNzQ3JlYXRpb25QYXJhbWV0 ZXJzLmNwcAppbmRleCAxZDhmOTg3OGYzYWJkYmJhMGVlYjkwNjBkMDkyZGFlYTg3NTFlZjhkLi5l MjBjODUyNzk5MDQ0MDk3ZjhjMDU1NzkyMzhmNjcyZDBjNWEzN2Y4IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0Mi9TaGFyZWQvV2ViUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVycy5jcHAKKysrIGIv U291cmNlL1dlYktpdDIvU2hhcmVkL1dlYlByb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMuY3BwCkBA IC0zMiw3ICszMiw4IEBACiBuYW1lc3BhY2UgV2ViS2l0IHsKIAogV2ViUHJvY2Vzc0NyZWF0aW9u UGFyYW1ldGVyczo6V2ViUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVycygpCi0gICAgOiBzaG91bGRB bHdheXNVc2VDb21wbGV4VGV4dENvZGVQYXRoKGZhbHNlKQorICAgIDogY2FuVXNlTGVnYWN5SW5q ZWN0ZWRCdW5kbGVJbml0aWFsaXplcihmYWxzZSkKKyAgICAsIHNob3VsZEFsd2F5c1VzZUNvbXBs ZXhUZXh0Q29kZVBhdGgoZmFsc2UpCiAgICAgLCBzaG91bGRVc2VGb250U21vb3RoaW5nKHRydWUp CiAgICAgLCBkZWZhdWx0UmVxdWVzdFRpbWVvdXRJbnRlcnZhbChJTlRfTUFYKQogI2lmIFBMQVRG T1JNKENPQ09BKQpAQCAtNjAsNiArNjEsNyBAQCB2b2lkIFdlYlByb2Nlc3NDcmVhdGlvblBhcmFt ZXRlcnM6OmVuY29kZShJUEM6OkFyZ3VtZW50RW5jb2RlciYgZW5jb2RlcikgY29uc3QKIHsKICAg ICBlbmNvZGVyIDw8IGluamVjdGVkQnVuZGxlUGF0aDsKICAgICBlbmNvZGVyIDw8IGluamVjdGVk QnVuZGxlUGF0aEV4dGVuc2lvbkhhbmRsZTsKKyAgICBlbmNvZGVyIDw8IGNhblVzZUxlZ2FjeUlu amVjdGVkQnVuZGxlSW5pdGlhbGl6ZXI7CiAgICAgZW5jb2RlciA8PCBhcHBsaWNhdGlvbkNhY2hl RGlyZWN0b3J5OwogICAgIGVuY29kZXIgPDwgYXBwbGljYXRpb25DYWNoZURpcmVjdG9yeUV4dGVu c2lvbkhhbmRsZTsKICAgICBlbmNvZGVyIDw8IHdlYlNRTERhdGFiYXNlRGlyZWN0b3J5OwpAQCAt MTUxLDYgKzE1Myw4IEBAIGJvb2wgV2ViUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVyczo6ZGVjb2Rl KElQQzo6QXJndW1lbnREZWNvZGVyJiBkZWNvZGVyLCBXZWJQcm9jCiAgICAgICAgIHJldHVybiBm YWxzZTsKICAgICBpZiAoIWRlY29kZXIuZGVjb2RlKHBhcmFtZXRlcnMuaW5qZWN0ZWRCdW5kbGVQ YXRoRXh0ZW5zaW9uSGFuZGxlKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOworICAgIGlmICghZGVj b2Rlci5kZWNvZGUocGFyYW1ldGVycy5jYW5Vc2VMZWdhY3lJbmplY3RlZEJ1bmRsZUluaXRpYWxp emVyKSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIGlmICghZGVjb2Rlci5kZWNvZGUocGFy YW1ldGVycy5hcHBsaWNhdGlvbkNhY2hlRGlyZWN0b3J5KSkKICAgICAgICAgcmV0dXJuIGZhbHNl OwogICAgIGlmICghZGVjb2Rlci5kZWNvZGUocGFyYW1ldGVycy5hcHBsaWNhdGlvbkNhY2hlRGly ZWN0b3J5RXh0ZW5zaW9uSGFuZGxlKSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1NoYXJl ZC9XZWJQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzLmggYi9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQv V2ViUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVycy5oCmluZGV4IDQ3YTllZWVjMzNhZGM5MjA2MGZi NmFhNTJlZDlkYTEzOWJiNzI5NzEuLmRhYjZiZWE3NmQ2OTBlOTYyOTc4ODZmMjYwZGJmOTU5NjRk Y2VhMDggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9XZWJQcm9jZXNzQ3JlYXRp b25QYXJhbWV0ZXJzLmgKKysrIGIvU291cmNlL1dlYktpdDIvU2hhcmVkL1dlYlByb2Nlc3NDcmVh dGlvblBhcmFtZXRlcnMuaApAQCAtNDksOCArNDksOCBAQCBjbGFzcyBEYXRhOwogfQogCiBuYW1l c3BhY2UgSVBDIHsKLSAgICBjbGFzcyBBcmd1bWVudERlY29kZXI7Ci0gICAgY2xhc3MgQXJndW1l bnRFbmNvZGVyOworY2xhc3MgQXJndW1lbnREZWNvZGVyOworY2xhc3MgQXJndW1lbnRFbmNvZGVy OwogfQogCiBuYW1lc3BhY2UgV2ViS2l0IHsKQEAgLTYzLDYgKzYzLDcgQEAgc3RydWN0IFdlYlBy b2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMgewogCiAgICAgU3RyaW5nIGluamVjdGVkQnVuZGxlUGF0 aDsKICAgICBTYW5kYm94RXh0ZW5zaW9uOjpIYW5kbGUgaW5qZWN0ZWRCdW5kbGVQYXRoRXh0ZW5z aW9uSGFuZGxlOworICAgIGJvb2wgY2FuVXNlTGVnYWN5SW5qZWN0ZWRCdW5kbGVJbml0aWFsaXpl cjsKIAogICAgIFN0cmluZyBhcHBsaWNhdGlvbkNhY2hlRGlyZWN0b3J5OyAgICAKICAgICBTYW5k Ym94RXh0ZW5zaW9uOjpIYW5kbGUgYXBwbGljYXRpb25DYWNoZURpcmVjdG9yeUV4dGVuc2lvbkhh bmRsZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS0NvbnRl eHRDb25maWd1cmF0aW9uUmVmLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9X S0NvbnRleHRDb25maWd1cmF0aW9uUmVmLmNwcAppbmRleCBmN2QyNTZhY2UyZmIzMjQ2Yzk1NTNi NzEzZmVkNTUyOGE0YzQ5MjA5Li43ZGI0YmUzMjRhZWI2Zjk4N2Y5M2I2M2E3NjNjM2RmZTc5MmUy ZjRhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tDb250ZXh0 Q29uZmlndXJhdGlvblJlZi5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9D L1dLQ29udGV4dENvbmZpZ3VyYXRpb25SZWYuY3BwCkBAIC0zMyw3ICszMyw5IEBAIHVzaW5nIG5h bWVzcGFjZSBXZWJLaXQ7CiAKIFdLQ29udGV4dENvbmZpZ3VyYXRpb25SZWYgV0tDb250ZXh0Q29u ZmlndXJhdGlvbkNyZWF0ZSgpCiB7Ci0gICAgcmV0dXJuIHRvQVBJKEFQSTo6Q29udGV4dENvbmZp Z3VyYXRpb246OmNyZWF0ZSgpLmxlYWtSZWYoKSk7CisgICAgUmVmUHRyPEFQSTo6Q29udGV4dENv bmZpZ3VyYXRpb24+IGNvbnRleHRDb25maWd1cmF0aW9uID0gQVBJOjpDb250ZXh0Q29uZmlndXJh dGlvbjo6Y3JlYXRlKCk7CisgICAgY29udGV4dENvbmZpZ3VyYXRpb24tPnNldENhblVzZUxlZ2Fj eUluamVjdGVkQnVuZGxlSW5pdGlhbGl6ZXIodHJ1ZSk7CisgICAgcmV0dXJuIHRvQVBJKGNvbnRl eHRDb25maWd1cmF0aW9uLnJlbGVhc2UoKS5sZWFrUmVmKCkpOwogfQogCiBXS1N0cmluZ1JlZiBX S0NvbnRleHRDb25maWd1cmF0aW9uQ29weUluZGV4ZWREQkRhdGFiYXNlRGlyZWN0b3J5KFdLQ29u dGV4dENvbmZpZ3VyYXRpb25SZWYgY29uZmlndXJhdGlvbikKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9BUElDb250ZXh0Q29uZmlndXJhdGlvbi5jcHAgYi9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQVBJQ29udGV4dENvbmZpZ3VyYXRpb24uY3BwCmluZGV4IDZlZTFhODk3 MzBmODcyYmUwMjM3ZTY3ZmVlYzI1ZjRmOTZiYThlNjEuLmE3MDg1MDIyOGI3Y2NhOWExNWNiNTcy MDVhODVmYzQ2YzY3MTk4YmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9B UElDb250ZXh0Q29uZmlndXJhdGlvbi5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L0FQSUNvbnRleHRDb25maWd1cmF0aW9uLmNwcApAQCAtNDYsNiArNDYsNyBAQCBXZWJLaXQ6Oldl YkNvbnRleHRDb25maWd1cmF0aW9uIENvbnRleHRDb25maWd1cmF0aW9uOjp3ZWJDb250ZXh0Q29u ZmlndXJhdGlvbigpCiAgICAgY29uZmlndXJhdGlvbi5pbmplY3RlZEJ1bmRsZVBhdGggPSBtX2lu amVjdGVkQnVuZGxlUGF0aDsKICAgICBjb25maWd1cmF0aW9uLmxvY2FsU3RvcmFnZURpcmVjdG9y eSA9IG1fbG9jYWxTdG9yYWdlRGlyZWN0b3J5OwogICAgIGNvbmZpZ3VyYXRpb24ud2ViU1FMRGF0 YWJhc2VEaXJlY3RvcnkgPSBtX3dlYlNRTERhdGFiYXNlRGlyZWN0b3J5OworICAgIGNvbmZpZ3Vy YXRpb24uY2FuVXNlTGVnYWN5SW5qZWN0ZWRCdW5kbGVJbml0aWFsaXplciA9IG1fY2FuVXNlTGVn YWN5SW5qZWN0ZWRCdW5kbGVJbml0aWFsaXplcjsKIAogICAgIFdlYktpdDo6V2ViQ29udGV4dDo6 YXBwbHlQbGF0Zm9ybVNwZWNpZmljQ29uZmlndXJhdGlvbkRlZmF1bHRzKGNvbmZpZ3VyYXRpb24p OwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJQ29udGV4dENvbmZp Z3VyYXRpb24uaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUElDb250ZXh0Q29uZmlndXJh dGlvbi5oCmluZGV4IGJjZWMxZjQ4NTY0YzA4NzVkZTUzZTIwYjA4YmM1ZjViYWI2MTU1NTAuLmVh Mjg3ZTJhOGQyOWRkN2I2NmYwMDg0ZWZjNjVkZmQ0NWM3N2U5MDggMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUElDb250ZXh0Q29uZmlndXJhdGlvbi5oCisrKyBiL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUElDb250ZXh0Q29uZmlndXJhdGlvbi5oCkBAIC01NSw2ICs1 NSw5IEBAIHB1YmxpYzoKICAgICBTdHJpbmcgd2ViU1FMRGF0YWJhc2VEaXJlY3RvcnkoKSBjb25z dCB7IHJldHVybiBtX3dlYlNRTERhdGFiYXNlRGlyZWN0b3J5OyB9CiAgICAgdm9pZCBzZXRXZWJT UUxEYXRhYmFzZURpcmVjdG9yeShjb25zdCBTdHJpbmcmIHdlYlNRTERhdGFiYXNlRGlyZWN0b3J5 KSB7IG1fd2ViU1FMRGF0YWJhc2VEaXJlY3RvcnkgPSB3ZWJTUUxEYXRhYmFzZURpcmVjdG9yeTsg fQogCisgICAgYm9vbCBjYW5Vc2VMZWdhY3lJbmplY3RlZEJ1bmRsZUluaXRpYWxpemVyKCkgY29u c3QgeyByZXR1cm4gbV9jYW5Vc2VMZWdhY3lJbmplY3RlZEJ1bmRsZUluaXRpYWxpemVyOyB9Cisg ICAgdm9pZCBzZXRDYW5Vc2VMZWdhY3lJbmplY3RlZEJ1bmRsZUluaXRpYWxpemVyKGJvb2wgY2Fu VXNlTGVnYWN5SW5qZWN0ZWRCdW5kbGVJbml0aWFsaXplcikgeyBtX2NhblVzZUxlZ2FjeUluamVj dGVkQnVuZGxlSW5pdGlhbGl6ZXIgPSBjYW5Vc2VMZWdhY3lJbmplY3RlZEJ1bmRsZUluaXRpYWxp emVyOyB9CisKICAgICBXZWJLaXQ6OldlYkNvbnRleHRDb25maWd1cmF0aW9uIHdlYkNvbnRleHRD b25maWd1cmF0aW9uKCkgY29uc3Q7CiAKIHByaXZhdGU6CkBAIC02NCw2ICs2Nyw4IEBAIHByaXZh dGU6CiAgICAgU3RyaW5nIG1faW5qZWN0ZWRCdW5kbGVQYXRoOwogICAgIFN0cmluZyBtX2xvY2Fs U3RvcmFnZURpcmVjdG9yeTsKICAgICBTdHJpbmcgbV93ZWJTUUxEYXRhYmFzZURpcmVjdG9yeTsK KworICAgIGJvb2wgbV9jYW5Vc2VMZWdhY3lJbmplY3RlZEJ1bmRsZUluaXRpYWxpemVyOwogfTsK IAogfSAvLyBuYW1lc3BhY2UgQVBJCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvV2ViQ29udGV4dC5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViQ29udGV4dC5j cHAKaW5kZXggNmEyNDNjN2JhODA4ODE5MGNjMmU3YTQ4ODcwNzkwMThlOGQ5MDY0MC4uNTQ3ZWYx MDdkYTY0MjQ5ZDk2MDU0ODJhZmI0MjZhZDM2NGI3MmY5YiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL1dlYkNvbnRleHQuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9XZWJDb250ZXh0LmNwcApAQCAtMTg2LDYgKzE4Niw3IEBAIFdlYkNvbnRleHQ6OldlYkNv bnRleHQoV2ViQ29udGV4dENvbmZpZ3VyYXRpb24gY29uZmlndXJhdGlvbikKICAgICAsIG1faWdu b3JlVExTRXJyb3JzKHRydWUpCiAjZW5kaWYKICAgICAsIG1fbWVtb3J5Q2FjaGVEaXNhYmxlZChm YWxzZSkKKyAgICAsIG1fY2FuVXNlTGVnYWN5SW5qZWN0ZWRCdW5kbGVJbml0aWFsaXplcihjb25m aWd1cmF0aW9uLmNhblVzZUxlZ2FjeUluamVjdGVkQnVuZGxlSW5pdGlhbGl6ZXIpCiB7CiAgICAg cGxhdGZvcm1Jbml0aWFsaXplKCk7CiAKQEAgLTYwMyw2ICs2MDQsNyBAQCBXZWJQcm9jZXNzUHJv eHkmIFdlYkNvbnRleHQ6OmNyZWF0ZU5ld1dlYlByb2Nlc3MoKQogICAgIFdlYlByb2Nlc3NDcmVh dGlvblBhcmFtZXRlcnMgcGFyYW1ldGVyczsKIAogICAgIHBhcmFtZXRlcnMuaW5qZWN0ZWRCdW5k bGVQYXRoID0gaW5qZWN0ZWRCdW5kbGVQYXRoKCk7CisgICAgcGFyYW1ldGVycy5jYW5Vc2VMZWdh Y3lJbmplY3RlZEJ1bmRsZUluaXRpYWxpemVyID0gbV9jYW5Vc2VMZWdhY3lJbmplY3RlZEJ1bmRs ZUluaXRpYWxpemVyOwogICAgIGlmICghcGFyYW1ldGVycy5pbmplY3RlZEJ1bmRsZVBhdGguaXNF bXB0eSgpKQogICAgICAgICBTYW5kYm94RXh0ZW5zaW9uOjpjcmVhdGVIYW5kbGUocGFyYW1ldGVy cy5pbmplY3RlZEJ1bmRsZVBhdGgsIFNhbmRib3hFeHRlbnNpb246OlJlYWRPbmx5LCBwYXJhbWV0 ZXJzLmluamVjdGVkQnVuZGxlUGF0aEV4dGVuc2lvbkhhbmRsZSk7CiAKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJDb250ZXh0LmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvV2ViQ29udGV4dC5oCmluZGV4IDQyNGE2NWJjNTE1NDcyMDA3YTJjOTc1ZWVkNGRlYTI2 NWM5ZjVhMTMuLjk2MzdjYzY2MWE4OGFlMjcxNmU5ZWEwYzA3YTkzOWYzOTExZDQ1NjAgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJDb250ZXh0LmgKKysrIGIvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL1dlYkNvbnRleHQuaApAQCAtMTAwLDYgKzEwMCw3IEBAIHN0cnVj dCBXZWJDb250ZXh0Q29uZmlndXJhdGlvbiB7CiAgICAgU3RyaW5nIGxvY2FsU3RvcmFnZURpcmVj dG9yeTsKICAgICBTdHJpbmcgd2ViU1FMRGF0YWJhc2VEaXJlY3Rvcnk7CiAgICAgU3RyaW5nIGlu ZGV4ZWREQkRhdGFiYXNlRGlyZWN0b3J5OworICAgIGJvb2wgY2FuVXNlTGVnYWN5SW5qZWN0ZWRC dW5kbGVJbml0aWFsaXplciA9IGZhbHNlOwogfTsKIAogY2xhc3MgV2ViQ29udGV4dCA6IHB1Ymxp YyBBUEk6Ok9iamVjdEltcGw8QVBJOjpPYmplY3Q6OlR5cGU6OkNvbnRleHQ+LCBwcml2YXRlIElQ Qzo6TWVzc2FnZVJlY2VpdmVyCkBAIC01NTEsNiArNTUyLDcgQEAgcHJpdmF0ZToKICNlbmRpZgog CiAgICAgYm9vbCBtX21lbW9yeUNhY2hlRGlzYWJsZWQ7CisgICAgYm9vbCBtX2NhblVzZUxlZ2Fj eUluamVjdGVkQnVuZGxlSW5pdGlhbGl6ZXI7CiAKICNpZiBQTEFURk9STShDT0NPQSkKICAgICBS ZXRhaW5QdHI8TlNNdXRhYmxlRGljdGlvbmFyeT4gbV9idW5kbGVQYXJhbWV0ZXJzOwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9tYWMvSW5qZWN0 ZWRCdW5kbGVNYWMubW0gYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL0luamVjdGVkQnVuZGxl L21hYy9JbmplY3RlZEJ1bmRsZU1hYy5tbQppbmRleCBhYWE2MTBhYmMyOWE5Y2I2ODcxNTc4MTBh MmFkNDg0NzUwOTMzNGUyLi40NTJlNzhlOGM1YmQzY2I3NGFjMzFhYjA5NzdjYjhlN2ZjZjU5ZGVk IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL21h Yy9JbmplY3RlZEJ1bmRsZU1hYy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL0lu amVjdGVkQnVuZGxlL21hYy9JbmplY3RlZEJ1bmRsZU1hYy5tbQpAQCAtODEsMTMgKzgxLDE1IEBA IGJvb2wgSW5qZWN0ZWRCdW5kbGU6OmluaXRpYWxpemUoY29uc3QgV2ViUHJvY2Vzc0NyZWF0aW9u UGFyYW1ldGVycyYgcGFyYW1ldGVycywKICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIH0KIAot ICAgIC8vIEZpcnN0IGNoZWNrIHRvIHNlZSBpZiB0aGUgYnVuZGxlIGhhcyBhIFdLQnVuZGxlSW5p dGlhbGl6ZSBmdW5jdGlvbi4KLSAgICBXS0J1bmRsZUluaXRpYWxpemVGdW5jdGlvblB0ciBpbml0 aWFsaXplRnVuY3Rpb24gPSByZWludGVycHJldF9jYXN0PFdLQnVuZGxlSW5pdGlhbGl6ZUZ1bmN0 aW9uUHRyPihDRkJ1bmRsZUdldEZ1bmN0aW9uUG9pbnRlckZvck5hbWUoW21fcGxhdGZvcm1CdW5k bGUgX2NmQnVuZGxlXSwgQ0ZTVFIoIldLQnVuZGxlSW5pdGlhbGl6ZSIpKSk7Ci0gICAgaWYgKGlu aXRpYWxpemVGdW5jdGlvbikgewotICAgICAgICBpbml0aWFsaXplRnVuY3Rpb24odG9BUEkodGhp cyksIHRvQVBJKGluaXRpYWxpemF0aW9uVXNlckRhdGEpKTsKLSAgICAgICAgcmV0dXJuIHRydWU7 CisgICAgaWYgKHBhcmFtZXRlcnMuY2FuVXNlTGVnYWN5SW5qZWN0ZWRCdW5kbGVJbml0aWFsaXpl cikgeworICAgICAgICAvLyBGaXJzdCBjaGVjayB0byBzZWUgaWYgdGhlIGJ1bmRsZSBoYXMgYSBX S0J1bmRsZUluaXRpYWxpemUgZnVuY3Rpb24uCisgICAgICAgIFdLQnVuZGxlSW5pdGlhbGl6ZUZ1 bmN0aW9uUHRyIGluaXRpYWxpemVGdW5jdGlvbiA9IHJlaW50ZXJwcmV0X2Nhc3Q8V0tCdW5kbGVJ bml0aWFsaXplRnVuY3Rpb25QdHI+KENGQnVuZGxlR2V0RnVuY3Rpb25Qb2ludGVyRm9yTmFtZShb bV9wbGF0Zm9ybUJ1bmRsZSBfY2ZCdW5kbGVdLCBDRlNUUigiV0tCdW5kbGVJbml0aWFsaXplIikp KTsKKyAgICAgICAgaWYgKGluaXRpYWxpemVGdW5jdGlvbikgeworICAgICAgICAgICAgaW5pdGlh bGl6ZUZ1bmN0aW9uKHRvQVBJKHRoaXMpLCB0b0FQSShpbml0aWFsaXphdGlvblVzZXJEYXRhKSk7 CisgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICAgICAgfQogICAgIH0KLSAgICAKKwogI2lm IFdLX0FQSV9FTkFCTEVECiAgICAgaWYgKHBhcmFtZXRlcnMuYnVuZGxlUGFyYW1ldGVyRGF0YSkg ewogICAgICAgICBhdXRvIGJ1bmRsZVBhcmFtZXRlckRhdGEgPSBhZG9wdE5TKFtbTlNEYXRhIGFs bG9jXSBpbml0V2l0aEJ5dGVzTm9Db3B5OmNvbnN0X2Nhc3Q8dm9pZCo+KHN0YXRpY19jYXN0PGNv bnN0IHZvaWQqPihwYXJhbWV0ZXJzLmJ1bmRsZVBhcmFtZXRlckRhdGEtPmJ5dGVzKCkpKSBsZW5n dGg6cGFyYW1ldGVycy5idW5kbGVQYXJhbWV0ZXJEYXRhLT5zaXplKCkgZnJlZVdoZW5Eb25lOk5P XSk7Cg==