127454 2014-01-22 16:36:04 -0800 WKBrowsingContextController should not be an API wrapper around WebPageProxy 2014-01-22 18:19:39 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 970932 0 andersca 2014-01-22 16:36:04 -0800 WKBrowsingContextController should not be an API wrapper around WebPageProxy 970934 1 221923 andersca 2014-01-22 16:36:24 -0800 Created attachment 221923 Patch 970972 2 221923 mitz 2014-01-22 18:18:39 -0800 Comment on attachment 221923 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=221923&action=review > Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextControllerInternal.h:42 > -- (void)_finishInitialization; > + (NSMutableSet *)customSchemes; > > +- (instancetype)_initWithPageRef:(WKPageRef)pageRef; > ++ (WKBrowsingContextController *)_browsingContextControllerForPageRef:(WKPageRef)pageRef; Class methods before instance methods, please. 970973 3 andersca 2014-01-22 18:19:39 -0800 Committed r162580: <http://trac.webkit.org/changeset/162580> 221923 2014-01-22 16:36:24 -0800 2014-01-22 18:18:39 -0800 Patch bug-127454-20140122163623.patch text/plain 11833 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTYyNTY0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggNjkwOGMxN2EyMTllZjc3 Yjk0Y2MxYjYyZmI2ZTc0YTM1ZDg4MWY0NS4uZWY2MzFhNjIzYzkxYTU5MWEzMTgyYWZkMzdmNDk2 OTI1ZGVlYTYzMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDM0IEBACiAyMDE0LTAxLTIyICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKKyAgICAgICAgV0tCcm93c2luZ0Nv bnRleHRDb250cm9sbGVyIHNob3VsZCBub3QgYmUgYW4gQVBJIHdyYXBwZXIgYXJvdW5kIFdlYlBh Z2VQcm94eQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTI3NDU0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg KiBTaGFyZWQvQ29jb2EvQVBJT2JqZWN0Lm1tOgorICAgICAgICAoQVBJOjpPYmplY3Q6Om5ld09i amVjdCk6CisgICAgICAgICogU2hhcmVkL21hYy9PYmpDT2JqZWN0R3JhcGhDb2RlcnMubW06Cisg ICAgICAgIChXZWJLaXQ6OldlYkNvbnRleHRPYmpDT2JqZWN0R3JhcGhEZWNvZGVySW1wbDo6ZGVj b2RlKToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0NvY29hL1dLQnJvd3NpbmdDb250ZXh0Q29u dHJvbGxlci5tbToKKyAgICAgICAgKC1bV0tCcm93c2luZ0NvbnRleHRDb250cm9sbGVyIF9pbml0 V2l0aFBhZ2VSZWY6XSk6CisgICAgICAgICgrW1dLQnJvd3NpbmdDb250ZXh0Q29udHJvbGxlciBf YnJvd3NpbmdDb250ZXh0Q29udHJvbGxlckZvclBhZ2VSZWY6XSk6CisgICAgICAgICogVUlQcm9j ZXNzL0FQSS9Db2NvYS9XS0Jyb3dzaW5nQ29udGV4dENvbnRyb2xsZXJJbnRlcm5hbC5oOgorICAg ICAgICAqIFVJUHJvY2Vzcy9BUEkvQ29jb2EvV0tQcm9jZXNzR3JvdXAubW06CisgICAgICAgIChk aWROYXZpZ2F0ZVdpdGhOYXZpZ2F0aW9uRGF0YSk6CisgICAgICAgIChkaWRQZXJmb3JtQ2xpZW50 UmVkaXJlY3QpOgorICAgICAgICAoZGlkUGVyZm9ybVNlcnZlclJlZGlyZWN0KToKKyAgICAgICAg KGRpZFVwZGF0ZUhpc3RvcnlUaXRsZSk6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9pb3MvV0tD b250ZW50Vmlldy5tbToKKyAgICAgICAgKC1bV0tDb250ZW50VmlldyBicm93c2luZ0NvbnRleHRD b250cm9sbGVyXSk6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9tYWMvV0tWaWV3Lm1tOgorICAg ICAgICAoLVtXS1ZpZXcgYnJvd3NpbmdDb250ZXh0Q29udHJvbGxlcl0pOgorICAgICAgICAqIFVJ UHJvY2Vzcy9pb3MvV2ViUGFnZVByb3h5SU9TLm1tOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdl UHJveHk6OnBsYXRmb3JtSW5pdGlhbGl6ZSk6CisgICAgICAgICogVUlQcm9jZXNzL21hYy9XZWJQ YWdlUHJveHlNYWMubW06CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6cGxhdGZvcm1J bml0aWFsaXplKToKKworMjAxNC0wMS0yMiAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBw bGUuY29tPgorCiAgICAgICAgIFdLUHJvY2Vzc0NsYXNzIHNob3VsZCBjcmVhdGUgYSBXZWJDb250 ZXh0CiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjc0 NDkKICAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzE1ODg1NTgyPgpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdDIvU2hhcmVkL0NvY29hL0FQSU9iamVjdC5tbSBiL1NvdXJjZS9XZWJLaXQyL1NoYXJl ZC9Db2NvYS9BUElPYmplY3QubW0KaW5kZXggMjI2YTY4MTc2MmU3ZmE0ZDkyMzkxNjE5ODllZGY5 ODg5NWQ5OWY1My4uMmU1NTgyMDEwMTFlMzQyYTUxMTdkNWQwZTQ1NzM4YTA2N2M1YTQwOCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdDIvU2hhcmVkL0NvY29hL0FQSU9iamVjdC5tbQorKysgYi9T b3VyY2UvV2ViS2l0Mi9TaGFyZWQvQ29jb2EvQVBJT2JqZWN0Lm1tCkBAIC0xMjAsMTAgKzEyMCw2 IEBAIHZvaWQqIE9iamVjdDo6bmV3T2JqZWN0KHNpemVfdCBzaXplLCBUeXBlIHR5cGUpCiAgICAg ICAgIHdyYXBwZXIgPSBbV0tOYXZpZ2F0aW9uRGF0YSBhbGxvY107CiAgICAgICAgIGJyZWFrOwog Ci0gICAgY2FzZSBUeXBlOjpQYWdlOgotICAgICAgICB3cmFwcGVyID0gW1dLQnJvd3NpbmdDb250 ZXh0Q29udHJvbGxlciBhbGxvY107Ci0gICAgICAgIGJyZWFrOwotCiAgICAgY2FzZSBUeXBlOjpQ YWdlR3JvdXA6CiAgICAgICAgIHdyYXBwZXIgPSBbV0tCcm93c2luZ0NvbnRleHRHcm91cCBhbGxv Y107CiAgICAgICAgIGJyZWFrOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvU2hhcmVkL21h Yy9PYmpDT2JqZWN0R3JhcGhDb2RlcnMubW0gYi9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvbWFjL09i akNPYmplY3RHcmFwaENvZGVycy5tbQppbmRleCAyY2U5MjJmMGUxYzdkZmIwMTg2ZWQzZDEwY2I1 ZDZhODM5OWZiZDhhLi5iZjUxYzA3ZTdhOTVhNzFkYWNhZTBjZDg4NmFmYTI3ZjZjMmMxMDliIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvbWFjL09iakNPYmplY3RHcmFwaENvZGVy cy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvbWFjL09iakNPYmplY3RHcmFwaENvZGVy cy5tbQpAQCAtMzUxLDcgKzM1MSw3IEBAIHB1YmxpYzoKICAgICAgICAgICAgIGlmICghd2ViUGFn ZSkKICAgICAgICAgICAgICAgICBjb2Rlci5tX3Jvb3QgPSBbTlNOdWxsIG51bGxdOwogICAgICAg ICAgICAgZWxzZSAKLSAgICAgICAgICAgICAgICBjb2Rlci5tX3Jvb3QgPSB3cmFwcGVyKCp3ZWJQ YWdlKTsKKyAgICAgICAgICAgICAgICBjb2Rlci5tX3Jvb3QgPSBbV0tCcm93c2luZ0NvbnRleHRD b250cm9sbGVyIF9icm93c2luZ0NvbnRleHRDb250cm9sbGVyRm9yUGFnZVJlZjp0b0FQSSh3ZWJQ YWdlKV07CiAgICAgICAgICAgICBicmVhazsKICAgICAgICAgfQogICAgICAgICBjYXNlIFdLVHlw ZVJlZldyYXBwZXJUeXBlOiB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv QVBJL0NvY29hL1dLQnJvd3NpbmdDb250ZXh0Q29udHJvbGxlci5tbSBiL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tCcm93c2luZ0NvbnRleHRDb250cm9sbGVyLm1tCmluZGV4 IGE1Njk4M2FhYzNkZTk3YjE0MTI0ZmJlN2ZjNTRkZjk2MzcyYTkwODYuLmNlMzM0MWQ3NTI4MmQ0 MWQ2N2Q5Mzc0OGU0ZjE0YmJjMTk5YzFiM2EgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9BUEkvQ29jb2EvV0tCcm93c2luZ0NvbnRleHRDb250cm9sbGVyLm1tCisrKyBiL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tCcm93c2luZ0NvbnRleHRDb250cm9s bGVyLm1tCkBAIC0xMzksNyArMTM5LDcgQEAgc3RhdGljIE5TU3RyaW5nICogY29uc3QgZnJhbWVF cnJvcktleSA9IEAiV0tCcm93c2luZ0NvbnRleHRGcmFtZUVycm9yS2V5IjsKIEBlbmQKIAogQGlt cGxlbWVudGF0aW9uIFdLQnJvd3NpbmdDb250ZXh0Q29udHJvbGxlciB7Ci0gICAgQVBJOjpPYmpl Y3RTdG9yYWdlPFdlYlBhZ2VQcm94eT4gX3BhZ2U7CisgICAgUmVmUHRyPFdlYlBhZ2VQcm94eT4g X3BhZ2U7CiAgICAgc3RkOjp1bmlxdWVfcHRyPFBhZ2VMb2FkU3RhdGVPYnNlcnZlcj4gX3BhZ2VM b2FkU3RhdGVPYnNlcnZlcjsKIAogICAgIFdlYWtPYmpDUHRyPGlkIDxXS0Jyb3dzaW5nQ29udGV4 dExvYWREZWxlZ2F0ZT4+IF9sb2FkRGVsZWdhdGU7CkBAIC0xNTgsMTIgKzE1OCw2IEBAIHN0YXRp YyBOU1N0cmluZyAqIGNvbnN0IGZyYW1lRXJyb3JLZXkgPSBAIldLQnJvd3NpbmdDb250ZXh0RnJh bWVFcnJvcktleSI7CiAgICAgW3N1cGVyIGRlYWxsb2NdOwogfQogCi0tICh2b2lkKV9maW5pc2hJ bml0aWFsaXphdGlvbgotewotICAgIF9wYWdlTG9hZFN0YXRlT2JzZXJ2ZXIgPSBzdGQ6Om1ha2Vf dW5pcXVlPFBhZ2VMb2FkU3RhdGVPYnNlcnZlcj4oc2VsZik7Ci0gICAgX3BhZ2UtPnBhZ2VMb2Fk U3RhdGUoKS5hZGRPYnNlcnZlcigqX3BhZ2VMb2FkU3RhdGVPYnNlcnZlcik7Ci19Ci0KICNwcmFn bWEgbWFyayBMb2FkaW5nCiAKICsgKHZvaWQpcmVnaXN0ZXJTY2hlbWVGb3JDdXN0b21Qcm90b2Nv bDooTlNTdHJpbmcgKilzY2hlbWUKQEAgLTc5Nyw2ICs3OTEsMjQgQEAgc3RhdGljIHZvaWQgc2V0 VXBQYWdlUG9saWN5Q2xpZW50KFdLQnJvd3NpbmdDb250ZXh0Q29udHJvbGxlciAqYnJvd3NpbmdD b250ZXh0LAogICAgIHJldHVybiAqcmVpbnRlcnByZXRfY2FzdDxBUEk6Ok9iamVjdCo+KCZfcGFn ZSk7CiB9CiAKKy0gKGluc3RhbmNldHlwZSlfaW5pdFdpdGhQYWdlUmVmOihXS1BhZ2VSZWYpcGFn ZVJlZgoreworICAgIGlmICghKHNlbGYgPSBbc3VwZXIgaW5pdF0pKQorICAgICAgICByZXR1cm4g bmlsOworCisgICAgX3BhZ2UgPSB0b0ltcGwocGFnZVJlZik7CisKKyAgICBfcGFnZUxvYWRTdGF0 ZU9ic2VydmVyID0gc3RkOjptYWtlX3VuaXF1ZTxQYWdlTG9hZFN0YXRlT2JzZXJ2ZXI+KHNlbGYp OworICAgIF9wYWdlLT5wYWdlTG9hZFN0YXRlKCkuYWRkT2JzZXJ2ZXIoKl9wYWdlTG9hZFN0YXRl T2JzZXJ2ZXIpOworCisgICAgcmV0dXJuIHNlbGY7Cit9CisKKysgKFdLQnJvd3NpbmdDb250ZXh0 Q29udHJvbGxlciAqKV9icm93c2luZ0NvbnRleHRDb250cm9sbGVyRm9yUGFnZVJlZjooV0tQYWdl UmVmKXBhZ2VSZWYKK3sKKyAgICByZXR1cm4gKFdLQnJvd3NpbmdDb250ZXh0Q29udHJvbGxlciAq KVdlYktpdDo6dG9JbXBsKHBhZ2VSZWYpLT5sb2FkZXJDbGllbnQoKS5jbGllbnQoKS5iYXNlLmNs aWVudEluZm87Cit9CisKIEBlbmQKIAogQGltcGxlbWVudGF0aW9uIFdLQnJvd3NpbmdDb250ZXh0 Q29udHJvbGxlciAoUHJpdmF0ZSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9BUEkvQ29jb2EvV0tCcm93c2luZ0NvbnRleHRDb250cm9sbGVySW50ZXJuYWwuaCBiL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tCcm93c2luZ0NvbnRleHRDb250cm9sbGVy SW50ZXJuYWwuaAppbmRleCAxZDdhMGY3ODFhMjQ0ODY2NmQ2N2I4MDlmMjRhM2I0MDZhNjBkMWI2 Li4zMDU4YTU5OGRiMjkwMjIxZDg4NGRhMWMxZjdmNTI5NzYwZWI4NTBiIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLQnJvd3NpbmdDb250ZXh0Q29udHJv bGxlckludGVybmFsLmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9X S0Jyb3dzaW5nQ29udGV4dENvbnRyb2xsZXJJbnRlcm5hbC5oCkBAIC0zMSwyNCArMzEsMTYgQEAK ICNpbXBvcnQgIldlYWtPYmpDUHRyLmgiCiAjaW1wb3J0ICJXZWJQYWdlUHJveHkuaCIKIAotbmFt ZXNwYWNlIFdlYktpdCB7Ci0KLWlubGluZSBXS0Jyb3dzaW5nQ29udGV4dENvbnRyb2xsZXIgKndy YXBwZXIoV2ViUGFnZVByb3h5JiBwYWdlKQotewotICAgIEFTU0VSVChbcGFnZS53cmFwcGVyKCkg aXNLaW5kT2ZDbGFzczpbV0tCcm93c2luZ0NvbnRleHRDb250cm9sbGVyIGNsYXNzXV0pOwotICAg IHJldHVybiAoV0tCcm93c2luZ0NvbnRleHRDb250cm9sbGVyICopcGFnZS53cmFwcGVyKCk7Ci19 Ci0KLX0KLQogQGludGVyZmFjZSBXS0Jyb3dzaW5nQ29udGV4dENvbnRyb2xsZXIgKCkgPFdLT2Jq ZWN0PiB7CiBAcGFja2FnZQogICAgIFdlYktpdDo6V2Vha09iakNQdHI8aWQgPFdLQnJvd3NpbmdD b250ZXh0SGlzdG9yeURlbGVnYXRlPj4gX2hpc3RvcnlEZWxlZ2F0ZTsKIH0KIAotLSAodm9pZClf ZmluaXNoSW5pdGlhbGl6YXRpb247CiArIChOU011dGFibGVTZXQgKiljdXN0b21TY2hlbWVzOwog CistIChpbnN0YW5jZXR5cGUpX2luaXRXaXRoUGFnZVJlZjooV0tQYWdlUmVmKXBhZ2VSZWY7Cisr IChXS0Jyb3dzaW5nQ29udGV4dENvbnRyb2xsZXIgKilfYnJvd3NpbmdDb250ZXh0Q29udHJvbGxl ckZvclBhZ2VSZWY6KFdLUGFnZVJlZilwYWdlUmVmOworCiBAZW5kCiAKICNlbmRpZiAvLyBXS19B UElfRU5BQkxFRApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2Nv YS9XS1Byb2Nlc3NHcm91cC5tbSBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2Ev V0tQcm9jZXNzR3JvdXAubW0KaW5kZXggZTljZTg0YzRkNzczOGY3NTVhYmRmMWVjYTBiOTU1ZDRl MDMxMDVhZi4uNTA5YWNhNTBlYzFkYmVkODNhOTUyNDY1ZDhkYzlkMjI2NDZmNmYyZiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1Byb2Nlc3NHcm91cC5t bQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLUHJvY2Vzc0dyb3Vw Lm1tCkBAIC0xMTUsNyArMTE1LDcgQEAgc3RhdGljIHZvaWQgZGlkTmF2aWdhdGVXaXRoTmF2aWdh dGlvbkRhdGEoV0tDb250ZXh0UmVmLCBXS1BhZ2VSZWYgcGFnZVJlZiwgV0tOYXYKICAgICBpZiAo IXRvSW1wbChmcmFtZVJlZiktPmlzTWFpbkZyYW1lKCkpCiAgICAgICAgIHJldHVybjsKIAotICAg IFdLQnJvd3NpbmdDb250ZXh0Q29udHJvbGxlciAqY29udHJvbGxlciA9IHdyYXBwZXIoKnRvSW1w bChwYWdlUmVmKSk7CisgICAgV0tCcm93c2luZ0NvbnRleHRDb250cm9sbGVyICpjb250cm9sbGVy ID0gW1dLQnJvd3NpbmdDb250ZXh0Q29udHJvbGxlciBfYnJvd3NpbmdDb250ZXh0Q29udHJvbGxl ckZvclBhZ2VSZWY6cGFnZVJlZl07CiAgICAgYXV0byBoaXN0b3J5RGVsZWdhdGUgPSBjb250cm9s bGVyLT5faGlzdG9yeURlbGVnYXRlLmdldCgpOwogCiAgICAgaWYgKFtoaXN0b3J5RGVsZWdhdGUg cmVzcG9uZHNUb1NlbGVjdG9yOkBzZWxlY3Rvcihicm93c2luZ0NvbnRleHRDb250cm9sbGVyOmRp ZE5hdmlnYXRlV2l0aE5hdmlnYXRpb25EYXRhOildKQpAQCAtMTI3LDcgKzEyNyw3IEBAIHN0YXRp YyB2b2lkIGRpZFBlcmZvcm1DbGllbnRSZWRpcmVjdChXS0NvbnRleHRSZWYsIFdLUGFnZVJlZiBw YWdlUmVmLCBXS1VSTFJlZiBzCiAgICAgaWYgKCF0b0ltcGwoZnJhbWVSZWYpLT5pc01haW5GcmFt ZSgpKQogICAgICAgICByZXR1cm47CiAKLSAgICBXS0Jyb3dzaW5nQ29udGV4dENvbnRyb2xsZXIg KmNvbnRyb2xsZXIgPSB3cmFwcGVyKCp0b0ltcGwocGFnZVJlZikpOworICAgIFdLQnJvd3NpbmdD b250ZXh0Q29udHJvbGxlciAqY29udHJvbGxlciA9IFtXS0Jyb3dzaW5nQ29udGV4dENvbnRyb2xs ZXIgX2Jyb3dzaW5nQ29udGV4dENvbnRyb2xsZXJGb3JQYWdlUmVmOnBhZ2VSZWZdOwogICAgIGF1 dG8gaGlzdG9yeURlbGVnYXRlID0gY29udHJvbGxlci0+X2hpc3RvcnlEZWxlZ2F0ZS5nZXQoKTsK IAogICAgIGlmIChbaGlzdG9yeURlbGVnYXRlIHJlc3BvbmRzVG9TZWxlY3RvcjpAc2VsZWN0b3Io YnJvd3NpbmdDb250ZXh0Q29udHJvbGxlcjpkaWRQZXJmb3JtQ2xpZW50UmVkaXJlY3RGcm9tVVJM OnRvVVJMOildKQpAQCAtMTM5LDcgKzEzOSw3IEBAIHN0YXRpYyB2b2lkIGRpZFBlcmZvcm1TZXJ2 ZXJSZWRpcmVjdChXS0NvbnRleHRSZWYsIFdLUGFnZVJlZiBwYWdlUmVmLCBXS1VSTFJlZiBzCiAg ICAgaWYgKCF0b0ltcGwoZnJhbWVSZWYpLT5pc01haW5GcmFtZSgpKQogICAgICAgICByZXR1cm47 CiAKLSAgICBXS0Jyb3dzaW5nQ29udGV4dENvbnRyb2xsZXIgKmNvbnRyb2xsZXIgPSB3cmFwcGVy KCp0b0ltcGwocGFnZVJlZikpOworICAgIFdLQnJvd3NpbmdDb250ZXh0Q29udHJvbGxlciAqY29u dHJvbGxlciA9IFtXS0Jyb3dzaW5nQ29udGV4dENvbnRyb2xsZXIgX2Jyb3dzaW5nQ29udGV4dENv bnRyb2xsZXJGb3JQYWdlUmVmOnBhZ2VSZWZdOwogICAgIGF1dG8gaGlzdG9yeURlbGVnYXRlID0g Y29udHJvbGxlci0+X2hpc3RvcnlEZWxlZ2F0ZS5nZXQoKTsKIAogICAgIGlmIChbaGlzdG9yeURl bGVnYXRlIHJlc3BvbmRzVG9TZWxlY3RvcjpAc2VsZWN0b3IoYnJvd3NpbmdDb250ZXh0Q29udHJv bGxlcjpkaWRQZXJmb3JtU2VydmVyUmVkaXJlY3RGcm9tVVJMOnRvVVJMOildKQpAQCAtMTUxLDcg KzE1MSw3IEBAIHN0YXRpYyB2b2lkIGRpZFVwZGF0ZUhpc3RvcnlUaXRsZShXS0NvbnRleHRSZWYs IFdLUGFnZVJlZiBwYWdlUmVmLCBXS1N0cmluZ1JlZiB0CiAgICAgaWYgKCF0b0ltcGwoZnJhbWVS ZWYpLT5pc01haW5GcmFtZSgpKQogICAgICAgICByZXR1cm47CiAKLSAgICBXS0Jyb3dzaW5nQ29u dGV4dENvbnRyb2xsZXIgKmNvbnRyb2xsZXIgPSB3cmFwcGVyKCp0b0ltcGwocGFnZVJlZikpOwor ICAgIFdLQnJvd3NpbmdDb250ZXh0Q29udHJvbGxlciAqY29udHJvbGxlciA9IFtXS0Jyb3dzaW5n Q29udGV4dENvbnRyb2xsZXIgX2Jyb3dzaW5nQ29udGV4dENvbnRyb2xsZXJGb3JQYWdlUmVmOnBh Z2VSZWZdOwogICAgIGF1dG8gaGlzdG9yeURlbGVnYXRlID0gY29udHJvbGxlci0+X2hpc3RvcnlE ZWxlZ2F0ZS5nZXQoKTsKIAogICAgIGlmIChbaGlzdG9yeURlbGVnYXRlIHJlc3BvbmRzVG9TZWxl Y3RvcjpAc2VsZWN0b3IoYnJvd3NpbmdDb250ZXh0Q29udHJvbGxlcjpkaWRVcGRhdGVIaXN0b3J5 VGl0bGU6Zm9yVVJMOildKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQ SS9pb3MvV0tDb250ZW50Vmlldy5tbSBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvaW9z L1dLQ29udGVudFZpZXcubW0KaW5kZXggNjFhMTZjYjBmZGZiY2RlNWFiNDU0MDc3ZmUxOGRiOTk3 MjQzZTRmNy4uZTlkMDlhODFkMjI3MGI3NDA1NmFiZWVkOWU2MTU0ZWNlZDAwNTJlZiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9pb3MvV0tDb250ZW50Vmlldy5tbQor KysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2lvcy9XS0NvbnRlbnRWaWV3Lm1tCkBA IC00OSw2ICs0OSw3IEBAIHVzaW5nIG5hbWVzcGFjZSBXZWJLaXQ7CiBAaW1wbGVtZW50YXRpb24g V0tDb250ZW50VmlldyB7CiAgICAgc3RkOjp1bmlxdWVfcHRyPFBhZ2VDbGllbnRJbXBsPiBfcGFn ZUNsaWVudDsKICAgICBSZWZQdHI8V2ViUGFnZVByb3h5PiBfcGFnZTsKKyAgICBSZXRhaW5QdHI8 V0tCcm93c2luZ0NvbnRleHRDb250cm9sbGVyPiBfYnJvd3NpbmdDb250ZXh0Q29udHJvbGxlcjsK IAogICAgIFJldGFpblB0cjxVSVZpZXc+IF9yb290Q29udGVudFZpZXc7CiAgICAgUmV0YWluUHRy PFdLSW50ZXJhY3Rpb25WaWV3PiBfaW50ZXJhY3Rpb25WaWV3OwpAQCAtMTE2LDcgKzExNywxMCBA QCB1c2luZyBuYW1lc3BhY2UgV2ViS2l0OwogCiAtIChXS0Jyb3dzaW5nQ29udGV4dENvbnRyb2xs ZXIgKilicm93c2luZ0NvbnRleHRDb250cm9sbGVyCiB7Ci0gICAgcmV0dXJuIHdyYXBwZXIoKl9w YWdlKTsKKyAgICBpZiAoIV9icm93c2luZ0NvbnRleHRDb250cm9sbGVyKQorICAgICAgICBfYnJv d3NpbmdDb250ZXh0Q29udHJvbGxlciA9IFtbV0tCcm93c2luZ0NvbnRleHRDb250cm9sbGVyIGFs bG9jXSBfaW5pdFdpdGhQYWdlUmVmOnRvQVBJKF9wYWdlLmdldCgpKV07CisKKyAgICByZXR1cm4g X2Jyb3dzaW5nQ29udGV4dENvbnRyb2xsZXIuZ2V0KCk7CiB9CiAKIC0gKFdLQ29udGVudFR5cGUp Y29udGVudFR5cGUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvbWFj L1dLVmlldy5tbSBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvbWFjL1dLVmlldy5tbQpp bmRleCBmM2Q0OTEyMTlmZDg5YTU3MWU1YWZmOTFiYWJhYjY4YTE3YTU1OTNjLi5kMjAzNzM3ZjA0 ZGE1NDJiZDI2ODJkMzQzNzJkYTE1YjNmNjhlNmY1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvQVBJL21hYy9XS1ZpZXcubW0KKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL0FQSS9tYWMvV0tWaWV3Lm1tCkBAIC0xNDUsNiArMTQ1LDEwIEBAIHN0cnVjdCBXS1ZpZXdJ bnRlcnByZXRLZXlFdmVudHNQYXJhbWV0ZXJzIHsKICAgICBzdGQ6OnVuaXF1ZV9wdHI8UGFnZUNs aWVudEltcGw+IF9wYWdlQ2xpZW50OwogICAgIFJlZlB0cjxXZWJQYWdlUHJveHk+IF9wYWdlOwog CisjaWYgV0tfQVBJX0VOQUJMRUQKKyAgICBSZXRhaW5QdHI8V0tCcm93c2luZ0NvbnRleHRDb250 cm9sbGVyPiBfYnJvd3NpbmdDb250ZXh0Q29udHJvbGxlcjsKKyNlbmRpZgorCiAgICAgLy8gRm9y IFRvb2xUaXBzLgogICAgIE5TVG9vbFRpcFRhZyBfbGFzdFRvb2xUaXBUYWc7CiAgICAgaWQgX3Ry YWNraW5nUmVjdE93bmVyOwpAQCAtMjg0LDcgKzI4OCwxMCBAQCBzdHJ1Y3QgV0tWaWV3SW50ZXJw cmV0S2V5RXZlbnRzUGFyYW1ldGVycyB7CiAKIC0gKFdLQnJvd3NpbmdDb250ZXh0Q29udHJvbGxl ciAqKWJyb3dzaW5nQ29udGV4dENvbnRyb2xsZXIKIHsKLSAgICByZXR1cm4gd3JhcHBlcigqX2Rh dGEtPl9wYWdlKTsKKyAgICBpZiAoIV9kYXRhLT5fYnJvd3NpbmdDb250ZXh0Q29udHJvbGxlcikK KyAgICAgICAgX2RhdGEtPl9icm93c2luZ0NvbnRleHRDb250cm9sbGVyID0gW1tXS0Jyb3dzaW5n Q29udGV4dENvbnRyb2xsZXIgYWxsb2NdIF9pbml0V2l0aFBhZ2VSZWY6dG9BUEkoX2RhdGEtPl9w YWdlLmdldCgpKV07CisKKyAgICByZXR1cm4gX2RhdGEtPl9icm93c2luZ0NvbnRleHRDb250cm9s bGVyLmdldCgpOwogfQogCiAjZW5kaWYgLy8gV0tfQVBJX0VOQUJMRUQKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9pb3MvV2ViUGFnZVByb3h5SU9TLm1tIGIvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL2lvcy9XZWJQYWdlUHJveHlJT1MubW0KaW5kZXggNmJjZTU0OTM2YTMz YjY1N2I2Yzg4MjQ3MDQxNzI5YjYxOWVhZTk3ZS4uZjFlODc1OGNkNDU0MDJiNzY4Yjk3ZDc0YzU2 YTEzY2JkZDJjMGJiYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2lvcy9X ZWJQYWdlUHJveHlJT1MubW0KKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2lvcy9XZWJQ YWdlUHJveHlJT1MubW0KQEAgLTQyLDkgKzQyLDYgQEAgbmFtZXNwYWNlIFdlYktpdCB7CiAKIHZv aWQgV2ViUGFnZVByb3h5OjpwbGF0Zm9ybUluaXRpYWxpemUoKQogewotI2lmIFdLX0FQSV9FTkFC TEVECi0gICAgW1dlYktpdDo6d3JhcHBlcigqdGhpcykgX2ZpbmlzaEluaXRpYWxpemF0aW9uXTsK LSNlbmRpZgogfQogCiBzdGF0aWMgU3RyaW5nIHVzZXJWaXNpYmxlV2ViS2l0VmVyc2lvblN0cmlu ZygpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1dlYlBhZ2VQcm94 eU1hYy5tbSBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvV2ViUGFnZVByb3h5TWFjLm1t CmluZGV4IDgxYmFjZTdlZGQ4NjZjOTkxYTQ5NWIzYWM2NzVlODU0NDhkMDdmZDguLjJlOTEzMmJk NTkzM2NlY2QzMjcwYjk0NDFjZGNhOTY3YWQ2MDM5MzUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9tYWMvV2ViUGFnZVByb3h5TWFjLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9tYWMvV2ViUGFnZVByb3h5TWFjLm1tCkBAIC02OSwxMCArNjksNiBAQCBzdGF0 aWMgYm9vbCBzaG91bGRVc2VMZWdhY3lJbXBsaWNpdFJ1YmJlckJhbmRDb250cm9sKCkKIHZvaWQg V2ViUGFnZVByb3h5OjpwbGF0Zm9ybUluaXRpYWxpemUoKQogewogICAgIG1fdXNlTGVnYWN5SW1w bGljaXRSdWJiZXJCYW5kQ29udHJvbCA9IHNob3VsZFVzZUxlZ2FjeUltcGxpY2l0UnViYmVyQmFu ZENvbnRyb2woKTsKLQotI2lmIFdLX0FQSV9FTkFCTEVECi0gICAgW1dlYktpdDo6d3JhcHBlcigq dGhpcykgX2ZpbmlzaEluaXRpYWxpemF0aW9uXTsKLSNlbmRpZgogfQogCiBzdGF0aWMgU3RyaW5n IHVzZXJWaXNpYmxlV2ViS2l0VmVyc2lvblN0cmluZygpCg==