42396 2010-07-15 13:28:10 -0700 Give the navigation type in the policy client callbacks meaning 2010-07-15 13:40:31 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) All OS X 10.5 RESOLVED FIXED P2 Normal --- 1 sam webkit-unassigned webkit.review.bot oldest_to_newest 252055 0 sam 2010-07-15 13:28:10 -0700 Give the navigation type in the policy client callbacks meaning. 252057 1 61704 sam 2010-07-15 13:29:58 -0700 Created attachment 61704 Patch 252059 2 webkit.review.bot 2010-07-15 13:30:50 -0700 Attachment 61704 did not pass style-queue: Failed to run "['WebKitTools/Scripts/check-webkit-style']" exit_code: 1 WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.h:33: "stdint.h" already included at WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.h:30 [build/include] [4] Total errors found: 1 in 8 files If any of these errors are false positives, please file a bug against check-webkit-style. 252069 3 sam 2010-07-15 13:40:31 -0700 Landed in http://trac.webkit.org/changeset/63455 61704 2010-07-15 13:29:58 -0700 2010-07-15 13:38:33 -0700 Patch patch.diff text/plain 11796 sam SW5kZXg6IFdlYktpdDIvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdDIvQ2hhbmdlTG9n CShyZXZpc2lvbiA2MzQ1MykKKysrIFdlYktpdDIvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjcgQEAKKzIwMTAtMDctMTUgIFNhbSBXZWluaWcgIDxzYW1Ad2Via2l0Lm9yZz4K KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBQYXRjaCBm b3IgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQyMzk2CisgICAgICAg IEdpdmUgdGhlIG5hdmlnYXRpb24gdHlwZSBpbiB0aGUgcG9saWN5IGNsaWVudCBjYWxsYmFja3Mg bWVhbmluZy4gCisKKyAgICAgICAgLSBVc2UgdGhlIG5ldyBXS0ZyYW1lTmF2aWdhdGlvblR5cGUg aW5zdGVhZCBvZiBqdXN0IHVpbnQzMl90LgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9DL1dL QVBJQ2FzdC5oOgorICAgICAgICAodG9XSyk6CisgICAgICAgIEFkZCBjb252ZXJzaW9uIG1ldGhv ZCBmcm9tIFdlYkNvcmU6Ok5hdmlnYXRpb25UeXBlIHRvIFdLRnJhbWVOYXZpZ2F0aW9uVHlwZS4K KyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0MvV0tQYWdlLmg6CisgICAgICAgICogVUlQcm9jZXNz L1dlYlBhZ2VQcm94eS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6ZGlkUmVj ZWl2ZU1lc3NhZ2UpOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OmRlY2lkZVBvbGlj eUZvck5hdmlnYXRpb25BY3Rpb24pOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OmRl Y2lkZVBvbGljeUZvck5ld1dpbmRvd0FjdGlvbik6CisgICAgICAgICogVUlQcm9jZXNzL1dlYlBh Z2VQcm94eS5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQb2xpY3lDbGllbnQuY3BwOgorICAg ICAgICAoV2ViS2l0OjpXZWJQb2xpY3lDbGllbnQ6OmRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25B Y3Rpb24pOgorICAgICAgICAoV2ViS2l0OjpXZWJQb2xpY3lDbGllbnQ6OmRlY2lkZVBvbGljeUZv ck5ld1dpbmRvd0FjdGlvbik6CisgICAgICAgICogVUlQcm9jZXNzL1dlYlBvbGljeUNsaWVudC5o OgorICAgICAgICAqIFdlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvQVBJL2MvV0tCdW5kbGVQYWdl Lmg6CisKIDIwMTAtMDctMTUgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4K IAogICAgICAgICBSZXZpZXdlZCBieSBTYW0gV2VpbmlnLgpJbmRleDogV2ViS2l0Mi9VSVByb2Nl c3MvV2ViUGFnZVByb3h5LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQyL1VJUHJvY2Vzcy9XZWJQ YWdlUHJveHkuY3BwCShyZXZpc2lvbiA2MzM4NCkKKysrIFdlYktpdDIvVUlQcm9jZXNzL1dlYlBh Z2VQcm94eS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQ5NCw3ICs0OTQsNyBAQCB2b2lkIFdlYlBh Z2VQcm94eTo6ZGlkUmVjZWl2ZU1lc3NhZ2UoQ29yCiAgICAgICAgICAgICB1aW50NjRfdCBsaXN0 ZW5lcklEOwogICAgICAgICAgICAgaWYgKCFhcmd1bWVudHMuZGVjb2RlKENvcmVJUEM6Ok91dChm cmFtZUlELCBuYXZpZ2F0aW9uVHlwZSwgdXJsLCBsaXN0ZW5lcklEKSkpCiAgICAgICAgICAgICAg ICAgcmV0dXJuOwotICAgICAgICAgICAgZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvbih3 ZWJGcmFtZShmcmFtZUlEKSwgbmF2aWdhdGlvblR5cGUsIHVybCwgbGlzdGVuZXJJRCk7CisgICAg ICAgICAgICBkZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uKHdlYkZyYW1lKGZyYW1lSUQp LCBzdGF0aWNfY2FzdDxOYXZpZ2F0aW9uVHlwZT4obmF2aWdhdGlvblR5cGUpLCB1cmwsIGxpc3Rl bmVySUQpOwogICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIH0KICAgICAgICAgY2FzZSBXZWJQ YWdlUHJveHlNZXNzYWdlOjpEZWNpZGVQb2xpY3lGb3JOZXdXaW5kb3dBY3Rpb246IHsKQEAgLTUw NCw3ICs1MDQsNyBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6ZGlkUmVjZWl2ZU1lc3NhZ2UoQ29yCiAg ICAgICAgICAgICB1aW50NjRfdCBsaXN0ZW5lcklEOwogICAgICAgICAgICAgaWYgKCFhcmd1bWVu dHMuZGVjb2RlKENvcmVJUEM6Ok91dChmcmFtZUlELCBuYXZpZ2F0aW9uVHlwZSwgdXJsLCBsaXN0 ZW5lcklEKSkpCiAgICAgICAgICAgICAgICAgcmV0dXJuOwotICAgICAgICAgICAgZGVjaWRlUG9s aWN5Rm9yTmV3V2luZG93QWN0aW9uKHdlYkZyYW1lKGZyYW1lSUQpLCBuYXZpZ2F0aW9uVHlwZSwg dXJsLCBsaXN0ZW5lcklEKTsKKyAgICAgICAgICAgIGRlY2lkZVBvbGljeUZvck5ld1dpbmRvd0Fj dGlvbih3ZWJGcmFtZShmcmFtZUlEKSwgc3RhdGljX2Nhc3Q8TmF2aWdhdGlvblR5cGU+KG5hdmln YXRpb25UeXBlKSwgdXJsLCBsaXN0ZW5lcklEKTsKICAgICAgICAgICAgIGJyZWFrOwogICAgICAg ICB9CiAgICAgICAgIGNhc2UgV2ViUGFnZVByb3h5TWVzc2FnZTo6RGVjaWRlUG9saWN5Rm9yTUlN RVR5cGU6IHsKQEAgLTc2MywxNCArNzYzLDE0IEBAIHZvaWQgV2ViUGFnZVByb3h5OjpkaWRGaXJz dFZpc3VhbGx5Tm9uRW0KIAogLy8gUG9saWN5Q2xpZW50CiAKLXZvaWQgV2ViUGFnZVByb3h5Ojpk ZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uKFdlYkZyYW1lUHJveHkqIGZyYW1lLCB1aW50 MzJfdCBuYXZpZ2F0aW9uVHlwZSwgY29uc3QgU3RyaW5nJiB1cmwsIHVpbnQ2NF90IGxpc3RlbmVy SUQpCit2b2lkIFdlYlBhZ2VQcm94eTo6ZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvbihX ZWJGcmFtZVByb3h5KiBmcmFtZSwgTmF2aWdhdGlvblR5cGUgbmF2aWdhdGlvblR5cGUsIGNvbnN0 IFN0cmluZyYgdXJsLCB1aW50NjRfdCBsaXN0ZW5lcklEKQogewogICAgIFJlZlB0cjxXZWJGcmFt ZVBvbGljeUxpc3RlbmVyUHJveHk+IGxpc3RlbmVyID0gZnJhbWUtPnNldFVwUG9saWN5TGlzdGVu ZXJQcm94eShsaXN0ZW5lcklEKTsKICAgICBpZiAoIW1fcG9saWN5Q2xpZW50LmRlY2lkZVBvbGlj eUZvck5hdmlnYXRpb25BY3Rpb24odGhpcywgbmF2aWdhdGlvblR5cGUsIHVybCwgZnJhbWUsIGxp c3RlbmVyLmdldCgpKSkKICAgICAgICAgbGlzdGVuZXItPnVzZSgpOwogfQogCi12b2lkIFdlYlBh Z2VQcm94eTo6ZGVjaWRlUG9saWN5Rm9yTmV3V2luZG93QWN0aW9uKFdlYkZyYW1lUHJveHkqIGZy YW1lLCB1aW50MzJfdCBuYXZpZ2F0aW9uVHlwZSwgY29uc3QgU3RyaW5nJiB1cmwsIHVpbnQ2NF90 IGxpc3RlbmVySUQpCit2b2lkIFdlYlBhZ2VQcm94eTo6ZGVjaWRlUG9saWN5Rm9yTmV3V2luZG93 QWN0aW9uKFdlYkZyYW1lUHJveHkqIGZyYW1lLCBOYXZpZ2F0aW9uVHlwZSBuYXZpZ2F0aW9uVHlw ZSwgY29uc3QgU3RyaW5nJiB1cmwsIHVpbnQ2NF90IGxpc3RlbmVySUQpCiB7CiAgICAgUmVmUHRy PFdlYkZyYW1lUG9saWN5TGlzdGVuZXJQcm94eT4gbGlzdGVuZXIgPSBmcmFtZS0+c2V0VXBQb2xp Y3lMaXN0ZW5lclByb3h5KGxpc3RlbmVySUQpOwogICAgIGlmICghbV9wb2xpY3lDbGllbnQuZGVj aWRlUG9saWN5Rm9yTmV3V2luZG93QWN0aW9uKHRoaXMsIG5hdmlnYXRpb25UeXBlLCB1cmwsIGZy YW1lLCBsaXN0ZW5lci5nZXQoKSkpCkluZGV4OiBXZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJv eHkuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAkocmV2 aXNpb24gNjMzODQpCisrKyBXZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAkod29ya2lu ZyBjb3B5KQpAQCAtMTcyLDggKzE3Miw4IEBAIHByaXZhdGU6CiAgICAgdm9pZCBkaWRDaGFuZ2VQ cm9ncmVzcyhkb3VibGUpOwogICAgIHZvaWQgZGlkRmluaXNoUHJvZ3Jlc3MoKTsKICAgICAKLSAg ICB2b2lkIGRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb24oV2ViRnJhbWVQcm94eSosIHVp bnQzMl90IG5hdmlnYXRpb25UeXBlLCBjb25zdCBXZWJDb3JlOjpTdHJpbmcmIHVybCwgdWludDY0 X3QgbGlzdGVuZXJJRCk7Ci0gICAgdm9pZCBkZWNpZGVQb2xpY3lGb3JOZXdXaW5kb3dBY3Rpb24o V2ViRnJhbWVQcm94eSosIHVpbnQzMl90IG5hdmlnYXRpb25UeXBlLCBjb25zdCBXZWJDb3JlOjpT dHJpbmcmIHVybCwgdWludDY0X3QgbGlzdGVuZXJJRCk7CisgICAgdm9pZCBkZWNpZGVQb2xpY3lG b3JOYXZpZ2F0aW9uQWN0aW9uKFdlYkZyYW1lUHJveHkqLCBXZWJDb3JlOjpOYXZpZ2F0aW9uVHlw ZSBuYXZpZ2F0aW9uVHlwZSwgY29uc3QgV2ViQ29yZTo6U3RyaW5nJiB1cmwsIHVpbnQ2NF90IGxp c3RlbmVySUQpOworICAgIHZvaWQgZGVjaWRlUG9saWN5Rm9yTmV3V2luZG93QWN0aW9uKFdlYkZy YW1lUHJveHkqLCBXZWJDb3JlOjpOYXZpZ2F0aW9uVHlwZSBuYXZpZ2F0aW9uVHlwZSwgY29uc3Qg V2ViQ29yZTo6U3RyaW5nJiB1cmwsIHVpbnQ2NF90IGxpc3RlbmVySUQpOwogICAgIHZvaWQgZGVj aWRlUG9saWN5Rm9yTUlNRVR5cGUoV2ViRnJhbWVQcm94eSosIGNvbnN0IFdlYkNvcmU6OlN0cmlu ZyYgTUlNRVR5cGUsIGNvbnN0IFdlYkNvcmU6OlN0cmluZyYgdXJsLCB1aW50NjRfdCBsaXN0ZW5l cklEKTsKIAogICAgIFdlYlBhZ2VQcm94eSogY3JlYXRlTmV3UGFnZSgpOwpJbmRleDogV2ViS2l0 Mi9VSVByb2Nlc3MvV2ViUG9saWN5Q2xpZW50LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQyL1VJ UHJvY2Vzcy9XZWJQb2xpY3lDbGllbnQuY3BwCShyZXZpc2lvbiA2MzM4NCkKKysrIFdlYktpdDIv VUlQcm9jZXNzL1dlYlBvbGljeUNsaWVudC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQ1LDIxICs0 NSwyMSBAQCB2b2lkIFdlYlBvbGljeUNsaWVudDo6aW5pdGlhbGl6ZShXS1BhZ2VQCiAgICAgICAg IG1lbXNldCgmbV9wYWdlUG9saWN5Q2xpZW50LCAwLCBzaXplb2YobV9wYWdlUG9saWN5Q2xpZW50 KSk7CiB9CiAKLWJvb2wgV2ViUG9saWN5Q2xpZW50OjpkZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9u QWN0aW9uKFdlYlBhZ2VQcm94eSogcGFnZSwgdWludDMyX3QgbmF2aWdhdGlvbkFjdGlvbiwgY29u c3QgU3RyaW5nJiB1cmwsIFdlYkZyYW1lUHJveHkqIGZyYW1lLCBXZWJGcmFtZVBvbGljeUxpc3Rl bmVyUHJveHkqIGxpc3RlbmVyKQorYm9vbCBXZWJQb2xpY3lDbGllbnQ6OmRlY2lkZVBvbGljeUZv ck5hdmlnYXRpb25BY3Rpb24oV2ViUGFnZVByb3h5KiBwYWdlLCBOYXZpZ2F0aW9uVHlwZSB0eXBl LCBjb25zdCBTdHJpbmcmIHVybCwgV2ViRnJhbWVQcm94eSogZnJhbWUsIFdlYkZyYW1lUG9saWN5 TGlzdGVuZXJQcm94eSogbGlzdGVuZXIpCiB7CiAgICAgaWYgKCFtX3BhZ2VQb2xpY3lDbGllbnQu ZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvbikKICAgICAgICAgcmV0dXJuIGZhbHNlOwog Ci0gICAgbV9wYWdlUG9saWN5Q2xpZW50LmRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb24o dG9SZWYocGFnZSksIG5hdmlnYXRpb25BY3Rpb24sIHRvVVJMUmVmKHVybC5pbXBsKCkpLCB0b1Jl ZihmcmFtZSksIHRvUmVmKGxpc3RlbmVyKSwgbV9wYWdlUG9saWN5Q2xpZW50LmNsaWVudEluZm8p OworICAgIG1fcGFnZVBvbGljeUNsaWVudC5kZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9u KHRvUmVmKHBhZ2UpLCB0b1dLKHR5cGUpLCB0b1VSTFJlZih1cmwuaW1wbCgpKSwgdG9SZWYoZnJh bWUpLCB0b1JlZihsaXN0ZW5lciksIG1fcGFnZVBvbGljeUNsaWVudC5jbGllbnRJbmZvKTsKICAg ICByZXR1cm4gdHJ1ZTsKIH0KIAotYm9vbCBXZWJQb2xpY3lDbGllbnQ6OmRlY2lkZVBvbGljeUZv ck5ld1dpbmRvd0FjdGlvbihXZWJQYWdlUHJveHkqIHBhZ2UsIHVpbnQzMl90IG5hdmlnYXRpb25B Y3Rpb24sIGNvbnN0IFN0cmluZyYgdXJsLCBXZWJGcmFtZVByb3h5KiBmcmFtZSwgV2ViRnJhbWVQ b2xpY3lMaXN0ZW5lclByb3h5KiBsaXN0ZW5lcikKK2Jvb2wgV2ViUG9saWN5Q2xpZW50OjpkZWNp ZGVQb2xpY3lGb3JOZXdXaW5kb3dBY3Rpb24oV2ViUGFnZVByb3h5KiBwYWdlLCBOYXZpZ2F0aW9u VHlwZSB0eXBlLCBjb25zdCBTdHJpbmcmIHVybCwgV2ViRnJhbWVQcm94eSogZnJhbWUsIFdlYkZy YW1lUG9saWN5TGlzdGVuZXJQcm94eSogbGlzdGVuZXIpCiB7CiAgICAgaWYgKCFtX3BhZ2VQb2xp Y3lDbGllbnQuZGVjaWRlUG9saWN5Rm9yTmV3V2luZG93QWN0aW9uKQogICAgICAgICByZXR1cm4g ZmFsc2U7CiAKLSAgICBtX3BhZ2VQb2xpY3lDbGllbnQuZGVjaWRlUG9saWN5Rm9yTmV3V2luZG93 QWN0aW9uKHRvUmVmKHBhZ2UpLCBuYXZpZ2F0aW9uQWN0aW9uLCB0b1VSTFJlZih1cmwuaW1wbCgp KSwgdG9SZWYoZnJhbWUpLCB0b1JlZihsaXN0ZW5lciksIG1fcGFnZVBvbGljeUNsaWVudC5jbGll bnRJbmZvKTsKKyAgICBtX3BhZ2VQb2xpY3lDbGllbnQuZGVjaWRlUG9saWN5Rm9yTmV3V2luZG93 QWN0aW9uKHRvUmVmKHBhZ2UpLCB0b1dLKHR5cGUpLCB0b1VSTFJlZih1cmwuaW1wbCgpKSwgdG9S ZWYoZnJhbWUpLCB0b1JlZihsaXN0ZW5lciksIG1fcGFnZVBvbGljeUNsaWVudC5jbGllbnRJbmZv KTsKICAgICByZXR1cm4gdHJ1ZTsKIH0KIApJbmRleDogV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUG9s aWN5Q2xpZW50LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUG9saWN5Q2xp ZW50LmgJKHJldmlzaW9uIDYzMzg0KQorKysgV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUG9saWN5Q2xp ZW50LmgJKHdvcmtpbmcgY29weSkKQEAgLTI3LDYgKzI3LDcgQEAKICNkZWZpbmUgV2ViUG9saWN5 Q2xpZW50X2gKIAogI2luY2x1ZGUgIldLUGFnZS5oIgorI2luY2x1ZGUgPFdlYkNvcmUvRnJhbWVM b2FkZXJUeXBlcy5oPgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgY2xhc3MgU3RyaW5nOwpA QCAtNDMsOCArNDQsOCBAQCBwdWJsaWM6CiAgICAgV2ViUG9saWN5Q2xpZW50KCk7CiAgICAgdm9p ZCBpbml0aWFsaXplKFdLUGFnZVBvbGljeUNsaWVudCopOwogCi0gICAgYm9vbCBkZWNpZGVQb2xp Y3lGb3JOYXZpZ2F0aW9uQWN0aW9uKFdlYlBhZ2VQcm94eSosIHVpbnQzMl90LCBjb25zdCBXZWJD b3JlOjpTdHJpbmcmIHVybCwgV2ViRnJhbWVQcm94eSosIFdlYkZyYW1lUG9saWN5TGlzdGVuZXJQ cm94eSopOwotICAgIGJvb2wgZGVjaWRlUG9saWN5Rm9yTmV3V2luZG93QWN0aW9uKFdlYlBhZ2VQ cm94eSosIHVpbnQzMl90LCBjb25zdCBXZWJDb3JlOjpTdHJpbmcmIHVybCwgV2ViRnJhbWVQcm94 eSosIFdlYkZyYW1lUG9saWN5TGlzdGVuZXJQcm94eSopOworICAgIGJvb2wgZGVjaWRlUG9saWN5 Rm9yTmF2aWdhdGlvbkFjdGlvbihXZWJQYWdlUHJveHkqLCBXZWJDb3JlOjpOYXZpZ2F0aW9uVHlw ZSwgY29uc3QgV2ViQ29yZTo6U3RyaW5nJiB1cmwsIFdlYkZyYW1lUHJveHkqLCBXZWJGcmFtZVBv bGljeUxpc3RlbmVyUHJveHkqKTsKKyAgICBib29sIGRlY2lkZVBvbGljeUZvck5ld1dpbmRvd0Fj dGlvbihXZWJQYWdlUHJveHkqLCBXZWJDb3JlOjpOYXZpZ2F0aW9uVHlwZSwgY29uc3QgV2ViQ29y ZTo6U3RyaW5nJiB1cmwsIFdlYkZyYW1lUHJveHkqLCBXZWJGcmFtZVBvbGljeUxpc3RlbmVyUHJv eHkqKTsKICAgICBib29sIGRlY2lkZVBvbGljeUZvck1JTUVUeXBlKFdlYlBhZ2VQcm94eSosIGNv bnN0IFdlYkNvcmU6OlN0cmluZyYsIGNvbnN0IFdlYkNvcmU6OlN0cmluZyYgdXJsLCBXZWJGcmFt ZVByb3h5KiwgV2ViRnJhbWVQb2xpY3lMaXN0ZW5lclByb3h5Kik7CiAKIHByaXZhdGU6CkluZGV4 OiBXZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS0FQSUNhc3QuaAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJL aXQyL1VJUHJvY2Vzcy9BUEkvQy9XS0FQSUNhc3QuaAkocmV2aXNpb24gNjMzODQpCisrKyBXZWJL aXQyL1VJUHJvY2Vzcy9BUEkvQy9XS0FQSUNhc3QuaAkod29ya2luZyBjb3B5KQpAQCAtMjcsNiAr MjcsOCBAQAogI2RlZmluZSBXS0FQSUNhc3RfaAogCiAjaW5jbHVkZSAiV0tCYXNlLmgiCisjaW5j bHVkZSAiV0tQYWdlLmgiCisjaW5jbHVkZSA8V2ViQ29yZS9GcmFtZUxvYWRlclR5cGVzLmg+CiAK ICNpZiBkZWZpbmVkKFdJTjMyKSB8fCBkZWZpbmVkKF9XSU4zMikKICNpbmNsdWRlICJXS0FQSUNh c3RXaW4uaCIKQEAgLTk5LDQgKzEwMSwzMiBAQCBpbmxpbmUgV0tVUkxSZWYgdG9VUkxSZWYoV2Vi Q29yZTo6U3RyaW5nCiAgICAgcmV0dXJuIHJlaW50ZXJwcmV0X2Nhc3Q8V0tVUkxSZWY+KHMpOwog fQogCitpbmxpbmUgV0tGcmFtZU5hdmlnYXRpb25UeXBlIHRvV0soV2ViQ29yZTo6TmF2aWdhdGlv blR5cGUgdHlwZSkKK3sKKyAgICBXS0ZyYW1lTmF2aWdhdGlvblR5cGUgd2tUeXBlID0ga1dLRnJh bWVOYXZpZ2F0aW9uVHlwZU90aGVyOworCisgICAgc3dpdGNoICh0eXBlKSB7CisgICAgY2FzZSBX ZWJDb3JlOjpOYXZpZ2F0aW9uVHlwZUxpbmtDbGlja2VkOgorICAgICAgICB3a1R5cGUgPSBrV0tG cmFtZU5hdmlnYXRpb25UeXBlTGlua0NsaWNrZWQ7CisgICAgICAgIGJyZWFrOworICAgIGNhc2Ug V2ViQ29yZTo6TmF2aWdhdGlvblR5cGVGb3JtU3VibWl0dGVkOgorICAgICAgICB3a1R5cGUgPSBr V0tGcmFtZU5hdmlnYXRpb25UeXBlRm9ybVN1Ym1pdHRlZDsKKyAgICAgICAgYnJlYWs7CisgICAg Y2FzZSBXZWJDb3JlOjpOYXZpZ2F0aW9uVHlwZUJhY2tGb3J3YXJkOgorICAgICAgICB3a1R5cGUg PSBrV0tGcmFtZU5hdmlnYXRpb25UeXBlQmFja0ZvcndhcmQ7CisgICAgICAgIGJyZWFrOworICAg IGNhc2UgV2ViQ29yZTo6TmF2aWdhdGlvblR5cGVSZWxvYWQ6CisgICAgICAgIHdrVHlwZSA9IGtX S0ZyYW1lTmF2aWdhdGlvblR5cGVSZWxvYWQ7CisgICAgICAgIGJyZWFrOworICAgIGNhc2UgV2Vi Q29yZTo6TmF2aWdhdGlvblR5cGVGb3JtUmVzdWJtaXR0ZWQ6CisgICAgICAgIHdrVHlwZSA9IGtX S0ZyYW1lTmF2aWdhdGlvblR5cGVGb3JtUmVzdWJtaXR0ZWQ7CisgICAgICAgIGJyZWFrOworICAg IGNhc2UgV2ViQ29yZTo6TmF2aWdhdGlvblR5cGVPdGhlcjoKKyAgICAgICAgd2tUeXBlID0ga1dL RnJhbWVOYXZpZ2F0aW9uVHlwZU90aGVyOworICAgICAgICBicmVhazsKKyAgICB9CisgICAgCisg ICAgcmV0dXJuIHdrVHlwZTsKK30KKwogI2VuZGlmIC8vIFdLQVBJQ2FzdF9oCkluZGV4OiBXZWJL aXQyL1VJUHJvY2Vzcy9BUEkvQy9XS1BhZ2UuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQyL1VJUHJv Y2Vzcy9BUEkvQy9XS1BhZ2UuaAkocmV2aXNpb24gNjMzODQpCisrKyBXZWJLaXQyL1VJUHJvY2Vz cy9BUEkvQy9XS1BhZ2UuaAkod29ya2luZyBjb3B5KQpAQCAtMzgsNiArMzgsMTYgQEAKIGV4dGVy biAiQyIgewogI2VuZGlmCiAKK2VudW0geworICAgIGtXS0ZyYW1lTmF2aWdhdGlvblR5cGVMaW5r Q2xpY2tlZCA9IDAsCisgICAga1dLRnJhbWVOYXZpZ2F0aW9uVHlwZUZvcm1TdWJtaXR0ZWQgPSAx LAorICAgIGtXS0ZyYW1lTmF2aWdhdGlvblR5cGVCYWNrRm9yd2FyZCA9IDIsCisgICAga1dLRnJh bWVOYXZpZ2F0aW9uVHlwZVJlbG9hZCA9IDMsCisgICAga1dLRnJhbWVOYXZpZ2F0aW9uVHlwZUZv cm1SZXN1Ym1pdHRlZCA9IDQsCisgICAga1dLRnJhbWVOYXZpZ2F0aW9uVHlwZU90aGVyID0gNQor fTsKK3R5cGVkZWYgdWludDMyX3QgV0tGcmFtZU5hdmlnYXRpb25UeXBlOworCiAvLyBGcmFtZUxv YWQgQ2xpZW50CiB0eXBlZGVmIHZvaWQgKCpXS1BhZ2VEaWRTdGFydFByb3Zpc2lvbmFsTG9hZEZv ckZyYW1lQ2FsbGJhY2spKFdLUGFnZVJlZiBwYWdlLCBXS0ZyYW1lUmVmIGZyYW1lLCBjb25zdCB2 b2lkICpjbGllbnRJbmZvKTsKIHR5cGVkZWYgdm9pZCAoKldLUGFnZURpZFJlY2VpdmVTZXJ2ZXJS ZWRpcmVjdEZvclByb3Zpc2lvbmFsTG9hZEZvckZyYW1lQ2FsbGJhY2spKFdLUGFnZVJlZiBwYWdl LCBXS0ZyYW1lUmVmIGZyYW1lLCBjb25zdCB2b2lkICpjbGllbnRJbmZvKTsKQEAgLTg0LDggKzk0 LDggQEAgc3RydWN0IFdLUGFnZUxvYWRlckNsaWVudCB7CiB0eXBlZGVmIHN0cnVjdCBXS1BhZ2VM b2FkZXJDbGllbnQgV0tQYWdlTG9hZGVyQ2xpZW50OwogCiAvLyBQb2xpY3kgQ2xpZW50LgotdHlw ZWRlZiB2b2lkICgqV0tQYWdlRGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvbkNhbGxiYWNr KShXS1BhZ2VSZWYgcGFnZSwgdWludDMyX3QgbmF2aWdhdGlvblR5cGUsIFdLVVJMUmVmIHVybCwg V0tGcmFtZVJlZiBmcmFtZSwgV0tGcmFtZVBvbGljeUxpc3RlbmVyUmVmIGxpc3RlbmVyLCBjb25z dCB2b2lkICpjbGllbnRJbmZvKTsKLXR5cGVkZWYgdm9pZCAoKldLUGFnZURlY2lkZVBvbGljeUZv ck5ld1dpbmRvd0FjdGlvbkNhbGxiYWNrKShXS1BhZ2VSZWYgcGFnZSwgdWludDMyX3QgbmF2aWdh dGlvblR5cGUsIFdLVVJMUmVmIHVybCwgV0tGcmFtZVJlZiBmcmFtZSwgV0tGcmFtZVBvbGljeUxp c3RlbmVyUmVmIGxpc3RlbmVyLCBjb25zdCB2b2lkICpjbGllbnRJbmZvKTsKK3R5cGVkZWYgdm9p ZCAoKldLUGFnZURlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb25DYWxsYmFjaykoV0tQYWdl UmVmIHBhZ2UsIFdLRnJhbWVOYXZpZ2F0aW9uVHlwZSBuYXZpZ2F0aW9uVHlwZSwgV0tVUkxSZWYg dXJsLCBXS0ZyYW1lUmVmIGZyYW1lLCBXS0ZyYW1lUG9saWN5TGlzdGVuZXJSZWYgbGlzdGVuZXIs IGNvbnN0IHZvaWQgKmNsaWVudEluZm8pOwordHlwZWRlZiB2b2lkICgqV0tQYWdlRGVjaWRlUG9s aWN5Rm9yTmV3V2luZG93QWN0aW9uQ2FsbGJhY2spKFdLUGFnZVJlZiBwYWdlLCBXS0ZyYW1lTmF2 aWdhdGlvblR5cGUgbmF2aWdhdGlvblR5cGUsIFdLVVJMUmVmIHVybCwgV0tGcmFtZVJlZiBmcmFt ZSwgV0tGcmFtZVBvbGljeUxpc3RlbmVyUmVmIGxpc3RlbmVyLCBjb25zdCB2b2lkICpjbGllbnRJ bmZvKTsKIHR5cGVkZWYgdm9pZCAoKldLUGFnZURlY2lkZVBvbGljeUZvck1JTUVUeXBlQ2FsbGJh Y2spKFdLUGFnZVJlZiBwYWdlLCBXS1N0cmluZ1JlZiBNSU1FVHlwZSwgV0tVUkxSZWYgdXJsLCBX S0ZyYW1lUmVmIGZyYW1lLCBXS0ZyYW1lUG9saWN5TGlzdGVuZXJSZWYgbGlzdGVuZXIsIGNvbnN0 IHZvaWQgKmNsaWVudEluZm8pOwogCiBzdHJ1Y3QgV0tQYWdlUG9saWN5Q2xpZW50IHsKSW5kZXg6 IFdlYktpdDIvV2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9BUEkvYy9XS0J1bmRsZVBhZ2UuaAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBXZWJLaXQyL1dlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvQVBJL2MvV0tC dW5kbGVQYWdlLmgJKHJldmlzaW9uIDYzMzg0KQorKysgV2ViS2l0Mi9XZWJQcm9jZXNzL0luamVj dGVkQnVuZGxlL0FQSS9jL1dLQnVuZGxlUGFnZS5oCSh3b3JraW5nIGNvcHkpCkBAIC0yOSw2ICsy OSw3IEBACiAjaW5jbHVkZSA8SmF2YVNjcmlwdENvcmUvSmF2YVNjcmlwdC5oPgogI2luY2x1ZGUg PFdlYktpdDIvV0tCYXNlLmg+CiAjaW5jbHVkZSA8V2ViS2l0Mi9XS0J1bmRsZUJhc2UuaD4KKyNp bmNsdWRlIDxzdGRpbnQuaD4KIAogI2lmZGVmIF9fY3BsdXNwbHVzCiBleHRlcm4gIkMiIHsK