93046 2012-08-02 16:39:46 -0700 [WK2] Move some WebContext messages to WebProcessProxy 2012-08-03 09:41:56 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 ap ap andersca sam webkit.review.bot oldest_to_newest 685980 0 ap 2012-08-02 16:39:46 -0700 There are a few messages that are really process proxy ones by implementation. 685982 1 156202 ap 2012-08-02 16:44:05 -0700 Created attachment 156202 proposed patch 685983 2 webkit.review.bot 2012-08-02 16:46:09 -0700 Attachment 156202 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebKit2/ChangeLog', u'Source/WebKit..." exit_code: 1 Source/WebKit2/UIProcess/WebProcessProxy.h:174: The parameter name "store" adds no information, so it should be removed. [readability/parameter_name] [5] Total errors found: 1 in 7 files If any of these errors are false positives, please file a bug against check-webkit-style. 686845 3 ap 2012-08-03 09:41:56 -0700 Committed <http://trac.webkit.org/changeset/124622>. 156202 2012-08-02 16:44:05 -0700 2012-08-03 09:38:38 -0700 proposed patch MoveMessages.txt text/plain 14848 ap SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDEyNDUzMCkKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMxIEBACisyMDEyLTA4LTAyICBBbGV4ZXkg UHJvc2t1cnlha292ICA8YXBAYXBwbGUuY29tPgorCisgICAgICAgIFtXSzJdIE1vdmUgc29tZSBX ZWJDb250ZXh0IG1lc3NhZ2VzIHRvIFdlYlByb2Nlc3NQcm94eQorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTMwNDYKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9XZWJDb250ZXh0LmNwcDog KFdlYktpdDo6V2ViQ29udGV4dDo6ZGlkUmVjZWl2ZVN5bmNNZXNzYWdlKTogVW5yZWxhdGVkCisg ICAgICAgIGZpeCAtIHVzZSBhY3R1YWwgcHJvY2VzcyBhcmd1bWVudCBpbnN0ZWFkIG9mIHNlY29u ZC1ndWVzc2luZyB3aGVyZSB0aGUgbWVzc2FnZSBjYW1lCisgICAgICAgIGZyb20uCisKKyAgICAg ICAgKiBVSVByb2Nlc3MvV2ViQ29udGV4dC5oOiAoV2ViS2l0OjpXZWJDb250ZXh0OjpoaXN0b3J5 Q2xpZW50KTogRXhwb3NlIGhpc3RvcnkgY2xpZW50LAorICAgICAgICBzaW5jZSBXZWJQcm9jZXNz UHJveHkgbm93IG5lZWRzIGl0LgorCisgICAgICAgICogVUlQcm9jZXNzL1dlYkNvbnRleHQubWVz c2FnZXMuaW46CisgICAgICAgICogVUlQcm9jZXNzL1dlYlByb2Nlc3NQcm94eS5jcHA6CisgICAg ICAgIChXZWJLaXQ6OldlYlByb2Nlc3NQcm94eTo6ZGlkTmF2aWdhdGVXaXRoTmF2aWdhdGlvbkRh dGEpOgorICAgICAgICAoV2ViS2l0OjpXZWJQcm9jZXNzUHJveHk6OmRpZFBlcmZvcm1DbGllbnRS ZWRpcmVjdCk6CisgICAgICAgIChXZWJLaXQ6OldlYlByb2Nlc3NQcm94eTo6ZGlkUGVyZm9ybVNl cnZlclJlZGlyZWN0KToKKyAgICAgICAgKFdlYktpdDo6V2ViUHJvY2Vzc1Byb3h5OjpkaWRVcGRh dGVIaXN0b3J5VGl0bGUpOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQcm9jZXNzUHJveHkuaDoK KyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUHJvY2Vzc1Byb3h5Lm1lc3NhZ2VzLmluOgorICAgICAg ICAqIFdlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuY3BwOgor ICAgICAgICAoV2ViS2l0OjpXZWJGcmFtZUxvYWRlckNsaWVudDo6dXBkYXRlR2xvYmFsSGlzdG9y eSk6CisgICAgICAgIChXZWJLaXQ6OldlYkZyYW1lTG9hZGVyQ2xpZW50Ojp1cGRhdGVHbG9iYWxI aXN0b3J5UmVkaXJlY3RMaW5rcyk6CisgICAgICAgIChXZWJLaXQ6OldlYkZyYW1lTG9hZGVyQ2xp ZW50OjpzZXRUaXRsZSk6CisgICAgICAgIE1vdmUgdGhlIG1lc3NhZ2VzLgorCiAyMDEyLTA4LTAy ICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KIAogICAgICAgICBb R1RLXSBJbnNwZWN0b3Igc2hvdWxkIHNldCBhIGRlZmF1bHQgYXR0YWNoZWQgaGVpZ2h0IGJlZm9y ZSBiZWluZyBhdHRhY2hlZApJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYkNvbnRl eHQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJDb250ZXh0 LmNwcAkocmV2aXNpb24gMTI0NDkzKQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYkNv bnRleHQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC04Niw3ICs4Niw2IEBACiAjaW5jbHVkZSA8d3Rm L1JlZkNvdW50ZWRMZWFrQ291bnRlci5oPgogI2VuZGlmCiAKLSNkZWZpbmUgTUVTU0FHRV9DSEVD Syhhc3NlcnRpb24pIE1FU1NBR0VfQ0hFQ0tfQkFTRShhc3NlcnRpb24sIG1fcHJvY2Vzcy0+Y29u bmVjdGlvbigpKQogI2RlZmluZSBNRVNTQUdFX0NIRUNLX1VSTCh1cmwpIE1FU1NBR0VfQ0hFQ0tf QkFTRShtX3Byb2Nlc3MtPmNoZWNrVVJMUmVjZWl2ZWRGcm9tV2ViUHJvY2Vzcyh1cmwpLCBtX3By b2Nlc3MtPmNvbm5lY3Rpb24oKSkKIAogdXNpbmcgbmFtZXNwYWNlIFdlYkNvcmU7CkBAIC01MjEs NzEgKzUyMCw2IEBAIHZvaWQgV2ViQ29udGV4dDo6ZGlkUmVjZWl2ZVN5bmNocm9ub3VzTWUKICAg ICBtX2luamVjdGVkQnVuZGxlQ2xpZW50LmRpZFJlY2VpdmVTeW5jaHJvbm91c01lc3NhZ2VGcm9t SW5qZWN0ZWRCdW5kbGUodGhpcywgbWVzc2FnZU5hbWUsIG1lc3NhZ2VCb2R5LCByZXR1cm5EYXRh KTsKIH0KIAotLy8gSGlzdG9yeUNsaWVudAotCi12b2lkIFdlYkNvbnRleHQ6OmRpZE5hdmlnYXRl V2l0aE5hdmlnYXRpb25EYXRhKHVpbnQ2NF90IHBhZ2VJRCwgY29uc3QgV2ViTmF2aWdhdGlvbkRh dGFTdG9yZSYgc3RvcmUsIHVpbnQ2NF90IGZyYW1lSUQpIAotewotICAgIFdlYlBhZ2VQcm94eSog cGFnZSA9IG1fcHJvY2Vzcy0+d2ViUGFnZShwYWdlSUQpOwotICAgIGlmICghcGFnZSkKLSAgICAg ICAgcmV0dXJuOwotICAgIAotICAgIFdlYkZyYW1lUHJveHkqIGZyYW1lID0gbV9wcm9jZXNzLT53 ZWJGcmFtZShmcmFtZUlEKTsKLSAgICBNRVNTQUdFX0NIRUNLKGZyYW1lKTsKLSAgICBNRVNTQUdF X0NIRUNLKGZyYW1lLT5wYWdlKCkgPT0gcGFnZSk7Ci0gICAgCi0gICAgbV9oaXN0b3J5Q2xpZW50 LmRpZE5hdmlnYXRlV2l0aE5hdmlnYXRpb25EYXRhKHRoaXMsIHBhZ2UsIHN0b3JlLCBmcmFtZSk7 Ci19Ci0KLXZvaWQgV2ViQ29udGV4dDo6ZGlkUGVyZm9ybUNsaWVudFJlZGlyZWN0KHVpbnQ2NF90 IHBhZ2VJRCwgY29uc3QgU3RyaW5nJiBzb3VyY2VVUkxTdHJpbmcsIGNvbnN0IFN0cmluZyYgZGVz dGluYXRpb25VUkxTdHJpbmcsIHVpbnQ2NF90IGZyYW1lSUQpCi17Ci0gICAgV2ViUGFnZVByb3h5 KiBwYWdlID0gbV9wcm9jZXNzLT53ZWJQYWdlKHBhZ2VJRCk7Ci0gICAgaWYgKCFwYWdlKQotICAg ICAgICByZXR1cm47Ci0KLSAgICBpZiAoc291cmNlVVJMU3RyaW5nLmlzRW1wdHkoKSB8fCBkZXN0 aW5hdGlvblVSTFN0cmluZy5pc0VtcHR5KCkpCi0gICAgICAgIHJldHVybjsKLSAgICAKLSAgICBX ZWJGcmFtZVByb3h5KiBmcmFtZSA9IG1fcHJvY2Vzcy0+d2ViRnJhbWUoZnJhbWVJRCk7Ci0gICAg TUVTU0FHRV9DSEVDSyhmcmFtZSk7Ci0gICAgTUVTU0FHRV9DSEVDSyhmcmFtZS0+cGFnZSgpID09 IHBhZ2UpOwotICAgIE1FU1NBR0VfQ0hFQ0tfVVJMKHNvdXJjZVVSTFN0cmluZyk7Ci0gICAgTUVT U0FHRV9DSEVDS19VUkwoZGVzdGluYXRpb25VUkxTdHJpbmcpOwotCi0gICAgbV9oaXN0b3J5Q2xp ZW50LmRpZFBlcmZvcm1DbGllbnRSZWRpcmVjdCh0aGlzLCBwYWdlLCBzb3VyY2VVUkxTdHJpbmcs IGRlc3RpbmF0aW9uVVJMU3RyaW5nLCBmcmFtZSk7Ci19Ci0KLXZvaWQgV2ViQ29udGV4dDo6ZGlk UGVyZm9ybVNlcnZlclJlZGlyZWN0KHVpbnQ2NF90IHBhZ2VJRCwgY29uc3QgU3RyaW5nJiBzb3Vy Y2VVUkxTdHJpbmcsIGNvbnN0IFN0cmluZyYgZGVzdGluYXRpb25VUkxTdHJpbmcsIHVpbnQ2NF90 IGZyYW1lSUQpCi17Ci0gICAgV2ViUGFnZVByb3h5KiBwYWdlID0gbV9wcm9jZXNzLT53ZWJQYWdl KHBhZ2VJRCk7Ci0gICAgaWYgKCFwYWdlKQotICAgICAgICByZXR1cm47Ci0gICAgCi0gICAgaWYg KHNvdXJjZVVSTFN0cmluZy5pc0VtcHR5KCkgfHwgZGVzdGluYXRpb25VUkxTdHJpbmcuaXNFbXB0 eSgpKQotICAgICAgICByZXR1cm47Ci0gICAgCi0gICAgV2ViRnJhbWVQcm94eSogZnJhbWUgPSBt X3Byb2Nlc3MtPndlYkZyYW1lKGZyYW1lSUQpOwotICAgIE1FU1NBR0VfQ0hFQ0soZnJhbWUpOwot ICAgIE1FU1NBR0VfQ0hFQ0soZnJhbWUtPnBhZ2UoKSA9PSBwYWdlKTsKLSAgICBNRVNTQUdFX0NI RUNLX1VSTChzb3VyY2VVUkxTdHJpbmcpOwotICAgIE1FU1NBR0VfQ0hFQ0tfVVJMKGRlc3RpbmF0 aW9uVVJMU3RyaW5nKTsKLQotICAgIG1faGlzdG9yeUNsaWVudC5kaWRQZXJmb3JtU2VydmVyUmVk aXJlY3QodGhpcywgcGFnZSwgc291cmNlVVJMU3RyaW5nLCBkZXN0aW5hdGlvblVSTFN0cmluZywg ZnJhbWUpOwotfQotCi12b2lkIFdlYkNvbnRleHQ6OmRpZFVwZGF0ZUhpc3RvcnlUaXRsZSh1aW50 NjRfdCBwYWdlSUQsIGNvbnN0IFN0cmluZyYgdGl0bGUsIGNvbnN0IFN0cmluZyYgdXJsLCB1aW50 NjRfdCBmcmFtZUlEKQotewotICAgIFdlYlBhZ2VQcm94eSogcGFnZSA9IG1fcHJvY2Vzcy0+d2Vi UGFnZShwYWdlSUQpOwotICAgIGlmICghcGFnZSkKLSAgICAgICAgcmV0dXJuOwotCi0gICAgV2Vi RnJhbWVQcm94eSogZnJhbWUgPSBtX3Byb2Nlc3MtPndlYkZyYW1lKGZyYW1lSUQpOwotICAgIE1F U1NBR0VfQ0hFQ0soZnJhbWUpOwotICAgIE1FU1NBR0VfQ0hFQ0soZnJhbWUtPnBhZ2UoKSA9PSBw YWdlKTsKLSAgICBNRVNTQUdFX0NIRUNLX1VSTCh1cmwpOwotCi0gICAgbV9oaXN0b3J5Q2xpZW50 LmRpZFVwZGF0ZUhpc3RvcnlUaXRsZSh0aGlzLCBwYWdlLCB0aXRsZSwgdXJsLCBmcmFtZSk7Ci19 Ci0KIHZvaWQgV2ViQ29udGV4dDo6cG9wdWxhdGVWaXNpdGVkTGlua3MoKQogewogICAgIG1faGlz dG9yeUNsaWVudC5wb3B1bGF0ZVZpc2l0ZWRMaW5rcyh0aGlzKTsKQEAgLTg5NCw3ICs4MjgsNyBA QCB2b2lkIFdlYkNvbnRleHQ6OmRpZFJlY2VpdmVTeW5jTWVzc2FnZShXCiAKICAgICAgICAgICAg IFN0cmluZyBtZXNzYWdlTmFtZTsKICAgICAgICAgICAgIFJlZlB0cjxBUElPYmplY3Q+IG1lc3Nh Z2VCb2R5OwotICAgICAgICAgICAgV2ViQ29udGV4dFVzZXJNZXNzYWdlRGVjb2RlciBtZXNzYWdl RGVjb2RlcihtZXNzYWdlQm9keSwgbV9wcm9jZXNzLmdldCgpKTsKKyAgICAgICAgICAgIFdlYkNv bnRleHRVc2VyTWVzc2FnZURlY29kZXIgbWVzc2FnZURlY29kZXIobWVzc2FnZUJvZHksIHByb2Nl c3MpOwogICAgICAgICAgICAgaWYgKCFhcmd1bWVudHMtPmRlY29kZShDb3JlSVBDOjpPdXQobWVz c2FnZU5hbWUsIG1lc3NhZ2VEZWNvZGVyKSkpCiAgICAgICAgICAgICAgICAgcmV0dXJuOwogCklu ZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViQ29udGV4dC5oCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJDb250ZXh0LmgJKHJldmlzaW9uIDEyNDQ5MykK KysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJDb250ZXh0LmgJKHdvcmtpbmcgY29weSkK QEAgLTE1OSw2ICsxNTksOCBAQCBwdWJsaWM6CiAgICAgV2ViRG93bmxvYWRDbGllbnQmIGRvd25s b2FkQ2xpZW50KCkgeyByZXR1cm4gbV9kb3dubG9hZENsaWVudDsgfQogICAgIHZvaWQgZG93bmxv YWRGaW5pc2hlZChEb3dubG9hZFByb3h5Kik7CiAKKyAgICBXZWJIaXN0b3J5Q2xpZW50JiBoaXN0 b3J5Q2xpZW50KCkgeyByZXR1cm4gbV9oaXN0b3J5Q2xpZW50OyB9CisKICAgICBzdGF0aWMgSGFz aFNldDxTdHJpbmcsIENhc2VGb2xkaW5nSGFzaD4gcGRmQW5kUG9zdFNjcmlwdE1JTUVUeXBlcygp OwogCiAgICAgV2ViQXBwbGljYXRpb25DYWNoZU1hbmFnZXJQcm94eSogYXBwbGljYXRpb25DYWNo ZU1hbmFnZXJQcm94eSgpIGNvbnN0IHsgcmV0dXJuIG1fYXBwbGljYXRpb25DYWNoZU1hbmFnZXJQ cm94eS5nZXQoKTsgfQpAQCAtMjI4LDEyICsyMzAsNiBAQCBwcml2YXRlOgogICAgIHZvaWQgcGxh dGZvcm1Jbml0aWFsaXplV2ViUHJvY2VzcyhXZWJQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzJik7 CiAgICAgdm9pZCBwbGF0Zm9ybUludmFsaWRhdGVDb250ZXh0KCk7CiAgICAgCi0gICAgLy8gSGlz dG9yeSBjbGllbnQKLSAgICB2b2lkIGRpZE5hdmlnYXRlV2l0aE5hdmlnYXRpb25EYXRhKHVpbnQ2 NF90IHBhZ2VJRCwgY29uc3QgV2ViTmF2aWdhdGlvbkRhdGFTdG9yZSYgc3RvcmUsIHVpbnQ2NF90 IGZyYW1lSUQpOwotICAgIHZvaWQgZGlkUGVyZm9ybUNsaWVudFJlZGlyZWN0KHVpbnQ2NF90IHBh Z2VJRCwgY29uc3QgU3RyaW5nJiBzb3VyY2VVUkxTdHJpbmcsIGNvbnN0IFN0cmluZyYgZGVzdGlu YXRpb25VUkxTdHJpbmcsIHVpbnQ2NF90IGZyYW1lSUQpOwotICAgIHZvaWQgZGlkUGVyZm9ybVNl cnZlclJlZGlyZWN0KHVpbnQ2NF90IHBhZ2VJRCwgY29uc3QgU3RyaW5nJiBzb3VyY2VVUkxTdHJp bmcsIGNvbnN0IFN0cmluZyYgZGVzdGluYXRpb25VUkxTdHJpbmcsIHVpbnQ2NF90IGZyYW1lSUQp OwotICAgIHZvaWQgZGlkVXBkYXRlSGlzdG9yeVRpdGxlKHVpbnQ2NF90IHBhZ2VJRCwgY29uc3Qg U3RyaW5nJiB0aXRsZSwgY29uc3QgU3RyaW5nJiB1cmwsIHVpbnQ2NF90IGZyYW1lSUQpOwotCiAg ICAgLy8gUGx1Z2lucwogICAgIHZvaWQgZ2V0UGx1Z2lucyhDb3JlSVBDOjpDb25uZWN0aW9uKiwg dWludDY0X3QgcmVxdWVzdElELCBib29sIHJlZnJlc2gpOwogICAgIHZvaWQgZ2V0UGx1Z2luUGF0 aChjb25zdCBTdHJpbmcmIG1pbWVUeXBlLCBjb25zdCBTdHJpbmcmIHVybFN0cmluZywgU3RyaW5n JiBwbHVnaW5QYXRoLCBib29sJiBibG9ja2VkKTsKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9XZWJDb250ZXh0Lm1lc3NhZ2VzLmluCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9XZWJDb250ZXh0Lm1lc3NhZ2VzLmluCShyZXZpc2lvbiAxMjQ0OTMpCisrKyBT b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViQ29udGV4dC5tZXNzYWdlcy5pbgkod29ya2luZyBj b3B5KQpAQCAtMjIsMTIgKzIyLDYgQEAKIAogbWVzc2FnZXMgLT4gV2ViQ29udGV4dCB7CiAKLSAg ICAjIEhpc3RvcnkgY2xpZW50IG1lc3NhZ2VzLgotICAgIERpZE5hdmlnYXRlV2l0aE5hdmlnYXRp b25EYXRhKHVpbnQ2NF90IHBhZ2VJRCwgV2ViS2l0OjpXZWJOYXZpZ2F0aW9uRGF0YVN0b3JlIHN0 b3JlLCB1aW50NjRfdCBmcmFtZUlEKQotICAgIERpZFBlcmZvcm1DbGllbnRSZWRpcmVjdCh1aW50 NjRfdCBwYWdlSUQsIFdURjo6U3RyaW5nIHNvdXJjZVVSTFN0cmluZywgV1RGOjpTdHJpbmcgZGVz dGluYXRpb25VUkxTdHJpbmcsIHVpbnQ2NF90IGZyYW1lSUQpCi0gICAgRGlkUGVyZm9ybVNlcnZl clJlZGlyZWN0KHVpbnQ2NF90IHBhZ2VJRCwgV1RGOjpTdHJpbmcgc291cmNlVVJMU3RyaW5nLCBX VEY6OlN0cmluZyBkZXN0aW5hdGlvblVSTFN0cmluZywgdWludDY0X3QgZnJhbWVJRCkKLSAgICBE aWRVcGRhdGVIaXN0b3J5VGl0bGUodWludDY0X3QgcGFnZUlELCBXVEY6OlN0cmluZyB0aXRsZSwg V1RGOjpTdHJpbmcgdXJsLCB1aW50NjRfdCBmcmFtZUlEKQotCiAgICAgIyBWaXNpdGVkIGxpbmsg cHJvdmlkZXIgbWVzc2FnZXMuCiAgICAgQWRkVmlzaXRlZExpbmtIYXNoKHVpbnQ2NF90IGxpbmtI YXNoKQogICAgIApJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlByb2Nlc3NQcm94 eS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlByb2Nlc3NQ cm94eS5jcHAJKHJldmlzaW9uIDEyNDQ5MykKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9X ZWJQcm9jZXNzUHJveHkuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00Niw2ICs0Niw3IEBACiB1c2lu ZyBuYW1lc3BhY2UgV2ViQ29yZTsKIHVzaW5nIG5hbWVzcGFjZSBzdGQ7CiAKKyNkZWZpbmUgTUVT U0FHRV9DSEVDSyhhc3NlcnRpb24pIE1FU1NBR0VfQ0hFQ0tfQkFTRShhc3NlcnRpb24sIGNvbm5l Y3Rpb24oKSkKICNkZWZpbmUgTUVTU0FHRV9DSEVDS19VUkwodXJsKSBNRVNTQUdFX0NIRUNLX0JB U0UoY2hlY2tVUkxSZWNlaXZlZEZyb21XZWJQcm9jZXNzKHVybCksIGNvbm5lY3Rpb24oKSkKIAog bmFtZXNwYWNlIFdlYktpdCB7CkBAIC01MjcsNCArNTI4LDY3IEBAIHZvaWQgV2ViUHJvY2Vzc1By b3h5Ojp1cGRhdGVUZXh0Q2hlY2tlclMKICAgICBzZW5kKE1lc3NhZ2VzOjpXZWJQcm9jZXNzOjpT ZXRUZXh0Q2hlY2tlclN0YXRlKFRleHRDaGVja2VyOjpzdGF0ZSgpKSwgMCk7CiB9CiAKK3ZvaWQg V2ViUHJvY2Vzc1Byb3h5OjpkaWROYXZpZ2F0ZVdpdGhOYXZpZ2F0aW9uRGF0YSh1aW50NjRfdCBw YWdlSUQsIGNvbnN0IFdlYk5hdmlnYXRpb25EYXRhU3RvcmUmIHN0b3JlLCB1aW50NjRfdCBmcmFt ZUlEKSAKK3sKKyAgICBXZWJQYWdlUHJveHkqIHBhZ2UgPSB3ZWJQYWdlKHBhZ2VJRCk7CisgICAg aWYgKCFwYWdlKQorICAgICAgICByZXR1cm47CisgICAgCisgICAgV2ViRnJhbWVQcm94eSogZnJh bWUgPSB3ZWJGcmFtZShmcmFtZUlEKTsKKyAgICBNRVNTQUdFX0NIRUNLKGZyYW1lKTsKKyAgICBN RVNTQUdFX0NIRUNLKGZyYW1lLT5wYWdlKCkgPT0gcGFnZSk7CisgICAgCisgICAgbV9jb250ZXh0 LT5oaXN0b3J5Q2xpZW50KCkuZGlkTmF2aWdhdGVXaXRoTmF2aWdhdGlvbkRhdGEobV9jb250ZXh0 LmdldCgpLCBwYWdlLCBzdG9yZSwgZnJhbWUpOworfQorCit2b2lkIFdlYlByb2Nlc3NQcm94eTo6 ZGlkUGVyZm9ybUNsaWVudFJlZGlyZWN0KHVpbnQ2NF90IHBhZ2VJRCwgY29uc3QgU3RyaW5nJiBz b3VyY2VVUkxTdHJpbmcsIGNvbnN0IFN0cmluZyYgZGVzdGluYXRpb25VUkxTdHJpbmcsIHVpbnQ2 NF90IGZyYW1lSUQpCit7CisgICAgV2ViUGFnZVByb3h5KiBwYWdlID0gd2ViUGFnZShwYWdlSUQp OworICAgIGlmICghcGFnZSkKKyAgICAgICAgcmV0dXJuOworCisgICAgaWYgKHNvdXJjZVVSTFN0 cmluZy5pc0VtcHR5KCkgfHwgZGVzdGluYXRpb25VUkxTdHJpbmcuaXNFbXB0eSgpKQorICAgICAg ICByZXR1cm47CisgICAgCisgICAgV2ViRnJhbWVQcm94eSogZnJhbWUgPSB3ZWJGcmFtZShmcmFt ZUlEKTsKKyAgICBNRVNTQUdFX0NIRUNLKGZyYW1lKTsKKyAgICBNRVNTQUdFX0NIRUNLKGZyYW1l LT5wYWdlKCkgPT0gcGFnZSk7CisgICAgTUVTU0FHRV9DSEVDS19VUkwoc291cmNlVVJMU3RyaW5n KTsKKyAgICBNRVNTQUdFX0NIRUNLX1VSTChkZXN0aW5hdGlvblVSTFN0cmluZyk7CisKKyAgICBt X2NvbnRleHQtPmhpc3RvcnlDbGllbnQoKS5kaWRQZXJmb3JtQ2xpZW50UmVkaXJlY3QobV9jb250 ZXh0LmdldCgpLCBwYWdlLCBzb3VyY2VVUkxTdHJpbmcsIGRlc3RpbmF0aW9uVVJMU3RyaW5nLCBm cmFtZSk7Cit9CisKK3ZvaWQgV2ViUHJvY2Vzc1Byb3h5OjpkaWRQZXJmb3JtU2VydmVyUmVkaXJl Y3QodWludDY0X3QgcGFnZUlELCBjb25zdCBTdHJpbmcmIHNvdXJjZVVSTFN0cmluZywgY29uc3Qg U3RyaW5nJiBkZXN0aW5hdGlvblVSTFN0cmluZywgdWludDY0X3QgZnJhbWVJRCkKK3sKKyAgICBX ZWJQYWdlUHJveHkqIHBhZ2UgPSB3ZWJQYWdlKHBhZ2VJRCk7CisgICAgaWYgKCFwYWdlKQorICAg ICAgICByZXR1cm47CisgICAgCisgICAgaWYgKHNvdXJjZVVSTFN0cmluZy5pc0VtcHR5KCkgfHwg ZGVzdGluYXRpb25VUkxTdHJpbmcuaXNFbXB0eSgpKQorICAgICAgICByZXR1cm47CisgICAgCisg ICAgV2ViRnJhbWVQcm94eSogZnJhbWUgPSB3ZWJGcmFtZShmcmFtZUlEKTsKKyAgICBNRVNTQUdF X0NIRUNLKGZyYW1lKTsKKyAgICBNRVNTQUdFX0NIRUNLKGZyYW1lLT5wYWdlKCkgPT0gcGFnZSk7 CisgICAgTUVTU0FHRV9DSEVDS19VUkwoc291cmNlVVJMU3RyaW5nKTsKKyAgICBNRVNTQUdFX0NI RUNLX1VSTChkZXN0aW5hdGlvblVSTFN0cmluZyk7CisKKyAgICBtX2NvbnRleHQtPmhpc3RvcnlD bGllbnQoKS5kaWRQZXJmb3JtU2VydmVyUmVkaXJlY3QobV9jb250ZXh0LmdldCgpLCBwYWdlLCBz b3VyY2VVUkxTdHJpbmcsIGRlc3RpbmF0aW9uVVJMU3RyaW5nLCBmcmFtZSk7Cit9CisKK3ZvaWQg V2ViUHJvY2Vzc1Byb3h5OjpkaWRVcGRhdGVIaXN0b3J5VGl0bGUodWludDY0X3QgcGFnZUlELCBj b25zdCBTdHJpbmcmIHRpdGxlLCBjb25zdCBTdHJpbmcmIHVybCwgdWludDY0X3QgZnJhbWVJRCkK K3sKKyAgICBXZWJQYWdlUHJveHkqIHBhZ2UgPSB3ZWJQYWdlKHBhZ2VJRCk7CisgICAgaWYgKCFw YWdlKQorICAgICAgICByZXR1cm47CisKKyAgICBXZWJGcmFtZVByb3h5KiBmcmFtZSA9IHdlYkZy YW1lKGZyYW1lSUQpOworICAgIE1FU1NBR0VfQ0hFQ0soZnJhbWUpOworICAgIE1FU1NBR0VfQ0hF Q0soZnJhbWUtPnBhZ2UoKSA9PSBwYWdlKTsKKyAgICBNRVNTQUdFX0NIRUNLX1VSTCh1cmwpOwor CisgICAgbV9jb250ZXh0LT5oaXN0b3J5Q2xpZW50KCkuZGlkVXBkYXRlSGlzdG9yeVRpdGxlKG1f Y29udGV4dC5nZXQoKSwgcGFnZSwgdGl0bGUsIHVybCwgZnJhbWUpOworfQorCiB9IC8vIG5hbWVz cGFjZSBXZWJLaXQKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQcm9jZXNzUHJv eHkuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUHJvY2Vzc1By b3h5LmgJKHJldmlzaW9uIDEyNDQ5MykKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQ cm9jZXNzUHJveHkuaAkod29ya2luZyBjb3B5KQpAQCAtMTcwLDYgKzE3MCwxMiBAQCBwcml2YXRl OgogCiAgICAgdm9pZCBkaWRGaW5pc2hMYXVuY2hpbmcoQ29yZUlQQzo6Q29ubmVjdGlvbjo6SWRl bnRpZmllcik7CiAKKyAgICAvLyBIaXN0b3J5IGNsaWVudAorICAgIHZvaWQgZGlkTmF2aWdhdGVX aXRoTmF2aWdhdGlvbkRhdGEodWludDY0X3QgcGFnZUlELCBjb25zdCBXZWJOYXZpZ2F0aW9uRGF0 YVN0b3JlJiBzdG9yZSwgdWludDY0X3QgZnJhbWVJRCk7CisgICAgdm9pZCBkaWRQZXJmb3JtQ2xp ZW50UmVkaXJlY3QodWludDY0X3QgcGFnZUlELCBjb25zdCBTdHJpbmcmIHNvdXJjZVVSTFN0cmlu ZywgY29uc3QgU3RyaW5nJiBkZXN0aW5hdGlvblVSTFN0cmluZywgdWludDY0X3QgZnJhbWVJRCk7 CisgICAgdm9pZCBkaWRQZXJmb3JtU2VydmVyUmVkaXJlY3QodWludDY0X3QgcGFnZUlELCBjb25z dCBTdHJpbmcmIHNvdXJjZVVSTFN0cmluZywgY29uc3QgU3RyaW5nJiBkZXN0aW5hdGlvblVSTFN0 cmluZywgdWludDY0X3QgZnJhbWVJRCk7CisgICAgdm9pZCBkaWRVcGRhdGVIaXN0b3J5VGl0bGUo dWludDY0X3QgcGFnZUlELCBjb25zdCBTdHJpbmcmIHRpdGxlLCBjb25zdCBTdHJpbmcmIHVybCwg dWludDY0X3QgZnJhbWVJRCk7CisKICAgICAvLyBJbXBsZW1lbnRlZCBpbiBnZW5lcmF0ZWQgV2Vi UHJvY2Vzc1Byb3h5TWVzc2FnZVJlY2VpdmVyLmNwcAogICAgIHZvaWQgZGlkUmVjZWl2ZVdlYlBy b2Nlc3NQcm94eU1lc3NhZ2UoQ29yZUlQQzo6Q29ubmVjdGlvbiosIENvcmVJUEM6Ok1lc3NhZ2VJ RCwgQ29yZUlQQzo6QXJndW1lbnREZWNvZGVyKik7CiAgICAgdm9pZCBkaWRSZWNlaXZlU3luY1dl YlByb2Nlc3NQcm94eU1lc3NhZ2UoQ29yZUlQQzo6Q29ubmVjdGlvbiosIENvcmVJUEM6Ok1lc3Nh Z2VJRCwgQ29yZUlQQzo6QXJndW1lbnREZWNvZGVyKiBhcmd1bWVudHMsIE93blB0cjxDb3JlSVBD OjpBcmd1bWVudEVuY29kZXI+JiByZXBseSk7CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvV2ViUHJvY2Vzc1Byb3h5Lm1lc3NhZ2VzLmluCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9XZWJQcm9jZXNzUHJveHkubWVzc2FnZXMuaW4JKHJldmlzaW9uIDEyNDQ5 MykKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQcm9jZXNzUHJveHkubWVzc2FnZXMu aW4JKHdvcmtpbmcgY29weSkKQEAgLTIyLDYgKzIyLDEyIEBACiAKIG1lc3NhZ2VzIC0+IFdlYlBy b2Nlc3NQcm94eSB7CiAKKyAgICAjIEhpc3RvcnkgY2xpZW50IG1lc3NhZ2VzLgorICAgIERpZE5h dmlnYXRlV2l0aE5hdmlnYXRpb25EYXRhKHVpbnQ2NF90IHBhZ2VJRCwgV2ViS2l0OjpXZWJOYXZp Z2F0aW9uRGF0YVN0b3JlIHN0b3JlLCB1aW50NjRfdCBmcmFtZUlEKQorICAgIERpZFBlcmZvcm1D bGllbnRSZWRpcmVjdCh1aW50NjRfdCBwYWdlSUQsIFdURjo6U3RyaW5nIHNvdXJjZVVSTFN0cmlu ZywgV1RGOjpTdHJpbmcgZGVzdGluYXRpb25VUkxTdHJpbmcsIHVpbnQ2NF90IGZyYW1lSUQpCisg ICAgRGlkUGVyZm9ybVNlcnZlclJlZGlyZWN0KHVpbnQ2NF90IHBhZ2VJRCwgV1RGOjpTdHJpbmcg c291cmNlVVJMU3RyaW5nLCBXVEY6OlN0cmluZyBkZXN0aW5hdGlvblVSTFN0cmluZywgdWludDY0 X3QgZnJhbWVJRCkKKyAgICBEaWRVcGRhdGVIaXN0b3J5VGl0bGUodWludDY0X3QgcGFnZUlELCBX VEY6OlN0cmluZyB0aXRsZSwgV1RGOjpTdHJpbmcgdXJsLCB1aW50NjRfdCBmcmFtZUlEKQorCiAg ICAgQWRkQmFja0ZvcndhcmRJdGVtKHVpbnQ2NF90IGl0ZW1JRCwgV1RGOjpTdHJpbmcgb3JpZ2lu YWxVUkwsIFdURjo6U3RyaW5nIHVybCwgV1RGOjpTdHJpbmcgdGl0bGUsIENvcmVJUEM6OkRhdGFS ZWZlcmVuY2UgYmFja0ZvcndhcmREYXRhKQogICAgIERpZERlc3Ryb3lGcmFtZSh1aW50NjRfdCBm cmFtZUlEKSAKIApJbmRleDogU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9y dC9XZWJGcmFtZUxvYWRlckNsaWVudC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIv V2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5jcHAJKHJldmlz aW9uIDEyNDQ5MykKKysrIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQv V2ViRnJhbWVMb2FkZXJDbGllbnQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC05NDMsNyArOTQzLDcg QEAgdm9pZCBXZWJGcmFtZUxvYWRlckNsaWVudDo6dXBkYXRlR2xvYmFsSAogICAgIGRhdGEudGl0 bGUgPSBsb2FkZXItPnRpdGxlKCkuc3RyaW5nKCk7CiAgICAgZGF0YS5vcmlnaW5hbFJlcXVlc3Qg PSBsb2FkZXItPm9yaWdpbmFsUmVxdWVzdENvcHkoKTsKIAotICAgIFdlYlByb2Nlc3M6OnNoYXJl ZCgpLmNvbm5lY3Rpb24oKS0+c2VuZChNZXNzYWdlczo6V2ViQ29udGV4dDo6RGlkTmF2aWdhdGVX aXRoTmF2aWdhdGlvbkRhdGEod2ViUGFnZS0+cGFnZUlEKCksIGRhdGEsIG1fZnJhbWUtPmZyYW1l SUQoKSksIDApOworICAgIFdlYlByb2Nlc3M6OnNoYXJlZCgpLmNvbm5lY3Rpb24oKS0+c2VuZChN ZXNzYWdlczo6V2ViUHJvY2Vzc1Byb3h5OjpEaWROYXZpZ2F0ZVdpdGhOYXZpZ2F0aW9uRGF0YSh3 ZWJQYWdlLT5wYWdlSUQoKSwgZGF0YSwgbV9mcmFtZS0+ZnJhbWVJRCgpKSwgMCk7CiB9CiAKIHZv aWQgV2ViRnJhbWVMb2FkZXJDbGllbnQ6OnVwZGF0ZUdsb2JhbEhpc3RvcnlSZWRpcmVjdExpbmtz KCkKQEAgLTk1NywxMyArOTU3LDEzIEBAIHZvaWQgV2ViRnJhbWVMb2FkZXJDbGllbnQ6OnVwZGF0 ZUdsb2JhbEgKIAogICAgIC8vIENsaWVudCByZWRpcmVjdAogICAgIGlmICghbG9hZGVyLT5jbGll bnRSZWRpcmVjdFNvdXJjZUZvckhpc3RvcnkoKS5pc051bGwoKSkgewotICAgICAgICBXZWJQcm9j ZXNzOjpzaGFyZWQoKS5jb25uZWN0aW9uKCktPnNlbmQoTWVzc2FnZXM6OldlYkNvbnRleHQ6OkRp ZFBlcmZvcm1DbGllbnRSZWRpcmVjdCh3ZWJQYWdlLT5wYWdlSUQoKSwKKyAgICAgICAgV2ViUHJv Y2Vzczo6c2hhcmVkKCkuY29ubmVjdGlvbigpLT5zZW5kKE1lc3NhZ2VzOjpXZWJQcm9jZXNzUHJv eHk6OkRpZFBlcmZvcm1DbGllbnRSZWRpcmVjdCh3ZWJQYWdlLT5wYWdlSUQoKSwKICAgICAgICAg ICAgIGxvYWRlci0+Y2xpZW50UmVkaXJlY3RTb3VyY2VGb3JIaXN0b3J5KCksIGxvYWRlci0+Y2xp ZW50UmVkaXJlY3REZXN0aW5hdGlvbkZvckhpc3RvcnkoKSwgbV9mcmFtZS0+ZnJhbWVJRCgpKSwg MCk7CiAgICAgfQogCiAgICAgLy8gU2VydmVyIHJlZGlyZWN0CiAgICAgaWYgKCFsb2FkZXItPnNl cnZlclJlZGlyZWN0U291cmNlRm9ySGlzdG9yeSgpLmlzTnVsbCgpKSB7Ci0gICAgICAgIFdlYlBy b2Nlc3M6OnNoYXJlZCgpLmNvbm5lY3Rpb24oKS0+c2VuZChNZXNzYWdlczo6V2ViQ29udGV4dDo6 RGlkUGVyZm9ybVNlcnZlclJlZGlyZWN0KHdlYlBhZ2UtPnBhZ2VJRCgpLAorICAgICAgICBXZWJQ cm9jZXNzOjpzaGFyZWQoKS5jb25uZWN0aW9uKCktPnNlbmQoTWVzc2FnZXM6OldlYlByb2Nlc3NQ cm94eTo6RGlkUGVyZm9ybVNlcnZlclJlZGlyZWN0KHdlYlBhZ2UtPnBhZ2VJRCgpLAogICAgICAg ICAgICAgbG9hZGVyLT5zZXJ2ZXJSZWRpcmVjdFNvdXJjZUZvckhpc3RvcnkoKSwgbG9hZGVyLT5z ZXJ2ZXJSZWRpcmVjdERlc3RpbmF0aW9uRm9ySGlzdG9yeSgpLCBtX2ZyYW1lLT5mcmFtZUlEKCkp LCAwKTsKICAgICB9CiB9CkBAIC0xMTk0LDcgKzExOTQsNyBAQCB2b2lkIFdlYkZyYW1lTG9hZGVy Q2xpZW50OjpzZXRUaXRsZShjb25zCiAgICAgICAgIHJldHVybjsKIAogICAgIC8vIEZJWE1FOiB1 c2UgZGlyZWN0aW9uIG9mIHRpdGxlLgotICAgIFdlYlByb2Nlc3M6OnNoYXJlZCgpLmNvbm5lY3Rp b24oKS0+c2VuZChNZXNzYWdlczo6V2ViQ29udGV4dDo6RGlkVXBkYXRlSGlzdG9yeVRpdGxlKHdl YlBhZ2UtPnBhZ2VJRCgpLAorICAgIFdlYlByb2Nlc3M6OnNoYXJlZCgpLmNvbm5lY3Rpb24oKS0+ c2VuZChNZXNzYWdlczo6V2ViUHJvY2Vzc1Byb3h5OjpEaWRVcGRhdGVIaXN0b3J5VGl0bGUod2Vi UGFnZS0+cGFnZUlEKCksCiAgICAgICAgIHRpdGxlLnN0cmluZygpLCB1cmwuc3RyaW5nKCksIG1f ZnJhbWUtPmZyYW1lSUQoKSksIDApOwogfQogCg==