35565 2010-03-01 23:44:33 -0800 Google Analytics triggers "blocked plugin" UI 2010-03-02 19:17:02 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 abarth webkit-unassigned commit-queue fishd pkasting oldest_to_newest 194961 0 abarth 2010-03-01 23:44:33 -0800 Google Analytics triggers "blocked plugin" UI 194963 1 49784 abarth 2010-03-01 23:47:00 -0800 Created attachment 49784 Patch 194964 2 abarth 2010-03-01 23:48:22 -0800 http://code.google.com/p/chromium/issues/detail?id=36879 194975 3 49784 fishd 2010-03-02 00:27:36 -0800 Comment on attachment 49784 Patch Thanks for working on this! Just some minor issues: > +++ b/WebCore/loader/FrameLoader.cpp > + const bool allowed = m_client->allowPlugins(settings && settings->arePluginsEnabled()); nit: gratuitous const :) > +++ b/WebCore/loader/FrameLoader.h > @@ -82,6 +82,11 @@ class Widget; > struct FrameLoadRequest; > struct WindowFeatures; > > +enum ReasonForCallingAllowPlugins { > + AboutToInstantiatePlugin, > + NotAboutToInstantiatePlugin > +}; ^^^ maybe this should go in FrameLoaderTypes.h? > +++ b/WebCore/loader/MainResourceLoader.cpp ... > + if (!m_frame->loader()->allowPlugins(NowAboutToInstantiatePlugin)) NowAboutToInstantiatePlugin -> AboutToInstantiatePlugin, right? > +++ b/WebKit/chromium/public/WebFrameClient.h > + // Notifies the client that the frame would have instanitated a plug-in if plug-ins were enabled. instanitated -> instantiated 195070 4 49809 abarth 2010-03-02 09:31:07 -0800 Created attachment 49809 Patch 195071 5 abarth 2010-03-02 09:32:50 -0800 > nit: gratuitous const :) Removed. > ^^^ maybe this should go in FrameLoaderTypes.h? Done. > > +++ b/WebCore/loader/MainResourceLoader.cpp > ... > > + if (!m_frame->loader()->allowPlugins(NowAboutToInstantiatePlugin)) > > NowAboutToInstantiatePlugin -> AboutToInstantiatePlugin, right? "Now" is a typo. I think it's supposed to be "Not". > instanitated -> instantiated Fixed. 195359 6 49809 commit-queue 2010-03-02 19:16:57 -0800 Comment on attachment 49809 Patch Clearing flags on attachment: 49809 Committed r55449: <http://trac.webkit.org/changeset/55449> 195360 7 commit-queue 2010-03-02 19:17:02 -0800 All reviewed patches have been landed. Closing bug. 49784 2010-03-01 23:47:00 -0800 2010-03-02 09:30:57 -0800 Patch bug-35565-20100301234658.patch text/plain 9795 abarth ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg ODEzZjQwZC4uMmNkZjEyMyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwzNCBAQAorMjAxMC0wMy0wMSAgQWRhbSBCYXJ0aCAg PGFiYXJ0aEB3ZWJraXQub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIEdvb2dsZSBBbmFseXRpY3MgdHJpZ2dlcnMgImJsb2NrZWQgcGx1Z2luIiBV SQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzU1NjUK KworICAgICAgICBKdXN0IGxpa2UgZm9yIHJ1bm5pbmcgc2NyaXB0LCB3ZSBuZWVkIHRvIGRpc3Rp bmd1aXNoIGJldHdlZW4gcXVlcnlpbmcKKyAgICAgICAgd2hldGhlciBwbHVnLWlucyBhcmUgZW5h YmxlZCBhbmQgYWN0dWFsbHkgYmxvY2tpbmcgYSBwYWdlIGZyb20KKyAgICAgICAgaW5zdGFudGlh dGluZyBhIHBsdWdpbi4gIFdlIG5lZWQgdG8gaXNzdWUgZGlmZmVyZW50IGNhbGxiYWNrcyB0byB0 aGUKKyAgICAgICAgRnJhbWVMb2FkZXJDbGllbnQgc28gdGhhdCB0aGUgY2xpZW50IGNhbiBpbmZv cm0gdXMgdGhhdCBwbHVnLWlucyBhcmUKKyAgICAgICAgZGlzYWJsZWQgaW4gc29tZSBjYXNlcyB3 aXRob3V0IHNob3dpbmcgdGhlICJwbHVnLWluIGJsb2NrZWQiIFVJLgorCisgICAgICAgICogZG9t L0RPTUltcGxlbWVudGF0aW9uLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkRPTUltcGxlbWVudGF0 aW9uOjpjcmVhdGVEb2N1bWVudCk6CisgICAgICAgICogbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OkZyYW1lTG9hZGVyOjpyZXF1ZXN0T2JqZWN0KToKKyAgICAgICAg KFdlYkNvcmU6OkZyYW1lTG9hZGVyOjphbGxvd1BsdWdpbnMpOgorICAgICAgICAqIGxvYWRlci9G cmFtZUxvYWRlci5oOgorICAgICAgICAoV2ViQ29yZTo6KToKKyAgICAgICAgKiBsb2FkZXIvRnJh bWVMb2FkZXJDbGllbnQuaDoKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lTG9hZGVyQ2xpZW50Ojpk aWROb3RBbGxvd1BsdWdpbnMpOgorICAgICAgICAqIGxvYWRlci9NYWluUmVzb3VyY2VMb2FkZXIu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6TWFpblJlc291cmNlTG9hZGVyOjpzdWJzdGl0dXRlTUlN RVR5cGVGcm9tUGx1Z2luRGF0YWJhc2UpOgorICAgICAgICAqIGxvYWRlci9QbHVnaW5Eb2N1bWVu dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpQbHVnaW5Ub2tlbml6ZXI6OndyaXRlUmF3RGF0YSk6 CisgICAgICAgICogcGFnZS9QYWdlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlBhZ2U6OnBsdWdp bkRhdGEpOgorICAgICAgICAqIHBsdWdpbnMvTWltZVR5cGUuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6TWltZVR5cGU6OmVuYWJsZWRQbHVnaW4pOgorCiAyMDEwLTAzLTAxICBGcmlkcmljaCBTdHJi YSAgPGZyaWRyaWNoLnN0cmJhQGJsdWV3aW4uY2g+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgSG9s Z2VyIEZyZXl0aGVyLgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9kb20vRE9NSW1wbGVtZW50YXRpb24u Y3BwIGIvV2ViQ29yZS9kb20vRE9NSW1wbGVtZW50YXRpb24uY3BwCmluZGV4IDRhMDA4MmQuLjNj ZGFlOWIgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvZG9tL0RPTUltcGxlbWVudGF0aW9uLmNwcAorKysg Yi9XZWJDb3JlL2RvbS9ET01JbXBsZW1lbnRhdGlvbi5jcHAKQEAgLTMzOCw3ICszMzgsNyBAQCBQ YXNzUmVmUHRyPERvY3VtZW50PiBET01JbXBsZW1lbnRhdGlvbjo6Y3JlYXRlRG9jdW1lbnQoY29u c3QgU3RyaW5nJiB0eXBlLCBGcmFtZQogI2VuZGlmCiAKICAgICBQbHVnaW5EYXRhKiBwbHVnaW5E YXRhID0gMDsKLSAgICBpZiAoZnJhbWUgJiYgZnJhbWUtPnBhZ2UoKSAmJiBmcmFtZS0+bG9hZGVy KCktPmNsaWVudCgpLT5hbGxvd1BsdWdpbnMoZnJhbWUtPnBhZ2UoKS0+c2V0dGluZ3MoKS0+YXJl UGx1Z2luc0VuYWJsZWQoKSkpCisgICAgaWYgKGZyYW1lICYmIGZyYW1lLT5wYWdlKCkgJiYgZnJh bWUtPmxvYWRlcigpLT5hbGxvd1BsdWdpbnMoTm90QWJvdXRUb0luc3RhbnRpYXRlUGx1Z2luKSkK ICAgICAgICAgcGx1Z2luRGF0YSA9IGZyYW1lLT5wYWdlKCktPnBsdWdpbkRhdGEoKTsKIAogICAg IC8vIFBERiBpcyBvbmUgaW1hZ2UgdHlwZSBmb3Igd2hpY2ggYSBwbHVnaW4gY2FuIG92ZXJyaWRl IGJ1aWx0LWluIHN1cHBvcnQuCmRpZmYgLS1naXQgYS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRl ci5jcHAgYi9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAKaW5kZXggMWNmZjFiMy4uOGNi MTYzMCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwCisrKyBiL1dl YkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcApAQCAtMTI3Nyw3ICsxMjc3LDcgQEAgYm9vbCBG cmFtZUxvYWRlcjo6cmVxdWVzdE9iamVjdChSZW5kZXJQYXJ0KiByZW5kZXJlciwgY29uc3QgU3Ry aW5nJiB1cmwsIGNvbnN0IEEKICAgICBib29sIHVzZUZhbGxiYWNrOwogICAgIGlmIChzaG91bGRV c2VQbHVnaW4oY29tcGxldGVkVVJMLCBtaW1lVHlwZSwgcmVuZGVyZXItPmhhc0ZhbGxiYWNrQ29u dGVudCgpLCB1c2VGYWxsYmFjaykpIHsKICAgICAgICAgU2V0dGluZ3MqIHNldHRpbmdzID0gbV9m cmFtZS0+c2V0dGluZ3MoKTsKLSAgICAgICAgaWYgKCFtX2NsaWVudC0+YWxsb3dQbHVnaW5zKHNl dHRpbmdzICYmIHNldHRpbmdzLT5hcmVQbHVnaW5zRW5hYmxlZCgpKQorICAgICAgICBpZiAoIWFs bG93UGx1Z2lucyhBYm91dFRvSW5zdGFudGlhdGVQbHVnaW4pCiAgICAgICAgICAgICB8fCAoIXNl dHRpbmdzLT5pc0phdmFFbmFibGVkKCkgJiYgTUlNRVR5cGVSZWdpc3RyeTo6aXNKYXZhQXBwbGV0 TUlNRVR5cGUobWltZVR5cGUpKSkKICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICAgICAg aWYgKGlzRG9jdW1lbnRTYW5kYm94ZWQoU2FuZGJveFBsdWdpbnMpKQpAQCAtMTgxMiw2ICsxODEy LDE1IEBAIHZvaWQgRnJhbWVMb2FkZXI6OnN0YXJ0ZWQoKQogICAgICAgICBmcmFtZS0+bG9hZGVy KCktPm1faXNDb21wbGV0ZSA9IGZhbHNlOwogfQogCitib29sIEZyYW1lTG9hZGVyOjphbGxvd1Bs dWdpbnMoUmVhc29uRm9yQ2FsbGluZ0FsbG93UGx1Z2lucyByZWFzb24pCit7CisgICAgU2V0dGlu Z3MqIHNldHRpbmdzID0gbV9mcmFtZS0+c2V0dGluZ3MoKTsKKyAgICBjb25zdCBib29sIGFsbG93 ZWQgPSBtX2NsaWVudC0+YWxsb3dQbHVnaW5zKHNldHRpbmdzICYmIHNldHRpbmdzLT5hcmVQbHVn aW5zRW5hYmxlZCgpKTsKKyAgICBpZiAoIWFsbG93ZWQgJiYgcmVhc29uID09IEFib3V0VG9JbnN0 YW50aWF0ZVBsdWdpbikKKyAgICAgICAgbV9mcmFtZS0+bG9hZGVyKCktPmNsaWVudCgpLT5kaWRO b3RBbGxvd1BsdWdpbnMoKTsKKyAgICByZXR1cm4gYWxsb3dlZDsKK30KKwogYm9vbCBGcmFtZUxv YWRlcjo6Y29udGFpbnNQbHVnaW5zKCkgY29uc3QgCiB7IAogICAgIHJldHVybiBtX2NvbnRhaW5z UGx1Z0luczsKZGlmZiAtLWdpdCBhL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmggYi9XZWJD b3JlL2xvYWRlci9GcmFtZUxvYWRlci5oCmluZGV4IDY1MzM0NDUuLmFkMWNiMzcgMTAwNjQ0Ci0t LSBhL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmgKKysrIGIvV2ViQ29yZS9sb2FkZXIvRnJh bWVMb2FkZXIuaApAQCAtODIsNiArODIsMTEgQEAgY2xhc3MgV2lkZ2V0Owogc3RydWN0IEZyYW1l TG9hZFJlcXVlc3Q7CiBzdHJ1Y3QgV2luZG93RmVhdHVyZXM7CiAKK2VudW0gUmVhc29uRm9yQ2Fs bGluZ0FsbG93UGx1Z2lucyB7CisgICAgQWJvdXRUb0luc3RhbnRpYXRlUGx1Z2luLAorICAgIE5v dEFib3V0VG9JbnN0YW50aWF0ZVBsdWdpbgorfTsKKwogYm9vbCBpc0JhY2tGb3J3YXJkTG9hZFR5 cGUoRnJhbWVMb2FkVHlwZSk7CiAKIGNsYXNzIEZyYW1lTG9hZGVyIDogcHVibGljIE5vbmNvcHlh YmxlIHsKQEAgLTI4MCw2ICsyODUsNyBAQCBwdWJsaWM6CiAgICAgdm9pZCBzZXRSZXNwb25zZU1J TUVUeXBlKGNvbnN0IFN0cmluZyYpOwogICAgIGNvbnN0IFN0cmluZyYgcmVzcG9uc2VNSU1FVHlw ZSgpIGNvbnN0OwogCisgICAgYm9vbCBhbGxvd1BsdWdpbnMoUmVhc29uRm9yQ2FsbGluZ0FsbG93 UGx1Z2lucyk7CiAgICAgYm9vbCBjb250YWluc1BsdWdpbnMoKSBjb25zdDsKIAogICAgIHZvaWQg bG9hZERvbmUoKTsKZGlmZiAtLWdpdCBhL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyQ2xpZW50 LmggYi9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlckNsaWVudC5oCmluZGV4IDc1NTZiYmMuLmUy OWM4ODIgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyQ2xpZW50LmgKKysr IGIvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXJDbGllbnQuaApAQCAtMjY3LDYgKzI2Nyw4IEBA IG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgLy8gdGhhdCBuZWVkIHRvIGtub3cgaWYgSmF2 YVNjcmlwdCBpcyBlbmFibGVkIGJ1dCBhcmUgbm90IG5lY2Vzc2FyaWx5CiAgICAgICAgIC8vIHBy ZXBhcmluZyB0byBleGVjdXRlIHNjcmlwdC4KICAgICAgICAgdmlydHVhbCB2b2lkIGRpZE5vdEFs bG93U2NyaXB0KCkgeyB9CisgICAgICAgIC8vIFRoaXMgY2FsbGJhY2sgaXMgc2ltaWxhciwgYnV0 IGZvciBwbHVnaW5zLgorICAgICAgICB2aXJ0dWFsIHZvaWQgZGlkTm90QWxsb3dQbHVnaW5zKCkg eyB9CiAgICAgfTsKIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpkaWZmIC0tZ2l0IGEvV2ViQ29y ZS9sb2FkZXIvTWFpblJlc291cmNlTG9hZGVyLmNwcCBiL1dlYkNvcmUvbG9hZGVyL01haW5SZXNv dXJjZUxvYWRlci5jcHAKaW5kZXggZDc0NjdkMS4uOGZhYmZjOSAxMDA2NDQKLS0tIGEvV2ViQ29y ZS9sb2FkZXIvTWFpblJlc291cmNlTG9hZGVyLmNwcAorKysgYi9XZWJDb3JlL2xvYWRlci9NYWlu UmVzb3VyY2VMb2FkZXIuY3BwCkBAIC0yODUsNyArMjg1LDcgQEAgdm9pZCBNYWluUmVzb3VyY2VM b2FkZXI6OmNvbnRpbnVlQWZ0ZXJDb250ZW50UG9saWN5KFBvbGljeUFjdGlvbiBwb2xpY3kpCiAj aWYgUExBVEZPUk0oUVQpCiB2b2lkIE1haW5SZXNvdXJjZUxvYWRlcjo6c3Vic3RpdHV0ZU1JTUVU eXBlRnJvbVBsdWdpbkRhdGFiYXNlKGNvbnN0IFJlc291cmNlUmVzcG9uc2UmIHIpCiB7Ci0gICAg aWYgKCFtX2ZyYW1lLT5sb2FkZXIoKS0+Y2xpZW50KCktPmFsbG93UGx1Z2lucyhtX2ZyYW1lLT5z ZXR0aW5ncygpLT5hcmVQbHVnaW5zRW5hYmxlZCgpKSkKKyAgICBpZiAoIW1fZnJhbWUtPmxvYWRl cigpLT5hbGxvd1BsdWdpbnMoTm93QWJvdXRUb0luc3RhbnRpYXRlUGx1Z2luKSkKICAgICAgICAg cmV0dXJuOwogCiAgICAgU3RyaW5nIGZpbGVuYW1lID0gci51cmwoKS5sYXN0UGF0aENvbXBvbmVu dCgpOwpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9sb2FkZXIvUGx1Z2luRG9jdW1lbnQuY3BwIGIvV2Vi Q29yZS9sb2FkZXIvUGx1Z2luRG9jdW1lbnQuY3BwCmluZGV4IGQ3MTA3NDYuLjYwNGRlZmMgMTAw NjQ0Ci0tLSBhL1dlYkNvcmUvbG9hZGVyL1BsdWdpbkRvY3VtZW50LmNwcAorKysgYi9XZWJDb3Jl L2xvYWRlci9QbHVnaW5Eb2N1bWVudC5jcHAKQEAgLTEwNCw3ICsxMDQsNyBAQCBib29sIFBsdWdp blRva2VuaXplcjo6d3JpdGVSYXdEYXRhKGNvbnN0IGNoYXIqLCBpbnQpCiAKICAgICBpZiAoRnJh bWUqIGZyYW1lID0gbV9kb2MtPmZyYW1lKCkpIHsKICAgICAgICAgU2V0dGluZ3MqIHNldHRpbmdz ID0gZnJhbWUtPnNldHRpbmdzKCk7Ci0gICAgICAgIGlmIChzZXR0aW5ncyAmJiBmcmFtZS0+bG9h ZGVyKCktPmNsaWVudCgpLT5hbGxvd1BsdWdpbnMoc2V0dGluZ3MtPmFyZVBsdWdpbnNFbmFibGVk KCkpKSB7CisgICAgICAgIGlmIChzZXR0aW5ncyAmJiBmcmFtZS0+bG9hZGVyKCktPmFsbG93UGx1 Z2lucyhOb3RBYm91dFRvSW5zdGFudGlhdGVQbHVnaW4pKSB7CiAgICAgICAgICAgICBtX2RvYy0+ dXBkYXRlTGF5b3V0KCk7CiAKICAgICAgICAgICAgIGlmIChSZW5kZXJXaWRnZXQqIHJlbmRlcmVy ID0gdG9SZW5kZXJXaWRnZXQobV9lbWJlZEVsZW1lbnQtPnJlbmRlcmVyKCkpKSB7CmRpZmYgLS1n aXQgYS9XZWJDb3JlL3BhZ2UvUGFnZS5jcHAgYi9XZWJDb3JlL3BhZ2UvUGFnZS5jcHAKaW5kZXgg ZmQyMzVhNy4uZWM2NTI1MiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wYWdlL1BhZ2UuY3BwCisrKyBi L1dlYkNvcmUvcGFnZS9QYWdlLmNwcApAQCAtMzg5LDcgKzM4OSw3IEBAIHZvaWQgUGFnZTo6cmVm cmVzaFBsdWdpbnMoYm9vbCByZWxvYWQpCiAKIFBsdWdpbkRhdGEqIFBhZ2U6OnBsdWdpbkRhdGEo KSBjb25zdAogewotICAgIGlmICghbWFpbkZyYW1lKCktPmxvYWRlcigpLT5jbGllbnQoKS0+YWxs b3dQbHVnaW5zKHNldHRpbmdzKCktPmFyZVBsdWdpbnNFbmFibGVkKCkpKQorICAgIGlmICghbWFp bkZyYW1lKCktPmxvYWRlcigpLT5hbGxvd1BsdWdpbnMoTm90QWJvdXRUb0luc3RhbnRpYXRlUGx1 Z2luKSkKICAgICAgICAgcmV0dXJuIDA7CiAgICAgaWYgKCFtX3BsdWdpbkRhdGEpCiAgICAgICAg IG1fcGx1Z2luRGF0YSA9IFBsdWdpbkRhdGE6OmNyZWF0ZSh0aGlzKTsKZGlmZiAtLWdpdCBhL1dl YkNvcmUvcGx1Z2lucy9NaW1lVHlwZS5jcHAgYi9XZWJDb3JlL3BsdWdpbnMvTWltZVR5cGUuY3Bw CmluZGV4IGFjOTE4MWMuLjk1NDcxNWEgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGx1Z2lucy9NaW1l VHlwZS5jcHAKKysrIGIvV2ViQ29yZS9wbHVnaW5zL01pbWVUeXBlLmNwcApAQCAtNTYsNyArNTYs NyBAQCBjb25zdCBTdHJpbmcgJk1pbWVUeXBlOjpkZXNjcmlwdGlvbigpIGNvbnN0CiBQYXNzUmVm UHRyPFBsdWdpbj4gTWltZVR5cGU6OmVuYWJsZWRQbHVnaW4oKSBjb25zdAogewogICAgIGNvbnN0 IFBhZ2UqIHAgPSBtX3BsdWdpbkRhdGEtPnBhZ2UoKTsKLSAgICBpZiAoIXAgfHwgIXAtPm1haW5G cmFtZSgpLT5sb2FkZXIoKS0+Y2xpZW50KCktPmFsbG93UGx1Z2lucyhwLT5zZXR0aW5ncygpLT5h cmVQbHVnaW5zRW5hYmxlZCgpKSkKKyAgICBpZiAoIXAgfHwgIXAtPm1haW5GcmFtZSgpLT5sb2Fk ZXIoKS0+YWxsb3dQbHVnaW5zKE5vdEFib3V0VG9JbnN0YW50aWF0ZVBsdWdpbikpCiAgICAgICAg IHJldHVybiAwOwogCiAgICAgY29uc3QgUGx1Z2luSW5mbyAqaW5mbyA9IG1fcGx1Z2luRGF0YS0+ bWltZXMoKVttX2luZGV4XS0+cGx1Z2luOwpkaWZmIC0tZ2l0IGEvV2ViS2l0L2Nocm9taXVtL0No YW5nZUxvZyBiL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKaW5kZXggMzk4YThjNi4uYzAzOWM0 NyAxMDA2NDQKLS0tIGEvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZworKysgYi9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMTAtMDMtMDEgIEFkYW0gQmFydGgg IDxhYmFydGhAd2Via2l0Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBHb29nbGUgQW5hbHl0aWNzIHRyaWdnZXJzICJibG9ja2VkIHBsdWdpbiIg VUkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM1NTY1 CisKKyAgICAgICAgUGx1bWIgZGlkTm90QWxsb3dQbHVnaW5zIHRvIHRoZSBjbGllbnQuCisKKyAg ICAgICAgKiBwdWJsaWMvV2ViRnJhbWVDbGllbnQuaDoKKyAgICAgICAgKFdlYktpdDo6V2ViRnJh bWVDbGllbnQ6OmRpZE5vdEFsbG93UGx1Z2lucyk6CisgICAgICAgICogc3JjL0ZyYW1lTG9hZGVy Q2xpZW50SW1wbC5jcHA6CisgICAgICAgIChXZWJLaXQ6OkZyYW1lTG9hZGVyQ2xpZW50SW1wbDo6 ZGlkTm90QWxsb3dQbHVnaW5zKToKKyAgICAgICAgKiBzcmMvRnJhbWVMb2FkZXJDbGllbnRJbXBs Lmg6CisKIDIwMTAtMDItMjcgIFBhdmVsIEZlbGRtYW4gIDxwZmVsZG1hbkBjaHJvbWl1bS5vcmc+ CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgVGltb3RoeSBIYXRjaGVyLgpkaWZmIC0tZ2l0IGEvV2Vi S2l0L2Nocm9taXVtL3B1YmxpYy9XZWJGcmFtZUNsaWVudC5oIGIvV2ViS2l0L2Nocm9taXVtL3B1 YmxpYy9XZWJGcmFtZUNsaWVudC5oCmluZGV4IDkwNzYzODYuLjJkYzU5MzkgMTAwNjQ0Ci0tLSBh L1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViRnJhbWVDbGllbnQuaAorKysgYi9XZWJLaXQvY2hy b21pdW0vcHVibGljL1dlYkZyYW1lQ2xpZW50LmgKQEAgLTkxLDYgKzkxLDkgQEAgcHVibGljOgog ICAgIC8vIENvbnRyb2xzIHdoZXRoZXIgcGx1Z2lucyBhcmUgYWxsb3dlZCBmb3IgdGhpcyBmcmFt ZS4KICAgICB2aXJ0dWFsIGJvb2wgYWxsb3dQbHVnaW5zKFdlYkZyYW1lKiwgYm9vbCBlbmFibGVk UGVyU2V0dGluZ3MpIHsgcmV0dXJuIGVuYWJsZWRQZXJTZXR0aW5nczsgfQogCisgICAgLy8gTm90 aWZpZXMgdGhlIGNsaWVudCB0aGF0IHRoZSBmcmFtZSB3b3VsZCBoYXZlIGluc3Rhbml0YXRlZCBh IHBsdWctaW4gaWYgcGx1Zy1pbnMgd2VyZSBlbmFibGVkLgorICAgIHZpcnR1YWwgdm9pZCBkaWRO b3RBbGxvd1BsdWdpbnMoV2ViRnJhbWUqKSB7IH0KKwogICAgIC8vIENvbnRyb2xzIHdoZXRoZXIg aW1hZ2VzIGFyZSBhbGxvd2VkIGZvciB0aGlzIGZyYW1lLgogICAgIHZpcnR1YWwgYm9vbCBhbGxv d0ltYWdlcyhXZWJGcmFtZSosIGJvb2wgZW5hYmxlZFBlclNldHRpbmdzKSB7IHJldHVybiBlbmFi bGVkUGVyU2V0dGluZ3M7IH0KIApkaWZmIC0tZ2l0IGEvV2ViS2l0L2Nocm9taXVtL3NyYy9GcmFt ZUxvYWRlckNsaWVudEltcGwuY3BwIGIvV2ViS2l0L2Nocm9taXVtL3NyYy9GcmFtZUxvYWRlckNs aWVudEltcGwuY3BwCmluZGV4IDM1ODUzMzkuLmM4NGYxMWEgMTAwNjQ0Ci0tLSBhL1dlYktpdC9j aHJvbWl1bS9zcmMvRnJhbWVMb2FkZXJDbGllbnRJbXBsLmNwcAorKysgYi9XZWJLaXQvY2hyb21p dW0vc3JjL0ZyYW1lTG9hZGVyQ2xpZW50SW1wbC5jcHAKQEAgLTE4Niw2ICsxODYsMTIgQEAgdm9p ZCBGcmFtZUxvYWRlckNsaWVudEltcGw6OmRpZE5vdEFsbG93U2NyaXB0KCkKICAgICAgICAgbV93 ZWJGcmFtZS0+Y2xpZW50KCktPmRpZE5vdEFsbG93U2NyaXB0KG1fd2ViRnJhbWUpOwogfQogCit2 b2lkIEZyYW1lTG9hZGVyQ2xpZW50SW1wbDo6ZGlkTm90QWxsb3dQbHVnaW5zKCkKK3sKKyAgICBp ZiAobV93ZWJGcmFtZS0+Y2xpZW50KCkpCisgICAgICAgIG1fd2ViRnJhbWUtPmNsaWVudCgpLT5k aWROb3RBbGxvd1BsdWdpbnMobV93ZWJGcmFtZSk7Cit9CisKIGJvb2wgRnJhbWVMb2FkZXJDbGll bnRJbXBsOjpoYXNXZWJWaWV3KCkgY29uc3QKIHsKICAgICByZXR1cm4gbV93ZWJGcmFtZS0+dmll d0ltcGwoKTsKZGlmZiAtLWdpdCBhL1dlYktpdC9jaHJvbWl1bS9zcmMvRnJhbWVMb2FkZXJDbGll bnRJbXBsLmggYi9XZWJLaXQvY2hyb21pdW0vc3JjL0ZyYW1lTG9hZGVyQ2xpZW50SW1wbC5oCmlu ZGV4IDc1MTEyYTYuLmUwZWU5OGMgMTAwNjQ0Ci0tLSBhL1dlYktpdC9jaHJvbWl1bS9zcmMvRnJh bWVMb2FkZXJDbGllbnRJbXBsLmgKKysrIGIvV2ViS2l0L2Nocm9taXVtL3NyYy9GcmFtZUxvYWRl ckNsaWVudEltcGwuaApAQCAtMTk2LDYgKzE5Niw3IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIGJv b2wgYWxsb3dQbHVnaW5zKGJvb2wgZW5hYmxlZFBlclNldHRpbmdzKTsKICAgICB2aXJ0dWFsIGJv b2wgYWxsb3dJbWFnZXMoYm9vbCBlbmFibGVkUGVyU2V0dGluZ3MpOwogICAgIHZpcnR1YWwgdm9p ZCBkaWROb3RBbGxvd1NjcmlwdCgpOworICAgIHZpcnR1YWwgdm9pZCBkaWROb3RBbGxvd1BsdWdp bnMoKTsKIAogcHJpdmF0ZToKICAgICB2b2lkIG1ha2VEb2N1bWVudFZpZXcoKTsK 49809 2010-03-02 09:31:07 -0800 2010-03-02 19:16:57 -0800 Patch bug-35565-20100302093103.patch text/plain 10135 abarth SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1NTM1OSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMzQgQEAKKzIwMTAtMDMtMDEgIEFkYW0gQmFydGggIDxhYmFydGhAd2Via2l0Lm9y Zz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBHb29n bGUgQW5hbHl0aWNzIHRyaWdnZXJzICJibG9ja2VkIHBsdWdpbiIgVUkKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM1NTY1CisKKyAgICAgICAgSnVzdCBs aWtlIGZvciBydW5uaW5nIHNjcmlwdCwgd2UgbmVlZCB0byBkaXN0aW5ndWlzaCBiZXR3ZWVuIHF1 ZXJ5aW5nCisgICAgICAgIHdoZXRoZXIgcGx1Zy1pbnMgYXJlIGVuYWJsZWQgYW5kIGFjdHVhbGx5 IGJsb2NraW5nIGEgcGFnZSBmcm9tCisgICAgICAgIGluc3RhbnRpYXRpbmcgYSBwbHVnaW4uICBX ZSBuZWVkIHRvIGlzc3VlIGRpZmZlcmVudCBjYWxsYmFja3MgdG8gdGhlCisgICAgICAgIEZyYW1l TG9hZGVyQ2xpZW50IHNvIHRoYXQgdGhlIGNsaWVudCBjYW4gaW5mb3JtIHVzIHRoYXQgcGx1Zy1p bnMgYXJlCisgICAgICAgIGRpc2FibGVkIGluIHNvbWUgY2FzZXMgd2l0aG91dCBzaG93aW5nIHRo ZSAicGx1Zy1pbiBibG9ja2VkIiBVSS4KKworICAgICAgICAqIGRvbS9ET01JbXBsZW1lbnRhdGlv bi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpET01JbXBsZW1lbnRhdGlvbjo6Y3JlYXRlRG9jdW1l bnQpOgorICAgICAgICAqIGxvYWRlci9GcmFtZUxvYWRlci5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpGcmFtZUxvYWRlcjo6cmVxdWVzdE9iamVjdCk6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxv YWRlcjo6YWxsb3dQbHVnaW5zKToKKyAgICAgICAgKiBsb2FkZXIvRnJhbWVMb2FkZXIuaDoKKyAg ICAgICAgKFdlYkNvcmU6Oik6CisgICAgICAgICogbG9hZGVyL0ZyYW1lTG9hZGVyQ2xpZW50Lmg6 CisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRlckNsaWVudDo6ZGlkTm90QWxsb3dQbHVnaW5z KToKKyAgICAgICAgKiBsb2FkZXIvTWFpblJlc291cmNlTG9hZGVyLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6Ok1haW5SZXNvdXJjZUxvYWRlcjo6c3Vic3RpdHV0ZU1JTUVUeXBlRnJvbVBsdWdpbkRh dGFiYXNlKToKKyAgICAgICAgKiBsb2FkZXIvUGx1Z2luRG9jdW1lbnQuY3BwOgorICAgICAgICAo V2ViQ29yZTo6UGx1Z2luVG9rZW5pemVyOjp3cml0ZVJhd0RhdGEpOgorICAgICAgICAqIHBhZ2Uv UGFnZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpQYWdlOjpwbHVnaW5EYXRhKToKKyAgICAgICAg KiBwbHVnaW5zL01pbWVUeXBlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Ok1pbWVUeXBlOjplbmFi bGVkUGx1Z2luKToKKwogMjAxMC0wMi0yOCAgQWxleGV5IFByb3NrdXJ5YWtvdiAgPGFwQGFwcGxl LmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBEYW4gQmVybnN0ZWluLgpJbmRleDogV2ViQ29y ZS9kb20vRE9NSW1wbGVtZW50YXRpb24uY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvZG9tL0RP TUltcGxlbWVudGF0aW9uLmNwcAkocmV2aXNpb24gNTUzNTkpCisrKyBXZWJDb3JlL2RvbS9ET01J bXBsZW1lbnRhdGlvbi5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTMzOCw3ICszMzgsNyBAQCBQYXNz UmVmUHRyPERvY3VtZW50PiBET01JbXBsZW1lbnRhdGlvbjo6CiAjZW5kaWYKIAogICAgIFBsdWdp bkRhdGEqIHBsdWdpbkRhdGEgPSAwOwotICAgIGlmIChmcmFtZSAmJiBmcmFtZS0+cGFnZSgpICYm IGZyYW1lLT5sb2FkZXIoKS0+Y2xpZW50KCktPmFsbG93UGx1Z2lucyhmcmFtZS0+cGFnZSgpLT5z ZXR0aW5ncygpLT5hcmVQbHVnaW5zRW5hYmxlZCgpKSkKKyAgICBpZiAoZnJhbWUgJiYgZnJhbWUt PnBhZ2UoKSAmJiBmcmFtZS0+bG9hZGVyKCktPmFsbG93UGx1Z2lucyhOb3RBYm91dFRvSW5zdGFu dGlhdGVQbHVnaW4pKQogICAgICAgICBwbHVnaW5EYXRhID0gZnJhbWUtPnBhZ2UoKS0+cGx1Z2lu RGF0YSgpOwogCiAgICAgLy8gUERGIGlzIG9uZSBpbWFnZSB0eXBlIGZvciB3aGljaCBhIHBsdWdp biBjYW4gb3ZlcnJpZGUgYnVpbHQtaW4gc3VwcG9ydC4KSW5kZXg6IFdlYkNvcmUvbG9hZGVyL0Zy YW1lTG9hZGVyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5j cHAJKHJldmlzaW9uIDU1MzU5KQorKysgV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwCSh3 b3JraW5nIGNvcHkpCkBAIC0xMjc3LDcgKzEyNzcsNyBAQCBib29sIEZyYW1lTG9hZGVyOjpyZXF1 ZXN0T2JqZWN0KFJlbmRlclBhCiAgICAgYm9vbCB1c2VGYWxsYmFjazsKICAgICBpZiAoc2hvdWxk VXNlUGx1Z2luKGNvbXBsZXRlZFVSTCwgbWltZVR5cGUsIHJlbmRlcmVyLT5oYXNGYWxsYmFja0Nv bnRlbnQoKSwgdXNlRmFsbGJhY2spKSB7CiAgICAgICAgIFNldHRpbmdzKiBzZXR0aW5ncyA9IG1f ZnJhbWUtPnNldHRpbmdzKCk7Ci0gICAgICAgIGlmICghbV9jbGllbnQtPmFsbG93UGx1Z2lucyhz ZXR0aW5ncyAmJiBzZXR0aW5ncy0+YXJlUGx1Z2luc0VuYWJsZWQoKSkKKyAgICAgICAgaWYgKCFh bGxvd1BsdWdpbnMoQWJvdXRUb0luc3RhbnRpYXRlUGx1Z2luKQogICAgICAgICAgICAgfHwgKCFz ZXR0aW5ncy0+aXNKYXZhRW5hYmxlZCgpICYmIE1JTUVUeXBlUmVnaXN0cnk6OmlzSmF2YUFwcGxl dE1JTUVUeXBlKG1pbWVUeXBlKSkpCiAgICAgICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgICAg IGlmIChpc0RvY3VtZW50U2FuZGJveGVkKFNhbmRib3hQbHVnaW5zKSkKQEAgLTE4MTIsNiArMTgx MiwxNSBAQCB2b2lkIEZyYW1lTG9hZGVyOjpzdGFydGVkKCkKICAgICAgICAgZnJhbWUtPmxvYWRl cigpLT5tX2lzQ29tcGxldGUgPSBmYWxzZTsKIH0KIAorYm9vbCBGcmFtZUxvYWRlcjo6YWxsb3dQ bHVnaW5zKFJlYXNvbkZvckNhbGxpbmdBbGxvd1BsdWdpbnMgcmVhc29uKQoreworICAgIFNldHRp bmdzKiBzZXR0aW5ncyA9IG1fZnJhbWUtPnNldHRpbmdzKCk7CisgICAgYm9vbCBhbGxvd2VkID0g bV9jbGllbnQtPmFsbG93UGx1Z2lucyhzZXR0aW5ncyAmJiBzZXR0aW5ncy0+YXJlUGx1Z2luc0Vu YWJsZWQoKSk7CisgICAgaWYgKCFhbGxvd2VkICYmIHJlYXNvbiA9PSBBYm91dFRvSW5zdGFudGlh dGVQbHVnaW4pCisgICAgICAgIG1fZnJhbWUtPmxvYWRlcigpLT5jbGllbnQoKS0+ZGlkTm90QWxs b3dQbHVnaW5zKCk7CisgICAgcmV0dXJuIGFsbG93ZWQ7Cit9CisKIGJvb2wgRnJhbWVMb2FkZXI6 OmNvbnRhaW5zUGx1Z2lucygpIGNvbnN0IAogeyAKICAgICByZXR1cm4gbV9jb250YWluc1BsdWdJ bnM7CkluZGV4OiBXZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5oCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdl YkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmgJKHJldmlzaW9uIDU1MzU5KQorKysgV2ViQ29yZS9s b2FkZXIvRnJhbWVMb2FkZXIuaAkod29ya2luZyBjb3B5KQpAQCAtMjgwLDYgKzI4MCw3IEBAIHB1 YmxpYzoKICAgICB2b2lkIHNldFJlc3BvbnNlTUlNRVR5cGUoY29uc3QgU3RyaW5nJik7CiAgICAg Y29uc3QgU3RyaW5nJiByZXNwb25zZU1JTUVUeXBlKCkgY29uc3Q7CiAKKyAgICBib29sIGFsbG93 UGx1Z2lucyhSZWFzb25Gb3JDYWxsaW5nQWxsb3dQbHVnaW5zKTsKICAgICBib29sIGNvbnRhaW5z UGx1Z2lucygpIGNvbnN0OwogCiAgICAgdm9pZCBsb2FkRG9uZSgpOwpJbmRleDogV2ViQ29yZS9s b2FkZXIvRnJhbWVMb2FkZXJDbGllbnQuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2xvYWRlci9G cmFtZUxvYWRlckNsaWVudC5oCShyZXZpc2lvbiA1NTM1OSkKKysrIFdlYkNvcmUvbG9hZGVyL0Zy YW1lTG9hZGVyQ2xpZW50LmgJKHdvcmtpbmcgY29weSkKQEAgLTI2Nyw2ICsyNjcsOCBAQCBuYW1l c3BhY2UgV2ViQ29yZSB7CiAgICAgICAgIC8vIHRoYXQgbmVlZCB0byBrbm93IGlmIEphdmFTY3Jp cHQgaXMgZW5hYmxlZCBidXQgYXJlIG5vdCBuZWNlc3NhcmlseQogICAgICAgICAvLyBwcmVwYXJp bmcgdG8gZXhlY3V0ZSBzY3JpcHQuCiAgICAgICAgIHZpcnR1YWwgdm9pZCBkaWROb3RBbGxvd1Nj cmlwdCgpIHsgfQorICAgICAgICAvLyBUaGlzIGNhbGxiYWNrIGlzIHNpbWlsYXIsIGJ1dCBmb3Ig cGx1Z2lucy4KKyAgICAgICAgdmlydHVhbCB2b2lkIGRpZE5vdEFsbG93UGx1Z2lucygpIHsgfQog ICAgIH07CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKSW5kZXg6IFdlYkNvcmUvbG9hZGVyL0Zy YW1lTG9hZGVyVHlwZXMuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRl clR5cGVzLmgJKHJldmlzaW9uIDU1MzU5KQorKysgV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXJU eXBlcy5oCSh3b3JraW5nIGNvcHkpCkBAIC0xMDgsNiArMTA4LDExIEBAIG5hbWVzcGFjZSBXZWJD b3JlIHsKICAgICAgICAgRG9TZWN1cml0eUNoZWNrCiAgICAgfTsKIAorICAgIGVudW0gUmVhc29u Rm9yQ2FsbGluZ0FsbG93UGx1Z2lucyB7CisgICAgICAgIEFib3V0VG9JbnN0YW50aWF0ZVBsdWdp biwKKyAgICAgICAgTm90QWJvdXRUb0luc3RhbnRpYXRlUGx1Z2luCisgICAgfTsKKwogICAgIHR5 cGVkZWYgaW50IFNhbmRib3hGbGFnczsKIH0KIApJbmRleDogV2ViQ29yZS9sb2FkZXIvTWFpblJl c291cmNlTG9hZGVyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2xvYWRlci9NYWluUmVzb3Vy Y2VMb2FkZXIuY3BwCShyZXZpc2lvbiA1NTM1OSkKKysrIFdlYkNvcmUvbG9hZGVyL01haW5SZXNv dXJjZUxvYWRlci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTI4NSw3ICsyODUsNyBAQCB2b2lkIE1h aW5SZXNvdXJjZUxvYWRlcjo6Y29udGludWVBZnRlckNvCiAjaWYgUExBVEZPUk0oUVQpCiB2b2lk IE1haW5SZXNvdXJjZUxvYWRlcjo6c3Vic3RpdHV0ZU1JTUVUeXBlRnJvbVBsdWdpbkRhdGFiYXNl KGNvbnN0IFJlc291cmNlUmVzcG9uc2UmIHIpCiB7Ci0gICAgaWYgKCFtX2ZyYW1lLT5sb2FkZXIo KS0+Y2xpZW50KCktPmFsbG93UGx1Z2lucyhtX2ZyYW1lLT5zZXR0aW5ncygpLT5hcmVQbHVnaW5z RW5hYmxlZCgpKSkKKyAgICBpZiAoIW1fZnJhbWUtPmxvYWRlcigpLT5hbGxvd1BsdWdpbnMoTm90 QWJvdXRUb0luc3RhbnRpYXRlUGx1Z2luKSkKICAgICAgICAgcmV0dXJuOwogCiAgICAgU3RyaW5n IGZpbGVuYW1lID0gci51cmwoKS5sYXN0UGF0aENvbXBvbmVudCgpOwpJbmRleDogV2ViQ29yZS9s b2FkZXIvUGx1Z2luRG9jdW1lbnQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvbG9hZGVyL1Bs dWdpbkRvY3VtZW50LmNwcAkocmV2aXNpb24gNTUzNTkpCisrKyBXZWJDb3JlL2xvYWRlci9QbHVn aW5Eb2N1bWVudC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEwNCw3ICsxMDQsNyBAQCBib29sIFBs dWdpblRva2VuaXplcjo6d3JpdGVSYXdEYXRhKGNvbnN0CiAKICAgICBpZiAoRnJhbWUqIGZyYW1l ID0gbV9kb2MtPmZyYW1lKCkpIHsKICAgICAgICAgU2V0dGluZ3MqIHNldHRpbmdzID0gZnJhbWUt PnNldHRpbmdzKCk7Ci0gICAgICAgIGlmIChzZXR0aW5ncyAmJiBmcmFtZS0+bG9hZGVyKCktPmNs aWVudCgpLT5hbGxvd1BsdWdpbnMoc2V0dGluZ3MtPmFyZVBsdWdpbnNFbmFibGVkKCkpKSB7Cisg ICAgICAgIGlmIChzZXR0aW5ncyAmJiBmcmFtZS0+bG9hZGVyKCktPmFsbG93UGx1Z2lucyhOb3RB Ym91dFRvSW5zdGFudGlhdGVQbHVnaW4pKSB7CiAgICAgICAgICAgICBtX2RvYy0+dXBkYXRlTGF5 b3V0KCk7CiAKICAgICAgICAgICAgIGlmIChSZW5kZXJXaWRnZXQqIHJlbmRlcmVyID0gdG9SZW5k ZXJXaWRnZXQobV9lbWJlZEVsZW1lbnQtPnJlbmRlcmVyKCkpKSB7CkluZGV4OiBXZWJDb3JlL3Bh Z2UvUGFnZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wYWdlL1BhZ2UuY3BwCShyZXZpc2lv biA1NTM1OSkKKysrIFdlYkNvcmUvcGFnZS9QYWdlLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzg5 LDcgKzM4OSw3IEBAIHZvaWQgUGFnZTo6cmVmcmVzaFBsdWdpbnMoYm9vbCByZWxvYWQpCiAKIFBs dWdpbkRhdGEqIFBhZ2U6OnBsdWdpbkRhdGEoKSBjb25zdAogewotICAgIGlmICghbWFpbkZyYW1l KCktPmxvYWRlcigpLT5jbGllbnQoKS0+YWxsb3dQbHVnaW5zKHNldHRpbmdzKCktPmFyZVBsdWdp bnNFbmFibGVkKCkpKQorICAgIGlmICghbWFpbkZyYW1lKCktPmxvYWRlcigpLT5hbGxvd1BsdWdp bnMoTm90QWJvdXRUb0luc3RhbnRpYXRlUGx1Z2luKSkKICAgICAgICAgcmV0dXJuIDA7CiAgICAg aWYgKCFtX3BsdWdpbkRhdGEpCiAgICAgICAgIG1fcGx1Z2luRGF0YSA9IFBsdWdpbkRhdGE6OmNy ZWF0ZSh0aGlzKTsKSW5kZXg6IFdlYkNvcmUvcGx1Z2lucy9NaW1lVHlwZS5jcHAKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gV2ViQ29yZS9wbHVnaW5zL01pbWVUeXBlLmNwcAkocmV2aXNpb24gNTUzNTkpCisrKyBX ZWJDb3JlL3BsdWdpbnMvTWltZVR5cGUuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC01Niw3ICs1Niw3 IEBAIGNvbnN0IFN0cmluZyAmTWltZVR5cGU6OmRlc2NyaXB0aW9uKCkgY28KIFBhc3NSZWZQdHI8 UGx1Z2luPiBNaW1lVHlwZTo6ZW5hYmxlZFBsdWdpbigpIGNvbnN0CiB7CiAgICAgY29uc3QgUGFn ZSogcCA9IG1fcGx1Z2luRGF0YS0+cGFnZSgpOwotICAgIGlmICghcCB8fCAhcC0+bWFpbkZyYW1l KCktPmxvYWRlcigpLT5jbGllbnQoKS0+YWxsb3dQbHVnaW5zKHAtPnNldHRpbmdzKCktPmFyZVBs dWdpbnNFbmFibGVkKCkpKQorICAgIGlmICghcCB8fCAhcC0+bWFpbkZyYW1lKCktPmxvYWRlcigp LT5hbGxvd1BsdWdpbnMoTm90QWJvdXRUb0luc3RhbnRpYXRlUGx1Z2luKSkKICAgICAgICAgcmV0 dXJuIDA7CiAKICAgICBjb25zdCBQbHVnaW5JbmZvICppbmZvID0gbV9wbHVnaW5EYXRhLT5taW1l cygpW21faW5kZXhdLT5wbHVnaW47CkluZGV4OiBXZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFdlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cJKHJldmlzaW9uIDU1MzM5KQor KysgV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE4 IEBACisyMDEwLTAzLTAxICBBZGFtIEJhcnRoICA8YWJhcnRoQHdlYmtpdC5vcmc+CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgR29vZ2xlIEFuYWx5dGlj cyB0cmlnZ2VycyAiYmxvY2tlZCBwbHVnaW4iIFVJCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zNTU2NQorCisgICAgICAgIFBsdW1iIGRpZE5vdEFsbG93 UGx1Z2lucyB0byB0aGUgY2xpZW50LgorCisgICAgICAgICogcHVibGljL1dlYkZyYW1lQ2xpZW50 Lmg6CisgICAgICAgIChXZWJLaXQ6OldlYkZyYW1lQ2xpZW50OjpkaWROb3RBbGxvd1BsdWdpbnMp OgorICAgICAgICAqIHNyYy9GcmFtZUxvYWRlckNsaWVudEltcGwuY3BwOgorICAgICAgICAoV2Vi S2l0OjpGcmFtZUxvYWRlckNsaWVudEltcGw6OmRpZE5vdEFsbG93UGx1Z2lucyk6CisgICAgICAg ICogc3JjL0ZyYW1lTG9hZGVyQ2xpZW50SW1wbC5oOgorCiAyMDEwLTAyLTI2ICBBZGFtIEJhcnRo ICA8YWJhcnRoQHdlYmtpdC5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGFyaW4gRmlzaGVy LgpJbmRleDogV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJGcmFtZUNsaWVudC5oCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFdlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViRnJhbWVDbGllbnQuaAkocmV2aXNpb24g NTUzMzkpCisrKyBXZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYkZyYW1lQ2xpZW50LmgJKHdvcmtp bmcgY29weSkKQEAgLTkxLDYgKzkxLDkgQEAgcHVibGljOgogICAgIC8vIENvbnRyb2xzIHdoZXRo ZXIgcGx1Z2lucyBhcmUgYWxsb3dlZCBmb3IgdGhpcyBmcmFtZS4KICAgICB2aXJ0dWFsIGJvb2wg YWxsb3dQbHVnaW5zKFdlYkZyYW1lKiwgYm9vbCBlbmFibGVkUGVyU2V0dGluZ3MpIHsgcmV0dXJu IGVuYWJsZWRQZXJTZXR0aW5nczsgfQogCisgICAgLy8gTm90aWZpZXMgdGhlIGNsaWVudCB0aGF0 IHRoZSBmcmFtZSB3b3VsZCBoYXZlIGluc3RhbnRpYXRlZCBhIHBsdWctaW4gaWYgcGx1Zy1pbnMg d2VyZSBlbmFibGVkLgorICAgIHZpcnR1YWwgdm9pZCBkaWROb3RBbGxvd1BsdWdpbnMoV2ViRnJh bWUqKSB7IH0KKwogICAgIC8vIENvbnRyb2xzIHdoZXRoZXIgaW1hZ2VzIGFyZSBhbGxvd2VkIGZv ciB0aGlzIGZyYW1lLgogICAgIHZpcnR1YWwgYm9vbCBhbGxvd0ltYWdlcyhXZWJGcmFtZSosIGJv b2wgZW5hYmxlZFBlclNldHRpbmdzKSB7IHJldHVybiBlbmFibGVkUGVyU2V0dGluZ3M7IH0KIApJ bmRleDogV2ViS2l0L2Nocm9taXVtL3NyYy9GcmFtZUxvYWRlckNsaWVudEltcGwuY3BwCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFdlYktpdC9jaHJvbWl1bS9zcmMvRnJhbWVMb2FkZXJDbGllbnRJbXBsLmNwcAko cmV2aXNpb24gNTUzMzkpCisrKyBXZWJLaXQvY2hyb21pdW0vc3JjL0ZyYW1lTG9hZGVyQ2xpZW50 SW1wbC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTE4Niw2ICsxODYsMTIgQEAgdm9pZCBGcmFtZUxv YWRlckNsaWVudEltcGw6OmRpZE5vdEFsbG93UwogICAgICAgICBtX3dlYkZyYW1lLT5jbGllbnQo KS0+ZGlkTm90QWxsb3dTY3JpcHQobV93ZWJGcmFtZSk7CiB9CiAKK3ZvaWQgRnJhbWVMb2FkZXJD bGllbnRJbXBsOjpkaWROb3RBbGxvd1BsdWdpbnMoKQoreworICAgIGlmIChtX3dlYkZyYW1lLT5j bGllbnQoKSkKKyAgICAgICAgbV93ZWJGcmFtZS0+Y2xpZW50KCktPmRpZE5vdEFsbG93UGx1Z2lu cyhtX3dlYkZyYW1lKTsKK30KKwogYm9vbCBGcmFtZUxvYWRlckNsaWVudEltcGw6Omhhc1dlYlZp ZXcoKSBjb25zdAogewogICAgIHJldHVybiBtX3dlYkZyYW1lLT52aWV3SW1wbCgpOwpJbmRleDog V2ViS2l0L2Nocm9taXVtL3NyYy9GcmFtZUxvYWRlckNsaWVudEltcGwuaAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBXZWJLaXQvY2hyb21pdW0vc3JjL0ZyYW1lTG9hZGVyQ2xpZW50SW1wbC5oCShyZXZpc2lvbiA1 NTMzOSkKKysrIFdlYktpdC9jaHJvbWl1bS9zcmMvRnJhbWVMb2FkZXJDbGllbnRJbXBsLmgJKHdv cmtpbmcgY29weSkKQEAgLTE5Niw2ICsxOTYsNyBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCBib29s IGFsbG93UGx1Z2lucyhib29sIGVuYWJsZWRQZXJTZXR0aW5ncyk7CiAgICAgdmlydHVhbCBib29s IGFsbG93SW1hZ2VzKGJvb2wgZW5hYmxlZFBlclNldHRpbmdzKTsKICAgICB2aXJ0dWFsIHZvaWQg ZGlkTm90QWxsb3dTY3JpcHQoKTsKKyAgICB2aXJ0dWFsIHZvaWQgZGlkTm90QWxsb3dQbHVnaW5z KCk7CiAKIHByaXZhdGU6CiAgICAgdm9pZCBtYWtlRG9jdW1lbnRWaWV3KCk7Cg==