105113 2012-12-15 15:29:07 -0800 [WebKit2] Register schemes with the network process if it is being used 2012-12-15 16:04:48 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 aestes aestes oldest_to_newest 792225 0 aestes 2012-12-15 15:29:07 -0800 [WebKit2] Register schemes with the network process if it is being used 792230 1 179627 aestes 2012-12-15 15:35:51 -0800 Created attachment 179627 Patch 792233 2 179627 andersca 2012-12-15 15:40:08 -0800 Comment on attachment 179627 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=179627&action=review > Source/WebKit2/NetworkProcess/NetworkProcess.h:78 > + void registerSchemeForCustomProtocol(const WTF::String&); > + void unregisterSchemeForCustomProtocol(const WTF::String&); No need for WTF:: here. > Source/WebKit2/UIProcess/Network/mac/NetworkProcessProxyMac.mm:46 > + NSArray *schemes = [[WKBrowsingContextController customSchemes] allObjects]; > + for (size_t i = 0; i < [schemes count]; ++i) > + parameters.urlSchemesRegisteredForCustomProtocols.append([schemes objectAtIndex:i]); You can just use fast enumeration here: for (NSString *scheme in [WKBrowsingContextController customSchemes]) > Source/WebKit2/UIProcess/WebContext.cpp:1116 > + if (m_usesNetworkProcess) > + NetworkProcessManager::shared().process()->send(Messages::NetworkProcess::RegisterSchemeForCustomProtocol(scheme), 0); > + else > + sendToAllProcesses(Messages::WebProcess::RegisterSchemeForCustomProtocol(scheme)); > +} This is missing the #if ENABLE(NETWORK_PROCESS). I'd use an early return to avoid making the indentation look weird. > Source/WebKit2/UIProcess/WebContext.cpp:1123 > + if (m_usesNetworkProcess) > + NetworkProcessManager::shared().process()->send(Messages::NetworkProcess::UnregisterSchemeForCustomProtocol(scheme), 0); > + else > + sendToAllProcesses(Messages::WebProcess::UnregisterSchemeForCustomProtocol(scheme)); Ditto. > Source/WebKit2/UIProcess/WebContext.h:329 > + void registerSchemeForCustomProtocol(const WTF::String&); > + void unregisterSchemeForCustomProtocol(const WTF::String&); No need for WTF:: 792236 3 179627 buildbot 2012-12-15 15:43:48 -0800 Comment on attachment 179627 Patch Attachment 179627 did not pass mac-ews (mac): Output: http://queues.webkit.org/results/15360229 792244 4 aestes 2012-12-15 16:04:48 -0800 Committed r137818: <http://trac.webkit.org/changeset/137818> 179627 2012-12-15 15:35:51 -0800 2012-12-15 15:43:48 -0800 Patch bug-105113-20121215153310.patch text/plain 14093 aestes U3VidmVyc2lvbiBSZXZpc2lvbjogMTM3ODA2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggNzVjNTEyZTc5MzA3NGUw ZDk4ZGZlZTliOWQ1MGYxYTliZWM1ZGJiNy4uODEzMzgxMzRiNTM3ODBiNWViYmFjZWMyMWY1YTY2 Yjg1NTY1ZDUwYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDUxIEBACiAyMDEyLTEyLTE1ICBBbmR5 IEVzdGVzICA8YWVzdGVzQGFwcGxlLmNvbT4KIAorICAgICAgICBbV2ViS2l0Ml0gUmVnaXN0ZXIg c2NoZW1lcyB3aXRoIHRoZSBuZXR3b3JrIHByb2Nlc3MgaWYgaXQgaXMgYmVpbmcgdXNlZAorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA1MTEzCisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSWYgYSBXZWJDb250 ZXh0IGlzIHVzaW5nIHRoZSBuZXR3b3JrIHByb2Nlc3MsIGl0IG5lZWRzIHRvIGJlIHRvbGQgYWJv dXQKKyAgICAgICAgc2NoZW1lICh1bilyZWdpc3RyYXRpb24gcmF0aGVyIHRoYW4gdGhlIGNvbnRl eHQncyB3ZWIgcHJvY2Vzc2VzLgorCisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvTmV0d29ya1By b2Nlc3MuY3BwOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrUHJvY2Vzczo6aW5pdGlhbGl6ZU5l dHdvcmtQcm9jZXNzKTogVGVsbCB0aGUgc2hhcmVkCisgICAgICAgIEN1c3RvbVByb3RvY29sTWFu YWdlciBhYm91dCBzY2hlbWVzIHJlZ2lzdGVyZWQgYXQgcHJvY2VzcyBjcmVhdGlvbiB0aW1lLgor ICAgICAgICAoV2ViS2l0OjpOZXR3b3JrUHJvY2Vzczo6cmVnaXN0ZXJTY2hlbWVGb3JDdXN0b21Q cm90b2NvbCk6IFRlbGwgdGhlCisgICAgICAgIHNoYXJlZCBDdXN0b21Qcm90b2NvbE1hbmFnZXIg YWJvdXQgYSBuZXcgc2NoZW1lLgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrUHJvY2Vzczo6dW5y ZWdpc3RlclNjaGVtZUZvckN1c3RvbVByb3RvY29sKTogUmVtb3ZlIGEKKyAgICAgICAgc2NoZW1l IGZyb20gdGhlIHNoYXJlZCBDdXN0b21Qcm90b2NvbE1hbmFnZXIuCisgICAgICAgICogTmV0d29y a1Byb2Nlc3MvTmV0d29ya1Byb2Nlc3MuaDoKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9OZXR3 b3JrUHJvY2Vzcy5tZXNzYWdlcy5pbjogQWRkIHJlZ2lzdHJhdGlvbiBhbmQKKyAgICAgICAgdW5y ZWdpc3RyYXRpb24gbWVzc2FnZXMgZm9yIHRoZSBOZXR3b3JrUHJvY2Vzcy4KKyAgICAgICAgKiBT aGFyZWQvTmV0d29yay9OZXR3b3JrUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVycy5jcHA6CisgICAg ICAgIChXZWJLaXQ6Ok5ldHdvcmtQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzOjplbmNvZGUpOiBF bmNvZGUKKyAgICAgICAgdXJsU2NoZW1lc1JlZ2lzdGVyZWRGb3JDdXN0b21Qcm90b2NvbHMuCisg ICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzOjpkZWNvZGUp OiBEZWNvZGUKKyAgICAgICAgdXJsU2NoZW1lc1JlZ2lzdGVyZWRGb3JDdXN0b21Qcm90b2NvbHMu CisgICAgICAgICogU2hhcmVkL05ldHdvcmsvTmV0d29ya1Byb2Nlc3NDcmVhdGlvblBhcmFtZXRl cnMuaDogRGVmaW5lCisgICAgICAgIHVybFNjaGVtZXNSZWdpc3RlcmVkRm9yQ3VzdG9tUHJvdG9j b2xzLgorICAgICAgICAqIFVJUHJvY2Vzcy9OZXR3b3JrL21hYy9OZXR3b3JrUHJvY2Vzc1Byb3h5 TWFjLm1tOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrUHJvY2Vzc1Byb3h5OjpwbGF0Zm9ybUlu aXRpYWxpemVOZXR3b3JrUHJvY2Vzcyk6IFBvcHVsYXRlCisgICAgICAgIHVybFNjaGVtZXNSZWdp c3RlcmVkRm9yQ3VzdG9tUHJvdG9jb2xzIHdpdGggdGhlIGN1cnJlbnQgc2V0IG9mIHNjaGVtZXMu CisgICAgICAgICogVUlQcm9jZXNzL1dlYkNvbnRleHQuY3BwOgorICAgICAgICAoV2ViS2l0OjpX ZWJDb250ZXh0OjpyZWdpc3RlclNjaGVtZUZvckN1c3RvbVByb3RvY29sKTogU2VuZCBhIG5ldwor ICAgICAgICBzY2hlbWUgdG8gZWl0aGVyIHRoZSBuZXR3b3JrIHByb2Nlc3Mgb3IgdG8gdGhlIGNv bnRleHQncyB3ZWIgcHJvY2Vzc2VzLgorICAgICAgICAoV2ViS2l0OjpXZWJDb250ZXh0Ojp1bnJl Z2lzdGVyU2NoZW1lRm9yQ3VzdG9tUHJvdG9jb2wpOiBEaXR0byBmb3IKKyAgICAgICAgcmVtb3Zp bmcgYSBzY2hlbWUuCisgICAgICAgICogVUlQcm9jZXNzL1dlYkNvbnRleHQuaDoKKyAgICAgICAg KiBVSVByb2Nlc3MvbWFjL1dlYkNvbnRleHRNYWMubW06CisgICAgICAgIChXZWJLaXQ6OldlYkNv bnRleHQ6OnBsYXRmb3JtSW5pdGlhbGl6ZVdlYlByb2Nlc3MpOiBPbmx5IHBvcHVsYXRlCisgICAg ICAgIHVybFNjaGVtZXNSZWdpc3RlcmVkRm9yQ3VzdG9tUHJvdG9jb2xzIGlmIHRoZSBuZXR3b3Jr IHByb2Nlc3MgaXNuJ3QKKyAgICAgICAgYmVpbmcgdXNlZC4KKyAgICAgICAgKFdlYktpdDo6V2Vi Q29udGV4dDo6cmVnaXN0ZXJOb3RpZmljYXRpb25PYnNlcnZlcnMpOgorICAgICAgICAqIFdlYlBy b2Nlc3MvbWFjL1dlYlByb2Nlc3NNYWMubW06CisgICAgICAgIChXZWJLaXQ6OldlYlByb2Nlc3M6 OnBsYXRmb3JtSW5pdGlhbGl6ZVdlYlByb2Nlc3MpOgorICAgICAgICB1cmxTY2hlbWVzUmVnaXN0 ZXJlZEZvckN1c3RvbVByb3RvY29scyBzaG91bGQgb25seSBiZSBub24tZW1wdHkgaWYgdGhlCisg ICAgICAgIG5ldHdvcmsgcHJvY2VzcyBpc24ndCBiZWluZyB1c2VkLiBBc3NlcnQgdGhpcy4KKwor MjAxMi0xMi0xNSAgQW5keSBFc3RlcyAgPGFlc3Rlc0BhcHBsZS5jb20+CisKICAgICAgICAgW1dl YktpdDJdIE1vdmUgQ3VzdG9tUHJvdG9jb2xNYW5hZ2VyIHRvIFNoYXJlZC8KICAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwNTEwMwogCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUHJvY2Vzcy5jcHAgYi9Tb3Vy Y2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUHJvY2Vzcy5jcHAKaW5kZXggODUxOGMy MGFiZjg0YTczNDkwODc0NzYxYTBmMDk5ZDM1OTUxZjZkZC4uODY0ZjBjNjdmNWMxZDVkM2MxZWNm YjExNTA0MzgwMTk4NzhmMGEyMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvTmV0d29ya1By b2Nlc3MvTmV0d29ya1Byb2Nlc3MuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9j ZXNzL05ldHdvcmtQcm9jZXNzLmNwcApAQCAtMzAsNiArMzAsNyBAQAogCiAjaW5jbHVkZSAiQXJn dW1lbnRDb2RlcnMuaCIKICNpbmNsdWRlICJBdHRhY2htZW50LmgiCisjaW5jbHVkZSAiQ3VzdG9t UHJvdG9jb2xNYW5hZ2VyLmgiCiAjaW5jbHVkZSAiTG9nZ2luZy5oIgogI2luY2x1ZGUgIk5ldHdv cmtDb25uZWN0aW9uVG9XZWJQcm9jZXNzLmgiCiAjaW5jbHVkZSAiTmV0d29ya1Byb2Nlc3NDcmVh dGlvblBhcmFtZXRlcnMuaCIKQEAgLTExMSw2ICsxMTIsMTEgQEAgdm9pZCBOZXR3b3JrUHJvY2Vz czo6aW5pdGlhbGl6ZU5ldHdvcmtQcm9jZXNzKGNvbnN0IE5ldHdvcmtQcm9jZXNzQ3JlYXRpb25Q YXJhbWUKIAogICAgIGlmIChwYXJhbWV0ZXJzLnByaXZhdGVCcm93c2luZ0VuYWJsZWQpCiAgICAg ICAgIFJlbW90ZU5ldHdvcmtpbmdDb250ZXh0OjplbnN1cmVQcml2YXRlQnJvd3NpbmdTZXNzaW9u KCk7CisKKyNpZiBFTkFCTEUoQ1VTVE9NX1BST1RPQ09MUykKKyAgICBmb3IgKHNpemVfdCBpID0g MDsgaSA8IHBhcmFtZXRlcnMudXJsU2NoZW1lc1JlZ2lzdGVyZWRGb3JDdXN0b21Qcm90b2NvbHMu c2l6ZSgpOyArK2kpCisgICAgICAgIEN1c3RvbVByb3RvY29sTWFuYWdlcjo6c2hhcmVkKCkucmVn aXN0ZXJTY2hlbWUocGFyYW1ldGVycy51cmxTY2hlbWVzUmVnaXN0ZXJlZEZvckN1c3RvbVByb3Rv Y29sc1tpXSk7CisjZW5kaWYKIH0KIAogdm9pZCBOZXR3b3JrUHJvY2Vzczo6Y3JlYXRlTmV0d29y a0Nvbm5lY3Rpb25Ub1dlYlByb2Nlc3MoKQpAQCAtMTQxLDYgKzE0NywxOCBAQCB2b2lkIE5ldHdv cmtQcm9jZXNzOjpkZXN0cm95UHJpdmF0ZUJyb3dzaW5nU2Vzc2lvbigpCiAgICAgUmVtb3RlTmV0 d29ya2luZ0NvbnRleHQ6OmRlc3Ryb3lQcml2YXRlQnJvd3NpbmdTZXNzaW9uKCk7CiB9CiAKKyNp ZiBFTkFCTEUoQ1VTVE9NX1BST1RPQ09MUykKK3ZvaWQgTmV0d29ya1Byb2Nlc3M6OnJlZ2lzdGVy U2NoZW1lRm9yQ3VzdG9tUHJvdG9jb2woY29uc3QgV1RGOjpTdHJpbmcmIHNjaGVtZSkKK3sKKyAg ICBDdXN0b21Qcm90b2NvbE1hbmFnZXI6OnNoYXJlZCgpLnJlZ2lzdGVyU2NoZW1lKHNjaGVtZSk7 Cit9CisKK3ZvaWQgTmV0d29ya1Byb2Nlc3M6OnVucmVnaXN0ZXJTY2hlbWVGb3JDdXN0b21Qcm90 b2NvbChjb25zdCBXVEY6OlN0cmluZyYgc2NoZW1lKQoreworICAgIEN1c3RvbVByb3RvY29sTWFu YWdlcjo6c2hhcmVkKCkudW5yZWdpc3RlclNjaGVtZShzY2hlbWUpOworfQorI2VuZGlmCisKIH0g Ly8gbmFtZXNwYWNlIFdlYktpdAogCiAjZW5kaWYgLy8gRU5BQkxFKE5FVFdPUktfUFJPQ0VTUykK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL05ldHdvcmtQcm9jZXNz LmggYi9Tb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUHJvY2Vzcy5oCmluZGV4 IDhkY2YxMDY1OWVlNTY0ZGNlMWMxZjkxN2NjMTNmNGYzNDQ5ZjJlOGIuLjY5YzczZmQ0NDVlY2U4 M2E5ZDJlMzIzNjk5MzUwODBiNTU3MDFhNWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL05l dHdvcmtQcm9jZXNzL05ldHdvcmtQcm9jZXNzLmgKKysrIGIvU291cmNlL1dlYktpdDIvTmV0d29y a1Byb2Nlc3MvTmV0d29ya1Byb2Nlc3MuaApAQCAtNzMsNiArNzMsMTEgQEAgcHJpdmF0ZToKICAg ICB2b2lkIGVuc3VyZVByaXZhdGVCcm93c2luZ1Nlc3Npb24oKTsKICAgICB2b2lkIGRlc3Ryb3lQ cml2YXRlQnJvd3NpbmdTZXNzaW9uKCk7CiAKKyNpZiBFTkFCTEUoQ1VTVE9NX1BST1RPQ09MUykK KyAgICB2b2lkIHJlZ2lzdGVyU2NoZW1lRm9yQ3VzdG9tUHJvdG9jb2woY29uc3QgV1RGOjpTdHJp bmcmKTsKKyAgICB2b2lkIHVucmVnaXN0ZXJTY2hlbWVGb3JDdXN0b21Qcm90b2NvbChjb25zdCBX VEY6OlN0cmluZyYpOworI2VuZGlmCisKICAgICAvLyBUaGUgY29ubmVjdGlvbiB0byB0aGUgVUkg cHJvY2Vzcy4KICAgICBSZWZQdHI8Q29yZUlQQzo6Q29ubmVjdGlvbj4gbV91aUNvbm5lY3Rpb247 CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL05ldHdvcmtQcm9j ZXNzLm1lc3NhZ2VzLmluIGIvU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1By b2Nlc3MubWVzc2FnZXMuaW4KaW5kZXggOTdhN2ViZWZhM2FjMDFmMTlkZTcwNDdiODg5Y2I2OTUx YjMxNzFkOC4uZmQ0M2YwNWY1MGM0YmU0NzIzMGE1NWYwZWI1NmQ2NWJjMGUzNTdkOSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Byb2Nlc3MubWVzc2Fn ZXMuaW4KKysrIGIvU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Byb2Nlc3Mu bWVzc2FnZXMuaW4KQEAgLTM1LDYgKzM1LDExIEBAIG1lc3NhZ2VzIC0+IE5ldHdvcmtQcm9jZXNz IHsKICNpZiBQTEFURk9STShNQUMpCiAgICAgU2V0QXBwbGljYXRpb25Jc09jY2x1ZGVkKGJvb2wg ZmxhZykKICNlbmRpZgorCisjaWYgRU5BQkxFKENVU1RPTV9QUk9UT0NPTFMpCisgICAgUmVnaXN0 ZXJTY2hlbWVGb3JDdXN0b21Qcm90b2NvbChXVEY6OlN0cmluZyBuYW1lKQorICAgIFVucmVnaXN0 ZXJTY2hlbWVGb3JDdXN0b21Qcm90b2NvbChXVEY6OlN0cmluZyBuYW1lKQorI2VuZGlmCiB9CiAK ICNlbmRpZiAvLyBFTkFCTEUoTkVUV09SS19QUk9DRVNTKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdDIvU2hhcmVkL05ldHdvcmsvTmV0d29ya1Byb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMuY3Bw IGIvU291cmNlL1dlYktpdDIvU2hhcmVkL05ldHdvcmsvTmV0d29ya1Byb2Nlc3NDcmVhdGlvblBh cmFtZXRlcnMuY3BwCmluZGV4IDZjODAwZTk4YzNlMzM5Njk2NjZiMGRmYjg3N2IzMDU0NTI3Mzk0 YTAuLjgzYzRlMDUxNWU2YjgyMTM4MDliYjNhZjU5ZDU0ZWY3NzU2ZDA4M2IgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9OZXR3b3JrL05ldHdvcmtQcm9jZXNzQ3JlYXRpb25QYXJh bWV0ZXJzLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvTmV0d29yay9OZXR3b3JrUHJv Y2Vzc0NyZWF0aW9uUGFyYW1ldGVycy5jcHAKQEAgLTQzLDYgKzQzLDkgQEAgdm9pZCBOZXR3b3Jr UHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVyczo6ZW5jb2RlKENvcmVJUEM6OkFyZ3VtZW50RW5jb2Rl ciYgZW5jb2RlcikKICAgICBlbmNvZGVyIDw8IHVpUHJvY2Vzc0J1bmRsZUlkZW50aWZpZXI7CiAj ZW5kaWYKICAgICBlbmNvZGVyIDw8IHByaXZhdGVCcm93c2luZ0VuYWJsZWQ7CisjaWYgRU5BQkxF KENVU1RPTV9QUk9UT0NPTFMpCisgICAgZW5jb2RlciA8PCB1cmxTY2hlbWVzUmVnaXN0ZXJlZEZv ckN1c3RvbVByb3RvY29sczsKKyNlbmRpZgogfQogCiBib29sIE5ldHdvcmtQcm9jZXNzQ3JlYXRp b25QYXJhbWV0ZXJzOjpkZWNvZGUoQ29yZUlQQzo6QXJndW1lbnREZWNvZGVyKiBkZWNvZGVyLCBO ZXR3b3JrUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVycyYgcmVzdWx0KQpAQCAtNTUsNiArNTgsMTAg QEAgYm9vbCBOZXR3b3JrUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVyczo6ZGVjb2RlKENvcmVJUEM6 OkFyZ3VtZW50RGVjb2RlciogZGVjb2RlciwKICNlbmRpZgogICAgIGlmICghZGVjb2Rlci0+ZGVj b2RlKHJlc3VsdC5wcml2YXRlQnJvd3NpbmdFbmFibGVkKSkKICAgICAgICAgcmV0dXJuIGZhbHNl OworI2lmIEVOQUJMRShDVVNUT01fUFJPVE9DT0xTKQorICAgIGlmICghZGVjb2Rlci0+ZGVjb2Rl KHJlc3VsdC51cmxTY2hlbWVzUmVnaXN0ZXJlZEZvckN1c3RvbVByb3RvY29scykpCisgICAgICAg IHJldHVybiBmYWxzZTsKKyNlbmRpZgogCiAgICAgcmV0dXJuIHRydWU7CiB9CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvTmV0d29yay9OZXR3b3JrUHJvY2Vzc0NyZWF0aW9uUGFy YW1ldGVycy5oIGIvU291cmNlL1dlYktpdDIvU2hhcmVkL05ldHdvcmsvTmV0d29ya1Byb2Nlc3ND cmVhdGlvblBhcmFtZXRlcnMuaAppbmRleCAyMGM2ZDFkNzc3Yjg2ZjY2MTMxNTZjMmQzZGM5N2Rl MzkwM2VjNzIxLi45Mzg2ZjFlZjRlMjBmZmQzNDU0MGQzYjc4N2E1MGQ4MGM3MDJlNDNhIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvTmV0d29yay9OZXR3b3JrUHJvY2Vzc0NyZWF0 aW9uUGFyYW1ldGVycy5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9OZXR3b3JrL05ldHdv cmtQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzLmgKQEAgLTQ5LDYgKzQ5LDEwIEBAIHN0cnVjdCBO ZXR3b3JrUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVycyB7CiAjZW5kaWYKIAogICAgIGJvb2wgcHJp dmF0ZUJyb3dzaW5nRW5hYmxlZDsKKworI2lmIEVOQUJMRShDVVNUT01fUFJPVE9DT0xTKQorICAg IFZlY3RvcjxTdHJpbmc+IHVybFNjaGVtZXNSZWdpc3RlcmVkRm9yQ3VzdG9tUHJvdG9jb2xzOwor I2VuZGlmCiB9OwogCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9OZXR3b3JrL21hYy9OZXR3b3JrUHJvY2Vzc1Byb3h5TWFjLm1tIGIv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL05ldHdvcmsvbWFjL05ldHdvcmtQcm9jZXNzUHJveHlN YWMubW0KaW5kZXggNmI5YTM1MWZlNjAwZTdiMGYwNDM3YzkxNGNmYTZjYjcyOTI1NTM2Yi4uMGI2 ZTE0YTNkMTQyZmNhNThmN2RmMGM2NGY3ZjBkOWMwODE0YTgxMiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL05ldHdvcmsvbWFjL05ldHdvcmtQcm9jZXNzUHJveHlNYWMubW0K KysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL05ldHdvcmsvbWFjL05ldHdvcmtQcm9jZXNz UHJveHlNYWMubW0KQEAgLTI4LDYgKzI4LDcgQEAKIAogI2ltcG9ydCAiTmV0d29ya1Byb2Nlc3ND cmVhdGlvblBhcmFtZXRlcnMuaCIKICNpbXBvcnQgIk5ldHdvcmtQcm9jZXNzTWVzc2FnZXMuaCIK KyNpbXBvcnQgIldLQnJvd3NpbmdDb250ZXh0Q29udHJvbGxlckludGVybmFsLmgiCiAKICNpZiBF TkFCTEUoTkVUV09SS19QUk9DRVNTKQogCkBAIC0zOSw2ICs0MCwxMCBAQCB2b2lkIE5ldHdvcmtQ cm9jZXNzUHJveHk6OnBsYXRmb3JtSW5pdGlhbGl6ZU5ldHdvcmtQcm9jZXNzKE5ldHdvcmtQcm9j ZXNzQ3JlYXRpbwogewogICAgIHBhcmFtZXRlcnMucGFyZW50UHJvY2Vzc05hbWUgPSBbW05TUHJv Y2Vzc0luZm8gcHJvY2Vzc0luZm9dIHByb2Nlc3NOYW1lXTsKICAgICBwYXJhbWV0ZXJzLnVpUHJv Y2Vzc0J1bmRsZUlkZW50aWZpZXIgPSBbW05TQnVuZGxlIG1haW5CdW5kbGVdIGJ1bmRsZUlkZW50 aWZpZXJdOworICAgIAorICAgIE5TQXJyYXkgKnNjaGVtZXMgPSBbW1dLQnJvd3NpbmdDb250ZXh0 Q29udHJvbGxlciBjdXN0b21TY2hlbWVzXSBhbGxPYmplY3RzXTsKKyAgICBmb3IgKHNpemVfdCBp ID0gMDsgaSA8IFtzY2hlbWVzIGNvdW50XTsgKytpKQorICAgICAgICBwYXJhbWV0ZXJzLnVybFNj aGVtZXNSZWdpc3RlcmVkRm9yQ3VzdG9tUHJvdG9jb2xzLmFwcGVuZChbc2NoZW1lcyBvYmplY3RB dEluZGV4OmldKTsKIH0KIAogdm9pZCBOZXR3b3JrUHJvY2Vzc1Byb3h5OjpzZXRBcHBsaWNhdGlv bklzT2NjbHVkZWQoYm9vbCBhcHBsaWNhdGlvbklzT2NjbHVkZWQpCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViQ29udGV4dC5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvV2ViQ29udGV4dC5jcHAKaW5kZXggZjY3NDIxN2NlMDU0MzAzYmY5MjZlMTE5Y2Q1ZDJm NzEwOTAxNjMxNC4uNzczMTg3YjVmYTk4NmIxYzgwMGYwYTRlNzg3NjUzMDdiM2JkY2E4MiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYkNvbnRleHQuY3BwCisrKyBiL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJDb250ZXh0LmNwcApAQCAtMTEwNiw0ICsxMTA2LDIy IEBAIHZvaWQgV2ViQ29udGV4dDo6YWRkUGx1Z0luQXV0b1N0YXJ0T3JpZ2luSGFzaChjb25zdCBT dHJpbmcmIHBhZ2VPcmlnaW4sIHVuc2lnbmVkCiAgICAgbV9wbHVnSW5BdXRvU3RhcnRQcm92aWRl ci5hZGRBdXRvU3RhcnRPcmlnaW4ocGFnZU9yaWdpbiwgcGx1Z0luT3JpZ2luSGFzaCk7CiB9CiAK KyNpZiBFTkFCTEUoQ1VTVE9NX1BST1RPQ09MUykKK3ZvaWQgV2ViQ29udGV4dDo6cmVnaXN0ZXJT Y2hlbWVGb3JDdXN0b21Qcm90b2NvbChjb25zdCBXVEY6OlN0cmluZyYgc2NoZW1lKQoreworICAg IGlmIChtX3VzZXNOZXR3b3JrUHJvY2VzcykKKyAgICAgICAgTmV0d29ya1Byb2Nlc3NNYW5hZ2Vy OjpzaGFyZWQoKS5wcm9jZXNzKCktPnNlbmQoTWVzc2FnZXM6Ok5ldHdvcmtQcm9jZXNzOjpSZWdp c3RlclNjaGVtZUZvckN1c3RvbVByb3RvY29sKHNjaGVtZSksIDApOworICAgIGVsc2UKKyAgICAg ICAgc2VuZFRvQWxsUHJvY2Vzc2VzKE1lc3NhZ2VzOjpXZWJQcm9jZXNzOjpSZWdpc3RlclNjaGVt ZUZvckN1c3RvbVByb3RvY29sKHNjaGVtZSkpOworfQorCit2b2lkIFdlYkNvbnRleHQ6OnVucmVn aXN0ZXJTY2hlbWVGb3JDdXN0b21Qcm90b2NvbChjb25zdCBXVEY6OlN0cmluZyYgc2NoZW1lKQor eworICAgIGlmIChtX3VzZXNOZXR3b3JrUHJvY2VzcykKKyAgICAgICAgTmV0d29ya1Byb2Nlc3NN YW5hZ2VyOjpzaGFyZWQoKS5wcm9jZXNzKCktPnNlbmQoTWVzc2FnZXM6Ok5ldHdvcmtQcm9jZXNz OjpVbnJlZ2lzdGVyU2NoZW1lRm9yQ3VzdG9tUHJvdG9jb2woc2NoZW1lKSwgMCk7CisgICAgZWxz ZQorICAgICAgICBzZW5kVG9BbGxQcm9jZXNzZXMoTWVzc2FnZXM6OldlYlByb2Nlc3M6OlVucmVn aXN0ZXJTY2hlbWVGb3JDdXN0b21Qcm90b2NvbChzY2hlbWUpKTsKK30KKyNlbmRpZgorCiB9IC8v IG5hbWVzcGFjZSBXZWJLaXQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9X ZWJDb250ZXh0LmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViQ29udGV4dC5oCmluZGV4 IDRjZTE5YzM2YTNmZWNkMWNhNDlhZjA3OTdhNGU5Y2Q2MjVmYjY5ZTMuLmMzMTA0YmVkZTQ0MWE5 YzhlM2RmMGIyY2VlZTRhMWY4YjdiODM4NTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9XZWJDb250ZXh0LmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYkNv bnRleHQuaApAQCAtMzI0LDYgKzMyNCwxMSBAQCBwcml2YXRlOgogICAgIHZvaWQgdW5yZWdpc3Rl ck5vdGlmaWNhdGlvbk9ic2VydmVycygpOwogI2VuZGlmCiAKKyNpZiBFTkFCTEUoQ1VTVE9NX1BS T1RPQ09MUykKKyAgICB2b2lkIHJlZ2lzdGVyU2NoZW1lRm9yQ3VzdG9tUHJvdG9jb2woY29uc3Qg V1RGOjpTdHJpbmcmKTsKKyAgICB2b2lkIHVucmVnaXN0ZXJTY2hlbWVGb3JDdXN0b21Qcm90b2Nv bChjb25zdCBXVEY6OlN0cmluZyYpOworI2VuZGlmCisKICAgICB2b2lkIGFkZFBsdWdJbkF1dG9T dGFydE9yaWdpbkhhc2goY29uc3QgU3RyaW5nJiBwYWdlT3JpZ2luLCB1bnNpZ25lZCBwbHVnSW5P cmlnaW5IYXNoKTsKIAogICAgIENvcmVJUEM6Ok1lc3NhZ2VSZWNlaXZlck1hcCBtX21lc3NhZ2VS ZWNlaXZlck1hcDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvV2Vi Q29udGV4dE1hYy5tbSBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvV2ViQ29udGV4dE1h Yy5tbQppbmRleCA3NGJkMGU3NTI5MGYzZDYyMjg4MDRlYWJjNTZlZjI5ZTczZDUwNzliLi42MjA2 M2RlYmExY2MzMWQ0YTM1MTk3OGQ5OTRkNTMzY2VhYzdkYzc2IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1dlYkNvbnRleHRNYWMubW0KKysrIGIvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL21hYy9XZWJDb250ZXh0TWFjLm1tCkBAIC0xMjgsMTAgKzEyOCwxMiBAQCB2 b2lkIFdlYkNvbnRleHQ6OnBsYXRmb3JtSW5pdGlhbGl6ZVdlYlByb2Nlc3MoV2ViUHJvY2Vzc0Ny ZWF0aW9uUGFyYW1ldGVycyYgcGFyYQogICAgIFNhbmRib3hFeHRlbnNpb246OmNyZWF0ZUhhbmRs ZShwYXJhbWV0ZXJzLnVpUHJvY2Vzc0J1bmRsZVJlc291cmNlUGF0aCwgU2FuZGJveEV4dGVuc2lv bjo6UmVhZE9ubHksIHBhcmFtZXRlcnMudWlQcm9jZXNzQnVuZGxlUmVzb3VyY2VQYXRoRXh0ZW5z aW9uSGFuZGxlKTsKIAogICAgIHBhcmFtZXRlcnMudWlQcm9jZXNzQnVuZGxlSWRlbnRpZmllciA9 IFN0cmluZyhbW05TQnVuZGxlIG1haW5CdW5kbGVdIGJ1bmRsZUlkZW50aWZpZXJdKTsKLSAgICAK LSAgICBOU0FycmF5ICpzY2hlbWVzID0gW1tXS0Jyb3dzaW5nQ29udGV4dENvbnRyb2xsZXIgY3Vz dG9tU2NoZW1lc10gYWxsT2JqZWN0c107Ci0gICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBbc2No ZW1lcyBjb3VudF07ICsraSkKLSAgICAgICAgcGFyYW1ldGVycy51cmxTY2hlbWVzUmVnaXN0ZXJl ZEZvckN1c3RvbVByb3RvY29scy5hcHBlbmQoW3NjaGVtZXMgb2JqZWN0QXRJbmRleDppXSk7CisK KyAgICBpZiAoIW1fdXNlc05ldHdvcmtQcm9jZXNzKSB7CisgICAgICAgIE5TQXJyYXkgKnNjaGVt ZXMgPSBbW1dLQnJvd3NpbmdDb250ZXh0Q29udHJvbGxlciBjdXN0b21TY2hlbWVzXSBhbGxPYmpl Y3RzXTsKKyAgICAgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBbc2NoZW1lcyBjb3VudF07ICsr aSkKKyAgICAgICAgICAgIHBhcmFtZXRlcnMudXJsU2NoZW1lc1JlZ2lzdGVyZWRGb3JDdXN0b21Q cm90b2NvbHMuYXBwZW5kKFtzY2hlbWVzIG9iamVjdEF0SW5kZXg6aV0pOworICAgIH0KIH0KIAog dm9pZCBXZWJDb250ZXh0OjpwbGF0Zm9ybUludmFsaWRhdGVDb250ZXh0KCkKQEAgLTM0MCwxMyAr MzQyLDEzIEBAIHZvaWQgV2ViQ29udGV4dDo6cmVnaXN0ZXJOb3RpZmljYXRpb25PYnNlcnZlcnMo KQogICAgIG1fY3VzdG9tU2NoZW1lUmVnaXN0ZXJlZE9ic2VydmVyID0gW1tOU05vdGlmaWNhdGlv bkNlbnRlciBkZWZhdWx0Q2VudGVyXSBhZGRPYnNlcnZlckZvck5hbWU6V2ViS2l0OjpTY2hlbWVG b3JDdXN0b21Qcm90b2NvbFJlZ2lzdGVyZWROb3RpZmljYXRpb25OYW1lIG9iamVjdDpuaWwgcXVl dWU6W05TT3BlcmF0aW9uUXVldWUgY3VycmVudFF1ZXVlXSB1c2luZ0Jsb2NrOl4oTlNOb3RpZmlj YXRpb24gKm5vdGlmaWNhdGlvbikgewogICAgICAgICBOU1N0cmluZyAqc2NoZW1lID0gW25vdGlm aWNhdGlvbiBvYmplY3RdOwogICAgICAgICBBU1NFUlQoW3NjaGVtZSBpc0tpbmRPZkNsYXNzOltO U1N0cmluZyBjbGFzc11dKTsKLSAgICAgICAgc2VuZFRvQWxsUHJvY2Vzc2VzKE1lc3NhZ2VzOjpX ZWJQcm9jZXNzOjpSZWdpc3RlclNjaGVtZUZvckN1c3RvbVByb3RvY29sKHNjaGVtZSkpOworICAg ICAgICByZWdpc3RlclNjaGVtZUZvckN1c3RvbVByb3RvY29sKHNjaGVtZSk7CiAgICAgfV07CiAg ICAgCiAgICAgbV9jdXN0b21TY2hlbWVVbnJlZ2lzdGVyZWRPYnNlcnZlciA9IFtbTlNOb3RpZmlj YXRpb25DZW50ZXIgZGVmYXVsdENlbnRlcl0gYWRkT2JzZXJ2ZXJGb3JOYW1lOldlYktpdDo6U2No ZW1lRm9yQ3VzdG9tUHJvdG9jb2xVbnJlZ2lzdGVyZWROb3RpZmljYXRpb25OYW1lIG9iamVjdDpu aWwgcXVldWU6W05TT3BlcmF0aW9uUXVldWUgY3VycmVudFF1ZXVlXSB1c2luZ0Jsb2NrOl4oTlNO b3RpZmljYXRpb24gKm5vdGlmaWNhdGlvbikgewogICAgICAgICBOU1N0cmluZyAqc2NoZW1lID0g W25vdGlmaWNhdGlvbiBvYmplY3RdOwogICAgICAgICBBU1NFUlQoW3NjaGVtZSBpc0tpbmRPZkNs YXNzOltOU1N0cmluZyBjbGFzc11dKTsKLSAgICAgICAgc2VuZFRvQWxsUHJvY2Vzc2VzKE1lc3Nh Z2VzOjpXZWJQcm9jZXNzOjpVbnJlZ2lzdGVyU2NoZW1lRm9yQ3VzdG9tUHJvdG9jb2woc2NoZW1l KSk7CisgICAgICAgIHVucmVnaXN0ZXJTY2hlbWVGb3JDdXN0b21Qcm90b2NvbChzY2hlbWUpOwog ICAgIH1dOwogICAgIAogICAgIC8vIExpc3RlbiBmb3IgZW5oYW5jZWQgYWNjZXNzaWJpbGl0eSBj aGFuZ2VzIGFuZCBwcm9wYWdhdGUgdGhlbSB0byB0aGUgV2ViUHJvY2Vzcy4KZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvbWFjL1dlYlByb2Nlc3NNYWMubW0gYi9Tb3VyY2Uv V2ViS2l0Mi9XZWJQcm9jZXNzL21hYy9XZWJQcm9jZXNzTWFjLm1tCmluZGV4IGRmZTBiODMyMDdm MDdiOWZjZTAyMWM3OGI2ZTY4N2ZlODQ5NTFmY2IuLjlhZmVhZmUwZWZhMWQ0MGVkYmQ3ZTk4MDEz OTQ5NWQ2MTYxNmQ2ZDQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvbWFj L1dlYlByb2Nlc3NNYWMubW0KKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9tYWMvV2Vi UHJvY2Vzc01hYy5tbQpAQCAtMjgzLDYgKzI4Myw3IEBAIHZvaWQgV2ViUHJvY2Vzczo6cGxhdGZv cm1Jbml0aWFsaXplV2ViUHJvY2Vzcyhjb25zdCBXZWJQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJz CiAgICAgTWV0aG9kIG1ldGhvZFRvUGF0Y2ggPSBjbGFzc19nZXRJbnN0YW5jZU1ldGhvZChbTlNB cHBsaWNhdGlvbiBjbGFzc10sIEBzZWxlY3RvcihhY2Nlc3NpYmlsaXR5Rm9jdXNlZFVJRWxlbWVu dCkpOwogICAgIG1ldGhvZF9zZXRJbXBsZW1lbnRhdGlvbihtZXRob2RUb1BhdGNoLCAoSU1QKU5T QXBwbGljYXRpb25BY2Nlc3NpYmlsaXR5Rm9jdXNlZFVJRWxlbWVudCk7CiAgICAgCisgICAgQVNT RVJUKHBhcmFtZXRlcnMudXJsU2NoZW1lc1JlZ2lzdGVyZWRGb3JDdXN0b21Qcm90b2NvbHMuaXNF bXB0eSgpIHx8ICFtX3VzZXNOZXR3b3JrUHJvY2Vzcyk7CiAgICAgZm9yIChzaXplX3QgaSA9IDA7 IGkgPCBwYXJhbWV0ZXJzLnVybFNjaGVtZXNSZWdpc3RlcmVkRm9yQ3VzdG9tUHJvdG9jb2xzLnNp emUoKTsgKytpKQogICAgICAgICBDdXN0b21Qcm90b2NvbE1hbmFnZXI6OnNoYXJlZCgpLnJlZ2lz dGVyU2NoZW1lKHBhcmFtZXRlcnMudXJsU2NoZW1lc1JlZ2lzdGVyZWRGb3JDdXN0b21Qcm90b2Nv bHNbaV0pOwogICAgIAo=