97066 2012-09-18 20:59:20 -0700 [V8] Move WorkerContextExecutionProxy::initIsolate() to WorkerScriptController 2012-09-19 18:06:23 -0700 1 1 1 Unclassified WebKit WebCore JavaScript 528+ (Nightly build) Unspecified Unspecified RESOLVED WONTFIX P2 Normal --- 97057 1 haraken haraken abarth japhet webkit.review.bot oldest_to_newest 723241 0 haraken 2012-09-18 20:59:20 -0700 To kill WorkerContextExecutionProxy, we can move WorkerContextExecutionProxy::initIsolate() to WorkerScriptController. 723244 1 164655 haraken 2012-09-18 21:03:21 -0700 Created attachment 164655 Patch 723687 2 164655 abarth 2012-09-19 11:34:23 -0700 Comment on attachment 164655 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=164655&action=review > Source/WebCore/bindings/v8/V8Binding.cpp:362 > + int memoryUsageMB = MemoryUsageSupport::actualMemoryUsageMB(); Is this function safe to call on a worker thread? I guess we're just going to CRASH() a couple lines later, but it seems like we should make sure the threading is ok anyway. > Source/WebCore/bindings/v8/WorkerScriptController.cpp:88 > +void WorkerScriptController::initIsolate() This function looks very similar to initializeV8IfNeeded. Should we move initializeV8IfNeeded and friends into V8Initializer.(cpp|h) and share more code? 724026 3 haraken 2012-09-19 18:06:23 -0700 (In reply to comment #2) > This function looks very similar to initializeV8IfNeeded. Should we move initializeV8IfNeeded and friends into V8Initializer.(cpp|h) and share more code? Sounds better. I'll do it. Thanks. 164655 2012-09-18 21:03:21 -0700 2012-09-19 11:34:23 -0700 Patch bug-97066-20120919130247.patch text/plain 10345 haraken U3VidmVyc2lvbiBSZXZpc2lvbjogMTI4ODUwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjMwMmI4MWQ1MWFjMjk2 YTg5M2Y3NjExNmE5OTNmZDhlNjY4MGEyYi4uMzA3ZTE0M2VkOGU4YWJjNzM1ZGY3ZDI0ZTViN2Uy Y2U3ZWQxYTIwNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM3IEBACisyMDEyLTA5LTE4ICBLZW50 YXJvIEhhcmEgIDxoYXJha2VuQGNocm9taXVtLm9yZz4KKworICAgICAgICBbVjhdIE1vdmUgV29y a2VyQ29udGV4dEV4ZWN1dGlvblByb3h5Ojppbml0SXNvbGF0ZSgpIHRvIFdvcmtlclNjcmlwdENv bnRyb2xsZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTk3MDY2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg VG8ga2lsbCBXb3JrZXJDb250ZXh0RXhlY3V0aW9uUHJveHksIHRoaXMgcGF0Y2ggbW92ZXMKKyAg ICAgICAgV29ya2VyQ29udGV4dEV4ZWN1dGlvblByb3h5Ojppbml0SXNvbGF0ZSgpIHRvIFdvcmtl clNjcmlwdENvbnRyb2xsZXIuCisKKyAgICAgICAgVGhpcyBwYXRjaCBhbHNvIG1vdmVzIHJlcG9y dEZhdGFsRXJyb3JJblY4KCkgdG8gVjhCaW5kaW5nCisgICAgICAgIHNvIHRoYXQgYm90aCBXb3Jr ZXJTY3JpcHRDb250cm9sbGVyIGFuZCBWOERPTVdpbmRvd1NoZWxsCisgICAgICAgIGNhbiBzaGFy ZSB0aGUgY29kZS4KKworICAgICAgICBObyB0ZXN0cy4gTm8gY2hhbmdlIGluIGJlaGF2aW9yLgor CisgICAgICAgICogYmluZGluZ3MvdjgvVjhCaW5kaW5nLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OnJlcG9ydEZhdGFsRXJyb3JJblY4KToKKyAgICAgICAgKFdlYkNvcmUpOgorICAgICAgICAqIGJp bmRpbmdzL3Y4L1Y4QmluZGluZy5oOgorICAgICAgICAoV2ViQ29yZSk6CisgICAgICAgICogYmlu ZGluZ3MvdjgvVjhET01XaW5kb3dTaGVsbC5jcHA6CisgICAgICAgIChXZWJDb3JlOjppbml0aWFs aXplVjhJZk5lZWRlZCk6CisgICAgICAgICogYmluZGluZ3MvdjgvV29ya2VyQ29udGV4dEV4ZWN1 dGlvblByb3h5LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OldvcmtlckNvbnRleHRFeGVjdXRpb25Q cm94eTo6V29ya2VyQ29udGV4dEV4ZWN1dGlvblByb3h5KToKKyAgICAgICAgKiBiaW5kaW5ncy92 OC9Xb3JrZXJDb250ZXh0RXhlY3V0aW9uUHJveHkuaDoKKyAgICAgICAgKFdvcmtlckNvbnRleHRF eGVjdXRpb25Qcm94eSk6CisgICAgICAgICogYmluZGluZ3MvdjgvV29ya2VyU2NyaXB0Q29udHJv bGxlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpXb3JrZXJTY3JpcHRDb250cm9sbGVyOjpXb3Jr ZXJTY3JpcHRDb250cm9sbGVyKToKKyAgICAgICAgKFdlYkNvcmU6OldvcmtlclNjcmlwdENvbnRy b2xsZXI6OmluaXRJc29sYXRlKToKKyAgICAgICAgKFdlYkNvcmUpOgorICAgICAgICAqIGJpbmRp bmdzL3Y4L1dvcmtlclNjcmlwdENvbnRyb2xsZXIuaDoKKyAgICAgICAgKFdvcmtlclNjcmlwdENv bnRyb2xsZXIpOgorCiAyMDEyLTA5LTE3ICBLZW50IFRhbXVyYSAgPHRrZW50QGNocm9taXVtLm9y Zz4KIAogICAgICAgICBFeHBvcnQgUnVudGltZUVuYWJsZWRGZWF0dXJlczo6aXNMYW5nQXR0cmli dXRlQXdhcmVGb3JtQ29udHJvbFVJRW5hYmxlZCBjb3JyZWN0bHkKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4QmluZGluZy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9iaW5k aW5ncy92OC9WOEJpbmRpbmcuY3BwCmluZGV4IDVjOTA0NmZkZjc3NGFmZDM0N2EyNGJjYjZiYWE2 Y2NjMWNlOGZjZWQuLmY0MGQ4YmRhODRlYTNkNGJmNzA3OGQ4OGE3ZjAwZDhjMjdhMjJmM2IgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4QmluZGluZy5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvVjhCaW5kaW5nLmNwcApAQCAtMzUsNiArMzUsNyBA QAogI2luY2x1ZGUgIkRPTVN0cmluZ0xpc3QuaCIKICNpbmNsdWRlICJFbGVtZW50LmgiCiAjaW5j bHVkZSAiRnJhbWUuaCIKKyNpbmNsdWRlICJNZW1vcnlVc2FnZVN1cHBvcnQuaCIKICNpbmNsdWRl ICJQbGF0Zm9ybVN1cHBvcnQuaCIKICNpbmNsdWRlICJRdWFsaWZpZWROYW1lLmgiCiAjaW5jbHVk ZSAiU2V0dGluZ3MuaCIKQEAgLTM1Niw0ICszNTcsMTEgQEAgdm9pZCBjcmFzaElmVjhJc0RlYWQo KQogICAgIH0KIH0KIAordm9pZCByZXBvcnRGYXRhbEVycm9ySW5WOChjb25zdCBjaGFyKiBsb2Nh dGlvbiwgY29uc3QgY2hhciogbWVzc2FnZSkKK3sKKyAgICBpbnQgbWVtb3J5VXNhZ2VNQiA9IE1l bW9yeVVzYWdlU3VwcG9ydDo6YWN0dWFsTWVtb3J5VXNhZ2VNQigpOworICAgIHByaW50ZigiVjgg ZXJyb3I6ICVzICglcykuICBDdXJyZW50IG1lbW9yeSB1c2FnZTogJWQgTUJcbiIsIG1lc3NhZ2Us IGxvY2F0aW9uLCBtZW1vcnlVc2FnZU1CKTsKKyAgICBDUkFTSCgpOworfQorCiB9IC8vIG5hbWVz cGFjZSBXZWJDb3JlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9WOEJp bmRpbmcuaCBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4QmluZGluZy5oCmluZGV4IDBj OWVlNGY0Y2ExOGEwYzgwYzZlMmIzNWEyNzY3MTg0NDcwZjJlYmYuLjhiYzZlMDdkYzZjMzEyZmI2 NWM2NDY5MmU1MWVkNDkxM2RlNzlhZGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRp bmdzL3Y4L1Y4QmluZGluZy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4Qmlu ZGluZy5oCkBAIC0zNzMsNiArMzczLDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgIHY4OjpM b2NhbDx2ODo6VmFsdWU+IGhhbmRsZU1heFJlY3Vyc2lvbkRlcHRoRXhjZWVkZWQoKTsKIAogICAg IHZvaWQgY3Jhc2hJZlY4SXNEZWFkKCk7CisgICAgdm9pZCByZXBvcnRGYXRhbEVycm9ySW5WOChj b25zdCBjaGFyKiwgY29uc3QgY2hhciopOwogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCiAKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4RE9NV2luZG93U2hlbGwuY3Bw IGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvVjhET01XaW5kb3dTaGVsbC5jcHAKaW5kZXgg OWZlNmQ3Y2VhYjllZWE4ZWQ4NmU0ZWFjN2IxYjlhNjAwZDZiNzQ1MS4uZjllNDVhZjdjNDIxYTIy ZWZjYjgwNmY5OWQ4MTk5NGE5MTgyZmFmMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYmlu ZGluZ3MvdjgvVjhET01XaW5kb3dTaGVsbC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYmluZGlu Z3MvdjgvVjhET01XaW5kb3dTaGVsbC5jcHAKQEAgLTM4LDcgKzM4LDYgQEAKICNpbmNsdWRlICJG cmFtZS5oIgogI2luY2x1ZGUgIkZyYW1lTG9hZGVyQ2xpZW50LmgiCiAjaW5jbHVkZSAiSW5zcGVj dG9ySW5zdHJ1bWVudGF0aW9uLmgiCi0jaW5jbHVkZSAiTWVtb3J5VXNhZ2VTdXBwb3J0LmgiCiAj aW5jbHVkZSAiUGFnZS5oIgogI2luY2x1ZGUgIlBhZ2VHcm91cC5oIgogI2luY2x1ZGUgIlBsYXRm b3JtU3VwcG9ydC5oIgpAQCAtODIsMTMgKzgxLDYgQEAKIAogbmFtZXNwYWNlIFdlYkNvcmUgewog Ci1zdGF0aWMgdm9pZCByZXBvcnRGYXRhbEVycm9yKGNvbnN0IGNoYXIqIGxvY2F0aW9uLCBjb25z dCBjaGFyKiBtZXNzYWdlKQotewotICAgIGludCBtZW1vcnlVc2FnZU1CID0gTWVtb3J5VXNhZ2VT dXBwb3J0OjphY3R1YWxNZW1vcnlVc2FnZU1CKCk7Ci0gICAgcHJpbnRmKCJWOCBlcnJvcjogJXMg KCVzKS4gIEN1cnJlbnQgbWVtb3J5IHVzYWdlOiAlZCBNQlxuIiwgbWVzc2FnZSwgbG9jYXRpb24s IG1lbW9yeVVzYWdlTUIpOwotICAgIENSQVNIKCk7Ci19Ci0KIHN0YXRpYyB2b2lkIHJlcG9ydFVu Y2F1Z2h0RXhjZXB0aW9uKHY4OjpIYW5kbGU8djg6Ok1lc3NhZ2U+IG1lc3NhZ2UsIHY4OjpIYW5k bGU8djg6OlZhbHVlPiBkYXRhKQogewogICAgIERPTVdpbmRvdyogZmlyc3RXaW5kb3cgPSBmaXJz dERPTVdpbmRvdyhCaW5kaW5nU3RhdGU6Omluc3RhbmNlKCkpOwpAQCAtMTUwLDcgKzE0Miw3IEBA IHN0YXRpYyB2b2lkIGluaXRpYWxpemVWOElmTmVlZGVkKCkKICAgICBpbml0aWFsaXplZCA9IHRy dWU7CiAKICAgICB2ODo6Vjg6Oklnbm9yZU91dE9mTWVtb3J5RXhjZXB0aW9uKCk7Ci0gICAgdjg6 OlY4OjpTZXRGYXRhbEVycm9ySGFuZGxlcihyZXBvcnRGYXRhbEVycm9yKTsKKyAgICB2ODo6Vjg6 OlNldEZhdGFsRXJyb3JIYW5kbGVyKHJlcG9ydEZhdGFsRXJyb3JJblY4KTsKICAgICB2ODo6Vjg6 OlNldEdsb2JhbEdDUHJvbG9ndWVDYWxsYmFjaygmVjhHQ0NvbnRyb2xsZXI6OmdjUHJvbG9ndWUp OwogICAgIHY4OjpWODo6U2V0R2xvYmFsR0NFcGlsb2d1ZUNhbGxiYWNrKCZWOEdDQ29udHJvbGxl cjo6Z2NFcGlsb2d1ZSk7CiAgICAgdjg6OlY4OjpBZGRNZXNzYWdlTGlzdGVuZXIoJnJlcG9ydFVu Y2F1Z2h0RXhjZXB0aW9uKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4 L1dvcmtlckNvbnRleHRFeGVjdXRpb25Qcm94eS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5n cy92OC9Xb3JrZXJDb250ZXh0RXhlY3V0aW9uUHJveHkuY3BwCmluZGV4IDY3NmZhZWQwNjgyNjM5 MmI0MzRhZWY2MDlhNmQ1ODMzODZkOTc2MjguLjA3NDg3NGMxYTM2NDU2ODhkZWMwZTVjZDFkOWQ3 OGMwMDMxMTg4ODUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1dvcmtl ckNvbnRleHRFeGVjdXRpb25Qcm94eS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mv djgvV29ya2VyQ29udGV4dEV4ZWN1dGlvblByb3h5LmNwcApAQCAtNTgsMTIgKzU4LDYgQEAKIAog bmFtZXNwYWNlIFdlYkNvcmUgewogCi1zdGF0aWMgdm9pZCByZXBvcnRGYXRhbEVycm9ySW5WOChj b25zdCBjaGFyKiBsb2NhdGlvbiwgY29uc3QgY2hhciogbWVzc2FnZSkKLXsKLSAgICAvLyBGSVhN RTogV2UgdGVtcG9yYXJpbHkgZGVhbCB3aXRoIFY4IGludGVybmFsIGVycm9yIHNpdHVhdGlvbnMg c3VjaCBhcyBvdXQtb2YtbWVtb3J5IGJ5IGNyYXNoaW5nIHRoZSB3b3JrZXIuCi0gICAgQ1JBU0go KTsKLX0KLQogc3RhdGljIHZvaWQgdjhNZXNzYWdlSGFuZGxlcih2ODo6SGFuZGxlPHY4OjpNZXNz YWdlPiBtZXNzYWdlLCB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4gZGF0YSkKIHsKICAgICBzdGF0aWMg Ym9vbCBpc1JlcG9ydGluZ0V4Y2VwdGlvbiA9IGZhbHNlOwpAQCAtODgsNyArODIsNiBAQCBXb3Jr ZXJDb250ZXh0RXhlY3V0aW9uUHJveHk6OldvcmtlckNvbnRleHRFeGVjdXRpb25Qcm94eShXb3Jr ZXJDb250ZXh0KiB3b3JrZXJDbwogICAgIDogbV93b3JrZXJDb250ZXh0KHdvcmtlckNvbnRleHQp CiAgICAgLCBtX2Rpc2FibGVFdmFsUGVuZGluZyhmYWxzZSkKIHsKLSAgICBpbml0SXNvbGF0ZSgp OwogfQogCiBXb3JrZXJDb250ZXh0RXhlY3V0aW9uUHJveHk6On5Xb3JrZXJDb250ZXh0RXhlY3V0 aW9uUHJveHkoKQpAQCAtMTE1LDI3ICsxMDgsNiBAQCB2b2lkIFdvcmtlckNvbnRleHRFeGVjdXRp b25Qcm94eTo6ZGlzcG9zZSgpCiAgICAgfQogfQogCi12b2lkIFdvcmtlckNvbnRleHRFeGVjdXRp b25Qcm94eTo6aW5pdElzb2xhdGUoKQotewotICAgIC8vIFRlbGwgVjggbm90IHRvIGNhbGwgdGhl IGRlZmF1bHQgT09NIGhhbmRsZXIsIGJpbmRpbmcgY29kZSB3aWxsIGhhbmRsZSBpdC4KLSAgICB2 ODo6Vjg6Oklnbm9yZU91dE9mTWVtb3J5RXhjZXB0aW9uKCk7Ci0gICAgdjg6OlY4OjpTZXRGYXRh bEVycm9ySGFuZGxlcihyZXBvcnRGYXRhbEVycm9ySW5WOCk7Ci0KLSAgICB2ODo6Vjg6OlNldEds b2JhbEdDUHJvbG9ndWVDYWxsYmFjaygmVjhHQ0NvbnRyb2xsZXI6OmdjUHJvbG9ndWUpOwotICAg IHY4OjpWODo6U2V0R2xvYmFsR0NFcGlsb2d1ZUNhbGxiYWNrKCZWOEdDQ29udHJvbGxlcjo6Z2NF cGlsb2d1ZSk7Ci0KLSAgICAvLyBGSVhNRTogUmVtb3ZlIHRoZSBmb2xsb3dpbmcgMiBsaW5lcyB3 aGVuIFY4IGRlZmF1bHQgaGFzIGNoYW5nZWQuCi0gICAgY29uc3QgY2hhciBlczVSZWFkb25seUZs YWdbXSA9ICItLWVzNV9yZWFkb25seSI7Ci0gICAgdjg6OlY4OjpTZXRGbGFnc0Zyb21TdHJpbmco ZXM1UmVhZG9ubHlGbGFnLCBzaXplb2YoZXM1UmVhZG9ubHlGbGFnKSk7Ci0KLSAgICB2ODo6UmVz b3VyY2VDb25zdHJhaW50cyByZXNvdXJjZV9jb25zdHJhaW50czsKLSAgICB1aW50MzJfdCBoZXJl OwotICAgIHJlc291cmNlX2NvbnN0cmFpbnRzLnNldF9zdGFja19saW1pdCgmaGVyZSAtIGtXb3Jr ZXJNYXhTdGFja1NpemUgLyBzaXplb2YodWludDMyX3QqKSk7Ci0gICAgdjg6OlNldFJlc291cmNl Q29uc3RyYWludHMoJnJlc291cmNlX2NvbnN0cmFpbnRzKTsKLQotICAgIFY4UGVySXNvbGF0ZURh dGE6OmVuc3VyZUluaXRpYWxpemVkKHY4OjpJc29sYXRlOjpHZXRDdXJyZW50KCkpOwotfQotCiBi b29sIFdvcmtlckNvbnRleHRFeGVjdXRpb25Qcm94eTo6aW5pdGlhbGl6ZUlmTmVlZGVkKCkKIHsK ICAgICAvLyBCYWlsIG91dCBpZiB0aGUgY29udGV4dCBoYXMgYWxyZWFkeSBiZWVuIGluaXRpYWxp emVkLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvV29ya2VyQ29udGV4 dEV4ZWN1dGlvblByb3h5LmggYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9Xb3JrZXJDb250 ZXh0RXhlY3V0aW9uUHJveHkuaAppbmRleCA4MTI4YWI4N2FlNjY1YTRlZDZiMGY1ZWQxZTdlOGYz NTgyMzNiMDVjLi5kYjVmNDQ4YzZjMmQ0M2NlM2JkMzQ3YzNhMDg3ZmEwZjZjMWUxYTZmIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9Xb3JrZXJDb250ZXh0RXhlY3V0aW9u UHJveHkuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9Xb3JrZXJDb250ZXh0RXhl Y3V0aW9uUHJveHkuaApAQCAtNzgsNyArNzgsNiBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAg ICAgIHY4OjpMb2NhbDx2ODo6Q29udGV4dD4gY29udGV4dCgpIHsgcmV0dXJuIHY4OjpMb2NhbDx2 ODo6Q29udGV4dD46Ok5ldyhtX2NvbnRleHQpOyB9CiAKICAgICBwcml2YXRlOgotICAgICAgICB2 b2lkIGluaXRJc29sYXRlKCk7CiAgICAgICAgIGJvb2wgaW5pdGlhbGl6ZUlmTmVlZGVkKCk7CiAg ICAgICAgIHZvaWQgZGlzcG9zZSgpOwogCkBAIC04Nyw4ICs4Niw2IEBAIG5hbWVzcGFjZSBXZWJD b3JlIHsKIAogICAgICAgICBzdGF0aWMgYm9vbCBmb3JnZXRWOEV2ZW50T2JqZWN0KEV2ZW50Kik7 CiAKLSAgICAgICAgc3RhdGljIGNvbnN0IGludCBrV29ya2VyTWF4U3RhY2tTaXplID0gNTAwICog MTAyNDsKLQogICAgICAgICBXb3JrZXJDb250ZXh0KiBtX3dvcmtlckNvbnRleHQ7CiAgICAgICAg IHY4OjpQZXJzaXN0ZW50PHY4OjpDb250ZXh0PiBtX2NvbnRleHQ7CiAKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1dvcmtlclNjcmlwdENvbnRyb2xsZXIuY3BwIGIvU291 cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvV29ya2VyU2NyaXB0Q29udHJvbGxlci5jcHAKaW5kZXgg NzAyMDhlMWZlZTQwZjYwN2QzM2RiM2UzZGI3Y2VlYTA4MmY1OGYxMC4uODI5OTEwMWNmYTQ2YTJk NmQ1N2Y3YjM3YjY2MzFjM2NmY2FlOTQxOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYmlu ZGluZ3MvdjgvV29ya2VyU2NyaXB0Q29udHJvbGxlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv YmluZGluZ3MvdjgvV29ya2VyU2NyaXB0Q29udHJvbGxlci5jcHAKQEAgLTM4LDcgKzM4LDkgQEAK ICNpbmNsdWRlICJTY3JpcHRDYWxsU3RhY2suaCIKICNpbmNsdWRlICJTY3JpcHRTb3VyY2VDb2Rl LmgiCiAjaW5jbHVkZSAiU2NyaXB0VmFsdWUuaCIKKyNpbmNsdWRlICJWOEJpbmRpbmcuaCIKICNp bmNsdWRlICJWOERPTU1hcC5oIgorI2luY2x1ZGUgIlY4R0NDb250cm9sbGVyLmgiCiAjaW5jbHVk ZSAiVjhXb3JrZXJDb250ZXh0LmgiCiAjaW5jbHVkZSAiV29ya2VyQ29udGV4dC5oIgogI2luY2x1 ZGUgIldvcmtlckNvbnRleHRFeGVjdXRpb25Qcm94eS5oIgpAQCAtNjQsNiArNjYsOCBAQCBXb3Jr ZXJTY3JpcHRDb250cm9sbGVyOjpXb3JrZXJTY3JpcHRDb250cm9sbGVyKFdvcmtlckNvbnRleHQq IHdvcmtlckNvbnRleHQpCiAgICAgZGF0YS0+c2V0RE9NRGF0YVN0b3JlKCZtX0RPTURhdGFTdG9y ZSk7CiAgICAgbV9pc29sYXRlLT5FbnRlcigpOwogICAgIG1fcHJveHkgPSBhZG9wdFB0cihuZXcg V29ya2VyQ29udGV4dEV4ZWN1dGlvblByb3h5KHdvcmtlckNvbnRleHQpKTsKKworICAgIGluaXRJ c29sYXRlKCk7CiB9CiAKIFdvcmtlclNjcmlwdENvbnRyb2xsZXI6On5Xb3JrZXJTY3JpcHRDb250 cm9sbGVyKCkKQEAgLTgxLDYgKzg1LDI3IEBAIFdvcmtlclNjcmlwdENvbnRyb2xsZXI6On5Xb3Jr ZXJTY3JpcHRDb250cm9sbGVyKCkKICAgICBtX2lzb2xhdGUtPkRpc3Bvc2UoKTsKIH0KIAordm9p ZCBXb3JrZXJTY3JpcHRDb250cm9sbGVyOjppbml0SXNvbGF0ZSgpCit7CisgICAgLy8gVGVsbCBW OCBub3QgdG8gY2FsbCB0aGUgZGVmYXVsdCBPT00gaGFuZGxlciwgYmluZGluZyBjb2RlIHdpbGwg aGFuZGxlIGl0LgorICAgIHY4OjpWODo6SWdub3JlT3V0T2ZNZW1vcnlFeGNlcHRpb24oKTsKKyAg ICB2ODo6Vjg6OlNldEZhdGFsRXJyb3JIYW5kbGVyKHJlcG9ydEZhdGFsRXJyb3JJblY4KTsKKwor ICAgIHY4OjpWODo6U2V0R2xvYmFsR0NQcm9sb2d1ZUNhbGxiYWNrKCZWOEdDQ29udHJvbGxlcjo6 Z2NQcm9sb2d1ZSk7CisgICAgdjg6OlY4OjpTZXRHbG9iYWxHQ0VwaWxvZ3VlQ2FsbGJhY2soJlY4 R0NDb250cm9sbGVyOjpnY0VwaWxvZ3VlKTsKKworICAgIC8vIEZJWE1FOiBSZW1vdmUgdGhlIGZv bGxvd2luZyAyIGxpbmVzIHdoZW4gVjggZGVmYXVsdCBoYXMgY2hhbmdlZC4KKyAgICBjb25zdCBj aGFyIGVzNVJlYWRvbmx5RmxhZ1tdID0gIi0tZXM1X3JlYWRvbmx5IjsKKyAgICB2ODo6Vjg6OlNl dEZsYWdzRnJvbVN0cmluZyhlczVSZWFkb25seUZsYWcsIHNpemVvZihlczVSZWFkb25seUZsYWcp KTsKKworICAgIHY4OjpSZXNvdXJjZUNvbnN0cmFpbnRzIHJlc291cmNlQ29uc3RyYWludHM7Cisg ICAgdWludDMyX3QgaGVyZTsKKyAgICByZXNvdXJjZUNvbnN0cmFpbnRzLnNldF9zdGFja19saW1p dCgmaGVyZSAtIGtXb3JrZXJNYXhTdGFja1NpemUgLyBzaXplb2YodWludDMyX3QqKSk7CisgICAg djg6OlNldFJlc291cmNlQ29uc3RyYWludHMoJnJlc291cmNlQ29uc3RyYWludHMpOworCisgICAg VjhQZXJJc29sYXRlRGF0YTo6ZW5zdXJlSW5pdGlhbGl6ZWQodjg6Oklzb2xhdGU6OkdldEN1cnJl bnQoKSk7Cit9CisKIHZvaWQgV29ya2VyU2NyaXB0Q29udHJvbGxlcjo6ZXZhbHVhdGUoY29uc3Qg U2NyaXB0U291cmNlQ29kZSYgc291cmNlQ29kZSkKIHsKICAgICBldmFsdWF0ZShzb3VyY2VDb2Rl LCAwKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1dvcmtlclNjcmlw dENvbnRyb2xsZXIuaCBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1dvcmtlclNjcmlwdENv bnRyb2xsZXIuaAppbmRleCA2OGNlODlhYWUwN2ZmMzg2NTkwYmFmOGI5OTc4NDY2Mjg2MDg3YzBj Li4wZmFlM2IxNzg3ZGRiYWQ0NDA3MzZiZWI1MmY2NjFkM2U5OTg1NzQyIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9Xb3JrZXJTY3JpcHRDb250cm9sbGVyLmgKKysrIGIv U291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvV29ya2VyU2NyaXB0Q29udHJvbGxlci5oCkBAIC03 OSw2ICs3OSw4IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgc3RhdGljIFdvcmtlclNj cmlwdENvbnRyb2xsZXIqIGNvbnRyb2xsZXJGb3JDb250ZXh0KCk7CiAKICAgICBwcml2YXRlOgor ICAgICAgICB2b2lkIGluaXRJc29sYXRlKCk7CisKICAgICAgICAgV29ya2VyQ29udGV4dCogbV93 b3JrZXJDb250ZXh0OwogICAgICAgICBPd25QdHI8V29ya2VyQ29udGV4dEV4ZWN1dGlvblByb3h5 PiBtX3Byb3h5OwogICAgICAgICB2ODo6SXNvbGF0ZSogbV9pc29sYXRlOwpAQCAtODYsNiArODgs OCBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgIGJvb2wgbV9leGVjdXRpb25Gb3JiaWRk ZW47CiAgICAgICAgIGJvb2wgbV9leGVjdXRpb25TY2hlZHVsZWRUb1Rlcm1pbmF0ZTsKICAgICAg ICAgbXV0YWJsZSBNdXRleCBtX3NjaGVkdWxlZFRlcm1pbmF0aW9uTXV0ZXg7CisKKyAgICAgICAg c3RhdGljIGNvbnN0IGludCBrV29ya2VyTWF4U3RhY2tTaXplID0gNTAwICogMTAyNDsKICAgICB9 OwogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCg==