34901 2010-02-12 11:44:38 -0800 [Qt] QtWebkit bridge: enable passing a QWebElement to a signal/slot/property 2010-02-15 07:36:13 -0800 1 1 1 Unclassified WebKit WebKit Qt 528+ (Nightly build) All All RESOLVED FIXED Qt P2 Normal --- 1 noam webkit-unassigned commit-queue oldest_to_newest 190110 0 noam 2010-02-12 11:44:38 -0800 This is the last "HTML-specific" bridge addition: Allow a signal/slot/property of type QWebElement to send/receive a javascript argument that holds an actual HTML image element. 190244 1 48696 noam 2010-02-12 20:31:00 -0800 Created attachment 48696 QtWebkitBridge: support for QWebElement as a transient (QVariant) type Includes appropriate tests in tst_qwebframe 190450 2 48696 hausmann 2010-02-15 07:17:57 -0800 Comment on attachment 48696 QtWebkitBridge: support for QWebElement as a transient (QVariant) type Nice! Noam, I'm going to set cq+, but please set either cq? or cq- if you want or do not want this to go through the commit-queue. 190453 3 48696 commit-queue 2010-02-15 07:36:06 -0800 Comment on attachment 48696 QtWebkitBridge: support for QWebElement as a transient (QVariant) type Clearing flags on attachment: 48696 Committed r54775: <http://trac.webkit.org/changeset/54775> 190454 4 commit-queue 2010-02-15 07:36:13 -0800 All reviewed patches have been landed. Closing bug. 48696 2010-02-12 20:31:00 -0800 2010-02-15 07:36:06 -0800 QtWebkitBridge: support for QWebElement as a transient (QVariant) type patch-34901-1.diff text/plain 8688 noam SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1NDc0OCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjMgQEAKKzIwMTAtMDItMTIgIE5vYW0gUm9zZW50aGFsICA8bm9hbS5yb3NlbnRo YWxAbm9raWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIFtRdF0gUXRXZWJraXQgYnJpZGdlOiBlbmFibGUgcGFzc2luZyBhIFFXZWJFbGVtZW50 IHRvIGEgc2lnbmFsL3Nsb3QvcHJvcGVydHkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTM0OTAxCisKKyAgICAgICAgV2hlbiBhIHNpZ25hbC9zbG90L3By b3BlcnR5IGlzIG9mIHR5cGUgUVdlYkVsZW1lbnQsIGl0IGNhbiBzZWFtbGVzc2x5CisgICAgICAg IGNvbm5lY3Qgd2l0aCBKUyBvYmplY3RzIHRoYXQgaG9sZCBhIFdlYkNvcmUgZWxlbWVudC4KKwor ICAgICAgICBOZXcgdGVzdHMsIHNlZSBXZWJLaXQvcXQvQ2hhbmdlTG9nCisKKyAgICAgICAgKiBi cmlkZ2UvcXQvcXRfcnVudGltZS5jcHA6CisgICAgICAgIChKU0M6OkJpbmRpbmdzOjpRdFdlYkVs ZW1lbnRSdW50aW1lOjpjcmVhdGUpOiBBIHByb3h5IHRvIFFXZWJFbGVtZW50CisgICAgICAgIGNv bnN0cnVjdG9yCisgICAgICAgIChKU0M6OkJpbmRpbmdzOjpRdFdlYkVsZW1lbnRSdW50aW1lOjpn ZXQpOiBBIHByb3h5IHRvCisgICAgICAgIFFXZWJFbGVtZW50OjplbGVtZW50CisgICAgICAgIChK U0M6OkJpbmRpbmdzOjpjb252ZXJ0VmFsdWVUb1FWYXJpYW50KTogaGFuZGxlIFFXZWJFbGVtZW50 CisgICAgICAgIChKU0M6OkJpbmRpbmdzOjpjb252ZXJ0UVZhcmlhbnRUb1ZhbHVlKTogaGFuZGxl IFFXZWJFbGVtZW50CisKIDIwMTAtMDEtMDUgIE9qYW4gVmFmYWkgIDxvamFuQGNocm9taXVtLm9y Zz4KIAogICAgICAgICBSZXZpZXdlZCBieSBEYW4gQmVybnN0ZWluLgpJbmRleDogV2ViQ29yZS9i cmlkZ2UvcXQvcXRfcnVudGltZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9icmlkZ2UvcXQv cXRfcnVudGltZS5jcHAJKHJldmlzaW9uIDU0NzI4KQorKysgV2ViQ29yZS9icmlkZ2UvcXQvcXRf cnVudGltZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTI5LDcgKzI5LDEwIEBACiAjaW5jbHVkZSAi SlNBcnJheS5oIgogI2luY2x1ZGUgIkpTQnl0ZUFycmF5LmgiCiAjaW5jbHVkZSAiSlNET01CaW5k aW5nLmgiCisjaW5jbHVkZSAiSlNET01XaW5kb3cuaCIKKyNpbmNsdWRlIDxKU0Z1bmN0aW9uLmg+ CiAjaW5jbHVkZSAiSlNHbG9iYWxPYmplY3QuaCIKKyNpbmNsdWRlICJKU0hUTUxFbGVtZW50Lmgi CiAjaW5jbHVkZSAiSlNMb2NrLmgiCiAjaW5jbHVkZSAiSlNPYmplY3QuaCIKICNpbmNsdWRlICJP YmplY3RQcm90b3R5cGUuaCIKQEAgLTQ1LDcgKzQ4LDcgQEAKICNpbmNsdWRlICJxdF9pbnN0YW5j ZS5oIgogI2luY2x1ZGUgInF0X3BpeG1hcHJ1bnRpbWUuaCIKICNpbmNsdWRlICJxdmFybGVuZ3Ro YXJyYXkuaCIKLSNpbmNsdWRlIDxKU0Z1bmN0aW9uLmg+CisjaW5jbHVkZSAicXdlYmVsZW1lbnQu aCIKICNpbmNsdWRlIDxsaW1pdHMuaD4KICNpbmNsdWRlIDxydW50aW1lL0Vycm9yLmg+CiAjaW5j bHVkZSA8cnVudGltZV9hcnJheS5oPgpAQCAtMTE0LDYgKzExNywyMSBAQCBRRGVidWcgb3BlcmF0 b3I8PChRRGVidWcgZGJnLCBjb25zdCBKU1JlCiB9CiAjZW5kaWYKIAorLy8gdGhpcyBpcyBoZXJl IGFzIGEgcHJveHksIHNvIHdlJ2QgaGF2ZSBhIGNsYXNzIHRvIGZyaWVuZCBpbiBRV2ViRWxlbWVu dCwKKy8vIGFzIGdldHRpbmcvc2V0dGluZyBhIFdlYkNvcmUgaW4gUVdlYkVsZW1lbnQgaXMgcHJp dmF0ZQorY2xhc3MgUXRXZWJFbGVtZW50UnVudGltZSB7CitwdWJsaWM6CisgICAgc3RhdGljIFFX ZWJFbGVtZW50IGNyZWF0ZShFbGVtZW50KiBlbGVtZW50KQorICAgIHsKKyAgICAgICAgcmV0dXJu IFFXZWJFbGVtZW50KGVsZW1lbnQpOworICAgIH0KKworICAgIHN0YXRpYyBFbGVtZW50KiBnZXQo Y29uc3QgUVdlYkVsZW1lbnQmIGVsZW1lbnQpCisgICAgeworICAgICAgICByZXR1cm4gZWxlbWVu dC5tX2VsZW1lbnQ7CisgICAgfQorfTsKKwogc3RhdGljIEpTUmVhbFR5cGUgdmFsdWVSZWFsVHlw ZShFeGVjU3RhdGUqIGV4ZWMsIEpTVmFsdWUgdmFsKQogewogICAgIGlmICh2YWwuaXNOdW1iZXIo KSkKQEAgLTcyMiw2ICs3NDAsMTEgQEAgUVZhcmlhbnQgY29udmVydFZhbHVlVG9RVmFyaWFudChF eGVjU3RhdAogICAgICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICAgICAgfSBlbHNlIGlmIChR dFBpeG1hcEluc3RhbmNlOjpjYW5IYW5kbGUoc3RhdGljX2Nhc3Q8UU1ldGFUeXBlOjpUeXBlPiho aW50KSkpIHsKICAgICAgICAgICAgICAgICByZXQgPSBRdFBpeG1hcEluc3RhbmNlOjp2YXJpYW50 RnJvbU9iamVjdChvYmplY3QsIHN0YXRpY19jYXN0PFFNZXRhVHlwZTo6VHlwZT4oaGludCkpOwor ICAgICAgICAgICAgfSBlbHNlIGlmIChoaW50ID09IChRTWV0YVR5cGU6OlR5cGUpIHFNZXRhVHlw ZUlkPFFXZWJFbGVtZW50PigpKSB7CisgICAgICAgICAgICAgICAgaWYgKG9iamVjdCAmJiBvYmpl Y3QtPmluaGVyaXRzKCZKU0hUTUxFbGVtZW50OjpzX2luZm8pKQorICAgICAgICAgICAgICAgICAg ICByZXQgPSBRVmFyaWFudDo6ZnJvbVZhbHVlPFFXZWJFbGVtZW50PihRdFdlYkVsZW1lbnRSdW50 aW1lOjpjcmVhdGUoKHN0YXRpY19jYXN0PEpTSFRNTEVsZW1lbnQqPihvYmplY3QpKS0+aW1wbCgp KSk7CisgICAgICAgICAgICAgICAgZWxzZQorICAgICAgICAgICAgICAgICAgICByZXQgPSBRVmFy aWFudDo6ZnJvbVZhbHVlPFFXZWJFbGVtZW50PihRV2ViRWxlbWVudCgpKTsKICAgICAgICAgICAg IH0gZWxzZSBpZiAoaGludCA9PSAoUU1ldGFUeXBlOjpUeXBlKSBxTWV0YVR5cGVJZDxRVmFyaWFu dD4oKSkgewogICAgICAgICAgICAgICAgIGlmICh2YWx1ZS5pc1VuZGVmaW5lZE9yTnVsbCgpKSB7 CiAgICAgICAgICAgICAgICAgICAgIGlmIChkaXN0YW5jZSkKQEAgLTg1NCw2ICs4NzcsMTcgQEAg SlNWYWx1ZSBjb252ZXJ0UVZhcmlhbnRUb1ZhbHVlKEV4ZWNTdGF0ZQogICAgIGlmIChRdFBpeG1h cEluc3RhbmNlOjpjYW5IYW5kbGUoc3RhdGljX2Nhc3Q8UU1ldGFUeXBlOjpUeXBlPih2YXJpYW50 LnR5cGUoKSkpKQogICAgICAgICByZXR1cm4gUXRQaXhtYXBJbnN0YW5jZTo6Y3JlYXRlUnVudGlt ZU9iamVjdChleGVjLCByb290LCB2YXJpYW50KTsKIAorICAgIGlmICh0eXBlID09IHFNZXRhVHlw ZUlkPFFXZWJFbGVtZW50PigpKSB7CisgICAgICAgIGlmICghcm9vdC0+Z2xvYmFsT2JqZWN0KCkt PmluaGVyaXRzKCZKU0RPTVdpbmRvdzo6c19pbmZvKSkKKyAgICAgICAgICAgIHJldHVybiBqc1Vu ZGVmaW5lZCgpOworCisgICAgICAgIERvY3VtZW50KiBkb2N1bWVudCA9IChzdGF0aWNfY2FzdDxK U0RPTVdpbmRvdyo+KHJvb3QtPmdsb2JhbE9iamVjdCgpKSktPmltcGwoKS0+ZG9jdW1lbnQoKTsK KyAgICAgICAgaWYgKCFkb2N1bWVudCkKKyAgICAgICAgICAgIHJldHVybiBqc1VuZGVmaW5lZCgp OworCisgICAgICAgIHJldHVybiB0b0pTKGV4ZWMsIHRvSlNET01HbG9iYWxPYmplY3QoZG9jdW1l bnQsIGV4ZWMpLCBRdFdlYkVsZW1lbnRSdW50aW1lOjpnZXQodmFyaWFudC52YWx1ZTxRV2ViRWxl bWVudD4oKSkpOworICAgIH0KKwogICAgIGlmICh0eXBlID09IFFNZXRhVHlwZTo6UVZhcmlhbnRN YXApIHsKICAgICAgICAgLy8gY3JlYXRlIGEgbmV3IG9iamVjdCwgYW5kIHN0dWZmIHByb3BlcnRp ZXMgaW50byBpdAogICAgICAgICBKU09iamVjdCogcmV0ID0gY29uc3RydWN0RW1wdHlPYmplY3Qo ZXhlYyk7CkluZGV4OiBXZWJLaXQvcXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9x dC9DaGFuZ2VMb2cJKHJldmlzaW9uIDU0NzQ4KQorKysgV2ViS2l0L3F0L0NoYW5nZUxvZwkod29y a2luZyBjb3B5KQpAQCAtMSwzICsxLDE4IEBACisyMDEwLTAyLTEyICBOb2FtIFJvc2VudGhhbCAg PG5vYW0ucm9zZW50aGFsQG5va2lhLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBbUXRdIFF0V2Via2l0IGJyaWRnZTogZW5hYmxlIHBhc3Npbmcg YSBRV2ViRWxlbWVudCB0byBhIHNpZ25hbC9zbG90L3Byb3BlcnR5CisgICAgICAgIEFkZCBRX0RF Q0xBUkVfTUVUQVRZUEUgdG8gUVdlYkVsZW1lbnQsIGFkZCByZWxldmFudCB0ZXN0cyB0bworICAg ICAgICB0c3RfcXdlYmZyYW1lCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0zNDkwMQorCisgICAgICAgICogQXBpL3F3ZWJlbGVtZW50Lmg6IGRlY2xhcmUg bWV0YXR5cGUKKyAgICAgICAgKiB0ZXN0cy9xd2ViZnJhbWUvdHN0X3F3ZWJmcmFtZS5jcHA6Cisg ICAgICAgIChNeVFPYmplY3Q6OndlYkVsZW1lbnRQcm9wZXJ0eSk6IG5ldyB0ZXN0IGZvciBRV2Vi RWxlbWVudAorICAgICAgICAoTXlRT2JqZWN0OjpzZXRXZWJFbGVtZW50UHJvcGVydHkpOiBuZXcg dGVzdCBmb3IgUVdlYkVsZW1lbnQKKyAgICAgICAgKE15UU9iamVjdDo6bXlPdmVybG9hZGVkU2xv dCk6IG5ldyB0ZXN0IGZvciBRV2ViRWxlbWVudAorCiAyMDEwLTAyLTEyICBEaWVnbyBHb256YWxl eiAgPGRpZWdvLmdvbnphbGV6QG9wZW5ib3NzYS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkg S2VubmV0aCBSb2hkZSBDaHJpc3RpYW5zZW4uCkluZGV4OiBXZWJLaXQvcXQvQXBpL3F3ZWJlbGVt ZW50LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L3F0L0FwaS9xd2ViZWxlbWVudC5oCShyZXZpc2lv biA1NDcyOCkKKysrIFdlYktpdC9xdC9BcGkvcXdlYmVsZW1lbnQuaAkod29ya2luZyBjb3B5KQpA QCAtMzIsNiArMzIsMTIgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgIGNsYXNzIE5vZGU7CiB9 CiAKK25hbWVzcGFjZSBKU0MgeworbmFtZXNwYWNlIEJpbmRpbmdzIHsKKyAgICBjbGFzcyBRdFdl YkVsZW1lbnRSdW50aW1lOworfQorfQorCiBRVF9CRUdJTl9OQU1FU1BBQ0UKIGNsYXNzIFFQYWlu dGVyOwogUVRfRU5EX05BTUVTUEFDRQpAQCAtMTUzLDYgKzE1OSw3IEBAIHByaXZhdGU6CiAgICAg ZnJpZW5kIGNsYXNzIFFXZWJIaXRUZXN0UmVzdWx0OwogICAgIGZyaWVuZCBjbGFzcyBRV2ViSGl0 VGVzdFJlc3VsdFByaXZhdGU7CiAgICAgZnJpZW5kIGNsYXNzIFFXZWJQYWdlOworICAgIGZyaWVu ZCBjbGFzcyBKU0M6OkJpbmRpbmdzOjpRdFdlYkVsZW1lbnRSdW50aW1lOwogCiAgICAgUVdlYkVs ZW1lbnRQcml2YXRlKiBkOwogICAgIFdlYkNvcmU6OkVsZW1lbnQqIG1fZWxlbWVudDsKQEAgLTI1 NSw0ICsyNjIsNiBAQCBwcml2YXRlOgogICAgIFFFeHBsaWNpdGx5U2hhcmVkRGF0YVBvaW50ZXI8 UVdlYkVsZW1lbnRDb2xsZWN0aW9uUHJpdmF0ZT4gZDsKIH07CiAKK1FfREVDTEFSRV9NRVRBVFlQ RShRV2ViRWxlbWVudCkKKwogI2VuZGlmIC8vIFFXRUJFTEVNRU5UX0gKSW5kZXg6IFdlYktpdC9x dC90ZXN0cy9xd2ViZnJhbWUvdHN0X3F3ZWJmcmFtZS5jcHAKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0 L3F0L3Rlc3RzL3F3ZWJmcmFtZS90c3RfcXdlYmZyYW1lLmNwcAkocmV2aXNpb24gNTQ3MjgpCisr KyBXZWJLaXQvcXQvdGVzdHMvcXdlYmZyYW1lL3RzdF9xd2ViZnJhbWUuY3BwCSh3b3JraW5nIGNv cHkpCkBAIC02Niw2ICs2Niw3IEBAIGNsYXNzIE15UU9iamVjdCA6IHB1YmxpYyBRT2JqZWN0CiAg ICAgUV9QUk9QRVJUWShpbnQgcmVhZE9ubHlQcm9wZXJ0eSBSRUFEIHJlYWRPbmx5UHJvcGVydHkp CiAgICAgUV9QUk9QRVJUWShRS2V5U2VxdWVuY2Ugc2hvcnRjdXQgUkVBRCBzaG9ydGN1dCBXUklU RSBzZXRTaG9ydGN1dCkKICAgICBRX1BST1BFUlRZKEN1c3RvbVR5cGUgcHJvcFdpdGhDdXN0b21U eXBlIFJFQUQgcHJvcFdpdGhDdXN0b21UeXBlIFdSSVRFIHNldFByb3BXaXRoQ3VzdG9tVHlwZSkK KyAgICBRX1BST1BFUlRZKFFXZWJFbGVtZW50IHdlYkVsZW1lbnRQcm9wZXJ0eSBSRUFEIHdlYkVs ZW1lbnRQcm9wZXJ0eSBXUklURSBzZXRXZWJFbGVtZW50UHJvcGVydHkpCiAgICAgUV9FTlVNUyhQ b2xpY3kgU3RyYXRlZ3kpCiAgICAgUV9GTEFHUyhBYmlsaXR5KQogCkBAIC0xODEsNiArMTgyLDE0 IEBAIHB1YmxpYzoKICAgICAgICAgbV9zaG9ydGN1dCA9IHNlcTsKICAgICB9CiAKKyAgICBRV2Vi RWxlbWVudCB3ZWJFbGVtZW50UHJvcGVydHkoKSBjb25zdCB7CisgICAgICAgIHJldHVybiBtX3dl YkVsZW1lbnQ7CisgICAgfQorCisgICAgdm9pZCBzZXRXZWJFbGVtZW50UHJvcGVydHkoY29uc3Qg UVdlYkVsZW1lbnQmIGVsZW1lbnQpIHsKKyAgICAgICAgbV93ZWJFbGVtZW50ID0gZWxlbWVudDsK KyAgICB9CisKICAgICBDdXN0b21UeXBlIHByb3BXaXRoQ3VzdG9tVHlwZSgpIGNvbnN0IHsKICAg ICAgICAgcmV0dXJuIG1fY3VzdG9tVHlwZTsKICAgICB9CkBAIC00MzMsNiArNDQyLDEwIEBAIHB1 YmxpYyBRX1NMT1RTOgogICAgICAgICBtX3F0RnVuY3Rpb25JbnZva2VkID0gMzU7CiAgICAgICAg IG1fYWN0dWFscyA8PCBhcmc7CiAgICAgfQorICAgIHZvaWQgbXlPdmVybG9hZGVkU2xvdChjb25z dCBRV2ViRWxlbWVudCAmYXJnKSB7CisgICAgICAgIG1fcXRGdW5jdGlvbkludm9rZWQgPSAzNjsK KyAgICAgICAgbV9hY3R1YWxzIDw8IFFWYXJpYW50Ojpmcm9tVmFsdWU8UVdlYkVsZW1lbnQ+KGFy Zyk7CisgICAgfQogCiAgICAgdm9pZCBxc2NyaXB0X2NhbGwoaW50IGFyZykgewogICAgICAgICBt X3F0RnVuY3Rpb25JbnZva2VkID0gNDA7CkBAIC00NjcsNiArNDgwLDcgQEAgcHJpdmF0ZToKICAg ICBpbnQgbV93cml0ZU9ubHlWYWx1ZTsKICAgICBpbnQgbV9yZWFkT25seVZhbHVlOwogICAgIFFL ZXlTZXF1ZW5jZSBtX3Nob3J0Y3V0OworICAgIFFXZWJFbGVtZW50IG1fd2ViRWxlbWVudDsKICAg ICBDdXN0b21UeXBlIG1fY3VzdG9tVHlwZTsKICAgICBpbnQgbV9xdEZ1bmN0aW9uSW52b2tlZDsK ICAgICBRVmFyaWFudExpc3QgbV9hY3R1YWxzOwpAQCAtNjg1LDYgKzY5OSw3IEBAIHZvaWQgdHN0 X1FXZWJGcmFtZTo6Y2xlYW51cCgpCiAKIHZvaWQgdHN0X1FXZWJGcmFtZTo6Z2V0U2V0U3RhdGlj UHJvcGVydHkoKQogeworICAgIG1fcGFnZS0+bWFpbkZyYW1lKCktPnNldEh0bWwoIjxodG1sPjxo ZWFkPjxib2R5PjwvYm9keT48L2h0bWw+Iik7CiAgICAgUUNPTVBBUkUoZXZhbEpTKCJ0eXBlb2Yg bXlPYmplY3Qubm9TdWNoUHJvcGVydHkiKSwgc1VuZGVmaW5lZCk7CiAKICAgICAvLyBpbml0aWFs IHZhbHVlIChzZXQgaW4gTXlRT2JqZWN0IGNvbnN0cnVjdG9yKQpAQCAtODI0LDYgKzgzOSw4IEBA IHZvaWQgdHN0X1FXZWJGcmFtZTo6Z2V0U2V0U3RhdGljUHJvcGVydHkKICAgICBRQ09NUEFSRShl dmFsSlMoIm15T2JqZWN0LnN0cmluZ0xpc3RQcm9wZXJ0eVsxXSIpLCBRTGF0aW4xU3RyaW5nKCJ0 d28iKSk7CiAgICAgUUNPTVBBUkUoZXZhbEpTKCJ0eXBlb2YgbXlPYmplY3Quc3RyaW5nTGlzdFBy b3BlcnR5WzJdIiksIHNTdHJpbmcpOwogICAgIFFDT01QQVJFKGV2YWxKUygibXlPYmplY3Quc3Ry aW5nTGlzdFByb3BlcnR5WzJdIiksIFFMYXRpbjFTdHJpbmcoInRydWUiKSk7CisgICAgZXZhbEpT KCJteU9iamVjdC53ZWJFbGVtZW50UHJvcGVydHk9ZG9jdW1lbnQuYm9keTsiKTsKKyAgICBRQ09N UEFSRShldmFsSlMoIm15T2JqZWN0LndlYkVsZW1lbnRQcm9wZXJ0eS50YWdOYW1lIiksIFFMYXRp bjFTdHJpbmcoIkJPRFkiKSk7CiAKICAgICAvLyB0cnkgdG8gZGVsZXRlCiAgICAgUUNPTVBBUkUo ZXZhbEpTKCJkZWxldGUgbXlPYmplY3QuaW50UHJvcGVydHkiKSwgc0ZhbHNlKTsKQEAgLTE4ODYs NiArMTkwMywxMiBAQCB2b2lkIHRzdF9RV2ViRnJhbWU6Om92ZXJsb2FkZWRTbG90cygpCiAgICAg Zi5jYWxsKFFTdHJpbmcoKSwgUVN0cmluZ0xpc3QoKSA8PCBtX2VuZ2luZS0+bmV3VmFyaWFudChR VmFyaWFudCgiY2lhbyIpKSk7CiAgICAgUUNPTVBBUkUobV9teU9iamVjdC0+cXRGdW5jdGlvbklu dm9rZWQoKSwgMzUpOwogICAgICovCisKKyAgICAvLyBzaG91bGQgcGljayBteU92ZXJsb2FkZWRT bG90KFFSZWdFeHApCisgICAgbV9teU9iamVjdC0+cmVzZXRRdEZ1bmN0aW9uSW52b2tlZCgpOwor ICAgIGV2YWxKUygibXlPYmplY3QubXlPdmVybG9hZGVkU2xvdChkb2N1bWVudC5ib2R5KSIpOwor ICAgIFFDT01QQVJFKG1fbXlPYmplY3QtPnF0RnVuY3Rpb25JbnZva2VkKCksIDM2KTsKKwogICAg IC8vIHNob3VsZCBwaWNrIG15T3ZlcmxvYWRlZFNsb3QoUU9iamVjdCopCiAgICAgbV9teU9iamVj dC0+cmVzZXRRdEZ1bmN0aW9uSW52b2tlZCgpOwogICAgIGV2YWxKUygibXlPYmplY3QubXlPdmVy bG9hZGVkU2xvdChteU9iamVjdCkiKTsK