84417 2012-04-19 20:27:27 -0700 [Chromium] Remove PlatformSupport::loadPlatformImageResource, call loadResource directly 2012-05-09 15:05:51 -0700 1 1 1 Unclassified WebKit WebKit Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 82948 1 pilgrim pilgrim abarth cc-bugs fishd haraken jamesr webkit.review.bot oldest_to_newest 606323 0 pilgrim 2012-04-19 20:27:27 -0700 [Chromium] Remove PlatformSupport::loadPlatformImageResource, call loadResource directly 606324 1 138035 pilgrim 2012-04-19 20:28:04 -0700 Created attachment 138035 Patch 606326 2 pilgrim 2012-04-19 20:29:09 -0700 Duplicates some code between ImageChromium.cpp and ImageChromiumMac.mm. Problem? 606439 3 138035 haraken 2012-04-20 01:16:57 -0700 Comment on attachment 138035 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=138035&action=review > Duplicates some code between ImageChromium.cpp and ImageChromiumMac.mm. Problem? Yeah, we want to avoid duplication. > Source/WebCore/platform/graphics/chromium/ImageChromiumMac.mm:41 > +#include <public/Platform.h> Nit: This header is duplicated. 619473 4 140943 pilgrim 2012-05-09 07:44:58 -0700 Created attachment 140943 Patch 619475 5 pilgrim 2012-05-09 07:46:04 -0700 After discussion with abarth, this new patch removes ImageChromiumMac.mm and all references in build scripts, thus eliminating the duplicate code problem. 619547 6 140943 abarth 2012-05-09 09:08:27 -0700 Comment on attachment 140943 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=140943&action=review > Source/WebCore/platform/graphics/chromium/ImageChromium.cpp:51 > + return image; image.release(); ^^ Transfers the reference from the RefPtr to the PassRefPtr, saving an increment and a decrement on the refcount. 619707 7 140988 pilgrim 2012-05-09 11:57:52 -0700 Created attachment 140988 Patch 619708 8 pilgrim 2012-05-09 11:58:22 -0700 (In reply to comment #6) > (From update of attachment 140943 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=140943&action=review > > > Source/WebCore/platform/graphics/chromium/ImageChromium.cpp:51 > > + return image; > > image.release(); > ^^ Transfers the reference from the RefPtr to the PassRefPtr, saving an increment and a decrement on the refcount. Included in latest patch. 619887 9 140988 webkit.review.bot 2012-05-09 15:05:45 -0700 Comment on attachment 140988 Patch Clearing flags on attachment: 140988 Committed r116561: <http://trac.webkit.org/changeset/116561> 619889 10 webkit.review.bot 2012-05-09 15:05:51 -0700 All reviewed patches have been landed. Closing bug. 138035 2012-04-19 20:28:04 -0700 2012-05-09 07:44:54 -0700 Patch bug-84417-20120419232748.patch text/plain 5238 pilgrim SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDExNDcxMykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE5IEBACisyMDEyLTA0LTE5ICBNYXJrIFBp bGdyaW0gIDxwaWxncmltQGNocm9taXVtLm9yZz4KKworICAgICAgICBbQ2hyb21pdW1dIFJlbW92 ZSBQbGF0Zm9ybVN1cHBvcnQ6OmxvYWRQbGF0Zm9ybUltYWdlUmVzb3VyY2UsIGNhbGwgbG9hZFJl c291cmNlIGRpcmVjdGx5CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD04NDQxNworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIFBhcnQgb2YgYSByZWZhY3RvcmluZyBzZXJpZXMuIFNlZSB0cmFja2luZyBidWcgODI5 NDguCisKKyAgICAgICAgKiBwbGF0Zm9ybS9jaHJvbWl1bS9QbGF0Zm9ybVN1cHBvcnQuaDoKKyAg ICAgICAgKFBsYXRmb3JtU3VwcG9ydCk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2hy b21pdW0vSW1hZ2VDaHJvbWl1bS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJbWFnZTo6bG9hZFBs YXRmb3JtUmVzb3VyY2UpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0lt YWdlQ2hyb21pdW1NYWMubW06CisgICAgICAgIChXZWJDb3JlOjpJbWFnZTo6bG9hZFBsYXRmb3Jt UmVzb3VyY2UpOgorCiAyMDEyLTA0LTE5ICBTaGVyaWZmIEJvdCAgPHdlYmtpdC5yZXZpZXcuYm90 QGdtYWlsLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkLCByb2xsaW5nIG91dCByMTE0NzExLgpJ bmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vUGxhdGZvcm1TdXBwb3J0LmgK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vUGxhdGZvcm1T dXBwb3J0LmgJKHJldmlzaW9uIDExNDcxMykKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2No cm9taXVtL1BsYXRmb3JtU3VwcG9ydC5oCSh3b3JraW5nIGNvcHkpCkBAIC0yMTYsOCArMjE2LDYg QEAgcHVibGljOgogICAgIHN0YXRpYyBib29sIHBvcHVwc0FsbG93ZWQoTlBQKTsKIAogICAgIC8v IFJlc291cmNlcyAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tCi0gICAgc3RhdGljIFBhc3NSZWZQdHI8SW1hZ2U+IGxvYWRQbGF0Zm9ybUlt YWdlUmVzb3VyY2UoY29uc3QgY2hhciogbmFtZSk7Ci0KICNpZiBFTkFCTEUoV0VCX0FVRElPKQog ICAgIHN0YXRpYyBQYXNzT3duUHRyPEF1ZGlvQnVzPiBsb2FkUGxhdGZvcm1BdWRpb1Jlc291cmNl KGNvbnN0IGNoYXIqIG5hbWUsIGRvdWJsZSBzYW1wbGVSYXRlKTsKICAgICBzdGF0aWMgUGFzc093 blB0cjxBdWRpb0J1cz4gZGVjb2RlQXVkaW9GaWxlRGF0YShjb25zdCBjaGFyKiBkYXRhLCBzaXpl X3QsIGRvdWJsZSBzYW1wbGVSYXRlKTsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL2Nocm9taXVtL0ltYWdlQ2hyb21pdW0uY3BwCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0ltYWdlQ2hyb21pdW0uY3BwCShyZXZp c2lvbiAxMTQ3MTMpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1 bS9JbWFnZUNocm9taXVtLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjksOSArMjksMTIgQEAKICAq LwogCiAjaW5jbHVkZSAiY29uZmlnLmgiCisjaW5jbHVkZSAiQml0bWFwSW1hZ2UuaCIKICNpbmNs dWRlICJJbWFnZS5oIgorI2luY2x1ZGUgIlNoYXJlZEJ1ZmZlci5oIgogCi0jaW5jbHVkZSAiUGxh dGZvcm1TdXBwb3J0LmgiCisjaW5jbHVkZSA8cHVibGljL1BsYXRmb3JtLmg+CisjaW5jbHVkZSA8 cHVibGljL1dlYkRhdGEuaD4KIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCkBAIC0zOSw3ICs0Miwx MyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKIFBhc3NSZWZQdHI8SW1hZ2U+IEltYWdlOjpsb2Fk UGxhdGZvcm1SZXNvdXJjZShjb25zdCBjaGFyICpuYW1lKQogewotICAgIHJldHVybiBQbGF0Zm9y bVN1cHBvcnQ6OmxvYWRQbGF0Zm9ybUltYWdlUmVzb3VyY2UobmFtZSk7CisgICAgY29uc3QgV2Vi S2l0OjpXZWJEYXRhJiByZXNvdXJjZSA9IFdlYktpdDo6UGxhdGZvcm06OmN1cnJlbnQoKS0+bG9h ZFJlc291cmNlKG5hbWUpOworICAgIGlmIChyZXNvdXJjZS5pc0VtcHR5KCkpCisgICAgICAgIHJl dHVybiBJbWFnZTo6bnVsbEltYWdlKCk7CisKKyAgICBSZWZQdHI8SW1hZ2U+IGltYWdlID0gQml0 bWFwSW1hZ2U6OmNyZWF0ZSgpOworICAgIGltYWdlLT5zZXREYXRhKHJlc291cmNlLCB0cnVlKTsK KyAgICByZXR1cm4gaW1hZ2U7CiB9CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKSW5kZXg6IFNv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0ltYWdlQ2hyb21pdW1NYWMu bW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21p dW0vSW1hZ2VDaHJvbWl1bU1hYy5tbQkocmV2aXNpb24gMTE0NzEzKQorKysgU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vSW1hZ2VDaHJvbWl1bU1hYy5tbQkod29ya2lu ZyBjb3B5KQpAQCAtMzIsMTUgKzMyLDI1IEBACiAKICNpbmNsdWRlICJjb25maWcuaCIKICNpbmNs dWRlICJCaXRtYXBJbWFnZS5oIgotCiAjaW5jbHVkZSAiSW1hZ2UuaCIKLSNpbmNsdWRlICJQbGF0 Zm9ybVN1cHBvcnQuaCIKKyNpbmNsdWRlICJTaGFyZWRCdWZmZXIuaCIKKworI2luY2x1ZGUgPHB1 YmxpYy9QbGF0Zm9ybS5oPgorI2luY2x1ZGUgPHB1YmxpYy9XZWJEYXRhLmg+CisKKyNpbmNsdWRl IDxwdWJsaWMvUGxhdGZvcm0uaD4KIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCiBQYXNzUmVmUHRy PEltYWdlPiBJbWFnZTo6bG9hZFBsYXRmb3JtUmVzb3VyY2UoY29uc3QgY2hhciogbmFtZSkKIHsK LSAgICByZXR1cm4gUGxhdGZvcm1TdXBwb3J0Ojpsb2FkUGxhdGZvcm1JbWFnZVJlc291cmNlKG5h bWUpOworICAgIGNvbnN0IFdlYktpdDo6V2ViRGF0YSYgcmVzb3VyY2UgPSBXZWJLaXQ6OlBsYXRm b3JtOjpjdXJyZW50KCktPmxvYWRSZXNvdXJjZShuYW1lKTsKKyAgICBpZiAocmVzb3VyY2UuaXNF bXB0eSgpKQorICAgICAgICByZXR1cm4gSW1hZ2U6Om51bGxJbWFnZSgpOworCisgICAgUmVmUHRy PEltYWdlPiBpbWFnZSA9IEJpdG1hcEltYWdlOjpjcmVhdGUoKTsKKyAgICBpbWFnZS0+c2V0RGF0 YShyZXNvdXJjZSwgdHJ1ZSk7CisgICAgcmV0dXJuIGltYWdlOwogfQogCiAvLyBGSVhNRTogVGhl c2UgYXJlIHRlbXBvcmFyeSBzdHVicywgd2UgbmVlZCByZWFsIGltcGxlbWVudGF0aW9ucyB3aGlj aApJbmRleDogU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cJKHJldmlzaW9uIDExNDcxMykKKysrIFNv dXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEs MTUgQEAKKzIwMTItMDQtMTkgIE1hcmsgUGlsZ3JpbSAgPHBpbGdyaW1AY2hyb21pdW0ub3JnPgor CisgICAgICAgIFtDaHJvbWl1bV0gUmVtb3ZlIFBsYXRmb3JtU3VwcG9ydDo6bG9hZFBsYXRmb3Jt SW1hZ2VSZXNvdXJjZSwgY2FsbCBsb2FkUmVzb3VyY2UgZGlyZWN0bHkKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg0NDE3CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUGFydCBvZiBhIHJlZmFjdG9yaW5nIHNl cmllcy4gU2VlIHRyYWNraW5nIGJ1ZyA4Mjk0OC4KKworICAgICAgICAqIHNyYy9QbGF0Zm9ybVN1 cHBvcnQuY3BwOgorICAgICAgICAoV2ViQ29yZSk6CisKIDIwMTItMDQtMTkgIEpvc2h1YSBCZWxs ICA8anNiZWxsQGNocm9taXVtLm9yZz4KIAogICAgICAgICBbQ2hyb21pdW1dIEluZGV4ZWREQjog UHJlcCBmb3IgY2hhbmdpbmcga2V5UGF0aCByZXR1cm4gdHlwZQpJbmRleDogU291cmNlL1dlYktp dC9jaHJvbWl1bS9zcmMvUGxhdGZvcm1TdXBwb3J0LmNwcAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViS2l0L2Nocm9taXVtL3NyYy9QbGF0Zm9ybVN1cHBvcnQuY3BwCShyZXZpc2lvbiAxMTQ3MTMp CisrKyBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9QbGF0Zm9ybVN1cHBvcnQuY3BwCSh3b3Jr aW5nIGNvcHkpCkBAIC01NzIsMTcgKzU3Miw2IEBAIE5QT2JqZWN0KiBQbGF0Zm9ybVN1cHBvcnQ6 OnBsdWdpblNjcmlwdGEKIAogLy8gUmVzb3VyY2VzIC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogCi1QYXNzUmVmUHRyPElt YWdlPiBQbGF0Zm9ybVN1cHBvcnQ6OmxvYWRQbGF0Zm9ybUltYWdlUmVzb3VyY2UoY29uc3QgY2hh ciogbmFtZSkKLXsKLSAgICBjb25zdCBXZWJEYXRhJiByZXNvdXJjZSA9IHdlYktpdFBsYXRmb3Jt U3VwcG9ydCgpLT5sb2FkUmVzb3VyY2UobmFtZSk7Ci0gICAgaWYgKHJlc291cmNlLmlzRW1wdHko KSkKLSAgICAgICAgcmV0dXJuIEltYWdlOjpudWxsSW1hZ2UoKTsKLQotICAgIFJlZlB0cjxJbWFn ZT4gaW1hZ2UgPSBCaXRtYXBJbWFnZTo6Y3JlYXRlKCk7Ci0gICAgaW1hZ2UtPnNldERhdGEocmVz b3VyY2UsIHRydWUpOwotICAgIHJldHVybiBpbWFnZTsKLX0KLQogI2lmIEVOQUJMRShXRUJfQVVE SU8pCiAKIFBhc3NPd25QdHI8QXVkaW9CdXM+IFBsYXRmb3JtU3VwcG9ydDo6bG9hZFBsYXRmb3Jt QXVkaW9SZXNvdXJjZShjb25zdCBjaGFyKiBuYW1lLCBkb3VibGUgc2FtcGxlUmF0ZSkK 140943 2012-05-09 07:44:58 -0700 2012-05-09 11:57:45 -0700 Patch bug-84417-20120509104456.patch text/plain 8141 pilgrim SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDExNjUyMykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIwIEBACisyMDEyLTA1LTA5ICBNYXJrIFBp bGdyaW0gIDxwaWxncmltQGNocm9taXVtLm9yZz4KKworICAgICAgICBbQ2hyb21pdW1dIFJlbW92 ZSBQbGF0Zm9ybVN1cHBvcnQ6OmxvYWRQbGF0Zm9ybUltYWdlUmVzb3VyY2UsIGNhbGwgbG9hZFJl c291cmNlIGRpcmVjdGx5CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD04NDQxNworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIFBhcnQgb2YgYSByZWZhY3RvcmluZyBzZXJpZXMuIFNlZSB0cmFja2luZyBidWcgODI5 NDguCisKKyAgICAgICAgKiBXZWJDb3JlLmd5cC9XZWJDb3JlLmd5cDoKKyAgICAgICAgKiBXZWJD b3JlLmd5cGk6CisgICAgICAgICogcGxhdGZvcm0vY2hyb21pdW0vUGxhdGZvcm1TdXBwb3J0Lmg6 CisgICAgICAgIChQbGF0Zm9ybVN1cHBvcnQpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNz L2Nocm9taXVtL0ltYWdlQ2hyb21pdW0uY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW1hZ2U6Omxv YWRQbGF0Zm9ybVJlc291cmNlKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1 bS9JbWFnZUNocm9taXVtTWFjLm1tOiBSZW1vdmVkLgorCiAyMDEyLTA1LTA5ICBUYWthc2hpIFNh a2Ftb3RvICA8dGFzYWtAZ29vZ2xlLmNvbT4KIAogICAgICAgICBTaGFkb3dSb290IG5lZWRzIGFw cGx5QXV0aG9yU3R5bGVzCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmd5cGkKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYkNvcmUvV2ViQ29yZS5neXBpCShyZXZpc2lvbiAxMTY1MjIpCisr KyBTb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmd5cGkJKHdvcmtpbmcgY29weSkKQEAgLTM1NzAsNyAr MzU3MCw2IEBACiAgICAgICAgICAgICAncGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vSWNvbkNo cm9taXVtQW5kcm9pZC5jcHAnLAogICAgICAgICAgICAgJ3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9t aXVtL0ltYWdlQnVmZmVyRGF0YVNraWEuaCcsCiAgICAgICAgICAgICAncGxhdGZvcm0vZ3JhcGhp Y3MvY2hyb21pdW0vSW1hZ2VDaHJvbWl1bS5jcHAnLAotICAgICAgICAgICAgJ3BsYXRmb3JtL2dy YXBoaWNzL2Nocm9taXVtL0ltYWdlQ2hyb21pdW1NYWMubW0nLAogICAgICAgICAgICAgJ3BsYXRm b3JtL2dyYXBoaWNzL2Nocm9taXVtL0ltYWdlTGF5ZXJDaHJvbWl1bS5jcHAnLAogICAgICAgICAg ICAgJ3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0ltYWdlTGF5ZXJDaHJvbWl1bS5oJywKICAg ICAgICAgICAgICdwbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9MYXllckNocm9taXVtLmNwcCcs CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmd5cC9XZWJDb3JlLmd5cAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmd5cC9XZWJDb3JlLmd5cAkocmV2aXNpb24gMTE2 NTIyKQorKysgU291cmNlL1dlYkNvcmUvV2ViQ29yZS5neXAvV2ViQ29yZS5neXAJKHdvcmtpbmcg Y29weSkKQEAgLTE2NTQsNyArMTY1NCw2IEBACiAgICAgICAgICAgICBbJ2luY2x1ZGUnLCAncGxh dGZvcm0vZ3JhcGhpY3MvY2cvSW50UG9pbnRDR1xcLmNwcCQnXSwKICAgICAgICAgICAgIFsnaW5j bHVkZScsICdwbGF0Zm9ybS9ncmFwaGljcy9jZy9JbnRSZWN0Q0dcXC5jcHAkJ10sCiAgICAgICAg ICAgICBbJ2luY2x1ZGUnLCAncGxhdGZvcm0vZ3JhcGhpY3MvY2cvSW50U2l6ZUNHXFwuY3BwJCdd LAotICAgICAgICAgICAgWydleGNsdWRlJywgJ3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0lt YWdlQ2hyb21pdW1NYWNcXC5tbSQnXSwKICAgICAgICAgICAgIFsnZXhjbHVkZScsICdwbGF0Zm9y bS9ncmFwaGljcy9tYWMvRm9udE1hY1xcLm1tJCddLAogICAgICAgICAgICAgWydleGNsdWRlJywg J3BsYXRmb3JtL2dyYXBoaWNzL3NraWEvRm9udENhY2hlU2tpYVxcLmNwcCQnXSwKICAgICAgICAg ICAgIFsnZXhjbHVkZScsICdwbGF0Zm9ybS9ncmFwaGljcy9za2lhL0dseXBoUGFnZVRyZWVOb2Rl U2tpYVxcLmNwcCQnXSwKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL1Bs YXRmb3JtU3VwcG9ydC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2No cm9taXVtL1BsYXRmb3JtU3VwcG9ydC5oCShyZXZpc2lvbiAxMTY1MjIpCisrKyBTb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9QbGF0Zm9ybVN1cHBvcnQuaAkod29ya2luZyBjb3B5KQpA QCAtMTk2LDggKzE5Niw2IEBAIHB1YmxpYzoKICAgICBzdGF0aWMgYm9vbCBwb3B1cHNBbGxvd2Vk KE5QUCk7CiAKICAgICAvLyBSZXNvdXJjZXMgLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQotICAgIHN0YXRpYyBQYXNzUmVmUHRyPEltYWdl PiBsb2FkUGxhdGZvcm1JbWFnZVJlc291cmNlKGNvbnN0IGNoYXIqIG5hbWUpOwotCiAjaWYgRU5B QkxFKFdFQl9BVURJTykKICAgICBzdGF0aWMgUGFzc093blB0cjxBdWRpb0J1cz4gZGVjb2RlQXVk aW9GaWxlRGF0YShjb25zdCBjaGFyKiBkYXRhLCBzaXplX3QsIGRvdWJsZSBzYW1wbGVSYXRlKTsK ICNlbmRpZgpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0v SW1hZ2VDaHJvbWl1bS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvY2hyb21pdW0vSW1hZ2VDaHJvbWl1bS5jcHAJKHJldmlzaW9uIDExNjUyMikKKysr IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0ltYWdlQ2hyb21pdW0u Y3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yOSw5ICsyOSwxMiBAQAogICovCiAKICNpbmNsdWRlICJj b25maWcuaCIKKyNpbmNsdWRlICJCaXRtYXBJbWFnZS5oIgogI2luY2x1ZGUgIkltYWdlLmgiCisj aW5jbHVkZSAiU2hhcmVkQnVmZmVyLmgiCiAKLSNpbmNsdWRlICJQbGF0Zm9ybVN1cHBvcnQuaCIK KyNpbmNsdWRlIDxwdWJsaWMvUGxhdGZvcm0uaD4KKyNpbmNsdWRlIDxwdWJsaWMvV2ViRGF0YS5o PgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKQEAgLTM5LDcgKzQyLDEzIEBAIG5hbWVzcGFjZSBX ZWJDb3JlIHsKIAogUGFzc1JlZlB0cjxJbWFnZT4gSW1hZ2U6OmxvYWRQbGF0Zm9ybVJlc291cmNl KGNvbnN0IGNoYXIgKm5hbWUpCiB7Ci0gICAgcmV0dXJuIFBsYXRmb3JtU3VwcG9ydDo6bG9hZFBs YXRmb3JtSW1hZ2VSZXNvdXJjZShuYW1lKTsKKyAgICBjb25zdCBXZWJLaXQ6OldlYkRhdGEmIHJl c291cmNlID0gV2ViS2l0OjpQbGF0Zm9ybTo6Y3VycmVudCgpLT5sb2FkUmVzb3VyY2UobmFtZSk7 CisgICAgaWYgKHJlc291cmNlLmlzRW1wdHkoKSkKKyAgICAgICAgcmV0dXJuIEltYWdlOjpudWxs SW1hZ2UoKTsKKworICAgIFJlZlB0cjxJbWFnZT4gaW1hZ2UgPSBCaXRtYXBJbWFnZTo6Y3JlYXRl KCk7CisgICAgaW1hZ2UtPnNldERhdGEocmVzb3VyY2UsIHRydWUpOworICAgIHJldHVybiBpbWFn ZTsKIH0KIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpJbmRleDogU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vSW1hZ2VDaHJvbWl1bU1hYy5tbQo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9JbWFnZUNocm9taXVt TWFjLm1tCShyZXZpc2lvbiAxMTY1MjIpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9jaHJvbWl1bS9JbWFnZUNocm9taXVtTWFjLm1tCSh3b3JraW5nIGNvcHkpCkBAIC0xLDU4 ICswLDAgQEAKLS8qCi0gKiBDb3B5cmlnaHQgKGMpIDIwMDgsIDIwMDksIEdvb2dsZSBJbmMuIEFs bCByaWdodHMgcmVzZXJ2ZWQuCi0gKiAKLSAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291 cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAotICogbW9kaWZpY2F0aW9uLCBh cmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zIGFyZQot ICogbWV0OgotICogCi0gKiAgICAgKiBSZWRpc3RyaWJ1dGlvbnMgb2Ygc291cmNlIGNvZGUgbXVz dCByZXRhaW4gdGhlIGFib3ZlIGNvcHlyaWdodAotICogbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29u ZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyLgotICogICAgICogUmVkaXN0cmli dXRpb25zIGluIGJpbmFyeSBmb3JtIG11c3QgcmVwcm9kdWNlIHRoZSBhYm92ZQotICogY29weXJp Z2h0IG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlz Y2xhaW1lcgotICogaW4gdGhlIGRvY3VtZW50YXRpb24gYW5kL29yIG90aGVyIG1hdGVyaWFscyBw cm92aWRlZCB3aXRoIHRoZQotICogZGlzdHJpYnV0aW9uLgotICogICAgICogTmVpdGhlciB0aGUg bmFtZSBvZiBHb29nbGUgSW5jLiBub3IgdGhlIG5hbWVzIG9mIGl0cwotICogY29udHJpYnV0b3Jz IG1heSBiZSB1c2VkIHRvIGVuZG9yc2Ugb3IgcHJvbW90ZSBwcm9kdWN0cyBkZXJpdmVkIGZyb20K LSAqIHRoaXMgc29mdHdhcmUgd2l0aG91dCBzcGVjaWZpYyBwcmlvciB3cml0dGVuIHBlcm1pc3Np b24uCi0gKiAKLSAqIFRISVMgU09GVFdBUkUgSVMgUFJPVklERUQgQlkgVEhFIENPUFlSSUdIVCBI T0xERVJTIEFORCBDT05UUklCVVRPUlMKLSAqICJBUyBJUyIgQU5EIEFOWSBFWFBSRVNTIE9SIElN UExJRUQgV0FSUkFOVElFUywgSU5DTFVESU5HLCBCVVQgTk9UCi0gKiBMSU1JVEVEIFRPLCBUSEUg SU1QTElFRCBXQVJSQU5USUVTIE9GIE1FUkNIQU5UQUJJTElUWSBBTkQgRklUTkVTUyBGT1IKLSAq IEEgUEFSVElDVUxBUiBQVVJQT1NFIEFSRSBESVNDTEFJTUVELiBJTiBOTyBFVkVOVCBTSEFMTCBU SEUgQ09QWVJJR0hUCi0gKiBPV05FUiBPUiBDT05UUklCVVRPUlMgQkUgTElBQkxFIEZPUiBBTlkg RElSRUNULCBJTkRJUkVDVCwgSU5DSURFTlRBTCwKLSAqIFNQRUNJQUwsIEVYRU1QTEFSWSwgT1Ig Q09OU0VRVUVOVElBTCBEQU1BR0VTIChJTkNMVURJTkcsIEJVVCBOT1QKLSAqIExJTUlURUQgVE8s IFBST0NVUkVNRU5UIE9GIFNVQlNUSVRVVEUgR09PRFMgT1IgU0VSVklDRVM7IExPU1MgT0YgVVNF LAotICogREFUQSwgT1IgUFJPRklUUzsgT1IgQlVTSU5FU1MgSU5URVJSVVBUSU9OKSBIT1dFVkVS IENBVVNFRCBBTkQgT04gQU5ZCi0gKiBUSEVPUlkgT0YgTElBQklMSVRZLCBXSEVUSEVSIElOIENP TlRSQUNULCBTVFJJQ1QgTElBQklMSVRZLCBPUiBUT1JUCi0gKiAoSU5DTFVESU5HIE5FR0xJR0VO Q0UgT1IgT1RIRVJXSVNFKSBBUklTSU5HIElOIEFOWSBXQVkgT1VUIE9GIFRIRSBVU0UKLSAqIE9G IFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VD SCBEQU1BR0UuCi0gKi8KLQotLy8gQSB3cmFwcGVyIGFyb3VuZCBVbmlzY3JpYmUgdGhhdCBwcm92 aWRlcyBhIHJlYXNvbmFibGUgQVBJLgotCi0jaW5jbHVkZSAiY29uZmlnLmgiCi0jaW5jbHVkZSAi Qml0bWFwSW1hZ2UuaCIKLQotI2luY2x1ZGUgIkltYWdlLmgiCi0jaW5jbHVkZSAiUGxhdGZvcm1T dXBwb3J0LmgiCi0KLW5hbWVzcGFjZSBXZWJDb3JlIHsKLQotUGFzc1JlZlB0cjxJbWFnZT4gSW1h Z2U6OmxvYWRQbGF0Zm9ybVJlc291cmNlKGNvbnN0IGNoYXIqIG5hbWUpCi17Ci0gICAgcmV0dXJu IFBsYXRmb3JtU3VwcG9ydDo6bG9hZFBsYXRmb3JtSW1hZ2VSZXNvdXJjZShuYW1lKTsKLX0KLQot Ly8gRklYTUU6IFRoZXNlIGFyZSB0ZW1wb3Jhcnkgc3R1YnMsIHdlIG5lZWQgcmVhbCBpbXBsZW1l bnRhdGlvbnMgd2hpY2gKLS8vIG1heSBjb21lIGluIHRoZSBmb3JtIG9mIEltYWdlQ2hyb21pdW0u Y3BwLiAgVGhlIFdpbmRvd3MgQ2hyb21pdW0KLS8vIGltcGxlbWVudGF0aW9uIGlzIGN1cnJlbnRs eSBpbiBJbWFnZVNraWEuY3BwLgotIAotdm9pZCBCaXRtYXBJbWFnZTo6aW5pdFBsYXRmb3JtRGF0 YSgpCi17Ci19Ci0KLXZvaWQgQml0bWFwSW1hZ2U6OmludmFsaWRhdGVQbGF0Zm9ybURhdGEoKQot ewotfQotCi19ICAvLyBuYW1lc3BhY2UgV2ViQ29yZQpJbmRleDogU291cmNlL1dlYktpdC9jaHJv bWl1bS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFu Z2VMb2cJKHJldmlzaW9uIDExNjUyMykKKysrIFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTItMDUtMDkgIE1hcmsgUGls Z3JpbSAgPHBpbGdyaW1AY2hyb21pdW0ub3JnPgorCisgICAgICAgIFtDaHJvbWl1bV0gUmVtb3Zl IFBsYXRmb3JtU3VwcG9ydDo6bG9hZFBsYXRmb3JtSW1hZ2VSZXNvdXJjZSwgY2FsbCBsb2FkUmVz b3VyY2UgZGlyZWN0bHkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTg0NDE3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgUGFydCBvZiBhIHJlZmFjdG9yaW5nIHNlcmllcy4gU2VlIHRyYWNraW5nIGJ1ZyA4Mjk0 OC4KKworICAgICAgICAqIHNyYy9QbGF0Zm9ybVN1cHBvcnQuY3BwOgorICAgICAgICAoV2ViQ29y ZSk6CisKIDIwMTItMDUtMDkgIEtlbnQgVGFtdXJhICA8dGtlbnRAY2hyb21pdW0ub3JnPgogCiAg ICAgICAgIFtDaHJvbWl1bV0gRGlzYWJsZSBXZWJWaWV3VGVzdC5UZXh0SW5wdXRUeXBlIGJlY2F1 c2UgdGhlIHRlc3QgaXMgaW5jb21wbGV0ZS4KSW5kZXg6IFNvdXJjZS9XZWJLaXQvY2hyb21pdW0v c3JjL1BsYXRmb3JtU3VwcG9ydC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9jaHJv bWl1bS9zcmMvUGxhdGZvcm1TdXBwb3J0LmNwcAkocmV2aXNpb24gMTE2NTIyKQorKysgU291cmNl L1dlYktpdC9jaHJvbWl1bS9zcmMvUGxhdGZvcm1TdXBwb3J0LmNwcAkod29ya2luZyBjb3B5KQpA QCAtNTUzLDE3ICs1NTMsNiBAQCBOUE9iamVjdCogUGxhdGZvcm1TdXBwb3J0OjpwbHVnaW5TY3Jp cHRhCiAKIC8vIFJlc291cmNlcyAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIAotUGFzc1JlZlB0cjxJbWFnZT4gUGxhdGZv cm1TdXBwb3J0Ojpsb2FkUGxhdGZvcm1JbWFnZVJlc291cmNlKGNvbnN0IGNoYXIqIG5hbWUpCi17 Ci0gICAgY29uc3QgV2ViRGF0YSYgcmVzb3VyY2UgPSB3ZWJLaXRQbGF0Zm9ybVN1cHBvcnQoKS0+ bG9hZFJlc291cmNlKG5hbWUpOwotICAgIGlmIChyZXNvdXJjZS5pc0VtcHR5KCkpCi0gICAgICAg IHJldHVybiBJbWFnZTo6bnVsbEltYWdlKCk7Ci0KLSAgICBSZWZQdHI8SW1hZ2U+IGltYWdlID0g Qml0bWFwSW1hZ2U6OmNyZWF0ZSgpOwotICAgIGltYWdlLT5zZXREYXRhKHJlc291cmNlLCB0cnVl KTsKLSAgICByZXR1cm4gaW1hZ2U7Ci19Ci0KICNpZiBFTkFCTEUoV0VCX0FVRElPKQogCiBQYXNz T3duUHRyPEF1ZGlvQnVzPiBQbGF0Zm9ybVN1cHBvcnQ6OmRlY29kZUF1ZGlvRmlsZURhdGEoY29u c3QgY2hhciogZGF0YSwgc2l6ZV90IHNpemUsIGRvdWJsZSBzYW1wbGVSYXRlKQo= 140988 2012-05-09 11:57:52 -0700 2012-05-09 15:05:45 -0700 Patch bug-84417-20120509145750.patch text/plain 8134 pilgrim SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDExNjU0NikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIwIEBACisyMDEyLTA1LTA5ICBNYXJrIFBp bGdyaW0gIDxwaWxncmltQGNocm9taXVtLm9yZz4KKworICAgICAgICBbQ2hyb21pdW1dIFJlbW92 ZSBQbGF0Zm9ybVN1cHBvcnQ6OmxvYWRQbGF0Zm9ybUltYWdlUmVzb3VyY2UsIGNhbGwgbG9hZFJl c291cmNlIGRpcmVjdGx5CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD04NDQxNworCisgICAgICAgIFJldmlld2VkIGJ5IEFkYW0gQmFydGguCisKKyAgICAg ICAgUGFydCBvZiBhIHJlZmFjdG9yaW5nIHNlcmllcy4gU2VlIHRyYWNraW5nIGJ1ZyA4Mjk0OC4K KworICAgICAgICAqIFdlYkNvcmUuZ3lwL1dlYkNvcmUuZ3lwOgorICAgICAgICAqIFdlYkNvcmUu Z3lwaToKKyAgICAgICAgKiBwbGF0Zm9ybS9jaHJvbWl1bS9QbGF0Zm9ybVN1cHBvcnQuaDoKKyAg ICAgICAgKFBsYXRmb3JtU3VwcG9ydCk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2hy b21pdW0vSW1hZ2VDaHJvbWl1bS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJbWFnZTo6bG9hZFBs YXRmb3JtUmVzb3VyY2UpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0lt YWdlQ2hyb21pdW1NYWMubW06IFJlbW92ZWQuCisKIDIwMTItMDUtMDkgIEFiaGlzaGVrIEFyeWEg IDxpbmZlcm5vQGNocm9taXVtLm9yZz4KIAogICAgICAgICBDcmFzaCBpbiBSZXBsYWNlU2VsZWN0 aW9uQ29tbWFuZDo6cGVyZm9ybVRyaXZpYWxSZXBsYWNlCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9X ZWJDb3JlLmd5cGkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvV2ViQ29yZS5neXBpCShy ZXZpc2lvbiAxMTY1NDYpCisrKyBTb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmd5cGkJKHdvcmtpbmcg Y29weSkKQEAgLTM1NzAsNyArMzU3MCw2IEBACiAgICAgICAgICAgICAncGxhdGZvcm0vZ3JhcGhp Y3MvY2hyb21pdW0vSWNvbkNocm9taXVtQW5kcm9pZC5jcHAnLAogICAgICAgICAgICAgJ3BsYXRm b3JtL2dyYXBoaWNzL2Nocm9taXVtL0ltYWdlQnVmZmVyRGF0YVNraWEuaCcsCiAgICAgICAgICAg ICAncGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vSW1hZ2VDaHJvbWl1bS5jcHAnLAotICAgICAg ICAgICAgJ3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0ltYWdlQ2hyb21pdW1NYWMubW0nLAog ICAgICAgICAgICAgJ3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0ltYWdlTGF5ZXJDaHJvbWl1 bS5jcHAnLAogICAgICAgICAgICAgJ3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0ltYWdlTGF5 ZXJDaHJvbWl1bS5oJywKICAgICAgICAgICAgICdwbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9M YXllckNocm9taXVtLmNwcCcsCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmd5cC9XZWJD b3JlLmd5cAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmd5cC9XZWJDb3Jl Lmd5cAkocmV2aXNpb24gMTE2NTQ2KQorKysgU291cmNlL1dlYkNvcmUvV2ViQ29yZS5neXAvV2Vi Q29yZS5neXAJKHdvcmtpbmcgY29weSkKQEAgLTE2NTQsNyArMTY1NCw2IEBACiAgICAgICAgICAg ICBbJ2luY2x1ZGUnLCAncGxhdGZvcm0vZ3JhcGhpY3MvY2cvSW50UG9pbnRDR1xcLmNwcCQnXSwK ICAgICAgICAgICAgIFsnaW5jbHVkZScsICdwbGF0Zm9ybS9ncmFwaGljcy9jZy9JbnRSZWN0Q0dc XC5jcHAkJ10sCiAgICAgICAgICAgICBbJ2luY2x1ZGUnLCAncGxhdGZvcm0vZ3JhcGhpY3MvY2cv SW50U2l6ZUNHXFwuY3BwJCddLAotICAgICAgICAgICAgWydleGNsdWRlJywgJ3BsYXRmb3JtL2dy YXBoaWNzL2Nocm9taXVtL0ltYWdlQ2hyb21pdW1NYWNcXC5tbSQnXSwKICAgICAgICAgICAgIFsn ZXhjbHVkZScsICdwbGF0Zm9ybS9ncmFwaGljcy9tYWMvRm9udE1hY1xcLm1tJCddLAogICAgICAg ICAgICAgWydleGNsdWRlJywgJ3BsYXRmb3JtL2dyYXBoaWNzL3NraWEvRm9udENhY2hlU2tpYVxc LmNwcCQnXSwKICAgICAgICAgICAgIFsnZXhjbHVkZScsICdwbGF0Zm9ybS9ncmFwaGljcy9za2lh L0dseXBoUGFnZVRyZWVOb2RlU2tpYVxcLmNwcCQnXSwKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2Nocm9taXVtL1BsYXRmb3JtU3VwcG9ydC5oCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL1BsYXRmb3JtU3VwcG9ydC5oCShyZXZpc2lvbiAxMTY1 NDYpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9QbGF0Zm9ybVN1cHBvcnQu aAkod29ya2luZyBjb3B5KQpAQCAtMTk2LDggKzE5Niw2IEBAIHB1YmxpYzoKICAgICBzdGF0aWMg Ym9vbCBwb3B1cHNBbGxvd2VkKE5QUCk7CiAKICAgICAvLyBSZXNvdXJjZXMgLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQotICAgIHN0YXRp YyBQYXNzUmVmUHRyPEltYWdlPiBsb2FkUGxhdGZvcm1JbWFnZVJlc291cmNlKGNvbnN0IGNoYXIq IG5hbWUpOwotCiAjaWYgRU5BQkxFKFdFQl9BVURJTykKICAgICBzdGF0aWMgUGFzc093blB0cjxB dWRpb0J1cz4gZGVjb2RlQXVkaW9GaWxlRGF0YShjb25zdCBjaGFyKiBkYXRhLCBzaXplX3QsIGRv dWJsZSBzYW1wbGVSYXRlKTsKICNlbmRpZgpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvY2hyb21pdW0vSW1hZ2VDaHJvbWl1bS5jcHAKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vSW1hZ2VDaHJvbWl1bS5jcHAJKHJl dmlzaW9uIDExNjU0NikKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9t aXVtL0ltYWdlQ2hyb21pdW0uY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yOSw5ICsyOSwxMiBAQAog ICovCiAKICNpbmNsdWRlICJjb25maWcuaCIKKyNpbmNsdWRlICJCaXRtYXBJbWFnZS5oIgogI2lu Y2x1ZGUgIkltYWdlLmgiCisjaW5jbHVkZSAiU2hhcmVkQnVmZmVyLmgiCiAKLSNpbmNsdWRlICJQ bGF0Zm9ybVN1cHBvcnQuaCIKKyNpbmNsdWRlIDxwdWJsaWMvUGxhdGZvcm0uaD4KKyNpbmNsdWRl IDxwdWJsaWMvV2ViRGF0YS5oPgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKQEAgLTM5LDcgKzQy LDEzIEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogUGFzc1JlZlB0cjxJbWFnZT4gSW1hZ2U6Omxv YWRQbGF0Zm9ybVJlc291cmNlKGNvbnN0IGNoYXIgKm5hbWUpCiB7Ci0gICAgcmV0dXJuIFBsYXRm b3JtU3VwcG9ydDo6bG9hZFBsYXRmb3JtSW1hZ2VSZXNvdXJjZShuYW1lKTsKKyAgICBjb25zdCBX ZWJLaXQ6OldlYkRhdGEmIHJlc291cmNlID0gV2ViS2l0OjpQbGF0Zm9ybTo6Y3VycmVudCgpLT5s b2FkUmVzb3VyY2UobmFtZSk7CisgICAgaWYgKHJlc291cmNlLmlzRW1wdHkoKSkKKyAgICAgICAg cmV0dXJuIEltYWdlOjpudWxsSW1hZ2UoKTsKKworICAgIFJlZlB0cjxJbWFnZT4gaW1hZ2UgPSBC aXRtYXBJbWFnZTo6Y3JlYXRlKCk7CisgICAgaW1hZ2UtPnNldERhdGEocmVzb3VyY2UsIHRydWUp OworICAgIHJldHVybiBpbWFnZS5yZWxlYXNlKCk7CiB9CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNv cmUKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0ltYWdl Q2hyb21pdW1NYWMubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvY2hyb21pdW0vSW1hZ2VDaHJvbWl1bU1hYy5tbQkocmV2aXNpb24gMTE2NTQ2KQorKysg U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vSW1hZ2VDaHJvbWl1bU1h Yy5tbQkod29ya2luZyBjb3B5KQpAQCAtMSw1OCArMCwwIEBACi0vKgotICogQ29weXJpZ2h0IChj KSAyMDA4LCAyMDA5LCBHb29nbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgotICogCi0gKiBS ZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9y IHdpdGhvdXQKLSAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRo ZSBmb2xsb3dpbmcgY29uZGl0aW9ucyBhcmUKLSAqIG1ldDoKLSAqIAotICogICAgICogUmVkaXN0 cmlidXRpb25zIG9mIHNvdXJjZSBjb2RlIG11c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQK LSAqIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlz Y2xhaW1lci4KLSAqICAgICAqIFJlZGlzdHJpYnV0aW9ucyBpbiBiaW5hcnkgZm9ybSBtdXN0IHJl cHJvZHVjZSB0aGUgYWJvdmUKLSAqIGNvcHlyaWdodCBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25k aXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIKLSAqIGluIHRoZSBkb2N1bWVudGF0 aW9uIGFuZC9vciBvdGhlciBtYXRlcmlhbHMgcHJvdmlkZWQgd2l0aCB0aGUKLSAqIGRpc3RyaWJ1 dGlvbi4KLSAqICAgICAqIE5laXRoZXIgdGhlIG5hbWUgb2YgR29vZ2xlIEluYy4gbm9yIHRoZSBu YW1lcyBvZiBpdHMKLSAqIGNvbnRyaWJ1dG9ycyBtYXkgYmUgdXNlZCB0byBlbmRvcnNlIG9yIHBy b21vdGUgcHJvZHVjdHMgZGVyaXZlZCBmcm9tCi0gKiB0aGlzIHNvZnR3YXJlIHdpdGhvdXQgc3Bl Y2lmaWMgcHJpb3Igd3JpdHRlbiBwZXJtaXNzaW9uLgotICogCi0gKiBUSElTIFNPRlRXQVJFIElT IFBST1ZJREVEIEJZIFRIRSBDT1BZUklHSFQgSE9MREVSUyBBTkQgQ09OVFJJQlVUT1JTCi0gKiAi QVMgSVMiIEFORCBBTlkgRVhQUkVTUyBPUiBJTVBMSUVEIFdBUlJBTlRJRVMsIElOQ0xVRElORywg QlVUIE5PVAotICogTElNSVRFRCBUTywgVEhFIElNUExJRUQgV0FSUkFOVElFUyBPRiBNRVJDSEFO VEFCSUxJVFkgQU5EIEZJVE5FU1MgRk9SCi0gKiBBIFBBUlRJQ1VMQVIgUFVSUE9TRSBBUkUgRElT Q0xBSU1FRC4gSU4gTk8gRVZFTlQgU0hBTEwgVEhFIENPUFlSSUdIVAotICogT1dORVIgT1IgQ09O VFJJQlVUT1JTIEJFIExJQUJMRSBGT1IgQU5ZIERJUkVDVCwgSU5ESVJFQ1QsIElOQ0lERU5UQUws Ci0gKiBTUEVDSUFMLCBFWEVNUExBUlksIE9SIENPTlNFUVVFTlRJQUwgREFNQUdFUyAoSU5DTFVE SU5HLCBCVVQgTk9UCi0gKiBMSU1JVEVEIFRPLCBQUk9DVVJFTUVOVCBPRiBTVUJTVElUVVRFIEdP T0RTIE9SIFNFUlZJQ0VTOyBMT1NTIE9GIFVTRSwKLSAqIERBVEEsIE9SIFBST0ZJVFM7IE9SIEJV U0lORVNTIElOVEVSUlVQVElPTikgSE9XRVZFUiBDQVVTRUQgQU5EIE9OIEFOWQotICogVEhFT1JZ IE9GIExJQUJJTElUWSwgV0hFVEhFUiBJTiBDT05UUkFDVCwgU1RSSUNUIExJQUJJTElUWSwgT1Ig VE9SVAotICogKElOQ0xVRElORyBORUdMSUdFTkNFIE9SIE9USEVSV0lTRSkgQVJJU0lORyBJTiBB TlkgV0FZIE9VVCBPRiBUSEUgVVNFCi0gKiBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklT RUQgT0YgVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgotICovCi0KLS8vIEEgd3JhcHBl ciBhcm91bmQgVW5pc2NyaWJlIHRoYXQgcHJvdmlkZXMgYSByZWFzb25hYmxlIEFQSS4KLQotI2lu Y2x1ZGUgImNvbmZpZy5oIgotI2luY2x1ZGUgIkJpdG1hcEltYWdlLmgiCi0KLSNpbmNsdWRlICJJ bWFnZS5oIgotI2luY2x1ZGUgIlBsYXRmb3JtU3VwcG9ydC5oIgotCi1uYW1lc3BhY2UgV2ViQ29y ZSB7Ci0KLVBhc3NSZWZQdHI8SW1hZ2U+IEltYWdlOjpsb2FkUGxhdGZvcm1SZXNvdXJjZShjb25z dCBjaGFyKiBuYW1lKQotewotICAgIHJldHVybiBQbGF0Zm9ybVN1cHBvcnQ6OmxvYWRQbGF0Zm9y bUltYWdlUmVzb3VyY2UobmFtZSk7Ci19Ci0KLS8vIEZJWE1FOiBUaGVzZSBhcmUgdGVtcG9yYXJ5 IHN0dWJzLCB3ZSBuZWVkIHJlYWwgaW1wbGVtZW50YXRpb25zIHdoaWNoCi0vLyBtYXkgY29tZSBp biB0aGUgZm9ybSBvZiBJbWFnZUNocm9taXVtLmNwcC4gIFRoZSBXaW5kb3dzIENocm9taXVtCi0v LyBpbXBsZW1lbnRhdGlvbiBpcyBjdXJyZW50bHkgaW4gSW1hZ2VTa2lhLmNwcC4KLSAKLXZvaWQg Qml0bWFwSW1hZ2U6OmluaXRQbGF0Zm9ybURhdGEoKQotewotfQotCi12b2lkIEJpdG1hcEltYWdl OjppbnZhbGlkYXRlUGxhdGZvcm1EYXRhKCkKLXsKLX0KLQotfSAgLy8gbmFtZXNwYWNlIFdlYkNv cmUKSW5kZXg6IFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCShyZXZpc2lvbiAxMTY1NDYpCisrKyBT b3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsx LDE1IEBACisyMDEyLTA1LTA5ICBNYXJrIFBpbGdyaW0gIDxwaWxncmltQGNocm9taXVtLm9yZz4K KworICAgICAgICBbQ2hyb21pdW1dIFJlbW92ZSBQbGF0Zm9ybVN1cHBvcnQ6OmxvYWRQbGF0Zm9y bUltYWdlUmVzb3VyY2UsIGNhbGwgbG9hZFJlc291cmNlIGRpcmVjdGx5CisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04NDQxNworCisgICAgICAgIFJldmll d2VkIGJ5IEFkYW0gQmFydGguCisKKyAgICAgICAgUGFydCBvZiBhIHJlZmFjdG9yaW5nIHNlcmll cy4gU2VlIHRyYWNraW5nIGJ1ZyA4Mjk0OC4KKworICAgICAgICAqIHNyYy9QbGF0Zm9ybVN1cHBv cnQuY3BwOgorICAgICAgICAoV2ViQ29yZSk6CisKIDIwMTItMDUtMDkgIE1hcmN1cyBCdWxhY2gg IDxidWxhY2hAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFtjaHJvbWl1bV0gRXhwb3NlcyBPcmll bnRhdGlvbkNoYW5nZUV2ZW50LgpJbmRleDogU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvUGxh dGZvcm1TdXBwb3J0LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Ny Yy9QbGF0Zm9ybVN1cHBvcnQuY3BwCShyZXZpc2lvbiAxMTY1NDYpCisrKyBTb3VyY2UvV2ViS2l0 L2Nocm9taXVtL3NyYy9QbGF0Zm9ybVN1cHBvcnQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC01NTMs MTcgKzU1Myw2IEBAIE5QT2JqZWN0KiBQbGF0Zm9ybVN1cHBvcnQ6OnBsdWdpblNjcmlwdGEKIAog Ly8gUmVzb3VyY2VzIC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogCi1QYXNzUmVmUHRyPEltYWdlPiBQbGF0Zm9ybVN1cHBv cnQ6OmxvYWRQbGF0Zm9ybUltYWdlUmVzb3VyY2UoY29uc3QgY2hhciogbmFtZSkKLXsKLSAgICBj b25zdCBXZWJEYXRhJiByZXNvdXJjZSA9IHdlYktpdFBsYXRmb3JtU3VwcG9ydCgpLT5sb2FkUmVz b3VyY2UobmFtZSk7Ci0gICAgaWYgKHJlc291cmNlLmlzRW1wdHkoKSkKLSAgICAgICAgcmV0dXJu IEltYWdlOjpudWxsSW1hZ2UoKTsKLQotICAgIFJlZlB0cjxJbWFnZT4gaW1hZ2UgPSBCaXRtYXBJ bWFnZTo6Y3JlYXRlKCk7Ci0gICAgaW1hZ2UtPnNldERhdGEocmVzb3VyY2UsIHRydWUpOwotICAg IHJldHVybiBpbWFnZTsKLX0KLQogI2lmIEVOQUJMRShXRUJfQVVESU8pCiAKIFBhc3NPd25QdHI8 QXVkaW9CdXM+IFBsYXRmb3JtU3VwcG9ydDo6ZGVjb2RlQXVkaW9GaWxlRGF0YShjb25zdCBjaGFy KiBkYXRhLCBzaXplX3Qgc2l6ZSwgZG91YmxlIHNhbXBsZVJhdGUpCg==