78605 2012-02-14 07:52:44 -0800 Separate mimetype and file extension mapping API from WebKit/blackberry/Api/WebKitTextCodec and complete it. 2012-02-14 13:17:35 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other Other RESOLVED FIXED P1 Minor --- 0 liachen webkit-unassigned rwlbuis staikos webkit.review.bot yong.li.webkit oldest_to_newest 556302 0 liachen 2012-02-14 07:52:44 -0800 Right now there is an getExtensionForMimeType() in WebKitTextCodec, it should be in its own files and another matching function, getMimeTypeFromExtension() is needed. 556457 1 127007 liachen 2012-02-14 11:41:57 -0800 Created attachment 127007 Patch for 78605. 556467 2 127007 rwlbuis 2012-02-14 12:00:05 -0800 Comment on attachment 127007 Patch for 78605. View in context: https://bugs.webkit.org/attachment.cgi?id=127007&action=review ChangeLog still needs some fixing > Source/WebKit/ChangeLog:4 > + Now the MIME type and file extension mapping API are in WebKitMIMETypeConverter. The explanation should go below the Reviewed By line. > Source/WebKit/ChangeLog:17 > + * blackberry/CMakeListsBlackBerry.txt: The ChangeLog does not include all changes below. 556487 3 127015 liachen 2012-02-14 12:22:44 -0800 Created attachment 127015 Patch for 78605 with updated ChangeLog 556493 4 127015 rwlbuis 2012-02-14 12:28:10 -0800 Comment on attachment 127015 Patch for 78605 with updated ChangeLog Looks good. 556543 5 127015 webkit.review.bot 2012-02-14 13:17:18 -0800 Comment on attachment 127015 Patch for 78605 with updated ChangeLog Clearing flags on attachment: 127015 Committed r107730: <http://trac.webkit.org/changeset/107730> 556544 6 webkit.review.bot 2012-02-14 13:17:35 -0800 All reviewed patches have been landed. Closing bug. 127007 2012-02-14 11:41:57 -0800 2012-02-14 12:00:05 -0800 Patch for 78605. 78605.patch text/plain 7120 liachen ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFu Z2VMb2cKaW5kZXggOGZiYmQxMy4uNWRjMzgwMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9D aGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMSBAQAor MjAxMi0wMi0xNCAgTGlhbmdodWkgQ2hlbiAgPGxpYWNoZW5AcmltLmNvbT4KKworICAgICAgICBT ZXBhcmF0ZSBtaW1ldHlwZSBhbmQgZmlsZSBleHRlbnNpb24gbWFwcGluZyBBUEkgZnJvbSBXZWJL aXQvYmxhY2tiZXJyeS9BcGkvV2ViS2l0VGV4dENvZGVjIGFuZCBjb21wbGV0ZSBpdC4KKyAgICAg ICAgTm93IHRoZSBNSU1FIHR5cGUgYW5kIGZpbGUgZXh0ZW5zaW9uIG1hcHBpbmcgQVBJIGFyZSBp biBXZWJLaXRNSU1FVHlwZUNvbnZlcnRlci4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTc4NjA1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgKiBibGFja2JlcnJ5L0FwaS9XZWJLaXRNSU1FVHlwZUNvbnZlcnRl ci5jcHA6IEFkZGVkLgorICAgICAgICAoV2ViS2l0KToKKyAgICAgICAgKEJsYWNrQmVycnk6Oldl YktpdDo6Z2V0RXh0ZW5zaW9uRm9yTWltZVR5cGUpOgorICAgICAgICAoQmxhY2tCZXJyeTo6V2Vi S2l0OjpnZXRNaW1lVHlwZUZvckV4dGVuc2lvbik6CisgICAgICAgICogYmxhY2tiZXJyeS9BcGkv V2ViS2l0TUlNRVR5cGVDb252ZXJ0ZXIuaDogQWRkZWQuCisgICAgICAgIChXZWJLaXQpOgorICAg ICAgICAqIGJsYWNrYmVycnkvQXBpL1dlYktpdFRleHRDb2RlYy5jcHA6CisgICAgICAgICogYmxh Y2tiZXJyeS9BcGkvV2ViS2l0VGV4dENvZGVjLmg6CisgICAgICAgICogYmxhY2tiZXJyeS9DTWFr ZUxpc3RzQmxhY2tCZXJyeS50eHQ6CisKIDIwMTItMDItMTQgIFJvYiBCdWlzICA8cmJ1aXNAcmlt LmNvbT4KIAogICAgICAgICBbQmxhY2tCZXJyeV0gVXBzdHJlYW0gYmFja2luZyBzdG9yZSByZWxh dGVkIGNsYXNzZXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2Vi S2l0TUlNRVR5cGVDb252ZXJ0ZXIuY3BwIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9X ZWJLaXRNSU1FVHlwZUNvbnZlcnRlci5jcHAKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAw MDAwMC4uOWM5OGFmNAotLS0gL2Rldi9udWxsCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJy eS9BcGkvV2ViS2l0TUlNRVR5cGVDb252ZXJ0ZXIuY3BwCkBAIC0wLDAgKzEsNTYgQEAKKy8qCisg KiBDb3B5cmlnaHQgKEMpIDIwMTIgUmVzZWFyY2ggSW4gTW90aW9uIExpbWl0ZWQuIEFsbCByaWdo dHMgcmVzZXJ2ZWQuCisgKgorICogVGhpcyBsaWJyYXJ5IGlzIGZyZWUgc29mdHdhcmU7IHlvdSBj YW4gcmVkaXN0cmlidXRlIGl0IGFuZC9vcgorICogbW9kaWZ5IGl0IHVuZGVyIHRoZSB0ZXJtcyBv ZiB0aGUgR05VIExlc3NlciBHZW5lcmFsIFB1YmxpYworICogTGljZW5zZSBhcyBwdWJsaXNoZWQg YnkgdGhlIEZyZWUgU29mdHdhcmUgRm91bmRhdGlvbjsgZWl0aGVyCisgKiB2ZXJzaW9uIDIgb2Yg dGhlIExpY2Vuc2UsIG9yIChhdCB5b3VyIG9wdGlvbikgYW55IGxhdGVyIHZlcnNpb24uCisgKgor ICogVGhpcyBsaWJyYXJ5IGlzIGRpc3RyaWJ1dGVkIGluIHRoZSBob3BlIHRoYXQgaXQgd2lsbCBi ZSB1c2VmdWwsCisgKiBidXQgV0lUSE9VVCBBTlkgV0FSUkFOVFk7IHdpdGhvdXQgZXZlbiB0aGUg aW1wbGllZCB3YXJyYW50eSBvZgorICogTUVSQ0hBTlRBQklMSVRZIG9yIEZJVE5FU1MgRk9SIEEg UEFSVElDVUxBUiBQVVJQT1NFLiAgU2VlIHRoZSBHTlUKKyAqIExlc3NlciBHZW5lcmFsIFB1Ymxp YyBMaWNlbnNlIGZvciBtb3JlIGRldGFpbHMuCisgKgorICogWW91IHNob3VsZCBoYXZlIHJlY2Vp dmVkIGEgY29weSBvZiB0aGUgR05VIExlc3NlciBHZW5lcmFsIFB1YmxpYworICogTGljZW5zZSBh bG9uZyB3aXRoIHRoaXMgbGlicmFyeTsgaWYgbm90LCB3cml0ZSB0byB0aGUgRnJlZSBTb2Z0d2Fy ZQorICogRm91bmRhdGlvbiwgSW5jLiwgNTEgRnJhbmtsaW4gU3RyZWV0LCBGaWZ0aCBGbG9vciwg Qm9zdG9uLCBNQSAgMDIxMTAtMTMwMSAgVVNBCisgKi8KKworI2luY2x1ZGUgImNvbmZpZy5oIgor I2luY2x1ZGUgIldlYktpdE1JTUVUeXBlQ29udmVydGVyLmgiCisKKyNpbmNsdWRlICJNSU1FVHlw ZVJlZ2lzdHJ5LmgiCisjaW5jbHVkZSA8d3RmL3RleHQvQ1N0cmluZy5oPgorI2luY2x1ZGUgPHd0 Zi90ZXh0L1dURlN0cmluZy5oPgorCituYW1lc3BhY2UgQmxhY2tCZXJyeSB7CituYW1lc3BhY2Ug V2ViS2l0IHsKKworYm9vbCBnZXRFeHRlbnNpb25Gb3JNaW1lVHlwZShjb25zdCBzdGQ6OnN0cmlu ZyYgbWltZSwgc3RkOjpzdHJpbmcmIGV4dGVuc2lvbikKK3sKKyAgICBTdHJpbmcgbWltZVR5cGUo bWltZS5kYXRhKCksIG1pbWUubGVuZ3RoKCkpOworICAgIFN0cmluZyBwcmVmZXJyZWRFeHRlbnNp b24gPSBXZWJDb3JlOjpNSU1FVHlwZVJlZ2lzdHJ5OjpnZXRQcmVmZXJyZWRFeHRlbnNpb25Gb3JN SU1FVHlwZShtaW1lVHlwZSk7CisgICAgaWYgKHByZWZlcnJlZEV4dGVuc2lvbi5pc0VtcHR5KCkp CisgICAgICAgIHJldHVybiBmYWxzZTsKKworICAgIENTdHJpbmcgdXRmOCA9IHByZWZlcnJlZEV4 dGVuc2lvbi51dGY4KCk7CisgICAgZXh0ZW5zaW9uLmNsZWFyKCk7CisgICAgZXh0ZW5zaW9uLmFw cGVuZCh1dGY4LmRhdGEoKSwgdXRmOC5sZW5ndGgoKSk7CisgICAgcmV0dXJuIHRydWU7Cit9CisK K2Jvb2wgZ2V0TWltZVR5cGVGb3JFeHRlbnNpb24oY29uc3Qgc3RkOjpzdHJpbmcmIGV4dGVuc2lv biwgc3RkOjpzdHJpbmcmIG1pbWVUeXBlKQoreworICAgIFN0cmluZyBleHRTdHIoZXh0ZW5zaW9u LmRhdGEoKSwgZXh0ZW5zaW9uLmxlbmd0aCgpKTsKKyAgICBTdHJpbmcgbWltZSA9IFdlYkNvcmU6 Ok1JTUVUeXBlUmVnaXN0cnk6OmdldE1lZGlhTUlNRVR5cGVGb3JFeHRlbnNpb24oZXh0U3RyKTsK KyAgICBpZiAobWltZS5pc0VtcHR5KCkpCisgICAgICAgIHJldHVybiBmYWxzZTsKKworICAgIENT dHJpbmcgdXRmOCA9IG1pbWUudXRmOCgpOworICAgIG1pbWVUeXBlLmNsZWFyKCk7CisgICAgbWlt ZVR5cGUuYXBwZW5kKHV0ZjguZGF0YSgpLCB1dGY4Lmxlbmd0aCgpKTsKKyAgICByZXR1cm4gdHJ1 ZTsKK30KKworfSAvLyBuYW1lc3BhY2UgV2ViS2l0Cit9IC8vIG5hbWVzcGFjZSBCbGFja0JlcnJ5 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYktpdE1JTUVUeXBl Q29udmVydGVyLmggYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYktpdE1JTUVUeXBl Q29udmVydGVyLmgKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uM2ZmM2Q3NAot LS0gL2Rldi9udWxsCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2ViS2l0TUlN RVR5cGVDb252ZXJ0ZXIuaApAQCAtMCwwICsxLDM0IEBACisvKgorICogQ29weXJpZ2h0IChDKSAy MDEyIFJlc2VhcmNoIEluIE1vdGlvbiBMaW1pdGVkLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICoK KyAqIFRoaXMgbGlicmFyeSBpcyBmcmVlIHNvZnR3YXJlOyB5b3UgY2FuIHJlZGlzdHJpYnV0ZSBp dCBhbmQvb3IKKyAqIG1vZGlmeSBpdCB1bmRlciB0aGUgdGVybXMgb2YgdGhlIEdOVSBMZXNzZXIg R2VuZXJhbCBQdWJsaWMKKyAqIExpY2Vuc2UgYXMgcHVibGlzaGVkIGJ5IHRoZSBGcmVlIFNvZnR3 YXJlIEZvdW5kYXRpb247IGVpdGhlcgorICogdmVyc2lvbiAyIG9mIHRoZSBMaWNlbnNlLCBvciAo YXQgeW91ciBvcHRpb24pIGFueSBsYXRlciB2ZXJzaW9uLgorICoKKyAqIFRoaXMgbGlicmFyeSBp cyBkaXN0cmlidXRlZCBpbiB0aGUgaG9wZSB0aGF0IGl0IHdpbGwgYmUgdXNlZnVsLAorICogYnV0 IFdJVEhPVVQgQU5ZIFdBUlJBTlRZOyB3aXRob3V0IGV2ZW4gdGhlIGltcGxpZWQgd2FycmFudHkg b2YKKyAqIE1FUkNIQU5UQUJJTElUWSBvciBGSVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIgUFVSUE9T RS4gIFNlZSB0aGUgR05VCisgKiBMZXNzZXIgR2VuZXJhbCBQdWJsaWMgTGljZW5zZSBmb3IgbW9y ZSBkZXRhaWxzLgorICoKKyAqIFlvdSBzaG91bGQgaGF2ZSByZWNlaXZlZCBhIGNvcHkgb2YgdGhl IEdOVSBMZXNzZXIgR2VuZXJhbCBQdWJsaWMKKyAqIExpY2Vuc2UgYWxvbmcgd2l0aCB0aGlzIGxp YnJhcnk7IGlmIG5vdCwgd3JpdGUgdG8gdGhlIEZyZWUgU29mdHdhcmUKKyAqIEZvdW5kYXRpb24s IEluYy4sIDUxIEZyYW5rbGluIFN0cmVldCwgRmlmdGggRmxvb3IsIEJvc3RvbiwgTUEgIDAyMTEw LTEzMDEgIFVTQQorICovCisKKyNpZm5kZWYgV2ViS2l0TUlNRVR5cGVDb252ZXJ0ZXJfaAorI2Rl ZmluZSBXZWJLaXRNSU1FVHlwZUNvbnZlcnRlcl9oCisKKyNpbmNsdWRlICJCbGFja0JlcnJ5R2xv YmFsLmgiCisjaW5jbHVkZSA8c3RyaW5nPgorCituYW1lc3BhY2UgQmxhY2tCZXJyeSB7CituYW1l c3BhY2UgV2ViS2l0IHsKKworQkxBQ0tCRVJSWV9FWFBPUlQgYm9vbCBnZXRFeHRlbnNpb25Gb3JN aW1lVHlwZShjb25zdCBzdGQ6OnN0cmluZyYgbWltZSwgc3RkOjpzdHJpbmcmIGV4dGVuc2lvbik7 CitCTEFDS0JFUlJZX0VYUE9SVCBib29sIGdldE1pbWVUeXBlRm9yRXh0ZW5zaW9uKGNvbnN0IHN0 ZDo6c3RyaW5nJiBleHRlbnNpb24sIHN0ZDo6c3RyaW5nJiBtaW1lVHlwZSk7CisKK30gLy8gbmFt ZXNwYWNlIFdlYktpdAorfSAvLyBuYW1lc3BhY2UgQmxhY2tCZXJyeQorCisjZW5kaWYgLy8gV2Vi S2l0TUlNRVR5cGVDb252ZXJ0ZXJfaApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9ibGFja2Jl cnJ5L0FwaS9XZWJLaXRUZXh0Q29kZWMuY3BwIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0Fw aS9XZWJLaXRUZXh0Q29kZWMuY3BwCmluZGV4IGJhZGIzMWYuLjMyNTA2MDEgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2ViS2l0VGV4dENvZGVjLmNwcAorKysgYi9T b3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYktpdFRleHRDb2RlYy5jcHAKQEAgLTIxLDcg KzIxLDYgQEAKIAogI2luY2x1ZGUgIkJhc2U2NC5oIgogI2luY2x1ZGUgIktVUkwuaCIKLSNpbmNs dWRlICJNSU1FVHlwZVJlZ2lzdHJ5LmgiCiAjaW5jbHVkZSAiVGV4dENvZGVjSUNVLmgiCiAjaW5j bHVkZSA8d3RmL1ZlY3Rvci5oPgogI2luY2x1ZGUgPHd0Zi90ZXh0L0NTdHJpbmcuaD4KQEAgLTEz NCwxOCArMTMzLDUgQEAgdm9pZCBlc2NhcGVVUkwoY29uc3Qgc3RkOjpzdHJpbmcmIHVybCwgc3Rk OjpzdHJpbmcmIGVzY2FwZWQpCiAgICAgZXNjYXBlZC5hcHBlbmQodXRmOC5kYXRhKCksIHV0Zjgu bGVuZ3RoKCkpOwogfQogCi1ib29sIGdldEV4dGVuc2lvbkZvck1pbWVUeXBlKGNvbnN0IHN0ZDo6 c3RyaW5nJiBtaW1lLCBzdGQ6OnN0cmluZyYgZXh0ZW5zaW9uKQotewotICAgIFN0cmluZyBtaW1l VHlwZShtaW1lLmRhdGEoKSwgbWltZS5sZW5ndGgoKSk7Ci0gICAgU3RyaW5nIHByZWZlcnJlZEV4 dGVuc2lvbiA9IFdlYkNvcmU6Ok1JTUVUeXBlUmVnaXN0cnk6OmdldFByZWZlcnJlZEV4dGVuc2lv bkZvck1JTUVUeXBlKG1pbWVUeXBlKTsKLSAgICBpZiAocHJlZmVycmVkRXh0ZW5zaW9uLmlzRW1w dHkoKSkKLSAgICAgICAgcmV0dXJuIGZhbHNlOwotCi0gICAgQ1N0cmluZyB1dGY4ID0gcHJlZmVy cmVkRXh0ZW5zaW9uLnV0ZjgoKTsKLSAgICBleHRlbnNpb24uY2xlYXIoKTsKLSAgICBleHRlbnNp b24uYXBwZW5kKHV0ZjguZGF0YSgpLCB1dGY4Lmxlbmd0aCgpKTsKLSAgICByZXR1cm4gdHJ1ZTsK LX0KLQogfSAvLyBuYW1lc3BhY2UgV2ViS2l0CiB9IC8vIG5hbWVzcGFjZSBCbGFja0JlcnJ5CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYktpdFRleHRDb2RlYy5o IGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9XZWJLaXRUZXh0Q29kZWMuaAppbmRleCAz MTg0MTFhLi4yODM0YmU3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBp L1dlYktpdFRleHRDb2RlYy5oCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2Vi S2l0VGV4dENvZGVjLmgKQEAgLTU1LDggKzU1LDYgQEAgQkxBQ0tCRVJSWV9FWFBPUlQgYm9vbCBi YXNlNjRFbmNvZGUoY29uc3Qgc3RkOjp2ZWN0b3I8Y2hhcj4mIGJpbmFyeSwgc3RkOjpzdHJpbmcK IEJMQUNLQkVSUllfRVhQT1JUIHZvaWQgdW5lc2NhcGVVUkwoY29uc3Qgc3RkOjpzdHJpbmcmIGVz Y2FwZWQsIHN0ZDo6c3RyaW5nJiB1cmwpOwogQkxBQ0tCRVJSWV9FWFBPUlQgdm9pZCBlc2NhcGVV UkwoY29uc3Qgc3RkOjpzdHJpbmcmIHVybCwgc3RkOjpzdHJpbmcmIGVzY2FwZWQpOwogCi1CTEFD S0JFUlJZX0VYUE9SVCBib29sIGdldEV4dGVuc2lvbkZvck1pbWVUeXBlKGNvbnN0IHN0ZDo6c3Ry aW5nJiBtaW1lLCBzdGQ6OnN0cmluZyYgZXh0ZW5zaW9uKTsKLQogfSAvLyBuYW1lc3BhY2UgV2Vi S2l0CiB9IC8vIG5hbWVzcGFjZSBCbGFja0JlcnJ5CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQvYmxhY2tiZXJyeS9DTWFrZUxpc3RzQmxhY2tCZXJyeS50eHQgYi9Tb3VyY2UvV2ViS2l0L2Js YWNrYmVycnkvQ01ha2VMaXN0c0JsYWNrQmVycnkudHh0CmluZGV4IGQwZTI3Y2YuLmVlMzZiNDgg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9DTWFrZUxpc3RzQmxhY2tCZXJy eS50eHQKKysrIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0NNYWtlTGlzdHNCbGFja0JlcnJ5 LnR4dApAQCAtNDIsNiArNDIsNyBAQCBMSVNUKEFQUEVORCBXZWJLaXRfU09VUkNFUwogICAgIGJs YWNrYmVycnkvQXBpL0JsYWNrQmVycnlHbG9iYWwuY3BwCiAgICAgYmxhY2tiZXJyeS9BcGkvV2Vi U3RyaW5nLmNwcAogICAgIGJsYWNrYmVycnkvQXBpL1Jlc291cmNlSG9sZGVySW1wbC5jcHAKKyAg ICBibGFja2JlcnJ5L0FwaS9XZWJLaXRNSU1FVHlwZUNvbnZlcnRlci5jcHAKICAgICBibGFja2Jl cnJ5L0FwaS9XZWJLaXRUZXh0Q29kZWMuY3BwCiAgICAgYmxhY2tiZXJyeS9BcGkvV2ViUGFnZS5j cHAKICAgICBibGFja2JlcnJ5L0FwaS9XZWJQYWdlR3JvdXBMb2FkRGVmZXJyZXIuY3BwCg== 127015 2012-02-14 12:22:44 -0800 2012-02-14 13:17:17 -0800 Patch for 78605 with updated ChangeLog 78605.patch text/plain 7122 liachen ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFu Z2VMb2cKaW5kZXggOGZiYmQxMy4uYjMyNTdiMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9D aGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMiBAQAor MjAxMi0wMi0xNCAgTGlhbmdodWkgQ2hlbiAgPGxpYWNoZW5AcmltLmNvbT4KKworICAgICAgICBT ZXBhcmF0ZSBtaW1ldHlwZSBhbmQgZmlsZSBleHRlbnNpb24gbWFwcGluZyBBUEkgZnJvbSBXZWJL aXQvYmxhY2tiZXJyeS9BcGkvV2ViS2l0VGV4dENvZGVjIGFuZCBjb21wbGV0ZSBpdC4KKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTc4NjA1CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTm93IHRoZSBNSU1FIHR5 cGUgYW5kIGZpbGUgZXh0ZW5zaW9uIG1hcHBpbmcgQVBJIGFyZSBpbiBXZWJLaXRNSU1FVHlwZUNv bnZlcnRlci4KKworICAgICAgICAqIGJsYWNrYmVycnkvQXBpL1dlYktpdE1JTUVUeXBlQ29udmVy dGVyLmNwcDogQWRkZWQuCisgICAgICAgIChXZWJLaXQpOgorICAgICAgICAoQmxhY2tCZXJyeTo6 V2ViS2l0OjpnZXRFeHRlbnNpb25Gb3JNaW1lVHlwZSk6CisgICAgICAgIChCbGFja0JlcnJ5OjpX ZWJLaXQ6OmdldE1pbWVUeXBlRm9yRXh0ZW5zaW9uKToKKyAgICAgICAgKiBibGFja2JlcnJ5L0Fw aS9XZWJLaXRNSU1FVHlwZUNvbnZlcnRlci5oOiBBZGRlZC4KKyAgICAgICAgKFdlYktpdCk6Cisg ICAgICAgICogYmxhY2tiZXJyeS9BcGkvV2ViS2l0VGV4dENvZGVjLmNwcDoKKyAgICAgICAgKiBi bGFja2JlcnJ5L0FwaS9XZWJLaXRUZXh0Q29kZWMuaDoKKyAgICAgICAgKiBibGFja2JlcnJ5L0NN YWtlTGlzdHNCbGFja0JlcnJ5LnR4dDoKKwogMjAxMi0wMi0xNCAgUm9iIEJ1aXMgIDxyYnVpc0By aW0uY29tPgogCiAgICAgICAgIFtCbGFja0JlcnJ5XSBVcHN0cmVhbSBiYWNraW5nIHN0b3JlIHJl bGF0ZWQgY2xhc3NlcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9X ZWJLaXRNSU1FVHlwZUNvbnZlcnRlci5jcHAgYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBp L1dlYktpdE1JTUVUeXBlQ29udmVydGVyLmNwcApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAw MDAwMDAwLi45Yzk4YWY0Ci0tLSAvZGV2L251bGwKKysrIGIvU291cmNlL1dlYktpdC9ibGFja2Jl cnJ5L0FwaS9XZWJLaXRNSU1FVHlwZUNvbnZlcnRlci5jcHAKQEAgLTAsMCArMSw1NiBAQAorLyoK KyAqIENvcHlyaWdodCAoQykgMjAxMiBSZXNlYXJjaCBJbiBNb3Rpb24gTGltaXRlZC4gQWxsIHJp Z2h0cyByZXNlcnZlZC4KKyAqCisgKiBUaGlzIGxpYnJhcnkgaXMgZnJlZSBzb2Z0d2FyZTsgeW91 IGNhbiByZWRpc3RyaWJ1dGUgaXQgYW5kL29yCisgKiBtb2RpZnkgaXQgdW5kZXIgdGhlIHRlcm1z IG9mIHRoZSBHTlUgTGVzc2VyIEdlbmVyYWwgUHVibGljCisgKiBMaWNlbnNlIGFzIHB1Ymxpc2hl ZCBieSB0aGUgRnJlZSBTb2Z0d2FyZSBGb3VuZGF0aW9uOyBlaXRoZXIKKyAqIHZlcnNpb24gMiBv ZiB0aGUgTGljZW5zZSwgb3IgKGF0IHlvdXIgb3B0aW9uKSBhbnkgbGF0ZXIgdmVyc2lvbi4KKyAq CisgKiBUaGlzIGxpYnJhcnkgaXMgZGlzdHJpYnV0ZWQgaW4gdGhlIGhvcGUgdGhhdCBpdCB3aWxs IGJlIHVzZWZ1bCwKKyAqIGJ1dCBXSVRIT1VUIEFOWSBXQVJSQU5UWTsgd2l0aG91dCBldmVuIHRo ZSBpbXBsaWVkIHdhcnJhbnR5IG9mCisgKiBNRVJDSEFOVEFCSUxJVFkgb3IgRklUTkVTUyBGT1Ig QSBQQVJUSUNVTEFSIFBVUlBPU0UuICBTZWUgdGhlIEdOVQorICogTGVzc2VyIEdlbmVyYWwgUHVi bGljIExpY2Vuc2UgZm9yIG1vcmUgZGV0YWlscy4KKyAqCisgKiBZb3Ugc2hvdWxkIGhhdmUgcmVj ZWl2ZWQgYSBjb3B5IG9mIHRoZSBHTlUgTGVzc2VyIEdlbmVyYWwgUHVibGljCisgKiBMaWNlbnNl IGFsb25nIHdpdGggdGhpcyBsaWJyYXJ5OyBpZiBub3QsIHdyaXRlIHRvIHRoZSBGcmVlIFNvZnR3 YXJlCisgKiBGb3VuZGF0aW9uLCBJbmMuLCA1MSBGcmFua2xpbiBTdHJlZXQsIEZpZnRoIEZsb29y LCBCb3N0b24sIE1BICAwMjExMC0xMzAxICBVU0EKKyAqLworCisjaW5jbHVkZSAiY29uZmlnLmgi CisjaW5jbHVkZSAiV2ViS2l0TUlNRVR5cGVDb252ZXJ0ZXIuaCIKKworI2luY2x1ZGUgIk1JTUVU eXBlUmVnaXN0cnkuaCIKKyNpbmNsdWRlIDx3dGYvdGV4dC9DU3RyaW5nLmg+CisjaW5jbHVkZSA8 d3RmL3RleHQvV1RGU3RyaW5nLmg+CisKK25hbWVzcGFjZSBCbGFja0JlcnJ5IHsKK25hbWVzcGFj ZSBXZWJLaXQgeworCitib29sIGdldEV4dGVuc2lvbkZvck1pbWVUeXBlKGNvbnN0IHN0ZDo6c3Ry aW5nJiBtaW1lLCBzdGQ6OnN0cmluZyYgZXh0ZW5zaW9uKQoreworICAgIFN0cmluZyBtaW1lVHlw ZShtaW1lLmRhdGEoKSwgbWltZS5sZW5ndGgoKSk7CisgICAgU3RyaW5nIHByZWZlcnJlZEV4dGVu c2lvbiA9IFdlYkNvcmU6Ok1JTUVUeXBlUmVnaXN0cnk6OmdldFByZWZlcnJlZEV4dGVuc2lvbkZv ck1JTUVUeXBlKG1pbWVUeXBlKTsKKyAgICBpZiAocHJlZmVycmVkRXh0ZW5zaW9uLmlzRW1wdHko KSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOworCisgICAgQ1N0cmluZyB1dGY4ID0gcHJlZmVycmVk RXh0ZW5zaW9uLnV0ZjgoKTsKKyAgICBleHRlbnNpb24uY2xlYXIoKTsKKyAgICBleHRlbnNpb24u YXBwZW5kKHV0ZjguZGF0YSgpLCB1dGY4Lmxlbmd0aCgpKTsKKyAgICByZXR1cm4gdHJ1ZTsKK30K KworYm9vbCBnZXRNaW1lVHlwZUZvckV4dGVuc2lvbihjb25zdCBzdGQ6OnN0cmluZyYgZXh0ZW5z aW9uLCBzdGQ6OnN0cmluZyYgbWltZVR5cGUpCit7CisgICAgU3RyaW5nIGV4dFN0cihleHRlbnNp b24uZGF0YSgpLCBleHRlbnNpb24ubGVuZ3RoKCkpOworICAgIFN0cmluZyBtaW1lID0gV2ViQ29y ZTo6TUlNRVR5cGVSZWdpc3RyeTo6Z2V0TWVkaWFNSU1FVHlwZUZvckV4dGVuc2lvbihleHRTdHIp OworICAgIGlmIChtaW1lLmlzRW1wdHkoKSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOworCisgICAg Q1N0cmluZyB1dGY4ID0gbWltZS51dGY4KCk7CisgICAgbWltZVR5cGUuY2xlYXIoKTsKKyAgICBt aW1lVHlwZS5hcHBlbmQodXRmOC5kYXRhKCksIHV0ZjgubGVuZ3RoKCkpOworICAgIHJldHVybiB0 cnVlOworfQorCit9IC8vIG5hbWVzcGFjZSBXZWJLaXQKK30gLy8gbmFtZXNwYWNlIEJsYWNrQmVy cnkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2ViS2l0TUlNRVR5 cGVDb252ZXJ0ZXIuaCBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2ViS2l0TUlNRVR5 cGVDb252ZXJ0ZXIuaApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi4zZmYzZDc0 Ci0tLSAvZGV2L251bGwKKysrIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9XZWJLaXRN SU1FVHlwZUNvbnZlcnRlci5oCkBAIC0wLDAgKzEsMzQgQEAKKy8qCisgKiBDb3B5cmlnaHQgKEMp IDIwMTIgUmVzZWFyY2ggSW4gTW90aW9uIExpbWl0ZWQuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisg KgorICogVGhpcyBsaWJyYXJ5IGlzIGZyZWUgc29mdHdhcmU7IHlvdSBjYW4gcmVkaXN0cmlidXRl IGl0IGFuZC9vcgorICogbW9kaWZ5IGl0IHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgR05VIExlc3Nl ciBHZW5lcmFsIFB1YmxpYworICogTGljZW5zZSBhcyBwdWJsaXNoZWQgYnkgdGhlIEZyZWUgU29m dHdhcmUgRm91bmRhdGlvbjsgZWl0aGVyCisgKiB2ZXJzaW9uIDIgb2YgdGhlIExpY2Vuc2UsIG9y IChhdCB5b3VyIG9wdGlvbikgYW55IGxhdGVyIHZlcnNpb24uCisgKgorICogVGhpcyBsaWJyYXJ5 IGlzIGRpc3RyaWJ1dGVkIGluIHRoZSBob3BlIHRoYXQgaXQgd2lsbCBiZSB1c2VmdWwsCisgKiBi dXQgV0lUSE9VVCBBTlkgV0FSUkFOVFk7IHdpdGhvdXQgZXZlbiB0aGUgaW1wbGllZCB3YXJyYW50 eSBvZgorICogTUVSQ0hBTlRBQklMSVRZIG9yIEZJVE5FU1MgRk9SIEEgUEFSVElDVUxBUiBQVVJQ T1NFLiAgU2VlIHRoZSBHTlUKKyAqIExlc3NlciBHZW5lcmFsIFB1YmxpYyBMaWNlbnNlIGZvciBt b3JlIGRldGFpbHMuCisgKgorICogWW91IHNob3VsZCBoYXZlIHJlY2VpdmVkIGEgY29weSBvZiB0 aGUgR05VIExlc3NlciBHZW5lcmFsIFB1YmxpYworICogTGljZW5zZSBhbG9uZyB3aXRoIHRoaXMg bGlicmFyeTsgaWYgbm90LCB3cml0ZSB0byB0aGUgRnJlZSBTb2Z0d2FyZQorICogRm91bmRhdGlv biwgSW5jLiwgNTEgRnJhbmtsaW4gU3RyZWV0LCBGaWZ0aCBGbG9vciwgQm9zdG9uLCBNQSAgMDIx MTAtMTMwMSAgVVNBCisgKi8KKworI2lmbmRlZiBXZWJLaXRNSU1FVHlwZUNvbnZlcnRlcl9oCisj ZGVmaW5lIFdlYktpdE1JTUVUeXBlQ29udmVydGVyX2gKKworI2luY2x1ZGUgIkJsYWNrQmVycnlH bG9iYWwuaCIKKyNpbmNsdWRlIDxzdHJpbmc+CisKK25hbWVzcGFjZSBCbGFja0JlcnJ5IHsKK25h bWVzcGFjZSBXZWJLaXQgeworCitCTEFDS0JFUlJZX0VYUE9SVCBib29sIGdldEV4dGVuc2lvbkZv ck1pbWVUeXBlKGNvbnN0IHN0ZDo6c3RyaW5nJiBtaW1lLCBzdGQ6OnN0cmluZyYgZXh0ZW5zaW9u KTsKK0JMQUNLQkVSUllfRVhQT1JUIGJvb2wgZ2V0TWltZVR5cGVGb3JFeHRlbnNpb24oY29uc3Qg c3RkOjpzdHJpbmcmIGV4dGVuc2lvbiwgc3RkOjpzdHJpbmcmIG1pbWVUeXBlKTsKKworfSAvLyBu YW1lc3BhY2UgV2ViS2l0Cit9IC8vIG5hbWVzcGFjZSBCbGFja0JlcnJ5CisKKyNlbmRpZiAvLyBX ZWJLaXRNSU1FVHlwZUNvbnZlcnRlcl9oCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2JsYWNr YmVycnkvQXBpL1dlYktpdFRleHRDb2RlYy5jcHAgYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkv QXBpL1dlYktpdFRleHRDb2RlYy5jcHAKaW5kZXggYmFkYjMxZi4uMzI1MDYwMSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9XZWJLaXRUZXh0Q29kZWMuY3BwCisrKyBi L1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2ViS2l0VGV4dENvZGVjLmNwcApAQCAtMjEs NyArMjEsNiBAQAogCiAjaW5jbHVkZSAiQmFzZTY0LmgiCiAjaW5jbHVkZSAiS1VSTC5oIgotI2lu Y2x1ZGUgIk1JTUVUeXBlUmVnaXN0cnkuaCIKICNpbmNsdWRlICJUZXh0Q29kZWNJQ1UuaCIKICNp bmNsdWRlIDx3dGYvVmVjdG9yLmg+CiAjaW5jbHVkZSA8d3RmL3RleHQvQ1N0cmluZy5oPgpAQCAt MTM0LDE4ICsxMzMsNSBAQCB2b2lkIGVzY2FwZVVSTChjb25zdCBzdGQ6OnN0cmluZyYgdXJsLCBz dGQ6OnN0cmluZyYgZXNjYXBlZCkKICAgICBlc2NhcGVkLmFwcGVuZCh1dGY4LmRhdGEoKSwgdXRm OC5sZW5ndGgoKSk7CiB9CiAKLWJvb2wgZ2V0RXh0ZW5zaW9uRm9yTWltZVR5cGUoY29uc3Qgc3Rk OjpzdHJpbmcmIG1pbWUsIHN0ZDo6c3RyaW5nJiBleHRlbnNpb24pCi17Ci0gICAgU3RyaW5nIG1p bWVUeXBlKG1pbWUuZGF0YSgpLCBtaW1lLmxlbmd0aCgpKTsKLSAgICBTdHJpbmcgcHJlZmVycmVk RXh0ZW5zaW9uID0gV2ViQ29yZTo6TUlNRVR5cGVSZWdpc3RyeTo6Z2V0UHJlZmVycmVkRXh0ZW5z aW9uRm9yTUlNRVR5cGUobWltZVR5cGUpOwotICAgIGlmIChwcmVmZXJyZWRFeHRlbnNpb24uaXNF bXB0eSgpKQotICAgICAgICByZXR1cm4gZmFsc2U7Ci0KLSAgICBDU3RyaW5nIHV0ZjggPSBwcmVm ZXJyZWRFeHRlbnNpb24udXRmOCgpOwotICAgIGV4dGVuc2lvbi5jbGVhcigpOwotICAgIGV4dGVu c2lvbi5hcHBlbmQodXRmOC5kYXRhKCksIHV0ZjgubGVuZ3RoKCkpOwotICAgIHJldHVybiB0cnVl OwotfQotCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQKIH0gLy8gbmFtZXNwYWNlIEJsYWNrQmVycnkK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2ViS2l0VGV4dENvZGVj LmggYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYktpdFRleHRDb2RlYy5oCmluZGV4 IDMxODQxMWEuLjI4MzRiZTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9B cGkvV2ViS2l0VGV4dENvZGVjLmgKKysrIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9X ZWJLaXRUZXh0Q29kZWMuaApAQCAtNTUsOCArNTUsNiBAQCBCTEFDS0JFUlJZX0VYUE9SVCBib29s IGJhc2U2NEVuY29kZShjb25zdCBzdGQ6OnZlY3RvcjxjaGFyPiYgYmluYXJ5LCBzdGQ6OnN0cmlu ZwogQkxBQ0tCRVJSWV9FWFBPUlQgdm9pZCB1bmVzY2FwZVVSTChjb25zdCBzdGQ6OnN0cmluZyYg ZXNjYXBlZCwgc3RkOjpzdHJpbmcmIHVybCk7CiBCTEFDS0JFUlJZX0VYUE9SVCB2b2lkIGVzY2Fw ZVVSTChjb25zdCBzdGQ6OnN0cmluZyYgdXJsLCBzdGQ6OnN0cmluZyYgZXNjYXBlZCk7CiAKLUJM QUNLQkVSUllfRVhQT1JUIGJvb2wgZ2V0RXh0ZW5zaW9uRm9yTWltZVR5cGUoY29uc3Qgc3RkOjpz dHJpbmcmIG1pbWUsIHN0ZDo6c3RyaW5nJiBleHRlbnNpb24pOwotCiB9IC8vIG5hbWVzcGFjZSBX ZWJLaXQKIH0gLy8gbmFtZXNwYWNlIEJsYWNrQmVycnkKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdC9ibGFja2JlcnJ5L0NNYWtlTGlzdHNCbGFja0JlcnJ5LnR4dCBiL1NvdXJjZS9XZWJLaXQv YmxhY2tiZXJyeS9DTWFrZUxpc3RzQmxhY2tCZXJyeS50eHQKaW5kZXggZDBlMjdjZi4uZWUzNmI0 OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0NNYWtlTGlzdHNCbGFja0Jl cnJ5LnR4dAorKysgYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQ01ha2VMaXN0c0JsYWNrQmVy cnkudHh0CkBAIC00Miw2ICs0Miw3IEBAIExJU1QoQVBQRU5EIFdlYktpdF9TT1VSQ0VTCiAgICAg YmxhY2tiZXJyeS9BcGkvQmxhY2tCZXJyeUdsb2JhbC5jcHAKICAgICBibGFja2JlcnJ5L0FwaS9X ZWJTdHJpbmcuY3BwCiAgICAgYmxhY2tiZXJyeS9BcGkvUmVzb3VyY2VIb2xkZXJJbXBsLmNwcAor ICAgIGJsYWNrYmVycnkvQXBpL1dlYktpdE1JTUVUeXBlQ29udmVydGVyLmNwcAogICAgIGJsYWNr YmVycnkvQXBpL1dlYktpdFRleHRDb2RlYy5jcHAKICAgICBibGFja2JlcnJ5L0FwaS9XZWJQYWdl LmNwcAogICAgIGJsYWNrYmVycnkvQXBpL1dlYlBhZ2VHcm91cExvYWREZWZlcnJlci5jcHAK