46728 2010-09-28 08:51:26 -0700 Add PluginControllerProxy class 2010-09-28 09:24:14 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 andersca andersca abarth eric webkit.review.bot oldest_to_newest 286273 0 andersca 2010-09-28 08:51:26 -0700 Add PluginControllerProxy class 286278 1 69059 andersca 2010-09-28 08:55:12 -0700 Created attachment 69059 Patch 286281 2 webkit.review.bot 2010-09-28 08:57:49 -0700 Attachment 69059 did not pass style-queue: Failed to run "['WebKitTools/Scripts/check-webkit-style']" exit_code: 1 WebKit2/PluginProcess/PluginControllerProxy.cpp:28: Found header this file implements before WebCore config.h. Should be: config.h, primary header, blank line, and then alphabetically sorted. [build/include_order] [4] Total errors found: 1 in 6 files If any of these errors are false positives, please file a bug against check-webkit-style. 286283 3 69059 aroben 2010-09-28 08:59:50 -0700 Comment on attachment 69059 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=69059&action=review > WebKit2/ChangeLog:17 > + (WebKit::WebProcessConnection::addPluginControllerProxy > + Add the plug-in controller proxy to the map. Missing the trailing ): here. > WebKit2/PluginProcess/PluginControllerProxy.h:65 > + // We use a weak reference to the web process connection because the WebProcessConnection has a strong > + // reference to the PluginControllerProxy objects. > + WebProcessConnection* m_connection; Since PluginControllerProxy is ref-counted, it's hard to guarantee that it doesn't outlive its WebProcessConnection. Maybe we should have a way to tell PluginControllerProxy that its WebProcessConnection has been destroyed. > WebKit2/PluginProcess/WebProcessConnection.cpp:52 > +void WebProcessConnection::addPluginControllerProxy(PluginControllerProxy* pluginController) This should take a PassRefPtr. 286287 4 andersca 2010-09-28 09:07:38 -0700 Committed r68522: <http://trac.webkit.org/changeset/68522> 286296 5 webkit.review.bot 2010-09-28 09:24:14 -0700 http://trac.webkit.org/changeset/68522 might have broken GTK Linux 64-bit Debug The following changes are on the blame list: http://trac.webkit.org/changeset/68521 http://trac.webkit.org/changeset/68522 69059 2010-09-28 08:55:12 -0700 2010-09-28 08:59:50 -0700 Patch bug-46728-20100928085511.patch text/plain 15888 andersca ZGlmZiAtLWdpdCBhL1dlYktpdDIvQ2hhbmdlTG9nIGIvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXgg YmU4NzQ3YjFjYTFiZDY2M2UyNTI1YjEyOWMxNWU1MjBhZDMzNjAxMi4uMzY3YzlmZDI3ZWYxMmVk YzAwZWNhNjc4ZjMwNjQwYzM1ZTc2MWU5NyAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9DaGFuZ2VMb2cK KysrIGIvV2ViS2l0Mi9DaGFuZ2VMb2cKQEAgLTEsNSArMSwzMCBAQAogMjAxMC0wOS0yOCAgQW5k ZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgogCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCBQbHVnaW5Db250cm9sbGVyUHJveHkgY2xh c3MKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ2NzI4 CisKKyAgICAgICAgKiBQbHVnaW5Qcm9jZXNzL1BsdWdpbkNvbnRyb2xsZXJQcm94eS5jcHA6IEFk ZGVkLgorICAgICAgICAqIFBsdWdpblByb2Nlc3MvUGx1Z2luQ29udHJvbGxlclByb3h5Lmg6IEFk ZGVkLgorICAgICAgICBBZGQgc3R1YmJlZCBvdXQgUGx1Z2luQ29udHJvbGxlclByb3h5IGNsYXNz LgorICAgICAgICAKKyAgICAgICAgKiBQbHVnaW5Qcm9jZXNzL1dlYlByb2Nlc3NDb25uZWN0aW9u LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUHJvY2Vzc0Nvbm5lY3Rpb246On5XZWJQcm9jZXNz Q29ubmVjdGlvbik6CisgICAgICAgIEFzc2VydCB0aGF0IHdlIGRvbid0IGhhdmUgYW55IGxpdmUg cGx1Zy1pbiBjb250cm9sbGVyIHByb3hpZXMuCisKKyAgICAgICAgKFdlYktpdDo6V2ViUHJvY2Vz c0Nvbm5lY3Rpb246OmFkZFBsdWdpbkNvbnRyb2xsZXJQcm94eQorICAgICAgICBBZGQgdGhlIHBs dWctaW4gY29udHJvbGxlciBwcm94eSB0byB0aGUgbWFwLgorICAgICAgICAgICAgICAgIAorICAg ICAgICAoV2ViS2l0OjpXZWJQcm9jZXNzQ29ubmVjdGlvbjo6cmVtb3ZlUGx1Z2luQ29udHJvbGxl clByb3h5KToKKyAgICAgICAgUmVtb3ZlIHRoZSBwbHVnLWluIGNvbnRyb2xsZXIgcHJveHkgZnJv bSB0aGUgbWFwLiBJZiB0aGUgbGFzdCBwbHVnLWluIGNvbnRyb2xsZXIKKyAgICAgICAgcHJveHkg d2VudCBhd2F5LCBpbnZhbGlkYXRlIHRoZSBjb25uZWN0aW9uLgorICAgICAgICAKKyAgICAgICAg KiBXZWJLaXQyLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2o6CisgICAgICAgIEFkZCBmaWxlcy4K KworMjAxMC0wOS0yOCAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgorCiAg ICAgICAgIE91dCBvZiBwcm9jZXNzIHBsdWctaW5zIHNob3VsZG4ndCBiZSB0dXJuZWQgb24ganVz dCB5ZXQuLi4KIAogICAgICAgICAqIFdlYktpdDJQcmVmaXguaDoKZGlmZiAtLWdpdCBhL1dlYktp dDIvUGx1Z2luUHJvY2Vzcy9QbHVnaW5Db250cm9sbGVyUHJveHkuY3BwIGIvV2ViS2l0Mi9QbHVn aW5Qcm9jZXNzL1BsdWdpbkNvbnRyb2xsZXJQcm94eS5jcHAKbmV3IGZpbGUgbW9kZSAxMDA2NDQK aW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uMTRkZjE4YWNk NjljN2I1NTE4MGE2YzIwMWRjZDMzMDRiZWNhYmQwMgotLS0gL2Rldi9udWxsCisrKyBiL1dlYktp dDIvUGx1Z2luUHJvY2Vzcy9QbHVnaW5Db250cm9sbGVyUHJveHkuY3BwCkBAIC0wLDAgKzEsMTE1 IEBACisvKgorICogQ29weXJpZ2h0IChDKSAyMDEwIEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNl cnZlZC4KKyAqCisgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5 IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKKyAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBw cm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucworICogYXJlIG1ldDoKKyAqIDEu IFJlZGlzdHJpYnV0aW9ucyBvZiBzb3VyY2UgY29kZSBtdXN0IHJldGFpbiB0aGUgYWJvdmUgY29w eXJpZ2h0CisgKiAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9s bG93aW5nIGRpc2NsYWltZXIuCisgKiAyLiBSZWRpc3RyaWJ1dGlvbnMgaW4gYmluYXJ5IGZvcm0g bXVzdCByZXByb2R1Y2UgdGhlIGFib3ZlIGNvcHlyaWdodAorICogICAgbm90aWNlLCB0aGlzIGxp c3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyIGluIHRoZQorICog ICAgZG9jdW1lbnRhdGlvbiBhbmQvb3Igb3RoZXIgbWF0ZXJpYWxzIHByb3ZpZGVkIHdpdGggdGhl IGRpc3RyaWJ1dGlvbi4KKyAqCisgKiBUSElTIFNPRlRXQVJFIElTIFBST1ZJREVEIEJZIEFQUExF IElOQy4gQU5EIElUUyBDT05UUklCVVRPUlMgYGBBUyBJUycnCisgKiBBTkQgQU5ZIEVYUFJFU1Mg T1IgSU1QTElFRCBXQVJSQU5USUVTLCBJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywKKyAq IFRIRSBJTVBMSUVEIFdBUlJBTlRJRVMgT0YgTUVSQ0hBTlRBQklMSVRZIEFORCBGSVRORVNTIEZP UiBBIFBBUlRJQ1VMQVIKKyAqIFBVUlBPU0UgQVJFIERJU0NMQUlNRUQuIElOIE5PIEVWRU5UIFNI QUxMIEFQUExFIElOQy4gT1IgSVRTIENPTlRSSUJVVE9SUworICogQkUgTElBQkxFIEZPUiBBTlkg RElSRUNULCBJTkRJUkVDVCwgSU5DSURFTlRBTCwgU1BFQ0lBTCwgRVhFTVBMQVJZLCBPUgorICog Q09OU0VRVUVOVElBTCBEQU1BR0VTIChJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywgUFJP Q1VSRU1FTlQgT0YKKyAqIFNVQlNUSVRVVEUgR09PRFMgT1IgU0VSVklDRVM7IExPU1MgT0YgVVNF LCBEQVRBLCBPUiBQUk9GSVRTOyBPUiBCVVNJTkVTUworICogSU5URVJSVVBUSU9OKSBIT1dFVkVS IENBVVNFRCBBTkQgT04gQU5ZIFRIRU9SWSBPRiBMSUFCSUxJVFksIFdIRVRIRVIgSU4KKyAqIENP TlRSQUNULCBTVFJJQ1QgTElBQklMSVRZLCBPUiBUT1JUIChJTkNMVURJTkcgTkVHTElHRU5DRSBP UiBPVEhFUldJU0UpCisgKiBBUklTSU5HIElOIEFOWSBXQVkgT1VUIE9GIFRIRSBVU0UgT0YgVEhJ UyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GCisgKiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VD SCBEQU1BR0UuCisgKi8KKworI2lmIEVOQUJMRShQTFVHSU5fUFJPQ0VTUykKKworI2luY2x1ZGUg IlBsdWdpbkNvbnRyb2xsZXJQcm94eS5oIgorCisjaW5jbHVkZSAiTm90SW1wbGVtZW50ZWQuaCIK KyNpbmNsdWRlIDx3dGYvdGV4dC9XVEZTdHJpbmcuaD4KKwordXNpbmcgbmFtZXNwYWNlIFdlYkNv cmU7CisKK25hbWVzcGFjZSBXZWJLaXQgeworCitQYXNzUmVmUHRyPFBsdWdpbkNvbnRyb2xsZXJQ cm94eT4gUGx1Z2luQ29udHJvbGxlclByb3h5OjpjcmVhdGUoV2ViUHJvY2Vzc0Nvbm5lY3Rpb24q IGNvbm5lY3Rpb24sIHVpbnQ2NF90IHBsdWdpbkluc3RhbmNlSUQpCit7CisgICAgcmV0dXJuIGFk b3B0UmVmKG5ldyBQbHVnaW5Db250cm9sbGVyUHJveHkoY29ubmVjdGlvbiwgcGx1Z2luSW5zdGFu Y2VJRCkpOworfQorCitQbHVnaW5Db250cm9sbGVyUHJveHk6OlBsdWdpbkNvbnRyb2xsZXJQcm94 eShXZWJQcm9jZXNzQ29ubmVjdGlvbiogY29ubmVjdGlvbiwgdWludDY0X3QgcGx1Z2luSW5zdGFu Y2VJRCkKKyAgICA6IG1fY29ubmVjdGlvbihjb25uZWN0aW9uKQorICAgICwgbV9wbHVnaW5JbnN0 YW5jZUlEKHBsdWdpbkluc3RhbmNlSUQpCit7Cit9CisKK1BsdWdpbkNvbnRyb2xsZXJQcm94eTo6 flBsdWdpbkNvbnRyb2xsZXJQcm94eSgpCit7CisgICAgQVNTRVJUKCFtX3BsdWdpbik7Cit9CisK K3ZvaWQgUGx1Z2luQ29udHJvbGxlclByb3h5OjppbnZhbGlkYXRlKGNvbnN0IEludFJlY3QmKQor eworICAgIG5vdEltcGxlbWVudGVkKCk7Cit9CisKK1N0cmluZyBQbHVnaW5Db250cm9sbGVyUHJv eHk6OnVzZXJBZ2VudChjb25zdCBXZWJDb3JlOjpLVVJMJikKK3sKKyAgICBub3RJbXBsZW1lbnRl ZCgpOworICAgIHJldHVybiBTdHJpbmcoKTsKK30KKwordm9pZCBQbHVnaW5Db250cm9sbGVyUHJv eHk6OmxvYWRVUkwodWludDY0X3QgcmVxdWVzdElELCBjb25zdCBTdHJpbmcmIG1ldGhvZCwgY29u c3QgU3RyaW5nJiB1cmxTdHJpbmcsIGNvbnN0IFN0cmluZyYgdGFyZ2V0LCBjb25zdCBIVFRQSGVh ZGVyTWFwJiBoZWFkZXJGaWVsZHMsIGNvbnN0IFZlY3Rvcjx1aW50OF90PiYgaHR0cEJvZHksIGJv b2wgYWxsb3dQb3B1cHMpCit7CisgICAgbm90SW1wbGVtZW50ZWQoKTsKK30KKwordm9pZCBQbHVn aW5Db250cm9sbGVyUHJveHk6OmNhbmNlbFN0cmVhbUxvYWQodWludDY0X3Qgc3RyZWFtSUQpCit7 CisgICAgbm90SW1wbGVtZW50ZWQoKTsKK30KKwordm9pZCBQbHVnaW5Db250cm9sbGVyUHJveHk6 OmNhbmNlbE1hbnVhbFN0cmVhbUxvYWQoKQoreworICAgIG5vdEltcGxlbWVudGVkKCk7Cit9CisK K05QT2JqZWN0KiBQbHVnaW5Db250cm9sbGVyUHJveHk6OndpbmRvd1NjcmlwdE5QT2JqZWN0KCkK K3sKKyAgICBub3RJbXBsZW1lbnRlZCgpOworICAgIHJldHVybiAwOworfQorCitOUE9iamVjdCog UGx1Z2luQ29udHJvbGxlclByb3h5OjpwbHVnaW5FbGVtZW50TlBPYmplY3QoKQoreworICAgIG5v dEltcGxlbWVudGVkKCk7CisgICAgcmV0dXJuIDA7Cit9CisKK2Jvb2wgUGx1Z2luQ29udHJvbGxl clByb3h5OjpldmFsdWF0ZShOUE9iamVjdCosIGNvbnN0IFN0cmluZyYgc2NyaXB0U3RyaW5nLCBO UFZhcmlhbnQqIHJlc3VsdCwgYm9vbCBhbGxvd1BvcHVwcykKK3sKKyAgICBub3RJbXBsZW1lbnRl ZCgpOworICAgIHJldHVybiBmYWxzZTsKK30KKwordm9pZCBQbHVnaW5Db250cm9sbGVyUHJveHk6 OnNldFN0YXR1c2JhclRleHQoY29uc3QgV1RGOjpTdHJpbmcmKQoreworICAgIG5vdEltcGxlbWVu dGVkKCk7Cit9CisKK2Jvb2wgUGx1Z2luQ29udHJvbGxlclByb3h5Ojppc0FjY2VsZXJhdGVkQ29t cG9zaXRpbmdFbmFibGVkKCkKK3sKKyAgICBub3RJbXBsZW1lbnRlZCgpOworICAgIHJldHVybiBm YWxzZTsKK30KKwordm9pZCBQbHVnaW5Db250cm9sbGVyUHJveHk6OnBsdWdpblByb2Nlc3NDcmFz aGVkKCkKK3sKKyAgICBub3RJbXBsZW1lbnRlZCgpOworfQorCit9IC8vIG5hbWVzcGFjZSBXZWJL aXQKKworI2VuZGlmIC8vIEVOQUJMRShQTFVHSU5fUFJPQ0VTUykKZGlmZiAtLWdpdCBhL1dlYktp dDIvUGx1Z2luUHJvY2Vzcy9QbHVnaW5Db250cm9sbGVyUHJveHkuaCBiL1dlYktpdDIvUGx1Z2lu UHJvY2Vzcy9QbHVnaW5Db250cm9sbGVyUHJveHkuaApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRl eCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi5iNTJhNTY3OGJiNmY3 ZWFjMTZkZjU4N2RhZmQ0MDgzOGMzYWMwZmVhCi0tLSAvZGV2L251bGwKKysrIGIvV2ViS2l0Mi9Q bHVnaW5Qcm9jZXNzL1BsdWdpbkNvbnRyb2xsZXJQcm94eS5oCkBAIC0wLDAgKzEsNzUgQEAKKy8q CisgKiBDb3B5cmlnaHQgKEMpIDIwMTAgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgor ICoKKyAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMs IHdpdGggb3Igd2l0aG91dAorICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVk IHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCisgKiBhcmUgbWV0OgorICogMS4gUmVkaXN0 cmlidXRpb25zIG9mIHNvdXJjZSBjb2RlIG11c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQK KyAqICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcg ZGlzY2xhaW1lci4KKyAqIDIuIFJlZGlzdHJpYnV0aW9ucyBpbiBiaW5hcnkgZm9ybSBtdXN0IHJl cHJvZHVjZSB0aGUgYWJvdmUgY29weXJpZ2h0CisgKiAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBj b25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIgaW4gdGhlCisgKiAgICBkb2N1 bWVudGF0aW9uIGFuZC9vciBvdGhlciBtYXRlcmlhbHMgcHJvdmlkZWQgd2l0aCB0aGUgZGlzdHJp YnV0aW9uLgorICoKKyAqIFRISVMgU09GVFdBUkUgSVMgUFJPVklERUQgQlkgQVBQTEUgSU5DLiBB TkQgSVRTIENPTlRSSUJVVE9SUyBgYEFTIElTJycKKyAqIEFORCBBTlkgRVhQUkVTUyBPUiBJTVBM SUVEIFdBUlJBTlRJRVMsIElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLAorICogVEhFIElN UExJRUQgV0FSUkFOVElFUyBPRiBNRVJDSEFOVEFCSUxJVFkgQU5EIEZJVE5FU1MgRk9SIEEgUEFS VElDVUxBUgorICogUFVSUE9TRSBBUkUgRElTQ0xBSU1FRC4gSU4gTk8gRVZFTlQgU0hBTEwgQVBQ TEUgSU5DLiBPUiBJVFMgQ09OVFJJQlVUT1JTCisgKiBCRSBMSUFCTEUgRk9SIEFOWSBESVJFQ1Qs IElORElSRUNULCBJTkNJREVOVEFMLCBTUEVDSUFMLCBFWEVNUExBUlksIE9SCisgKiBDT05TRVFV RU5USUFMIERBTUFHRVMgKElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLCBQUk9DVVJFTUVO VCBPRgorICogU1VCU1RJVFVURSBHT09EUyBPUiBTRVJWSUNFUzsgTE9TUyBPRiBVU0UsIERBVEEs IE9SIFBST0ZJVFM7IE9SIEJVU0lORVNTCisgKiBJTlRFUlJVUFRJT04pIEhPV0VWRVIgQ0FVU0VE IEFORCBPTiBBTlkgVEhFT1JZIE9GIExJQUJJTElUWSwgV0hFVEhFUiBJTgorICogQ09OVFJBQ1Qs IFNUUklDVCBMSUFCSUxJVFksIE9SIFRPUlQgKElOQ0xVRElORyBORUdMSUdFTkNFIE9SIE9USEVS V0lTRSkKKyAqIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRSBPRiBUSElTIFNPRlRX QVJFLCBFVkVOIElGIEFEVklTRUQgT0YKKyAqIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFH RS4KKyAqLworCisjaWZuZGVmIFBsdWdpbkNvbnRyb2xsZXJQcm94eV9oCisjZGVmaW5lIFBsdWdp bkNvbnRyb2xsZXJQcm94eV9oCisKKyNpZiBFTkFCTEUoUExVR0lOX1BST0NFU1MpCisKKyNpbmNs dWRlICJDb25uZWN0aW9uLmgiCisjaW5jbHVkZSAiUGx1Z2luLmgiCisjaW5jbHVkZSAiUGx1Z2lu Q29udHJvbGxlci5oIgorI2luY2x1ZGUgPHd0Zi9SZWZDb3VudGVkLmg+CisKK25hbWVzcGFjZSBX ZWJLaXQgeworCitjbGFzcyBXZWJQcm9jZXNzQ29ubmVjdGlvbjsKKworY2xhc3MgUGx1Z2luQ29u dHJvbGxlclByb3h5IDogcHVibGljIFJlZkNvdW50ZWQ8UGx1Z2luQ29udHJvbGxlclByb3h5Piwg UGx1Z2luQ29udHJvbGxlciB7CitwdWJsaWM6CisgICAgc3RhdGljIFBhc3NSZWZQdHI8UGx1Z2lu Q29udHJvbGxlclByb3h5PiBjcmVhdGUoV2ViUHJvY2Vzc0Nvbm5lY3Rpb24qIGNvbm5lY3Rpb24s IHVpbnQ2NF90IHBsdWdpbkluc3RhbmNlSUQpOworICAgIH5QbHVnaW5Db250cm9sbGVyUHJveHko KTsKKworICAgIHVpbnQ2NF90IHBsdWdpbkluc3RhbmNlSUQoKSBjb25zdCB7IHJldHVybiBtX3Bs dWdpbkluc3RhbmNlSUQ7IH0KKworcHJpdmF0ZToKKyAgICBQbHVnaW5Db250cm9sbGVyUHJveHko V2ViUHJvY2Vzc0Nvbm5lY3Rpb24qIGNvbm5lY3Rpb24sIHVpbnQ2NF90IHBsdWdpbkluc3RhbmNl SUQpOworCisgICAgLy8gUGx1Z2luQ29udHJvbGxlcgorICAgIHZpcnR1YWwgdm9pZCBpbnZhbGlk YXRlKGNvbnN0IFdlYkNvcmU6OkludFJlY3QmKTsKKyAgICB2aXJ0dWFsIFN0cmluZyB1c2VyQWdl bnQoY29uc3QgV2ViQ29yZTo6S1VSTCYpOworICAgIHZpcnR1YWwgdm9pZCBsb2FkVVJMKHVpbnQ2 NF90IHJlcXVlc3RJRCwgY29uc3QgU3RyaW5nJiBtZXRob2QsIGNvbnN0IFN0cmluZyYgdXJsU3Ry aW5nLCBjb25zdCBTdHJpbmcmIHRhcmdldCwgY29uc3QgV2ViQ29yZTo6SFRUUEhlYWRlck1hcCYg aGVhZGVyRmllbGRzLCBjb25zdCBWZWN0b3I8dWludDhfdD4mIGh0dHBCb2R5LCBib29sIGFsbG93 UG9wdXBzKTsKKyAgICB2aXJ0dWFsIHZvaWQgY2FuY2VsU3RyZWFtTG9hZCh1aW50NjRfdCBzdHJl YW1JRCk7CisgICAgdmlydHVhbCB2b2lkIGNhbmNlbE1hbnVhbFN0cmVhbUxvYWQoKTsKKyAgICB2 aXJ0dWFsIE5QT2JqZWN0KiB3aW5kb3dTY3JpcHROUE9iamVjdCgpOworICAgIHZpcnR1YWwgTlBP YmplY3QqIHBsdWdpbkVsZW1lbnROUE9iamVjdCgpOworICAgIHZpcnR1YWwgYm9vbCBldmFsdWF0 ZShOUE9iamVjdCosIGNvbnN0IFN0cmluZyYgc2NyaXB0U3RyaW5nLCBOUFZhcmlhbnQqIHJlc3Vs dCwgYm9vbCBhbGxvd1BvcHVwcyk7CisgICAgdmlydHVhbCB2b2lkIHNldFN0YXR1c2JhclRleHQo Y29uc3QgU3RyaW5nJik7CisgICAgdmlydHVhbCBib29sIGlzQWNjZWxlcmF0ZWRDb21wb3NpdGlu Z0VuYWJsZWQoKTsKKyAgICB2aXJ0dWFsIHZvaWQgcGx1Z2luUHJvY2Vzc0NyYXNoZWQoKTsKKwor ICAgIC8vIFdlIHVzZSBhIHdlYWsgcmVmZXJlbmNlIHRvIHRoZSB3ZWIgcHJvY2VzcyBjb25uZWN0 aW9uIGJlY2F1c2UgdGhlIFdlYlByb2Nlc3NDb25uZWN0aW9uIGhhcyBhIHN0cm9uZworICAgIC8v IHJlZmVyZW5jZSB0byB0aGUgUGx1Z2luQ29udHJvbGxlclByb3h5IG9iamVjdHMuCisgICAgV2Vi UHJvY2Vzc0Nvbm5lY3Rpb24qIG1fY29ubmVjdGlvbjsKKyAgICB1aW50NjRfdCBtX3BsdWdpbklu c3RhbmNlSUQ7CisKKyAgICBSZWZQdHI8UGx1Z2luPiBtX3BsdWdpbjsKK307CisKK30gLy8gbmFt ZXNwYWNlIFdlYktpdAorCisjZW5kaWYgLy8gRU5BQkxFKFBMVUdJTl9QUk9DRVNTKQorCisjZW5k aWYgLy8gUGx1Z2luQ29udHJvbGxlclByb3h5X2gKZGlmZiAtLWdpdCBhL1dlYktpdDIvUGx1Z2lu UHJvY2Vzcy9XZWJQcm9jZXNzQ29ubmVjdGlvbi5jcHAgYi9XZWJLaXQyL1BsdWdpblByb2Nlc3Mv V2ViUHJvY2Vzc0Nvbm5lY3Rpb24uY3BwCmluZGV4IGIxM2Y4YjM1ZDdiYmQ1N2QyMzgyMjFhZWEw NGQzMWNkMGQ3MzFkODIuLmE1YWNmYTRiOTU2NzkxN2FmNWM0ZGRiOGIwMWI2YzMxNzg3OWM2ZGYg MTAwNjQ0Ci0tLSBhL1dlYktpdDIvUGx1Z2luUHJvY2Vzcy9XZWJQcm9jZXNzQ29ubmVjdGlvbi5j cHAKKysrIGIvV2ViS2l0Mi9QbHVnaW5Qcm9jZXNzL1dlYlByb2Nlc3NDb25uZWN0aW9uLmNwcApA QCAtMjcsNiArMjcsOCBAQAogCiAjaW5jbHVkZSAiV2ViUHJvY2Vzc0Nvbm5lY3Rpb24uaCIKIAor I2luY2x1ZGUgIlBsdWdpbkNvbnRyb2xsZXJQcm94eS5oIgorI2luY2x1ZGUgIlBsdWdpblByb2Nl c3MuaCIKICNpbmNsdWRlICJSdW5Mb29wLmgiCiAKIG5hbWVzcGFjZSBXZWJLaXQgewpAQCAtMzgs NiArNDAsNyBAQCBQYXNzUmVmUHRyPFdlYlByb2Nlc3NDb25uZWN0aW9uPiBXZWJQcm9jZXNzQ29u bmVjdGlvbjo6Y3JlYXRlKENvcmVJUEM6OkNvbm5lY3RpbwogCiBXZWJQcm9jZXNzQ29ubmVjdGlv bjo6fldlYlByb2Nlc3NDb25uZWN0aW9uKCkKIHsKKyAgICBBU1NFUlQobV9wbHVnaW5Db250cm9s bGVycy5pc0VtcHR5KCkpOwogfQogICAgIAogV2ViUHJvY2Vzc0Nvbm5lY3Rpb246OldlYlByb2Nl c3NDb25uZWN0aW9uKENvcmVJUEM6OkNvbm5lY3Rpb246OklkZW50aWZpZXIgY29ubmVjdGlvbklk ZW50aWZpZXIpCkBAIC00Niw2ICs0OSwyOCBAQCBXZWJQcm9jZXNzQ29ubmVjdGlvbjo6V2ViUHJv Y2Vzc0Nvbm5lY3Rpb24oQ29yZUlQQzo6Q29ubmVjdGlvbjo6SWRlbnRpZmllciBjb25uZQogICAg IG1fY29ubmVjdGlvbi0+b3BlbigpOwogfQogCit2b2lkIFdlYlByb2Nlc3NDb25uZWN0aW9uOjph ZGRQbHVnaW5Db250cm9sbGVyUHJveHkoUGx1Z2luQ29udHJvbGxlclByb3h5KiBwbHVnaW5Db250 cm9sbGVyKQoreworICAgIEFTU0VSVCghbV9wbHVnaW5Db250cm9sbGVycy5jb250YWlucyhwbHVn aW5Db250cm9sbGVyLT5wbHVnaW5JbnN0YW5jZUlEKCkpKTsKKyAgICBtX3BsdWdpbkNvbnRyb2xs ZXJzLnNldChwbHVnaW5Db250cm9sbGVyLT5wbHVnaW5JbnN0YW5jZUlEKCksIHBsdWdpbkNvbnRy b2xsZXIpOworfQorCit2b2lkIFdlYlByb2Nlc3NDb25uZWN0aW9uOjpyZW1vdmVQbHVnaW5Db250 cm9sbGVyUHJveHkoUGx1Z2luQ29udHJvbGxlclByb3h5KiBwbHVnaW5Db250cm9sbGVyKQorewor ICAgIEFTU0VSVChtX3BsdWdpbkNvbnRyb2xsZXJzLmNvbnRhaW5zKHBsdWdpbkNvbnRyb2xsZXIt PnBsdWdpbkluc3RhbmNlSUQoKSkpOworICAgIG1fcGx1Z2luQ29udHJvbGxlcnMucmVtb3ZlKHBs dWdpbkNvbnRyb2xsZXItPnBsdWdpbkluc3RhbmNlSUQoKSk7CisKKyAgICBpZiAoIW1fcGx1Z2lu Q29udHJvbGxlcnMuaXNFbXB0eSgpKQorICAgICAgICByZXR1cm47CisKKyAgICAvLyBUaGUgbGFz dCBwbHVnLWluIHdlbnQgYXdheSwgY2xvc2UgdGhpcyBjb25uZWN0aW9uLgorICAgIG1fY29ubmVj dGlvbi0+aW52YWxpZGF0ZSgpOworICAgIG1fY29ubmVjdGlvbiA9IDA7CisKKyAgICAvLyBUaGlz IHdpbGwgY2F1c2UgdXMgdG8gYmUgZGVsZXRlZC4gICAgCisgICAgUGx1Z2luUHJvY2Vzczo6c2hh cmVkKCkucmVtb3ZlV2ViUHJvY2Vzc0Nvbm5lY3Rpb24odGhpcyk7Cit9CisKIHZvaWQgV2ViUHJv Y2Vzc0Nvbm5lY3Rpb246OmRpZFJlY2VpdmVNZXNzYWdlKENvcmVJUEM6OkNvbm5lY3Rpb24qIGNv bm5lY3Rpb24sIENvcmVJUEM6Ok1lc3NhZ2VJRCBtZXNzYWdlSUQsIENvcmVJUEM6OkFyZ3VtZW50 RGVjb2RlciogYXJndW1lbnRzKQogewogICAgIC8vIEZJWE1FOiBJbXBsZW1lbnQuCmRpZmYgLS1n aXQgYS9XZWJLaXQyL1BsdWdpblByb2Nlc3MvV2ViUHJvY2Vzc0Nvbm5lY3Rpb24uaCBiL1dlYktp dDIvUGx1Z2luUHJvY2Vzcy9XZWJQcm9jZXNzQ29ubmVjdGlvbi5oCmluZGV4IGM3ZjRlNzlmOGQ5 ZmVjOTcwN2EyZDZlY2ZhMTIyN2NhOTgyNDIzZjEuLjZmNzkzYWU0ODNlODA4Njk3MzIzMDMwNTkw YjAwZTEwZGFkMmIwNjkgMTAwNjQ0Ci0tLSBhL1dlYktpdDIvUGx1Z2luUHJvY2Vzcy9XZWJQcm9j ZXNzQ29ubmVjdGlvbi5oCisrKyBiL1dlYktpdDIvUGx1Z2luUHJvY2Vzcy9XZWJQcm9jZXNzQ29u bmVjdGlvbi5oCkBAIC0zNCw2ICszNCw4IEBACiAKIG5hbWVzcGFjZSBXZWJLaXQgewogCitjbGFz cyBQbHVnaW5Db250cm9sbGVyUHJveHk7CisgICAgCiAvLyBBIGNvbm5lY3Rpb24gZnJvbSBhIHBs dWctaW4gcHJvY2VzcyB0byBhIHdlYiBwcm9jZXNzLgogCiBjbGFzcyBXZWJQcm9jZXNzQ29ubmVj dGlvbiA6IHB1YmxpYyBSZWZDb3VudGVkPFdlYlByb2Nlc3NDb25uZWN0aW9uPiwgQ29yZUlQQzo6 Q29ubmVjdGlvbjo6Q2xpZW50IHsKQEAgLTQzLDYgKzQ1LDkgQEAgcHVibGljOgogCiAgICAgQ29y ZUlQQzo6Q29ubmVjdGlvbiogY29ubmVjdGlvbigpIGNvbnN0IHsgcmV0dXJuIG1fY29ubmVjdGlv bi5nZXQoKTsgfQogCisgICAgdm9pZCBhZGRQbHVnaW5Db250cm9sbGVyUHJveHkoUGx1Z2luQ29u dHJvbGxlclByb3h5Kik7CisgICAgdm9pZCByZW1vdmVQbHVnaW5Db250cm9sbGVyUHJveHkoUGx1 Z2luQ29udHJvbGxlclByb3h5Kik7CisKIHByaXZhdGU6CiAgICAgV2ViUHJvY2Vzc0Nvbm5lY3Rp b24oQ29yZUlQQzo6Q29ubmVjdGlvbjo6SWRlbnRpZmllcik7CiAKQEAgLTU3LDYgKzYyLDkgQEAg cHJpdmF0ZToKICAgICB2b2lkIGNyZWF0ZVBsdWdpbih1aW50NjRfdCBwbHVnaW5JbnN0YW5jZUlE LCBjb25zdCBQbHVnaW46OlBhcmFtZXRlcnMmLCBib29sJiByZXN1bHQpOwogCiAgICAgUmVmUHRy PENvcmVJUEM6OkNvbm5lY3Rpb24+IG1fY29ubmVjdGlvbjsKKworICAgIEhhc2hNYXA8dWludDY0 X3QsIFJlZlB0cjxQbHVnaW5Db250cm9sbGVyUHJveHk+ID4gbV9wbHVnaW5Db250cm9sbGVyczsK KwogfTsKIAogfSAvLyBuYW1lc3BhY2UgV2ViS2l0CmRpZmYgLS1naXQgYS9XZWJLaXQyL1dlYktp dDIueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvaiBiL1dlYktpdDIvV2ViS2l0Mi54Y29kZXByb2ov cHJvamVjdC5wYnhwcm9qCmluZGV4IGZkZDRhOGEyMzRjNjc5NDUwYjkyNTE5YWY3NmFlNmIzMjE0 M2RiZTIuLmNiZTU0YjQ5YThkMWMwNzgxZmFhOTI2NGZlNDk2ZmEzNmU5N2NkMjggMTAwNjQ0Ci0t LSBhL1dlYktpdDIvV2ViS2l0Mi54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCisrKyBiL1dlYktp dDIvV2ViS2l0Mi54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCkBAIC0xMDgsNiArMTA4LDggQEAK IAkJMUE2RkJBMkIxMUU2ODYyNzAwREIxMzcxIC8qIE5ldHNjYXBlQnJvd3NlckZ1bmNzLmNwcCBp biBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDFBNkZCQTI5MTFF Njg2MjcwMERCMTM3MSAvKiBOZXRzY2FwZUJyb3dzZXJGdW5jcy5jcHAgKi87IH07CiAJCTFBNkZC RDI4MTFFNjlCQzIwMERCMTM3MSAvKiBOZXRzY2FwZVBsdWdpbi5oIGluIEhlYWRlcnMgKi8gPSB7 aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gMUE2RkJEMjYxMUU2OUJDMjAwREIxMzcxIC8q IE5ldHNjYXBlUGx1Z2luLmggKi87IH07CiAJCTFBNkZCRDI5MTFFNjlCQzIwMERCMTM3MSAvKiBO ZXRzY2FwZVBsdWdpbi5jcHAgaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZp bGVSZWYgPSAxQTZGQkQyNzExRTY5QkMyMDBEQjEzNzEgLyogTmV0c2NhcGVQbHVnaW4uY3BwICov OyB9OworCQkxQThFRjRDQjEyNTI0MDM3MDBGNzA2N0YgLyogUGx1Z2luQ29udHJvbGxlclByb3h5 LmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAxQThFRjRD OTEyNTI0MDM3MDBGNzA2N0YgLyogUGx1Z2luQ29udHJvbGxlclByb3h5LmggKi87IH07CisJCTFB OEVGNENDMTI1MjQwMzcwMEY3MDY3RiAvKiBQbHVnaW5Db250cm9sbGVyUHJveHkuY3BwIGluIFNv dXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gMUE4RUY0Q0ExMjUyNDAz NzAwRjcwNjdGIC8qIFBsdWdpbkNvbnRyb2xsZXJQcm94eS5jcHAgKi87IH07CiAJCTFBQTFDQzVE MTAwRkExQTEwMDc4REVCQyAvKiBRdWFydHpDb3JlLmZyYW1ld29yayBpbiBGcmFtZXdvcmtzICov ID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDFBQTFDQzVDMTAwRkExQTEwMDc4REVC QyAvKiBRdWFydHpDb3JlLmZyYW1ld29yayAqLzsgfTsKIAkJMUFBMUNEMDcxMDBGQTFCQTAwNzhE RUJDIC8qIENhcmJvbi5mcmFtZXdvcmsgaW4gRnJhbWV3b3JrcyAqLyA9IHtpc2EgPSBQQlhCdWls ZEZpbGU7IGZpbGVSZWYgPSAxQUExQ0QwNjEwMEZBMUJBMDA3OERFQkMgLyogQ2FyYm9uLmZyYW1l d29yayAqLzsgfTsKIAkJMUFBNTZGMjkxMUU5MkJDODAwNjFCODgyIC8qIFBsdWdpbkNvbnRyb2xs ZXIuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDFBQTU2 RjI4MTFFOTJCQzgwMDYxQjg4MiAvKiBQbHVnaW5Db250cm9sbGVyLmggKi87IH07CkBAIC01MzUs NiArNTM3LDggQEAKIAkJMUE2RkJBMjkxMUU2ODYyNzAwREIxMzcxIC8qIE5ldHNjYXBlQnJvd3Nl ckZ1bmNzLmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0 OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLmNwcDsgcGF0aCA9IE5ldHNjYXBl QnJvd3NlckZ1bmNzLmNwcDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJMUE2RkJEMjYx MUU2OUJDMjAwREIxMzcxIC8qIE5ldHNjYXBlUGx1Z2luLmggKi8gPSB7aXNhID0gUEJYRmlsZVJl ZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2Rl LmMuaDsgcGF0aCA9IE5ldHNjYXBlUGx1Z2luLmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07 CiAJCTFBNkZCRDI3MTFFNjlCQzIwMERCMTM3MSAvKiBOZXRzY2FwZVBsdWdpbi5jcHAgKi8gPSB7 aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5 cGUgPSBzb3VyY2Vjb2RlLmNwcC5jcHA7IHBhdGggPSBOZXRzY2FwZVBsdWdpbi5jcHA7IHNvdXJj ZVRyZWUgPSAiPGdyb3VwPiI7IH07CisJCTFBOEVGNEM5MTI1MjQwMzcwMEY3MDY3RiAvKiBQbHVn aW5Db250cm9sbGVyUHJveHkuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5j b2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0gUGx1 Z2luQ29udHJvbGxlclByb3h5Lmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CisJCTFBOEVG NENBMTI1MjQwMzcwMEY3MDY3RiAvKiBQbHVnaW5Db250cm9sbGVyUHJveHkuY3BwICovID0ge2lz YSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBl ID0gc291cmNlY29kZS5jcHAuY3BwOyBwYXRoID0gUGx1Z2luQ29udHJvbGxlclByb3h5LmNwcDsg c291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJMUFBMUM3OUExMDBFN0ZDNTAwNzhERUJDIC8q IFdlYkNvcmUuZnJhbWV3b3JrICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGxhc3RLbm93 bkZpbGVUeXBlID0gd3JhcHBlci5mcmFtZXdvcms7IHBhdGggPSBXZWJDb3JlLmZyYW1ld29yazsg c291cmNlVHJlZSA9IEJVSUxUX1BST0RVQ1RTX0RJUjsgfTsKIAkJMUFBMUM3REUxMDBFODQ2RTAw NzhERUJDIC8qIEphdmFTY3JpcHRDb3JlLmZyYW1ld29yayAqLyA9IHtpc2EgPSBQQlhGaWxlUmVm ZXJlbmNlOyBsYXN0S25vd25GaWxlVHlwZSA9IHdyYXBwZXIuZnJhbWV3b3JrOyBwYXRoID0gSmF2 YVNjcmlwdENvcmUuZnJhbWV3b3JrOyBzb3VyY2VUcmVlID0gQlVJTFRfUFJPRFVDVFNfRElSOyB9 OwogCQkxQUExQ0M1QzEwMEZBMUExMDA3OERFQkMgLyogUXVhcnR6Q29yZS5mcmFtZXdvcmsgKi8g PSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgbGFzdEtub3duRmlsZVR5cGUgPSB3cmFwcGVyLmZy YW1ld29yazsgbmFtZSA9IFF1YXJ0ekNvcmUuZnJhbWV3b3JrOyBwYXRoID0gL1N5c3RlbS9MaWJy YXJ5L0ZyYW1ld29ya3MvUXVhcnR6Q29yZS5mcmFtZXdvcms7IHNvdXJjZVRyZWUgPSAiPGFic29s dXRlPiI7IH07CkBAIC05NTIsNiArOTU2LDggQEAKIAkJCWlzYSA9IFBCWEdyb3VwOwogCQkJY2hp bGRyZW4gPSAoCiAJCQkJMUEwRUM3RkQxMjRCRDQwMjAwN0VGNEE1IC8qIG1hYyAqLywKKwkJCQkx QThFRjRDQTEyNTI0MDM3MDBGNzA2N0YgLyogUGx1Z2luQ29udHJvbGxlclByb3h5LmNwcCAqLywK KwkJCQkxQThFRjRDOTEyNTI0MDM3MDBGNzA2N0YgLyogUGx1Z2luQ29udHJvbGxlclByb3h5Lmgg Ki8sCiAJCQkJMUEwNDM5NzUxMjREMDM0ODAwRkZCRkI1IC8qIFBsdWdpblByb2Nlc3MuY3BwICov LAogCQkJCTFBMDQzOTc0MTI0RDAzNDgwMEZGQkZCNSAvKiBQbHVnaW5Qcm9jZXNzLmggKi8sCiAJ CQkJMUEwRUM2QjExMjRCQkQzNjAwN0VGNEE1IC8qIFBsdWdpblByb2Nlc3MubWVzc2FnZXMuaW4g Ki8sCkBAIC0xODcxLDYgKzE4NzcsNyBAQAogCQkJCUJDNDA3ODNEMTI1MEZBREQwMDY4RjIwQSAv KiBXS0V2ZW50LmggaW4gSGVhZGVycyAqLywKIAkJCQkxQTA0M0RDMTEyNEZGODc1MDBGRkJGQjUg LyogUGx1Z2luUHJveHkuaCBpbiBIZWFkZXJzICovLAogCQkJCTFBMDQzRjZBMTI1MTREOEIwMEZG QkZCNSAvKiBXZWJQcm9jZXNzQ29ubmVjdGlvbk1lc3NhZ2VzLmggaW4gSGVhZGVycyAqLywKKwkJ CQkxQThFRjRDQjEyNTI0MDM3MDBGNzA2N0YgLyogUGx1Z2luQ29udHJvbGxlclByb3h5LmggaW4g SGVhZGVycyAqLywKIAkJCSk7CiAJCQlydW5Pbmx5Rm9yRGVwbG95bWVudFBvc3Rwcm9jZXNzaW5n ID0gMDsKIAkJfTsKQEAgLTIxNTksNiArMjE2Niw3IEBACiAJCQkJMUEwNDNEOTIxMjRGRjAyQjAw RkZCRkI1IC8qIEJhY2tpbmdTdG9yZU1hYy5tbSBpbiBTb3VyY2VzICovLAogCQkJCTFBMDQzREMy MTI0RkY4NzUwMEZGQkZCNSAvKiBQbHVnaW5Qcm94eS5jcHAgaW4gU291cmNlcyAqLywKIAkJCQkx QTA0M0Y2OTEyNTE0RDhCMDBGRkJGQjUgLyogV2ViUHJvY2Vzc0Nvbm5lY3Rpb25NZXNzYWdlUmVj ZWl2ZXIuY3BwIGluIFNvdXJjZXMgKi8sCisJCQkJMUE4RUY0Q0MxMjUyNDAzNzAwRjcwNjdGIC8q IFBsdWdpbkNvbnRyb2xsZXJQcm94eS5jcHAgaW4gU291cmNlcyAqLywKIAkJCSk7CiAJCQlydW5P bmx5Rm9yRGVwbG95bWVudFBvc3Rwcm9jZXNzaW5nID0gMDsKIAkJfTsK