151075 2015-11-09 19:50:09 -0800 Web Inspector: Provide a way to override the WKWebView remote inspector name 2015-11-13 15:47:31 -0800 1 1 1 Unclassified WebKit Web Inspector Other All All RESOLVED FIXED InRadar P2 Normal --- 1 joepeck joepeck andersca bburg commit-queue graouts joepeck mattbaker nvasilyev thorton timothy webkit-bug-importer oldest_to_newest 1140671 0 joepeck 2015-11-09 19:50:09 -0800 * SUMMARY Provide a way to override the WKWebView remote inspector name. 1140672 1 joepeck 2015-11-09 19:50:35 -0800 <rdar://problem/23475086> 1140673 2 265140 joepeck 2015-11-09 19:52:08 -0800 Created attachment 265140 [PATCH] Proposed Fix 1140674 3 commit-queue 2015-11-09 19:54:59 -0800 Attachment 265140 did not pass style-queue: ERROR: Source/WebKit2/UIProcess/WebPageProxy.h:314: The parameter name "name" adds no information, so it should be removed. [readability/parameter_name] [5] ERROR: Source/WebCore/page/PageDebuggable.h:57: The parameter name "name" adds no information, so it should be removed. [readability/parameter_name] [5] Total errors found: 2 in 15 files If any of these errors are false positives, please file a bug against check-webkit-style. 1140780 4 265140 bburg 2015-11-10 08:50:49 -0800 Comment on attachment 265140 [PATCH] Proposed Fix Is name reported as the Debuggable's title? I don't see a usage at the WK2 or RemoteInspector side. Otherwise, looks fine to me. 1140830 5 265140 joepeck 2015-11-10 10:29:36 -0800 Comment on attachment 265140 [PATCH] Proposed Fix View in context: https://bugs.webkit.org/attachment.cgi?id=265140&action=review > Source/WebCore/page/PageDebuggable.cpp:48 > String PageDebuggable::name() const This is the use on the RemoteInspector side. When pushing a listing we get the name() of each debuggable. 1140838 6 andersca 2015-11-10 10:44:40 -0800 Wouldn't it be better to make this a configuration parameter instead? 1140876 7 265140 bburg 2015-11-10 11:50:12 -0800 Comment on attachment 265140 [PATCH] Proposed Fix View in context: https://bugs.webkit.org/attachment.cgi?id=265140&action=review >> Source/WebCore/page/PageDebuggable.cpp:48 >> String PageDebuggable::name() const > > This is the use on the RemoteInspector side. When pushing a listing we get the name() of each debuggable. Oh, missed that. Thanks. 1140878 8 bburg 2015-11-10 11:52:49 -0800 (In reply to comment #6) > Wouldn't it be better to make this a configuration parameter instead? That would work if we know what to name the view and it will never change. But, I think the idea of this patch is to override crappy page names as the pages are loaded into the WKWebView. Joe? 1140882 9 thorton 2015-11-10 11:56:07 -0800 (In reply to comment #8) > (In reply to comment #6) > > Wouldn't it be better to make this a configuration parameter instead? > > That would work if we know what to name the view and it will never change. > But, I think the idea of this patch is to override crappy page names as the > pages are loaded into the WKWebView. Joe? Yeah, I think it's very feasible that clients will want to change the name dynamically. 1141014 10 joepeck 2015-11-10 17:40:00 -0800 Are there any open questions? 1141896 11 joepeck 2015-11-13 11:46:51 -0800 <http://trac.webkit.org/changeset/192437> 1141960 12 joepeck 2015-11-13 15:47:31 -0800 Follow-up to add Availability Macros: <http://trac.webkit.org/changeset/192446> 265140 2015-11-09 19:52:08 -0800 2015-11-11 08:02:31 -0800 [PATCH] Proposed Fix override.patch text/plain 11604 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA2ZWNlNmZkLi42NDQ3YWY4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkg QEAKKzIwMTUtMTEtMDkgIEpvc2VwaCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KKwor ICAgICAgICBXZWIgSW5zcGVjdG9yOiBQcm92aWRlIGEgd2F5IHRvIG92ZXJyaWRlIHRoZSBXS1dl YlZpZXcgcmVtb3RlIGluc3BlY3RvciBuYW1lCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xNTEwNzUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICAqIHBhZ2UvUGFnZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpQ YWdlOjpyZW1vdGVJbnNwZWN0aW9uTmFtZU92ZXJyaWRlKToKKyAgICAgICAgKFdlYkNvcmU6OlBh Z2U6OnNldFJlbW90ZUluc3BlY3Rpb25OYW1lT3ZlcnJpZGUpOgorICAgICAgICAqIHBhZ2UvUGFn ZS5oOgorICAgICAgICAqIHBhZ2UvUGFnZURlYnVnZ2FibGUuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6UGFnZURlYnVnZ2FibGU6Om5hbWUpOgorICAgICAgICAoV2ViQ29yZTo6UGFnZURlYnVnZ2Fi bGU6OnNldE5hbWVPdmVycmlkZSk6CisgICAgICAgICogcGFnZS9QYWdlRGVidWdnYWJsZS5oOgor CiAyMDE1LTExLTA5ICBKaWV3ZW4gVGFuICA8amlld2VuX3RhbkBhcHBsZS5jb20+CiAKICAgICAg ICAgTnVsbCBkZXJlZmVyZW5jZSBsb2FkaW5nIEJsaW5rIGxheW91dCB0ZXN0IGVkaXRpbmcvaW5z ZXJ0aW5nL2luc2VydC1odG1sLWNyYXNoLTAxLmh0bWwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3BhZ2UvUGFnZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2UuY3BwCmluZGV4IDg5 ZjdlZjEuLjhiNzQxMDIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZS5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlLmNwcApAQCAtMTM5NCw2ICsxMzk0LDE2IEBA IHZvaWQgUGFnZTo6c2V0UmVtb3RlSW5zcGVjdGlvbkFsbG93ZWQoYm9vbCBhbGxvd2VkKQogICAg IG1faW5zcGVjdG9yRGVidWdnYWJsZS0+c2V0UmVtb3RlRGVidWdnaW5nQWxsb3dlZChhbGxvd2Vk KTsKIH0KIAorU3RyaW5nIFBhZ2U6OnJlbW90ZUluc3BlY3Rpb25OYW1lT3ZlcnJpZGUoKSBjb25z dAoreworICAgIHJldHVybiBtX2luc3BlY3RvckRlYnVnZ2FibGUtPm5hbWVPdmVycmlkZSgpOwor fQorCit2b2lkIFBhZ2U6OnNldFJlbW90ZUluc3BlY3Rpb25OYW1lT3ZlcnJpZGUoY29uc3QgU3Ry aW5nJiBuYW1lKQoreworICAgIG1faW5zcGVjdG9yRGVidWdnYWJsZS0+c2V0TmFtZU92ZXJyaWRl KG5hbWUpOworfQorCiB2b2lkIFBhZ2U6OnJlbW90ZUluc3BlY3RvckluZm9ybWF0aW9uRGlkQ2hh bmdlKCkgY29uc3QKIHsKICAgICBtX2luc3BlY3RvckRlYnVnZ2FibGUtPnVwZGF0ZSgpOwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlLmggYi9Tb3VyY2UvV2ViQ29yZS9wYWdl L1BhZ2UuaAppbmRleCA1OTg4MzZkLi5lM2ZkYTVmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9wYWdlL1BhZ2UuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2UuaApAQCAtMTc4LDYg KzE3OCw4IEBAIHB1YmxpYzoKICNpZiBFTkFCTEUoUkVNT1RFX0lOU1BFQ1RPUikKICAgICBXRUJD T1JFX0VYUE9SVCBib29sIHJlbW90ZUluc3BlY3Rpb25BbGxvd2VkKCkgY29uc3Q7CiAgICAgV0VC Q09SRV9FWFBPUlQgdm9pZCBzZXRSZW1vdGVJbnNwZWN0aW9uQWxsb3dlZChib29sKTsKKyAgICBX RUJDT1JFX0VYUE9SVCBTdHJpbmcgcmVtb3RlSW5zcGVjdGlvbk5hbWVPdmVycmlkZSgpIGNvbnN0 OworICAgIFdFQkNPUkVfRVhQT1JUIHZvaWQgc2V0UmVtb3RlSW5zcGVjdGlvbk5hbWVPdmVycmlk ZShjb25zdCBTdHJpbmcmKTsKICAgICB2b2lkIHJlbW90ZUluc3BlY3RvckluZm9ybWF0aW9uRGlk Q2hhbmdlKCkgY29uc3Q7CiAjZW5kaWYKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFn ZS9QYWdlRGVidWdnYWJsZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2VEZWJ1Z2dhYmxl LmNwcAppbmRleCBmZGY0NzA4Li42NDAyNzRhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9w YWdlL1BhZ2VEZWJ1Z2dhYmxlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2VEZWJ1 Z2dhYmxlLmNwcApAQCAtNDcsNiArNDcsOSBAQCBQYWdlRGVidWdnYWJsZTo6UGFnZURlYnVnZ2Fi bGUoUGFnZSYgcGFnZSkKIAogU3RyaW5nIFBhZ2VEZWJ1Z2dhYmxlOjpuYW1lKCkgY29uc3QKIHsK KyAgICBpZiAoIW1fbmFtZU92ZXJyaWRlLmlzTnVsbCgpKQorICAgICAgICByZXR1cm4gbV9uYW1l T3ZlcnJpZGU7CisKICAgICBpZiAoIW1fcGFnZS5tYWluRnJhbWUoKS5kb2N1bWVudCgpKQogICAg ICAgICByZXR1cm4gU3RyaW5nKCk7CiAKQEAgLTEwMCw2ICsxMDMsMTIgQEAgdm9pZCBQYWdlRGVi dWdnYWJsZTo6c2V0SW5kaWNhdGluZyhib29sIGluZGljYXRpbmcpCiAgICAgbV9wYWdlLmluc3Bl Y3RvckNvbnRyb2xsZXIoKS5zZXRJbmRpY2F0aW5nKGluZGljYXRpbmcpOwogfQogCit2b2lkIFBh Z2VEZWJ1Z2dhYmxlOjpzZXROYW1lT3ZlcnJpZGUoY29uc3QgU3RyaW5nJiBuYW1lKQoreworICAg IG1fbmFtZU92ZXJyaWRlID0gbmFtZTsKKyAgICB1cGRhdGUoKTsKK30KKwogfSAvLyBuYW1lc3Bh Y2UgV2ViQ29yZQogCiAjZW5kaWYgLy8gRU5BQkxFKFJFTU9URV9JTlNQRUNUT1IpCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2VEZWJ1Z2dhYmxlLmggYi9Tb3VyY2UvV2ViQ29y ZS9wYWdlL1BhZ2VEZWJ1Z2dhYmxlLmgKaW5kZXggYjI5MDk0Zi4uZGMzNzFlOSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlRGVidWdnYWJsZS5oCisrKyBiL1NvdXJjZS9XZWJD b3JlL3BhZ2UvUGFnZURlYnVnZ2FibGUuaApAQCAtNTMsOCArNTMsMTIgQEAgcHVibGljOgogICAg IHZpcnR1YWwgdm9pZCBkaXNwYXRjaE1lc3NhZ2VGcm9tUmVtb3RlRnJvbnRlbmQoY29uc3QgU3Ry aW5nJiBtZXNzYWdlKSBvdmVycmlkZTsKICAgICB2aXJ0dWFsIHZvaWQgc2V0SW5kaWNhdGluZyhi b29sKSBvdmVycmlkZTsKIAorICAgIFN0cmluZyBuYW1lT3ZlcnJpZGUoKSBjb25zdCB7IHJldHVy biBtX25hbWVPdmVycmlkZTsgfQorICAgIHZvaWQgc2V0TmFtZU92ZXJyaWRlKGNvbnN0IFN0cmlu ZyYgbmFtZSk7CisKIHByaXZhdGU6CiAgICAgUGFnZSYgbV9wYWdlOworICAgIFN0cmluZyBtX25h bWVPdmVycmlkZTsKICAgICBib29sIG1fZm9yY2VkRGV2ZWxvcGVyRXh0cmFzRW5hYmxlZDsKIH07 CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQy L0NoYW5nZUxvZwppbmRleCBiZjRhMDFjLi40YWEwY2Y4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDUgKzEs MzEgQEAKIDIwMTUtMTEtMDkgIEpvc2VwaCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4K IAorICAgICAgICBXZWIgSW5zcGVjdG9yOiBQcm92aWRlIGEgd2F5IHRvIG92ZXJyaWRlIHRoZSBX S1dlYlZpZXcgcmVtb3RlIGluc3BlY3RvciBuYW1lCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTEwNzUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICAqIFNoYXJlZC9XZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJz LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZUNyZWF0aW9uUGFyYW1ldGVyczo6ZW5jb2Rl KToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZUNyZWF0aW9uUGFyYW1ldGVyczo6ZGVjb2RlKToK KyAgICAgICAgKiBTaGFyZWQvV2ViUGFnZUNyZWF0aW9uUGFyYW1ldGVycy5oOgorICAgICAgICAq IFVJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tOgorICAgICAgICAoLVtXS1dlYlZpZXcg X3JlbW90ZUluc3BlY3Rpb25OYW1lT3ZlcnJpZGVdKToKKyAgICAgICAgKC1bV0tXZWJWaWV3IF9z ZXRSZW1vdGVJbnNwZWN0aW9uTmFtZU92ZXJyaWRlOl0pOgorICAgICAgICAqIFVJUHJvY2Vzcy9B UEkvQ29jb2EvV0tXZWJWaWV3UHJpdmF0ZS5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdl UHJveHkuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OnNldFJlbW90ZUluc3Bl Y3Rpb25OYW1lT3ZlcnJpZGUpOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OmNyZWF0 aW9uUGFyYW1ldGVycyk6CisgICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oOgorICAg ICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OnJlbW90ZUluc3BlY3Rpb25OYW1lT3ZlcnJpZGUp OgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcDoKKyAgICAgICAgKFdl YktpdDo6bV9zaG91bGREaXNwYXRjaEZha2VNb3VzZU1vdmVFdmVudHMpOgorICAgICAgICAoV2Vi S2l0OjpXZWJQYWdlOjpzZXRSZW1vdGVJbnNwZWN0aW9uTmFtZU92ZXJyaWRlKToKKyAgICAgICAg KiBXZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oOgorICAgICAgICAqIFdlYlByb2Nlc3MvV2Vi UGFnZS9XZWJQYWdlLm1lc3NhZ2VzLmluOgorCisyMDE1LTExLTA5ICBKb3NlcGggUGVjb3Jhcm8g IDxwZWNvcmFyb0BhcHBsZS5jb20+CisKICAgICAgICAgV2ViIEluc3BlY3RvcjogUkVHUkVTU0lP TjogMm5kIGxldmVsIGluc3BlY3RvciBzaG91bGQgbm90IGJlIGFibGUgdG8gZG9jayB0byBmaXJz dAogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTUxMDUw CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9XZWJQYWdlQ3JlYXRpb25QYXJh bWV0ZXJzLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9XZWJQYWdlQ3JlYXRpb25QYXJhbWV0 ZXJzLmNwcAppbmRleCA5ZjhlMzQ4Li41MWM5NWZlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9TaGFyZWQvV2ViUGFnZUNyZWF0aW9uUGFyYW1ldGVycy5jcHAKKysrIGIvU291cmNlL1dlYktp dDIvU2hhcmVkL1dlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnMuY3BwCkBAIC03Myw2ICs3Myw3IEBA IHZvaWQgV2ViUGFnZUNyZWF0aW9uUGFyYW1ldGVyczo6ZW5jb2RlKElQQzo6QXJndW1lbnRFbmNv ZGVyJiBlbmNvZGVyKSBjb25zdAogCiAjaWYgRU5BQkxFKFJFTU9URV9JTlNQRUNUT1IpCiAgICAg ZW5jb2RlciA8PCBhbGxvd3NSZW1vdGVJbnNwZWN0aW9uOworICAgIGVuY29kZXIgPDwgcmVtb3Rl SW5zcGVjdGlvbk5hbWVPdmVycmlkZTsKICNlbmRpZgogI2lmIFBMQVRGT1JNKE1BQykKICAgICBl bmNvZGVyIDw8IGNvbG9yU3BhY2U7CkBAIC0xNjYsNiArMTY3LDggQEAgYm9vbCBXZWJQYWdlQ3Jl YXRpb25QYXJhbWV0ZXJzOjpkZWNvZGUoSVBDOjpBcmd1bWVudERlY29kZXImIGRlY29kZXIsIFdl YlBhZ2VDcmUKICNpZiBFTkFCTEUoUkVNT1RFX0lOU1BFQ1RPUikKICAgICBpZiAoIWRlY29kZXIu ZGVjb2RlKHBhcmFtZXRlcnMuYWxsb3dzUmVtb3RlSW5zcGVjdGlvbikpCiAgICAgICAgIHJldHVy biBmYWxzZTsKKyAgICBpZiAoIWRlY29kZXIuZGVjb2RlKHBhcmFtZXRlcnMucmVtb3RlSW5zcGVj dGlvbk5hbWVPdmVycmlkZSkpCisgICAgICAgIHJldHVybiBmYWxzZTsKICNlbmRpZgogCiAjaWYg UExBVEZPUk0oTUFDKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvU2hhcmVkL1dlYlBhZ2VD cmVhdGlvblBhcmFtZXRlcnMuaCBiL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9XZWJQYWdlQ3JlYXRp b25QYXJhbWV0ZXJzLmgKaW5kZXggZjBlYTE5MC4uZjJmMDU3NyAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdDIvU2hhcmVkL1dlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnMuaAorKysgYi9Tb3VyY2Uv V2ViS2l0Mi9TaGFyZWQvV2ViUGFnZUNyZWF0aW9uUGFyYW1ldGVycy5oCkBAIC0xMTgsNiArMTE4 LDcgQEAgc3RydWN0IFdlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnMgewogCiAjaWYgRU5BQkxFKFJF TU9URV9JTlNQRUNUT1IpCiAgICAgYm9vbCBhbGxvd3NSZW1vdGVJbnNwZWN0aW9uOworICAgIFN0 cmluZyByZW1vdGVJbnNwZWN0aW9uTmFtZU92ZXJyaWRlOwogI2VuZGlmCiAKICNpZiBQTEFURk9S TShNQUMpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dL V2ViVmlldy5tbSBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3 Lm1tCmluZGV4IDZjZGFlNDUuLjdjYTIyZDggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tCkBAIC0zMDUwLDYgKzMwNTAsMjIgQEAgLSAodm9p ZClfc2V0QWxsb3dzUmVtb3RlSW5zcGVjdGlvbjooQk9PTClhbGxvdwogI2VuZGlmCiB9CiAKKy0g KE5TU3RyaW5nICopX3JlbW90ZUluc3BlY3Rpb25OYW1lT3ZlcnJpZGUKK3sKKyNpZiBFTkFCTEUo UkVNT1RFX0lOU1BFQ1RPUikKKyAgICByZXR1cm4gX3BhZ2UtPnJlbW90ZUluc3BlY3Rpb25OYW1l T3ZlcnJpZGUoKTsKKyNlbHNlCisgICAgcmV0dXJuIG5pbDsKKyNlbmRpZgorfQorCistICh2b2lk KV9zZXRSZW1vdGVJbnNwZWN0aW9uTmFtZU92ZXJyaWRlOihOU1N0cmluZyAqKW5hbWUKK3sKKyNp ZiBFTkFCTEUoUkVNT1RFX0lOU1BFQ1RPUikKKyAgICBfcGFnZS0+c2V0UmVtb3RlSW5zcGVjdGlv bk5hbWVPdmVycmlkZShuYW1lKTsKKyNlbmRpZgorfQorCiAtIChCT09MKV9hZGRzVmlzaXRlZExp bmtzCiB7CiAgICAgcmV0dXJuIF9wYWdlLT5hZGRzVmlzaXRlZExpbmtzKCk7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlld1ByaXZhdGUuaCBi L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3UHJpdmF0ZS5oCmlu ZGV4IDZmNjVkYWIuLjYwYTk5MWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9BUEkvQ29jb2EvV0tXZWJWaWV3UHJpdmF0ZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3UHJpdmF0ZS5oCkBAIC05Nyw2ICs5Nyw3IEBAIHR5cGVk ZWYgTlNfRU5VTShOU0ludGVnZXIsIF9XS0ltbWVkaWF0ZUFjdGlvblR5cGUpIHsKIC0gKFdLTmF2 aWdhdGlvbiAqKV9yZXN0b3JlU2Vzc2lvblN0YXRlOihfV0tTZXNzaW9uU3RhdGUgKilzZXNzaW9u U3RhdGUgYW5kTmF2aWdhdGU6KEJPT0wpbmF2aWdhdGU7CiAKIEBwcm9wZXJ0eSAobm9uYXRvbWlj LCBzZXR0ZXI9X3NldEFsbG93c1JlbW90ZUluc3BlY3Rpb246KSBCT09MIF9hbGxvd3NSZW1vdGVJ bnNwZWN0aW9uOworQHByb3BlcnR5IChub25hdG9taWMsIGNvcHksIHNldHRlcj1fc2V0UmVtb3Rl SW5zcGVjdGlvbk5hbWVPdmVycmlkZTopIE5TU3RyaW5nICpfcmVtb3RlSW5zcGVjdGlvbk5hbWVP dmVycmlkZTsKIAogQHByb3BlcnR5IChub25hdG9taWMsIHNldHRlcj1fc2V0QWRkc1Zpc2l0ZWRM aW5rczopIEJPT0wgX2FkZHNWaXNpdGVkTGlua3M7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L1dlYlBhZ2VQcm94eS5jcHAKaW5kZXggNjE5ZjM3NS4uZDBmYjIwYSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKKysrIGIvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKQEAgLTEyMzIsNiArMTIzMiwxOCBAQCB2b2lk IFdlYlBhZ2VQcm94eTo6c2V0QWxsb3dzUmVtb3RlSW5zcGVjdGlvbihib29sIGFsbG93KQogICAg IGlmIChpc1ZhbGlkKCkpCiAgICAgICAgIG1fcHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6V2ViUGFn ZTo6U2V0QWxsb3dzUmVtb3RlSW5zcGVjdGlvbihhbGxvdyksIG1fcGFnZUlEKTsKIH0KKwordm9p ZCBXZWJQYWdlUHJveHk6OnNldFJlbW90ZUluc3BlY3Rpb25OYW1lT3ZlcnJpZGUoY29uc3QgU3Ry aW5nJiBuYW1lKQoreworICAgIGlmIChtX3JlbW90ZUluc3BlY3Rpb25OYW1lT3ZlcnJpZGUgPT0g bmFtZSkKKyAgICAgICAgcmV0dXJuOworCisgICAgbV9yZW1vdGVJbnNwZWN0aW9uTmFtZU92ZXJy aWRlID0gbmFtZTsKKworICAgIGlmIChpc1ZhbGlkKCkpCisgICAgICAgIG1fcHJvY2Vzcy0+c2Vu ZChNZXNzYWdlczo6V2ViUGFnZTo6U2V0UmVtb3RlSW5zcGVjdGlvbk5hbWVPdmVycmlkZShtX3Jl bW90ZUluc3BlY3Rpb25OYW1lT3ZlcnJpZGUpLCBtX3BhZ2VJRCk7Cit9CisKICNlbmRpZgogCiB2 b2lkIFdlYlBhZ2VQcm94eTo6c2V0RHJhd3NCYWNrZ3JvdW5kKGJvb2wgZHJhd3NCYWNrZ3JvdW5k KQpAQCAtNTEyOSw2ICs1MTQxLDcgQEAgV2ViUGFnZUNyZWF0aW9uUGFyYW1ldGVycyBXZWJQYWdl UHJveHk6OmNyZWF0aW9uUGFyYW1ldGVycygpCiAgICAgcGFyYW1ldGVycy5sYXllckhvc3RpbmdN b2RlID0gbV9sYXllckhvc3RpbmdNb2RlOwogI2lmIEVOQUJMRShSRU1PVEVfSU5TUEVDVE9SKQog ICAgIHBhcmFtZXRlcnMuYWxsb3dzUmVtb3RlSW5zcGVjdGlvbiA9IG1fYWxsb3dzUmVtb3RlSW5z cGVjdGlvbjsKKyAgICBwYXJhbWV0ZXJzLnJlbW90ZUluc3BlY3Rpb25OYW1lT3ZlcnJpZGUgPSBt X3JlbW90ZUluc3BlY3Rpb25OYW1lT3ZlcnJpZGU7CiAjZW5kaWYKICNpZiBQTEFURk9STShNQUMp CiAgICAgcGFyYW1ldGVycy5jb2xvclNwYWNlID0gbV9wYWdlQ2xpZW50LmNvbG9yU3BhY2UoKTsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaCBiL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAppbmRleCBkMmVjNGYzLi5lNDlh MDJkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgK KysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCkBAIC0zMTAsNiAr MzEwLDggQEAgcHVibGljOgogI2lmIEVOQUJMRShSRU1PVEVfSU5TUEVDVE9SKQogICAgIGJvb2wg YWxsb3dzUmVtb3RlSW5zcGVjdGlvbigpIGNvbnN0IHsgcmV0dXJuIG1fYWxsb3dzUmVtb3RlSW5z cGVjdGlvbjsgfQogICAgIHZvaWQgc2V0QWxsb3dzUmVtb3RlSW5zcGVjdGlvbihib29sKTsKKyAg ICBTdHJpbmcgcmVtb3RlSW5zcGVjdGlvbk5hbWVPdmVycmlkZSgpIGNvbnN0IHsgcmV0dXJuIG1f cmVtb3RlSW5zcGVjdGlvbk5hbWVPdmVycmlkZTsgfQorICAgIHZvaWQgc2V0UmVtb3RlSW5zcGVj dGlvbk5hbWVPdmVycmlkZShjb25zdCBTdHJpbmcmIG5hbWUpOwogI2VuZGlmCiAKICNpZiBFTkFC TEUoVklCUkFUSU9OKQpAQCAtMTY2OCw2ICsxNjcwLDcgQEAgcHJpdmF0ZToKIAogI2lmIEVOQUJM RShSRU1PVEVfSU5TUEVDVE9SKQogICAgIGJvb2wgbV9hbGxvd3NSZW1vdGVJbnNwZWN0aW9uOwor ICAgIFN0cmluZyBtX3JlbW90ZUluc3BlY3Rpb25OYW1lT3ZlcnJpZGU7CiAjZW5kaWYKIAogI2lm IFBMQVRGT1JNKENPQ09BKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9X ZWJQYWdlL1dlYlBhZ2UuY3BwIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dl YlBhZ2UuY3BwCmluZGV4IDBkNzQ5MTkuLjA3ZmUwMzA5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIv V2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCkBAIC00MTgsNyArNDE4LDggQEAgV2ViUGFn ZTo6V2ViUGFnZSh1aW50NjRfdCBwYWdlSUQsIGNvbnN0IFdlYlBhZ2VDcmVhdGlvblBhcmFtZXRl cnMmIHBhcmFtZXRlcnMpCiAjZW5kaWYKIAogI2lmIEVOQUJMRShSRU1PVEVfSU5TUEVDVE9SKQot ICAgIG1fcGFnZS0+c2V0UmVtb3RlSW5zcGVjdGlvbkFsbG93ZWQodHJ1ZSk7CisgICAgbV9wYWdl LT5zZXRSZW1vdGVJbnNwZWN0aW9uQWxsb3dlZChwYXJhbWV0ZXJzLmFsbG93c1JlbW90ZUluc3Bl Y3Rpb24pOworICAgIG1fcGFnZS0+c2V0UmVtb3RlSW5zcGVjdGlvbk5hbWVPdmVycmlkZShwYXJh bWV0ZXJzLnJlbW90ZUluc3BlY3Rpb25OYW1lT3ZlcnJpZGUpOwogI2VuZGlmCiAKICAgICBtX3Bh Z2UtPnNldENhblN0YXJ0TWVkaWEoZmFsc2UpOwpAQCAtMjI0Niw2ICsyMjQ3LDExIEBAIHZvaWQg V2ViUGFnZTo6c2V0QWxsb3dzUmVtb3RlSW5zcGVjdGlvbihib29sIGFsbG93KQogewogICAgIG1f cGFnZS0+c2V0UmVtb3RlSW5zcGVjdGlvbkFsbG93ZWQoYWxsb3cpOwogfQorCit2b2lkIFdlYlBh Z2U6OnNldFJlbW90ZUluc3BlY3Rpb25OYW1lT3ZlcnJpZGUoY29uc3QgU3RyaW5nJiBuYW1lKQor eworICAgIG1fcGFnZS0+c2V0UmVtb3RlSW5zcGVjdGlvbk5hbWVPdmVycmlkZShuYW1lKTsKK30K ICNlbmRpZgogCiB2b2lkIFdlYlBhZ2U6OnNldERyYXdzQmFja2dyb3VuZChib29sIGRyYXdzQmFj a2dyb3VuZCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9X ZWJQYWdlLmggYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oCmlu ZGV4IDE5ZThhNjUuLjM3OTZkNDIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nl c3MvV2ViUGFnZS9XZWJQYWdlLmgKKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQ YWdlL1dlYlBhZ2UuaApAQCAtMTAyNiw2ICsxMDI2LDcgQEAgcHJpdmF0ZToKIAogI2lmIEVOQUJM RShSRU1PVEVfSU5TUEVDVE9SKQogICAgIHZvaWQgc2V0QWxsb3dzUmVtb3RlSW5zcGVjdGlvbihi b29sKTsKKyAgICB2b2lkIHNldFJlbW90ZUluc3BlY3Rpb25OYW1lT3ZlcnJpZGUoY29uc3QgU3Ry aW5nJik7CiAjZW5kaWYKIAogICAgIHZvaWQgc2V0RHJhd3NCYWNrZ3JvdW5kKGJvb2wpOwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UubWVzc2Fn ZXMuaW4gYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5tZXNzYWdl cy5pbgppbmRleCA3OTI3ZGE5Li5hNmQ2ZjIzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9X ZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5tZXNzYWdlcy5pbgorKysgYi9Tb3VyY2UvV2ViS2l0 Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5tZXNzYWdlcy5pbgpAQCAtOTcsNiArOTcsNyBA QCBtZXNzYWdlcyAtPiBXZWJQYWdlIExlZ2FjeVJlY2VpdmVyIHsKIAogI2lmIEVOQUJMRShSRU1P VEVfSU5TUEVDVE9SKQogICAgIFNldEFsbG93c1JlbW90ZUluc3BlY3Rpb24oYm9vbCBhbGxvdykK KyAgICBTZXRSZW1vdGVJbnNwZWN0aW9uTmFtZU92ZXJyaWRlKFN0cmluZyBuYW1lKQogI2VuZGlm CiAKICNpZiBFTkFCTEUoSU9TX1RPVUNIX0VWRU5UUykK