130817 2014-03-26 20:48:46 -0700 Add a _WKScriptWorld class 2014-03-26 20:56:16 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 994807 0 andersca 2014-03-26 20:48:46 -0700 Add a _WKScriptWorld class 994808 1 227915 andersca 2014-03-26 20:50:16 -0700 Created attachment 227915 Patch 994811 2 227915 mitz 2014-03-26 20:54:53 -0700 Comment on attachment 227915 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=227915&action=review > Source/WebKit2/UIProcess/API/Cocoa/_WKScriptWorld.mm:79 > +- (BOOL)isEqual:(id)object > +{ > + if (![object isKindOfClass:[_WKScriptWorld class]]) > + return NO; > + > + return _worldID == ((_WKScriptWorld *)object)->_worldID; > +} > + > +- (NSUInteger)hash > +{ > + return _worldID; > +} This seems premature. 994813 3 andersca 2014-03-26 20:56:16 -0700 Committed r166340: <http://trac.webkit.org/changeset/166340> 227915 2014-03-26 20:50:16 -0700 2014-03-26 20:54:53 -0700 Patch bug-130817-20140326204955.patch text/plain 10521 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTY2MzM4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggYjIyZmY3ZjYyOTE4MzY0 MzU5NzJlOWMwMDNlOWU0MGZmZGVkNzc0Ni4uZmYzOTU2YzUwM2MxNWZiOWU1NDdmMjBkMTVlYWEy ZDkzOGI5NmZlMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDIyIEBACiAyMDE0LTAzLTI2ICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKKyAgICAgICAgQWRkIGEgX1dLU2Ny aXB0V29ybGQgY2xhc3MKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTEzMDgxNworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgICogVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tTY3JpcHRXb3JsZC5oOiBBZGRlZC4KKyAg ICAgICAgKiBVSVByb2Nlc3MvQVBJL0NvY29hL19XS1NjcmlwdFdvcmxkLm1tOiBBZGRlZC4KKyAg ICAgICAgKGdlbmVyYXRlV29ybGRJRCk6CisgICAgICAgICgrW19XS1NjcmlwdFdvcmxkIGRlZmF1 bHRXb3JsZF0pOgorICAgICAgICAoLVtfV0tTY3JpcHRXb3JsZCBpbml0XSk6CisgICAgICAgICgt W19XS1NjcmlwdFdvcmxkIF9pbml0V2l0aFdvcmxkSUQ6XSk6CisgICAgICAgICgtW19XS1Njcmlw dFdvcmxkIGlzRXF1YWw6XSk6CisgICAgICAgICgtW19XS1NjcmlwdFdvcmxkIGhhc2hdKToKKyAg ICAgICAgKiBXZWJLaXQyLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2o6CisKKzIwMTQtMDMtMjYg IEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KKwogICAgICAgICBSZW5hbWUg YSBkZWxlZ2F0ZSBtZXRob2QgdG8gLXdlYlZpZXc6ZGlkRmluaXNoTmF2aWdhdGlvbjoKICAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzMDgxNAogCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL19XS1NjcmlwdFdvcmxk LmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL19XS1NjcmlwdFdvcmxkLmgK bmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMC4uMTczZTM3NTFkNzUyMTQ1MTY5Yzc4NWI4YTcyNGE1ZWE0M2QyZTJhMwotLS0g L2Rldi9udWxsCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvX1dLU2Ny aXB0V29ybGQuaApAQCAtMCwwICsxLDM4IEBACisvKgorICogQ29weXJpZ2h0IChDKSAyMDE0IEFw cGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqCisgKiBSZWRpc3RyaWJ1dGlvbiBhbmQg dXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKKyAqIG1vZGlm aWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0 aW9ucworICogYXJlIG1ldDoKKyAqIDEuIFJlZGlzdHJpYnV0aW9ucyBvZiBzb3VyY2UgY29kZSBt dXN0IHJldGFpbiB0aGUgYWJvdmUgY29weXJpZ2h0CisgKiAgICBub3RpY2UsIHRoaXMgbGlzdCBv ZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIuCisgKiAyLiBSZWRpc3Ry aWJ1dGlvbnMgaW4gYmluYXJ5IGZvcm0gbXVzdCByZXByb2R1Y2UgdGhlIGFib3ZlIGNvcHlyaWdo dAorICogICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2lu ZyBkaXNjbGFpbWVyIGluIHRoZQorICogICAgZG9jdW1lbnRhdGlvbiBhbmQvb3Igb3RoZXIgbWF0 ZXJpYWxzIHByb3ZpZGVkIHdpdGggdGhlIGRpc3RyaWJ1dGlvbi4KKyAqCisgKiBUSElTIFNPRlRX QVJFIElTIFBST1ZJREVEIEJZIEFQUExFIElOQy4gQU5EIElUUyBDT05UUklCVVRPUlMgYGBBUyBJ UycnCisgKiBBTkQgQU5ZIEVYUFJFU1MgT1IgSU1QTElFRCBXQVJSQU5USUVTLCBJTkNMVURJTkcs IEJVVCBOT1QgTElNSVRFRCBUTywKKyAqIFRIRSBJTVBMSUVEIFdBUlJBTlRJRVMgT0YgTUVSQ0hB TlRBQklMSVRZIEFORCBGSVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIKKyAqIFBVUlBPU0UgQVJFIERJ U0NMQUlNRUQuIElOIE5PIEVWRU5UIFNIQUxMIEFQUExFIElOQy4gT1IgSVRTIENPTlRSSUJVVE9S UworICogQkUgTElBQkxFIEZPUiBBTlkgRElSRUNULCBJTkRJUkVDVCwgSU5DSURFTlRBTCwgU1BF Q0lBTCwgRVhFTVBMQVJZLCBPUgorICogQ09OU0VRVUVOVElBTCBEQU1BR0VTIChJTkNMVURJTkcs IEJVVCBOT1QgTElNSVRFRCBUTywgUFJPQ1VSRU1FTlQgT0YKKyAqIFNVQlNUSVRVVEUgR09PRFMg T1IgU0VSVklDRVM7IExPU1MgT0YgVVNFLCBEQVRBLCBPUiBQUk9GSVRTOyBPUiBCVVNJTkVTUwor ICogSU5URVJSVVBUSU9OKSBIT1dFVkVSIENBVVNFRCBBTkQgT04gQU5ZIFRIRU9SWSBPRiBMSUFC SUxJVFksIFdIRVRIRVIgSU4KKyAqIENPTlRSQUNULCBTVFJJQ1QgTElBQklMSVRZLCBPUiBUT1JU IChJTkNMVURJTkcgTkVHTElHRU5DRSBPUiBPVEhFUldJU0UpCisgKiBBUklTSU5HIElOIEFOWSBX QVkgT1VUIE9GIFRIRSBVU0UgT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GCisg KiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCisgKi8KKworI2ltcG9ydCA8Rm91bmRh dGlvbi9Gb3VuZGF0aW9uLmg+CisjaW1wb3J0IDxXZWJLaXQyL1dLRm91bmRhdGlvbi5oPgorCisj aWYgV0tfQVBJX0VOQUJMRUQKKworV0tfQVBJX0NMQVNTCitAaW50ZXJmYWNlIF9XS1NjcmlwdFdv cmxkIDogTlNPYmplY3QKKworKyhpbnN0YW5jZXR5cGUpZGVmYXVsdFdvcmxkOworCitAZW5kCisK KyNlbmRpZgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9f V0tTY3JpcHRXb3JsZC5tbSBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvX1dL U2NyaXB0V29ybGQubW0KbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uMWQ0ZmJkN2FmOGVkMTZkZTQzZjMwM2M4YmZmZThi ZTdjMDUyNTNmYwotLS0gL2Rldi9udWxsCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9B UEkvQ29jb2EvX1dLU2NyaXB0V29ybGQubW0KQEAgLTAsMCArMSw4MyBAQAorLyoKKyAqIENvcHly aWdodCAoQykgMjAxNCBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKgorICogUmVk aXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3 aXRob3V0CisgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUg Zm9sbG93aW5nIGNvbmRpdGlvbnMKKyAqIGFyZSBtZXQ6CisgKiAxLiBSZWRpc3RyaWJ1dGlvbnMg b2Ygc291cmNlIGNvZGUgbXVzdCByZXRhaW4gdGhlIGFib3ZlIGNvcHlyaWdodAorICogICAgbm90 aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVy LgorICogMi4gUmVkaXN0cmlidXRpb25zIGluIGJpbmFyeSBmb3JtIG11c3QgcmVwcm9kdWNlIHRo ZSBhYm92ZSBjb3B5cmlnaHQKKyAqICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMg YW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lciBpbiB0aGUKKyAqICAgIGRvY3VtZW50YXRpb24g YW5kL29yIG90aGVyIG1hdGVyaWFscyBwcm92aWRlZCB3aXRoIHRoZSBkaXN0cmlidXRpb24uCisg KgorICogVEhJUyBTT0ZUV0FSRSBJUyBQUk9WSURFRCBCWSBBUFBMRSBJTkMuIEFORCBJVFMgQ09O VFJJQlVUT1JTIGBgQVMgSVMnJworICogQU5EIEFOWSBFWFBSRVNTIE9SIElNUExJRUQgV0FSUkFO VElFUywgSU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sCisgKiBUSEUgSU1QTElFRCBXQVJS QU5USUVTIE9GIE1FUkNIQU5UQUJJTElUWSBBTkQgRklUTkVTUyBGT1IgQSBQQVJUSUNVTEFSCisg KiBQVVJQT1NFIEFSRSBESVNDTEFJTUVELiBJTiBOTyBFVkVOVCBTSEFMTCBBUFBMRSBJTkMuIE9S IElUUyBDT05UUklCVVRPUlMKKyAqIEJFIExJQUJMRSBGT1IgQU5ZIERJUkVDVCwgSU5ESVJFQ1Qs IElOQ0lERU5UQUwsIFNQRUNJQUwsIEVYRU1QTEFSWSwgT1IKKyAqIENPTlNFUVVFTlRJQUwgREFN QUdFUyAoSU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sIFBST0NVUkVNRU5UIE9GCisgKiBT VUJTVElUVVRFIEdPT0RTIE9SIFNFUlZJQ0VTOyBMT1NTIE9GIFVTRSwgREFUQSwgT1IgUFJPRklU UzsgT1IgQlVTSU5FU1MKKyAqIElOVEVSUlVQVElPTikgSE9XRVZFUiBDQVVTRUQgQU5EIE9OIEFO WSBUSEVPUlkgT0YgTElBQklMSVRZLCBXSEVUSEVSIElOCisgKiBDT05UUkFDVCwgU1RSSUNUIExJ QUJJTElUWSwgT1IgVE9SVCAoSU5DTFVESU5HIE5FR0xJR0VOQ0UgT1IgT1RIRVJXSVNFKQorICog QVJJU0lORyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUgVVNFIE9GIFRISVMgU09GVFdBUkUsIEVWRU4g SUYgQURWSVNFRCBPRgorICogVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgorICovCisK KyNpbXBvcnQgImNvbmZpZy5oIgorI2ltcG9ydCAiX1dLU2NyaXB0V29ybGQuaCIKKworI2lmIFdL X0FQSV9FTkFCTEVECisKK0BpbXBsZW1lbnRhdGlvbiBfV0tTY3JpcHRXb3JsZCB7CisgICAgdWlu dDY0X3QgX3dvcmxkSUQ7Cit9CisKK3N0YXRpYyB1aW50NjRfdCBnZW5lcmF0ZVdvcmxkSUQoKQor eworICAgIHN0ZDo6YXRvbWljPHVpbnQ2NF90PiB3b3JsZElEOworCisgICAgcmV0dXJuICsrd29y bGRJRDsKK30KKworKyAoaW5zdGFuY2V0eXBlKWRlZmF1bHRXb3JsZAoreworICAgIHN0YXRpYyBk aXNwYXRjaF9vbmNlX3Qgb25jZVRva2VuOworICAgIHN0YXRpYyBfV0tTY3JpcHRXb3JsZCAqZGVm YXVsdFdvcmxkOworCisgICAgZGlzcGF0Y2hfb25jZSgmb25jZVRva2VuLCBeeworICAgICAgICBk ZWZhdWx0V29ybGQgPSBbW19XS1NjcmlwdFdvcmxkIGFsbG9jXSBfaW5pdFdpdGhXb3JsZElEOjBd OworICAgIH0pOworCisgICAgcmV0dXJuIGRlZmF1bHRXb3JsZDsKK30KKworLSAoaW5zdGFuY2V0 eXBlKWluaXQKK3sKKyAgICByZXR1cm4gW3NlbGYgX2luaXRXaXRoV29ybGRJRDpnZW5lcmF0ZVdv cmxkSUQoKV07Cit9CisKKy0gKGluc3RhbmNldHlwZSlfaW5pdFdpdGhXb3JsZElEOih1aW50NjRf dCl3b3JsZElECit7CisgICAgaWYgKCEoc2VsZiA9IFtzdXBlciBpbml0XSkpCisgICAgICAgIHJl dHVybiBuaWw7CisKKyAgICBfd29ybGRJRCA9IHdvcmxkSUQ7CisgICAgcmV0dXJuIHNlbGY7Cit9 CisKKy0gKEJPT0wpaXNFcXVhbDooaWQpb2JqZWN0Cit7CisgICAgaWYgKCFbb2JqZWN0IGlzS2lu ZE9mQ2xhc3M6W19XS1NjcmlwdFdvcmxkIGNsYXNzXV0pCisgICAgICAgIHJldHVybiBOTzsKKwor ICAgIHJldHVybiBfd29ybGRJRCA9PSAoKF9XS1NjcmlwdFdvcmxkICopb2JqZWN0KS0+X3dvcmxk SUQ7Cit9CisKKy0gKE5TVUludGVnZXIpaGFzaAoreworICAgIHJldHVybiBfd29ybGRJRDsKK30K KworQGVuZAorCisjZW5kaWYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYktpdDIueGNv ZGVwcm9qL3Byb2plY3QucGJ4cHJvaiBiL1NvdXJjZS9XZWJLaXQyL1dlYktpdDIueGNvZGVwcm9q L3Byb2plY3QucGJ4cHJvagppbmRleCBjMmEyMTI3YzlhYjRlNDRlMDU5ODYyMDUzZWFmMjBjNGNm Mzg4YWU0Li43NDNjMGY2NDgwNzI5MTc3ZmMwZjJlZjk3MzA3MTA1YjYzYmJmZTEyIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJLaXQyLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oKKysr IGIvU291cmNlL1dlYktpdDIvV2ViS2l0Mi54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCkBAIC0y NTEsNiArMjUxLDggQEAKIAkJMUE3ODY1QkExNkNBQzcxNTAwQUNFODNBIC8qIFBsdWdpblByb2Nl c3NDb25uZWN0aW9uTWFuYWdlck1lc3NhZ2VzLmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhC dWlsZEZpbGU7IGZpbGVSZWYgPSAxQTc4NjVCODE2Q0FDNzE1MDBBQ0U4M0EgLyogUGx1Z2luUHJv Y2Vzc0Nvbm5lY3Rpb25NYW5hZ2VyTWVzc2FnZXMuaCAqLzsgfTsKIAkJMUE3QzZDREExMzc4OTUw ODAwQjlDMDREIC8qIEVudmlyb25tZW50VmFyaWFibGVzLmNwcCBpbiBTb3VyY2VzICovID0ge2lz YSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDFBN0M2Q0Q4MTM3ODk1MDgwMEI5QzA0RCAvKiBF bnZpcm9ubWVudFZhcmlhYmxlcy5jcHAgKi87IH07CiAJCTFBN0M2Q0RCMTM3ODk1MDgwMEI5QzA0 RCAvKiBFbnZpcm9ubWVudFZhcmlhYmxlcy5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVp bGRGaWxlOyBmaWxlUmVmID0gMUE3QzZDRDkxMzc4OTUwODAwQjlDMDREIC8qIEVudmlyb25tZW50 VmFyaWFibGVzLmggKi87IH07CisJCTFBN0UzNzZEMThFM0NBNTcwMDNEMEZGRiAvKiBfV0tTY3Jp cHRXb3JsZC5tbSBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9 IDFBN0UzNzZCMThFM0NBNTcwMDNEMEZGRiAvKiBfV0tTY3JpcHRXb3JsZC5tbSAqLzsgfTsKKwkJ MUE3RTM3NkUxOEUzQ0E1NzAwM0QwRkZGIC8qIF9XS1NjcmlwdFdvcmxkLmggaW4gSGVhZGVycyAq LyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAxQTdFMzc2QzE4RTNDQTU3MDAzRDBG RkYgLyogX1dLU2NyaXB0V29ybGQuaCAqLzsgc2V0dGluZ3MgPSB7QVRUUklCVVRFUyA9IChQcml2 YXRlLCApOyB9OyB9OwogCQkxQTgxQjM4MDE4QkQ2NkFEMDAwN0ZEQUMgLyogX1dLVmlzaXRlZExp bmtQcm92aWRlci5tbSBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJl ZiA9IDFBODFCMzdFMThCRDY2QUQwMDA3RkRBQyAvKiBfV0tWaXNpdGVkTGlua1Byb3ZpZGVyLm1t ICovOyB9OwogCQkxQTgxQjM4MTE4QkQ2NkFEMDAwN0ZEQUMgLyogX1dLVmlzaXRlZExpbmtQcm92 aWRlci5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gMUE4 MUIzN0YxOEJENjZBRDAwMDdGREFDIC8qIF9XS1Zpc2l0ZWRMaW5rUHJvdmlkZXIuaCAqLzsgc2V0 dGluZ3MgPSB7QVRUUklCVVRFUyA9IChQcml2YXRlLCApOyB9OyB9OwogCQkxQTgxQjM4NTE4QkQ2 NzNBMDAwN0ZEQUMgLyogX1dLVmlzaXRlZExpbmtQcm92aWRlckludGVybmFsLmggaW4gSGVhZGVy cyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAxQTgxQjM4NDE4QkQ2NzNBMDAw N0ZEQUMgLyogX1dLVmlzaXRlZExpbmtQcm92aWRlckludGVybmFsLmggKi87IH07CkBAIC0xOTk4 LDYgKzIwMDAsOCBAQAogCQkxQTc4NjVCODE2Q0FDNzE1MDBBQ0U4M0EgLyogUGx1Z2luUHJvY2Vz c0Nvbm5lY3Rpb25NYW5hZ2VyTWVzc2FnZXMuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNl OyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBw YXRoID0gUGx1Z2luUHJvY2Vzc0Nvbm5lY3Rpb25NYW5hZ2VyTWVzc2FnZXMuaDsgc291cmNlVHJl ZSA9ICI8Z3JvdXA+IjsgfTsKIAkJMUE3QzZDRDgxMzc4OTUwODAwQjlDMDREIC8qIEVudmlyb25t ZW50VmFyaWFibGVzLmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2Rp bmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLmNwcDsgcGF0aCA9IEVu dmlyb25tZW50VmFyaWFibGVzLmNwcDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJMUE3 QzZDRDkxMzc4OTUwODAwQjlDMDREIC8qIEVudmlyb25tZW50VmFyaWFibGVzLmggKi8gPSB7aXNh ID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUg PSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IEVudmlyb25tZW50VmFyaWFibGVzLmg7IHNvdXJjZVRy ZWUgPSAiPGdyb3VwPiI7IH07CisJCTFBN0UzNzZCMThFM0NBNTcwMDNEMEZGRiAvKiBfV0tTY3Jp cHRXb3JsZC5tbSAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0 OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLm9iamNwcDsgcGF0aCA9IF9XS1Nj cmlwdFdvcmxkLm1tOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OworCQkxQTdFMzc2QzE4RTND QTU3MDAzRDBGRkYgLyogX1dLU2NyaXB0V29ybGQuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJl bmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5o OyBwYXRoID0gX1dLU2NyaXB0V29ybGQuaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJ MUE4MUIzN0UxOEJENjZBRDAwMDdGREFDIC8qIF9XS1Zpc2l0ZWRMaW5rUHJvdmlkZXIubW0gKi8g PSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmls ZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5vYmpjcHA7IHBhdGggPSBfV0tWaXNpdGVkTGlua1Byb3Zp ZGVyLm1tOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQkxQTgxQjM3RjE4QkQ2NkFEMDAw N0ZEQUMgLyogX1dLVmlzaXRlZExpbmtQcm92aWRlci5oICovID0ge2lzYSA9IFBCWEZpbGVSZWZl cmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5j Lmg7IHBhdGggPSBfV0tWaXNpdGVkTGlua1Byb3ZpZGVyLmg7IHNvdXJjZVRyZWUgPSAiPGdyb3Vw PiI7IH07CiAJCTFBODFCMzg0MThCRDY3M0EwMDA3RkRBQyAvKiBfV0tWaXNpdGVkTGlua1Byb3Zp ZGVySW50ZXJuYWwuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2Rpbmcg PSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0gX1dLVmlzaXRl ZExpbmtQcm92aWRlckludGVybmFsLmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CkBAIC00 NjE2LDYgKzQ2MjAsOCBAQAogCQkJCTFBMTU4NDE3MTg5MDQ0RjUwMDE3NjE2QyAvKiBXS1Byb2Nl c3NQb29sLm1tICovLAogCQkJCTFBNjUwOUNEMThCNDE0NjIwMDYxNDMzMiAvKiBXS1Byb2Nlc3NQ b29sUHJpdmF0ZS5oICovLAogCQkJCTFBM0NDMTY4MTg5MDdFQjAwMDFFNkVEOCAvKiBXS1Byb2Nl c3NQb29sSW50ZXJuYWwuaCAqLywKKwkJCQkxQTdFMzc2QzE4RTNDQTU3MDAzRDBGRkYgLyogX1dL U2NyaXB0V29ybGQuaCAqLywKKwkJCQkxQTdFMzc2QjE4RTNDQTU3MDAzRDBGRkYgLyogX1dLU2Ny aXB0V29ybGQubW0gKi8sCiAJCQkJMUFEODc5MDkxOEI2QzM4QTAwNkNBRkQ3IC8qIFdLVUlEZWxl Z2F0ZS5oICovLAogCQkJCTM3NDM5MjU3MThCQzRDNjAwMDFDODY3NSAvKiBXS1VJRGVsZWdhdGVQ cml2YXRlLmggKi8sCiAJCQkJMUEzQ0MxNjUxODkwNkFDRjAwMUU2RUQ4IC8qIFdLV2ViVmlldy5o ICovLApAQCAtNjU3OSw2ICs2NTg1LDcgQEAKIAkJCQkyOTg5QTQxNDE2N0QxODRCMDA0Rjk2RDIg LyogQ3VzdG9tUHJvdG9jb2xNYW5hZ2VyLmggaW4gSGVhZGVycyAqLywKIAkJCQkzNzFCMzJERTE4 NEQ2NzQ5MDAxM0UyQjIgLyogV0tOU1VSTFByb3RlY3Rpb25TcGFjZS5oIGluIEhlYWRlcnMgKi8s CiAJCQkJMjk4NEY1ODkxNjRCQTA5NTAwNEJDMEM2IC8qIEN1c3RvbVByb3RvY29sTWFuYWdlck1l c3NhZ2VzLmggaW4gSGVhZGVycyAqLywKKwkJCQkxQTdFMzc2RTE4RTNDQTU3MDAzRDBGRkYgLyog X1dLU2NyaXB0V29ybGQuaCBpbiBIZWFkZXJzICovLAogCQkJCTI5QUQzMDkzMTY0QjRDNUQwMDcy REVBOSAvKiBDdXN0b21Qcm90b2NvbE1hbmFnZXJQcm94eS5oIGluIEhlYWRlcnMgKi8sCiAJCQkJ Mjk4NEY1N0QxNjRCOTE1RjAwNEJDMEM2IC8qIEN1c3RvbVByb3RvY29sTWFuYWdlclByb3h5TWVz c2FnZXMuaCBpbiBIZWFkZXJzICovLAogCQkJCTUxODM1M0RGMTg4NzEyOEIwMEQ5RkU0NCAvKiBL ZXllZERlY29kZXIuaCBpbiBIZWFkZXJzICovLApAQCAtODUzMCw2ICs4NTM3LDcgQEAKIAkJCQlC QzQwNzYyODEyNEZGMDQwMDA2OEYyMEEgLyogV0tDZXJ0aWZpY2F0ZUluZm9NYWMubW0gaW4gU291 cmNlcyAqLywKIAkJCQk1MTVFNzcyNzE4M0RENkY2MDAwNzIwM0YgLyogQXN5bmNSZXF1ZXN0LmNw cCBpbiBTb3VyY2VzICovLAogCQkJCUJDQTI4NEQ2MTQ5MkYyQzcwMDFGOTA0MiAvKiBXS0Nvbm5l Y3Rpb24ubW0gaW4gU291cmNlcyAqLywKKwkJCQkxQTdFMzc2RDE4RTNDQTU3MDAzRDBGRkYgLyog X1dLU2NyaXB0V29ybGQubW0gaW4gU291cmNlcyAqLywKIAkJCQkwRjBDMzY1ODE4QzA1MUJBMDBG NjA3RDcgLyogUmVtb3RlTGF5ZXJUcmVlSG9zdElPUy5tbSBpbiBTb3VyY2VzICovLAogCQkJCTBG MEMzNjVDMThDMDVDQTEwMEY2MDdENyAvKiBSZW1vdGVTY3JvbGxpbmdDb29yZGluYXRvclByb3h5 SU9TLm1tIGluIFNvdXJjZXMgKi8sCiAJCQkJQkM0QTYyOTYxNDczMTNBMDAwNkM2ODFBIC8qIFdL Q29ubmVjdGlvblJlZi5jcHAgaW4gU291cmNlcyAqLywK