134609 2014-07-03 13:53:30 -0700 Get rid of WebPageProxyCF.cpp 2014-07-03 14:04:28 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca bunhere cdumez commit-queue gyuyoung.kim sergio oldest_to_newest 1020365 0 andersca 2014-07-03 13:53:30 -0700 Get rid of WebPageProxyCF.cpp 1020366 1 234370 andersca 2014-07-03 13:53:44 -0700 Created attachment 234370 Patch 1020372 2 andersca 2014-07-03 14:04:28 -0700 Committed r170768: <http://trac.webkit.org/changeset/170768> 234370 2014-07-03 13:53:44 -0700 2014-07-03 13:54:51 -0700 Patch bug-134609-20140703135326.patch text/plain 10374 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTcwNzY3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggYTcyYzdlOGQzMjAyOWRj NWMwODUwZmUyMTNkNDlmZWIwZjE5OGEyYy4uN2Q4MWEwODJkZTNhOGMyZDM0ZTllNmRkMDlkMTYz NzI0NjhkYWRlYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDE0LTA3LTAzICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKKyAgICAgICAgR2V0IHJpZCBvZiBX ZWJQYWdlUHJveHlDRi5jcHAKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTEzNDYwOQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgICogVUlQcm9jZXNzL2NmL1dlYlBhZ2VQcm94eUNGLmNwcDogUmVtb3ZlZC4KKyAg ICAgICAgKiBVSVByb2Nlc3MvbWFjL1dlYlBhZ2VQcm94eU1hYy5tbToKKyAgICAgICAgKFdlYktp dDo6YXV0b3NhdmVLZXkpOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OnNhdmVSZWNl bnRTZWFyY2hlcyk6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6bG9hZFJlY2VudFNl YXJjaGVzKToKKyAgICAgICAgKiBXZWJLaXQyLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2o6CisK IDIwMTQtMDctMDMgIFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CiAKICAg ICAgICAgW1dLMl0gUmV2aXNlIHRoZSBmbGF0IGZpbmQgaW5kaWNhdG9yIHNlY29uZGFyeSBoaWdo bGlnaHQgc2hhZG93cwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2NmL1dl YlBhZ2VQcm94eUNGLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9jZi9XZWJQYWdlUHJv eHlDRi5jcHAKZGVsZXRlZCBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDQzN2ZkYTM2ZTNlNDNmYzEz ZWQwYmRjNTZiMmUzYjhkOTVmOTQ4YjEuLjAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2NmL1dlYlBhZ2VQcm94eUNG LmNwcAorKysgL2Rldi9udWxsCkBAIC0xLDc4ICswLDAgQEAKLS8qCi0gKiBDb3B5cmlnaHQgKEMp IDIwMTAsIDIwMTEgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgotICoKLSAqIFJlZGlz dHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0 aG91dAotICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZv bGxvd2luZyBjb25kaXRpb25zCi0gKiBhcmUgbWV0OgotICogMS4gUmVkaXN0cmlidXRpb25zIG9m IHNvdXJjZSBjb2RlIG11c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQKLSAqICAgIG5vdGlj ZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lci4K LSAqIDIuIFJlZGlzdHJpYnV0aW9ucyBpbiBiaW5hcnkgZm9ybSBtdXN0IHJlcHJvZHVjZSB0aGUg YWJvdmUgY29weXJpZ2h0Ci0gKiAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFu ZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIgaW4gdGhlCi0gKiAgICBkb2N1bWVudGF0aW9uIGFu ZC9vciBvdGhlciBtYXRlcmlhbHMgcHJvdmlkZWQgd2l0aCB0aGUgZGlzdHJpYnV0aW9uLgotICoK LSAqIFRISVMgU09GVFdBUkUgSVMgUFJPVklERUQgQlkgQVBQTEUgSU5DLiBBTkQgSVRTIENPTlRS SUJVVE9SUyBgYEFTIElTJycKLSAqIEFORCBBTlkgRVhQUkVTUyBPUiBJTVBMSUVEIFdBUlJBTlRJ RVMsIElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLAotICogVEhFIElNUExJRUQgV0FSUkFO VElFUyBPRiBNRVJDSEFOVEFCSUxJVFkgQU5EIEZJVE5FU1MgRk9SIEEgUEFSVElDVUxBUgotICog UFVSUE9TRSBBUkUgRElTQ0xBSU1FRC4gSU4gTk8gRVZFTlQgU0hBTEwgQVBQTEUgSU5DLiBPUiBJ VFMgQ09OVFJJQlVUT1JTCi0gKiBCRSBMSUFCTEUgRk9SIEFOWSBESVJFQ1QsIElORElSRUNULCBJ TkNJREVOVEFMLCBTUEVDSUFMLCBFWEVNUExBUlksIE9SCi0gKiBDT05TRVFVRU5USUFMIERBTUFH RVMgKElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLCBQUk9DVVJFTUVOVCBPRgotICogU1VC U1RJVFVURSBHT09EUyBPUiBTRVJWSUNFUzsgTE9TUyBPRiBVU0UsIERBVEEsIE9SIFBST0ZJVFM7 IE9SIEJVU0lORVNTCi0gKiBJTlRFUlJVUFRJT04pIEhPV0VWRVIgQ0FVU0VEIEFORCBPTiBBTlkg VEhFT1JZIE9GIExJQUJJTElUWSwgV0hFVEhFUiBJTgotICogQ09OVFJBQ1QsIFNUUklDVCBMSUFC SUxJVFksIE9SIFRPUlQgKElOQ0xVRElORyBORUdMSUdFTkNFIE9SIE9USEVSV0lTRSkKLSAqIEFS SVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRSBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElG IEFEVklTRUQgT0YKLSAqIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KLSAqLwotCi0j aW5jbHVkZSAiY29uZmlnLmgiCi0jaW5jbHVkZSAiV2ViUGFnZVByb3h5LmgiCi0KLSNpbmNsdWRl IDx3dGYvUmV0YWluUHRyLmg+Ci0jaW5jbHVkZSA8d3RmL2NmL1R5cGVDYXN0cy5oPgotCi11c2lu ZyBuYW1lc3BhY2UgV2ViQ29yZTsKLQotbmFtZXNwYWNlIFdlYktpdCB7Ci0KLXN0YXRpYyBSZXRh aW5QdHI8Q0ZTdHJpbmdSZWY+IGF1dG9zYXZlS2V5KGNvbnN0IFN0cmluZyYgbmFtZSkKLXsKLSAg ICByZXR1cm4gU3RyaW5nKCJjb20uYXBwbGUuV2ViS2l0LnNlYXJjaEZpZWxkOiIgKyBuYW1lKS5j cmVhdGVDRlN0cmluZygpOwotfQotCi12b2lkIFdlYlBhZ2VQcm94eTo6c2F2ZVJlY2VudFNlYXJj aGVzKGNvbnN0IFN0cmluZyYgbmFtZSwgY29uc3QgVmVjdG9yPFN0cmluZz4mIHNlYXJjaEl0ZW1z KQotewotICAgIGlmICghbmFtZSkgewotICAgICAgICAvLyBGSVhNRTogVGhpcyBzaG91bGQgYmUg YSBtZXNzYWdlIGNoZWNrLgotICAgICAgICByZXR1cm47Ci0gICAgfQotCi0gICAgUmV0YWluUHRy PENGTXV0YWJsZUFycmF5UmVmPiBpdGVtczsKLQotICAgIGlmICghc2VhcmNoSXRlbXMuaXNFbXB0 eSgpKSB7Ci0gICAgICAgIGl0ZW1zID0gYWRvcHRDRihDRkFycmF5Q3JlYXRlTXV0YWJsZSgwLCBz ZWFyY2hJdGVtcy5zaXplKCksICZrQ0ZUeXBlQXJyYXlDYWxsQmFja3MpKTsKLQotICAgICAgICBm b3IgKGNvbnN0IGF1dG8mIHNlYXJjaEl0ZW0gOiBzZWFyY2hJdGVtcykKLSAgICAgICAgICAgIENG QXJyYXlBcHBlbmRWYWx1ZShpdGVtcy5nZXQoKSwgc2VhcmNoSXRlbS5jcmVhdGVDRlN0cmluZygp LmdldCgpKTsKLSAgICB9Ci0KLSAgICBDRlByZWZlcmVuY2VzU2V0QXBwVmFsdWUoYXV0b3NhdmVL ZXkobmFtZSkuZ2V0KCksIGl0ZW1zLmdldCgpLCBrQ0ZQcmVmZXJlbmNlc0N1cnJlbnRBcHBsaWNh dGlvbik7Ci0gICAgQ0ZQcmVmZXJlbmNlc0FwcFN5bmNocm9uaXplKGtDRlByZWZlcmVuY2VzQ3Vy cmVudEFwcGxpY2F0aW9uKTsKLX0KLQotdm9pZCBXZWJQYWdlUHJveHk6OmxvYWRSZWNlbnRTZWFy Y2hlcyhjb25zdCBTdHJpbmcmIG5hbWUsIFZlY3RvcjxTdHJpbmc+JiBzZWFyY2hJdGVtcykKLXsK LSAgICBpZiAoIW5hbWUpIHsKLSAgICAgICAgLy8gRklYTUU6IFRoaXMgc2hvdWxkIGJlIGEgbWVz c2FnZSBjaGVjay4KLSAgICAgICAgcmV0dXJuOwotICAgIH0KLQotICAgIGF1dG8gaXRlbXMgPSBh ZG9wdENGKGR5bmFtaWNfY2ZfY2FzdDxDRkFycmF5UmVmPihDRlByZWZlcmVuY2VzQ29weUFwcFZh bHVlKGF1dG9zYXZlS2V5KG5hbWUpLmdldCgpLCBrQ0ZQcmVmZXJlbmNlc0N1cnJlbnRBcHBsaWNh dGlvbikpKTsKLSAgICBpZiAoIWl0ZW1zKQotICAgICAgICByZXR1cm47Ci0KLSAgICBmb3IgKHNp emVfdCBpID0gMCwgc2l6ZSA9IENGQXJyYXlHZXRDb3VudChpdGVtcy5nZXQoKSk7IGkgPCBzaXpl OyArK2kpIHsKLSAgICAgICAgaWYgKGF1dG8gaXRlbSA9IGR5bmFtaWNfY2ZfY2FzdDxDRlN0cmlu Z1JlZj4oQ0ZBcnJheUdldFZhbHVlQXRJbmRleChpdGVtcy5nZXQoKSwgaSkpKQotICAgICAgICAg ICAgc2VhcmNoSXRlbXMuYXBwZW5kKGl0ZW0pOwotICAgIH0KLX0KLQotfSAvLyBuYW1lc3BhY2Ug V2ViS2l0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1dlYlBhZ2VQ cm94eU1hYy5tbSBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvV2ViUGFnZVByb3h5TWFj Lm1tCmluZGV4IDdhMjZiZjg3ZWYwOTVmOTJhMGNiNGVkZGJlODQ4NDhkNzY5NWE5ZmYuLjdiZGUz ZTkwZGU4ODBkNTQzMTg4ZTM3MmE1MmMxNGNmZmI0MjM5NmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9tYWMvV2ViUGFnZVByb3h5TWFjLm1tCisrKyBiL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9tYWMvV2ViUGFnZVByb3h5TWFjLm1tCkBAIC02NDQsNiArNjQ0LDQ4IEBA IHZvaWQgV2ViUGFnZVByb3h5OjpvcGVuUERGRnJvbVRlbXBvcmFyeUZvbGRlcldpdGhOYXRpdmVB cHBsaWNhdGlvbihjb25zdCBTdHJpbmcmCiAgICAgW1tOU1dvcmtzcGFjZSBzaGFyZWRXb3Jrc3Bh Y2VdIG9wZW5GaWxlOnBkZkZpbGVuYW1lXTsKIH0KIAorc3RhdGljIFJldGFpblB0cjxDRlN0cmlu Z1JlZj4gYXV0b3NhdmVLZXkoY29uc3QgU3RyaW5nJiBuYW1lKQoreworICAgIHJldHVybiBTdHJp bmcoImNvbS5hcHBsZS5XZWJLaXQuc2VhcmNoRmllbGQ6IiArIG5hbWUpLmNyZWF0ZUNGU3RyaW5n KCk7Cit9CisKK3ZvaWQgV2ViUGFnZVByb3h5OjpzYXZlUmVjZW50U2VhcmNoZXMoY29uc3QgU3Ry aW5nJiBuYW1lLCBjb25zdCBWZWN0b3I8U3RyaW5nPiYgc2VhcmNoSXRlbXMpCit7CisgICAgaWYg KCFuYW1lKSB7CisgICAgICAgIC8vIEZJWE1FOiBUaGlzIHNob3VsZCBiZSBhIG1lc3NhZ2UgY2hl Y2suCisgICAgICAgIHJldHVybjsKKyAgICB9CisKKyAgICBSZXRhaW5QdHI8Q0ZNdXRhYmxlQXJy YXlSZWY+IGl0ZW1zOworCisgICAgaWYgKCFzZWFyY2hJdGVtcy5pc0VtcHR5KCkpIHsKKyAgICAg ICAgaXRlbXMgPSBhZG9wdENGKENGQXJyYXlDcmVhdGVNdXRhYmxlKDAsIHNlYXJjaEl0ZW1zLnNp emUoKSwgJmtDRlR5cGVBcnJheUNhbGxCYWNrcykpOworCisgICAgICAgIGZvciAoY29uc3QgYXV0 byYgc2VhcmNoSXRlbSA6IHNlYXJjaEl0ZW1zKQorICAgICAgICAgICAgQ0ZBcnJheUFwcGVuZFZh bHVlKGl0ZW1zLmdldCgpLCBzZWFyY2hJdGVtLmNyZWF0ZUNGU3RyaW5nKCkuZ2V0KCkpOworICAg IH0KKworICAgIENGUHJlZmVyZW5jZXNTZXRBcHBWYWx1ZShhdXRvc2F2ZUtleShuYW1lKS5nZXQo KSwgaXRlbXMuZ2V0KCksIGtDRlByZWZlcmVuY2VzQ3VycmVudEFwcGxpY2F0aW9uKTsKKyAgICBD RlByZWZlcmVuY2VzQXBwU3luY2hyb25pemUoa0NGUHJlZmVyZW5jZXNDdXJyZW50QXBwbGljYXRp b24pOworfQorCit2b2lkIFdlYlBhZ2VQcm94eTo6bG9hZFJlY2VudFNlYXJjaGVzKGNvbnN0IFN0 cmluZyYgbmFtZSwgVmVjdG9yPFN0cmluZz4mIHNlYXJjaEl0ZW1zKQoreworICAgIGlmICghbmFt ZSkgeworICAgICAgICAvLyBGSVhNRTogVGhpcyBzaG91bGQgYmUgYSBtZXNzYWdlIGNoZWNrLgor ICAgICAgICByZXR1cm47CisgICAgfQorCisgICAgYXV0byBpdGVtcyA9IGFkb3B0Q0YoZHluYW1p Y19jZl9jYXN0PENGQXJyYXlSZWY+KENGUHJlZmVyZW5jZXNDb3B5QXBwVmFsdWUoYXV0b3NhdmVL ZXkobmFtZSkuZ2V0KCksIGtDRlByZWZlcmVuY2VzQ3VycmVudEFwcGxpY2F0aW9uKSkpOworICAg IGlmICghaXRlbXMpCisgICAgICAgIHJldHVybjsKKworICAgIGZvciAoc2l6ZV90IGkgPSAwLCBz aXplID0gQ0ZBcnJheUdldENvdW50KGl0ZW1zLmdldCgpKTsgaSA8IHNpemU7ICsraSkgeworICAg ICAgICBpZiAoYXV0byBpdGVtID0gZHluYW1pY19jZl9jYXN0PENGU3RyaW5nUmVmPihDRkFycmF5 R2V0VmFsdWVBdEluZGV4KGl0ZW1zLmdldCgpLCBpKSkpCisgICAgICAgICAgICBzZWFyY2hJdGVt cy5hcHBlbmQoaXRlbSk7CisgICAgfQorfQorCiAjaWYgRU5BQkxFKFRFTEVQSE9ORV9OVU1CRVJf REVURUNUSU9OKQogdm9pZCBXZWJQYWdlUHJveHk6OnNob3dUZWxlcGhvbmVOdW1iZXJNZW51KGNv bnN0IFN0cmluZyYgdGVsZXBob25lTnVtYmVyLCBjb25zdCBXZWJDb3JlOjpJbnRQb2ludCYgcG9p bnQpCiB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJLaXQyLnhjb2RlcHJvai9wcm9q ZWN0LnBieHByb2ogYi9Tb3VyY2UvV2ViS2l0Mi9XZWJLaXQyLnhjb2RlcHJvai9wcm9qZWN0LnBi eHByb2oKaW5kZXggYmZlOWJlODQ4MjI4ZmJmY2E2YmY0MzU4MTA1NWJlZWM1NzNmZjViOC4uOTY0 NTE1NWViZjcyZWMxZWU1YzhkNDczZDI1Yjc4NjU0YjIzNTgzOCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdDIvV2ViS2l0Mi54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCisrKyBiL1NvdXJjZS9X ZWJLaXQyL1dlYktpdDIueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagpAQCAtOTMxLDcgKzkzMSw2 IEBACiAJCTUxQUNCQkExMTI3QThGMkMwMEQyMDNCOSAvKiBXZWJDb250ZXh0TWVudVByb3h5TWFj Lm1tIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gNTFBQ0JC OUYxMjdBOEYyQzAwRDIwM0I5IC8qIFdlYkNvbnRleHRNZW51UHJveHlNYWMubW0gKi87IH07CiAJ CTUxQjE1QTg0MTM4NDNBMzkwMDMyMUFEOCAvKiBFbnZpcm9ubWVudFV0aWxpdGllcy5jcHAgaW4g U291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSA1MUIxNUE4MjEzODQz QTM5MDAzMjFBRDggLyogRW52aXJvbm1lbnRVdGlsaXRpZXMuY3BwICovOyB9OwogCQk1MUIxNUE4 NTEzODQzQTM5MDAzMjFBRDggLyogRW52aXJvbm1lbnRVdGlsaXRpZXMuaCBpbiBIZWFkZXJzICov ID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDUxQjE1QTgzMTM4NDNBMzkwMDMyMUFE OCAvKiBFbnZpcm9ubWVudFV0aWxpdGllcy5oICovOyB9OwotCQk1MUIzMDA1MTEyNTI5RDBFMDAw QjVDQTAgLyogV2ViUGFnZVByb3h5Q0YuY3BwIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVp bGRGaWxlOyBmaWxlUmVmID0gNTFCMzAwNEYxMjUyOUQwRTAwMEI1Q0EwIC8qIFdlYlBhZ2VQcm94 eUNGLmNwcCAqLzsgfTsKIAkJNTFCQTI0NDQxODU4RUUzMDAwRUEyODExIC8qIEFzeW5jVGFzay5o IGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gNTFCQTI0NDMx ODU4RUUzMDAwRUEyODExIC8qIEFzeW5jVGFzay5oICovOyB9OwogCQk1MUJBMjQ0NjE4NThGNTVE MDBFQTI4MTEgLyogV2ViQ3Jvc3NUaHJlYWRDb3BpZXIuY3BwIGluIFNvdXJjZXMgKi8gPSB7aXNh ID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gNTFCQTI0NDUxODU4RjQxNTAwRUEyODExIC8qIFdl YkNyb3NzVGhyZWFkQ29waWVyLmNwcCAqLzsgfTsKIAkJNTFDOTYxMTgxODNEMjk0NzAwRDIwMDJF IC8qIFdlYklEQlNlcnZlckNvbm5lY3Rpb25NZXNzYWdlUmVjZWl2ZXIuY3BwIGluIFNvdXJjZXMg Ki8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gNTFDOTYxMTYxODNEMjk0NzAwRDIw MDJFIC8qIFdlYklEQlNlcnZlckNvbm5lY3Rpb25NZXNzYWdlUmVjZWl2ZXIuY3BwICovOyB9OwpA QCAtMjk0Myw3ICsyOTQyLDYgQEAKIAkJNTFBQ0M5MzUxNjI4MDY0ODAwMzQyNTUwIC8qIE5ldHdv cmtQcm9jZXNzTWVzc2FnZXMuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5j b2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0gTmV0 d29ya1Byb2Nlc3NNZXNzYWdlcy5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQk1MUIx NUE4MjEzODQzQTM5MDAzMjFBRDggLyogRW52aXJvbm1lbnRVdGlsaXRpZXMuY3BwICovID0ge2lz YSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBl ID0gc291cmNlY29kZS5jcHAuY3BwOyBuYW1lID0gRW52aXJvbm1lbnRVdGlsaXRpZXMuY3BwOyBw YXRoID0gdW5peC9FbnZpcm9ubWVudFV0aWxpdGllcy5jcHA7IHNvdXJjZVRyZWUgPSAiPGdyb3Vw PiI7IH07CiAJCTUxQjE1QTgzMTM4NDNBMzkwMDMyMUFEOCAvKiBFbnZpcm9ubWVudFV0aWxpdGll cy5oICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RL bm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jLmg7IG5hbWUgPSBFbnZpcm9ubWVudFV0aWxpdGll cy5oOyBwYXRoID0gdW5peC9FbnZpcm9ubWVudFV0aWxpdGllcy5oOyBzb3VyY2VUcmVlID0gIjxn cm91cD4iOyB9OwotCQk1MUIzMDA0RjEyNTI5RDBFMDAwQjVDQTAgLyogV2ViUGFnZVByb3h5Q0Yu Y3BwICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RL bm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAuY3BwOyBuYW1lID0gV2ViUGFnZVByb3h5Q0Yu Y3BwOyBwYXRoID0gY2YvV2ViUGFnZVByb3h5Q0YuY3BwOyBzb3VyY2VUcmVlID0gIjxncm91cD4i OyB9OwogCQk1MUJBMjQ0MzE4NThFRTMwMDBFQTI4MTEgLyogQXN5bmNUYXNrLmggKi8gPSB7aXNh ID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUg PSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IEFzeW5jVGFzay5oOyBzb3VyY2VUcmVlID0gIjxncm91 cD4iOyB9OwogCQk1MUJBMjQ0NTE4NThGNDE1MDBFQTI4MTEgLyogV2ViQ3Jvc3NUaHJlYWRDb3Bp ZXIuY3BwICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGxhc3RLbm93bkZpbGVUeXBlID0g c291cmNlY29kZS5jcHAuY3BwOyBwYXRoID0gV2ViQ3Jvc3NUaHJlYWRDb3BpZXIuY3BwOyBzb3Vy Y2VUcmVlID0gIjxncm91cD4iOyB9OwogCQk1MUM5NjExNTE4M0M5NUZGMDBEMjAwMkUgLyogV2Vi SURCU2VydmVyQ29ubmVjdGlvbi5tZXNzYWdlcy5pbiAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJl bmNlOyBsYXN0S25vd25GaWxlVHlwZSA9IHRleHQ7IHBhdGggPSBXZWJJREJTZXJ2ZXJDb25uZWN0 aW9uLm1lc3NhZ2VzLmluOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwpAQCAtNTM2MCwxNCAr NTM1OCw2IEBACiAJCQluYW1lID0gdW5peDsKIAkJCXNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7CiAJ CX07Ci0JCTUxQjMwMDREMTI1MjlDRjUwMDBCNUNBMCAvKiBjZiAqLyA9IHsKLQkJCWlzYSA9IFBC WEdyb3VwOwotCQkJY2hpbGRyZW4gPSAoCi0JCQkJNTFCMzAwNEYxMjUyOUQwRTAwMEI1Q0EwIC8q IFdlYlBhZ2VQcm94eUNGLmNwcCAqLywKLQkJCSk7Ci0JCQluYW1lID0gY2Y7Ci0JCQlzb3VyY2VU cmVlID0gIjxncm91cD4iOwotCQl9OwogCQk1MUUzNTFDMjE4MEYyQzg1MDBFNTNCRTkgLyogRGF0 YWJhc2VzICovID0gewogCQkJaXNhID0gUEJYR3JvdXA7CiAJCQljaGlsZHJlbiA9ICgKQEAgLTU3 MTksNyArNTcwOSw2IEBACiAJCQkJMkRBOTQ0QTgxODg0RTlBQjAwRUQ4NkRCIC8qIGlvcyAqLywK IAkJCQlCQzAzMkRDNDEwRjQzODdDMDA1OEMxNUEgLyogQVBJICovLAogCQkJCTUxMkY1ODhEMTJB ODgzNkYwMDYyOTUzMCAvKiBBdXRoZW50aWNhdGlvbiAqLywKLQkJCQk1MUIzMDA0RDEyNTI5Q0Y1 MDAwQjVDQTAgLyogY2YgKi8sCiAJCQkJMUFCQzNERjIxODk5RTQxNTAwNEYwNjI2IC8qIENvY29h ICovLAogCQkJCTUxN0RENUJCMTgwREE3QzQwMDgxNjYwQiAvKiBEYXRhYmFzZXMgKi8sCiAJCQkJ MUFCN0Q0QzcxMjg4QUE5QTAwQ0ZEMDhDIC8qIERvd25sb2FkcyAqLywKQEAgLTkyMDIsNyArOTE5 MSw2IEBACiAJCQkJMzdBNUUwMTMxOEJCRjkzNzAwMEEwODFFIC8qIF9XS0FjdGl2YXRlZEVsZW1l bnRJbmZvLm1tIGluIFNvdXJjZXMgKi8sCiAJCQkJQkMxMTFCMEYxMTJGNUU0RjAwMzM3QkFCIC8q IFdlYlBhZ2VQcm94eS5jcHAgaW4gU291cmNlcyAqLywKIAkJCQlDNThDREYyRDE4ODc2MDlGMDA4 NzE1MzYgLyogSW50ZXJhY3Rpb25JbmZvcm1hdGlvbkF0UG9zaXRpb24uY3BwIGluIFNvdXJjZXMg Ki8sCi0JCQkJNTFCMzAwNTExMjUyOUQwRTAwMEI1Q0EwIC8qIFdlYlBhZ2VQcm94eUNGLmNwcCBp biBTb3VyY2VzICovLAogCQkJCTFGNzUwNkFEMTg1OTE2MUMwMEVDMEZGNyAvKiBXS1dlYlByb2Nl c3NQbHVnSW5GcmFtZS5tbSBpbiBTb3VyY2VzICovLAogCQkJCUM1RkExRUQ0MThFMTA2MjIwMEIz RjQwMiAvKiBXS0FpclBsYXlSb3V0ZVBpY2tlci5tbSBpbiBTb3VyY2VzICovLAogCQkJCUJDODU3 RTg3MTJCNzFFQkIwMEVERUIyRSAvKiBXZWJQYWdlUHJveHlNYWMubW0gaW4gU291cmNlcyAqLywK