46305 2010-09-22 13:58:11 -0700 Stub out a PluginProcessManager class 2010-09-22 15:08:51 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 283232 0 andersca 2010-09-22 13:58:11 -0700 Stub out a PluginProcessManager class 283233 1 68435 andersca 2010-09-22 13:59:31 -0700 Created attachment 68435 Patch 283237 2 68435 aroben 2010-09-22 14:03:56 -0700 Comment on attachment 68435 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=68435&action=review What about WebKit2.vcproj? > WebKit2/UIProcess/Plugins/PluginProcessManager.cpp:56 > +void PluginProcessManager::removePluginProcessProxy(PluginProcessProxy* pluginProcessProxy) > +{ > + size_t vectorIndex = m_pluginProcesses.find(pluginProcessProxy); > + ASSERT(vectorIndex != notFound); > + > + m_pluginProcesses.remove(vectorIndex); > +} Maybe a HashSet would be better? > WebKit2/UIProcess/WebProcessProxy.h:97 > + WebContext* context() const { return m_context; } I don't see any callers of this function. It seems strange to add it in this patch if it won't be used until a future patch. 283281 3 andersca 2010-09-22 15:08:51 -0700 Committed r68088: <http://trac.webkit.org/changeset/68088> 68435 2010-09-22 13:59:31 -0700 2010-09-22 14:03:56 -0700 Patch bug-46305-20100922135930.patch text/plain 10887 andersca ZGlmZiAtLWdpdCBhL1dlYktpdDIvQ2hhbmdlTG9nIGIvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXgg NWZhMGQxZDcwOTY3YWM4NmU2ZTBkYzg2MzhiNzFiNDkzNGM3MGIyNC4uMjM0MWFlNDlkMmNlNjky NDc2ZjJmMDRiN2M0NGNiMjU4ODFkM2QxNCAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9DaGFuZ2VMb2cK KysrIGIvV2ViS2l0Mi9DaGFuZ2VMb2cKQEAgLTEsNSArMSwyMSBAQAogMjAxMC0wOS0yMiAgQW5k ZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgogCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFN0dWIgb3V0IGEgUGx1Z2luUHJvY2Vzc01hbmFn ZXIgY2xhc3MKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTQ2MzA1CisKKyAgICAgICAgKiBVSVByb2Nlc3MvUGx1Z2lucy9QbHVnaW5Qcm9jZXNzTWFuYWdl ci5jcHA6IEFkZGVkLgorICAgICAgICAoV2ViS2l0OjpQbHVnaW5Qcm9jZXNzTWFuYWdlcjo6c2hh cmVkKToKKyAgICAgICAgKFdlYktpdDo6UGx1Z2luUHJvY2Vzc01hbmFnZXI6OmdldFBsdWdpblBy b2Nlc3NDb25uZWN0aW9uKToKKyAgICAgICAgKFdlYktpdDo6UGx1Z2luUHJvY2Vzc01hbmFnZXI6 OnJlbW92ZVBsdWdpblByb2Nlc3NQcm94eSk6CisgICAgICAgICogVUlQcm9jZXNzL1BsdWdpbnMv UGx1Z2luUHJvY2Vzc01hbmFnZXIuaDogQWRkZWQuCisgICAgICAgICogVUlQcm9jZXNzL1dlYlBy b2Nlc3NQcm94eS5oOgorICAgICAgICAoV2ViS2l0OjpXZWJQcm9jZXNzUHJveHk6OmNvbnRleHQp OgorICAgICAgICAqIFdlYktpdDIueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvajoKKworMjAxMC0w OS0yMiAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgorCiAgICAgICAgIFJl dmlld2VkIGJ5IERhcmluIEFkbGVyLgogCiAgICAgICAgIEVuaGFuY2UgUHJvY2Vzc0xhdW5jaGVy IHRvIGJlIGFibGUgdG8gbGF1bmNoIHBsdWctaW4gcHJvY2Vzc2VzCmRpZmYgLS1naXQgYS9XZWJL aXQyL1VJUHJvY2Vzcy9QbHVnaW5zL1BsdWdpblByb2Nlc3NNYW5hZ2VyLmNwcCBiL1dlYktpdDIv VUlQcm9jZXNzL1BsdWdpbnMvUGx1Z2luUHJvY2Vzc01hbmFnZXIuY3BwCm5ldyBmaWxlIG1vZGUg MTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmMw YTM3NTc1Y2JhMWRkZTRjMTIxNDgyNDc0YWE0YjBmMmRmMzRhYjcKLS0tIC9kZXYvbnVsbAorKysg Yi9XZWJLaXQyL1VJUHJvY2Vzcy9QbHVnaW5zL1BsdWdpblByb2Nlc3NNYW5hZ2VyLmNwcApAQCAt MCwwICsxLDYwIEBACisvKgorICogQ29weXJpZ2h0IChDKSAyMDEwIEFwcGxlIEluYy4gQWxsIHJp Z2h0cyByZXNlcnZlZC4KKyAqCisgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBh bmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKKyAqIG1vZGlmaWNhdGlvbiwgYXJlIHBl cm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucworICogYXJlIG1l dDoKKyAqIDEuIFJlZGlzdHJpYnV0aW9ucyBvZiBzb3VyY2UgY29kZSBtdXN0IHJldGFpbiB0aGUg YWJvdmUgY29weXJpZ2h0CisgKiAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFu ZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIuCisgKiAyLiBSZWRpc3RyaWJ1dGlvbnMgaW4gYmlu YXJ5IGZvcm0gbXVzdCByZXByb2R1Y2UgdGhlIGFib3ZlIGNvcHlyaWdodAorICogICAgbm90aWNl LCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyIGlu IHRoZQorICogICAgZG9jdW1lbnRhdGlvbiBhbmQvb3Igb3RoZXIgbWF0ZXJpYWxzIHByb3ZpZGVk IHdpdGggdGhlIGRpc3RyaWJ1dGlvbi4KKyAqCisgKiBUSElTIFNPRlRXQVJFIElTIFBST1ZJREVE IEJZIEFQUExFIElOQy4gQU5EIElUUyBDT05UUklCVVRPUlMgYGBBUyBJUycnCisgKiBBTkQgQU5Z IEVYUFJFU1MgT1IgSU1QTElFRCBXQVJSQU5USUVTLCBJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRF RCBUTywKKyAqIFRIRSBJTVBMSUVEIFdBUlJBTlRJRVMgT0YgTUVSQ0hBTlRBQklMSVRZIEFORCBG SVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIKKyAqIFBVUlBPU0UgQVJFIERJU0NMQUlNRUQuIElOIE5P IEVWRU5UIFNIQUxMIEFQUExFIElOQy4gT1IgSVRTIENPTlRSSUJVVE9SUworICogQkUgTElBQkxF IEZPUiBBTlkgRElSRUNULCBJTkRJUkVDVCwgSU5DSURFTlRBTCwgU1BFQ0lBTCwgRVhFTVBMQVJZ LCBPUgorICogQ09OU0VRVUVOVElBTCBEQU1BR0VTIChJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRF RCBUTywgUFJPQ1VSRU1FTlQgT0YKKyAqIFNVQlNUSVRVVEUgR09PRFMgT1IgU0VSVklDRVM7IExP U1MgT0YgVVNFLCBEQVRBLCBPUiBQUk9GSVRTOyBPUiBCVVNJTkVTUworICogSU5URVJSVVBUSU9O KSBIT1dFVkVSIENBVVNFRCBBTkQgT04gQU5ZIFRIRU9SWSBPRiBMSUFCSUxJVFksIFdIRVRIRVIg SU4KKyAqIENPTlRSQUNULCBTVFJJQ1QgTElBQklMSVRZLCBPUiBUT1JUIChJTkNMVURJTkcgTkVH TElHRU5DRSBPUiBPVEhFUldJU0UpCisgKiBBUklTSU5HIElOIEFOWSBXQVkgT1VUIE9GIFRIRSBV U0UgT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GCisgKiBUSEUgUE9TU0lCSUxJ VFkgT0YgU1VDSCBEQU1BR0UuCisgKi8KKworI2lmIEVOQUJMRShQTFVHSU5fUFJPQ0VTUykKKwor I2luY2x1ZGUgIlBsdWdpblByb2Nlc3NNYW5hZ2VyLmgiCisKKyNpbmNsdWRlICJQbHVnaW5JbmZv U3RvcmUuaCIKKyNpbmNsdWRlICJXZWJDb250ZXh0LmgiCisjaW5jbHVkZSA8d3RmL1N0ZExpYkV4 dHJhcy5oPgorI2luY2x1ZGUgPHd0Zi90ZXh0L1dURlN0cmluZy5oPgorCituYW1lc3BhY2UgV2Vi S2l0IHsKKworUGx1Z2luUHJvY2Vzc01hbmFnZXImIFBsdWdpblByb2Nlc3NNYW5hZ2VyOjpzaGFy ZWQoKQoreworICAgIERFRklORV9TVEFUSUNfTE9DQUwoUGx1Z2luUHJvY2Vzc01hbmFnZXIsIHBs dWdpblByb2Nlc3NNYW5hZ2VyLCAoKSk7CisgICAgcmV0dXJuIHBsdWdpblByb2Nlc3NNYW5hZ2Vy OworfQorCit2b2lkIFBsdWdpblByb2Nlc3NNYW5hZ2VyOjpnZXRQbHVnaW5Qcm9jZXNzQ29ubmVj dGlvbihjb25zdCBTdHJpbmcmIHBsdWdpblBhdGgsIFdlYlByb2Nlc3NQcm94eSogd2ViUHJvY2Vz c1Byb3h5LCBDb3JlSVBDOjpBcmd1bWVudEVuY29kZXIqIHJlcGx5KQoreworICAgIEFTU0VSVCgh cGx1Z2luUGF0aC5pc051bGwoKSk7CisKKyAgICAvLyBGSVhNRTogSW1wbGVtZW50LgorfQorCit2 b2lkIFBsdWdpblByb2Nlc3NNYW5hZ2VyOjpyZW1vdmVQbHVnaW5Qcm9jZXNzUHJveHkoUGx1Z2lu UHJvY2Vzc1Byb3h5KiBwbHVnaW5Qcm9jZXNzUHJveHkpCit7CisgICAgc2l6ZV90IHZlY3Rvcklu ZGV4ID0gbV9wbHVnaW5Qcm9jZXNzZXMuZmluZChwbHVnaW5Qcm9jZXNzUHJveHkpOworICAgIEFT U0VSVCh2ZWN0b3JJbmRleCAhPSBub3RGb3VuZCk7CisKKyAgICBtX3BsdWdpblByb2Nlc3Nlcy5y ZW1vdmUodmVjdG9ySW5kZXgpOworfQorCit9IC8vIG5hbWVzcGFjZSBXZWJLaXQKKworI2VuZGlm IC8vIEVOQUJMRShQTFVHSU5fUFJPQ0VTUykKZGlmZiAtLWdpdCBhL1dlYktpdDIvVUlQcm9jZXNz L1BsdWdpbnMvUGx1Z2luUHJvY2Vzc01hbmFnZXIuaCBiL1dlYktpdDIvVUlQcm9jZXNzL1BsdWdp bnMvUGx1Z2luUHJvY2Vzc01hbmFnZXIuaApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi5jMjY1ZjJlMjg5ZDI5YzBjNTk4 ODVjOTA5MmEzY2EzYzkyZWIwN2QyCi0tLSAvZGV2L251bGwKKysrIGIvV2ViS2l0Mi9VSVByb2Nl c3MvUGx1Z2lucy9QbHVnaW5Qcm9jZXNzTWFuYWdlci5oCkBAIC0wLDAgKzEsNjEgQEAKKy8qCisg KiBDb3B5cmlnaHQgKEMpIDIwMTAgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICoK KyAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdp dGggb3Igd2l0aG91dAorICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRo YXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCisgKiBhcmUgbWV0OgorICogMS4gUmVkaXN0cmli dXRpb25zIG9mIHNvdXJjZSBjb2RlIG11c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAq ICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlz Y2xhaW1lci4KKyAqIDIuIFJlZGlzdHJpYnV0aW9ucyBpbiBiaW5hcnkgZm9ybSBtdXN0IHJlcHJv ZHVjZSB0aGUgYWJvdmUgY29weXJpZ2h0CisgKiAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25k aXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIgaW4gdGhlCisgKiAgICBkb2N1bWVu dGF0aW9uIGFuZC9vciBvdGhlciBtYXRlcmlhbHMgcHJvdmlkZWQgd2l0aCB0aGUgZGlzdHJpYnV0 aW9uLgorICoKKyAqIFRISVMgU09GVFdBUkUgSVMgUFJPVklERUQgQlkgQVBQTEUgSU5DLiBBTkQg SVRTIENPTlRSSUJVVE9SUyBgYEFTIElTJycKKyAqIEFORCBBTlkgRVhQUkVTUyBPUiBJTVBMSUVE IFdBUlJBTlRJRVMsIElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLAorICogVEhFIElNUExJ RUQgV0FSUkFOVElFUyBPRiBNRVJDSEFOVEFCSUxJVFkgQU5EIEZJVE5FU1MgRk9SIEEgUEFSVElD VUxBUgorICogUFVSUE9TRSBBUkUgRElTQ0xBSU1FRC4gSU4gTk8gRVZFTlQgU0hBTEwgQVBQTEUg SU5DLiBPUiBJVFMgQ09OVFJJQlVUT1JTCisgKiBCRSBMSUFCTEUgRk9SIEFOWSBESVJFQ1QsIElO RElSRUNULCBJTkNJREVOVEFMLCBTUEVDSUFMLCBFWEVNUExBUlksIE9SCisgKiBDT05TRVFVRU5U SUFMIERBTUFHRVMgKElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLCBQUk9DVVJFTUVOVCBP RgorICogU1VCU1RJVFVURSBHT09EUyBPUiBTRVJWSUNFUzsgTE9TUyBPRiBVU0UsIERBVEEsIE9S IFBST0ZJVFM7IE9SIEJVU0lORVNTCisgKiBJTlRFUlJVUFRJT04pIEhPV0VWRVIgQ0FVU0VEIEFO RCBPTiBBTlkgVEhFT1JZIE9GIExJQUJJTElUWSwgV0hFVEhFUiBJTgorICogQ09OVFJBQ1QsIFNU UklDVCBMSUFCSUxJVFksIE9SIFRPUlQgKElOQ0xVRElORyBORUdMSUdFTkNFIE9SIE9USEVSV0lT RSkKKyAqIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRSBPRiBUSElTIFNPRlRXQVJF LCBFVkVOIElGIEFEVklTRUQgT0YKKyAqIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4K KyAqLworCisjaWZuZGVmIFBsdWdpblByb2Nlc3NNYW5hZ2VyX2gKKyNkZWZpbmUgUGx1Z2luUHJv Y2Vzc01hbmFnZXJfaAorCisjaWYgRU5BQkxFKFBMVUdJTl9QUk9DRVNTKQorCisjaW5jbHVkZSA8 d3RmL0ZvcndhcmQuaD4KKyNpbmNsdWRlIDx3dGYvTm9uY29weWFibGUuaD4KKyNpbmNsdWRlIDx3 dGYvVmVjdG9yLmg+CisKK25hbWVzcGFjZSBDb3JlSVBDIHsKKyAgICBjbGFzcyBBcmd1bWVudEVu Y29kZXI7Cit9CisKK25hbWVzcGFjZSBXZWJLaXQgeworCitjbGFzcyBQbHVnaW5Qcm9jZXNzUHJv eHk7CitjbGFzcyBXZWJQcm9jZXNzUHJveHk7CisKK2NsYXNzIFBsdWdpblByb2Nlc3NNYW5hZ2Vy IDogTm9uY29weWFibGUgIHsKK3B1YmxpYzoKKyAgICBzdGF0aWMgUGx1Z2luUHJvY2Vzc01hbmFn ZXImIHNoYXJlZCgpOworCisgICAgdm9pZCBnZXRQbHVnaW5Qcm9jZXNzQ29ubmVjdGlvbihjb25z dCBTdHJpbmcmIHBsdWdpblBhdGgsIFdlYlByb2Nlc3NQcm94eSosIENvcmVJUEM6OkFyZ3VtZW50 RW5jb2RlciogcmVwbHkpOworICAgIHZvaWQgcmVtb3ZlUGx1Z2luUHJvY2Vzc1Byb3h5KFBsdWdp blByb2Nlc3NQcm94eSopOworCitwcml2YXRlOgorICAgIFBsdWdpblByb2Nlc3NNYW5hZ2VyKCk7 CisKKyAgICBWZWN0b3I8UGx1Z2luUHJvY2Vzc1Byb3h5Kj4gbV9wbHVnaW5Qcm9jZXNzZXM7Cit9 OworCit9IC8vIG5hbWVzcGFjZSBXZWJLaXQKKworI2VuZGlmIC8vIEVOQUJMRShQTFVHSU5fUFJP Q0VTUykKKworI2VuZGlmIC8vIFBsdWdpblByb2Nlc3NNYW5hZ2VyX2gKZGlmZiAtLWdpdCBhL1dl YktpdDIvVUlQcm9jZXNzL1dlYlByb2Nlc3NQcm94eS5oIGIvV2ViS2l0Mi9VSVByb2Nlc3MvV2Vi UHJvY2Vzc1Byb3h5LmgKaW5kZXggMzU2ZDZhMTVkYWY4YWMyNTQ2YWNjZWMzNzhiZTI2MTFjNWRj ZjI1Yy4uM2ZhYzU1Y2VlZmM0ZjBlNDFlMjNhNGNhOTVhOTc5NjdjNDZiOGM3ZCAxMDA2NDQKLS0t IGEvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Byb3h5LmgKKysrIGIvV2ViS2l0Mi9VSVBy b2Nlc3MvV2ViUHJvY2Vzc1Byb3h5LmgKQEAgLTk0LDYgKzk0LDggQEAgcHVibGljOgogICAgIHZv aWQgZGlzY29ubmVjdEZyYW1lc0Zyb21QYWdlKFdlYlBhZ2VQcm94eSopOyAvLyBJbmNsdWRpbmcg bWFpbiBmcmFtZS4KICAgICBzaXplX3QgZnJhbWVDb3VudEluUGFnZShXZWJQYWdlUHJveHkqKSBj b25zdDsgLy8gSW5jbHVkaW5nIG1haW4gZnJhbWUuCiAKKyAgICBXZWJDb250ZXh0KiBjb250ZXh0 KCkgY29uc3QgeyByZXR1cm4gbV9jb250ZXh0OyB9CisKIHByaXZhdGU6CiAgICAgZXhwbGljaXQg V2ViUHJvY2Vzc1Byb3h5KFdlYkNvbnRleHQqKTsKIApkaWZmIC0tZ2l0IGEvV2ViS2l0Mi9XZWJL aXQyLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2ogYi9XZWJLaXQyL1dlYktpdDIueGNvZGVwcm9q L3Byb2plY3QucGJ4cHJvagppbmRleCBkMmM4ODM5NmFiYzg2MTA5NTYwMTVmZDEwMWJkN2QyMzRj NjM0MjIxLi41Mjk1NTljMGQzMDIwZDQwMzAwZmJlYWRkYjNmZTc2YzZlNGYzMDk2IDEwMDY0NAot LS0gYS9XZWJLaXQyL1dlYktpdDIueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagorKysgYi9XZWJL aXQyL1dlYktpdDIueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagpAQCAtMzIsNiArMzIsOCBAQAog CQkwRjUyNjY3NDExREQ0QTQ5MDAwNkQzM0MgLyogV2ViUHJvY2Vzc1Byb3h5TWFjLm1tIGluIFNv dXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gMEY1MjY2NzMxMURENEE0 OTAwMDZEMzNDIC8qIFdlYlByb2Nlc3NQcm94eU1hYy5tbSAqLzsgfTsKIAkJMEZCNjU5MjMxMjA4 QjREQjAwNDQ4MTZDIC8qIERyYXdpbmdBcmVhQmFzZS5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0g UEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gMEZCNjU5MjIxMjA4QjREQjAwNDQ4MTZDIC8qIERyYXdp bmdBcmVhQmFzZS5oICovOyB9OwogCQkwRkI2NTlBNjEyMDhCOUVFMDA0NDgxNkMgLyogRHJhd2lu Z0FyZWFCYXNlLmNwcCBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJl ZiA9IDBGQjY1OUE1MTIwOEI5RUUwMDQ0ODE2QyAvKiBEcmF3aW5nQXJlYUJhc2UuY3BwICovOyB9 OworCQkxQTBFQzYwMzEyNEE5RjJDMDA3RUY0QTUgLyogUGx1Z2luUHJvY2Vzc01hbmFnZXIuaCBp biBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDFBMEVDNjAxMTI0 QTlGMkMwMDdFRjRBNSAvKiBQbHVnaW5Qcm9jZXNzTWFuYWdlci5oICovOyB9OworCQkxQTBFQzYw NDEyNEE5RjJDMDA3RUY0QTUgLyogUGx1Z2luUHJvY2Vzc01hbmFnZXIuY3BwIGluIFNvdXJjZXMg Ki8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gMUEwRUM2MDIxMjRBOUYyQzAwN0VG NEE1IC8qIFBsdWdpblByb2Nlc3NNYW5hZ2VyLmNwcCAqLzsgfTsKIAkJMUEwRjI5Q0IxMjBCMzcx NjAwNTNEMUI5IC8qIFZpc2l0ZWRMaW5rVGFibGUuY3BwIGluIFNvdXJjZXMgKi8gPSB7aXNhID0g UEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gMUEwRjI5QzkxMjBCMzcxNjAwNTNEMUI5IC8qIFZpc2l0 ZWRMaW5rVGFibGUuY3BwICovOyB9OwogCQkxQTBGMjlDQzEyMEIzNzE2MDA1M0QxQjkgLyogVmlz aXRlZExpbmtUYWJsZS5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxl UmVmID0gMUEwRjI5Q0ExMjBCMzcxNjAwNTNEMUI5IC8qIFZpc2l0ZWRMaW5rVGFibGUuaCAqLzsg fTsKIAkJMUEwRjI5RTMxMjBCNDQ0MjAwNTNEMUI5IC8qIFZpc2l0ZWRMaW5rUHJvdmlkZXIuY3Bw IGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gMUEwRjI5RTEx MjBCNDQ0MjAwNTNEMUI5IC8qIFZpc2l0ZWRMaW5rUHJvdmlkZXIuY3BwICovOyB9OwpAQCAtNDE0 LDYgKzQxNiw4IEBACiAJCTBGQjY1OTIyMTIwOEI0REIwMDQ0ODE2QyAvKiBEcmF3aW5nQXJlYUJh c2UuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0 S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0gRHJhd2luZ0FyZWFCYXNlLmg7 IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTBGQjY1OUE1MTIwOEI5RUUwMDQ0ODE2QyAv KiBEcmF3aW5nQXJlYUJhc2UuY3BwICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVF bmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAuY3BwOyBwYXRo ID0gRHJhd2luZ0FyZWFCYXNlLmNwcDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJMTA1 OEM3QjFGRUE1NTg1RTExQ0EyQ0JCIC8qIENvY29hLmZyYW1ld29yayAqLyA9IHtpc2EgPSBQQlhG aWxlUmVmZXJlbmNlOyBsYXN0S25vd25GaWxlVHlwZSA9IHdyYXBwZXIuZnJhbWV3b3JrOyBuYW1l ID0gQ29jb2EuZnJhbWV3b3JrOyBwYXRoID0gL1N5c3RlbS9MaWJyYXJ5L0ZyYW1ld29ya3MvQ29j b2EuZnJhbWV3b3JrOyBzb3VyY2VUcmVlID0gIjxhYnNvbHV0ZT4iOyB9OworCQkxQTBFQzYwMTEy NEE5RjJDMDA3RUY0QTUgLyogUGx1Z2luUHJvY2Vzc01hbmFnZXIuaCAqLyA9IHtpc2EgPSBQQlhG aWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJj ZWNvZGUuYy5oOyBwYXRoID0gUGx1Z2luUHJvY2Vzc01hbmFnZXIuaDsgc291cmNlVHJlZSA9ICI8 Z3JvdXA+IjsgfTsKKwkJMUEwRUM2MDIxMjRBOUYyQzAwN0VGNEE1IC8qIFBsdWdpblByb2Nlc3NN YW5hZ2VyLmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0 OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLmNwcDsgcGF0aCA9IFBsdWdpblBy b2Nlc3NNYW5hZ2VyLmNwcDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJMUEwRjI5Qzkx MjBCMzcxNjAwNTNEMUI5IC8qIFZpc2l0ZWRMaW5rVGFibGUuY3BwICovID0ge2lzYSA9IFBCWEZp bGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNl Y29kZS5jcHAuY3BwOyBwYXRoID0gVmlzaXRlZExpbmtUYWJsZS5jcHA7IHNvdXJjZVRyZWUgPSAi PGdyb3VwPiI7IH07CiAJCTFBMEYyOUNBMTIwQjM3MTYwMDUzRDFCOSAvKiBWaXNpdGVkTGlua1Rh YmxlLmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFz dEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IFZpc2l0ZWRMaW5rVGFibGUu aDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJMUEwRjI5RTExMjBCNDQ0MjAwNTNEMUI5 IC8qIFZpc2l0ZWRMaW5rUHJvdmlkZXIuY3BwICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7 IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAuY3Bw OyBwYXRoID0gVmlzaXRlZExpbmtQcm92aWRlci5jcHA7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7 IH07CkBAIC0xMDAxLDYgKzEwMDUsOCBAQAogCQkJCTFBRUZDQzBEMTFEMDFGNDEwMDgyMTlEMyAv KiBtYWMgKi8sCiAJCQkJMUFFRkNDMTExMUQwMUY5NjAwODIxOUQzIC8qIFBsdWdpbkluZm9TdG9y ZS5jcHAgKi8sCiAJCQkJMUFFRkNDMTAxMUQwMUY5NjAwODIxOUQzIC8qIFBsdWdpbkluZm9TdG9y ZS5oICovLAorCQkJCTFBMEVDNjAyMTI0QTlGMkMwMDdFRjRBNSAvKiBQbHVnaW5Qcm9jZXNzTWFu YWdlci5jcHAgKi8sCisJCQkJMUEwRUM2MDExMjRBOUYyQzAwN0VGNEE1IC8qIFBsdWdpblByb2Nl c3NNYW5hZ2VyLmggKi8sCiAJCQkpOwogCQkJcGF0aCA9IFBsdWdpbnM7CiAJCQlzb3VyY2VUcmVl ID0gIjxncm91cD4iOwpAQCAtMTY1OSw2ICsxNjY1LDcgQEAKIAkJCQlCQ0Y1MDcyNDEyNDMyOEE5 MDA1OTU1QUUgLyogV0tDZXJ0aWZpY2F0ZUluZm8uaCBpbiBIZWFkZXJzICovLAogCQkJCUJDRjUw NzI4MTI0MzI5QUEwMDU5NTVBRSAvKiBXZWJDZXJ0aWZpY2F0ZUluZm8uaCBpbiBIZWFkZXJzICov LAogCQkJCUJDRjUwNzJFMTI0MzJBOTcwMDU5NTVBRSAvKiBXS0NlcnRpZmljYXRlSW5mb01hYy5o IGluIEhlYWRlcnMgKi8sCisJCQkJMUEwRUM2MDMxMjRBOUYyQzAwN0VGNEE1IC8qIFBsdWdpblBy b2Nlc3NNYW5hZ2VyLmggaW4gSGVhZGVycyAqLywKIAkJCSk7CiAJCQlydW5Pbmx5Rm9yRGVwbG95 bWVudFBvc3Rwcm9jZXNzaW5nID0gMDsKIAkJfTsKQEAgLTE5MTEsNiArMTkxOCw3IEBACiAJCQkJ QkNGNTA1RTgxMjQzMDQ3QjAwNTk1NUFFIC8qIFBsYXRmb3JtQ2VydGlmaWNhdGVJbmZvLm1tIGlu IFNvdXJjZXMgKi8sCiAJCQkJQkNGNTA3MjUxMjQzMjhBOTAwNTk1NUFFIC8qIFdLQ2VydGlmaWNh dGVJbmZvLmNwcCBpbiBTb3VyY2VzICovLAogCQkJCUJDRjUwNzJGMTI0MzJBOTcwMDU5NTVBRSAv KiBXS0NlcnRpZmljYXRlSW5mb01hYy5tbSBpbiBTb3VyY2VzICovLAorCQkJCTFBMEVDNjA0MTI0 QTlGMkMwMDdFRjRBNSAvKiBQbHVnaW5Qcm9jZXNzTWFuYWdlci5jcHAgaW4gU291cmNlcyAqLywK IAkJCSk7CiAJCQlydW5Pbmx5Rm9yRGVwbG95bWVudFBvc3Rwcm9jZXNzaW5nID0gMDsKIAkJfTsK