142458 2015-03-08 13:06:36 -0700 [Content Extensions] Pass compiled content extensions as read-only shared memory rather than copying them 2015-03-08 14:33:15 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 sam sam commit-queue oldest_to_newest 1075399 0 sam 2015-03-08 13:06:36 -0700 [Content Extensions] Pass compiled content extensions as read-only shared memory rather than copying them 1075404 1 248200 sam 2015-03-08 13:32:28 -0700 Created attachment 248200 Patch 1075405 2 commit-queue 2015-03-08 13:34:32 -0700 Attachment 248200 did not pass style-queue: ERROR: Source/WebKit2/Shared/WebCompiledContentExtensionData.h:47: The parameter type should use PassRefPtr instead of RefPtr. [readability/pass_ptr] [5] Total errors found: 1 in 9 files If any of these errors are false positives, please file a bug against check-webkit-style. 1075423 3 sam 2015-03-08 14:33:15 -0700 Committed r181246: <http://trac.webkit.org/changeset/181246> 248200 2015-03-08 13:32:28 -0700 2015-03-08 14:30:55 -0700 Patch bug-142458-20150308133207.patch text/plain 14166 sam SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE4MTI0NSkKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDQ2IEBACisyMDE1LTAzLTA4ICBTYW0gV2Vp bmlnICA8c2FtQHdlYmtpdC5vcmc+CisKKyAgICAgICAgW0NvbnRlbnQgRXh0ZW5zaW9uc10gUGFz cyBjb21waWxlZCBjb250ZW50IGV4dGVuc2lvbnMgYXMgcmVhZC1vbmx5IHNoYXJlZCBtZW1vcnkg cmF0aGVyIHRoYW4gY29weWluZyB0aGVtCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0xNDI0NTgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICAqIFNoYXJlZC9XZWJDb21waWxlZENvbnRlbnRFeHRlbnNpb25EYXRh LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViQ29tcGlsZWRDb250ZW50RXh0ZW5zaW9uRGF0YTo6 ZW5jb2RlKToKKyAgICAgICAgKFdlYktpdDo6V2ViQ29tcGlsZWRDb250ZW50RXh0ZW5zaW9uRGF0 YTo6ZGVjb2RlKToKKyAgICAgICAgKiBTaGFyZWQvV2ViQ29tcGlsZWRDb250ZW50RXh0ZW5zaW9u RGF0YS5oOgorICAgICAgICAoV2ViS2l0OjpXZWJDb21waWxlZENvbnRlbnRFeHRlbnNpb25EYXRh OjpXZWJDb21waWxlZENvbnRlbnRFeHRlbnNpb25EYXRhKToKKyAgICAgICAgU3RvcmUgdGhlIGNv bXBpbGVkIGRhdGEgYXMgYSBTaGFyZWRNZW1vcnkgYmxvY2sgd2l0aCBvZmZzZXQvc2l6ZSBwYWly cyBmb3IgdGhlCisgICAgICAgIGJ5dGVjb2RlIGFuZCBhY3Rpb25zLiBXaGlsZSB0aGUgYnl0ZWNv ZGUgb2Zmc2V0IGlzIGN1cnJlbnRseSBhbHdheXMgMCwgdGhpcyB3b24ndAorICAgICAgICBiZSB0 aGUgY2FzZSB3aGVuIHdlIG1hcCB0aGVzZSBpbiBmcm9tIGZpbGVzIGR1ZSB0byBtZXRhZGF0YSB0 aGF0IHdpbGwgYmUgcGxhY2VkCisgICAgICAgIGF0IHRoZSB0b3Agb2YgdGhlIGZpbGVzLgorCisg ICAgICAgICogU2hhcmVkL1dlYkNvbXBpbGVkQ29udGVudEV4dGVuc2lvbi5oOgorICAgICAgICAq IFNoYXJlZC9XZWJDb21waWxlZENvbnRlbnRFeHRlbnNpb24uY3BwOgorICAgICAgICAoV2ViS2l0 OjpXZWJDb21waWxlZENvbnRlbnRFeHRlbnNpb246OmNyZWF0ZUZyb21Db21waWxlZENvbnRlbnRF eHRlbnNpb25EYXRhKToKKyAgICAgICAgVGVtcG9yYXJ5IGNyZWF0aW9uIGhlbHBlci4gSW4gc3Vi c2VxdWVudCBwYXRjaGVzLCB0aGlzIHdpbGwgYmUgcmVtb3ZlZCBhbmQgcmVwbGFjZWQKKyAgICAg ICAgYnkgYWx3YXlzIHBhc3NpbmcgaW4gc2hhcmVkL21hcHBlZCBkYXRhLgorCisgICAgICAgIChX ZWJLaXQ6OldlYkNvbXBpbGVkQ29udGVudEV4dGVuc2lvbjo6Y3JlYXRlKToKKyAgICAgICAgKFdl YktpdDo6V2ViQ29tcGlsZWRDb250ZW50RXh0ZW5zaW9uOjpXZWJDb21waWxlZENvbnRlbnRFeHRl bnNpb24pOgorICAgICAgICAoV2ViS2l0OjpXZWJDb21waWxlZENvbnRlbnRFeHRlbnNpb246OmJ5 dGVjb2RlKToKKyAgICAgICAgKFdlYktpdDo6V2ViQ29tcGlsZWRDb250ZW50RXh0ZW5zaW9uOjpi eXRlY29kZUxlbmd0aCk6CisgICAgICAgIChXZWJLaXQ6OldlYkNvbXBpbGVkQ29udGVudEV4dGVu c2lvbjo6YWN0aW9ucyk6CisgICAgICAgIChXZWJLaXQ6OldlYkNvbXBpbGVkQ29udGVudEV4dGVu c2lvbjo6YWN0aW9uc0xlbmd0aCk6CisgICAgICAgIENvbnZlcnQgdG8gd29yayB3aXRoIHRoZSBu ZXcgV2ViQ29tcGlsZWRDb250ZW50RXh0ZW5zaW9uIGZvcm1hdC4KKyAgICAgICAgCisgICAgICAg ICogVUlQcm9jZXNzL0FQSS9DL1dLVXNlckNvbnRlbnRGaWx0ZXJSZWYuY3BwOgorICAgICAgICAo V0tVc2VyQ29udGVudEZpbHRlckNyZWF0ZSk6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9Db2Nv YS9fV0tVc2VyQ29udGVudEZpbHRlci5tbToKKyAgICAgICAgKC1bX1dLVXNlckNvbnRlbnRGaWx0 ZXIgaW5pdFdpdGhOYW1lOnNlcmlhbGl6ZWRSdWxlczpdKToKKyAgICAgICAgU3dpdGNoIHRvIHVz aW5nIFdlYkNvbXBpbGVkQ29udGVudEV4dGVuc2lvbjo6Y3JlYXRlRnJvbUNvbXBpbGVkQ29udGVu dEV4dGVuc2lvbkRhdGEoKS4KKworICAgICAgICAqIFdlYlByb2Nlc3MvVXNlckNvbnRlbnQvV2Vi VXNlckNvbnRlbnRDb250cm9sbGVyLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViVXNlckNvbnRl bnRDb250cm9sbGVyOjphZGRVc2VyQ29udGVudEV4dGVuc2lvbnMpOgorICAgICAgICAqIFdlYlBy b2Nlc3MvV2ViUGFnZS9XZWJQYWdlR3JvdXBQcm94eS5jcHA6CisgICAgICAgIChXZWJLaXQ6Oldl YlBhZ2VHcm91cFByb3h5OjphZGRVc2VyQ29udGVudEV4dGVuc2lvbik6CisgICAgICAgIFVwZGF0 ZSB0byBwYXNzIHRoZSBXZWJDb21waWxlZENvbnRlbnRFeHRlbnNpb25EYXRhIGRpcmVjdGx5IHRv IHRoZSBXZWJDb21waWxlZENvbnRlbnRFeHRlbnNpb24uCisKIDIwMTUtMDMtMDggIENhcmxvcyBH YXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgogCiAgICAgICAgIFJlbW92ZSB3aWxs RGVzdHJveUZyYW1lIGluIFdLQnVuZGxlUGFnZUxvYWRlckNsaWVudApJbmRleDogU291cmNlL1dl YktpdDIvU2hhcmVkL1dlYkNvbXBpbGVkQ29udGVudEV4dGVuc2lvbi5jcHAKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYktpdDIvU2hhcmVkL1dlYkNvbXBpbGVkQ29udGVudEV4dGVuc2lvbi5jcHAJ KHJldmlzaW9uIDE4MTIwMCkKKysrIFNvdXJjZS9XZWJLaXQyL1NoYXJlZC9XZWJDb21waWxlZENv bnRlbnRFeHRlbnNpb24uY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yOCwxNSArMjgsMzMgQEAKIAog I2lmIEVOQUJMRShDT05URU5UX0VYVEVOU0lPTlMpCiAKKyNpbmNsdWRlIDxXZWJDb3JlL0NvbnRl bnRFeHRlbnNpb25Db21waWxlci5oPgorCiBuYW1lc3BhY2UgV2ViS2l0IHsKIAotUmVmPFdlYkNv bXBpbGVkQ29udGVudEV4dGVuc2lvbj4gV2ViQ29tcGlsZWRDb250ZW50RXh0ZW5zaW9uOjpjcmVh dGUoVmVjdG9yPFdlYkNvcmU6OkNvbnRlbnRFeHRlbnNpb25zOjpERkFCeXRlY29kZT4mJiBieXRl Y29kZSwgVmVjdG9yPFdlYkNvcmU6OkNvbnRlbnRFeHRlbnNpb25zOjpTZXJpYWxpemVkQWN0aW9u Qnl0ZT4mJiBhY3Rpb25zKQorUmVmPFdlYkNvbXBpbGVkQ29udGVudEV4dGVuc2lvbj4gV2ViQ29t cGlsZWRDb250ZW50RXh0ZW5zaW9uOjpjcmVhdGVGcm9tQ29tcGlsZWRDb250ZW50RXh0ZW5zaW9u RGF0YShjb25zdCBXZWJDb3JlOjpDb250ZW50RXh0ZW5zaW9uczo6Q29tcGlsZWRDb250ZW50RXh0 ZW5zaW9uRGF0YSYgY29tcGlsZXJEYXRhKQoreworICAgIFJlZlB0cjxTaGFyZWRNZW1vcnk+IHNo YXJlZE1lbW9yeSA9IFNoYXJlZE1lbW9yeTo6Y3JlYXRlKGNvbXBpbGVyRGF0YS5ieXRlY29kZS5z aXplKCkgKyBjb21waWxlckRhdGEuYWN0aW9ucy5zaXplKCkpOworICAgIG1lbWNweShzdGF0aWNf Y2FzdDxjaGFyKj4oc2hhcmVkTWVtb3J5LT5kYXRhKCkpLCBjb21waWxlckRhdGEuYnl0ZWNvZGUu ZGF0YSgpLCBjb21waWxlckRhdGEuYnl0ZWNvZGUuc2l6ZSgpKTsKKyAgICBtZW1jcHkoc3RhdGlj X2Nhc3Q8Y2hhcio+KHNoYXJlZE1lbW9yeS0+ZGF0YSgpKSArIGNvbXBpbGVyRGF0YS5ieXRlY29k ZS5zaXplKCksIGNvbXBpbGVyRGF0YS5hY3Rpb25zLmRhdGEoKSwgY29tcGlsZXJEYXRhLmFjdGlv bnMuc2l6ZSgpKTsKKworICAgIFdlYkNvbXBpbGVkQ29udGVudEV4dGVuc2lvbkRhdGEgZGF0YTsK KyAgICBkYXRhLmRhdGEgPSBXVEY6Om1vdmUoc2hhcmVkTWVtb3J5KTsKKyAgICBkYXRhLmJ5dGVj b2RlT2Zmc2V0ID0gMDsKKyAgICBkYXRhLmJ5dGVjb2RlU2l6ZSA9IGNvbXBpbGVyRGF0YS5ieXRl Y29kZS5zaXplKCk7CisgICAgZGF0YS5hY3Rpb25zT2Zmc2V0ID0gY29tcGlsZXJEYXRhLmJ5dGVj b2RlLnNpemUoKTsKKyAgICBkYXRhLmFjdGlvbnNTaXplID0gY29tcGlsZXJEYXRhLmFjdGlvbnMu c2l6ZSgpOworCisgICAgcmV0dXJuIGNyZWF0ZShXVEY6Om1vdmUoZGF0YSkpOworfQorCitSZWY8 V2ViQ29tcGlsZWRDb250ZW50RXh0ZW5zaW9uPiBXZWJDb21waWxlZENvbnRlbnRFeHRlbnNpb246 OmNyZWF0ZShXZWJDb21waWxlZENvbnRlbnRFeHRlbnNpb25EYXRhJiYgZGF0YSkKIHsKLSAgICBy ZXR1cm4gYWRvcHRSZWYoKm5ldyBXZWJDb21waWxlZENvbnRlbnRFeHRlbnNpb24oV1RGOjptb3Zl KGJ5dGVjb2RlKSwgV1RGOjptb3ZlKGFjdGlvbnMpKSk7CisgICAgcmV0dXJuIGFkb3B0UmVmKCpu ZXcgV2ViQ29tcGlsZWRDb250ZW50RXh0ZW5zaW9uKFdURjo6bW92ZShkYXRhKSkpOwogfQogCi1X ZWJDb21waWxlZENvbnRlbnRFeHRlbnNpb246OldlYkNvbXBpbGVkQ29udGVudEV4dGVuc2lvbihW ZWN0b3I8V2ViQ29yZTo6Q29udGVudEV4dGVuc2lvbnM6OkRGQUJ5dGVjb2RlPiYmIGJ5dGVjb2Rl LCBWZWN0b3I8V2ViQ29yZTo6Q29udGVudEV4dGVuc2lvbnM6OlNlcmlhbGl6ZWRBY3Rpb25CeXRl PiYmIGFjdGlvbnMpCi0gICAgOiBtX2RhdGEgeyBXVEY6Om1vdmUoYnl0ZWNvZGUpLCBXVEY6Om1v dmUoYWN0aW9ucykgfQorV2ViQ29tcGlsZWRDb250ZW50RXh0ZW5zaW9uOjpXZWJDb21waWxlZENv bnRlbnRFeHRlbnNpb24oV2ViQ29tcGlsZWRDb250ZW50RXh0ZW5zaW9uRGF0YSYmIGRhdGEpCisg ICAgOiBtX2RhdGEoV1RGOjptb3ZlKGRhdGEpKQogewogfQogCkBAIC00NiwyMiArNjQsMjIgQEAg V2ViQ29tcGlsZWRDb250ZW50RXh0ZW5zaW9uOjp+V2ViQ29tcGlsZQogCiBjb25zdCBXZWJDb3Jl OjpDb250ZW50RXh0ZW5zaW9uczo6REZBQnl0ZWNvZGUqIFdlYkNvbXBpbGVkQ29udGVudEV4dGVu c2lvbjo6Ynl0ZWNvZGUoKSBjb25zdAogewotICAgIHJldHVybiBtX2RhdGEuYnl0ZWNvZGUuZGF0 YSgpOworICAgIHJldHVybiBzdGF0aWNfY2FzdDxjb25zdCBXZWJDb3JlOjpDb250ZW50RXh0ZW5z aW9uczo6REZBQnl0ZWNvZGUqPihtX2RhdGEuZGF0YS0+ZGF0YSgpKSArIG1fZGF0YS5ieXRlY29k ZU9mZnNldDsKIH0KIAogdW5zaWduZWQgV2ViQ29tcGlsZWRDb250ZW50RXh0ZW5zaW9uOjpieXRl Y29kZUxlbmd0aCgpIGNvbnN0CiB7Ci0gICAgcmV0dXJuIG1fZGF0YS5ieXRlY29kZS5zaXplKCk7 CisgICAgcmV0dXJuIG1fZGF0YS5ieXRlY29kZVNpemU7CiB9CiAKIGNvbnN0IFdlYkNvcmU6OkNv bnRlbnRFeHRlbnNpb25zOjpTZXJpYWxpemVkQWN0aW9uQnl0ZSogV2ViQ29tcGlsZWRDb250ZW50 RXh0ZW5zaW9uOjphY3Rpb25zKCkgY29uc3QKIHsKLSAgICByZXR1cm4gbV9kYXRhLmFjdGlvbnMu ZGF0YSgpOworICAgIHJldHVybiBzdGF0aWNfY2FzdDxjb25zdCBXZWJDb3JlOjpDb250ZW50RXh0 ZW5zaW9uczo6U2VyaWFsaXplZEFjdGlvbkJ5dGUqPihtX2RhdGEuZGF0YS0+ZGF0YSgpKSArIG1f ZGF0YS5hY3Rpb25zT2Zmc2V0OwogfQogCiB1bnNpZ25lZCBXZWJDb21waWxlZENvbnRlbnRFeHRl bnNpb246OmFjdGlvbnNMZW5ndGgoKSBjb25zdAogewotICAgIHJldHVybiBtX2RhdGEuYWN0aW9u cy5zaXplKCk7CisgICAgcmV0dXJuIG1fZGF0YS5hY3Rpb25zU2l6ZTsKIH0KIAogfSAvLyBuYW1l c3BhY2UgV2ViS2l0CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9TaGFyZWQvV2ViQ29tcGlsZWRDb250 ZW50RXh0ZW5zaW9uLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvU2hhcmVkL1dlYkNv bXBpbGVkQ29udGVudEV4dGVuc2lvbi5oCShyZXZpc2lvbiAxODEyMDApCisrKyBTb3VyY2UvV2Vi S2l0Mi9TaGFyZWQvV2ViQ29tcGlsZWRDb250ZW50RXh0ZW5zaW9uLmgJKHdvcmtpbmcgY29weSkK QEAgLTI5LDE4ICsyOSwyOCBAQAogI2lmIEVOQUJMRShDT05URU5UX0VYVEVOU0lPTlMpCiAKICNp bmNsdWRlICJXZWJDb21waWxlZENvbnRlbnRFeHRlbnNpb25EYXRhLmgiCisjaW5jbHVkZSA8V2Vi Q29yZS9Db21waWxlZENvbnRlbnRFeHRlbnNpb24uaD4KKworbmFtZXNwYWNlIFdlYkNvcmUgewor bmFtZXNwYWNlIENvbnRlbnRFeHRlbnNpb25zIHsKK3N0cnVjdCBDb21waWxlZENvbnRlbnRFeHRl bnNpb25EYXRhOworfQorfQogCiBuYW1lc3BhY2UgV2ViS2l0IHsKIAogY2xhc3MgV2ViQ29tcGls ZWRDb250ZW50RXh0ZW5zaW9uIGZpbmFsIDogcHVibGljIFdlYkNvcmU6OkNvbnRlbnRFeHRlbnNp b25zOjpDb21waWxlZENvbnRlbnRFeHRlbnNpb24gewogcHVibGljOgotICAgIHN0YXRpYyBSZWY8 V2ViQ29tcGlsZWRDb250ZW50RXh0ZW5zaW9uPiBjcmVhdGUoVmVjdG9yPFdlYkNvcmU6OkNvbnRl bnRFeHRlbnNpb25zOjpERkFCeXRlY29kZT4mJiwgVmVjdG9yPFdlYkNvcmU6OkNvbnRlbnRFeHRl bnNpb25zOjpTZXJpYWxpemVkQWN0aW9uQnl0ZT4mJik7CisgICAgLy8gRklYTUU6IFJlbW92ZSB0 aGlzIG9uY2UgZXZlcnlvbmUgaXMgY29udmVydGVkIHRvIHVzaW5nIHRoZSBVc2VyQ29udGVudEV4 dGVuc2lvblN0b3JlLgorICAgIHN0YXRpYyBSZWY8V2ViQ29tcGlsZWRDb250ZW50RXh0ZW5zaW9u PiBjcmVhdGVGcm9tQ29tcGlsZWRDb250ZW50RXh0ZW5zaW9uRGF0YShjb25zdCBXZWJDb3JlOjpD b250ZW50RXh0ZW5zaW9uczo6Q29tcGlsZWRDb250ZW50RXh0ZW5zaW9uRGF0YSYpOworCisgICAg c3RhdGljIFJlZjxXZWJDb21waWxlZENvbnRlbnRFeHRlbnNpb24+IGNyZWF0ZShXZWJDb21waWxl ZENvbnRlbnRFeHRlbnNpb25EYXRhJiYpOwogICAgIHZpcnR1YWwgfldlYkNvbXBpbGVkQ29udGVu dEV4dGVuc2lvbigpOwogCiAgICAgV2ViQ29tcGlsZWRDb250ZW50RXh0ZW5zaW9uRGF0YSBkYXRh KCkgY29uc3QgeyByZXR1cm4gbV9kYXRhOyB9CiAKIHByaXZhdGU6Ci0gICAgV2ViQ29tcGlsZWRD b250ZW50RXh0ZW5zaW9uKFZlY3RvcjxXZWJDb3JlOjpDb250ZW50RXh0ZW5zaW9uczo6REZBQnl0 ZWNvZGU+JiYsIFZlY3RvcjxXZWJDb3JlOjpDb250ZW50RXh0ZW5zaW9uczo6U2VyaWFsaXplZEFj dGlvbkJ5dGU+JiYpOworICAgIFdlYkNvbXBpbGVkQ29udGVudEV4dGVuc2lvbihXZWJDb21waWxl ZENvbnRlbnRFeHRlbnNpb25EYXRhJiYpOwogCiAgICAgdmlydHVhbCBjb25zdCBXZWJDb3JlOjpD b250ZW50RXh0ZW5zaW9uczo6REZBQnl0ZWNvZGUqIGJ5dGVjb2RlKCkgY29uc3Qgb3ZlcnJpZGU7 CiAgICAgdmlydHVhbCB1bnNpZ25lZCBieXRlY29kZUxlbmd0aCgpIGNvbnN0IG92ZXJyaWRlOwpJ bmRleDogU291cmNlL1dlYktpdDIvU2hhcmVkL1dlYkNvbXBpbGVkQ29udGVudEV4dGVuc2lvbkRh dGEuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1NoYXJlZC9XZWJDb21waWxlZENv bnRlbnRFeHRlbnNpb25EYXRhLmNwcAkocmV2aXNpb24gMTgxMjAwKQorKysgU291cmNlL1dlYktp dDIvU2hhcmVkL1dlYkNvbXBpbGVkQ29udGVudEV4dGVuc2lvbkRhdGEuY3BwCSh3b3JraW5nIGNv cHkpCkBAIC0zNCwxNiArMzQsMzMgQEAgbmFtZXNwYWNlIFdlYktpdCB7CiAKIHZvaWQgV2ViQ29t cGlsZWRDb250ZW50RXh0ZW5zaW9uRGF0YTo6ZW5jb2RlKElQQzo6QXJndW1lbnRFbmNvZGVyJiBl bmNvZGVyKSBjb25zdAogewotICAgIGVuY29kZXIgPDwgYnl0ZWNvZGU7Ci0gICAgZW5jb2RlciA8 PCBhY3Rpb25zOworICAgIFNoYXJlZE1lbW9yeTo6SGFuZGxlIGhhbmRsZTsKKyAgICBkYXRhLT5j cmVhdGVIYW5kbGUoaGFuZGxlLCBTaGFyZWRNZW1vcnk6OlJlYWRPbmx5KTsKKyAgICBlbmNvZGVy IDw8IGhhbmRsZTsKKworICAgIGVuY29kZXIgPDwgYnl0ZWNvZGVPZmZzZXQ7CisgICAgZW5jb2Rl ciA8PCBieXRlY29kZVNpemU7CisgICAgZW5jb2RlciA8PCBhY3Rpb25zT2Zmc2V0OworICAgIGVu Y29kZXIgPDwgYWN0aW9uc1NpemU7CiB9CiAKIGJvb2wgV2ViQ29tcGlsZWRDb250ZW50RXh0ZW5z aW9uRGF0YTo6ZGVjb2RlKElQQzo6QXJndW1lbnREZWNvZGVyJiBkZWNvZGVyLCBXZWJDb21waWxl ZENvbnRlbnRFeHRlbnNpb25EYXRhJiBjb21waWxlZENvbnRlbnRFeHRlbnNpb25EYXRhKQogewot ICAgIGlmICghZGVjb2Rlci5kZWNvZGUoY29tcGlsZWRDb250ZW50RXh0ZW5zaW9uRGF0YS5ieXRl Y29kZSkpCisgICAgU2hhcmVkTWVtb3J5OjpIYW5kbGUgaGFuZGxlOworICAgIGlmICghZGVjb2Rl ci5kZWNvZGUoaGFuZGxlKSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOworICAgIGNvbXBpbGVkQ29u dGVudEV4dGVuc2lvbkRhdGEuZGF0YSA9IFNoYXJlZE1lbW9yeTo6Y3JlYXRlKGhhbmRsZSwgU2hh cmVkTWVtb3J5OjpSZWFkT25seSk7CisKKyAgICBpZiAoIWRlY29kZXIuZGVjb2RlKGNvbXBpbGVk Q29udGVudEV4dGVuc2lvbkRhdGEuYnl0ZWNvZGVPZmZzZXQpKQorICAgICAgICByZXR1cm4gZmFs c2U7CisgICAgaWYgKCFkZWNvZGVyLmRlY29kZShjb21waWxlZENvbnRlbnRFeHRlbnNpb25EYXRh LmJ5dGVjb2RlU2l6ZSkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKLSAgICBpZiAoIWRlY29kZXIu ZGVjb2RlKGNvbXBpbGVkQ29udGVudEV4dGVuc2lvbkRhdGEuYWN0aW9ucykpCisgICAgaWYgKCFk ZWNvZGVyLmRlY29kZShjb21waWxlZENvbnRlbnRFeHRlbnNpb25EYXRhLmFjdGlvbnNPZmZzZXQp KQogICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgaWYgKCFkZWNvZGVyLmRlY29kZShjb21waWxl ZENvbnRlbnRFeHRlbnNpb25EYXRhLmFjdGlvbnNTaXplKSkKKyAgICAgICAgcmV0dXJuIGZhbHNl OworCisKICAgICByZXR1cm4gdHJ1ZTsKIH0KIApJbmRleDogU291cmNlL1dlYktpdDIvU2hhcmVk L1dlYkNvbXBpbGVkQ29udGVudEV4dGVuc2lvbkRhdGEuaAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViS2l0Mi9TaGFyZWQvV2ViQ29tcGlsZWRDb250ZW50RXh0ZW5zaW9uRGF0YS5oCShyZXZpc2lv biAxODEyMDApCisrKyBTb3VyY2UvV2ViS2l0Mi9TaGFyZWQvV2ViQ29tcGlsZWRDb250ZW50RXh0 ZW5zaW9uRGF0YS5oCSh3b3JraW5nIGNvcHkpCkBAIC0yOCw3ICsyOCw4IEBACiAKICNpZiBFTkFC TEUoQ09OVEVOVF9FWFRFTlNJT05TKQogCi0jaW5jbHVkZSA8V2ViQ29yZS9Db21waWxlZENvbnRl bnRFeHRlbnNpb24uaD4KKyNpbmNsdWRlICJTaGFyZWRNZW1vcnkuaCIKKyNpbmNsdWRlIDx3dGYv UmVmUHRyLmg+CiAKIG5hbWVzcGFjZSBJUEMgewogY2xhc3MgQXJndW1lbnREZWNvZGVyOwpAQCAt MzksMTEgKzQwLDI3IEBAIG5hbWVzcGFjZSBXZWJLaXQgewogCiBjbGFzcyBXZWJDb21waWxlZENv bnRlbnRFeHRlbnNpb25EYXRhIHsKIHB1YmxpYzoKKyAgICBXZWJDb21waWxlZENvbnRlbnRFeHRl bnNpb25EYXRhKCkKKyAgICB7CisgICAgfQorICAgIAorICAgIFdlYkNvbXBpbGVkQ29udGVudEV4 dGVuc2lvbkRhdGEoUmVmUHRyPFNoYXJlZE1lbW9yeT4gZGF0YSwgdW5zaWduZWQgYnl0ZWNvZGVP ZmZzZXQsIHVuc2lnbmVkIGJ5dGVjb2RlU2l6ZSwgdW5zaWduZWQgYWN0aW9uc09mZnNldCwgdW5z aWduZWQgYWN0aW9uc1NpemUpCisgICAgICAgIDogZGF0YShkYXRhKQorICAgICAgICAsIGJ5dGVj b2RlT2Zmc2V0KGJ5dGVjb2RlT2Zmc2V0KQorICAgICAgICAsIGJ5dGVjb2RlU2l6ZShieXRlY29k ZVNpemUpCisgICAgICAgICwgYWN0aW9uc09mZnNldChhY3Rpb25zT2Zmc2V0KQorICAgICAgICAs IGFjdGlvbnNTaXplKGFjdGlvbnNTaXplKQorICAgIHsKKyAgICB9CisKICAgICB2b2lkIGVuY29k ZShJUEM6OkFyZ3VtZW50RW5jb2RlciYpIGNvbnN0OwogICAgIHN0YXRpYyBib29sIGRlY29kZShJ UEM6OkFyZ3VtZW50RGVjb2RlciYsIFdlYkNvbXBpbGVkQ29udGVudEV4dGVuc2lvbkRhdGEmKTsK IAotICAgIFZlY3RvcjxXZWJDb3JlOjpDb250ZW50RXh0ZW5zaW9uczo6REZBQnl0ZWNvZGU+IGJ5 dGVjb2RlOwotICAgIFZlY3RvcjxXZWJDb3JlOjpDb250ZW50RXh0ZW5zaW9uczo6U2VyaWFsaXpl ZEFjdGlvbkJ5dGU+IGFjdGlvbnM7CisgICAgUmVmUHRyPFNoYXJlZE1lbW9yeT4gZGF0YTsKKyAg ICB1bnNpZ25lZCBieXRlY29kZU9mZnNldCB7IDAgfTsKKyAgICB1bnNpZ25lZCBieXRlY29kZVNp emUgeyAwIH07CisgICAgdW5zaWduZWQgYWN0aW9uc09mZnNldCB7IDAgfTsKKyAgICB1bnNpZ25l ZCBhY3Rpb25zU2l6ZSB7IDAgfTsKIH07CiAKIH0KSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9BUEkvQy9XS1VzZXJDb250ZW50RmlsdGVyUmVmLmNwcAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tVc2VyQ29udGVudEZpbHRlclJlZi5jcHAJKHJl dmlzaW9uIDE4MTIwMCkKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS1VzZXJD b250ZW50RmlsdGVyUmVmLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDIsNyArNDIsNyBAQCBXS1Vz ZXJDb250ZW50RmlsdGVyUmVmIFdLVXNlckNvbnRlbnRGaWx0CiB7CiAjaWYgRU5BQkxFKENPTlRF TlRfRVhURU5TSU9OUykKICAgICBhdXRvIGNvbXBpbGVkQ29udGVudEV4dGVuc2lvbkRhdGEgPSBX ZWJDb3JlOjpDb250ZW50RXh0ZW5zaW9uczo6Y29tcGlsZVJ1bGVMaXN0KHRvV1RGU3RyaW5nKHNl cmlhbGl6ZWRSdWxlc1JlZikpOwotICAgIGF1dG8gY29tcGlsZWRDb250ZW50RXh0ZW5zaW9uID0g V2ViS2l0OjpXZWJDb21waWxlZENvbnRlbnRFeHRlbnNpb246OmNyZWF0ZShXVEY6Om1vdmUoY29t cGlsZWRDb250ZW50RXh0ZW5zaW9uRGF0YS5ieXRlY29kZSksIFdURjo6bW92ZShjb21waWxlZENv bnRlbnRFeHRlbnNpb25EYXRhLmFjdGlvbnMpKTsKKyAgICBhdXRvIGNvbXBpbGVkQ29udGVudEV4 dGVuc2lvbiA9IFdlYktpdDo6V2ViQ29tcGlsZWRDb250ZW50RXh0ZW5zaW9uOjpjcmVhdGVGcm9t Q29tcGlsZWRDb250ZW50RXh0ZW5zaW9uRGF0YShjb21waWxlZENvbnRlbnRFeHRlbnNpb25EYXRh KTsKIAogICAgIHJldHVybiB0b0FQSSgmQVBJOjpVc2VyQ29udGVudEV4dGVuc2lvbjo6Y3JlYXRl KHRvV1RGU3RyaW5nKG5hbWVSZWYpLCBXVEY6Om1vdmUoY29tcGlsZWRDb250ZW50RXh0ZW5zaW9u KSkubGVha1JlZigpKTsKICNlbHNlCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJ L0NvY29hL19XS1VzZXJDb250ZW50RmlsdGVyLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvX1dLVXNlckNvbnRlbnRGaWx0ZXIubW0JKHJldmlzaW9u IDE4MTIwMCkKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvX1dLVXNlckNv bnRlbnRGaWx0ZXIubW0JKHdvcmtpbmcgY29weSkKQEAgLTM5LDcgKzM5LDcgQEAgLSAoaW5zdGFu Y2V0eXBlKWluaXRXaXRoTmFtZTooTlNTdHJpbmcgKgogICAgICAgICByZXR1cm4gbmlsOwogCiAg ICAgYXV0byBjb21waWxlZENvbnRlbnRFeHRlbnNpb25EYXRhID0gV2ViQ29yZTo6Q29udGVudEV4 dGVuc2lvbnM6OmNvbXBpbGVSdWxlTGlzdChTdHJpbmcoc2VyaWFsaXplZFJ1bGVzKSk7Ci0gICAg YXV0byBjb21waWxlZENvbnRlbnRFeHRlbnNpb24gPSBXZWJLaXQ6OldlYkNvbXBpbGVkQ29udGVu dEV4dGVuc2lvbjo6Y3JlYXRlKFdURjo6bW92ZShjb21waWxlZENvbnRlbnRFeHRlbnNpb25EYXRh LmJ5dGVjb2RlKSwgV1RGOjptb3ZlKGNvbXBpbGVkQ29udGVudEV4dGVuc2lvbkRhdGEuYWN0aW9u cykpOworICAgIGF1dG8gY29tcGlsZWRDb250ZW50RXh0ZW5zaW9uID0gV2ViS2l0OjpXZWJDb21w aWxlZENvbnRlbnRFeHRlbnNpb246OmNyZWF0ZUZyb21Db21waWxlZENvbnRlbnRFeHRlbnNpb25E YXRhKGNvbXBpbGVkQ29udGVudEV4dGVuc2lvbkRhdGEpOwogCiAgICAgQVBJOjpPYmplY3Q6OmNv bnN0cnVjdEluV3JhcHBlcjxBUEk6OlVzZXJDb250ZW50RXh0ZW5zaW9uPihzZWxmLCBTdHJpbmco bmFtZSksIFdURjo6bW92ZShjb21waWxlZENvbnRlbnRFeHRlbnNpb24pKTsKIApJbmRleDogU291 cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9Vc2VyQ29udGVudC9XZWJVc2VyQ29udGVudENvbnRyb2xs ZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvVXNlckNvbnRl bnQvV2ViVXNlckNvbnRlbnRDb250cm9sbGVyLmNwcAkocmV2aXNpb24gMTgxMjAwKQorKysgU291 cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9Vc2VyQ29udGVudC9XZWJVc2VyQ29udGVudENvbnRyb2xs ZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xODYsNyArMTg2LDcgQEAgdm9pZCBXZWJVc2VyQ29u dGVudENvbnRyb2xsZXI6OmFkZFVzZXJDbwogewogICAgIGZvciAoY29uc3QgYXV0byYgdXNlckNv bnRlbnRFeHRlbnNpb24gOiB1c2VyQ29udGVudEV4dGVuc2lvbnMpIHsKICAgICAgICAgV2ViQ29t cGlsZWRDb250ZW50RXh0ZW5zaW9uRGF0YSBjb250ZW50RXh0ZW5zaW9uRGF0YSA9IHVzZXJDb250 ZW50RXh0ZW5zaW9uLnNlY29uZDsKLSAgICAgICAgUmVmUHRyPFdlYkNvbXBpbGVkQ29udGVudEV4 dGVuc2lvbj4gY29tcGlsZWRDb250ZW50RXh0ZW5zaW9uID0gV2ViQ29tcGlsZWRDb250ZW50RXh0 ZW5zaW9uOjpjcmVhdGUoV1RGOjptb3ZlKGNvbnRlbnRFeHRlbnNpb25EYXRhLmJ5dGVjb2RlKSwg V1RGOjptb3ZlKGNvbnRlbnRFeHRlbnNpb25EYXRhLmFjdGlvbnMpKTsKKyAgICAgICAgUmVmUHRy PFdlYkNvbXBpbGVkQ29udGVudEV4dGVuc2lvbj4gY29tcGlsZWRDb250ZW50RXh0ZW5zaW9uID0g V2ViQ29tcGlsZWRDb250ZW50RXh0ZW5zaW9uOjpjcmVhdGUoV1RGOjptb3ZlKGNvbnRlbnRFeHRl bnNpb25EYXRhKSk7CiAgICAgICAgIG1fdXNlckNvbnRlbnRDb250cm9sbGVyLT5hZGRVc2VyQ29u dGVudEV4dGVuc2lvbih1c2VyQ29udGVudEV4dGVuc2lvbi5maXJzdCwgY29tcGlsZWRDb250ZW50 RXh0ZW5zaW9uKTsKICAgICB9CiB9CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dl YlBhZ2UvV2ViUGFnZUdyb3VwUHJveHkuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQy L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlR3JvdXBQcm94eS5jcHAJKHJldmlzaW9uIDE4MTIw MCkKKysrIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlR3JvdXBQcm94 eS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEwMCw3ICsxMDAsNyBAQCB2b2lkIFdlYlBhZ2VHcm91 cFByb3h5OjpyZW1vdmVBbGxVc2VyQ29uCiAjaWYgRU5BQkxFKENPTlRFTlRfRVhURU5TSU9OUykK IHZvaWQgV2ViUGFnZUdyb3VwUHJveHk6OmFkZFVzZXJDb250ZW50RXh0ZW5zaW9uKGNvbnN0IFN0 cmluZyYgbmFtZSwgV2ViQ29tcGlsZWRDb250ZW50RXh0ZW5zaW9uRGF0YSBjb250ZW50RXh0ZW5z aW9uRGF0YSkKIHsKLSAgICBSZWZQdHI8V2ViQ29tcGlsZWRDb250ZW50RXh0ZW5zaW9uPiBjb21w aWxlZENvbnRlbnRFeHRlbnNpb24gPSBXZWJDb21waWxlZENvbnRlbnRFeHRlbnNpb246OmNyZWF0 ZShXVEY6Om1vdmUoY29udGVudEV4dGVuc2lvbkRhdGEuYnl0ZWNvZGUpLCBXVEY6Om1vdmUoY29u dGVudEV4dGVuc2lvbkRhdGEuYWN0aW9ucykpOworICAgIFJlZlB0cjxXZWJDb21waWxlZENvbnRl bnRFeHRlbnNpb24+IGNvbXBpbGVkQ29udGVudEV4dGVuc2lvbiA9IFdlYkNvbXBpbGVkQ29udGVu dEV4dGVuc2lvbjo6Y3JlYXRlKFdURjo6bW92ZShjb250ZW50RXh0ZW5zaW9uRGF0YSkpOwogICAg IHVzZXJDb250ZW50Q29udHJvbGxlcigpLmFkZFVzZXJDb250ZW50RXh0ZW5zaW9uKG5hbWUsIGNv bXBpbGVkQ29udGVudEV4dGVuc2lvbik7CiB9CiAK