29734 2009-09-25 03:59:52 -0700 Enable Pasteboard::writePlainText for Chromium and fix code style nits 2009-09-25 08:48:11 -0700 1 1 1 Unclassified WebKit WebKit API 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 apavlov webkit-unassigned eric mitz pfeldman oldest_to_newest 149968 0 apavlov 2009-09-25 03:59:52 -0700 The associated patch shall uncomment the method body for the Chromium platform (introduced in https://bugs.webkit.org/show_bug.cgi?id=29634) now that the necessary Chromium repository change is in place, and fix some leftover style nits. 149990 1 40108 apavlov 2009-09-25 06:36:41 -0700 Created attachment 40108 patch 149999 2 40108 mitz 2009-09-25 07:09:22 -0700 Comment on attachment 40108 patch > - if (types == nil) { > + if (!types == nil) { This is wrong. I think you meant to change (types == nil) to (!types). 150005 3 40110 apavlov 2009-09-25 07:24:38 -0700 Created attachment 40110 patch (condition fixed) Apologies, I somehow failed to delete the rest of the condition. This is now fixed. 150022 4 pfeldman 2009-09-25 08:48:11 -0700 Committing to http://svn.webkit.org/repository/webkit/trunk ... M WebCore/ChangeLog M WebCore/platform/chromium/PasteboardChromium.cpp M WebCore/platform/gtk/PasteboardGtk.cpp M WebCore/platform/mac/PasteboardMac.mm M WebCore/platform/qt/PasteboardQt.cpp Committed r48755 40108 2009-09-25 06:36:41 -0700 2009-09-25 07:24:38 -0700 patch plaintextfix.patch text/plain 5739 apavlov SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0ODc1MikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjIgQEAKKzIwMDktMDktMjUgIEFsZXhhbmRlciBQYXZsb3YgIDxhcGF2bG92QGNo cm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBFbmFibGUgUGFzdGVib2FyZDo6d3JpdGVQbGFpblRleHQgZm9yIENocm9taXVtIGFuZCBm aXggY29kZSBzdHlsZSBuaXRzLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9Mjk3MzQKKworICAgICAgICAqIHBsYXRmb3JtL2Nocm9taXVtL1Bhc3RlYm9h cmRDaHJvbWl1bS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpQYXN0ZWJvYXJkOjp3cml0ZVBsYWlu VGV4dCk6CisgICAgICAgICogcGxhdGZvcm0vZ3RrL1Bhc3RlYm9hcmRHdGsuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6UGFzdGVib2FyZDo6d3JpdGVQbGFpblRleHQpOgorICAgICAgICAoV2ViQ29y ZTo6UGFzdGVib2FyZDo6d3JpdGVVUkwpOgorICAgICAgICAqIHBsYXRmb3JtL21hYy9QYXN0ZWJv YXJkTWFjLm1tOgorICAgICAgICAoV2ViQ29yZTo6UGFzdGVib2FyZDo6d3JpdGVTZWxlY3Rpb24p OgorICAgICAgICAoV2ViQ29yZTo6UGFzdGVib2FyZDo6d3JpdGVQbGFpblRleHQpOgorICAgICAg ICAoV2ViQ29yZTo6UGFzdGVib2FyZDo6d3JpdGVVUkwpOgorICAgICAgICAqIHBsYXRmb3JtL3F0 L1Bhc3RlYm9hcmRRdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpQYXN0ZWJvYXJkOjp3cml0ZVBs YWluVGV4dCk6CisKIDIwMDktMDktMjUgIFlvbmdqdW4gWmhhbmcgIDx5b25nanVuLnpoYW5nQG5v a2lhLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBBcml5YSBIaWRheWF0LgpJbmRleDogV2Vi Q29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9QYXN0ZWJvYXJkQ2hyb21pdW0uY3BwCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFdlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vUGFzdGVib2FyZENocm9taXVtLmNwcAkocmV2 aXNpb24gNDg3NTIpCisrKyBXZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL1Bhc3RlYm9hcmRDaHJv bWl1bS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTk4LDEzICs5OCwxMyBAQCB2b2lkIFBhc3RlYm9h cmQ6OndyaXRlU2VsZWN0aW9uKFJhbmdlKiBzCiAKIHZvaWQgUGFzdGVib2FyZDo6d3JpdGVQbGFp blRleHQoY29uc3QgU3RyaW5nJiB0ZXh0KQogewotICAgIFN0cmluZyBwbGFpblRleHQgPSB0ZXh0 OwotCiAjaWYgUExBVEZPUk0oV0lOX09TKQorICAgIFN0cmluZyBwbGFpblRleHQodGV4dCk7CiAg ICAgcmVwbGFjZU5ld2xpbmVzV2l0aFdpbmRvd3NTdHlsZU5ld2xpbmVzKHBsYWluVGV4dCk7Cisg ICAgQ2hyb21pdW1CcmlkZ2U6OmNsaXBib2FyZFdyaXRlUGxhaW5UZXh0KHBsYWluVGV4dCk7Cisj ZWxzZQorICAgIENocm9taXVtQnJpZGdlOjpjbGlwYm9hcmRXcml0ZVBsYWluVGV4dCh0ZXh0KTsK ICNlbmRpZgotICAgIC8vIEZJWE1FOiB1bmNvbW1lbnQgd2hlbiBDaHJvbWl1bSBDTCBodHRwOi8v Y29kZXJldmlldy5jaHJvbWl1bS5vcmcvMjExMDUyIGlzIGNsb3NlZC4KLSAgICAvL0Nocm9taXVt QnJpZGdlOjpjbGlwYm9hcmRXcml0ZVBsYWluVGV4dChwbGFpblRleHQpOwogfQogCiB2b2lkIFBh c3RlYm9hcmQ6OndyaXRlVVJMKGNvbnN0IEtVUkwmIHVybCwgY29uc3QgU3RyaW5nJiB0aXRsZVN0 ciwgRnJhbWUqIGZyYW1lKQpJbmRleDogV2ViQ29yZS9wbGF0Zm9ybS9ndGsvUGFzdGVib2FyZEd0 ay5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wbGF0Zm9ybS9ndGsvUGFzdGVib2FyZEd0ay5j cHAJKHJldmlzaW9uIDQ4NzUyKQorKysgV2ViQ29yZS9wbGF0Zm9ybS9ndGsvUGFzdGVib2FyZEd0 ay5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTExMCw4ICsxMTAsOSBAQCB2b2lkIFBhc3RlYm9hcmQ6 OndyaXRlU2VsZWN0aW9uKFJhbmdlKiBzCiAKIHZvaWQgUGFzdGVib2FyZDo6d3JpdGVQbGFpblRl eHQoY29uc3QgU3RyaW5nJiB0ZXh0KQogeworICAgIENTdHJpbmcgdXRmOCA9IHRleHQudXRmOCgp OwogICAgIEd0a0NsaXBib2FyZCogY2xpcGJvYXJkID0gZ3RrX2NsaXBib2FyZF9nZXRfZm9yX2Rp c3BsYXkoZ2RrX2Rpc3BsYXlfZ2V0X2RlZmF1bHQoKSwgR0RLX1NFTEVDVElPTl9DTElQQk9BUkQp OwotICAgIGd0a19jbGlwYm9hcmRfc2V0X3RleHQoY2xpcGJvYXJkLCB0ZXh0LnV0ZjgoKS5kYXRh KCksIHRleHQudXRmOCgpLmxlbmd0aCgpKTsKKyAgICBndGtfY2xpcGJvYXJkX3NldF90ZXh0KGNs aXBib2FyZCwgdXRmOC5kYXRhKCksIHV0ZjgubGVuZ3RoKCkpOwogfQogCiB2b2lkIFBhc3RlYm9h cmQ6OndyaXRlVVJMKGNvbnN0IEtVUkwmIHVybCwgY29uc3QgU3RyaW5nJiwgRnJhbWUqIGZyYW1l KQpAQCAtMTIxLDggKzEyMiw5IEBAIHZvaWQgUGFzdGVib2FyZDo6d3JpdGVVUkwoY29uc3QgS1VS TCYgdXIKIAogICAgIEd0a0NsaXBib2FyZCogY2xpcGJvYXJkID0gbV9oZWxwZXItPmdldENsaXBi b2FyZChmcmFtZSk7CiAgICAgR3RrQ2xpcGJvYXJkKiBwcmltYXJ5ID0gbV9oZWxwZXItPmdldFBy aW1hcnkoZnJhbWUpOwotICAgIGd0a19jbGlwYm9hcmRfc2V0X3RleHQoY2xpcGJvYXJkLCB1cmwu c3RyaW5nKCkudXRmOCgpLmRhdGEoKSwgdXJsLnN0cmluZygpLnV0ZjgoKS5sZW5ndGgoKSk7Ci0g ICAgZ3RrX2NsaXBib2FyZF9zZXRfdGV4dChwcmltYXJ5LCB1cmwuc3RyaW5nKCkudXRmOCgpLmRh dGEoKSwgdXJsLnN0cmluZygpLnV0ZjgoKS5sZW5ndGgoKSk7CisgICAgQ1N0cmluZyB1dGY4ID0g dXJsLnN0cmluZygpLnV0ZjgoKTsKKyAgICBndGtfY2xpcGJvYXJkX3NldF90ZXh0KGNsaXBib2Fy ZCwgdXRmOC5kYXRhKCksIHV0ZjgubGVuZ3RoKCkpOworICAgIGd0a19jbGlwYm9hcmRfc2V0X3Rl eHQocHJpbWFyeSwgdXRmOC5kYXRhKCksIHV0ZjgubGVuZ3RoKCkpOwogfQogCiB2b2lkIFBhc3Rl Ym9hcmQ6OndyaXRlSW1hZ2UoTm9kZSogbm9kZSwgY29uc3QgS1VSTCYsIGNvbnN0IFN0cmluZyYp CkluZGV4OiBXZWJDb3JlL3BsYXRmb3JtL21hYy9QYXN0ZWJvYXJkTWFjLm1tCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFdlYkNvcmUvcGxhdGZvcm0vbWFjL1Bhc3RlYm9hcmRNYWMubW0JKHJldmlzaW9uIDQ4NzUy KQorKysgV2ViQ29yZS9wbGF0Zm9ybS9tYWMvUGFzdGVib2FyZE1hYy5tbQkod29ya2luZyBjb3B5 KQpAQCAtMTM1LDggKzEzNSw4IEBAIHN0YXRpYyBOU0F0dHJpYnV0ZWRTdHJpbmcgKnN0cmlwQXR0 YWNobWUKIAogdm9pZCBQYXN0ZWJvYXJkOjp3cml0ZVNlbGVjdGlvbihOU1Bhc3RlYm9hcmQqIHBh c3RlYm9hcmQsIFJhbmdlKiBzZWxlY3RlZFJhbmdlLCBib29sIGNhblNtYXJ0Q29weU9yRGVsZXRl LCBGcmFtZSogZnJhbWUpCiB7Ci0gICAgaWYgKFdlYkFyY2hpdmVQYm9hcmRUeXBlID09IG5pbCkK LSAgICAgICAgUGFzdGVib2FyZDo6Z2VuZXJhbFBhc3RlYm9hcmQoKTsgLy9Jbml0aWFsaXNlcyBw YXN0ZWJvYXJkIHR5cGVzCisgICAgaWYgKCFXZWJBcmNoaXZlUGJvYXJkVHlwZSkKKyAgICAgICAg UGFzdGVib2FyZDo6Z2VuZXJhbFBhc3RlYm9hcmQoKTsgLy8gSW5pdGlhbGlzZXMgcGFzdGVib2Fy ZCB0eXBlcwogICAgIEFTU0VSVChzZWxlY3RlZFJhbmdlKTsKICAgICAKICAgICBOU0F0dHJpYnV0 ZWRTdHJpbmcgKmF0dHJpYnV0ZWRTdHJpbmcgPSBbW1tOU0F0dHJpYnV0ZWRTdHJpbmcgYWxsb2Nd IF9pbml0V2l0aERPTVJhbmdlOmtpdChzZWxlY3RlZFJhbmdlKV0gYXV0b3JlbGVhc2VdOwpAQCAt MjA1LDExICsyMDUsMTEgQEAgdm9pZCBQYXN0ZWJvYXJkOjp3cml0ZVNlbGVjdGlvbihSYW5nZSog cwogCiB2b2lkIFBhc3RlYm9hcmQ6OndyaXRlUGxhaW5UZXh0KGNvbnN0IFN0cmluZyYgdGV4dCkK IHsKLSAgICBpZiAoV2ViQXJjaGl2ZVBib2FyZFR5cGUgPT0gbmlsKQotICAgICAgICBQYXN0ZWJv YXJkOjpnZW5lcmFsUGFzdGVib2FyZCgpOyAvL0luaXRpYWxpc2VzIHBhc3RlYm9hcmQgdHlwZXMK KyAgICBpZiAoIVdlYkFyY2hpdmVQYm9hcmRUeXBlKQorICAgICAgICBQYXN0ZWJvYXJkOjpnZW5l cmFsUGFzdGVib2FyZCgpOyAvLyBJbml0aWFsaXNlcyBwYXN0ZWJvYXJkIHR5cGVzCiAKLSAgICBO U0FycmF5ICp0eXBlcyA9IFtOU0FycmF5IGFycmF5V2l0aE9iamVjdHM6TlNTdHJpbmdQYm9hcmRU eXBlLCBuaWxdOwotICAgIE5TUGFzdGVib2FyZCogcGFzdGVib2FyZCA9IG1fcGFzdGVib2FyZC5n ZXQoKTsKKyAgICBOU0FycmF5ICp0eXBlcyA9IFtOU0FycmF5IGFycmF5V2l0aE9iamVjdDpOU1N0 cmluZ1Bib2FyZFR5cGVdOworICAgIE5TUGFzdGVib2FyZCAqcGFzdGVib2FyZCA9IG1fcGFzdGVi b2FyZC5nZXQoKTsKICAgICBbcGFzdGVib2FyZCBkZWNsYXJlVHlwZXM6dHlwZXMgb3duZXI6bmls XTsKIAogICAgIFtwYXN0ZWJvYXJkIHNldFN0cmluZzp0ZXh0IGZvclR5cGU6TlNTdHJpbmdQYm9h cmRUeXBlXTsKQEAgLTIxNywxMCArMjE3LDEwIEBAIHZvaWQgUGFzdGVib2FyZDo6d3JpdGVQbGFp blRleHQoY29uc3QgU3QKIAogdm9pZCBQYXN0ZWJvYXJkOjp3cml0ZVVSTChOU1Bhc3RlYm9hcmQq IHBhc3RlYm9hcmQsIE5TQXJyYXkqIHR5cGVzLCBjb25zdCBLVVJMJiB1cmwsIGNvbnN0IFN0cmlu ZyYgdGl0bGVTdHIsIEZyYW1lKiBmcmFtZSkKIHsKLSAgICBpZiAoV2ViQXJjaGl2ZVBib2FyZFR5 cGUgPT0gbmlsKQotICAgICAgICBQYXN0ZWJvYXJkOjpnZW5lcmFsUGFzdGVib2FyZCgpOyAvL0lu aXRpYWxpc2VzIHBhc3RlYm9hcmQgdHlwZXMKKyAgICBpZiAoIVdlYkFyY2hpdmVQYm9hcmRUeXBl KQorICAgICAgICBQYXN0ZWJvYXJkOjpnZW5lcmFsUGFzdGVib2FyZCgpOyAvLyBJbml0aWFsaXNl cyBwYXN0ZWJvYXJkIHR5cGVzCiAgICAKLSAgICBpZiAodHlwZXMgPT0gbmlsKSB7CisgICAgaWYg KCF0eXBlcyA9PSBuaWwpIHsKICAgICAgICAgdHlwZXMgPSB3cml0YWJsZVR5cGVzRm9yVVJMKCk7 CiAgICAgICAgIFtwYXN0ZWJvYXJkIGRlY2xhcmVUeXBlczp0eXBlcyBvd25lcjpuaWxdOwogICAg IH0KSW5kZXg6IFdlYkNvcmUvcGxhdGZvcm0vcXQvUGFzdGVib2FyZFF0LmNwcAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBXZWJDb3JlL3BsYXRmb3JtL3F0L1Bhc3RlYm9hcmRRdC5jcHAJKHJldmlzaW9uIDQ4NzUy KQorKysgV2ViQ29yZS9wbGF0Zm9ybS9xdC9QYXN0ZWJvYXJkUXQuY3BwCSh3b3JraW5nIGNvcHkp CkBAIC0xMjEsNyArMTIxLDYgQEAgUGFzc1JlZlB0cjxEb2N1bWVudEZyYWdtZW50PiBQYXN0ZWJv YXJkOgogCiB2b2lkIFBhc3RlYm9hcmQ6OndyaXRlUGxhaW5UZXh0KGNvbnN0IFN0cmluZyYgdGV4 dCkKIHsKLQogI2lmbmRlZiBRVF9OT19DTElQQk9BUkQKICAgICBRTWltZURhdGEqIG1kID0gbmV3 IFFNaW1lRGF0YTsKICAgICBRU3RyaW5nIHF0ZXh0ID0gdGV4dDsK 40110 2009-09-25 07:24:38 -0700 2009-09-25 07:32:35 -0700 patch (condition fixed) plaintextfix.patch text/plain 5732 apavlov SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0ODc1MikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjIgQEAKKzIwMDktMDktMjUgIEFsZXhhbmRlciBQYXZsb3YgIDxhcGF2bG92QGNo cm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBFbmFibGUgUGFzdGVib2FyZDo6d3JpdGVQbGFpblRleHQgZm9yIENocm9taXVtIGFuZCBm aXggY29kZSBzdHlsZSBuaXRzLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9Mjk3MzQKKworICAgICAgICAqIHBsYXRmb3JtL2Nocm9taXVtL1Bhc3RlYm9h cmRDaHJvbWl1bS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpQYXN0ZWJvYXJkOjp3cml0ZVBsYWlu VGV4dCk6CisgICAgICAgICogcGxhdGZvcm0vZ3RrL1Bhc3RlYm9hcmRHdGsuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6UGFzdGVib2FyZDo6d3JpdGVQbGFpblRleHQpOgorICAgICAgICAoV2ViQ29y ZTo6UGFzdGVib2FyZDo6d3JpdGVVUkwpOgorICAgICAgICAqIHBsYXRmb3JtL21hYy9QYXN0ZWJv YXJkTWFjLm1tOgorICAgICAgICAoV2ViQ29yZTo6UGFzdGVib2FyZDo6d3JpdGVTZWxlY3Rpb24p OgorICAgICAgICAoV2ViQ29yZTo6UGFzdGVib2FyZDo6d3JpdGVQbGFpblRleHQpOgorICAgICAg ICAoV2ViQ29yZTo6UGFzdGVib2FyZDo6d3JpdGVVUkwpOgorICAgICAgICAqIHBsYXRmb3JtL3F0 L1Bhc3RlYm9hcmRRdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpQYXN0ZWJvYXJkOjp3cml0ZVBs YWluVGV4dCk6CisKIDIwMDktMDktMjUgIFlvbmdqdW4gWmhhbmcgIDx5b25nanVuLnpoYW5nQG5v a2lhLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBBcml5YSBIaWRheWF0LgpJbmRleDogV2Vi Q29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9QYXN0ZWJvYXJkQ2hyb21pdW0uY3BwCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFdlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vUGFzdGVib2FyZENocm9taXVtLmNwcAkocmV2 aXNpb24gNDg3NTIpCisrKyBXZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL1Bhc3RlYm9hcmRDaHJv bWl1bS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTk4LDEzICs5OCwxMyBAQCB2b2lkIFBhc3RlYm9h cmQ6OndyaXRlU2VsZWN0aW9uKFJhbmdlKiBzCiAKIHZvaWQgUGFzdGVib2FyZDo6d3JpdGVQbGFp blRleHQoY29uc3QgU3RyaW5nJiB0ZXh0KQogewotICAgIFN0cmluZyBwbGFpblRleHQgPSB0ZXh0 OwotCiAjaWYgUExBVEZPUk0oV0lOX09TKQorICAgIFN0cmluZyBwbGFpblRleHQodGV4dCk7CiAg ICAgcmVwbGFjZU5ld2xpbmVzV2l0aFdpbmRvd3NTdHlsZU5ld2xpbmVzKHBsYWluVGV4dCk7Cisg ICAgQ2hyb21pdW1CcmlkZ2U6OmNsaXBib2FyZFdyaXRlUGxhaW5UZXh0KHBsYWluVGV4dCk7Cisj ZWxzZQorICAgIENocm9taXVtQnJpZGdlOjpjbGlwYm9hcmRXcml0ZVBsYWluVGV4dCh0ZXh0KTsK ICNlbmRpZgotICAgIC8vIEZJWE1FOiB1bmNvbW1lbnQgd2hlbiBDaHJvbWl1bSBDTCBodHRwOi8v Y29kZXJldmlldy5jaHJvbWl1bS5vcmcvMjExMDUyIGlzIGNsb3NlZC4KLSAgICAvL0Nocm9taXVt QnJpZGdlOjpjbGlwYm9hcmRXcml0ZVBsYWluVGV4dChwbGFpblRleHQpOwogfQogCiB2b2lkIFBh c3RlYm9hcmQ6OndyaXRlVVJMKGNvbnN0IEtVUkwmIHVybCwgY29uc3QgU3RyaW5nJiB0aXRsZVN0 ciwgRnJhbWUqIGZyYW1lKQpJbmRleDogV2ViQ29yZS9wbGF0Zm9ybS9ndGsvUGFzdGVib2FyZEd0 ay5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wbGF0Zm9ybS9ndGsvUGFzdGVib2FyZEd0ay5j cHAJKHJldmlzaW9uIDQ4NzUyKQorKysgV2ViQ29yZS9wbGF0Zm9ybS9ndGsvUGFzdGVib2FyZEd0 ay5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTExMCw4ICsxMTAsOSBAQCB2b2lkIFBhc3RlYm9hcmQ6 OndyaXRlU2VsZWN0aW9uKFJhbmdlKiBzCiAKIHZvaWQgUGFzdGVib2FyZDo6d3JpdGVQbGFpblRl eHQoY29uc3QgU3RyaW5nJiB0ZXh0KQogeworICAgIENTdHJpbmcgdXRmOCA9IHRleHQudXRmOCgp OwogICAgIEd0a0NsaXBib2FyZCogY2xpcGJvYXJkID0gZ3RrX2NsaXBib2FyZF9nZXRfZm9yX2Rp c3BsYXkoZ2RrX2Rpc3BsYXlfZ2V0X2RlZmF1bHQoKSwgR0RLX1NFTEVDVElPTl9DTElQQk9BUkQp OwotICAgIGd0a19jbGlwYm9hcmRfc2V0X3RleHQoY2xpcGJvYXJkLCB0ZXh0LnV0ZjgoKS5kYXRh KCksIHRleHQudXRmOCgpLmxlbmd0aCgpKTsKKyAgICBndGtfY2xpcGJvYXJkX3NldF90ZXh0KGNs aXBib2FyZCwgdXRmOC5kYXRhKCksIHV0ZjgubGVuZ3RoKCkpOwogfQogCiB2b2lkIFBhc3RlYm9h cmQ6OndyaXRlVVJMKGNvbnN0IEtVUkwmIHVybCwgY29uc3QgU3RyaW5nJiwgRnJhbWUqIGZyYW1l KQpAQCAtMTIxLDggKzEyMiw5IEBAIHZvaWQgUGFzdGVib2FyZDo6d3JpdGVVUkwoY29uc3QgS1VS TCYgdXIKIAogICAgIEd0a0NsaXBib2FyZCogY2xpcGJvYXJkID0gbV9oZWxwZXItPmdldENsaXBi b2FyZChmcmFtZSk7CiAgICAgR3RrQ2xpcGJvYXJkKiBwcmltYXJ5ID0gbV9oZWxwZXItPmdldFBy aW1hcnkoZnJhbWUpOwotICAgIGd0a19jbGlwYm9hcmRfc2V0X3RleHQoY2xpcGJvYXJkLCB1cmwu c3RyaW5nKCkudXRmOCgpLmRhdGEoKSwgdXJsLnN0cmluZygpLnV0ZjgoKS5sZW5ndGgoKSk7Ci0g ICAgZ3RrX2NsaXBib2FyZF9zZXRfdGV4dChwcmltYXJ5LCB1cmwuc3RyaW5nKCkudXRmOCgpLmRh dGEoKSwgdXJsLnN0cmluZygpLnV0ZjgoKS5sZW5ndGgoKSk7CisgICAgQ1N0cmluZyB1dGY4ID0g dXJsLnN0cmluZygpLnV0ZjgoKTsKKyAgICBndGtfY2xpcGJvYXJkX3NldF90ZXh0KGNsaXBib2Fy ZCwgdXRmOC5kYXRhKCksIHV0ZjgubGVuZ3RoKCkpOworICAgIGd0a19jbGlwYm9hcmRfc2V0X3Rl eHQocHJpbWFyeSwgdXRmOC5kYXRhKCksIHV0ZjgubGVuZ3RoKCkpOwogfQogCiB2b2lkIFBhc3Rl Ym9hcmQ6OndyaXRlSW1hZ2UoTm9kZSogbm9kZSwgY29uc3QgS1VSTCYsIGNvbnN0IFN0cmluZyYp CkluZGV4OiBXZWJDb3JlL3BsYXRmb3JtL21hYy9QYXN0ZWJvYXJkTWFjLm1tCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFdlYkNvcmUvcGxhdGZvcm0vbWFjL1Bhc3RlYm9hcmRNYWMubW0JKHJldmlzaW9uIDQ4NzUy KQorKysgV2ViQ29yZS9wbGF0Zm9ybS9tYWMvUGFzdGVib2FyZE1hYy5tbQkod29ya2luZyBjb3B5 KQpAQCAtMTM1LDggKzEzNSw4IEBAIHN0YXRpYyBOU0F0dHJpYnV0ZWRTdHJpbmcgKnN0cmlwQXR0 YWNobWUKIAogdm9pZCBQYXN0ZWJvYXJkOjp3cml0ZVNlbGVjdGlvbihOU1Bhc3RlYm9hcmQqIHBh c3RlYm9hcmQsIFJhbmdlKiBzZWxlY3RlZFJhbmdlLCBib29sIGNhblNtYXJ0Q29weU9yRGVsZXRl LCBGcmFtZSogZnJhbWUpCiB7Ci0gICAgaWYgKFdlYkFyY2hpdmVQYm9hcmRUeXBlID09IG5pbCkK LSAgICAgICAgUGFzdGVib2FyZDo6Z2VuZXJhbFBhc3RlYm9hcmQoKTsgLy9Jbml0aWFsaXNlcyBw YXN0ZWJvYXJkIHR5cGVzCisgICAgaWYgKCFXZWJBcmNoaXZlUGJvYXJkVHlwZSkKKyAgICAgICAg UGFzdGVib2FyZDo6Z2VuZXJhbFBhc3RlYm9hcmQoKTsgLy8gSW5pdGlhbGlzZXMgcGFzdGVib2Fy ZCB0eXBlcwogICAgIEFTU0VSVChzZWxlY3RlZFJhbmdlKTsKICAgICAKICAgICBOU0F0dHJpYnV0 ZWRTdHJpbmcgKmF0dHJpYnV0ZWRTdHJpbmcgPSBbW1tOU0F0dHJpYnV0ZWRTdHJpbmcgYWxsb2Nd IF9pbml0V2l0aERPTVJhbmdlOmtpdChzZWxlY3RlZFJhbmdlKV0gYXV0b3JlbGVhc2VdOwpAQCAt MjA1LDExICsyMDUsMTEgQEAgdm9pZCBQYXN0ZWJvYXJkOjp3cml0ZVNlbGVjdGlvbihSYW5nZSog cwogCiB2b2lkIFBhc3RlYm9hcmQ6OndyaXRlUGxhaW5UZXh0KGNvbnN0IFN0cmluZyYgdGV4dCkK IHsKLSAgICBpZiAoV2ViQXJjaGl2ZVBib2FyZFR5cGUgPT0gbmlsKQotICAgICAgICBQYXN0ZWJv YXJkOjpnZW5lcmFsUGFzdGVib2FyZCgpOyAvL0luaXRpYWxpc2VzIHBhc3RlYm9hcmQgdHlwZXMK KyAgICBpZiAoIVdlYkFyY2hpdmVQYm9hcmRUeXBlKQorICAgICAgICBQYXN0ZWJvYXJkOjpnZW5l cmFsUGFzdGVib2FyZCgpOyAvLyBJbml0aWFsaXNlcyBwYXN0ZWJvYXJkIHR5cGVzCiAKLSAgICBO U0FycmF5ICp0eXBlcyA9IFtOU0FycmF5IGFycmF5V2l0aE9iamVjdHM6TlNTdHJpbmdQYm9hcmRU eXBlLCBuaWxdOwotICAgIE5TUGFzdGVib2FyZCogcGFzdGVib2FyZCA9IG1fcGFzdGVib2FyZC5n ZXQoKTsKKyAgICBOU0FycmF5ICp0eXBlcyA9IFtOU0FycmF5IGFycmF5V2l0aE9iamVjdDpOU1N0 cmluZ1Bib2FyZFR5cGVdOworICAgIE5TUGFzdGVib2FyZCAqcGFzdGVib2FyZCA9IG1fcGFzdGVi b2FyZC5nZXQoKTsKICAgICBbcGFzdGVib2FyZCBkZWNsYXJlVHlwZXM6dHlwZXMgb3duZXI6bmls XTsKIAogICAgIFtwYXN0ZWJvYXJkIHNldFN0cmluZzp0ZXh0IGZvclR5cGU6TlNTdHJpbmdQYm9h cmRUeXBlXTsKQEAgLTIxNywxMCArMjE3LDEwIEBAIHZvaWQgUGFzdGVib2FyZDo6d3JpdGVQbGFp blRleHQoY29uc3QgU3QKIAogdm9pZCBQYXN0ZWJvYXJkOjp3cml0ZVVSTChOU1Bhc3RlYm9hcmQq IHBhc3RlYm9hcmQsIE5TQXJyYXkqIHR5cGVzLCBjb25zdCBLVVJMJiB1cmwsIGNvbnN0IFN0cmlu ZyYgdGl0bGVTdHIsIEZyYW1lKiBmcmFtZSkKIHsKLSAgICBpZiAoV2ViQXJjaGl2ZVBib2FyZFR5 cGUgPT0gbmlsKQotICAgICAgICBQYXN0ZWJvYXJkOjpnZW5lcmFsUGFzdGVib2FyZCgpOyAvL0lu aXRpYWxpc2VzIHBhc3RlYm9hcmQgdHlwZXMKKyAgICBpZiAoIVdlYkFyY2hpdmVQYm9hcmRUeXBl KQorICAgICAgICBQYXN0ZWJvYXJkOjpnZW5lcmFsUGFzdGVib2FyZCgpOyAvLyBJbml0aWFsaXNl cyBwYXN0ZWJvYXJkIHR5cGVzCiAgICAKLSAgICBpZiAodHlwZXMgPT0gbmlsKSB7CisgICAgaWYg KCF0eXBlcykgewogICAgICAgICB0eXBlcyA9IHdyaXRhYmxlVHlwZXNGb3JVUkwoKTsKICAgICAg ICAgW3Bhc3RlYm9hcmQgZGVjbGFyZVR5cGVzOnR5cGVzIG93bmVyOm5pbF07CiAgICAgfQpJbmRl eDogV2ViQ29yZS9wbGF0Zm9ybS9xdC9QYXN0ZWJvYXJkUXQuY3BwCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdl YkNvcmUvcGxhdGZvcm0vcXQvUGFzdGVib2FyZFF0LmNwcAkocmV2aXNpb24gNDg3NTIpCisrKyBX ZWJDb3JlL3BsYXRmb3JtL3F0L1Bhc3RlYm9hcmRRdC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEy MSw3ICsxMjEsNiBAQCBQYXNzUmVmUHRyPERvY3VtZW50RnJhZ21lbnQ+IFBhc3RlYm9hcmQ6CiAK IHZvaWQgUGFzdGVib2FyZDo6d3JpdGVQbGFpblRleHQoY29uc3QgU3RyaW5nJiB0ZXh0KQogewot CiAjaWZuZGVmIFFUX05PX0NMSVBCT0FSRAogICAgIFFNaW1lRGF0YSogbWQgPSBuZXcgUU1pbWVE YXRhOwogICAgIFFTdHJpbmcgcXRleHQgPSB0ZXh0Owo=