94768 2012-08-22 19:14:45 -0700 [V8] Move evaluate() from V8Proxy to ScriptController 2012-08-22 20:43:23 -0700 1 1 1 Unclassified WebKit WebCore JavaScript 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 85330 1 haraken haraken abarth japhet webkit.review.bot oldest_to_newest 702632 0 haraken 2012-08-22 19:14:45 -0700 To kill V8Proxy, we can move evaluate() from V8Proxy to ScriptController. 702637 1 160067 haraken 2012-08-22 19:19:10 -0700 Created attachment 160067 Patch 702648 2 160067 abarth 2012-08-22 20:03:38 -0700 Comment on attachment 160067 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=160067&action=review > Source/WebCore/bindings/v8/ScriptController.cpp:309 > + v8::Handle<v8::Context> v8Context = ScriptController::mainWorldContext(m_proxy->frame()); m_proxy->frame() is just m_frame, right? 702664 3 haraken 2012-08-22 20:42:35 -0700 Committed r126388: <http://trac.webkit.org/changeset/126388> 702665 4 haraken 2012-08-22 20:43:16 -0700 (In reply to comment #2) > > + v8::Handle<v8::Context> v8Context = ScriptController::mainWorldContext(m_proxy->frame()); > > m_proxy->frame() is just m_frame, right? Done. Thanks. 160067 2012-08-22 19:19:10 -0700 2012-08-22 20:43:23 -0700 Patch bug-94768-20120823111907.patch text/plain 12905 haraken U3VidmVyc2lvbiBSZXZpc2lvbjogMTI2Mzc4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggN2UxYjk0MmEwMWU3MDg3 ZjNkMGMwMDA0YWNjNjI2MzY4ZWU4NGY5Mi4uZTA3NDNkYTIwZTE2YjRiYzI4ZGIwY2E1NmZhZjU0 YjNhYmE1NjQxYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMzIEBACisyMDEyLTA4LTIyICBLZW50 YXJvIEhhcmEgIDxoYXJha2VuQGNocm9taXVtLm9yZz4KKworICAgICAgICBbVjhdIE1vdmUgZXZh bHVhdGUoKSBmcm9tIFY4UHJveHkgdG8gU2NyaXB0Q29udHJvbGxlcgorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTQ3NjgKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUbyBraWxsIFY4UHJveHksIHdlIGNhbiBt b3ZlIGV2YWx1YXRlKCkgZnJvbSBWOFByb3h5IHRvIFNjcmlwdENvbnRyb2xsZXIuCisKKyAgICAg ICAgLSBSZW5hbWVkIGV2YWx1YXRlKCkgdG8gY29tcGlsZUFuZFJ1blNjcmlwdCgpIHRvIGF2b2lk IG5hbWUgY29uZmxpY3QKKyAgICAgICAgd2l0aCBleGlzdGluZyBTY3JpcHRDb250cm9sbGVyOjpl dmFsdWF0ZSgpLgorCisgICAgICAgIC0gUmVtb3ZlZCB0b1Y4UHJveHkoKSBmcm9tIE5QVjhPYmpl Y3QsIGFzIGl0IGlzIG5vIGxvbmdlciB1c2VkLgorCisgICAgICAgIE5vIHRlc3RzLiBObyBjaGFu Z2UgaW4gYmVoYXZpb3IuCisKKyAgICAgICAgKiBiaW5kaW5ncy92OC9OUFY4T2JqZWN0LmNwcDoK KyAgICAgICAgKF9OUE5fRXZhbHVhdGVIZWxwZXIpOgorICAgICAgICAqIGJpbmRpbmdzL3Y4L1Nj aGVkdWxlZEFjdGlvbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTY2hlZHVsZWRBY3Rpb246OmV4 ZWN1dGUpOgorICAgICAgICAqIGJpbmRpbmdzL3Y4L1NjcmlwdENvbnRyb2xsZXIuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6U2NyaXB0Q29udHJvbGxlcjo6Y29tcGlsZUFuZFJ1blNjcmlwdCk6Cisg ICAgICAgIChXZWJDb3JlKToKKyAgICAgICAgKFdlYkNvcmU6OlNjcmlwdENvbnRyb2xsZXI6OmV2 YWx1YXRlKToKKyAgICAgICAgKFdlYkNvcmU6OlNjcmlwdENvbnRyb2xsZXI6OmV2YWx1YXRlSW5J c29sYXRlZFdvcmxkKToKKyAgICAgICAgKiBiaW5kaW5ncy92OC9TY3JpcHRDb250cm9sbGVyLmg6 CisgICAgICAgIChTY3JpcHRDb250cm9sbGVyKToKKyAgICAgICAgKiBiaW5kaW5ncy92OC9WOFBy b3h5LmNwcDoKKyAgICAgICAgKiBiaW5kaW5ncy92OC9WOFByb3h5Lmg6CisKIDIwMTItMDgtMjIg IEphbWVzIFJvYmluc29uICA8amFtZXNyQGNocm9taXVtLm9yZz4KIAogICAgICAgICBbY2hyb21p dW1dIENoYW5nZSBXZWJMYXllciBmcm9tIGEgY29uY3JldGUgdHlwZSB0byBhIHB1cmUgdmlydHVh bCBpbnRlcmZhY2UKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L05QVjhP YmplY3QuY3BwIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvTlBWOE9iamVjdC5jcHAKaW5k ZXggYWY3ZDk5ZTdlZWEyODIwMGZjZTljMTE2MjE4ZmM2MGFlZGViNzY5Yi4uODI5ZDllZjhjZDdl MjNjZTM4ZjdjNjgwMDgzMTA5ZmFmNzFiZDM5MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv YmluZGluZ3MvdjgvTlBWOE9iamVjdC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mv djgvTlBWOE9iamVjdC5jcHAKQEAgLTY5LDE1ICs2OSw2IEBAIHN0YXRpYyB2ODo6TG9jYWw8djg6 OkNvbnRleHQ+IHRvVjhDb250ZXh0KE5QUCBucHAsIE5QT2JqZWN0KiBucE9iamVjdCkKICAgICBy ZXR1cm4gU2NyaXB0Q29udHJvbGxlcjo6bWFpbldvcmxkQ29udGV4dChvYmplY3QtPnJvb3RPYmpl Y3QtPmZyYW1lKCkpOwogfQogCi1zdGF0aWMgVjhQcm94eSogdG9WOFByb3h5KE5QT2JqZWN0KiBu cE9iamVjdCkKLXsKLSAgICBWOE5QT2JqZWN0KiBvYmplY3QgPSByZWludGVycHJldF9jYXN0PFY4 TlBPYmplY3QqPihucE9iamVjdCk7Ci0gICAgRnJhbWUqIGZyYW1lID0gb2JqZWN0LT5yb290T2Jq ZWN0LT5mcmFtZSgpOwotICAgIGlmICghZnJhbWUpCi0gICAgICAgIHJldHVybiAwOwotICAgIHJl dHVybiBmcmFtZS0+c2NyaXB0KCktPnByb3h5KCk7Ci19Ci0KIHN0YXRpYyBWOE5QT2JqZWN0TWFw KiBzdGF0aWNWOE5QT2JqZWN0TWFwKCkKIHsKICAgICBERUZJTkVfU1RBVElDX0xPQ0FMKFY4TlBP YmplY3RNYXAsIHY4bnBPYmplY3RNYXAsICgpKTsKQEAgLTMzNSw5ICszMjYsNiBAQCBib29sIF9O UE5fRXZhbHVhdGVIZWxwZXIoTlBQIG5wcCwgYm9vbCBwb3B1cHNBbGxvd2VkLCBOUE9iamVjdCog bnBPYmplY3QsIE5QU3RyaQogICAgIGlmIChjb250ZXh0LklzRW1wdHkoKSkKICAgICAgICAgcmV0 dXJuIGZhbHNlOwogCi0gICAgVjhQcm94eSogcHJveHkgPSB0b1Y4UHJveHkobnBPYmplY3QpOwot ICAgIEFTU0VSVChwcm94eSk7Ci0KICAgICB2ODo6Q29udGV4dDo6U2NvcGUgc2NvcGUoY29udGV4 dCk7CiAgICAgRXhjZXB0aW9uQ2F0Y2hlciBleGNlcHRpb25DYXRjaGVyOwogCkBAIC0zNDYsMTAg KzMzNCwxNCBAQCBib29sIF9OUE5fRXZhbHVhdGVIZWxwZXIoTlBQIG5wcCwgYm9vbCBwb3B1cHNB bGxvd2VkLCBOUE9iamVjdCogbnBPYmplY3QsIE5QU3RyaQogICAgIGlmICghcG9wdXBzQWxsb3dl ZCkKICAgICAgICAgZmlsZW5hbWUgPSAibnBzY3JpcHQiOwogCisgICAgVjhOUE9iamVjdCogdjhO cE9iamVjdCA9IHJlaW50ZXJwcmV0X2Nhc3Q8VjhOUE9iamVjdCo+KG5wT2JqZWN0KTsKKyAgICBG cmFtZSogZnJhbWUgPSB2OE5wT2JqZWN0LT5yb290T2JqZWN0LT5mcmFtZSgpOworICAgIEFTU0VS VChmcmFtZSk7CisKICAgICBTdHJpbmcgc2NyaXB0ID0gU3RyaW5nOjpmcm9tVVRGOChucFNjcmlw dC0+VVRGOENoYXJhY3RlcnMsIG5wU2NyaXB0LT5VVEY4TGVuZ3RoKTsKIAogICAgIFVzZXJHZXN0 dXJlSW5kaWNhdG9yIGdlc3R1cmVJbmRpY2F0b3IocG9wdXBzQWxsb3dlZCA/IERlZmluaXRlbHlQ cm9jZXNzaW5nVXNlckdlc3R1cmUgOiBQb3NzaWJseVByb2Nlc3NpbmdVc2VyR2VzdHVyZSk7Ci0g ICAgdjg6OkxvY2FsPHY4OjpWYWx1ZT4gdjhyZXN1bHQgPSBwcm94eS0+ZXZhbHVhdGUoU2NyaXB0 U291cmNlQ29kZShzY3JpcHQsIEtVUkwoUGFyc2VkVVJMU3RyaW5nLCBmaWxlbmFtZSkpLCAwKTsK KyAgICB2ODo6TG9jYWw8djg6OlZhbHVlPiB2OHJlc3VsdCA9IGZyYW1lLT5zY3JpcHQoKS0+Y29t cGlsZUFuZFJ1blNjcmlwdChTY3JpcHRTb3VyY2VDb2RlKHNjcmlwdCwgS1VSTChQYXJzZWRVUkxT dHJpbmcsIGZpbGVuYW1lKSkpOwogCiAgICAgaWYgKHY4cmVzdWx0LklzRW1wdHkoKSkKICAgICAg ICAgcmV0dXJuIGZhbHNlOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvdjgv U2NoZWR1bGVkQWN0aW9uLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1NjaGVkdWxl ZEFjdGlvbi5jcHAKaW5kZXggZDU2ZjY3N2EwN2M1Y2IyMjRiOGI1M2Q2MmViMjE4YzZmYjBkMmU3 Zi4uYjA1NDJlMjAzODgwMGJiOTI0NWFiODQ1OWIyNGU3MjRiNDAzZTQ1MyAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvU2NoZWR1bGVkQWN0aW9uLmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9iaW5kaW5ncy92OC9TY2hlZHVsZWRBY3Rpb24uY3BwCkBAIC0xMzIsNyArMTMy LDcgQEAgdm9pZCBTY2hlZHVsZWRBY3Rpb246OmV4ZWN1dGUoU2NyaXB0Q29udHJvbGxlciogc2Ny aXB0KQogICAgIGlmICghbV9mdW5jdGlvbi5Jc0VtcHR5KCkgJiYgbV9mdW5jdGlvbi0+SXNGdW5j dGlvbigpKQogICAgICAgICBzY3JpcHQtPmNhbGxGdW5jdGlvbih2ODo6UGVyc2lzdGVudDx2ODo6 RnVuY3Rpb24+OjpDYXN0KG1fZnVuY3Rpb24pLCB2OENvbnRleHQtPkdsb2JhbCgpLCBtX2FyZ2Ms IG1fYXJndik7CiAgICAgZWxzZQotICAgICAgICBzY3JpcHQtPnByb3h5KCktPmV2YWx1YXRlKG1f Y29kZSwgMCk7CisgICAgICAgIHNjcmlwdC0+Y29tcGlsZUFuZFJ1blNjcmlwdChtX2NvZGUpOwog CiAgICAgLy8gVGhlICdwcm94eScgbWF5IGJlIGludmFsaWQgYXQgdGhpcyBwb2ludCBzaW5jZSBK UyBjb3VsZCBoYXZlIHJlbGVhc2VkIHRoZSBvd25pbmcgRnJhbWUuCiB9CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9TY3JpcHRDb250cm9sbGVyLmNwcCBiL1NvdXJjZS9X ZWJDb3JlL2JpbmRpbmdzL3Y4L1NjcmlwdENvbnRyb2xsZXIuY3BwCmluZGV4IGFmNWFkNjkyZDAy Njk5MGU2NTdmZDlkNGFlZmQyNTRkYjQ5ZmVmYjMuLjlmODE2NDczMWFlNzFjYTQzNzM4YjdhYmRm YzIwNTVkNTUwOTcyZjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1Nj cmlwdENvbnRyb2xsZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1Njcmlw dENvbnRyb2xsZXIuY3BwCkBAIC01MCw2ICs1MCw3IEBACiAjaW5jbHVkZSAiUGxhdGZvcm1TdXBw b3J0LmgiCiAjaW5jbHVkZSAiU2NyaXB0Q2FsbFN0YWNrLmgiCiAjaW5jbHVkZSAiU2NyaXB0Q2Fs bFN0YWNrRmFjdG9yeS5oIgorI2luY2x1ZGUgIlNjcmlwdFJ1bm5lci5oIgogI2luY2x1ZGUgIlNj cmlwdFNvdXJjZUNvZGUuaCIKICNpbmNsdWRlICJTY3JpcHRhYmxlRG9jdW1lbnRQYXJzZXIuaCIK ICNpbmNsdWRlICJTZWN1cml0eU9yaWdpbi5oIgpAQCAtMjU2LDYgKzI1Nyw3MyBAQCBTY3JpcHRW YWx1ZSBTY3JpcHRDb250cm9sbGVyOjpjYWxsRnVuY3Rpb25FdmVuSWZTY3JpcHREaXNhYmxlZCh2 ODo6SGFuZGxlPHY4OjpGdQogICAgIHJldHVybiBTY3JpcHRWYWx1ZShjYWxsRnVuY3Rpb24oZnVu Y3Rpb24sIHJlY2VpdmVyLCBhcmdjLCBhcmd2KSk7CiB9CiAKK3Y4OjpMb2NhbDx2ODo6VmFsdWU+ IFNjcmlwdENvbnRyb2xsZXI6OmNvbXBpbGVBbmRSdW5TY3JpcHQoY29uc3QgU2NyaXB0U291cmNl Q29kZSYgc291cmNlKQoreworICAgIEFTU0VSVCh2ODo6Q29udGV4dDo6SW5Db250ZXh0KCkpOwor CisgICAgVjhHQ0NvbnRyb2xsZXI6OmNoZWNrTWVtb3J5VXNhZ2UoKTsKKworICAgIEluc3BlY3Rv ckluc3RydW1lbnRhdGlvbkNvb2tpZSBjb29raWUgPSBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246 OndpbGxFdmFsdWF0ZVNjcmlwdChtX2ZyYW1lLCBzb3VyY2UudXJsKCkuaXNOdWxsKCkgPyBTdHJp bmcoKSA6IHNvdXJjZS51cmwoKS5zdHJpbmcoKSwgc291cmNlLnN0YXJ0TGluZSgpKTsKKworICAg IHY4OjpMb2NhbDx2ODo6VmFsdWU+IHJlc3VsdDsKKyAgICB7CisgICAgICAgIC8vIElzb2xhdGUg ZXhjZXB0aW9ucyB0aGF0IG9jY3VyIHdoZW4gY29tcGlsaW5nIGFuZCBleGVjdXRpbmcKKyAgICAg ICAgLy8gdGhlIGNvZGUuIFRoZXNlIGV4Y2VwdGlvbnMgc2hvdWxkIG5vdCBpbnRlcmZlcmUgd2l0 aAorICAgICAgICAvLyBqYXZhc2NyaXB0IGNvZGUgd2UgbWlnaHQgZXZhbHVhdGUgZnJvbSBDKysg d2hlbiByZXR1cm5pbmcKKyAgICAgICAgLy8gZnJvbSBoZXJlLgorICAgICAgICB2ODo6VHJ5Q2F0 Y2ggdHJ5Q2F0Y2g7CisgICAgICAgIHRyeUNhdGNoLlNldFZlcmJvc2UodHJ1ZSk7CisKKyAgICAg ICAgLy8gQ29tcGlsZSB0aGUgc2NyaXB0LgorICAgICAgICB2ODo6TG9jYWw8djg6OlN0cmluZz4g Y29kZSA9IHY4RXh0ZXJuYWxTdHJpbmcoc291cmNlLnNvdXJjZSgpKTsKKyNpZiBQTEFURk9STShD SFJPTUlVTSkKKyAgICAgICAgVFJBQ0VfRVZFTlRfQkVHSU4wKCJ2OCIsICJ2OC5jb21waWxlIik7 CisjZW5kaWYKKyAgICAgICAgT3duUHRyPHY4OjpTY3JpcHREYXRhPiBzY3JpcHREYXRhID0gU2Ny aXB0U291cmNlQ29kZTo6cHJlY29tcGlsZVNjcmlwdChjb2RlLCBzb3VyY2UuY2FjaGVkU2NyaXB0 KCkpOworCisgICAgICAgIC8vIE5PVEU6IEZvciBjb21wYXRpYmlsaXR5IHdpdGggV2ViQ29yZSwg U2NyaXB0U291cmNlQ29kZSdzIGxpbmUgc3RhcnRzIGF0CisgICAgICAgIC8vIDEsIHdoZXJlYXMg djggc3RhcnRzIGF0IDAuCisgICAgICAgIHY4OjpIYW5kbGU8djg6OlNjcmlwdD4gc2NyaXB0ID0g U2NyaXB0U291cmNlQ29kZTo6Y29tcGlsZVNjcmlwdChjb2RlLCBzb3VyY2UudXJsKCksIHNvdXJj ZS5zdGFydFBvc2l0aW9uKCksIHNjcmlwdERhdGEuZ2V0KCkpOworI2lmIFBMQVRGT1JNKENIUk9N SVVNKQorICAgICAgICBUUkFDRV9FVkVOVF9FTkQwKCJ2OCIsICJ2OC5jb21waWxlIik7CisgICAg ICAgIFRSQUNFX0VWRU5UMCgidjgiLCAidjgucnVuIik7CisjZW5kaWYKKworICAgICAgICAvLyBL ZWVwIEZyYW1lIChhbmQgdGhlcmVmb3JlIFNjcmlwdENvbnRyb2xsZXIpIGFsaXZlLgorICAgICAg ICBSZWZQdHI8RnJhbWU+IHByb3RlY3QobV9mcmFtZSk7CisgICAgICAgIHJlc3VsdCA9IFNjcmlw dFJ1bm5lcjo6cnVuQ29tcGlsZWRTY3JpcHQoc2NyaXB0LCBtX2ZyYW1lLT5kb2N1bWVudCgpKTsK KyAgICB9CisKKyAgICBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246OmRpZEV2YWx1YXRlU2NyaXB0 KGNvb2tpZSk7CisKKyAgICByZXR1cm4gcmVzdWx0OworfQorCitTY3JpcHRWYWx1ZSBTY3JpcHRD b250cm9sbGVyOjpldmFsdWF0ZShjb25zdCBTY3JpcHRTb3VyY2VDb2RlJiBzb3VyY2VDb2RlKQor eworICAgIFN0cmluZyBzb3VyY2VVUkwgPSBzb3VyY2VDb2RlLnVybCgpOworICAgIGNvbnN0IFN0 cmluZyogc2F2ZWRTb3VyY2VVUkwgPSBtX3NvdXJjZVVSTDsKKyAgICBtX3NvdXJjZVVSTCA9ICZz b3VyY2VVUkw7CisKKyAgICB2ODo6SGFuZGxlU2NvcGUgaGFuZGxlU2NvcGU7CisgICAgdjg6Okhh bmRsZTx2ODo6Q29udGV4dD4gdjhDb250ZXh0ID0gU2NyaXB0Q29udHJvbGxlcjo6bWFpbldvcmxk Q29udGV4dChtX3Byb3h5LT5mcmFtZSgpKTsKKyAgICBpZiAodjhDb250ZXh0LklzRW1wdHkoKSkK KyAgICAgICAgcmV0dXJuIFNjcmlwdFZhbHVlKCk7CisKKyAgICB2ODo6Q29udGV4dDo6U2NvcGUg c2NvcGUodjhDb250ZXh0KTsKKworICAgIFJlZlB0cjxGcmFtZT4gcHJvdGVjdChtX2ZyYW1lKTsK KworICAgIHY4OjpMb2NhbDx2ODo6VmFsdWU+IG9iamVjdCA9IGNvbXBpbGVBbmRSdW5TY3JpcHQo c291cmNlQ29kZSk7CisKKyAgICBtX3NvdXJjZVVSTCA9IHNhdmVkU291cmNlVVJMOworCisgICAg aWYgKG9iamVjdC5Jc0VtcHR5KCkpCisgICAgICAgIHJldHVybiBTY3JpcHRWYWx1ZSgpOworCisg ICAgcmV0dXJuIFNjcmlwdFZhbHVlKG9iamVjdCk7Cit9CisKIHZvaWQgU2NyaXB0Q29udHJvbGxl cjo6ZXZhbHVhdGVJbklzb2xhdGVkV29ybGQodW5zaWduZWQgd29ybGRJRCwgY29uc3QgVmVjdG9y PFNjcmlwdFNvdXJjZUNvZGU+JiBzb3VyY2VzLCBWZWN0b3I8U2NyaXB0VmFsdWU+KiByZXN1bHRz KQogewogICAgIGV2YWx1YXRlSW5Jc29sYXRlZFdvcmxkKHdvcmxkSUQsIHNvdXJjZXMsIDAsIHJl c3VsdHMpOwpAQCAtMzA0LDcgKzM3Miw3IEBAIHZvaWQgU2NyaXB0Q29udHJvbGxlcjo6ZXZhbHVh dGVJbklzb2xhdGVkV29ybGQodW5zaWduZWQgd29ybGRJRCwgY29uc3QgVmVjdG9yPFNjCiAgICAg ICAgIHY4OjpMb2NhbDx2ODo6QXJyYXk+IHJlc3VsdEFycmF5ID0gdjg6OkFycmF5OjpOZXcoc291 cmNlcy5zaXplKCkpOwogCiAgICAgICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgc291cmNlcy5z aXplKCk7ICsraSkgewotICAgICAgICAgICAgdjg6OkxvY2FsPHY4OjpWYWx1ZT4gZXZhbHVhdGlv blJlc3VsdCA9IG1fcHJveHktPmV2YWx1YXRlKHNvdXJjZXNbaV0sIDApOworICAgICAgICAgICAg djg6OkxvY2FsPHY4OjpWYWx1ZT4gZXZhbHVhdGlvblJlc3VsdCA9IGNvbXBpbGVBbmRSdW5TY3Jp cHQoc291cmNlc1tpXSk7CiAgICAgICAgICAgICBpZiAoZXZhbHVhdGlvblJlc3VsdC5Jc0VtcHR5 KCkpCiAgICAgICAgICAgICAgICAgZXZhbHVhdGlvblJlc3VsdCA9IHY4OjpMb2NhbDx2ODo6VmFs dWU+OjpOZXcodjg6OlVuZGVmaW5lZCgpKTsKICAgICAgICAgICAgIHJlc3VsdEFycmF5LT5TZXQo aSwgZXZhbHVhdGlvblJlc3VsdCk7CkBAIC0zMzEsMzIgKzM5OSw2IEBAIHZvaWQgU2NyaXB0Q29u dHJvbGxlcjo6c2V0SXNvbGF0ZWRXb3JsZFNlY3VyaXR5T3JpZ2luKGludCB3b3JsZElELCBQYXNz UmVmUHRyPFNlCiAgICAgICAgIGl0ZXItPnNlY29uZC0+c2V0U2VjdXJpdHlPcmlnaW4oc2VjdXJp dHlPcmlnaW4pOwogfQogCi0vLyBFdmFsdWF0ZSBhIHNjcmlwdCBmaWxlIGluIHRoZSBlbnZpcm9u bWVudCBvZiB0aGlzIHByb3h5LgotU2NyaXB0VmFsdWUgU2NyaXB0Q29udHJvbGxlcjo6ZXZhbHVh dGUoY29uc3QgU2NyaXB0U291cmNlQ29kZSYgc291cmNlQ29kZSkKLXsKLSAgICBTdHJpbmcgc291 cmNlVVJMID0gc291cmNlQ29kZS51cmwoKTsKLSAgICBjb25zdCBTdHJpbmcqIHNhdmVkU291cmNl VVJMID0gbV9zb3VyY2VVUkw7Ci0gICAgbV9zb3VyY2VVUkwgPSAmc291cmNlVVJMOwotCi0gICAg djg6OkhhbmRsZVNjb3BlIGhhbmRsZVNjb3BlOwotICAgIHY4OjpIYW5kbGU8djg6OkNvbnRleHQ+ IHY4Q29udGV4dCA9IFNjcmlwdENvbnRyb2xsZXI6Om1haW5Xb3JsZENvbnRleHQobV9wcm94eS0+ ZnJhbWUoKSk7Ci0gICAgaWYgKHY4Q29udGV4dC5Jc0VtcHR5KCkpCi0gICAgICAgIHJldHVybiBT Y3JpcHRWYWx1ZSgpOwotCi0gICAgdjg6OkNvbnRleHQ6OlNjb3BlIHNjb3BlKHY4Q29udGV4dCk7 Ci0KLSAgICBSZWZQdHI8RnJhbWU+IHByb3RlY3QobV9mcmFtZSk7Ci0KLSAgICB2ODo6TG9jYWw8 djg6OlZhbHVlPiBvYmplY3QgPSBtX3Byb3h5LT5ldmFsdWF0ZShzb3VyY2VDb2RlLCAwKTsKLQot ICAgIG1fc291cmNlVVJMID0gc2F2ZWRTb3VyY2VVUkw7Ci0KLSAgICBpZiAob2JqZWN0LklzRW1w dHkoKSkKLSAgICAgICAgcmV0dXJuIFNjcmlwdFZhbHVlKCk7Ci0KLSAgICByZXR1cm4gU2NyaXB0 VmFsdWUob2JqZWN0KTsKLX0KLQogVGV4dFBvc2l0aW9uIFNjcmlwdENvbnRyb2xsZXI6OmV2ZW50 SGFuZGxlclBvc2l0aW9uKCkgY29uc3QKIHsKICAgICBTY3JpcHRhYmxlRG9jdW1lbnRQYXJzZXIq IHBhcnNlciA9IG1fZnJhbWUtPmRvY3VtZW50KCktPnNjcmlwdGFibGVEb2N1bWVudFBhcnNlcigp OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvU2NyaXB0Q29udHJvbGxl ci5oIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvU2NyaXB0Q29udHJvbGxlci5oCmluZGV4 IDFlNGJiYTM0NDUzMTJkMjU1YTBmMGY1NTIwOTNlNTlkY2FkOWQ0MjMuLjVmOWI2N2Y3YjY3OTdi NWVlYzk1ZjU0Zjk1ZDc1NGY5YTU1NTY1NDIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Jp bmRpbmdzL3Y4L1NjcmlwdENvbnRyb2xsZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5n cy92OC9TY3JpcHRDb250cm9sbGVyLmgKQEAgLTg4LDcgKzg4LDEwIEBAIHB1YmxpYzoKICAgICAv LyBUaGlzIGZ1bmN0aW9uIG11c3QgYmUgY2FsbGVkIGZyb20gdGhlIG1haW4gdGhyZWFkLiBJdCBp cyBzYWZlIHRvIGNhbGwgaXQgcmVwZWF0ZWRseS4KICAgICBzdGF0aWMgdm9pZCBpbml0aWFsaXpl VGhyZWFkaW5nKCk7CiAKLSAgICAvLyBFdmFsdWF0ZSBhIHNjcmlwdCBmaWxlIGluIHRoZSBlbnZp cm9ubWVudCBvZiB0aGlzIHByb3h5LgorICAgIHY4OjpMb2NhbDx2ODo6VmFsdWU+IGNvbXBpbGVB bmRSdW5TY3JpcHQoY29uc3QgU2NyaXB0U291cmNlQ29kZSYpOworCisgICAgLy8gRXZhbHVhdGUg SmF2YVNjcmlwdCBpbiB0aGUgbWFpbiB3b3JsZC4KKyAgICAvLyBUaGUgY2FsbGVyIG11c3QgaG9s ZCBhbiBleGVjdXRpb24gY29udGV4dC4KICAgICBTY3JpcHRWYWx1ZSBldmFsdWF0ZShjb25zdCBT Y3JpcHRTb3VyY2VDb2RlJik7CiAKICAgICAvLyBFdmFsdWF0ZSBKYXZhU2NyaXB0IGluIGEgbmV3 IGlzb2xhdGVkIHdvcmxkLiBUaGUgc2NyaXB0IGdldHMgaXRzIG93bgpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvVjhQcm94eS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9iaW5k aW5ncy92OC9WOFByb3h5LmNwcAppbmRleCAxYTc0NjJiZTMzYzYwZmVhZjliZGExZjdmZDZlMGRl ZGVjOGQ4NWE4Li5lZDM2ZDg2NzVmNjBiMTNkMDNkNTZmMWQyYTQ3M2I1YWQyYzdjNjZlIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9WOFByb3h5LmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9iaW5kaW5ncy92OC9WOFByb3h5LmNwcApAQCAtODgsNDggKzg4LDYgQEAgVjhQ cm94eTo6flY4UHJveHkoKQogICAgIHdpbmRvd1NoZWxsKCktPmRlc3Ryb3lHbG9iYWwoKTsKIH0K IAotdjg6OkxvY2FsPHY4OjpWYWx1ZT4gVjhQcm94eTo6ZXZhbHVhdGUoY29uc3QgU2NyaXB0U291 cmNlQ29kZSYgc291cmNlLCBOb2RlKiBub2RlKQotewotICAgIEFTU0VSVCh2ODo6Q29udGV4dDo6 SW5Db250ZXh0KCkpOwotCi0gICAgVjhHQ0NvbnRyb2xsZXI6OmNoZWNrTWVtb3J5VXNhZ2UoKTsK LQotICAgIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbkNvb2tpZSBjb29raWUgPSBJbnNwZWN0b3JJ bnN0cnVtZW50YXRpb246OndpbGxFdmFsdWF0ZVNjcmlwdChtX2ZyYW1lLCBzb3VyY2UudXJsKCku aXNOdWxsKCkgPyBTdHJpbmcoKSA6IHNvdXJjZS51cmwoKS5zdHJpbmcoKSwgc291cmNlLnN0YXJ0 TGluZSgpKTsKLQotICAgIHY4OjpMb2NhbDx2ODo6VmFsdWU+IHJlc3VsdDsKLSAgICB7Ci0gICAg ICAgIC8vIElzb2xhdGUgZXhjZXB0aW9ucyB0aGF0IG9jY3VyIHdoZW4gY29tcGlsaW5nIGFuZCBl eGVjdXRpbmcKLSAgICAgICAgLy8gdGhlIGNvZGUuIFRoZXNlIGV4Y2VwdGlvbnMgc2hvdWxkIG5v dCBpbnRlcmZlcmUgd2l0aAotICAgICAgICAvLyBqYXZhc2NyaXB0IGNvZGUgd2UgbWlnaHQgZXZh bHVhdGUgZnJvbSBDKysgd2hlbiByZXR1cm5pbmcKLSAgICAgICAgLy8gZnJvbSBoZXJlLgotICAg ICAgICB2ODo6VHJ5Q2F0Y2ggdHJ5Q2F0Y2g7Ci0gICAgICAgIHRyeUNhdGNoLlNldFZlcmJvc2Uo dHJ1ZSk7Ci0KLSAgICAgICAgLy8gQ29tcGlsZSB0aGUgc2NyaXB0LgotICAgICAgICB2ODo6TG9j YWw8djg6OlN0cmluZz4gY29kZSA9IHY4RXh0ZXJuYWxTdHJpbmcoc291cmNlLnNvdXJjZSgpKTsK LSNpZiBQTEFURk9STShDSFJPTUlVTSkKLSAgICAgICAgVFJBQ0VfRVZFTlRfQkVHSU4wKCJ2OCIs ICJ2OC5jb21waWxlIik7Ci0jZW5kaWYKLSAgICAgICAgT3duUHRyPHY4OjpTY3JpcHREYXRhPiBz Y3JpcHREYXRhID0gU2NyaXB0U291cmNlQ29kZTo6cHJlY29tcGlsZVNjcmlwdChjb2RlLCBzb3Vy Y2UuY2FjaGVkU2NyaXB0KCkpOwotCi0gICAgICAgIC8vIE5PVEU6IEZvciBjb21wYXRpYmlsaXR5 IHdpdGggV2ViQ29yZSwgU2NyaXB0U291cmNlQ29kZSdzIGxpbmUgc3RhcnRzIGF0Ci0gICAgICAg IC8vIDEsIHdoZXJlYXMgdjggc3RhcnRzIGF0IDAuCi0gICAgICAgIHY4OjpIYW5kbGU8djg6OlNj cmlwdD4gc2NyaXB0ID0gU2NyaXB0U291cmNlQ29kZTo6Y29tcGlsZVNjcmlwdChjb2RlLCBzb3Vy Y2UudXJsKCksIHNvdXJjZS5zdGFydFBvc2l0aW9uKCksIHNjcmlwdERhdGEuZ2V0KCkpOwotI2lm IFBMQVRGT1JNKENIUk9NSVVNKQotICAgICAgICBUUkFDRV9FVkVOVF9FTkQwKCJ2OCIsICJ2OC5j b21waWxlIik7Ci0gICAgICAgIFRSQUNFX0VWRU5UMCgidjgiLCAidjgucnVuIik7Ci0jZW5kaWYK LQotICAgICAgICAvLyBLZWVwIEZyYW1lIChhbmQgdGhlcmVmb3JlIFNjcmlwdENvbnRyb2xsZXIp IGFsaXZlLgotICAgICAgICBSZWZQdHI8RnJhbWU+IHByb3RlY3QoZnJhbWUoKSk7Ci0gICAgICAg IHJlc3VsdCA9IFNjcmlwdFJ1bm5lcjo6cnVuQ29tcGlsZWRTY3JpcHQoc2NyaXB0LCBmcmFtZSgp LT5kb2N1bWVudCgpKTsKLSAgICB9Ci0KLSAgICBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246OmRp ZEV2YWx1YXRlU2NyaXB0KGNvb2tpZSk7Ci0KLSAgICByZXR1cm4gcmVzdWx0OwotfQotCiBWOERP TVdpbmRvd1NoZWxsKiBWOFByb3h5Ojp3aW5kb3dTaGVsbCgpIGNvbnN0CiB7CiAgICAgcmV0dXJu IGZyYW1lKCktPnNjcmlwdCgpLT53aW5kb3dTaGVsbCgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvYmluZGluZ3MvdjgvVjhQcm94eS5oIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvdjgv VjhQcm94eS5oCmluZGV4IDYzMDBhMTllNzg5YzE1YWMyNDIwMjAzMjI4NjhjOWQ5ZDBlOTNhYTEu LjkyMzQwYjhmYzI0NDdiZTQ1MGU5OGYxOTUxY2QwMmEwYmY1ODJkMTEgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4UHJveHkuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9i aW5kaW5ncy92OC9WOFByb3h5LmgKQEAgLTg3LDExICs4Nyw2IEBAIG5hbWVzcGFjZSBXZWJDb3Jl IHsKIAogICAgICAgICBGcmFtZSogZnJhbWUoKSBjb25zdCB7IHJldHVybiBtX2ZyYW1lOyB9CiAK LSAgICAgICAgLy8gRXZhbHVhdGUgYSBzY3JpcHQgZmlsZSBpbiB0aGUgY3VycmVudCBleGVjdXRp b24gZW52aXJvbm1lbnQuCi0gICAgICAgIC8vIFRoZSBjYWxsZXIgbXVzdCBob2xkIGFuIGV4ZWN1 dGlvbiBjb250ZXh0LgotICAgICAgICAvLyBJZiBjYW5ub3QgZXZhbHV0ZSB0aGUgc2NyaXB0LCBp dCByZXR1cm5zIGFuIGVycm9yLgotICAgICAgICB2ODo6TG9jYWw8djg6OlZhbHVlPiBldmFsdWF0 ZShjb25zdCBTY3JpcHRTb3VyY2VDb2RlJiwgTm9kZSopOwotCiAgICAgICAgIC8vIEZJWE1FOiBU aGlzIHNob3VsZCBldmVudHVhbGx5IHRha2UgRE9NV3JhcHBlcldvcmxkIGFyZ3VtZW50IQogICAg ICAgICAvLyBGSVhNRTogVGhpcyBtZXRob2Qgd2lsbCBiZSBzb29uIHJlbW92ZWQsIGFzIGFsbCBt ZXRob2RzIHRoYXQgYWNjZXNzIHdpbmRvd1NoZWxsKCkKICAgICAgICAgLy8gd2lsbCBiZSBtb3Zl ZCB0byBTY3JpcHRDb250cm9sbGVyLgo=