179360 2017-11-06 19:43:36 -0800 Web Inspector: Create inspector agents lazily 2017-11-15 12:10:24 -0800 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 joepeck joepeck buildbot commit-queue inspector-bugzilla-changes joepeck sam webkit-bug-importer oldest_to_newest 1368904 0 joepeck 2017-11-06 19:43:36 -0800 Create inspector agents lazily Move some agents to be created lazily. We don't need these to be created along with the WebCore::Page since they are only needed when an inspector frontend connects. Our goal should be to move more and more of these to be lazily created. 1368906 1 326186 joepeck 2017-11-06 19:45:01 -0800 Created attachment 326186 [PATCH] Proposed Fix 1368907 2 buildbot 2017-11-06 19:47:12 -0800 Attachment 326186 did not pass style-queue: ERROR: Source/WebCore/inspector/InspectorController.cpp:154: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] Total errors found: 1 in 4 files If any of these errors are false positives, please file a bug against check-webkit-style. 1368912 3 326186 joepeck 2017-11-06 20:02:57 -0800 Comment on attachment 326186 [PATCH] Proposed Fix View in context: https://bugs.webkit.org/attachment.cgi?id=326186&action=review > Source/WebCore/inspector/InspectorController.cpp:153 > - commandLineAPIHost->init(m_inspectorAgent > + commandLineAPIHost->init( I can make this all one line now. It used to be split up because of ENABLE guards that no longer exist. 1368955 4 326186 commit-queue 2017-11-07 01:32:18 -0800 Comment on attachment 326186 [PATCH] Proposed Fix Clearing flags on attachment: 326186 Committed r224530: <https://trac.webkit.org/changeset/224530> 1368956 5 commit-queue 2017-11-07 01:32:19 -0800 All reviewed patches have been landed. Closing bug. 1372091 6 webkit-bug-importer 2017-11-15 12:10:24 -0800 <rdar://problem/35567071> 326186 2017-11-06 19:45:01 -0800 2017-11-07 01:32:18 -0800 [PATCH] Proposed Fix lazy-1.patch text/plain 9816 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAwZTgyM2Y1N2Q2OS4uMjBlZWQwZmZkNTQgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEs NSArMSwyNSBAQAogMjAxNy0xMS0wNiAgSm9zZXBoIFBlY29yYXJvICA8cGVjb3Jhcm9AYXBwbGUu Y29tPgogCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IENyZWF0ZSBpbnNwZWN0b3IgYWdlbnRzIGxh emlseQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTc5 MzYwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBp bnNwZWN0b3IvQ29tbWFuZExpbmVBUElIb3N0Lmg6CisgICAgICAgIE1vZGVybml6ZSBzdHlsZS4K KworICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JDb250cm9sbGVyLmg6CisgICAgICAgICog aW5zcGVjdG9yL0luc3BlY3RvckNvbnRyb2xsZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW5z cGVjdG9yQ29udHJvbGxlcjo6SW5zcGVjdG9yQ29udHJvbGxlcik6CisgICAgICAgIChXZWJDb3Jl OjpJbnNwZWN0b3JDb250cm9sbGVyOjpwYWdlQWdlbnRDb250ZXh0KToKKyAgICAgICAgKFdlYkNv cmU6Okluc3BlY3RvckNvbnRyb2xsZXI6OmNyZWF0ZUxhenlBZ2VudHMpOgorICAgICAgICAoV2Vi Q29yZTo6SW5zcGVjdG9yQ29udHJvbGxlcjo6Y29ubmVjdEZyb250ZW5kKToKKyAgICAgICAgTW92 ZSBtYW55IG9mIHRoZSBhZ2VudCBjb25zdHJ1Y3Rpb24gdG8gaGFwcGVuIGxhemlseS4gVGhlc2UK KyAgICAgICAgYWdlbnQncyBhcmVuJ3QgbmVlZGVkIHVudGlsIGFuIGluc3BlY3RvciBjb25uZWN0 cywgc28gZGVmZXIKKyAgICAgICAgY3JlYXRpb24gdW50aWwgYW4gaW5zcGVjdG9yIGNvbm5lY3Rz LgorCisyMDE3LTExLTA2ICBKb3NlcGggUGVjb3Jhcm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CisK ICAgICAgICAgV2ViIEluc3BlY3RvcjogQWRkIHNvbWUgZmFzdCByZXR1cm5zIGluIGNhc2VzIHdo ZXJlIHdlIG9ubHkgY2FsbCB0aHJvdWdoIHRvIGEgTmV0d29ya0FnZW50CiAgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzkzNTkKIApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0NvbW1hbmRMaW5lQVBJSG9zdC5oIGIvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL0NvbW1hbmRMaW5lQVBJSG9zdC5oCmluZGV4IDU3NjU4NWE3MWNhLi4y OWU2MDE4MGJlNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0NvbW1hbmRM aW5lQVBJSG9zdC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9Db21tYW5kTGluZUFQ SUhvc3QuaApAQCAtMTEwLDExICsxMTAsMTEgQEAgcHVibGljOgogcHJpdmF0ZToKICAgICBDb21t YW5kTGluZUFQSUhvc3QoKTsKIAotICAgIEluc3BlY3Rvcjo6SW5zcGVjdG9yQWdlbnQqIG1faW5z cGVjdG9yQWdlbnQge251bGxwdHJ9OwotICAgIEluc3BlY3Rvcjo6SW5zcGVjdG9yQ29uc29sZUFn ZW50KiBtX2NvbnNvbGVBZ2VudCB7bnVsbHB0cn07Ci0gICAgSW5zcGVjdG9yRE9NQWdlbnQqIG1f ZG9tQWdlbnQge251bGxwdHJ9OwotICAgIEluc3BlY3RvckRPTVN0b3JhZ2VBZ2VudCogbV9kb21T dG9yYWdlQWdlbnQge251bGxwdHJ9OwotICAgIEluc3BlY3RvckRhdGFiYXNlQWdlbnQqIG1fZGF0 YWJhc2VBZ2VudCB7bnVsbHB0cn07CisgICAgSW5zcGVjdG9yOjpJbnNwZWN0b3JBZ2VudCogbV9p bnNwZWN0b3JBZ2VudCB7IG51bGxwdHIgfTsKKyAgICBJbnNwZWN0b3I6Okluc3BlY3RvckNvbnNv bGVBZ2VudCogbV9jb25zb2xlQWdlbnQgeyBudWxscHRyIH07CisgICAgSW5zcGVjdG9yRE9NQWdl bnQqIG1fZG9tQWdlbnQgeyBudWxscHRyIH07CisgICAgSW5zcGVjdG9yRE9NU3RvcmFnZUFnZW50 KiBtX2RvbVN0b3JhZ2VBZ2VudCB7IG51bGxwdHIgfTsKKyAgICBJbnNwZWN0b3JEYXRhYmFzZUFn ZW50KiBtX2RhdGFiYXNlQWdlbnQgeyBudWxscHRyIH07CiAKICAgICBzdGQ6OnVuaXF1ZV9wdHI8 SW5zcGVjdGFibGVPYmplY3Q+IG1faW5zcGVjdGVkT2JqZWN0OyAvLyAkMAogICAgIEluc3BlY3Rv cjo6UGVyR2xvYmFsT2JqZWN0V3JhcHBlcldvcmxkIG1fd3JhcHBlcnM7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxlci5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxlci5jcHAKaW5kZXggMmFhNzgwMTdl NDcuLmE1MjNjY2QwN2RiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5z cGVjdG9yQ29udHJvbGxlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3Bl Y3RvckNvbnRyb2xsZXIuY3BwCkBAIC04Myw4ICs4Myw4IEBACiAjaW5jbHVkZSAiUGFnZURlYnVn Z2FibGUuaCIKICNlbmRpZgogCi0KIG5hbWVzcGFjZSBXZWJDb3JlIHsKKwogdXNpbmcgbmFtZXNw YWNlIEpTQzsKIHVzaW5nIG5hbWVzcGFjZSBJbnNwZWN0b3I7CiAKQEAgLTEwMSwyMiArMTAxLDcg QEAgSW5zcGVjdG9yQ29udHJvbGxlcjo6SW5zcGVjdG9yQ29udHJvbGxlcihQYWdlJiBwYWdlLCBJ bnNwZWN0b3JDbGllbnQqIGluc3BlY3RvckMKIHsKICAgICBBU1NFUlRfQVJHKGluc3BlY3RvckNs aWVudCwgaW5zcGVjdG9yQ2xpZW50KTsKIAotICAgIEFnZW50Q29udGV4dCBiYXNlQ29udGV4dCA9 IHsKLSAgICAgICAgKnRoaXMsCi0gICAgICAgICptX2luamVjdGVkU2NyaXB0TWFuYWdlciwKLSAg ICAgICAgbV9mcm9udGVuZFJvdXRlci5nZXQoKSwKLSAgICAgICAgbV9iYWNrZW5kRGlzcGF0Y2hl ci5nZXQoKQotICAgIH07Ci0KLSAgICBXZWJBZ2VudENvbnRleHQgd2ViQ29udGV4dCA9IHsKLSAg ICAgICAgYmFzZUNvbnRleHQsCi0gICAgICAgIG1faW5zdHJ1bWVudGluZ0FnZW50cy5nZXQoKQot ICAgIH07Ci0KLSAgICBQYWdlQWdlbnRDb250ZXh0IHBhZ2VDb250ZXh0ID0gewotICAgICAgICB3 ZWJDb250ZXh0LAotICAgICAgICBtX3BhZ2UKLSAgICB9OworICAgIGF1dG8gcGFnZUNvbnRleHQg PSBwYWdlQWdlbnRDb250ZXh0KCk7CiAKICAgICBhdXRvIGluc3BlY3RvckFnZW50UHRyID0gc3Rk OjptYWtlX3VuaXF1ZTxJbnNwZWN0b3JBZ2VudD4ocGFnZUNvbnRleHQpOwogICAgIG1faW5zcGVj dG9yQWdlbnQgPSBpbnNwZWN0b3JBZ2VudFB0ci5nZXQoKTsKQEAgLTEyOCwzMSArMTEzLDE4IEBA IEluc3BlY3RvckNvbnRyb2xsZXI6Okluc3BlY3RvckNvbnRyb2xsZXIoUGFnZSYgcGFnZSwgSW5z cGVjdG9yQ2xpZW50KiBpbnNwZWN0b3JDCiAgICAgbV9wYWdlQWdlbnQgPSBwYWdlQWdlbnRQdHIu Z2V0KCk7CiAgICAgbV9hZ2VudHMuYXBwZW5kKFdURk1vdmUocGFnZUFnZW50UHRyKSk7CiAKLSAg ICBhdXRvIHJ1bnRpbWVBZ2VudFB0ciA9IHN0ZDo6bWFrZV91bmlxdWU8UGFnZVJ1bnRpbWVBZ2Vu dD4ocGFnZUNvbnRleHQsIHBhZ2VBZ2VudCk7Ci0gICAgUGFnZVJ1bnRpbWVBZ2VudCogcnVudGlt ZUFnZW50ID0gcnVudGltZUFnZW50UHRyLmdldCgpOwotICAgIG1faW5zdHJ1bWVudGluZ0FnZW50 cy0+c2V0UGFnZVJ1bnRpbWVBZ2VudChydW50aW1lQWdlbnQpOwotICAgIG1fYWdlbnRzLmFwcGVu ZChXVEZNb3ZlKHJ1bnRpbWVBZ2VudFB0cikpOworICAgIGF1dG8gcnVudGltZUFnZW50ID0gc3Rk OjptYWtlX3VuaXF1ZTxQYWdlUnVudGltZUFnZW50PihwYWdlQ29udGV4dCwgcGFnZUFnZW50KTsK KyAgICBtX2luc3RydW1lbnRpbmdBZ2VudHMtPnNldFBhZ2VSdW50aW1lQWdlbnQocnVudGltZUFn ZW50LmdldCgpKTsKKyAgICBtX2FnZW50cy5hcHBlbmQoV1RGTW92ZShydW50aW1lQWdlbnQpKTsK IAogICAgIGF1dG8gZG9tQWdlbnRQdHIgPSBzdGQ6Om1ha2VfdW5pcXVlPEluc3BlY3RvckRPTUFn ZW50PihwYWdlQ29udGV4dCwgcGFnZUFnZW50LCBtX292ZXJsYXkuZ2V0KCkpOwogICAgIG1fZG9t QWdlbnQgPSBkb21BZ2VudFB0ci5nZXQoKTsKICAgICBtX2FnZW50cy5hcHBlbmQoV1RGTW92ZShk b21BZ2VudFB0cikpOwogCi0gICAgbV9hZ2VudHMuYXBwZW5kKHN0ZDo6bWFrZV91bmlxdWU8SW5z cGVjdG9yQ1NTQWdlbnQ+KHBhZ2VDb250ZXh0LCBtX2RvbUFnZW50KSk7Ci0KICAgICBhdXRvIGRh dGFiYXNlQWdlbnRQdHIgPSBzdGQ6Om1ha2VfdW5pcXVlPEluc3BlY3RvckRhdGFiYXNlQWdlbnQ+ KHBhZ2VDb250ZXh0KTsKICAgICBJbnNwZWN0b3JEYXRhYmFzZUFnZW50KiBkYXRhYmFzZUFnZW50 ID0gZGF0YWJhc2VBZ2VudFB0ci5nZXQoKTsKICAgICBtX2FnZW50cy5hcHBlbmQoV1RGTW92ZShk YXRhYmFzZUFnZW50UHRyKSk7CiAKLSAgICBtX2FnZW50cy5hcHBlbmQoc3RkOjptYWtlX3VuaXF1 ZTxJbnNwZWN0b3JOZXR3b3JrQWdlbnQ+KHBhZ2VDb250ZXh0LCBwYWdlQWdlbnQpKTsKLQotI2lm IEVOQUJMRShJTkRFWEVEX0RBVEFCQVNFKQotICAgIG1fYWdlbnRzLmFwcGVuZChzdGQ6Om1ha2Vf dW5pcXVlPEluc3BlY3RvckluZGV4ZWREQkFnZW50PihwYWdlQ29udGV4dCwgcGFnZUFnZW50KSk7 Ci0jZW5kaWYKLQotI2lmIEVOQUJMRShSRVNPVVJDRV9VU0FHRSkKLSAgICBtX2FnZW50cy5hcHBl bmQoc3RkOjptYWtlX3VuaXF1ZTxJbnNwZWN0b3JNZW1vcnlBZ2VudD4ocGFnZUNvbnRleHQpKTsK LSNlbmRpZgotCiAgICAgYXV0byBkb21TdG9yYWdlQWdlbnRQdHIgPSBzdGQ6Om1ha2VfdW5pcXVl PEluc3BlY3RvckRPTVN0b3JhZ2VBZ2VudD4ocGFnZUNvbnRleHQsIG1fcGFnZUFnZW50KTsKICAg ICBJbnNwZWN0b3JET01TdG9yYWdlQWdlbnQqIGRvbVN0b3JhZ2VBZ2VudCA9IGRvbVN0b3JhZ2VB Z2VudFB0ci5nZXQoKTsKICAgICBtX2FnZW50cy5hcHBlbmQoV1RGTW92ZShkb21TdG9yYWdlQWdl bnRQdHIpKTsKQEAgLTE3MCwxNSArMTQyLDcgQEAgSW5zcGVjdG9yQ29udHJvbGxlcjo6SW5zcGVj dG9yQ29udHJvbGxlcihQYWdlJiBwYWdlLCBJbnNwZWN0b3JDbGllbnQqIGluc3BlY3RvckMKICAg ICBtX2luc3RydW1lbnRpbmdBZ2VudHMtPnNldFdlYkNvbnNvbGVBZ2VudChjb25zb2xlQWdlbnRQ dHIuZ2V0KCkpOwogICAgIG1fYWdlbnRzLmFwcGVuZChXVEZNb3ZlKGNvbnNvbGVBZ2VudFB0cikp OwogCi0gICAgYXV0byBkZWJ1Z2dlckFnZW50UHRyID0gc3RkOjptYWtlX3VuaXF1ZTxQYWdlRGVi dWdnZXJBZ2VudD4ocGFnZUNvbnRleHQsIHBhZ2VBZ2VudCwgbV9vdmVybGF5LmdldCgpKTsKLSAg ICBQYWdlRGVidWdnZXJBZ2VudCogZGVidWdnZXJBZ2VudCA9IGRlYnVnZ2VyQWdlbnRQdHIuZ2V0 KCk7Ci0gICAgbV9hZ2VudHMuYXBwZW5kKFdURk1vdmUoZGVidWdnZXJBZ2VudFB0cikpOwotCiAg ICAgbV9hZ2VudHMuYXBwZW5kKHN0ZDo6bWFrZV91bmlxdWU8SW5zcGVjdG9yVGltZWxpbmVBZ2Vu dD4ocGFnZUNvbnRleHQsIHNjcmlwdFByb2ZpbGVyQWdlbnQsIGhlYXBBZ2VudCwgcGFnZUFnZW50 KSk7Ci0gICAgbV9hZ2VudHMuYXBwZW5kKHN0ZDo6bWFrZV91bmlxdWU8SW5zcGVjdG9yRE9NRGVi dWdnZXJBZ2VudD4ocGFnZUNvbnRleHQsIG1fZG9tQWdlbnQsIGRlYnVnZ2VyQWdlbnQpKTsKLSAg ICBtX2FnZW50cy5hcHBlbmQoc3RkOjptYWtlX3VuaXF1ZTxJbnNwZWN0b3JBcHBsaWNhdGlvbkNh Y2hlQWdlbnQ+KHBhZ2VDb250ZXh0LCBwYWdlQWdlbnQpKTsKLSAgICBtX2FnZW50cy5hcHBlbmQo c3RkOjptYWtlX3VuaXF1ZTxJbnNwZWN0b3JMYXllclRyZWVBZ2VudD4ocGFnZUNvbnRleHQpKTsK LSAgICBtX2FnZW50cy5hcHBlbmQoc3RkOjptYWtlX3VuaXF1ZTxJbnNwZWN0b3JXb3JrZXJBZ2Vu dD4ocGFnZUNvbnRleHQpKTsKIAogICAgIGF1dG8gY2FudmFzQWdlbnRQdHIgPSBzdGQ6Om1ha2Vf dW5pcXVlPEluc3BlY3RvckNhbnZhc0FnZW50PihwYWdlQ29udGV4dCk7CiAgICAgbV9pbnN0cnVt ZW50aW5nQWdlbnRzLT5zZXRJbnNwZWN0b3JDYW52YXNBZ2VudChjYW52YXNBZ2VudFB0ci5nZXQo KSk7CkBAIC0xODYsNyArMTUwLDggQEAgSW5zcGVjdG9yQ29udHJvbGxlcjo6SW5zcGVjdG9yQ29u dHJvbGxlcihQYWdlJiBwYWdlLCBJbnNwZWN0b3JDbGllbnQqIGluc3BlY3RvckMKIAogICAgIEFT U0VSVChtX2luamVjdGVkU2NyaXB0TWFuYWdlci0+Y29tbWFuZExpbmVBUElIb3N0KCkpOwogICAg IGlmIChDb21tYW5kTGluZUFQSUhvc3QqIGNvbW1hbmRMaW5lQVBJSG9zdCA9IG1faW5qZWN0ZWRT Y3JpcHRNYW5hZ2VyLT5jb21tYW5kTGluZUFQSUhvc3QoKSkgewotICAgICAgICBjb21tYW5kTGlu ZUFQSUhvc3QtPmluaXQobV9pbnNwZWN0b3JBZ2VudAorICAgICAgICBjb21tYW5kTGluZUFQSUhv c3QtPmluaXQoCisgICAgICAgICAgICAgIG1faW5zcGVjdG9yQWdlbnQKICAgICAgICAgICAgICwg Y29uc29sZUFnZW50CiAgICAgICAgICAgICAsIG1fZG9tQWdlbnQKICAgICAgICAgICAgICwgZG9t U3RvcmFnZUFnZW50CkBAIC0yMDEsNiArMTY2LDU1IEBAIEluc3BlY3RvckNvbnRyb2xsZXI6On5J bnNwZWN0b3JDb250cm9sbGVyKCkKICAgICBBU1NFUlQoIW1faW5zcGVjdG9yQ2xpZW50KTsKIH0K IAorUGFnZUFnZW50Q29udGV4dCBJbnNwZWN0b3JDb250cm9sbGVyOjpwYWdlQWdlbnRDb250ZXh0 KCkKK3sKKyAgICBBZ2VudENvbnRleHQgYmFzZUNvbnRleHQgPSB7CisgICAgICAgICp0aGlzLAor ICAgICAgICAqbV9pbmplY3RlZFNjcmlwdE1hbmFnZXIsCisgICAgICAgIG1fZnJvbnRlbmRSb3V0 ZXIuZ2V0KCksCisgICAgICAgIG1fYmFja2VuZERpc3BhdGNoZXIuZ2V0KCkKKyAgICB9OworCisg ICAgV2ViQWdlbnRDb250ZXh0IHdlYkNvbnRleHQgPSB7CisgICAgICAgIGJhc2VDb250ZXh0LAor ICAgICAgICBtX2luc3RydW1lbnRpbmdBZ2VudHMuZ2V0KCkKKyAgICB9OworCisgICAgUGFnZUFn ZW50Q29udGV4dCBwYWdlQ29udGV4dCA9IHsKKyAgICAgICAgd2ViQ29udGV4dCwKKyAgICAgICAg bV9wYWdlCisgICAgfTsKKworICAgIHJldHVybiBwYWdlQ29udGV4dDsKK30KKwordm9pZCBJbnNw ZWN0b3JDb250cm9sbGVyOjpjcmVhdGVMYXp5QWdlbnRzKCkKK3sKKyAgICBpZiAobV9kaWRDcmVh dGVMYXp5QWdlbnRzKQorICAgICAgICByZXR1cm47CisKKyAgICBtX2RpZENyZWF0ZUxhenlBZ2Vu dHMgPSB0cnVlOworCisgICAgYXV0byBwYWdlQ29udGV4dCA9IHBhZ2VBZ2VudENvbnRleHQoKTsK KworICAgIGF1dG8gZGVidWdnZXJBZ2VudCA9IHN0ZDo6bWFrZV91bmlxdWU8UGFnZURlYnVnZ2Vy QWdlbnQ+KHBhZ2VDb250ZXh0LCBtX3BhZ2VBZ2VudCwgbV9vdmVybGF5LmdldCgpKTsKKyAgICBh dXRvIGRlYnVnZ2VyQWdlbnRQdHIgPSBkZWJ1Z2dlckFnZW50LmdldCgpOworCisgICAgbV9hZ2Vu dHMuYXBwZW5kKFdURk1vdmUoZGVidWdnZXJBZ2VudCkpOworICAgIG1fYWdlbnRzLmFwcGVuZChz dGQ6Om1ha2VfdW5pcXVlPEluc3BlY3Rvck5ldHdvcmtBZ2VudD4ocGFnZUNvbnRleHQsIG1fcGFn ZUFnZW50KSk7CisgICAgbV9hZ2VudHMuYXBwZW5kKHN0ZDo6bWFrZV91bmlxdWU8SW5zcGVjdG9y Q1NTQWdlbnQ+KHBhZ2VDb250ZXh0LCBtX2RvbUFnZW50KSk7CisgICAgbV9hZ2VudHMuYXBwZW5k KHN0ZDo6bWFrZV91bmlxdWU8SW5zcGVjdG9yRE9NRGVidWdnZXJBZ2VudD4ocGFnZUNvbnRleHQs IG1fZG9tQWdlbnQsIGRlYnVnZ2VyQWdlbnRQdHIpKTsKKyAgICBtX2FnZW50cy5hcHBlbmQoc3Rk OjptYWtlX3VuaXF1ZTxJbnNwZWN0b3JBcHBsaWNhdGlvbkNhY2hlQWdlbnQ+KHBhZ2VDb250ZXh0 LCBtX3BhZ2VBZ2VudCkpOworICAgIG1fYWdlbnRzLmFwcGVuZChzdGQ6Om1ha2VfdW5pcXVlPElu c3BlY3RvckxheWVyVHJlZUFnZW50PihwYWdlQ29udGV4dCkpOworICAgIG1fYWdlbnRzLmFwcGVu ZChzdGQ6Om1ha2VfdW5pcXVlPEluc3BlY3RvcldvcmtlckFnZW50PihwYWdlQ29udGV4dCkpOwor I2lmIEVOQUJMRShJTkRFWEVEX0RBVEFCQVNFKQorICAgIG1fYWdlbnRzLmFwcGVuZChzdGQ6Om1h a2VfdW5pcXVlPEluc3BlY3RvckluZGV4ZWREQkFnZW50PihwYWdlQ29udGV4dCwgbV9wYWdlQWdl bnQpKTsKKyNlbmRpZgorI2lmIEVOQUJMRShSRVNPVVJDRV9VU0FHRSkKKyAgICBtX2FnZW50cy5h cHBlbmQoc3RkOjptYWtlX3VuaXF1ZTxJbnNwZWN0b3JNZW1vcnlBZ2VudD4ocGFnZUNvbnRleHQp KTsKKyNlbmRpZgorfQorCiB2b2lkIEluc3BlY3RvckNvbnRyb2xsZXI6Omluc3BlY3RlZFBhZ2VE ZXN0cm95ZWQoKQogewogICAgIC8vIENsZWFuIHVwIHJlc291cmNlcyBhbmQgZGlzY29ubmVjdCBs b2NhbCBhbmQgcmVtb3RlIGZyb250ZW5kcy4KQEAgLTI1Miw2ICsyNjYsOCBAQCB2b2lkIEluc3Bl Y3RvckNvbnRyb2xsZXI6OmNvbm5lY3RGcm9udGVuZChJbnNwZWN0b3I6OkZyb250ZW5kQ2hhbm5l bCogZnJvbnRlbmRDaAogICAgIEFTU0VSVF9BUkcoZnJvbnRlbmRDaGFubmVsLCBmcm9udGVuZENo YW5uZWwpOwogICAgIEFTU0VSVChtX2luc3BlY3RvckNsaWVudCk7CiAKKyAgICBjcmVhdGVMYXp5 QWdlbnRzKCk7CisKICAgICBib29sIGNvbm5lY3RlZEZpcnN0RnJvbnRlbmQgPSAhbV9mcm9udGVu ZFJvdXRlci0+aGFzRnJvbnRlbmRzKCk7CiAgICAgbV9pc0F1dG9tYXRpY0luc3BlY3Rpb24gPSBp c0F1dG9tYXRpY0luc3BlY3Rpb247CiAgICAgbV9wYXVzZUFmdGVySW5pdGlhbGl6YXRpb24gPSBp bW1lZGlhdGVseVBhdXNlOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0lu c3BlY3RvckNvbnRyb2xsZXIuaCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JD b250cm9sbGVyLmgKaW5kZXggYTZmOWZjZDNjMmUuLmJhOWEzMmJlNWU2IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxlci5oCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDb250cm9sbGVyLmgKQEAgLTY2LDYgKzY2LDcg QEAgY2xhc3MgSW5zdHJ1bWVudGluZ0FnZW50czsKIGNsYXNzIE5vZGU7CiBjbGFzcyBQYWdlOwog Y2xhc3MgV2ViSW5qZWN0ZWRTY3JpcHRNYW5hZ2VyOworc3RydWN0IFBhZ2VBZ2VudENvbnRleHQ7 CiAKIGNsYXNzIEluc3BlY3RvckNvbnRyb2xsZXIgZmluYWwgOiBwdWJsaWMgSW5zcGVjdG9yOjpJ bnNwZWN0b3JFbnZpcm9ubWVudCB7CiAgICAgV1RGX01BS0VfTk9OQ09QWUFCTEUoSW5zcGVjdG9y Q29udHJvbGxlcik7CkBAIC0xMjgsNiArMTI5LDkgQEAgcHVibGljOgogcHJpdmF0ZToKICAgICBm cmllbmQgY2xhc3MgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOwogCisgICAgUGFnZUFnZW50Q29u dGV4dCBwYWdlQWdlbnRDb250ZXh0KCk7CisgICAgdm9pZCBjcmVhdGVMYXp5QWdlbnRzKCk7CisK ICAgICBSZWY8SW5zdHJ1bWVudGluZ0FnZW50cz4gbV9pbnN0cnVtZW50aW5nQWdlbnRzOwogICAg IHN0ZDo6dW5pcXVlX3B0cjxXZWJJbmplY3RlZFNjcmlwdE1hbmFnZXI+IG1faW5qZWN0ZWRTY3Jp cHRNYW5hZ2VyOwogICAgIFJlZjxJbnNwZWN0b3I6OkZyb250ZW5kUm91dGVyPiBtX2Zyb250ZW5k Um91dGVyOwpAQCAtMTQ4LDYgKzE1Miw3IEBAIHByaXZhdGU6CiAgICAgYm9vbCBtX2lzVW5kZXJU ZXN0IHsgZmFsc2UgfTsKICAgICBib29sIG1faXNBdXRvbWF0aWNJbnNwZWN0aW9uIHsgZmFsc2Ug fTsKICAgICBib29sIG1fcGF1c2VBZnRlckluaXRpYWxpemF0aW9uID0geyBmYWxzZSB9OworICAg IGJvb2wgbV9kaWRDcmVhdGVMYXp5QWdlbnRzIHsgZmFsc2UgfTsKIH07CiAKIH0gLy8gbmFtZXNw YWNlIFdlYkNvcmUK