95325 2012-08-29 04:41:48 -0700 [Qt] Change custom runtime conversion functions to use the JSC C API 2014-02-03 03:22:16 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED INVALID P2 Normal --- 60842 95570 1 hausmann hausmann allan.jensen cmarcelo oldest_to_newest 707316 0 hausmann 2012-08-29 04:41:48 -0700 [Qt] Change custom runtime conversion functions to use the JSC C API 707319 1 161185 hausmann 2012-08-29 04:47:35 -0700 Created attachment 161185 Patch 708597 2 161185 cmarcelo 2012-08-30 07:25:08 -0700 Comment on attachment 161185 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=161185&action=review > Source/WebCore/bridge/qt/qt_runtime.cpp:747 > - if (customRuntimeConversions()->contains(type)) { > - if (!root->globalObject()->inherits(&JSDOMWindow::s_info)) > - return JSValueMakeUndefined(context); > - > - Document* document = (static_cast<JSDOMWindow*>(root->globalObject()))->impl()->document(); > - if (!document) > - return JSValueMakeUndefined(context); > - ExecState* exec = toJS(context); > - return toRef(exec, customRuntimeConversions()->value(type).toJSValueFunc(exec, toJSDOMGlobalObject(document, exec), variant)); > - } > + if (customRuntimeConversions()->contains(type)) > + return customRuntimeConversions()->value(type).toJSValueFunc(context, variant); The change looks good to me, but I'm not entire sure that there will be edge situations where this won't work. By "this" I mean: using the current context (and global object) instead of the global object tied to the cacheable root object (that we use in the bridge). In general the cacheable root object is updated, so we'll probably get the same values here. 935653 3 161185 andersca 2013-10-02 21:14:45 -0700 Comment on attachment 161185 Patch Qt has been removed, clearing review flags. 974979 4 allan.jensen 2014-02-03 02:33:58 -0800 Simon, is this still relevant for the QtWebKit branch? 975544 5 jturcotte 2014-02-03 03:22:16 -0800 === Bulk closing of Qt bugs === If you believe that this bug report is still relevant for a non-Qt port of webkit.org, please re-open it and remove [Qt] from the summary. If you believe that this is still an important QtWebKit bug, please fill a new report at https://bugreports.qt-project.org and add a link to this issue. See http://qt-project.org/wiki/ReportingBugsInQt for additional guidelines. 161185 2012-08-29 04:47:35 -0700 2013-10-02 21:14:45 -0700 Patch bug-95325-20120829134908.patch text/plain 8361 hausmann U3VidmVyc2lvbiBSZXZpc2lvbjogMTI2OTgyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggN2Y0MWMzYmRhYmI5YTY5 MGQ5MTJiODMwMTc0ZWFjNzU1NDgwMWQxOC4uNzMyMGUzZWRhYjk2MWQ1NTQ4YzgwNTdkY2Q1Mjlh ZDJiOTA3ZTVhNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDIxIEBACiAyMDEyLTA4LTI5ICBTaW1v biBIYXVzbWFubiAgPHNpbW9uLmhhdXNtYW5uQG5va2lhLmNvbT4KIAorICAgICAgICBbUXRdIENo YW5nZSBjdXN0b20gcnVudGltZSBjb252ZXJzaW9uIGZ1bmN0aW9ucyB0byB1c2UgdGhlIEpTQyBD IEFQSQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTUz MjUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGJy aWRnZS9xdC9xdF9ydW50aW1lLmNwcDoKKyAgICAgICAgKEpTQzo6QmluZGluZ3M6OmNvbnZlcnRW YWx1ZVRvUVZhcmlhbnQpOiBBdm9pZCB0b0pTKCkgY2FsbHMgd2hlbiB1c2luZyB0aGUgY3VzdG9t CisgICAgICAgIGNvbnZlcnNpb24gZnVuY3Rpb25zIGFuZCBpbnN0ZWFkIHBhc3MgY29udGV4dHJl ZiBhbmQgdmFsdWVyZWYgcmlnaHQgdGhyb3VnaC4gVGhlCisgICAgICAgIEpTRE9NV2luZG93IGNo ZWNrIGlzIHVubmVjZXNzYXJ5IGluIG9yZGVyIHRvIGRvIHRoZSBzdWNjZXNzZnVsIGJpbmRpbmcg b2YgdGhlIERSVCBOb2RlCisgICAgICAgIGFuZCBlbGVtZW50IHR5cGVzIGJhY2sgdG8gSlMuCisg ICAgICAgIChKU0M6OkJpbmRpbmdzOjpjb252ZXJ0UVZhcmlhbnRUb1ZhbHVlKToKKyAgICAgICAg KiBicmlkZ2UvcXQvcXRfcnVudGltZS5oOiBBZGp1c3Qgc2lnbmF0dXJlIG9mIGN1c3RvbSBjb252 ZXJzaW9uIGZ1bmN0aW9ucyB0byB1c2UgQyBBUEkgdHlwZXMuCisgICAgICAgIChCaW5kaW5ncyk6 CisKKzIwMTItMDgtMjkgIFNpbW9uIEhhdXNtYW5uICA8c2ltb24uaGF1c21hbm5Abm9raWEuY29t PgorCiAgICAgICAgIFtRdF0gUG9ydCB0aGUgUXQgcGl4bWFwIEpTIGJpbmRpbmdzIHRvIHVzZSB0 aGUgSlNDIEMgQVBJCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD05NDcwMgogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L3F0L0NoYW5nZUxvZyBiL1Nv dXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nCmluZGV4IGNiZTY1M2NiNDlkZTFhZjg4YjlhMGIxYzg1 NzQzMGI5M2QxNTdlYjMuLmU2NzA2NmY1MmE4Njg0YmM3ZGYwNTQxZDliNmM5OGU4YmJmYmZkMWUg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJL aXQvcXQvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjMgQEAKIDIwMTItMDgtMjkgIFNpbW9uIEhhdXNt YW5uICA8c2ltb24uaGF1c21hbm5Abm9raWEuY29tPgogCisgICAgICAgIFtRdF0gQ2hhbmdlIGN1 c3RvbSBydW50aW1lIGNvbnZlcnNpb24gZnVuY3Rpb25zIHRvIHVzZSB0aGUgSlNDIEMgQVBJCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05NTMyNQorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkYXB0IHRoZSBR V2ViRWxlbWVudCBhbmQgRFJUTm9kZSBjdXN0b20gY29udmVyc2lvbiBmdW5jdGlvbnMgdG8gdXNl IHRoZSBKU0MgQyBBUEkKKyAgICAgICAgaW4gdGhlaXIgc2lnbmF0dXJlLiBUaGVpciBpbXBsZW1l bnRhdGlvbiBjb250aW51ZXMgdG8gcmVxdWlyZSB0aGUgdXNlIG9mIGludGVybmFsIEFQSSwKKyAg ICAgICAgYnV0IHRoYXQncyBub3cgZW5jYXBzdWxhdGVkIGhlcmUgaW5zdGVhZCBvZiBvbiB0aGUg Y2FsbGVyIHNpZGUuCisKKyAgICAgICAgKiBBcGkvcXdlYmVsZW1lbnQuY3BwOgorICAgICAgICAo Y29udmVydEpTVmFsdWVUb1dlYkVsZW1lbnRWYXJpYW50KToKKyAgICAgICAgKGNvbnZlcnRXZWJF bGVtZW50VmFyaWFudFRvSlNWYWx1ZSk6CisgICAgICAgICogV2ViQ29yZVN1cHBvcnQvRHVtcFJl bmRlclRyZWVTdXBwb3J0UXQuY3BwOgorICAgICAgICAoY29udmVydEpTVmFsdWVUb05vZGVWYXJp YW50KToKKyAgICAgICAgKGNvbnZlcnROb2RlVmFyaWFudFRvSlNWYWx1ZSk6CisKKzIwMTItMDgt MjkgIFNpbW9uIEhhdXNtYW5uICA8c2ltb24uaGF1c21hbm5Abm9raWEuY29tPgorCiAgICAgICAg IFtRdF0gUG9ydCBjb252ZXJ0VmFsdWVUb1FWYXJpYW50IHRvIHVzZSB0aGUgSlNDIEMgQVBJCiAg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05NDY5NQogCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9icmlkZ2UvcXQvcXRfcnVudGltZS5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9icmlkZ2UvcXQvcXRfcnVudGltZS5jcHAKaW5kZXggNGZmYTQzNGE2YzIzNzlm MmVhNzQwNTY1NjdmYmQyN2RhYzE5ZGM0NS4uY2Y2NjZjYzFkYzI2NjAwZjJlN2QxNWI0NjUzM2U0 ZDljZTNkODcwNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYnJpZGdlL3F0L3F0X3J1bnRp bWUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2JyaWRnZS9xdC9xdF9ydW50aW1lLmNwcApAQCAt NjI2LDcgKzYyNiw3IEBAIFFWYXJpYW50IGNvbnZlcnRWYWx1ZVRvUVZhcmlhbnQoSlNDb250ZXh0 UmVmIGNvbnRleHQsIEpTVmFsdWVSZWYgdmFsdWUsIFFNZXRhVHlwCiAgICAgICAgICAgICBpZiAo UXRQaXhtYXBSdW50aW1lOjpjYW5IYW5kbGUoc3RhdGljX2Nhc3Q8UU1ldGFUeXBlOjpUeXBlPiho aW50KSkpIHsKICAgICAgICAgICAgICAgICByZXQgPSBRdFBpeG1hcFJ1bnRpbWU6OnRvUXQoY29u dGV4dCwgb2JqZWN0LCBzdGF0aWNfY2FzdDxRTWV0YVR5cGU6OlR5cGU+KGhpbnQpLCBleGNlcHRp b24pOwogICAgICAgICAgICAgfSBlbHNlIGlmIChjdXN0b21SdW50aW1lQ29udmVyc2lvbnMoKS0+ Y29udGFpbnMoaGludCkpIHsKLSAgICAgICAgICAgICAgICByZXQgPSBjdXN0b21SdW50aW1lQ29u dmVyc2lvbnMoKS0+dmFsdWUoaGludCkudG9WYXJpYW50RnVuYyh0b0pTKG9iamVjdCksICZkaXN0 LCB2aXNpdGVkT2JqZWN0cyk7CisgICAgICAgICAgICAgICAgcmV0ID0gY3VzdG9tUnVudGltZUNv bnZlcnNpb25zKCktPnZhbHVlKGhpbnQpLnRvVmFyaWFudEZ1bmMob2JqZWN0LCAmZGlzdCwgdmlz aXRlZE9iamVjdHMpOwogICAgICAgICAgICAgICAgIGlmIChkaXN0ID09IDApCiAgICAgICAgICAg ICAgICAgICAgIGJyZWFrOwogICAgICAgICAgICAgfSBlbHNlIGlmIChoaW50ID09IChRTWV0YVR5 cGU6OlR5cGUpIHFNZXRhVHlwZUlkPFFWYXJpYW50PigpKSB7CkBAIC03NDMsMTYgKzc0Myw4IEBA IEpTVmFsdWVSZWYgY29udmVydFFWYXJpYW50VG9WYWx1ZShKU0NvbnRleHRSZWYgY29udGV4dCwg UGFzc1JlZlB0cjxSb290T2JqZWN0PiByCiAgICAgaWYgKFF0UGl4bWFwUnVudGltZTo6Y2FuSGFu ZGxlKHN0YXRpY19jYXN0PFFNZXRhVHlwZTo6VHlwZT4odmFyaWFudC50eXBlKCkpKSkKICAgICAg ICAgcmV0dXJuIFF0UGl4bWFwUnVudGltZTo6dG9KUyhjb250ZXh0LCB2YXJpYW50LCBleGNlcHRp b24pOwogCi0gICAgaWYgKGN1c3RvbVJ1bnRpbWVDb252ZXJzaW9ucygpLT5jb250YWlucyh0eXBl KSkgewotICAgICAgICBpZiAoIXJvb3QtPmdsb2JhbE9iamVjdCgpLT5pbmhlcml0cygmSlNET01X aW5kb3c6OnNfaW5mbykpCi0gICAgICAgICAgICByZXR1cm4gSlNWYWx1ZU1ha2VVbmRlZmluZWQo Y29udGV4dCk7Ci0KLSAgICAgICAgRG9jdW1lbnQqIGRvY3VtZW50ID0gKHN0YXRpY19jYXN0PEpT RE9NV2luZG93Kj4ocm9vdC0+Z2xvYmFsT2JqZWN0KCkpKS0+aW1wbCgpLT5kb2N1bWVudCgpOwot ICAgICAgICBpZiAoIWRvY3VtZW50KQotICAgICAgICAgICAgcmV0dXJuIEpTVmFsdWVNYWtlVW5k ZWZpbmVkKGNvbnRleHQpOwotICAgICAgICBFeGVjU3RhdGUqIGV4ZWMgPSB0b0pTKGNvbnRleHQp OwotICAgICAgICByZXR1cm4gdG9SZWYoZXhlYywgY3VzdG9tUnVudGltZUNvbnZlcnNpb25zKCkt PnZhbHVlKHR5cGUpLnRvSlNWYWx1ZUZ1bmMoZXhlYywgdG9KU0RPTUdsb2JhbE9iamVjdChkb2N1 bWVudCwgZXhlYyksIHZhcmlhbnQpKTsKLSAgICB9CisgICAgaWYgKGN1c3RvbVJ1bnRpbWVDb252 ZXJzaW9ucygpLT5jb250YWlucyh0eXBlKSkKKyAgICAgICAgcmV0dXJuIGN1c3RvbVJ1bnRpbWVD b252ZXJzaW9ucygpLT52YWx1ZSh0eXBlKS50b0pTVmFsdWVGdW5jKGNvbnRleHQsIHZhcmlhbnQp OwogCiAgICAgaWYgKHR5cGUgPT0gUU1ldGFUeXBlOjpRVmFyaWFudE1hcCkgewogICAgICAgICAv LyBjcmVhdGUgYSBuZXcgb2JqZWN0LCBhbmQgc3R1ZmYgcHJvcGVydGllcyBpbnRvIGl0CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9icmlkZ2UvcXQvcXRfcnVudGltZS5oIGIvU291cmNlL1dl YkNvcmUvYnJpZGdlL3F0L3F0X3J1bnRpbWUuaAppbmRleCBmMjY2Nzg3NDlmMjEwODkwYmQ5ZThl MTJiZjQ0Mzk2NDNmMzgwOWJkLi5iYWJiMmU2MDQ2ZDAxNGY3NjU2MDExNzJjZTg5NDk3MzYyMDYy NDg3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9icmlkZ2UvcXQvcXRfcnVudGltZS5oCisr KyBiL1NvdXJjZS9XZWJDb3JlL2JyaWRnZS9xdC9xdF9ydW50aW1lLmgKQEAgLTEzMiw4ICsxMzIs OCBAQCBwcml2YXRlOgogfTsKIAogCi10eXBlZGVmIFFWYXJpYW50ICgqQ29udmVydFRvVmFyaWFu dEZ1bmN0aW9uKShKU09iamVjdCogb2JqZWN0LCBpbnQgKmRpc3RhbmNlLCBIYXNoU2V0PEpTT2Jq ZWN0UmVmPiogdmlzaXRlZE9iamVjdHMpOwotdHlwZWRlZiBKU1ZhbHVlICgqQ29udmVydFRvSlNW YWx1ZUZ1bmN0aW9uKShFeGVjU3RhdGUqIGV4ZWMsIFdlYkNvcmU6OkpTRE9NR2xvYmFsT2JqZWN0 KiBnbG9iYWxPYmplY3QsIGNvbnN0IFFWYXJpYW50JiB2YXJpYW50KTsKK3R5cGVkZWYgUVZhcmlh bnQgKCpDb252ZXJ0VG9WYXJpYW50RnVuY3Rpb24pKEpTT2JqZWN0UmVmIG9iamVjdCwgaW50ICpk aXN0YW5jZSwgSGFzaFNldDxKU09iamVjdFJlZj4qIHZpc2l0ZWRPYmplY3RzKTsKK3R5cGVkZWYg SlNWYWx1ZVJlZiAoKkNvbnZlcnRUb0pTVmFsdWVGdW5jdGlvbikoSlNDb250ZXh0UmVmLCBjb25z dCBRVmFyaWFudCYgdmFyaWFudCk7CiAKIHZvaWQgcmVnaXN0ZXJDdXN0b21UeXBlKGludCBxdE1l dGFUeXBlSWQsIENvbnZlcnRUb1ZhcmlhbnRGdW5jdGlvbiwgQ29udmVydFRvSlNWYWx1ZUZ1bmN0 aW9uKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9xdC9BcGkvcXdlYmVsZW1lbnQuY3Bw IGIvU291cmNlL1dlYktpdC9xdC9BcGkvcXdlYmVsZW1lbnQuY3BwCmluZGV4IGU3NDhlNDQxNGJk ZmQ4N2I1ZWI3MTg2OWMyMGIwY2IxODk3Y2Q5ZWYuLmVjMmI3MjZmYTAxOWJiZjNkOTkwMDdlNzE4 ZWQ4NTBkOGY2YzcyZTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvcXQvQXBpL3F3ZWJlbGVt ZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L3F0L0FwaS9xd2ViZWxlbWVudC5jcHAKQEAgLTIw NDgsOCArMjA0OCw5IEBAIEVsZW1lbnQqIFF0V2ViRWxlbWVudFJ1bnRpbWU6OmdldChjb25zdCBR V2ViRWxlbWVudCYgZWxlbWVudCkKICAgICByZXR1cm4gZWxlbWVudC5tX2VsZW1lbnQ7CiB9CiAK LXN0YXRpYyBRVmFyaWFudCBjb252ZXJ0SlNWYWx1ZVRvV2ViRWxlbWVudFZhcmlhbnQoSlNDOjpK U09iamVjdCogb2JqZWN0LCBpbnQgKmRpc3RhbmNlLCBIYXNoU2V0PEpTT2JqZWN0UmVmPiogdmlz aXRlZE9iamVjdHMpCitzdGF0aWMgUVZhcmlhbnQgY29udmVydEpTVmFsdWVUb1dlYkVsZW1lbnRW YXJpYW50KEpTT2JqZWN0UmVmIG8sIGludCAqZGlzdGFuY2UsIEhhc2hTZXQ8SlNPYmplY3RSZWY+ KiB2aXNpdGVkT2JqZWN0cykKIHsKKyAgICBKU0M6OkpTT2JqZWN0KiBvYmplY3QgPSB0b0pTKG8p OwogICAgIEVsZW1lbnQqIGVsZW1lbnQgPSAwOwogICAgIFFWYXJpYW50IHJldDsKICAgICBpZiAo b2JqZWN0ICYmIG9iamVjdC0+aW5oZXJpdHMoJkpTRWxlbWVudDo6c19pbmZvKSkgewpAQCAtMjA2 OSw5ICsyMDcwLDEwIEBAIHN0YXRpYyBRVmFyaWFudCBjb252ZXJ0SlNWYWx1ZVRvV2ViRWxlbWVu dFZhcmlhbnQoSlNDOjpKU09iamVjdCogb2JqZWN0LCBpbnQgKmRpCiAgICAgcmV0dXJuIFFWYXJp YW50Ojpmcm9tVmFsdWU8UVdlYkVsZW1lbnQ+KFF0V2ViRWxlbWVudFJ1bnRpbWU6OmNyZWF0ZShl bGVtZW50KSk7CiB9CiAKLXN0YXRpYyBKU0M6OkpTVmFsdWUgY29udmVydFdlYkVsZW1lbnRWYXJp YW50VG9KU1ZhbHVlKEpTQzo6RXhlY1N0YXRlKiBleGVjLCBXZWJDb3JlOjpKU0RPTUdsb2JhbE9i amVjdCogZ2xvYmFsT2JqZWN0LCBjb25zdCBRVmFyaWFudCYgdmFyaWFudCkKK3N0YXRpYyBKU1Zh bHVlUmVmIGNvbnZlcnRXZWJFbGVtZW50VmFyaWFudFRvSlNWYWx1ZShKU0NvbnRleHRSZWYgY29u dGV4dCwgY29uc3QgUVZhcmlhbnQmIHZhcmlhbnQpCiB7Ci0gICAgcmV0dXJuIFdlYkNvcmU6OnRv SlMoZXhlYywgZ2xvYmFsT2JqZWN0LCBRdFdlYkVsZW1lbnRSdW50aW1lOjpnZXQodmFyaWFudC52 YWx1ZTxRV2ViRWxlbWVudD4oKSkpOworICAgIEpTQzo6RXhlY1N0YXRlKiBleGVjID0gdG9KUyhj b250ZXh0KTsKKyAgICByZXR1cm4gdG9SZWYoZXhlYywgV2ViQ29yZTo6dG9KUyhleGVjLCBzdGF0 aWNfY2FzdDxKU0RPTUdsb2JhbE9iamVjdCo+KGV4ZWMtPmxleGljYWxHbG9iYWxPYmplY3QoKSks IFF0V2ViRWxlbWVudFJ1bnRpbWU6OmdldCh2YXJpYW50LnZhbHVlPFFXZWJFbGVtZW50PigpKSkp OwogfQogCiB2b2lkIFF0V2ViRWxlbWVudFJ1bnRpbWU6OmluaXRpYWxpemUoKQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9EdW1wUmVuZGVyVHJlZVN1cHBvcnRR dC5jcHAgYi9Tb3VyY2UvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L0R1bXBSZW5kZXJUcmVlU3Vw cG9ydFF0LmNwcAppbmRleCA2YjE3OGM1NTE4NTBmYzYxODYxNmZiYWQ0NTY0YzE0M2Q0ZTkzNTUz Li5lYmZiNjgzZGQ5MDI5ZjgwY2ZiZmM2YjE4NGFhZTFmNTFlOTU2NWRlIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L0R1bXBSZW5kZXJUcmVlU3VwcG9ydFF0LmNw cAorKysgYi9Tb3VyY2UvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L0R1bXBSZW5kZXJUcmVlU3Vw cG9ydFF0LmNwcApAQCAtMTY2LDE2ICsxNjYsMTggQEAgV2ViQ29yZTo6Tm9kZSogUXREUlROb2Rl UnVudGltZTo6Z2V0KGNvbnN0IFFEUlROb2RlJiBub2RlKQogICAgIHJldHVybiBub2RlLm1fbm9k ZTsKIH0KIAotc3RhdGljIFFWYXJpYW50IGNvbnZlcnRKU1ZhbHVlVG9Ob2RlVmFyaWFudChKU0M6 OkpTT2JqZWN0KiBvYmplY3QsIGludCAqZGlzdGFuY2UsIEhhc2hTZXQ8SlNPYmplY3RSZWY+KikK K3N0YXRpYyBRVmFyaWFudCBjb252ZXJ0SlNWYWx1ZVRvTm9kZVZhcmlhbnQoSlNPYmplY3RSZWYg bywgaW50ICpkaXN0YW5jZSwgSGFzaFNldDxKU09iamVjdFJlZj4qKQogeworICAgIEpTQzo6SlNP YmplY3QqIG9iamVjdCA9IHRvSlMobyk7CiAgICAgaWYgKCFvYmplY3QgfHwgIW9iamVjdC0+aW5o ZXJpdHMoJkpTTm9kZTo6c19pbmZvKSkKICAgICAgICAgcmV0dXJuIFFWYXJpYW50KCk7CiAgICAg cmV0dXJuIFFWYXJpYW50Ojpmcm9tVmFsdWU8UURSVE5vZGU+KFF0RFJUTm9kZVJ1bnRpbWU6OmNy ZWF0ZSgoc3RhdGljX2Nhc3Q8SlNOb2RlKj4ob2JqZWN0KSktPmltcGwoKSkpOwogfQogCi1zdGF0 aWMgSlNDOjpKU1ZhbHVlIGNvbnZlcnROb2RlVmFyaWFudFRvSlNWYWx1ZShKU0M6OkV4ZWNTdGF0 ZSogZXhlYywgV2ViQ29yZTo6SlNET01HbG9iYWxPYmplY3QqIGdsb2JhbE9iamVjdCwgY29uc3Qg UVZhcmlhbnQmIHZhcmlhbnQpCitzdGF0aWMgSlNWYWx1ZVJlZiBjb252ZXJ0Tm9kZVZhcmlhbnRU b0pTVmFsdWUoSlNDb250ZXh0UmVmIGNvbnRleHQsIGNvbnN0IFFWYXJpYW50JiB2YXJpYW50KQog ewotICAgIHJldHVybiB0b0pTKGV4ZWMsIGdsb2JhbE9iamVjdCwgUXREUlROb2RlUnVudGltZTo6 Z2V0KHZhcmlhbnQudmFsdWU8UURSVE5vZGU+KCkpKTsKKyAgICBKU0M6OkV4ZWNTdGF0ZSogZXhl YyA9IHRvSlMoY29udGV4dCk7CisgICAgcmV0dXJuIHRvUmVmKGV4ZWMsIHRvSlMoZXhlYywgc3Rh dGljX2Nhc3Q8SlNET01HbG9iYWxPYmplY3QqPihleGVjLT5sZXhpY2FsR2xvYmFsT2JqZWN0KCkp LCBRdERSVE5vZGVSdW50aW1lOjpnZXQodmFyaWFudC52YWx1ZTxRRFJUTm9kZT4oKSkpKTsKIH0K IAogdm9pZCBRdERSVE5vZGVSdW50aW1lOjppbml0aWFsaXplKCkK