107405 2013-01-20 15:07:12 -0800 Remove support getting per-resource callbacks in the UIProcess 2013-02-02 17:14:18 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 107421 107417 1 sam sam abecsi cgarcia cmarcelo gyuyoung.kim menard ossy ostap73 philn rakuco tmpsantos webkit-ews webkit.review.bot xan.lopez zan oldest_to_newest 811688 0 sam 2013-01-20 15:07:12 -0800 Remove support getting per-resource callbacks in the UIProcess 811689 1 183689 sam 2013-01-20 15:10:29 -0800 Created attachment 183689 Patch 811692 2 183689 eflews.bot 2013-01-20 15:14:58 -0800 Comment on attachment 183689 Patch Attachment 183689 did not pass efl-ews (efl): Output: http://queues.webkit.org/results/15974781 811693 3 183689 webkit-ews 2013-01-20 15:16:48 -0800 Comment on attachment 183689 Patch Attachment 183689 did not pass qt-wk2-ews (qt): Output: http://queues.webkit.org/results/16011042 811694 4 183689 andersca 2013-01-20 15:20:47 -0800 Comment on attachment 183689 Patch r=me assuming it doesn't break the nightly builds. 811704 5 sam 2013-01-20 17:02:59 -0800 Committed r140285: <http://trac.webkit.org/changeset/140285> 811754 6 ostap73 2013-01-20 20:42:02 -0800 Reopen because of build breaks. 811755 7 183700 ostap73 2013-01-20 20:43:13 -0800 Created attachment 183700 EFL, GTK & Qt build fixes after r140285. 811779 8 183700 webkit.review.bot 2013-01-20 21:43:38 -0800 Comment on attachment 183700 EFL, GTK & Qt build fixes after r140285. Clearing flags on attachment: 183700 Committed r140294: <http://trac.webkit.org/changeset/140294> 811805 9 tmpsantos 2013-01-20 22:13:53 -0800 (In reply to comment #7) > Created an attachment (id=183700) [details] > EFL, GTK & Qt build fixes after r140285. Thanks for addressing the build breakage, but I'm afraid this is going to be more than just a buildsystem fix. 812182 10 cgarcia 2013-01-21 08:21:26 -0800 (In reply to comment #8) > (From update of attachment 183700 [details]) > Clearing flags on attachment: 183700 > > Committed r140294: <http://trac.webkit.org/changeset/140294> This is not a build fix, it removes public headers from the WebKit2 GTK+ API. 812187 11 cgarcia 2013-01-21 08:25:22 -0800 (In reply to comment #10) > (In reply to comment #8) > > (From update of attachment 183700 [details] [details]) > > Clearing flags on attachment: 183700 > > > > Committed r140294: <http://trac.webkit.org/changeset/140294> > > This is not a build fix, it removes public headers from the WebKit2 GTK+ API. Sorry, I misread the patch, it doesn't remove any patch from API/gtk dir. I still wonder how can this build, since GTK+ depends on WKPageResourceLoadClient. I'll look at it in detail. 183689 2013-01-20 15:10:29 -0800 2013-01-20 15:20:46 -0800 Patch bug-107405-20130120150725.patch text/plain 27861 sam SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE0MDI4MikKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM0IEBACisyMDEzLTAxLTIwICBTYW0gV2Vp bmlnICA8c2FtQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmVtb3ZlIHN1cHBvcnQgZ2V0dGluZyBw ZXItcmVzb3VyY2UgY2FsbGJhY2tzIGluIHRoZSBVSVByb2Nlc3MKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwNzQwNQorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJlbW92ZXMgc3VwcG9ydCBmb3IgdGhlIFdL UGFnZVJlc291cmNlTG9hZENsaWVudC4gQWNjZXNzIHRvIHBlci1yZXNvdXJjZQorICAgICAgICBj YWxsYmFja3MgYXJlIHN0aWxsIGF2YWlsYWJsZSBpbiB0aGUgYnVuZGxlLCBhbmQgdmlhIHRoZSBX ZWJJbnNwZWN0b3IuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0MvV0tQYWdlLmNwcDoKKyAg ICAgICAgKiBVSVByb2Nlc3MvQVBJL0MvV0tQYWdlLmg6CisgICAgICAgICogVUlQcm9jZXNzL1dl YlBhZ2VQcm94eS5jcHA6CisgICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oOgorICAg ICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdlUHJveHkubWVzc2FnZXMuaW46CisgICAgICAgIFN0b3Ag aGFuZGxpbmcgcGVyLXJlc291cmNlIG1lc3NhZ2VzIGFuZCBmb3J3YXJkaW5nIHRoZW0gdG8gdGhl IEFQSS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9XZWJSZXNvdXJjZUxvYWRDbGllbnQuY3BwOiBS ZW1vdmVkLgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJSZXNvdXJjZUxvYWRDbGllbnQuaDogUmVt b3ZlZC4KKyAgICAgICAgKiBXZWJLaXQyLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2o6CisgICAg ICAgIFJlbW92ZSB0aGUgZmlsZXMuCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYkNvcmVTdXBw b3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViRnJhbWVM b2FkZXJDbGllbnQ6OmFzc2lnbklkZW50aWZpZXJUb0luaXRpYWxSZXF1ZXN0KToKKyAgICAgICAg KFdlYktpdDo6V2ViRnJhbWVMb2FkZXJDbGllbnQ6OmRpc3BhdGNoV2lsbFNlbmRSZXF1ZXN0KToK KyAgICAgICAgKFdlYktpdDo6V2ViRnJhbWVMb2FkZXJDbGllbnQ6OmRpc3BhdGNoRGlkUmVjZWl2 ZVJlc3BvbnNlKToKKyAgICAgICAgKFdlYktpdDo6V2ViRnJhbWVMb2FkZXJDbGllbnQ6OmRpc3Bh dGNoRGlkUmVjZWl2ZUNvbnRlbnRMZW5ndGgpOgorICAgICAgICAoV2ViS2l0OjpXZWJGcmFtZUxv YWRlckNsaWVudDo6ZGlzcGF0Y2hEaWRGaW5pc2hMb2FkaW5nKToKKyAgICAgICAgKFdlYktpdDo6 V2ViRnJhbWVMb2FkZXJDbGllbnQ6OmRpc3BhdGNoRGlkRmFpbExvYWRpbmcpOgorICAgICAgICBT dG9wIHNlbmRpbmcgcGVyLXJlc291cmNlIG1lc3NhZ2VzIHRvIHRoZSBVSVByb2Nlc3MuCisKIDIw MTMtMDEtMjAgIEd1c3Rhdm8gTm9yb25oYSBTaWx2YSAgPGduc0Bnbm9tZS5vcmc+CiAKICAgICAg ICAgVW5yZXZpZXdlZC4gU2ltcGxlIGluZGVudGF0aW9uIGZpeC4KSW5kZXg6IFNvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCShyZXZpc2lvbiAxNDAyODApCisrKyBTb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAkod29ya2luZyBjb3B5KQpAQCAt MzQ3LDExICszNDcsNiBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6aW5pdGlhbGl6ZUZvcm1DbGllbnQo CiAgICAgbV9mb3JtQ2xpZW50LmluaXRpYWxpemUoZm9ybUNsaWVudCk7CiB9CiAKLXZvaWQgV2Vi UGFnZVByb3h5Ojppbml0aWFsaXplUmVzb3VyY2VMb2FkQ2xpZW50KGNvbnN0IFdLUGFnZVJlc291 cmNlTG9hZENsaWVudCogY2xpZW50KQotewotICAgIG1fcmVzb3VyY2VMb2FkQ2xpZW50LmluaXRp YWxpemUoY2xpZW50KTsKLX0KLQogdm9pZCBXZWJQYWdlUHJveHk6OmluaXRpYWxpemVVSUNsaWVu dChjb25zdCBXS1BhZ2VVSUNsaWVudCogY2xpZW50KQogewogICAgIGlmICghaXNWYWxpZCgpKQpA QCAtMjUxOSw1OSArMjUxNCw2IEBAIHZvaWQgV2ViUGFnZVByb3h5Ojp3aWxsU3VibWl0Rm9ybSh1 aW50NjQKICAgICAgICAgbGlzdGVuZXItPmNvbnRpbnVlU3VibWlzc2lvbigpOwogfQogCi0vLyBS ZXNvdXJjZUxvYWQgQ2xpZW50Ci0KLXZvaWQgV2ViUGFnZVByb3h5OjpkaWRJbml0aWF0ZUxvYWRG b3JSZXNvdXJjZSh1aW50NjRfdCBmcmFtZUlELCB1aW50NjRfdCByZXNvdXJjZUlkZW50aWZpZXIs IGNvbnN0IFJlc291cmNlUmVxdWVzdCYgcmVxdWVzdCwgYm9vbCBwYWdlSXNQcm92aXNpb25hbGx5 TG9hZGluZykKLXsKLSAgICBXZWJGcmFtZVByb3h5KiBmcmFtZSA9IG1fcHJvY2Vzcy0+d2ViRnJh bWUoZnJhbWVJRCk7Ci0gICAgTUVTU0FHRV9DSEVDSyhmcmFtZSk7Ci0gICAgTUVTU0FHRV9DSEVD S19VUkwocmVxdWVzdC51cmwoKSk7Ci0KLSAgICBtX3Jlc291cmNlTG9hZENsaWVudC5kaWRJbml0 aWF0ZUxvYWRGb3JSZXNvdXJjZSh0aGlzLCBmcmFtZSwgcmVzb3VyY2VJZGVudGlmaWVyLCByZXF1 ZXN0LCBwYWdlSXNQcm92aXNpb25hbGx5TG9hZGluZyk7Ci19Ci0KLXZvaWQgV2ViUGFnZVByb3h5 OjpkaWRTZW5kUmVxdWVzdEZvclJlc291cmNlKHVpbnQ2NF90IGZyYW1lSUQsIHVpbnQ2NF90IHJl c291cmNlSWRlbnRpZmllciwgY29uc3QgUmVzb3VyY2VSZXF1ZXN0JiByZXF1ZXN0LCBjb25zdCBS ZXNvdXJjZVJlc3BvbnNlJiByZWRpcmVjdFJlc3BvbnNlKQotewotICAgIFdlYkZyYW1lUHJveHkq IGZyYW1lID0gbV9wcm9jZXNzLT53ZWJGcmFtZShmcmFtZUlEKTsKLSAgICBNRVNTQUdFX0NIRUNL KGZyYW1lKTsKLSAgICBNRVNTQUdFX0NIRUNLX1VSTChyZXF1ZXN0LnVybCgpKTsKLQotICAgIG1f cmVzb3VyY2VMb2FkQ2xpZW50LmRpZFNlbmRSZXF1ZXN0Rm9yUmVzb3VyY2UodGhpcywgZnJhbWUs IHJlc291cmNlSWRlbnRpZmllciwgcmVxdWVzdCwgcmVkaXJlY3RSZXNwb25zZSk7Ci19Ci0KLXZv aWQgV2ViUGFnZVByb3h5OjpkaWRSZWNlaXZlUmVzcG9uc2VGb3JSZXNvdXJjZSh1aW50NjRfdCBm cmFtZUlELCB1aW50NjRfdCByZXNvdXJjZUlkZW50aWZpZXIsIGNvbnN0IFJlc291cmNlUmVzcG9u c2UmIHJlc3BvbnNlKQotewotICAgIFdlYkZyYW1lUHJveHkqIGZyYW1lID0gbV9wcm9jZXNzLT53 ZWJGcmFtZShmcmFtZUlEKTsKLSAgICBNRVNTQUdFX0NIRUNLKGZyYW1lKTsKLSAgICBNRVNTQUdF X0NIRUNLX1VSTChyZXNwb25zZS51cmwoKSk7Ci0KLSAgICBtX3Jlc291cmNlTG9hZENsaWVudC5k aWRSZWNlaXZlUmVzcG9uc2VGb3JSZXNvdXJjZSh0aGlzLCBmcmFtZSwgcmVzb3VyY2VJZGVudGlm aWVyLCByZXNwb25zZSk7Ci19Ci0KLXZvaWQgV2ViUGFnZVByb3h5OjpkaWRSZWNlaXZlQ29udGVu dExlbmd0aEZvclJlc291cmNlKHVpbnQ2NF90IGZyYW1lSUQsIHVpbnQ2NF90IHJlc291cmNlSWRl bnRpZmllciwgdWludDY0X3QgY29udGVudExlbmd0aCkKLXsKLSAgICBXZWJGcmFtZVByb3h5KiBm cmFtZSA9IG1fcHJvY2Vzcy0+d2ViRnJhbWUoZnJhbWVJRCk7Ci0gICAgTUVTU0FHRV9DSEVDSyhm cmFtZSk7Ci0KLSAgICBtX3Jlc291cmNlTG9hZENsaWVudC5kaWRSZWNlaXZlQ29udGVudExlbmd0 aEZvclJlc291cmNlKHRoaXMsIGZyYW1lLCByZXNvdXJjZUlkZW50aWZpZXIsIGNvbnRlbnRMZW5n dGgpOwotfQotCi12b2lkIFdlYlBhZ2VQcm94eTo6ZGlkRmluaXNoTG9hZEZvclJlc291cmNlKHVp bnQ2NF90IGZyYW1lSUQsIHVpbnQ2NF90IHJlc291cmNlSWRlbnRpZmllcikKLXsKLSAgICBXZWJG cmFtZVByb3h5KiBmcmFtZSA9IG1fcHJvY2Vzcy0+d2ViRnJhbWUoZnJhbWVJRCk7Ci0gICAgTUVT U0FHRV9DSEVDSyhmcmFtZSk7Ci0KLSAgICBtX3Jlc291cmNlTG9hZENsaWVudC5kaWRGaW5pc2hM b2FkRm9yUmVzb3VyY2UodGhpcywgZnJhbWUsIHJlc291cmNlSWRlbnRpZmllcik7Ci19Ci0KLXZv aWQgV2ViUGFnZVByb3h5OjpkaWRGYWlsTG9hZEZvclJlc291cmNlKHVpbnQ2NF90IGZyYW1lSUQs IHVpbnQ2NF90IHJlc291cmNlSWRlbnRpZmllciwgY29uc3QgUmVzb3VyY2VFcnJvciYgZXJyb3Ip Ci17Ci0gICAgV2ViRnJhbWVQcm94eSogZnJhbWUgPSBtX3Byb2Nlc3MtPndlYkZyYW1lKGZyYW1l SUQpOwotICAgIE1FU1NBR0VfQ0hFQ0soZnJhbWUpOwotCi0gICAgbV9yZXNvdXJjZUxvYWRDbGll bnQuZGlkRmFpbExvYWRGb3JSZXNvdXJjZSh0aGlzLCBmcmFtZSwgcmVzb3VyY2VJZGVudGlmaWVy LCBlcnJvcik7Ci19Ci0KIC8vIFVJQ2xpZW50CiAKIHZvaWQgV2ViUGFnZVByb3h5OjpjcmVhdGVO ZXdQYWdlKGNvbnN0IFJlc291cmNlUmVxdWVzdCYgcmVxdWVzdCwgY29uc3QgV2luZG93RmVhdHVy ZXMmIHdpbmRvd0ZlYXR1cmVzLCB1aW50MzJfdCBvcGFxdWVNb2RpZmllcnMsIGludDMyX3Qgb3Bh cXVlTW91c2VCdXR0b24sIHVpbnQ2NF90JiBuZXdQYWdlSUQsIFdlYlBhZ2VDcmVhdGlvblBhcmFt ZXRlcnMmIG5ld1BhZ2VQYXJhbWV0ZXJzKQpJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L1dlYlBhZ2VQcm94eS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9X ZWJQYWdlUHJveHkuaAkocmV2aXNpb24gMTQwMjgwKQorKysgU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL1dlYlBhZ2VQcm94eS5oCSh3b3JraW5nIGNvcHkpCkBAIC01Nyw3ICs1Nyw2IEBACiAjaW5j bHVkZSAiV2ViUGFnZUNvbnRleHRNZW51Q2xpZW50LmgiCiAjaW5jbHVkZSAiV2ViUG9saWN5Q2xp ZW50LmgiCiAjaW5jbHVkZSAiV2ViUG9wdXBNZW51UHJveHkuaCIKLSNpbmNsdWRlICJXZWJSZXNv dXJjZUxvYWRDbGllbnQuaCIKICNpbmNsdWRlICJXZWJVSUNsaWVudC5oIgogI2luY2x1ZGUgPFdl YkNvcmUvQWx0ZXJuYXRpdmVUZXh0Q2xpZW50Lmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9Db2xvci5o PgpAQCAtMjgxLDcgKzI4MCw2IEBAIHB1YmxpYzoKICAgICB2b2lkIGluaXRpYWxpemVGb3JtQ2xp ZW50KGNvbnN0IFdLUGFnZUZvcm1DbGllbnQqKTsKICAgICB2b2lkIGluaXRpYWxpemVMb2FkZXJD bGllbnQoY29uc3QgV0tQYWdlTG9hZGVyQ2xpZW50Kik7CiAgICAgdm9pZCBpbml0aWFsaXplUG9s aWN5Q2xpZW50KGNvbnN0IFdLUGFnZVBvbGljeUNsaWVudCopOwotICAgIHZvaWQgaW5pdGlhbGl6 ZVJlc291cmNlTG9hZENsaWVudChjb25zdCBXS1BhZ2VSZXNvdXJjZUxvYWRDbGllbnQqKTsKICAg ICB2b2lkIGluaXRpYWxpemVVSUNsaWVudChjb25zdCBXS1BhZ2VVSUNsaWVudCopOwogCiAgICAg dm9pZCBpbml0aWFsaXplV2ViUGFnZSgpOwpAQCAtODE5LDE0ICs4MTcsNiBAQCBwcml2YXRlOgog CiAgICAgdm9pZCB3aWxsU3VibWl0Rm9ybSh1aW50NjRfdCBmcmFtZUlELCB1aW50NjRfdCBzb3Vy Y2VGcmFtZUlELCBjb25zdCBTdHJpbmdQYWlyVmVjdG9yJiB0ZXh0RmllbGRWYWx1ZXMsIHVpbnQ2 NF90IGxpc3RlbmVySUQsIENvcmVJUEM6Ok1lc3NhZ2VEZWNvZGVyJik7CiAKLSAgICAvLyBSZXNv dXJjZSBsb2FkIGNsaWVudAotICAgIHZvaWQgZGlkSW5pdGlhdGVMb2FkRm9yUmVzb3VyY2UodWlu dDY0X3QgZnJhbWVJRCwgdWludDY0X3QgcmVzb3VyY2VJZGVudGlmaWVyLCBjb25zdCBXZWJDb3Jl OjpSZXNvdXJjZVJlcXVlc3QmLCBib29sIHBhZ2VJc1Byb3Zpc2lvbmFsbHlMb2FkaW5nKTsKLSAg ICB2b2lkIGRpZFNlbmRSZXF1ZXN0Rm9yUmVzb3VyY2UodWludDY0X3QgZnJhbWVJRCwgdWludDY0 X3QgcmVzb3VyY2VJZGVudGlmaWVyLCBjb25zdCBXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3QmLCBj b25zdCBXZWJDb3JlOjpSZXNvdXJjZVJlc3BvbnNlJiByZWRpcmVjdFJlc3BvbnNlKTsKLSAgICB2 b2lkIGRpZFJlY2VpdmVSZXNwb25zZUZvclJlc291cmNlKHVpbnQ2NF90IGZyYW1lSUQsIHVpbnQ2 NF90IHJlc291cmNlSWRlbnRpZmllciwgY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VSZXNwb25zZSYp OwotICAgIHZvaWQgZGlkUmVjZWl2ZUNvbnRlbnRMZW5ndGhGb3JSZXNvdXJjZSh1aW50NjRfdCBm cmFtZUlELCB1aW50NjRfdCByZXNvdXJjZUlkZW50aWZpZXIsIHVpbnQ2NF90IGNvbnRlbnRMZW5n dGgpOwotICAgIHZvaWQgZGlkRmluaXNoTG9hZEZvclJlc291cmNlKHVpbnQ2NF90IGZyYW1lSUQs IHVpbnQ2NF90IHJlc291cmNlSWRlbnRpZmllcik7Ci0gICAgdm9pZCBkaWRGYWlsTG9hZEZvclJl c291cmNlKHVpbnQ2NF90IGZyYW1lSUQsIHVpbnQ2NF90IHJlc291cmNlSWRlbnRpZmllciwgY29u c3QgV2ViQ29yZTo6UmVzb3VyY2VFcnJvciYpOwotCiAgICAgLy8gVUkgY2xpZW50CiAgICAgdm9p ZCBjcmVhdGVOZXdQYWdlKGNvbnN0IFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCYsIGNvbnN0IFdl YkNvcmU6OldpbmRvd0ZlYXR1cmVzJiwgdWludDMyX3QgbW9kaWZpZXJzLCBpbnQzMl90IG1vdXNl QnV0dG9uLCB1aW50NjRfdCYgbmV3UGFnZUlELCBXZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzJik7 CiAgICAgdm9pZCBzaG93UGFnZSgpOwpAQCAtMTA0Niw3ICsxMDM2LDYgQEAgcHJpdmF0ZToKICAg ICBXZWJMb2FkZXJDbGllbnQgbV9sb2FkZXJDbGllbnQ7CiAgICAgV2ViUG9saWN5Q2xpZW50IG1f cG9saWN5Q2xpZW50OwogICAgIFdlYkZvcm1DbGllbnQgbV9mb3JtQ2xpZW50OwotICAgIFdlYlJl c291cmNlTG9hZENsaWVudCBtX3Jlc291cmNlTG9hZENsaWVudDsKICAgICBXZWJVSUNsaWVudCBt X3VpQ2xpZW50OwogICAgIFdlYkZpbmRDbGllbnQgbV9maW5kQ2xpZW50OwogICAgIFdlYkZpbmRN YXRjaGVzQ2xpZW50IG1fZmluZE1hdGNoZXNDbGllbnQ7CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvV2ViUGFnZVByb3h5Lm1lc3NhZ2VzLmluCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkubWVzc2FnZXMuaW4JKHJldmlzaW9uIDE0MDI4 MCkKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkubWVzc2FnZXMuaW4J KHdvcmtpbmcgY29weSkKQEAgLTE0NCwxOCArMTQ0LDEwIEBAIG1lc3NhZ2VzIC0+IFdlYlBhZ2VQ cm94eSB7CiAKICAgICBGcmFtZURpZEJlY29tZUZyYW1lU2V0KHVpbnQ2NF90IGZyYW1lSUQsIGJv b2wgdmFsdWUpCiAKLSAgICAjIFJlc291cmNlIGxvYWQgbWVzc2FnZXMKLSAgICBEaWRJbml0aWF0 ZUxvYWRGb3JSZXNvdXJjZSh1aW50NjRfdCBmcmFtZUlELCB1aW50NjRfdCByZXNvdXJjZUlkZW50 aWZpZXIsIFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCByZXF1ZXN0LCBib29sIHBhZ2VJc1Byb3Zp c2lvbmFsbHlMb2FkaW5nKQotICAgIERpZFNlbmRSZXF1ZXN0Rm9yUmVzb3VyY2UodWludDY0X3Qg ZnJhbWVJRCwgdWludDY0X3QgcmVzb3VyY2VJZGVudGlmaWVyLCBXZWJDb3JlOjpSZXNvdXJjZVJl cXVlc3QgcmVxdWVzdCwgV2ViQ29yZTo6UmVzb3VyY2VSZXNwb25zZSByZWRpcmVjdFJlc3BvbnNl KQotICAgIERpZFJlY2VpdmVSZXNwb25zZUZvclJlc291cmNlKHVpbnQ2NF90IGZyYW1lSUQsIHVp bnQ2NF90IHJlc291cmNlSWRlbnRpZmllciwgV2ViQ29yZTo6UmVzb3VyY2VSZXNwb25zZSByZXNw b25zZSkKLSAgICBEaWRSZWNlaXZlQ29udGVudExlbmd0aEZvclJlc291cmNlKHVpbnQ2NF90IGZy YW1lSUQsIHVpbnQ2NF90IHJlc291cmNlSWRlbnRpZmllciwgdWludDY0X3QgY29udGVudExlbmd0 aCkKLSAgICBEaWRGaW5pc2hMb2FkRm9yUmVzb3VyY2UodWludDY0X3QgZnJhbWVJRCwgdWludDY0 X3QgcmVzb3VyY2VJZGVudGlmaWVyKQotICAgIERpZEZhaWxMb2FkRm9yUmVzb3VyY2UodWludDY0 X3QgZnJhbWVJRCwgdWludDY0X3QgcmVzb3VyY2VJZGVudGlmaWVyLCBXZWJDb3JlOjpSZXNvdXJj ZUVycm9yIGVycm9yKQogI2lmIFBMQVRGT1JNKFFUKQogICAgIFJlc29sdmVBcHBsaWNhdGlvblNj aGVtZVJlcXVlc3QoV2ViS2l0OjpRdE5ldHdvcmtSZXF1ZXN0RGF0YSByZXF1ZXN0KQogI2VuZGlm CiAKLQogICAgICMgQ3VzdG9tIHJlcHJlc2VudGF0aW9ucwogICAgIERpZEZpbmlzaExvYWRpbmdE YXRhRm9yQ3VzdG9tUmVwcmVzZW50YXRpb24oV1RGOjpTdHJpbmcgc3VnZ2VzdGVkRmlsZW5hbWUs IENvcmVJUEM6OkRhdGFSZWZlcmVuY2UgZGF0YSkKIApJbmRleDogU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL1dlYlJlc291cmNlTG9hZENsaWVudC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL1dlYlJlc291cmNlTG9hZENsaWVudC5jcHAJKHJldmlzaW9uIDE0MDI4 MCkKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJSZXNvdXJjZUxvYWRDbGllbnQuY3Bw CSh3b3JraW5nIGNvcHkpCkBAIC0xLDkxICswLDAgQEAKLS8qCi0gKiBDb3B5cmlnaHQgKEMpIDIw MTAgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgotICoKLSAqIFJlZGlzdHJpYnV0aW9u IGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAotICog bW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBj b25kaXRpb25zCi0gKiBhcmUgbWV0OgotICogMS4gUmVkaXN0cmlidXRpb25zIG9mIHNvdXJjZSBj b2RlIG11c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQKLSAqICAgIG5vdGljZSwgdGhpcyBs aXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lci4KLSAqIDIuIFJl ZGlzdHJpYnV0aW9ucyBpbiBiaW5hcnkgZm9ybSBtdXN0IHJlcHJvZHVjZSB0aGUgYWJvdmUgY29w eXJpZ2h0Ci0gKiAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9s bG93aW5nIGRpc2NsYWltZXIgaW4gdGhlCi0gKiAgICBkb2N1bWVudGF0aW9uIGFuZC9vciBvdGhl ciBtYXRlcmlhbHMgcHJvdmlkZWQgd2l0aCB0aGUgZGlzdHJpYnV0aW9uLgotICoKLSAqIFRISVMg U09GVFdBUkUgSVMgUFJPVklERUQgQlkgQVBQTEUgSU5DLiBBTkQgSVRTIENPTlRSSUJVVE9SUyBg YEFTIElTJycKLSAqIEFORCBBTlkgRVhQUkVTUyBPUiBJTVBMSUVEIFdBUlJBTlRJRVMsIElOQ0xV RElORywgQlVUIE5PVCBMSU1JVEVEIFRPLAotICogVEhFIElNUExJRUQgV0FSUkFOVElFUyBPRiBN RVJDSEFOVEFCSUxJVFkgQU5EIEZJVE5FU1MgRk9SIEEgUEFSVElDVUxBUgotICogUFVSUE9TRSBB UkUgRElTQ0xBSU1FRC4gSU4gTk8gRVZFTlQgU0hBTEwgQVBQTEUgSU5DLiBPUiBJVFMgQ09OVFJJ QlVUT1JTCi0gKiBCRSBMSUFCTEUgRk9SIEFOWSBESVJFQ1QsIElORElSRUNULCBJTkNJREVOVEFM LCBTUEVDSUFMLCBFWEVNUExBUlksIE9SCi0gKiBDT05TRVFVRU5USUFMIERBTUFHRVMgKElOQ0xV RElORywgQlVUIE5PVCBMSU1JVEVEIFRPLCBQUk9DVVJFTUVOVCBPRgotICogU1VCU1RJVFVURSBH T09EUyBPUiBTRVJWSUNFUzsgTE9TUyBPRiBVU0UsIERBVEEsIE9SIFBST0ZJVFM7IE9SIEJVU0lO RVNTCi0gKiBJTlRFUlJVUFRJT04pIEhPV0VWRVIgQ0FVU0VEIEFORCBPTiBBTlkgVEhFT1JZIE9G IExJQUJJTElUWSwgV0hFVEhFUiBJTgotICogQ09OVFJBQ1QsIFNUUklDVCBMSUFCSUxJVFksIE9S IFRPUlQgKElOQ0xVRElORyBORUdMSUdFTkNFIE9SIE9USEVSV0lTRSkKLSAqIEFSSVNJTkcgSU4g QU5ZIFdBWSBPVVQgT0YgVEhFIFVTRSBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQg T0YKLSAqIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KLSAqLwotCi0jaW5jbHVkZSAi Y29uZmlnLmgiCi0jaW5jbHVkZSAiV2ViUmVzb3VyY2VMb2FkQ2xpZW50LmgiCi0KLSNpbmNsdWRl ICJXS0FQSUNhc3QuaCIKLSNpbmNsdWRlICJXZWJVUkxSZXF1ZXN0LmgiCi0jaW5jbHVkZSAiV2Vi VVJMUmVzcG9uc2UuaCIKLQotdXNpbmcgbmFtZXNwYWNlIFdlYkNvcmU7Ci0KLW5hbWVzcGFjZSBX ZWJLaXQgewotCi12b2lkIFdlYlJlc291cmNlTG9hZENsaWVudDo6ZGlkSW5pdGlhdGVMb2FkRm9y UmVzb3VyY2UoV2ViUGFnZVByb3h5KiBwYWdlLCBXZWJGcmFtZVByb3h5KiBmcmFtZSwgdWludDY0 X3QgcmVzb3VyY2VJZGVudGlmaWVyLCBjb25zdCBSZXNvdXJjZVJlcXVlc3QmIHJlc291cmNlUmVx dWVzdCwgYm9vbCBwYWdlSXNQcm92aXNpb25hbGx5TG9hZGluZykKLXsKLSAgICBpZiAoIW1fY2xp ZW50LmRpZEluaXRpYXRlTG9hZEZvclJlc291cmNlKQotICAgICAgICByZXR1cm47Ci0KLSAgICBS ZWZQdHI8V2ViVVJMUmVxdWVzdD4gcmVxdWVzdCA9IFdlYlVSTFJlcXVlc3Q6OmNyZWF0ZShyZXNv dXJjZVJlcXVlc3QpOwotICAgIHJldHVybiBtX2NsaWVudC5kaWRJbml0aWF0ZUxvYWRGb3JSZXNv dXJjZSh0b0FQSShwYWdlKSwgdG9BUEkoZnJhbWUpLCByZXNvdXJjZUlkZW50aWZpZXIsIHRvQVBJ KHJlcXVlc3QuZ2V0KCkpLCBwYWdlSXNQcm92aXNpb25hbGx5TG9hZGluZywgbV9jbGllbnQuY2xp ZW50SW5mbyk7Ci19Ci0KLXZvaWQgV2ViUmVzb3VyY2VMb2FkQ2xpZW50OjpkaWRTZW5kUmVxdWVz dEZvclJlc291cmNlKFdlYlBhZ2VQcm94eSogcGFnZSwgV2ViRnJhbWVQcm94eSogZnJhbWUsIHVp bnQ2NF90IHJlc291cmNlSWRlbnRpZmllciwgY29uc3QgUmVzb3VyY2VSZXF1ZXN0JiByZXNvdXJj ZVJlcXVlc3QsIGNvbnN0IFJlc291cmNlUmVzcG9uc2UmIHJlZGlyZWN0UmVzb3VyY2VSZXNwb25z ZSkKLXsKLSAgICBpZiAoIW1fY2xpZW50LmRpZFNlbmRSZXF1ZXN0Rm9yUmVzb3VyY2UpCi0gICAg ICAgIHJldHVybjsKLQotICAgIFJlZlB0cjxXZWJVUkxSZXF1ZXN0PiByZXF1ZXN0ID0gV2ViVVJM UmVxdWVzdDo6Y3JlYXRlKHJlc291cmNlUmVxdWVzdCk7Ci0gICAgUmVmUHRyPFdlYlVSTFJlc3Bv bnNlPiByZXNwb25zZTsKLSAgICBpZiAoIXJlZGlyZWN0UmVzb3VyY2VSZXNwb25zZS5pc051bGwo KSkKLSAgICAgICAgcmVzcG9uc2UgPSBXZWJVUkxSZXNwb25zZTo6Y3JlYXRlKHJlZGlyZWN0UmVz b3VyY2VSZXNwb25zZSk7Ci0gICAgcmV0dXJuIG1fY2xpZW50LmRpZFNlbmRSZXF1ZXN0Rm9yUmVz b3VyY2UodG9BUEkocGFnZSksIHRvQVBJKGZyYW1lKSwgcmVzb3VyY2VJZGVudGlmaWVyLCB0b0FQ SShyZXF1ZXN0LmdldCgpKSwgdG9BUEkocmVzcG9uc2UuZ2V0KCkpLCBtX2NsaWVudC5jbGllbnRJ bmZvKTsKLX0KLQotdm9pZCBXZWJSZXNvdXJjZUxvYWRDbGllbnQ6OmRpZFJlY2VpdmVSZXNwb25z ZUZvclJlc291cmNlKFdlYlBhZ2VQcm94eSogcGFnZSwgV2ViRnJhbWVQcm94eSogZnJhbWUsIHVp bnQ2NF90IHJlc291cmNlSWRlbnRpZmllciwgY29uc3QgUmVzb3VyY2VSZXNwb25zZSYgcmVzb3Vy Y2VSZXNwb25zZSkKLXsKLSAgICBpZiAoIW1fY2xpZW50LmRpZFJlY2VpdmVSZXNwb25zZUZvclJl c291cmNlKQotICAgICAgICByZXR1cm47Ci0KLSAgICBSZWZQdHI8V2ViVVJMUmVzcG9uc2U+IHJl c3BvbnNlID0gV2ViVVJMUmVzcG9uc2U6OmNyZWF0ZShyZXNvdXJjZVJlc3BvbnNlKTsKLSAgICBy ZXR1cm4gbV9jbGllbnQuZGlkUmVjZWl2ZVJlc3BvbnNlRm9yUmVzb3VyY2UodG9BUEkocGFnZSks IHRvQVBJKGZyYW1lKSwgcmVzb3VyY2VJZGVudGlmaWVyLCB0b0FQSShyZXNwb25zZS5nZXQoKSks IG1fY2xpZW50LmNsaWVudEluZm8pOwotfQotCi12b2lkIFdlYlJlc291cmNlTG9hZENsaWVudDo6 ZGlkUmVjZWl2ZUNvbnRlbnRMZW5ndGhGb3JSZXNvdXJjZShXZWJQYWdlUHJveHkqIHBhZ2UsIFdl YkZyYW1lUHJveHkqIGZyYW1lLCB1aW50NjRfdCByZXNvdXJjZUlkZW50aWZpZXIsIHVpbnQ2NF90 IGNvbnRlbnRMZW5ndGgpCi17Ci0gICAgaWYgKCFtX2NsaWVudC5kaWRSZWNlaXZlQ29udGVudExl bmd0aEZvclJlc291cmNlKQotICAgICAgICByZXR1cm47Ci0KLSAgICByZXR1cm4gbV9jbGllbnQu ZGlkUmVjZWl2ZUNvbnRlbnRMZW5ndGhGb3JSZXNvdXJjZSh0b0FQSShwYWdlKSwgdG9BUEkoZnJh bWUpLCByZXNvdXJjZUlkZW50aWZpZXIsIGNvbnRlbnRMZW5ndGgsIG1fY2xpZW50LmNsaWVudElu Zm8pOwotfQotCi12b2lkIFdlYlJlc291cmNlTG9hZENsaWVudDo6ZGlkRmluaXNoTG9hZEZvclJl c291cmNlKFdlYlBhZ2VQcm94eSogcGFnZSwgV2ViRnJhbWVQcm94eSogZnJhbWUsIHVpbnQ2NF90 IHJlc291cmNlSWRlbnRpZmllcikKLXsKLSAgICBpZiAoIW1fY2xpZW50LmRpZEZpbmlzaExvYWRG b3JSZXNvdXJjZSkKLSAgICAgICAgcmV0dXJuOwotCi0gICAgcmV0dXJuIG1fY2xpZW50LmRpZEZp bmlzaExvYWRGb3JSZXNvdXJjZSh0b0FQSShwYWdlKSwgdG9BUEkoZnJhbWUpLCByZXNvdXJjZUlk ZW50aWZpZXIsIG1fY2xpZW50LmNsaWVudEluZm8pOwotfQotCi12b2lkIFdlYlJlc291cmNlTG9h ZENsaWVudDo6ZGlkRmFpbExvYWRGb3JSZXNvdXJjZShXZWJQYWdlUHJveHkqIHBhZ2UsIFdlYkZy YW1lUHJveHkqIGZyYW1lLCB1aW50NjRfdCByZXNvdXJjZUlkZW50aWZpZXIsIGNvbnN0IFJlc291 cmNlRXJyb3ImIGVycm9yKQotewotICAgIGlmICghbV9jbGllbnQuZGlkRmFpbExvYWRGb3JSZXNv dXJjZSkKLSAgICAgICAgcmV0dXJuOwotCi0gICAgcmV0dXJuIG1fY2xpZW50LmRpZEZhaWxMb2Fk Rm9yUmVzb3VyY2UodG9BUEkocGFnZSksIHRvQVBJKGZyYW1lKSwgcmVzb3VyY2VJZGVudGlmaWVy LCB0b0FQSShlcnJvciksIG1fY2xpZW50LmNsaWVudEluZm8pOwotfQotCi19IC8vIG5hbWVzcGFj ZSBXZWJLaXQKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJSZXNvdXJjZUxvYWRD bGllbnQuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUmVzb3Vy Y2VMb2FkQ2xpZW50LmgJKHJldmlzaW9uIDE0MDI4MCkKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9XZWJSZXNvdXJjZUxvYWRDbGllbnQuaAkod29ya2luZyBjb3B5KQpAQCAtMSw1NiArMCww IEBACi0vKgotICogQ29weXJpZ2h0IChDKSAyMDEwIEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNl cnZlZC4KLSAqCi0gKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5 IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKLSAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBw cm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucwotICogYXJlIG1ldDoKLSAqIDEu IFJlZGlzdHJpYnV0aW9ucyBvZiBzb3VyY2UgY29kZSBtdXN0IHJldGFpbiB0aGUgYWJvdmUgY29w eXJpZ2h0Ci0gKiAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9s bG93aW5nIGRpc2NsYWltZXIuCi0gKiAyLiBSZWRpc3RyaWJ1dGlvbnMgaW4gYmluYXJ5IGZvcm0g bXVzdCByZXByb2R1Y2UgdGhlIGFib3ZlIGNvcHlyaWdodAotICogICAgbm90aWNlLCB0aGlzIGxp c3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyIGluIHRoZQotICog ICAgZG9jdW1lbnRhdGlvbiBhbmQvb3Igb3RoZXIgbWF0ZXJpYWxzIHByb3ZpZGVkIHdpdGggdGhl IGRpc3RyaWJ1dGlvbi4KLSAqCi0gKiBUSElTIFNPRlRXQVJFIElTIFBST1ZJREVEIEJZIEFQUExF IElOQy4gQU5EIElUUyBDT05UUklCVVRPUlMgYGBBUyBJUycnCi0gKiBBTkQgQU5ZIEVYUFJFU1Mg T1IgSU1QTElFRCBXQVJSQU5USUVTLCBJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywKLSAq IFRIRSBJTVBMSUVEIFdBUlJBTlRJRVMgT0YgTUVSQ0hBTlRBQklMSVRZIEFORCBGSVRORVNTIEZP UiBBIFBBUlRJQ1VMQVIKLSAqIFBVUlBPU0UgQVJFIERJU0NMQUlNRUQuIElOIE5PIEVWRU5UIFNI QUxMIEFQUExFIElOQy4gT1IgSVRTIENPTlRSSUJVVE9SUwotICogQkUgTElBQkxFIEZPUiBBTlkg RElSRUNULCBJTkRJUkVDVCwgSU5DSURFTlRBTCwgU1BFQ0lBTCwgRVhFTVBMQVJZLCBPUgotICog Q09OU0VRVUVOVElBTCBEQU1BR0VTIChJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywgUFJP Q1VSRU1FTlQgT0YKLSAqIFNVQlNUSVRVVEUgR09PRFMgT1IgU0VSVklDRVM7IExPU1MgT0YgVVNF LCBEQVRBLCBPUiBQUk9GSVRTOyBPUiBCVVNJTkVTUwotICogSU5URVJSVVBUSU9OKSBIT1dFVkVS IENBVVNFRCBBTkQgT04gQU5ZIFRIRU9SWSBPRiBMSUFCSUxJVFksIFdIRVRIRVIgSU4KLSAqIENP TlRSQUNULCBTVFJJQ1QgTElBQklMSVRZLCBPUiBUT1JUIChJTkNMVURJTkcgTkVHTElHRU5DRSBP UiBPVEhFUldJU0UpCi0gKiBBUklTSU5HIElOIEFOWSBXQVkgT1VUIE9GIFRIRSBVU0UgT0YgVEhJ UyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GCi0gKiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VD SCBEQU1BR0UuCi0gKi8KLQotI2lmbmRlZiBXZWJSZXNvdXJjZUxvYWRDbGllbnRfaAotI2RlZmlu ZSBXZWJSZXNvdXJjZUxvYWRDbGllbnRfaAotCi0jaW5jbHVkZSAiQVBJQ2xpZW50LmgiCi0jaW5j bHVkZSAiV0tQYWdlLmgiCi0KLW5hbWVzcGFjZSBXZWJDb3JlIHsKLWNsYXNzIFJlc291cmNlRXJy b3I7Ci1jbGFzcyBSZXNvdXJjZVJlcXVlc3Q7Ci1jbGFzcyBSZXNvdXJjZVJlc3BvbnNlOwotfQot Ci1uYW1lc3BhY2UgV2ViS2l0IHsKLQotY2xhc3MgQVBJT2JqZWN0OwotY2xhc3MgV2ViRnJhbWVQ cm94eTsKLWNsYXNzIFdlYlBhZ2VQcm94eTsKLQotY2xhc3MgV2ViUmVzb3VyY2VMb2FkQ2xpZW50 IDogcHVibGljIEFQSUNsaWVudDxXS1BhZ2VSZXNvdXJjZUxvYWRDbGllbnQsIGtXS1BhZ2VSZXNv dXJjZUxvYWRDbGllbnRDdXJyZW50VmVyc2lvbj4gewotcHVibGljOgotICAgIHZvaWQgZGlkSW5p dGlhdGVMb2FkRm9yUmVzb3VyY2UoV2ViUGFnZVByb3h5KiwgV2ViRnJhbWVQcm94eSosIHVpbnQ2 NF90IHJlc291cmNlSWRlbnRpZmllciwgY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0Jiwg Ym9vbCBwYWdlSXNQcm92aXNpb25hbGx5TG9hZGluZyk7Ci0gICAgdm9pZCBkaWRTZW5kUmVxdWVz dEZvclJlc291cmNlKFdlYlBhZ2VQcm94eSosIFdlYkZyYW1lUHJveHkqLCB1aW50NjRfdCByZXNv dXJjZUlkZW50aWZpZXIsIGNvbnN0IFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCYsIGNvbnN0IFdl YkNvcmU6OlJlc291cmNlUmVzcG9uc2UmKTsKLSAgICB2b2lkIGRpZFJlY2VpdmVSZXNwb25zZUZv clJlc291cmNlKFdlYlBhZ2VQcm94eSosIFdlYkZyYW1lUHJveHkqLCB1aW50NjRfdCByZXNvdXJj ZUlkZW50aWZpZXIsIGNvbnN0IFdlYkNvcmU6OlJlc291cmNlUmVzcG9uc2UmKTsKLSAgICB2b2lk IGRpZFJlY2VpdmVDb250ZW50TGVuZ3RoRm9yUmVzb3VyY2UoV2ViUGFnZVByb3h5KiwgV2ViRnJh bWVQcm94eSosIHVpbnQ2NF90IHJlc291cmNlSWRlbnRpZmllciwgdWludDY0X3QgY29udGVudExl bmd0aCk7Ci0gICAgdm9pZCBkaWRGaW5pc2hMb2FkRm9yUmVzb3VyY2UoV2ViUGFnZVByb3h5Kiwg V2ViRnJhbWVQcm94eSosIHVpbnQ2NF90IHJlc291cmNlSWRlbnRpZmllcik7Ci0gICAgdm9pZCBk aWRGYWlsTG9hZEZvclJlc291cmNlKFdlYlBhZ2VQcm94eSosIFdlYkZyYW1lUHJveHkqLCB1aW50 NjRfdCByZXNvdXJjZUlkZW50aWZpZXIsIGNvbnN0IFdlYkNvcmU6OlJlc291cmNlRXJyb3ImKTsK LX07Ci0KLX0gLy8gbmFtZXNwYWNlIFdlYktpdAotCi0jZW5kaWYgLy8gV2ViUmVzb3VyY2VMb2Fk Q2xpZW50X2gKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS1BhZ2UuY3Bw Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS1BhZ2UuY3Bw CShyZXZpc2lvbiAxNDAyODApCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tQ YWdlLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNTU1LDExICs1NTUsNiBAQCB2b2lkIFdLUGFnZVNl dFBhZ2VQb2xpY3lDbGllbnQoV0tQYWdlUmVmCiAgICAgdG9JbXBsKHBhZ2VSZWYpLT5pbml0aWFs aXplUG9saWN5Q2xpZW50KHdrQ2xpZW50KTsKIH0KIAotdm9pZCBXS1BhZ2VTZXRQYWdlUmVzb3Vy Y2VMb2FkQ2xpZW50KFdLUGFnZVJlZiBwYWdlUmVmLCBjb25zdCBXS1BhZ2VSZXNvdXJjZUxvYWRD bGllbnQqIHdrQ2xpZW50KQotewotICAgIHRvSW1wbChwYWdlUmVmKS0+aW5pdGlhbGl6ZVJlc291 cmNlTG9hZENsaWVudCh3a0NsaWVudCk7Ci19Ci0KIHZvaWQgV0tQYWdlU2V0UGFnZVVJQ2xpZW50 KFdLUGFnZVJlZiBwYWdlUmVmLCBjb25zdCBXS1BhZ2VVSUNsaWVudCogd2tDbGllbnQpCiB7CiAg ICAgdG9JbXBsKHBhZ2VSZWYpLT5pbml0aWFsaXplVUlDbGllbnQod2tDbGllbnQpOwpJbmRleDog U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLUGFnZS5oCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS1BhZ2UuaAkocmV2aXNpb24gMTQwMjgwKQor KysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLUGFnZS5oCSh3b3JraW5nIGNvcHkp CkBAIC0xNjUsMjggKzE2NSw2IEBAIHR5cGVkZWYgc3RydWN0IFdLUGFnZUZvcm1DbGllbnQgV0tQ YWdlRm8KIAogZW51bSB7IGtXS1BhZ2VGb3JtQ2xpZW50Q3VycmVudFZlcnNpb24gPSAwIH07CiAK LS8vIFJlc291cmNlIExvYWQgQ2xpZW50LgotdHlwZWRlZiB2b2lkICgqV0tQYWdlRGlkSW5pdGlh dGVMb2FkRm9yUmVzb3VyY2VDYWxsYmFjaykoV0tQYWdlUmVmIHBhZ2UsIFdLRnJhbWVSZWYgZnJh bWUsIHVpbnQ2NF90IHJlc291cmNlSWRlbnRpZmllciwgV0tVUkxSZXF1ZXN0UmVmIHJlcXVlc3Qs IGJvb2wgcGFnZUlzUHJvdmlzaW9uYWxseUxvYWRpbmcsIGNvbnN0IHZvaWQqIGNsaWVudEluZm8p OwotdHlwZWRlZiB2b2lkICgqV0tQYWdlRGlkU2VuZFJlcXVlc3RGb3JSZXNvdXJjZUNhbGxiYWNr KShXS1BhZ2VSZWYgcGFnZSwgV0tGcmFtZVJlZiBmcmFtZSwgdWludDY0X3QgcmVzb3VyY2VJZGVu dGlmaWVyLCBXS1VSTFJlcXVlc3RSZWYgcmVxdWVzdCwgV0tVUkxSZXNwb25zZVJlZiByZWRpcmVj dFJlc3BvbnNlLCBjb25zdCB2b2lkKiBjbGllbnRJbmZvKTsKLXR5cGVkZWYgdm9pZCAoKldLUGFn ZURpZFJlY2VpdmVSZXNwb25zZUZvclJlc291cmNlQ2FsbGJhY2spKFdLUGFnZVJlZiBwYWdlLCBX S0ZyYW1lUmVmIGZyYW1lLCB1aW50NjRfdCByZXNvdXJjZUlkZW50aWZpZXIsIFdLVVJMUmVzcG9u c2VSZWYgcmVzcG9uc2UsIGNvbnN0IHZvaWQqIGNsaWVudEluZm8pOwotdHlwZWRlZiB2b2lkICgq V0tQYWdlRGlkUmVjZWl2ZUNvbnRlbnRMZW5ndGhGb3JSZXNvdXJjZUNhbGxiYWNrKShXS1BhZ2VS ZWYgcGFnZSwgV0tGcmFtZVJlZiBmcmFtZSwgdWludDY0X3QgcmVzb3VyY2VJZGVudGlmaWVyLCB1 aW50NjRfdCBjb250ZW50TGVuZ3RoLCBjb25zdCB2b2lkKiBjbGllbnRJbmZvKTsKLXR5cGVkZWYg dm9pZCAoKldLUGFnZURpZEZpbmlzaExvYWRGb3JSZXNvdXJjZUNhbGxiYWNrKShXS1BhZ2VSZWYg cGFnZSwgV0tGcmFtZVJlZiBmcmFtZSwgdWludDY0X3QgcmVzb3VyY2VJZGVudGlmaWVyLCBjb25z dCB2b2lkKiBjbGllbnRJbmZvKTsKLXR5cGVkZWYgdm9pZCAoKldLUGFnZURpZEZhaWxMb2FkRm9y UmVzb3VyY2VDYWxsYmFjaykoV0tQYWdlUmVmIHBhZ2UsIFdLRnJhbWVSZWYgZnJhbWUsIHVpbnQ2 NF90IHJlc291cmNlSWRlbnRpZmllciwgV0tFcnJvclJlZiBlcnJvciwgY29uc3Qgdm9pZCogY2xp ZW50SW5mbyk7Ci0KLXN0cnVjdCBXS1BhZ2VSZXNvdXJjZUxvYWRDbGllbnQgewotICAgIGludCAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgdmVyc2lvbjsKLSAgICBjb25zdCB2b2lkICogICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNsaWVudEluZm87Ci0gICAgV0tQYWdlRGlk SW5pdGlhdGVMb2FkRm9yUmVzb3VyY2VDYWxsYmFjayAgICAgICAgICAgICAgICAgICAgICAgICAg ICBkaWRJbml0aWF0ZUxvYWRGb3JSZXNvdXJjZTsKLSAgICBXS1BhZ2VEaWRTZW5kUmVxdWVzdEZv clJlc291cmNlQ2FsbGJhY2sgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGRpZFNlbmRSZXF1 ZXN0Rm9yUmVzb3VyY2U7Ci0gICAgV0tQYWdlRGlkUmVjZWl2ZVJlc3BvbnNlRm9yUmVzb3VyY2VD YWxsYmFjayAgICAgICAgICAgICAgICAgICAgICAgICBkaWRSZWNlaXZlUmVzcG9uc2VGb3JSZXNv dXJjZTsKLSAgICBXS1BhZ2VEaWRSZWNlaXZlQ29udGVudExlbmd0aEZvclJlc291cmNlQ2FsbGJh Y2sgICAgICAgICAgICAgICAgICAgIGRpZFJlY2VpdmVDb250ZW50TGVuZ3RoRm9yUmVzb3VyY2U7 Ci0gICAgV0tQYWdlRGlkRmluaXNoTG9hZEZvclJlc291cmNlQ2FsbGJhY2sgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBkaWRGaW5pc2hMb2FkRm9yUmVzb3VyY2U7Ci0gICAgV0tQYWdlRGlk RmFpbExvYWRGb3JSZXNvdXJjZUNhbGxiYWNrICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBkaWRGYWlsTG9hZEZvclJlc291cmNlOwotfTsKLXR5cGVkZWYgc3RydWN0IFdLUGFnZVJlc291 cmNlTG9hZENsaWVudCBXS1BhZ2VSZXNvdXJjZUxvYWRDbGllbnQ7Ci0KLWVudW0geyBrV0tQYWdl UmVzb3VyY2VMb2FkQ2xpZW50Q3VycmVudFZlcnNpb24gPSAwIH07Ci0KIGVudW0gewogICAgIGtX S1BsdWdpblVuYXZhaWxhYmlsaXR5UmVhc29uUGx1Z2luTWlzc2luZywKICAgICBrV0tQbHVnaW5V bmF2YWlsYWJpbGl0eVJlYXNvblBsdWdpbkNyYXNoZWQsCkBAIC00NzYsNyArNDU0LDYgQEAgV0tf RVhQT1JUIHZvaWQgV0tQYWdlU2V0UGFnZUZpbmRNYXRjaGVzQwogV0tfRVhQT1JUIHZvaWQgV0tQ YWdlU2V0UGFnZUZvcm1DbGllbnQoV0tQYWdlUmVmIHBhZ2UsIGNvbnN0IFdLUGFnZUZvcm1DbGll bnQqIGNsaWVudCk7CiBXS19FWFBPUlQgdm9pZCBXS1BhZ2VTZXRQYWdlTG9hZGVyQ2xpZW50KFdL UGFnZVJlZiBwYWdlLCBjb25zdCBXS1BhZ2VMb2FkZXJDbGllbnQqIGNsaWVudCk7CiBXS19FWFBP UlQgdm9pZCBXS1BhZ2VTZXRQYWdlUG9saWN5Q2xpZW50KFdLUGFnZVJlZiBwYWdlLCBjb25zdCBX S1BhZ2VQb2xpY3lDbGllbnQqIGNsaWVudCk7Ci1XS19FWFBPUlQgdm9pZCBXS1BhZ2VTZXRQYWdl UmVzb3VyY2VMb2FkQ2xpZW50KFdLUGFnZVJlZiBwYWdlLCBjb25zdCBXS1BhZ2VSZXNvdXJjZUxv YWRDbGllbnQqIGNsaWVudCk7CiBXS19FWFBPUlQgdm9pZCBXS1BhZ2VTZXRQYWdlVUlDbGllbnQo V0tQYWdlUmVmIHBhZ2UsIGNvbnN0IFdLUGFnZVVJQ2xpZW50KiBjbGllbnQpOwogCiB0eXBlZGVm IHZvaWQgKCpXS1BhZ2VSdW5KYXZhU2NyaXB0RnVuY3Rpb24pKFdLU2VyaWFsaXplZFNjcmlwdFZh bHVlUmVmLCBXS0Vycm9yUmVmLCB2b2lkKik7CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9XZWJLaXQy Lnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIv V2ViS2l0Mi54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCShyZXZpc2lvbiAxNDAyODApCisrKyBT b3VyY2UvV2ViS2l0Mi9XZWJLaXQyLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oJKHdvcmtpbmcg Y29weSkKQEAgLTgwNiw4ICs4MDYsNiBAQAogCQlCQzg1N0ZFNjEyQjg0M0Q4MDBFREVCMkUgLyog V0tPcGVuUGFuZWxQYXJhbWV0ZXJzLmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZp bGU7IGZpbGVSZWYgPSBCQzg1N0ZFNDEyQjg0M0Q4MDBFREVCMkUgLyogV0tPcGVuUGFuZWxQYXJh bWV0ZXJzLmggKi87IHNldHRpbmdzID0ge0FUVFJJQlVURVMgPSAoUHJpdmF0ZSwgKTsgfTsgfTsK IAkJQkM4NTgwNjIxMkI4NTA1NzAwRURFQjJFIC8qIFdLT3BlblBhbmVsUmVzdWx0TGlzdGVuZXIu Y3BwIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gQkMxREZF OEUxMkIzMUNBODAwNURGNzMwIC8qIFdLT3BlblBhbmVsUmVzdWx0TGlzdGVuZXIuY3BwICovOyB9 OwogCQlCQzg1ODA2MzEyQjg1MDU3MDBFREVCMkUgLyogV0tPcGVuUGFuZWxQYXJhbWV0ZXJzLmNw cCBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IEJDODU3RkU1 MTJCODQzRDgwMEVERUIyRSAvKiBXS09wZW5QYW5lbFBhcmFtZXRlcnMuY3BwICovOyB9OwotCQlC Qzg1OEEyMDEyQzAzNTdCMDBFREVCMkUgLyogV2ViUmVzb3VyY2VMb2FkQ2xpZW50LmggaW4gSGVh ZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBCQzg1OEExRTEyQzAzNTdC MDBFREVCMkUgLyogV2ViUmVzb3VyY2VMb2FkQ2xpZW50LmggKi87IH07Ci0JCUJDODU4QTIxMTJD MDM1N0IwMEVERUIyRSAvKiBXZWJSZXNvdXJjZUxvYWRDbGllbnQuY3BwIGluIFNvdXJjZXMgKi8g PSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gQkM4NThBMUYxMkMwMzU3QjAwRURFQjJF IC8qIFdlYlJlc291cmNlTG9hZENsaWVudC5jcHAgKi87IH07CiAJCUJDODY5OUI1MTE2QUFEQUEw MDJBOTI1QiAvKiBXS1ZpZXcuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsg ZmlsZVJlZiA9IEJDODY5OUIyMTE2QUFEQUEwMDJBOTI1QiAvKiBXS1ZpZXcuaCAqLzsgc2V0dGlu Z3MgPSB7QVRUUklCVVRFUyA9IChQdWJsaWMsICk7IH07IH07CiAJCUJDODY5OUI2MTE2QUFEQUEw MDJBOTI1QiAvKiBXS1ZpZXcubW0gaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7 IGZpbGVSZWYgPSBCQzg2OTlCMzExNkFBREFBMDAyQTkyNUIgLyogV0tWaWV3Lm1tICovOyB9Owog CQlCQzg2OTlCNzExNkFBREFBMDAyQTkyNUIgLyogV0tWaWV3SW50ZXJuYWwuaCBpbiBIZWFkZXJz ICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IEJDODY5OUI0MTE2QUFEQUEwMDJB OTI1QiAvKiBXS1ZpZXdJbnRlcm5hbC5oICovOyB9OwpAQCAtMjA5Niw4ICsyMDk0LDYgQEAKIAkJ QkM4NTdGQjQxMkI4MzBFNjAwRURFQjJFIC8qIFdlYk9wZW5QYW5lbFBhcmFtZXRlcnMuY3BwICov ID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZp bGVUeXBlID0gc291cmNlY29kZS5jcHAuY3BwOyBwYXRoID0gV2ViT3BlblBhbmVsUGFyYW1ldGVy cy5jcHA7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCUJDODU3RkU0MTJCODQzRDgwMEVE RUIyRSAvKiBXS09wZW5QYW5lbFBhcmFtZXRlcnMuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJl bmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5o OyBwYXRoID0gV0tPcGVuUGFuZWxQYXJhbWV0ZXJzLmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7 IH07CiAJCUJDODU3RkU1MTJCODQzRDgwMEVERUIyRSAvKiBXS09wZW5QYW5lbFBhcmFtZXRlcnMu Y3BwICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RL bm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAuY3BwOyBwYXRoID0gV0tPcGVuUGFuZWxQYXJh bWV0ZXJzLmNwcDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKLQkJQkM4NThBMUUxMkMwMzU3 QjAwRURFQjJFIC8qIFdlYlJlc291cmNlTG9hZENsaWVudC5oICovID0ge2lzYSA9IFBCWEZpbGVS ZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29k ZS5jLmg7IHBhdGggPSBXZWJSZXNvdXJjZUxvYWRDbGllbnQuaDsgc291cmNlVHJlZSA9ICI8Z3Jv dXA+IjsgfTsKLQkJQkM4NThBMUYxMkMwMzU3QjAwRURFQjJFIC8qIFdlYlJlc291cmNlTG9hZENs aWVudC5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsg bGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5jcHA7IHBhdGggPSBXZWJSZXNvdXJj ZUxvYWRDbGllbnQuY3BwOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQlCQzg2OTlCMjEx NkFBREFBMDAyQTkyNUIgLyogV0tWaWV3LmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsg ZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0 aCA9IFdLVmlldy5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQlCQzg2OTlCMzExNkFB REFBMDAyQTkyNUIgLyogV0tWaWV3Lm1tICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZp bGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAub2JqY3Bw OyBwYXRoID0gV0tWaWV3Lm1tOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQlCQzg2OTlC NDExNkFBREFBMDAyQTkyNUIgLyogV0tWaWV3SW50ZXJuYWwuaCAqLyA9IHtpc2EgPSBQQlhGaWxl UmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNv ZGUuYy5oOyBwYXRoID0gV0tWaWV3SW50ZXJuYWwuaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+Ijsg fTsKQEAgLTM2NDEsOCArMzYzNyw2IEBACiAJCQkJMzMzNjc2MzIxMzBDOTlCMjAwNkM5REUyIC8q IFdlYlJlc291cmNlQ2FjaGVNYW5hZ2VyUHJveHkuY3BwICovLAogCQkJCTMzMzY3NjMzMTMwQzk5 QjIwMDZDOURFMiAvKiBXZWJSZXNvdXJjZUNhY2hlTWFuYWdlclByb3h5LmggKi8sCiAJCQkJMzMz Njc2MzQxMzBDOTlCMjAwNkM5REUyIC8qIFdlYlJlc291cmNlQ2FjaGVNYW5hZ2VyUHJveHkubWVz c2FnZXMuaW4gKi8sCi0JCQkJQkM4NThBMUYxMkMwMzU3QjAwRURFQjJFIC8qIFdlYlJlc291cmNl TG9hZENsaWVudC5jcHAgKi8sCi0JCQkJQkM4NThBMUUxMkMwMzU3QjAwRURFQjJFIC8qIFdlYlJl c291cmNlTG9hZENsaWVudC5oICovLAogCQkJCTFBNTk0QUI4MTEyQTFGQjYwMDlERTdDNyAvKiBX ZWJVSUNsaWVudC5jcHAgKi8sCiAJCQkJMUE1OTRBQjkxMTJBMUZCNjAwOURFN0M3IC8qIFdlYlVJ Q2xpZW50LmggKi8sCiAJCQkpOwpAQCAtNDkwNCw3ICs0ODk4LDYgQEAKIAkJCQkzMzM2NzY1NjEz MEM5RUNBMDA2QzlERTIgLyogV2ViUmVzb3VyY2VDYWNoZU1hbmFnZXJNZXNzYWdlcy5oIGluIEhl YWRlcnMgKi8sCiAJCQkJMzMzNjc2MzYxMzBDOTlCMjAwNkM5REUyIC8qIFdlYlJlc291cmNlQ2Fj aGVNYW5hZ2VyUHJveHkuaCBpbiBIZWFkZXJzICovLAogCQkJCTMzMzY3NjU4MTMwQzlFQ0IwMDZD OURFMiAvKiBXZWJSZXNvdXJjZUNhY2hlTWFuYWdlclByb3h5TWVzc2FnZXMuaCBpbiBIZWFkZXJz ICovLAotCQkJCUJDODU4QTIwMTJDMDM1N0IwMEVERUIyRSAvKiBXZWJSZXNvdXJjZUxvYWRDbGll bnQuaCBpbiBIZWFkZXJzICovLAogCQkJCTUxMEFGRkJBMTY1NDIwNDgwMDFCQTA1RSAvKiBXZWJS ZXNvdXJjZUxvYWRlci5oIGluIEhlYWRlcnMgKi8sCiAJCQkJNTFGMDYwRTAxNjU0MzE3RjAwRjMy ODFCIC8qIFdlYlJlc291cmNlTG9hZGVyTWVzc2FnZXMuaCBpbiBIZWFkZXJzICovLAogCQkJCUQz Qjk0ODQ5MTFGRjRCNjUwMDAzMkIzOSAvKiBXZWJTZWFyY2hQb3B1cE1lbnUuaCBpbiBIZWFkZXJz ICovLApAQCAtNTkxNSw3ICs1OTA4LDYgQEAKIAkJCQkzMzM2NzY1NTEzMEM5RUNBMDA2QzlERTIg LyogV2ViUmVzb3VyY2VDYWNoZU1hbmFnZXJNZXNzYWdlUmVjZWl2ZXIuY3BwIGluIFNvdXJjZXMg Ki8sCiAJCQkJMzMzNjc2MzUxMzBDOTlCMjAwNkM5REUyIC8qIFdlYlJlc291cmNlQ2FjaGVNYW5h Z2VyUHJveHkuY3BwIGluIFNvdXJjZXMgKi8sCiAJCQkJMzMzNjc2NTcxMzBDOUVDQTAwNkM5REUy IC8qIFdlYlJlc291cmNlQ2FjaGVNYW5hZ2VyUHJveHlNZXNzYWdlUmVjZWl2ZXIuY3BwIGluIFNv dXJjZXMgKi8sCi0JCQkJQkM4NThBMjExMkMwMzU3QjAwRURFQjJFIC8qIFdlYlJlc291cmNlTG9h ZENsaWVudC5jcHAgaW4gU291cmNlcyAqLywKIAkJCQk1MTBBRkZCOTE2NTQyMDQ4MDAxQkEwNUUg LyogV2ViUmVzb3VyY2VMb2FkZXIuY3BwIGluIFNvdXJjZXMgKi8sCiAJCQkJNTFGMDYwRTExNjU0 MzE4NTAwRjMyODFCIC8qIFdlYlJlc291cmNlTG9hZGVyTWVzc2FnZVJlY2VpdmVyLmNwcCBpbiBT b3VyY2VzICovLAogCQkJCTUxRkIwOEZGMTYzOURFMUEwMEVDMzI0QSAvKiBXZWJSZXNvdXJjZUxv YWRTY2hlZHVsZXIuY3BwIGluIFNvdXJjZXMgKi8sCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9XZWJQ cm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmNwcAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9h ZGVyQ2xpZW50LmNwcAkocmV2aXNpb24gMTQwMjgwKQorKysgU291cmNlL1dlYktpdDIvV2ViUHJv Y2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5jcHAJKHdvcmtpbmcgY29w eSkKQEAgLTE3NCw3ICsxNzQsNiBAQCB2b2lkIFdlYkZyYW1lTG9hZGVyQ2xpZW50Ojphc3NpZ25J ZGVudGlmCiAgICAgICAgIHBhZ2VJc1Byb3Zpc2lvbmFsbHlMb2FkaW5nID0gZnJhbWVMb2FkZXIt PnByb3Zpc2lvbmFsRG9jdW1lbnRMb2FkZXIoKSA9PSBsb2FkZXI7CiAKICAgICB3ZWJQYWdlLT5p bmplY3RlZEJ1bmRsZVJlc291cmNlTG9hZENsaWVudCgpLmRpZEluaXRpYXRlTG9hZEZvclJlc291 cmNlKHdlYlBhZ2UsIG1fZnJhbWUsIGlkZW50aWZpZXIsIHJlcXVlc3QsIHBhZ2VJc1Byb3Zpc2lv bmFsbHlMb2FkaW5nKTsKLSAgICB3ZWJQYWdlLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6 OkRpZEluaXRpYXRlTG9hZEZvclJlc291cmNlKG1fZnJhbWUtPmZyYW1lSUQoKSwgaWRlbnRpZmll ciwgcmVxdWVzdCwgcGFnZUlzUHJvdmlzaW9uYWxseUxvYWRpbmcpKTsKIH0KIAogdm9pZCBXZWJG cmFtZUxvYWRlckNsaWVudDo6ZGlzcGF0Y2hXaWxsU2VuZFJlcXVlc3QoRG9jdW1lbnRMb2FkZXIq LCB1bnNpZ25lZCBsb25nIGlkZW50aWZpZXIsIFJlc291cmNlUmVxdWVzdCYgcmVxdWVzdCwgY29u c3QgUmVzb3VyY2VSZXNwb25zZSYgcmVkaXJlY3RSZXNwb25zZSkKQEAgLTE4NCwxMyArMTgzLDYg QEAgdm9pZCBXZWJGcmFtZUxvYWRlckNsaWVudDo6ZGlzcGF0Y2hXaWxsUwogICAgICAgICByZXR1 cm47CiAKICAgICB3ZWJQYWdlLT5pbmplY3RlZEJ1bmRsZVJlc291cmNlTG9hZENsaWVudCgpLndp bGxTZW5kUmVxdWVzdEZvckZyYW1lKHdlYlBhZ2UsIG1fZnJhbWUsIGlkZW50aWZpZXIsIHJlcXVl c3QsIHJlZGlyZWN0UmVzcG9uc2UpOwotCi0gICAgaWYgKHJlcXVlc3QuaXNOdWxsKCkpIHsKLSAg ICAgICAgLy8gRklYTUU6IFdlIHNob3VsZCBwcm9iYWJseSBzZW5kIGEgbWVzc2FnZSBzYXlpbmcg d2UgY2FuY2VsbGVkIHRoZSByZXF1ZXN0IGZvciB0aGUgcmVzb3VyY2UuCi0gICAgICAgIHJldHVy bjsKLSAgICB9Ci0KLSAgICB3ZWJQYWdlLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OkRp ZFNlbmRSZXF1ZXN0Rm9yUmVzb3VyY2UobV9mcmFtZS0+ZnJhbWVJRCgpLCBpZGVudGlmaWVyLCBy ZXF1ZXN0LCByZWRpcmVjdFJlc3BvbnNlKSk7CiB9CiAKIGJvb2wgV2ViRnJhbWVMb2FkZXJDbGll bnQ6OnNob3VsZFVzZUNyZWRlbnRpYWxTdG9yYWdlKERvY3VtZW50TG9hZGVyKiwgdW5zaWduZWQg bG9uZyBpZGVudGlmaWVyKQpAQCAtMjQ0LDcgKzIzNiw2IEBAIHZvaWQgV2ViRnJhbWVMb2FkZXJD bGllbnQ6OmRpc3BhdGNoRGlkUmUKICAgICAgICAgcmV0dXJuOwogCiAgICAgd2ViUGFnZS0+aW5q ZWN0ZWRCdW5kbGVSZXNvdXJjZUxvYWRDbGllbnQoKS5kaWRSZWNlaXZlUmVzcG9uc2VGb3JSZXNv dXJjZSh3ZWJQYWdlLCBtX2ZyYW1lLCBpZGVudGlmaWVyLCByZXNwb25zZSk7Ci0gICAgd2ViUGFn ZS0+c2VuZChNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpEaWRSZWNlaXZlUmVzcG9uc2VGb3JSZXNv dXJjZShtX2ZyYW1lLT5mcmFtZUlEKCksIGlkZW50aWZpZXIsIHJlc3BvbnNlKSk7CiB9CiAKIHZv aWQgV2ViRnJhbWVMb2FkZXJDbGllbnQ6OmRpc3BhdGNoRGlkUmVjZWl2ZUNvbnRlbnRMZW5ndGgo RG9jdW1lbnRMb2FkZXIqLCB1bnNpZ25lZCBsb25nIGlkZW50aWZpZXIsIGludCBkYXRhTGVuZ3Ro KQpAQCAtMjU0LDcgKzI0NSw2IEBAIHZvaWQgV2ViRnJhbWVMb2FkZXJDbGllbnQ6OmRpc3BhdGNo RGlkUmUKICAgICAgICAgcmV0dXJuOwogCiAgICAgd2ViUGFnZS0+aW5qZWN0ZWRCdW5kbGVSZXNv dXJjZUxvYWRDbGllbnQoKS5kaWRSZWNlaXZlQ29udGVudExlbmd0aEZvclJlc291cmNlKHdlYlBh Z2UsIG1fZnJhbWUsIGlkZW50aWZpZXIsIGRhdGFMZW5ndGgpOwotICAgIHdlYlBhZ2UtPnNlbmQo TWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6RGlkUmVjZWl2ZUNvbnRlbnRMZW5ndGhGb3JSZXNvdXJj ZShtX2ZyYW1lLT5mcmFtZUlEKCksIGlkZW50aWZpZXIsIGRhdGFMZW5ndGgpKTsKIH0KIAogdm9p ZCBXZWJGcmFtZUxvYWRlckNsaWVudDo6ZGlzcGF0Y2hEaWRGaW5pc2hMb2FkaW5nKERvY3VtZW50 TG9hZGVyKiwgdW5zaWduZWQgbG9uZyBpZGVudGlmaWVyKQpAQCAtMjY0LDcgKzI1NCw2IEBAIHZv aWQgV2ViRnJhbWVMb2FkZXJDbGllbnQ6OmRpc3BhdGNoRGlkRmkKICAgICAgICAgcmV0dXJuOwog CiAgICAgd2ViUGFnZS0+aW5qZWN0ZWRCdW5kbGVSZXNvdXJjZUxvYWRDbGllbnQoKS5kaWRGaW5p c2hMb2FkRm9yUmVzb3VyY2Uod2ViUGFnZSwgbV9mcmFtZSwgaWRlbnRpZmllcik7Ci0gICAgd2Vi UGFnZS0+c2VuZChNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpEaWRGaW5pc2hMb2FkRm9yUmVzb3Vy Y2UobV9mcmFtZS0+ZnJhbWVJRCgpLCBpZGVudGlmaWVyKSk7CiB9CiAKIHZvaWQgV2ViRnJhbWVM b2FkZXJDbGllbnQ6OmRpc3BhdGNoRGlkRmFpbExvYWRpbmcoRG9jdW1lbnRMb2FkZXIqLCB1bnNp Z25lZCBsb25nIGlkZW50aWZpZXIsIGNvbnN0IFJlc291cmNlRXJyb3ImIGVycm9yKQpAQCAtMjc0 LDcgKzI2Myw2IEBAIHZvaWQgV2ViRnJhbWVMb2FkZXJDbGllbnQ6OmRpc3BhdGNoRGlkRmEKICAg ICAgICAgcmV0dXJuOwogCiAgICAgd2ViUGFnZS0+aW5qZWN0ZWRCdW5kbGVSZXNvdXJjZUxvYWRD bGllbnQoKS5kaWRGYWlsTG9hZEZvclJlc291cmNlKHdlYlBhZ2UsIG1fZnJhbWUsIGlkZW50aWZp ZXIsIGVycm9yKTsKLSAgICB3ZWJQYWdlLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OkRp ZEZhaWxMb2FkRm9yUmVzb3VyY2UobV9mcmFtZS0+ZnJhbWVJRCgpLCBpZGVudGlmaWVyLCBlcnJv cikpOwogfQogCiBib29sIFdlYkZyYW1lTG9hZGVyQ2xpZW50OjpkaXNwYXRjaERpZExvYWRSZXNv dXJjZUZyb21NZW1vcnlDYWNoZShEb2N1bWVudExvYWRlciosIGNvbnN0IFJlc291cmNlUmVxdWVz dCYsIGNvbnN0IFJlc291cmNlUmVzcG9uc2UmLCBpbnQgLypsZW5ndGgqLykK 183700 2013-01-20 20:43:13 -0800 2013-01-20 21:43:38 -0800 EFL, GTK & Qt build fixes after r140285. r140285_build_fixes.diff text/plain 2657 ostap73 ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NNYWtlTGlzdHMudHh0IGIvU291cmNlL1dlYktp dDIvQ01ha2VMaXN0cy50eHQKaW5kZXggYjk2NGI0Yi4uYzNkYTlhOCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdDIvQ01ha2VMaXN0cy50eHQKKysrIGIvU291cmNlL1dlYktpdDIvQ01ha2VMaXN0 cy50eHQKQEAgLTI5Nyw3ICsyOTcsNiBAQCBzZXQoV2ViS2l0Ml9TT1VSQ0VTCiAgICAgVUlQcm9j ZXNzL1dlYlByZWZlcmVuY2VzLmNwcAogICAgIFVJUHJvY2Vzcy9XZWJQcm9jZXNzUHJveHkuY3Bw CiAgICAgVUlQcm9jZXNzL1dlYlJlc291cmNlQ2FjaGVNYW5hZ2VyUHJveHkuY3BwCi0gICAgVUlQ cm9jZXNzL1dlYlJlc291cmNlTG9hZENsaWVudC5jcHAKICAgICBVSVByb2Nlc3MvV2ViVGV4dENo ZWNrZXIuY3BwCiAgICAgVUlQcm9jZXNzL1dlYlRleHRDaGVja2VyQ2xpZW50LmNwcAogICAgIFVJ UHJvY2Vzcy9XZWJVSUNsaWVudC5jcHAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwppbmRleCA1ODI2NDAzLi41MDcxN2M1IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTMtMDEtMjAgIFZpYXRjaGVzbGF2IE9zdGFw ZW5rbyAgPHNsLm9zdGFwZW5rb0BzYW1zdW5nLmNvbT4KKworICAgICAgICBSZW1vdmUgc3VwcG9y dCBnZXR0aW5nIHBlci1yZXNvdXJjZSBjYWxsYmFja3MgaW4gdGhlIFVJUHJvY2VzcworICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA3NDA1CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRUZMLCBHVEsgYW5kIFF0 IFdlYktpdDIgYnVpbGQgZml4ZXMgYWZ0ZXIgcjE0MDI4NS4KKyAgICAgICAgUmVtb3ZlIGZyb20g YnVpbGQgV2ViUmVzb3VyY2VMb2FkQ2xpZW50LntjcHAsaH0gZGVsZXRlZCBieSByMTQwMjg1Lgor CisgICAgICAgICogQ01ha2VMaXN0cy50eHQ6CisgICAgICAgICogR05VbWFrZWZpbGUubGlzdC5h bToKKyAgICAgICAgKiBUYXJnZXQucHJpOgorCiAyMDEzLTAxLTIwICBTYW0gV2VpbmlnICA8c2Ft QHdlYmtpdC5vcmc+CiAKICAgICAgICAgUmVtb3ZlIHN1cHBvcnQgZ2V0dGluZyBwZXItcmVzb3Vy Y2UgY2FsbGJhY2tzIGluIHRoZSBVSVByb2Nlc3MKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQy L0dOVW1ha2VmaWxlLmxpc3QuYW0gYi9Tb3VyY2UvV2ViS2l0Mi9HTlVtYWtlZmlsZS5saXN0LmFt CmluZGV4IGM3NGM1YmUuLjUwNWEyMGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL0dOVW1h a2VmaWxlLmxpc3QuYW0KKysrIGIvU291cmNlL1dlYktpdDIvR05VbWFrZWZpbGUubGlzdC5hbQpA QCAtOTUwLDggKzk1MCw2IEBAIHdlYmtpdDJfc291cmNlcyArPSBcCiAJU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL1dlYlByb2Nlc3NQcm94eS5oIFwKIAlTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv V2ViUmVzb3VyY2VDYWNoZU1hbmFnZXJQcm94eS5oIFwKIAlTb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvV2ViUmVzb3VyY2VDYWNoZU1hbmFnZXJQcm94eS5jcHAgXAotCVNvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9XZWJSZXNvdXJjZUxvYWRDbGllbnQuY3BwIFwKLQlTb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvV2ViUmVzb3VyY2VMb2FkQ2xpZW50LmggXAogCVNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9XZWJUZXh0Q2hlY2tlci5jcHAgXAogCVNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJUZXh0 Q2hlY2tlci5oIFwKIAlTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViVGV4dENoZWNrZXJDbGll bnQuY3BwIFwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1RhcmdldC5wcmkgYi9Tb3VyY2Uv V2ViS2l0Mi9UYXJnZXQucHJpCmluZGV4IDBkNThjMmEuLjZjNDA4YTcgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQyL1RhcmdldC5wcmkKKysrIGIvU291cmNlL1dlYktpdDIvVGFyZ2V0LnByaQpA QCAtMjg1LDcgKzI4NSw2IEBAIEhFQURFUlMgKz0gXAogICAgIFVJUHJvY2Vzcy9XZWJQcmVmZXJl bmNlcy5oIFwKICAgICBVSVByb2Nlc3MvV2ViUHJvY2Vzc1Byb3h5LmggXAogICAgIFVJUHJvY2Vz cy9XZWJSZXNvdXJjZUNhY2hlTWFuYWdlclByb3h5LmggXAotICAgIFVJUHJvY2Vzcy9XZWJSZXNv dXJjZUxvYWRDbGllbnQuaCBcCiAgICAgVUlQcm9jZXNzL1dlYlRleHRDaGVja2VyLmggXAogICAg IFVJUHJvY2Vzcy9XZWJUZXh0Q2hlY2tlckNsaWVudC5oIFwKICAgICBVSVByb2Nlc3MvV2ViVUlD bGllbnQuaCBcCkBAIC02NTIsNyArNjUxLDYgQEAgU09VUkNFUyArPSBcCiAgICAgVUlQcm9jZXNz L1dlYlByZWZlcmVuY2VzLmNwcCBcCiAgICAgVUlQcm9jZXNzL1dlYlByb2Nlc3NQcm94eS5jcHAg XAogICAgIFVJUHJvY2Vzcy9XZWJSZXNvdXJjZUNhY2hlTWFuYWdlclByb3h5LmNwcCBcCi0gICAg VUlQcm9jZXNzL1dlYlJlc291cmNlTG9hZENsaWVudC5jcHAgXAogICAgIFVJUHJvY2Vzcy9XZWJU ZXh0Q2hlY2tlci5jcHAgXAogICAgIFVJUHJvY2Vzcy9XZWJUZXh0Q2hlY2tlckNsaWVudC5jcHAg XAogICAgIFVJUHJvY2Vzcy9XZWJVSUNsaWVudC5jcHAgXAo=