92482 2012-07-27 03:09:59 -0700 [Microdata] Remove toJs() and toV8Object() custom methods from JSHTMLElementCustom.cpp and V8HTMLElementCustom.cpp respectively. 2012-07-27 10:17:20 -0700 1 1 1 Unclassified WebKit DOM 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 arko arko abarth haraken japhet jochen rniwa webkit.review.bot oldest_to_newest 680387 0 arko 2012-07-27 03:09:59 -0700 Remove toJs() and toV8Object() custom methods from JSHTMLElementCustom.cpp and V8HTMLElementCustom.cpp respectively. We should use toJS() method defined in JSMicroDataItemValue.h and toV8() method defined in V8MicroDataItemValue.h in place of custom toJs() and toV8Object() methods respectively. 680394 1 154893 arko 2012-07-27 03:26:44 -0700 Created attachment 154893 Patch 680398 2 154893 haraken 2012-07-27 03:35:41 -0700 Comment on attachment 154893 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=154893&action=review > Source/WebCore/ChangeLog:12 > + No new tests. Just removed custom JS methods. I think this patch would change the current behavior. Would you add a test or list up a couple of existing tests affected by this change? For example, auto generated V8 code looks like this: inline v8::Handle<v8::Value> toV8(PassRefPtr< MicroDataItemValue > impl, v8::Isolate* isolate = 0) { return toV8(impl.get(), isolate); } which is different from the current toV8() in custom bindings. Auto generated toJS() is also different from the current toJS() in custom bindings. 680547 3 arko 2012-07-27 06:36:55 -0700 Thanks haraken for the review. (In reply to comment #2) > > Source/WebCore/ChangeLog:12 > > + No new tests. Just removed custom JS methods. > > I think this patch would change the current behavior. Would you add a test or list up a couple of existing tests affected by this change? This patch will not change the current behavior. Added list of existing test cases to ensure the same. > For example, auto generated V8 code looks like this: > > inline v8::Handle<v8::Value> toV8(PassRefPtr< MicroDataItemValue > impl, v8::Isolate* isolate = 0) { return toV8(impl.get(), isolate); } > > which is different from the current toV8() in custom bindings. Auto generated toJS() is also different from the current toJS() in custom bindings. MicroDataItemList interface [MicroDataItemList.idl] has CustomToJSObject property specified. CustomToJSObject property allows us to write custom toJS() or toV8(). We have the same toV8() custom binding defined in V8MicroDataItemValueCustom.cpp : http://trac.webkit.org/browser/trunk/Source/WebCore/bindings/v8/custom/V8MicroDataItemValueCustom.cpp#L42. 680549 4 154929 arko 2012-07-27 06:38:07 -0700 Created attachment 154929 Updated patch 680570 5 154929 haraken 2012-07-27 06:46:49 -0700 Comment on attachment 154929 Updated patch I am sorry! I was looking at different toJS()/toV8()... You are completely right! 680770 6 154929 webkit.review.bot 2012-07-27 10:17:16 -0700 Comment on attachment 154929 Updated patch Clearing flags on attachment: 154929 Committed r123880: <http://trac.webkit.org/changeset/123880> 680771 7 webkit.review.bot 2012-07-27 10:17:20 -0700 All reviewed patches have been landed. Closing bug. 154893 2012-07-27 03:26:44 -0700 2012-07-27 06:38:07 -0700 Patch bug-92482-20120727.diff text/plain 3409 arko SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEyMzg1OCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIyIEBACisyMDEyLTA3LTI3ICBBcmtvIFNh aGEgIDxhcmtvQG1vdG9yb2xhLmNvbT4KKworICAgICAgICBNaWNyb2RhdGE6IFJlbW92ZSB0b0pz KCkgYW5kIHRvVjhPYmplY3QoKSBjdXN0b20gbWV0aG9kcyBmcm9tIEpTSFRNTEVsZW1lbnRDdXN0 b20uY3BwIGFuZCBWOEhUTUxFbGVtZW50Q3VzdG9tLmNwcCByZXNwZWN0aXZlbHkuCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05MjQ4MgorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJlbW92ZWQgY3VzdG9tIG1l dGhvZHMgdG9KUygpIGFuZCB0b1Y4T2JqZWN0KCkuIFdlIHNob3VsZCB1c2UgdG9KUygpIG1ldGhv ZCBkZWZpbmVkCisgICAgICAgIGluIEpTTWljcm9EYXRhSXRlbVZhbHVlLmggYW5kIHRvVjgoKSBt ZXRob2QgZGVmaW5lZCBpbiBWOE1pY3JvRGF0YUl0ZW1WYWx1ZS5oCisgICAgICAgIGluIHBsYWNl IG9mIGN1c3RvbSB0b0pzKCkgYW5kIHRvVjhPYmplY3QoKSBtZXRob2RzIHJlc3BlY3RpdmVseS4K KworICAgICAgICBObyBuZXcgdGVzdHMuIEp1c3QgcmVtb3ZlZCBjdXN0b20gSlMgbWV0aG9kcy4K KworICAgICAgICAqIGJpbmRpbmdzL2pzL0pTSFRNTEVsZW1lbnRDdXN0b20uY3BwOgorICAgICAg ICAoV2ViQ29yZSk6CisgICAgICAgICogYmluZGluZ3MvdjgvY3VzdG9tL1Y4SFRNTEVsZW1lbnRD dXN0b20uY3BwOgorICAgICAgICAoV2ViQ29yZSk6CisgICAgICAgIChXZWJDb3JlOjpWOEhUTUxF bGVtZW50OjppdGVtVmFsdWVBY2Nlc3NvckdldHRlcik6CisKIDIwMTItMDctMjcgIEFkYW0gQmFy dGggIDxhYmFydGhAd2Via2l0Lm9yZz4KIAogICAgICAgICBBZGQgYSBTZXR0aW5nIHRvIGV4cG9z ZSBxdWFudGl6ZWQsIHJhdGUtbGltaXRlZCBNZW1vcnlJbmZvIHZhbHVlcwpJbmRleDogU291cmNl L1dlYkNvcmUvYmluZGluZ3MvanMvSlNIVE1MRWxlbWVudEN1c3RvbS5jcHAKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNIVE1MRWxlbWVudEN1c3RvbS5jcHAJKHJl dmlzaW9uIDEyMzgzNykKKysrIFNvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTSFRNTEVsZW1l bnRDdXN0b20uY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zMCwyNCArMzAsMTMgQEAKICNpbmNsdWRl ICJIVE1MRm9ybUVsZW1lbnQuaCIKIAogI2lmIEVOQUJMRShNSUNST0RBVEEpCi0jaW5jbHVkZSAi TWljcm9EYXRhSXRlbVZhbHVlLmgiCisjaW5jbHVkZSAiSlNNaWNyb0RhdGFJdGVtVmFsdWUuaCIK ICNlbmRpZgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKIHVzaW5nIG5hbWVzcGFjZSBKU0M7CiAK LSNpZiBFTkFCTEUoTUlDUk9EQVRBKQotc3RhdGljIEpTVmFsdWUgdG9KUyhFeGVjU3RhdGUqIGV4 ZWMsIEpTRE9NR2xvYmFsT2JqZWN0KiBnbG9iYWxPYmplY3QsIE1pY3JvRGF0YUl0ZW1WYWx1ZSog aXRlbVZhbHVlKQotewotICAgIGlmICghaXRlbVZhbHVlKQotICAgICAgICByZXR1cm4ganNOdWxs KCk7Ci0gICAgaWYgKGl0ZW1WYWx1ZS0+aXNOb2RlKCkpCi0gICAgICAgIHJldHVybiB0b0pTKGV4 ZWMsIGdsb2JhbE9iamVjdCwgaXRlbVZhbHVlLT5nZXROb2RlKCkpOwotICAgIHJldHVybiBqc1N0 cmluZyhleGVjLCBpdGVtVmFsdWUtPmdldFN0cmluZygpKTsKLX0KLSNlbmRpZgotCiBTY29wZUNo YWluTm9kZSogSlNIVE1MRWxlbWVudDo6cHVzaEV2ZW50SGFuZGxlclNjb3BlKEV4ZWNTdGF0ZSog ZXhlYywgU2NvcGVDaGFpbk5vZGUqIHNjb3BlKSBjb25zdAogewogICAgIEhUTUxFbGVtZW50KiBl bGVtZW50ID0gaW1wbCgpOwpJbmRleDogU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9t L1Y4SFRNTEVsZW1lbnRDdXN0b20uY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2Jp bmRpbmdzL3Y4L2N1c3RvbS9WOEhUTUxFbGVtZW50Q3VzdG9tLmNwcAkocmV2aXNpb24gMTIzODM3 KQorKysgU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4SFRNTEVsZW1lbnRDdXN0 b20uY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zNCw4ICszNCw4IEBACiAjaW5jbHVkZSAiVjhIVE1M RWxlbWVudFdyYXBwZXJGYWN0b3J5LmgiCiAKICNpZiBFTkFCTEUoTUlDUk9EQVRBKQotI2luY2x1 ZGUgIk1pY3JvRGF0YUl0ZW1WYWx1ZS5oIgogI2luY2x1ZGUgIlY4QmluZGluZy5oIgorI2luY2x1 ZGUgIlY4TWljcm9EYXRhSXRlbVZhbHVlLmgiCiAjZW5kaWYKIAogbmFtZXNwYWNlIFdlYkNvcmUg ewpAQCAtNDgsMjEgKzQ4LDEwIEBAIHY4OjpIYW5kbGU8djg6OlZhbHVlPiB0b1Y4KEhUTUxFbGVt ZW50KgogfQogCiAjaWYgRU5BQkxFKE1JQ1JPREFUQSkKLXN0YXRpYyB2ODo6SGFuZGxlPHY4OjpW YWx1ZT4gdG9WOE9iamVjdChNaWNyb0RhdGFJdGVtVmFsdWUqIGl0ZW1WYWx1ZSwgdjg6Oklzb2xh dGUqIGlzb2xhdGUpCi17Ci0gICAgaWYgKCFpdGVtVmFsdWUpCi0gICAgICAgIHJldHVybiB2ODo6 TnVsbChpc29sYXRlKTsKLQotICAgIGlmIChpdGVtVmFsdWUtPmlzTm9kZSgpKQotICAgICAgICBy ZXR1cm4gdG9WOChpdGVtVmFsdWUtPmdldE5vZGUoKSwgaXNvbGF0ZSk7Ci0KLSAgICByZXR1cm4g djhTdHJpbmcoaXRlbVZhbHVlLT5nZXRTdHJpbmcoKSwgaXNvbGF0ZSk7Ci19Ci0KIHY4OjpIYW5k bGU8djg6OlZhbHVlPiBWOEhUTUxFbGVtZW50OjppdGVtVmFsdWVBY2Nlc3NvckdldHRlcih2ODo6 TG9jYWw8djg6OlN0cmluZz4gbmFtZSwgY29uc3Qgdjg6OkFjY2Vzc29ySW5mbyYgaW5mbykKIHsK ICAgICBIVE1MRWxlbWVudCogaW1wbCA9IFY4SFRNTEVsZW1lbnQ6OnRvTmF0aXZlKGluZm8uSG9s ZGVyKCkpOwotICAgIHJldHVybiB0b1Y4T2JqZWN0KGltcGwtPml0ZW1WYWx1ZSgpLmdldCgpLCBp bmZvLkdldElzb2xhdGUoKSk7CisgICAgcmV0dXJuIHRvVjgoaW1wbC0+aXRlbVZhbHVlKCkuZ2V0 KCksIGluZm8uR2V0SXNvbGF0ZSgpKTsKIH0KIAogdm9pZCBWOEhUTUxFbGVtZW50OjppdGVtVmFs dWVBY2Nlc3NvclNldHRlcih2ODo6TG9jYWw8djg6OlN0cmluZz4gbmFtZSwgdjg6OkxvY2FsPHY4 OjpWYWx1ZT4gdmFsdWUsIGNvbnN0IHY4OjpBY2Nlc3NvckluZm8mIGluZm8pCg== 154929 2012-07-27 06:38:07 -0700 2012-07-27 10:17:15 -0700 Updated patch bug-92482-20120727.diff text/plain 4119 arko SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEyMzg2OSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMxIEBACisyMDEyLTA3LTI3ICBBcmtvIFNh aGEgIDxhcmtvQG1vdG9yb2xhLmNvbT4KKworICAgICAgICBNaWNyb2RhdGE6IFJlbW92ZSB0b0pz KCkgYW5kIHRvVjhPYmplY3QoKSBjdXN0b20gbWV0aG9kcyBmcm9tIEpTSFRNTEVsZW1lbnRDdXN0 b20uY3BwIGFuZCBWOEhUTUxFbGVtZW50Q3VzdG9tLmNwcCByZXNwZWN0aXZlbHkuCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05MjQ4MgorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJlbW92ZWQgY3VzdG9tIG1l dGhvZHMgdG9KUygpIGFuZCB0b1Y4T2JqZWN0KCkuIFdlIHNob3VsZCB1c2UgdG9KUygpIG1ldGhv ZCBkZWZpbmVkIGluCisgICAgICAgIEpTTWljcm9EYXRhSXRlbVZhbHVlQ3VzdG9tLmNwcCBhbmQg dG9WOCgpIG1ldGhvZCBkZWZpbmVkIGluIFY4TWljcm9EYXRhSXRlbVZhbHVlQ3VzdG9tLmNwcAor ICAgICAgICBpbiBwbGFjZSBvZiBjdXN0b20gdG9KcygpIGFuZCB0b1Y4T2JqZWN0KCkuCisKKyAg ICAgICAgRXhpc3RpbmcgdGVzdHMgOgorICAgICAgICAgICAgICAgIGZhc3QvZG9tL01pY3JvRGF0 YS9pdGVtdmFsdWUtcmVmbGVjdHMtZGF0YS1hdHRyLW9uLW9iamVjdC1lbGVtZW50Lmh0bWwKKyAg ICAgICAgICAgICAgICBmYXN0L2RvbS9NaWNyb0RhdGEvaXRlbXZhbHVlLXJlZmxlY3RzLWhyZWYt YXR0ci5odG1sCisgICAgICAgICAgICAgICAgZmFzdC9kb20vTWljcm9EYXRhL2l0ZW12YWx1ZS1y ZWZsZWN0cy1zcmMtYXR0cmlidXRlLW9uLWltZy1lbGVtZW50Lmh0bWwKKyAgICAgICAgICAgICAg ICBmYXN0L2RvbS9NaWNyb0RhdGEvaXRlbXZhbHVlLXJlZmxlY3RzLXRoZS1jb250ZW50LWF0dHIt b24tbWV0YS1lbGVtZW50Lmh0bWwKKyAgICAgICAgICAgICAgICBmYXN0L2RvbS9NaWNyb0RhdGEv aXRlbXZhbHVlLXJlZmxlY3RzLXRoZS1zcmMtYXR0ci5odG1sCisgICAgICAgICAgICAgICAgZmFz dC9kb20vTWljcm9EYXRhL2l0ZW12YWx1ZS1yZXR1cm5zLWVsZW1lbnQtaXRzZWxmLmh0bWwKKyAg ICAgICAgICAgICAgICBmYXN0L2RvbS9NaWNyb0RhdGEvaXRlbXZhbHVlLXJldHVybnMtbnVsbC5o dG1sCisgICAgICAgICAgICAgICAgZmFzdC9kb20vTWljcm9EYXRhL2l0ZW12YWx1ZS10aHJvd3Mt ZXhjcGV0aW9uLW9uc2V0dGluZy0wMDEuaHRtbAorICAgICAgICAgICAgICAgIGZhc3QvZG9tL01p Y3JvRGF0YS9pdGVtdmFsdWUtdGhyb3dzLWV4Y3BldGlvbi1vbnNldHRpbmctMDAyLmh0bWwKKwor ICAgICAgICAqIGJpbmRpbmdzL2pzL0pTSFRNTEVsZW1lbnRDdXN0b20uY3BwOgorICAgICAgICAo V2ViQ29yZSk6CisgICAgICAgICogYmluZGluZ3MvdjgvY3VzdG9tL1Y4SFRNTEVsZW1lbnRDdXN0 b20uY3BwOgorICAgICAgICAoV2ViQ29yZSk6CisgICAgICAgIChXZWJDb3JlOjpWOEhUTUxFbGVt ZW50OjppdGVtVmFsdWVBY2Nlc3NvckdldHRlcik6CisKIDIwMTItMDctMjcgIEtlaXNoaSBIYXR0 b3JpICA8a2Vpc2hpQHdlYmtpdC5vcmc+CiAKICAgICAgICAgUmVwbGFjZSBDb2xvckNob29zZXJD bGllbnQ6OmVsZW1lbnRSZWN0UmVsYXRpdmVUb1dpbmRvdyB3aXRoIGVsZW1lbnRSZWN0UmVsYXRp dmVUb1Jvb3RWaWV3CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0hUTUxFbGVt ZW50Q3VzdG9tLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9K U0hUTUxFbGVtZW50Q3VzdG9tLmNwcAkocmV2aXNpb24gMTIzODM3KQorKysgU291cmNlL1dlYkNv cmUvYmluZGluZ3MvanMvSlNIVE1MRWxlbWVudEN1c3RvbS5jcHAJKHdvcmtpbmcgY29weSkKQEAg LTMwLDI0ICszMCwxMyBAQAogI2luY2x1ZGUgIkhUTUxGb3JtRWxlbWVudC5oIgogCiAjaWYgRU5B QkxFKE1JQ1JPREFUQSkKLSNpbmNsdWRlICJNaWNyb0RhdGFJdGVtVmFsdWUuaCIKKyNpbmNsdWRl ICJKU01pY3JvRGF0YUl0ZW1WYWx1ZS5oIgogI2VuZGlmCiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsK IAogdXNpbmcgbmFtZXNwYWNlIEpTQzsKIAotI2lmIEVOQUJMRShNSUNST0RBVEEpCi1zdGF0aWMg SlNWYWx1ZSB0b0pTKEV4ZWNTdGF0ZSogZXhlYywgSlNET01HbG9iYWxPYmplY3QqIGdsb2JhbE9i amVjdCwgTWljcm9EYXRhSXRlbVZhbHVlKiBpdGVtVmFsdWUpCi17Ci0gICAgaWYgKCFpdGVtVmFs dWUpCi0gICAgICAgIHJldHVybiBqc051bGwoKTsKLSAgICBpZiAoaXRlbVZhbHVlLT5pc05vZGUo KSkKLSAgICAgICAgcmV0dXJuIHRvSlMoZXhlYywgZ2xvYmFsT2JqZWN0LCBpdGVtVmFsdWUtPmdl dE5vZGUoKSk7Ci0gICAgcmV0dXJuIGpzU3RyaW5nKGV4ZWMsIGl0ZW1WYWx1ZS0+Z2V0U3RyaW5n KCkpOwotfQotI2VuZGlmCi0KIFNjb3BlQ2hhaW5Ob2RlKiBKU0hUTUxFbGVtZW50OjpwdXNoRXZl bnRIYW5kbGVyU2NvcGUoRXhlY1N0YXRlKiBleGVjLCBTY29wZUNoYWluTm9kZSogc2NvcGUpIGNv bnN0CiB7CiAgICAgSFRNTEVsZW1lbnQqIGVsZW1lbnQgPSBpbXBsKCk7CkluZGV4OiBTb3VyY2Uv V2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhIVE1MRWxlbWVudEN1c3RvbS5jcHAKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4SFRNTEVsZW1lbnRD dXN0b20uY3BwCShyZXZpc2lvbiAxMjM4MzcpCisrKyBTb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92 OC9jdXN0b20vVjhIVE1MRWxlbWVudEN1c3RvbS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTM0LDgg KzM0LDggQEAKICNpbmNsdWRlICJWOEhUTUxFbGVtZW50V3JhcHBlckZhY3RvcnkuaCIKIAogI2lm IEVOQUJMRShNSUNST0RBVEEpCi0jaW5jbHVkZSAiTWljcm9EYXRhSXRlbVZhbHVlLmgiCiAjaW5j bHVkZSAiVjhCaW5kaW5nLmgiCisjaW5jbHVkZSAiVjhNaWNyb0RhdGFJdGVtVmFsdWUuaCIKICNl bmRpZgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CkBAIC00OCwyMSArNDgsMTAgQEAgdjg6OkhhbmRs ZTx2ODo6VmFsdWU+IHRvVjgoSFRNTEVsZW1lbnQqCiB9CiAKICNpZiBFTkFCTEUoTUlDUk9EQVRB KQotc3RhdGljIHY4OjpIYW5kbGU8djg6OlZhbHVlPiB0b1Y4T2JqZWN0KE1pY3JvRGF0YUl0ZW1W YWx1ZSogaXRlbVZhbHVlLCB2ODo6SXNvbGF0ZSogaXNvbGF0ZSkKLXsKLSAgICBpZiAoIWl0ZW1W YWx1ZSkKLSAgICAgICAgcmV0dXJuIHY4OjpOdWxsKGlzb2xhdGUpOwotCi0gICAgaWYgKGl0ZW1W YWx1ZS0+aXNOb2RlKCkpCi0gICAgICAgIHJldHVybiB0b1Y4KGl0ZW1WYWx1ZS0+Z2V0Tm9kZSgp LCBpc29sYXRlKTsKLQotICAgIHJldHVybiB2OFN0cmluZyhpdGVtVmFsdWUtPmdldFN0cmluZygp LCBpc29sYXRlKTsKLX0KLQogdjg6OkhhbmRsZTx2ODo6VmFsdWU+IFY4SFRNTEVsZW1lbnQ6Oml0 ZW1WYWx1ZUFjY2Vzc29yR2V0dGVyKHY4OjpMb2NhbDx2ODo6U3RyaW5nPiBuYW1lLCBjb25zdCB2 ODo6QWNjZXNzb3JJbmZvJiBpbmZvKQogewogICAgIEhUTUxFbGVtZW50KiBpbXBsID0gVjhIVE1M RWxlbWVudDo6dG9OYXRpdmUoaW5mby5Ib2xkZXIoKSk7Ci0gICAgcmV0dXJuIHRvVjhPYmplY3Qo aW1wbC0+aXRlbVZhbHVlKCkuZ2V0KCksIGluZm8uR2V0SXNvbGF0ZSgpKTsKKyAgICByZXR1cm4g dG9WOChpbXBsLT5pdGVtVmFsdWUoKS5nZXQoKSwgaW5mby5HZXRJc29sYXRlKCkpOwogfQogCiB2 b2lkIFY4SFRNTEVsZW1lbnQ6Oml0ZW1WYWx1ZUFjY2Vzc29yU2V0dGVyKHY4OjpMb2NhbDx2ODo6 U3RyaW5nPiBuYW1lLCB2ODo6TG9jYWw8djg6OlZhbHVlPiB2YWx1ZSwgY29uc3Qgdjg6OkFjY2Vz c29ySW5mbyYgaW5mbykK