149741 2015-10-02 00:26:29 -0700 "Plug-in is blocked" message doesn't draw correctly 2015-10-03 19:38:56 -0700 1 1 1 Unclassified WebKit Plug-ins Safari 9 Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 rmondello webkit-unassigned andersca commit-queue conrad_shultz rmondello thorton oldest_to_newest 1130175 0 rmondello 2015-10-02 00:26:29 -0700 When I set Flash to "Block" in Safari 9.0, I don't see a "Plug-in blocked" message on homestarrunner.com, but I should. The placeholder is actually on the page, but isn't drawn. 1130176 1 rmondello 2015-10-02 00:26:57 -0700 <rdar://problem/22920949> 1130184 2 262322 rmondello 2015-10-02 00:53:14 -0700 Created attachment 262322 First patch 1130185 3 262322 thorton 2015-10-02 00:59:38 -0700 Comment on attachment 262322 First patch View in context: https://bugs.webkit.org/attachment.cgi?id=262322&action=review Seems reasonable to me but Anders is the best person for plugin patches; Ccing him. > Source/WebCore/ChangeLog:4 > + No newline here. > Source/WebCore/ChangeLog:6 > + <rdar://problem/22920949> > + https://bugs.webkit.org/show_bug.cgi?id=149741 These are backwards IMO (but nobody strictly follows any rule here anyway). > Source/WebCore/ChangeLog:12 > + No new tests are added. Why not? From a cursory glance, this seems testable. 1130186 4 thorton 2015-10-02 01:00:40 -0700 Also, is this a regression? I am pretty sure the unavailable plugin indicator has worked for blocked Flash in the past. 1130187 5 thorton 2015-10-02 01:01:18 -0700 Also, a pared down version of your first comment would make a better title than the title that you chose (bug title/commit title should describe the problem, not the solution). 1130188 6 thorton 2015-10-02 01:01:36 -0700 Or even the title from the bug would be fine :D 1130189 7 262323 rmondello 2015-10-02 01:05:50 -0700 Created attachment 262323 Second attempt, addressing Tim's feedback Handle Tim's feedback. Still thinking about testing. 1130190 8 rmondello 2015-10-02 01:06:56 -0700 (In reply to comment #4) > Also, is this a regression? I am pretty sure the unavailable plugin > indicator has worked for blocked Flash in the past. Yes, this is a regression. 1130192 9 262323 thorton 2015-10-02 01:08:29 -0700 Comment on attachment 262323 Second attempt, addressing Tim's feedback View in context: https://bugs.webkit.org/attachment.cgi?id=262323&action=review > Source/WebKit2/ChangeLog:4 > + You left a newline here :D Perhaps you can repurpose LayoutTests/plugins/unavailable-plugin-indicator-obscurity.html to test this somehow? Or something like it? 1130193 10 thorton 2015-10-02 01:09:41 -0700 (In reply to comment #8) > (In reply to comment #4) > > Also, is this a regression? I am pretty sure the unavailable plugin > > indicator has worked for blocked Flash in the past. > > Yes, this is a regression. Do you know when? That would also be good title-fodder, of course :D 1130195 11 rmondello 2015-10-02 01:21:02 -0700 (In reply to comment #10) > (In reply to comment #8) > > (In reply to comment #4) > > > Also, is this a regression? I am pretty sure the unavailable plugin > > > indicator has worked for blocked Flash in the past. > > > > Yes, this is a regression. > > Do you know when? That would also be good title-fodder, of course :D I haven't proven it by making my own build, but I strongly suspect that r181562 was the cause. 1130196 12 262324 rmondello 2015-10-02 01:27:22 -0700 Created attachment 262324 Third attempt Actually removing the newline that Tim requested be removed. Still looking into testing. 1130418 13 262324 ap 2015-10-02 19:45:01 -0700 Comment on attachment 262324 Third attempt View in context: https://bugs.webkit.org/attachment.cgi?id=262324&action=review > Source/WebCore/plugins/PluginData.cpp:127 > + for (unsigned i = 0; i < mimes.size(); ++i) { Please use a modern style C++ loop. 1130431 14 thorton 2015-10-02 21:01:12 -0700 (In reply to comment #13) > Comment on attachment 262324 [details] > Third attempt > > View in context: > https://bugs.webkit.org/attachment.cgi?id=262324&action=review > > > Source/WebCore/plugins/PluginData.cpp:127 > > + for (unsigned i = 0; i < mimes.size(); ++i) { > > Please use a modern style C++ loop. This file is full of parallel vectors; they need the index to index into to the other ones! 1130476 15 262324 commit-queue 2015-10-03 19:38:50 -0700 Comment on attachment 262324 Third attempt Clearing flags on attachment: 262324 Committed r190547: <http://trac.webkit.org/changeset/190547> 1130477 16 commit-queue 2015-10-03 19:38:56 -0700 All reviewed patches have been landed. Closing bug. 262322 2015-10-02 00:53:14 -0700 2015-10-02 01:10:25 -0700 First patch 0001-149741.patch text/plain 8765 rmondello RnJvbSAyNzIxMGMzOGU2YTU3NGMyYTY1ZTBlNjhjNDIzOTYwOTgwNTA0YTk0IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBSaWNreSBNb25kZWxsbyA8cm1vbmRlbGxvQGFwcGxlLmNvbT4K RGF0ZTogRnJpLCAyIE9jdCAyMDE1IDAwOjQ4OjAxIC0wNzAwClN1YmplY3Q6IFtQQVRDSF0gU291 cmNlL1dlYkNvcmU6IEFkZCBQbHVnaW5EYXRhIEFQSSB0byBjaGVjayB3aGV0aGVyIGEgTUlNRQog dHlwZSBpcyBzdXBwb3J0ZWQsIHJlZ2FyZGxlc3Mgb2YgcGx1Zy1pbiB2aXNpYmlsaXR5Cgo8cmRh cjovL3Byb2JsZW0vMjI5MjA5NDk+Cmh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xNDk3NDEKClBhdGNoIGJ5IENvbnJhZCBTaHVsdHogYW5kIFJpY2t5IE1vbmRlbGxvLgoK UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCgpObyBuZXcgdGVzdHMgYXJlIGFkZGVkLgoKKiBw bHVnaW5zL1BsdWdpbkRhdGEuY3BwOgooV2ViQ29yZTo6UGx1Z2luRGF0YTo6Z2V0V2ViVmlzaWJs ZU1pbWVzQW5kUGx1Z2luSW5kaWNlcyk6IEFkb3B0IGdldE1pbWVzQW5kUGx1Z2luSW5kaWNpZXNG b3JQbHVnaW5zLgooV2ViQ29yZTo6UGx1Z2luRGF0YTo6Z2V0TWltZXNBbmRQbHVnaW5JbmRpY2Vz KTogQWRkZWQuCihXZWJDb3JlOjpQbHVnaW5EYXRhOjpnZXRNaW1lc0FuZFBsdWdpbkluZGljaWVz Rm9yUGx1Z2lucyk6IEVzc2VudGlhbGx5IGZhY3RvcmVkIG91dCBvZgogICAgZ2V0V2ViVmlzaWJs ZU1pbWVzQW5kUGx1Z2luSW5kaWNlcy4KKFdlYkNvcmU6OlBsdWdpbkRhdGE6OnN1cHBvcnRzTWlt ZVR5cGUpOiBBZGRlZC4gU29tZXdoYXQgc2ltaWxhciB0byBwcmVleGlzdGluZyBzdXBwb3J0c1dl YlZpc2libGVNaW1lVHlwZS4KKiBwbHVnaW5zL1BsdWdpbkRhdGEuaDogRGVjbGFyZSBzdXBwb3J0 c01pbWVUeXBlLgoKU291cmNlL1dlYktpdDI6CldoZW4gZGV0ZXJtaW5pbmcgdGhlIE9iamVjdENv bnRlbnRUeXBlIGZvciBhIE1JTUUgdHlwZSwgdXNlIGFsbCBhdmFpbGFibGUgcGx1Zy1pbnMsIG5v dCBqdXN0IHdlYi12aXNpYmxlIG9uZXMKCjxyZGFyOi8vcHJvYmxlbS8yMjkyMDk0OT4KaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0OTc0MQoKUGF0Y2ggYnkgQ29ucmFk IFNodWx0eiBhbmQgUmlja3kgTW9uZGVsbG8uCgpSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K CklmIGEgV2ViS2l0IGNsaWVudCBzZXRzIHBsdWctaW4gWCB0byBub3QgYmUgdmlzaWJsZSB0byB0 aGUgd2ViLCB0aGF0IGRvZXNuJ3QgbWVhbiB3ZSBzaG91bGRuJ3QgY29uc3VsdAp0aGF0IHBsdWct aW4gd2hlbiBkZXRlcm1pbmluZyB3aGF0IGtpbmQgb2Ygb2JqZWN0IHR5cGUgYW4gb2JqZWN0IGlz LiBQcm9wZXJseSBjbGFzc2lmeWluZyBhIG5vbi13ZWItdmlzaWJsZQpOZXRzY2FwZSBwbHVnLWlu IGFzIHN1Y2ggYWxsb3dzIGl0cyBib3VuZHMgdG8gcHJvcGVybHkgbWVhc3VyZWQsIGFsbG93aW5n IGl0IHRvIGJlIGRyYXduIHByb3Blcmx5LgoKKiBXZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dl YkZyYW1lTG9hZGVyQ2xpZW50LmNwcDoKKFdlYktpdDo6V2ViRnJhbWVMb2FkZXJDbGllbnQ6Om9i amVjdENvbnRlbnRUeXBlKTogVXNlIFBsdWdpbkRhdGEncyBzdXBwb3J0c01pbWVUeXBlLCByYXRo ZXIgdGhhbiBpdHMKICAgIHN1cHBvcnRzV2ViVmlzaWJsZU1pbWVUeXBlLCB3aGVuIGRldGVybWlu aW5nIHRoZSBPYmplY3RDb250ZW50VHlwZSBmb3IgYSBNSU1FIHR5cGUgb24gYSB1cmwuCi0tLQog U291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nICAgICAgICAgICAgICAgICAgICAgICAgICAgfCAyMSAr KysrKysrKysrKysrKysrKysKIFNvdXJjZS9XZWJDb3JlL3BsdWdpbnMvUGx1Z2luRGF0YS5jcHAg ICAgICAgICAgICAgIHwgMjUgKysrKysrKysrKysrKysrKysrKysrLQogU291cmNlL1dlYkNvcmUv cGx1Z2lucy9QbHVnaW5EYXRhLmggICAgICAgICAgICAgICAgfCAgNCArKysrCiBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cgICAgICAgICAgICAgICAgICAgICAgICAgICB8IDE5ICsrKysrKysrKysr KysrKysKIC4uLi9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5jcHAgICAgICAg IHwgIDQgKystLQogNSBmaWxlcyBjaGFuZ2VkLCA3MCBpbnNlcnRpb25zKCspLCAzIGRlbGV0aW9u cygtKQoKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJD b3JlL0NoYW5nZUxvZwppbmRleCBiMjIxOGZhLi45NTJjMTQ3IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMg KzEsMjQgQEAKKzIwMTUtMTAtMDIgIFJpY2t5IE1vbmRlbGxvICA8cm1vbmRlbGxvQGFwcGxlLmNv bT4KKworICAgICAgICBBZGQgUGx1Z2luRGF0YSBBUEkgdG8gY2hlY2sgd2hldGhlciBhIE1JTUUg dHlwZSBpcyBzdXBwb3J0ZWQsIHJlZ2FyZGxlc3Mgb2YgcGx1Zy1pbiB2aXNpYmlsaXR5CisKKyAg ICAgICAgPHJkYXI6Ly9wcm9ibGVtLzIyOTIwOTQ5PgorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ5NzQxCisKKyAgICAgICAgUGF0Y2ggYnkgQ29ucmFk IFNodWx0eiBhbmQgUmlja3kgTW9uZGVsbG8uCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzIGFyZSBhZGRlZC4KKworICAgICAgICAq IHBsdWdpbnMvUGx1Z2luRGF0YS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpQbHVnaW5EYXRhOjpn ZXRXZWJWaXNpYmxlTWltZXNBbmRQbHVnaW5JbmRpY2VzKTogQWRvcHQgZ2V0TWltZXNBbmRQbHVn aW5JbmRpY2llc0ZvclBsdWdpbnMuCisgICAgICAgIChXZWJDb3JlOjpQbHVnaW5EYXRhOjpnZXRN aW1lc0FuZFBsdWdpbkluZGljZXMpOiBBZGRlZC4KKyAgICAgICAgKFdlYkNvcmU6OlBsdWdpbkRh dGE6OmdldE1pbWVzQW5kUGx1Z2luSW5kaWNpZXNGb3JQbHVnaW5zKTogRXNzZW50aWFsbHkgZmFj dG9yZWQgb3V0IG9mCisgICAgICAgICAgICBnZXRXZWJWaXNpYmxlTWltZXNBbmRQbHVnaW5JbmRp Y2VzLgorICAgICAgICAoV2ViQ29yZTo6UGx1Z2luRGF0YTo6c3VwcG9ydHNNaW1lVHlwZSk6IEFk ZGVkLiBTb21ld2hhdCBzaW1pbGFyIHRvIHByZWV4aXN0aW5nIHN1cHBvcnRzV2ViVmlzaWJsZU1p bWVUeXBlLgorICAgICAgICAqIHBsdWdpbnMvUGx1Z2luRGF0YS5oOiBEZWNsYXJlIHN1cHBvcnRz TWltZVR5cGUuCisKIDIwMTQtMDItMTcgIFJpY2t5IE1vbmRlbGxvICA8cm1vbmRlbGxvQGFwcGxl LmNvbT4KIAogICAgICAgICBFeHBvc2UgYSB3YXkgdG8gY2xlYXIgY29va2llcyBtb2RpZmllZCBh ZnRlciBhIGdpdmVuIGRhdGUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsdWdpbnMvUGx1 Z2luRGF0YS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbHVnaW5zL1BsdWdpbkRhdGEuY3BwCmluZGV4 IGExNzhhZGIuLmEwODI2MjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsdWdpbnMvUGx1 Z2luRGF0YS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGx1Z2lucy9QbHVnaW5EYXRhLmNwcApA QCAtNDYsMTAgKzQ2LDE5IEBAIFZlY3RvcjxQbHVnaW5JbmZvPiBQbHVnaW5EYXRhOjp3ZWJWaXNp YmxlUGx1Z2lucygpIGNvbnN0CiAKIHZvaWQgUGx1Z2luRGF0YTo6Z2V0V2ViVmlzaWJsZU1pbWVz QW5kUGx1Z2luSW5kaWNlcyhWZWN0b3I8TWltZUNsYXNzSW5mbz4mIG1pbWVzLCBWZWN0b3I8c2l6 ZV90PiYgbWltZVBsdWdpbkluZGljZXMpIGNvbnN0CiB7CisgICAgZ2V0TWltZXNBbmRQbHVnaW5J bmRpY2llc0ZvclBsdWdpbnMod2ViVmlzaWJsZVBsdWdpbnMoKSwgbWltZXMsIG1pbWVQbHVnaW5J bmRpY2VzKTsKK30KKwordm9pZCBQbHVnaW5EYXRhOjpnZXRNaW1lc0FuZFBsdWdpbkluZGljZXMo VmVjdG9yPE1pbWVDbGFzc0luZm8+JiBtaW1lcywgVmVjdG9yPHNpemVfdD4mIG1pbWVQbHVnaW5J bmRpY2VzKSBjb25zdAoreworICAgIGdldE1pbWVzQW5kUGx1Z2luSW5kaWNpZXNGb3JQbHVnaW5z KHBsdWdpbnMoKSwgbWltZXMsIG1pbWVQbHVnaW5JbmRpY2VzKTsKK30KKwordm9pZCBQbHVnaW5E YXRhOjpnZXRNaW1lc0FuZFBsdWdpbkluZGljaWVzRm9yUGx1Z2lucyhjb25zdCBWZWN0b3I8UGx1 Z2luSW5mbz4mIHBsdWdpbnMsIFZlY3RvcjxNaW1lQ2xhc3NJbmZvPiYgbWltZXMsIFZlY3Rvcjxz aXplX3Q+JiBtaW1lUGx1Z2luSW5kaWNlcykgY29uc3QKK3sKICAgICBBU1NFUlRfQVJHKG1pbWVz LCBtaW1lcy5pc0VtcHR5KCkpOwogICAgIEFTU0VSVF9BUkcobWltZVBsdWdpbkluZGljZXMsIG1p bWVQbHVnaW5JbmRpY2VzLmlzRW1wdHkoKSk7CiAKLSAgICBjb25zdCBWZWN0b3I8UGx1Z2luSW5m bz4mIHBsdWdpbnMgPSB3ZWJWaXNpYmxlUGx1Z2lucygpOwogICAgIGZvciAodW5zaWduZWQgaSA9 IDA7IGkgPCBwbHVnaW5zLnNpemUoKTsgKytpKSB7CiAgICAgICAgIGNvbnN0IFBsdWdpbkluZm8m IHBsdWdpbiA9IHBsdWdpbnNbaV07CiAgICAgICAgIGZvciAoYXV0byYgbWltZSA6IHBsdWdpbi5t aW1lcykgewpAQCAtMTA4LDYgKzExNywyMCBAQCBTdHJpbmcgUGx1Z2luRGF0YTo6cGx1Z2luRmls ZUZvcldlYlZpc2libGVNaW1lVHlwZShjb25zdCBTdHJpbmcmIG1pbWVUeXBlKSBjb25zdAogICAg IHJldHVybiBTdHJpbmcoKTsKIH0KIAorYm9vbCBQbHVnaW5EYXRhOjpzdXBwb3J0c01pbWVUeXBl KGNvbnN0IFN0cmluZyYgbWltZVR5cGUsIGNvbnN0IEFsbG93ZWRQbHVnaW5UeXBlcyBhbGxvd2Vk UGx1Z2luVHlwZXMpIGNvbnN0Cit7CisgICAgVmVjdG9yPE1pbWVDbGFzc0luZm8+IG1pbWVzOwor ICAgIFZlY3RvcjxzaXplX3Q+IG1pbWVQbHVnaW5JbmRpY2VzOworICAgIGNvbnN0IFZlY3RvcjxQ bHVnaW5JbmZvPiYgcGx1Z2lucyA9IHRoaXMtPnBsdWdpbnMoKTsKKyAgICBnZXRNaW1lc0FuZFBs dWdpbkluZGljZXMobWltZXMsIG1pbWVQbHVnaW5JbmRpY2VzKTsKKworICAgIGZvciAodW5zaWdu ZWQgaSA9IDA7IGkgPCBtaW1lcy5zaXplKCk7ICsraSkgeworICAgICAgICBpZiAobWltZXNbaV0u dHlwZSA9PSBtaW1lVHlwZSAmJiAoYWxsb3dlZFBsdWdpblR5cGVzID09IEFsbFBsdWdpbnMgfHwg cGx1Z2luc1ttaW1lUGx1Z2luSW5kaWNlc1tpXV0uaXNBcHBsaWNhdGlvblBsdWdpbikpCisgICAg ICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICB9CisgICAgcmV0dXJuIGZhbHNlOworfQorCiB2b2lk IFBsdWdpbkRhdGE6OnJlZnJlc2goKQogewogICAgIHBsYXRmb3JtU3RyYXRlZ2llcygpLT5wbHVn aW5TdHJhdGVneSgpLT5yZWZyZXNoUGx1Z2lucygpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcGx1Z2lucy9QbHVnaW5EYXRhLmggYi9Tb3VyY2UvV2ViQ29yZS9wbHVnaW5zL1BsdWdpbkRh dGEuaAppbmRleCA3NjExMmQ0Li5mNTI4M2YwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9w bHVnaW5zL1BsdWdpbkRhdGEuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbHVnaW5zL1BsdWdpbkRh dGEuaApAQCAtMTAwLDEyICsxMDAsMTYgQEAgcHVibGljOgogICAgIFN0cmluZyBwbHVnaW5OYW1l Rm9yV2ViVmlzaWJsZU1pbWVUeXBlKGNvbnN0IFN0cmluZyYgbWltZVR5cGUpIGNvbnN0OwogICAg IFN0cmluZyBwbHVnaW5GaWxlRm9yV2ViVmlzaWJsZU1pbWVUeXBlKGNvbnN0IFN0cmluZyYgbWlt ZVR5cGUpIGNvbnN0OwogCisgICAgV0VCQ09SRV9FWFBPUlQgYm9vbCBzdXBwb3J0c01pbWVUeXBl KGNvbnN0IFN0cmluZyYgbWltZVR5cGUsIGNvbnN0IEFsbG93ZWRQbHVnaW5UeXBlcykgY29uc3Q7 CisKICAgICBzdGF0aWMgdm9pZCByZWZyZXNoKCk7CiAKIHByaXZhdGU6CiAgICAgZXhwbGljaXQg UGx1Z2luRGF0YShjb25zdCBQYWdlKik7CiAgICAgdm9pZCBpbml0UGx1Z2lucygpOwogICAgIGJv b2wgZ2V0UGx1Z2luSW5mb0ZvcldlYlZpc2libGVNaW1lVHlwZShjb25zdCBTdHJpbmcmIG1pbWVU eXBlLCBQbHVnaW5JbmZvJikgY29uc3Q7CisgICAgdm9pZCBnZXRNaW1lc0FuZFBsdWdpbkluZGlj ZXMoVmVjdG9yPE1pbWVDbGFzc0luZm8+JiwgVmVjdG9yPHNpemVfdD4mKSBjb25zdDsKKyAgICB2 b2lkIGdldE1pbWVzQW5kUGx1Z2luSW5kaWNpZXNGb3JQbHVnaW5zKGNvbnN0IFZlY3RvcjxQbHVn aW5JbmZvPiYsIFZlY3RvcjxNaW1lQ2xhc3NJbmZvPiYsIFZlY3RvcjxzaXplX3Q+JikgY29uc3Q7 CiAKIHByb3RlY3RlZDoKICNpZiBkZWZpbmVkIEVOQUJMRV9XRUJfUkVQTEFZICYmIEVOQUJMRV9X RUJfUkVQTEFZCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cgYi9Tb3VyY2Uv V2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMjY5ZWVmNS4uN2E1YmI4OSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAt MSwzICsxLDIyIEBACisyMDE1LTEwLTAyICBSaWNreSBNb25kZWxsbyAgPHJtb25kZWxsb0BhcHBs ZS5jb20+CisKKyAgICAgICAgV2hlbiBkZXRlcm1pbmluZyB0aGUgT2JqZWN0Q29udGVudFR5cGUg Zm9yIGEgTUlNRSB0eXBlLCB1c2UgYWxsIGF2YWlsYWJsZSBwbHVnLWlucywgbm90IGp1c3Qgd2Vi LXZpc2libGUgb25lcworCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8yMjkyMDk0OT4KKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0OTc0MQorCisgICAg ICAgIFBhdGNoIGJ5IENvbnJhZCBTaHVsdHogYW5kIFJpY2t5IE1vbmRlbGxvLgorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIElmIGEgV2ViS2l0IGNsaWVu dCBzZXRzIHBsdWctaW4gWCB0byBub3QgYmUgdmlzaWJsZSB0byB0aGUgd2ViLCB0aGF0IGRvZXNu J3QgbWVhbiB3ZSBzaG91bGRuJ3QgY29uc3VsdAorICAgICAgICB0aGF0IHBsdWctaW4gd2hlbiBk ZXRlcm1pbmluZyB3aGF0IGtpbmQgb2Ygb2JqZWN0IHR5cGUgYW4gb2JqZWN0IGlzLiBQcm9wZXJs eSBjbGFzc2lmeWluZyBhIG5vbi13ZWItdmlzaWJsZQorICAgICAgICBOZXRzY2FwZSBwbHVnLWlu IGFzIHN1Y2ggYWxsb3dzIGl0cyBib3VuZHMgdG8gcHJvcGVybHkgbWVhc3VyZWQsIGFsbG93aW5n IGl0IHRvIGJlIGRyYXduIHByb3Blcmx5LgorCisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJDb3Jl U3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYkZy YW1lTG9hZGVyQ2xpZW50OjpvYmplY3RDb250ZW50VHlwZSk6IFVzZSBQbHVnaW5EYXRhJ3Mgc3Vw cG9ydHNNaW1lVHlwZSwgcmF0aGVyIHRoYW4gaXRzCisgICAgICAgICAgICBzdXBwb3J0c1dlYlZp c2libGVNaW1lVHlwZSwgd2hlbiBkZXRlcm1pbmluZyB0aGUgT2JqZWN0Q29udGVudFR5cGUgZm9y IGEgTUlNRSB0eXBlIG9uIGEgdXJsLgorCiAyMDE0LTAyLTE3ICBSaWNreSBNb25kZWxsbyAgPHJt b25kZWxsb0BhcHBsZS5jb20+CiAKICAgICAgICAgRXhwb3NlIGEgd2F5IHRvIGNsZWFyIGNvb2tp ZXMgbW9kaWZpZWQgYWZ0ZXIgYSBnaXZlbiBkYXRlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmNwcCBiL1Nv dXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGll bnQuY3BwCmluZGV4IDdmY2M0NTAuLjYwMGM2ZWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQy L1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuY3BwCisrKyBi L1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJD bGllbnQuY3BwCkBAIC0xNTM3LDkgKzE1MzcsOSBAQCBPYmplY3RDb250ZW50VHlwZSBXZWJGcmFt ZUxvYWRlckNsaWVudDo6b2JqZWN0Q29udGVudFR5cGUoY29uc3QgVVJMJiB1cmwsIGNvbnN0CiAg ICAgYm9vbCBwbHVnSW5TdXBwb3J0c01JTUVUeXBlID0gZmFsc2U7CiAgICAgaWYgKFdlYlBhZ2Uq IHdlYlBhZ2UgPSBtX2ZyYW1lLT5wYWdlKCkpIHsKICAgICAgICAgY29uc3QgUGx1Z2luRGF0YSYg cGx1Z2luRGF0YSA9IHdlYlBhZ2UtPmNvcmVQYWdlKCktPnBsdWdpbkRhdGEoKTsKLSAgICAgICAg aWYgKHBsdWdpbkRhdGEuc3VwcG9ydHNXZWJWaXNpYmxlTWltZVR5cGUobWltZVR5cGUsIFBsdWdp bkRhdGE6OkFsbFBsdWdpbnMpICYmIHdlYkZyYW1lKCktPmNvcmVGcmFtZSgpLT5sb2FkZXIoKS5z dWJmcmFtZUxvYWRlcigpLmFsbG93UGx1Z2lucygpKQorICAgICAgICBpZiAocGx1Z2luRGF0YS5z dXBwb3J0c01pbWVUeXBlKG1pbWVUeXBlLCBQbHVnaW5EYXRhOjpBbGxQbHVnaW5zKSAmJiB3ZWJG cmFtZSgpLT5jb3JlRnJhbWUoKS0+bG9hZGVyKCkuc3ViZnJhbWVMb2FkZXIoKS5hbGxvd1BsdWdp bnMoKSkKICAgICAgICAgICAgIHBsdWdJblN1cHBvcnRzTUlNRVR5cGUgPSB0cnVlOwotICAgICAg ICBlbHNlIGlmIChwbHVnaW5EYXRhLnN1cHBvcnRzV2ViVmlzaWJsZU1pbWVUeXBlKG1pbWVUeXBl LCBQbHVnaW5EYXRhOjpPbmx5QXBwbGljYXRpb25QbHVnaW5zKSkKKyAgICAgICAgZWxzZSBpZiAo cGx1Z2luRGF0YS5zdXBwb3J0c01pbWVUeXBlKG1pbWVUeXBlLCBQbHVnaW5EYXRhOjpPbmx5QXBw bGljYXRpb25QbHVnaW5zKSkKICAgICAgICAgICAgIHBsdWdJblN1cHBvcnRzTUlNRVR5cGUgPSB0 cnVlOwogICAgIH0KICAgICAKLS0gCjIuMy44IChBcHBsZSBHaXQtNTgpCgo= 262323 2015-10-02 01:05:50 -0700 2015-10-02 01:26:34 -0700 Second attempt, addressing Tim's feedback 0001-Plug-in-is-blocked-message-doesn-t-draw-correctly.patch text/plain 8714 rmondello RnJvbSAwMjY5N2ZlMDRiZDhlNGFlYzc3N2JiNmJjYjEzMjJlMTA0YzU2MDNmIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBSaWNreSBNb25kZWxsbyA8cm1vbmRlbGxvQGFwcGxlLmNvbT4K RGF0ZTogRnJpLCAyIE9jdCAyMDE1IDAwOjQ4OjAxIC0wNzAwClN1YmplY3Q6IFtQQVRDSF0gIlBs dWctaW4gaXMgYmxvY2tlZCIgbWVzc2FnZSBkb2Vzbid0IGRyYXcgY29ycmVjdGx5CiBTb3VyY2Uv V2ViQ29yZToKCmh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDk3NDEK PHJkYXI6Ly9wcm9ibGVtLzIyOTIwOTQ5PgoKUGF0Y2ggYnkgQ29ucmFkIFNodWx0eiBhbmQgUmlj a3kgTW9uZGVsbG8uCgpSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KCk5vIG5ldyB0ZXN0cyBh cmUgYWRkZWQuCgpBZGQgUGx1Z2luRGF0YSBBUEkgdG8gY2hlY2sgd2hldGhlciBhIE1JTUUgdHlw ZSBpcyBzdXBwb3J0ZWQsIHJlZ2FyZGxlc3Mgb2YgcGx1Zy1pbiB2aXNpYmlsaXR5LgoKKiBwbHVn aW5zL1BsdWdpbkRhdGEuY3BwOgooV2ViQ29yZTo6UGx1Z2luRGF0YTo6Z2V0V2ViVmlzaWJsZU1p bWVzQW5kUGx1Z2luSW5kaWNlcyk6IEFkb3B0IGdldE1pbWVzQW5kUGx1Z2luSW5kaWNpZXNGb3JQ bHVnaW5zLgooV2ViQ29yZTo6UGx1Z2luRGF0YTo6Z2V0TWltZXNBbmRQbHVnaW5JbmRpY2VzKTog QWRkZWQuCihXZWJDb3JlOjpQbHVnaW5EYXRhOjpnZXRNaW1lc0FuZFBsdWdpbkluZGljaWVzRm9y UGx1Z2lucyk6IEVzc2VudGlhbGx5IGZhY3RvcmVkIG91dCBvZgogICAgZ2V0V2ViVmlzaWJsZU1p bWVzQW5kUGx1Z2luSW5kaWNlcy4KKFdlYkNvcmU6OlBsdWdpbkRhdGE6OnN1cHBvcnRzTWltZVR5 cGUpOiBBZGRlZC4gU29tZXdoYXQgc2ltaWxhciB0byBwcmVleGlzdGluZyBzdXBwb3J0c1dlYlZp c2libGVNaW1lVHlwZS4KKiBwbHVnaW5zL1BsdWdpbkRhdGEuaDogRGVjbGFyZSBzdXBwb3J0c01p bWVUeXBlLgoKU291cmNlL1dlYktpdDI6CgpodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTQ5NzQxCjxyZGFyOi8vcHJvYmxlbS8yMjkyMDk0OT4KClBhdGNoIGJ5IENvbnJh ZCBTaHVsdHogYW5kIFJpY2t5IE1vbmRlbGxvLgoKUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CgpJZiBhIFdlYktpdCBjbGllbnQgc2V0cyBwbHVnLWluIFggdG8gbm90IGJlIHZpc2libGUgdG8g dGhlIHdlYiwgdGhhdCBkb2Vzbid0IG1lYW4gd2Ugc2hvdWxkbid0IGNvbnN1bHQKdGhhdCBwbHVn LWluIHdoZW4gZGV0ZXJtaW5pbmcgd2hhdCBraW5kIG9mIG9iamVjdCB0eXBlIGFuIG9iamVjdCBp cy4gUHJvcGVybHkgY2xhc3NpZnlpbmcgYSBub24td2ViLXZpc2libGUKTmV0c2NhcGUgcGx1Zy1p biBhcyBzdWNoIGFsbG93cyBpdHMgYm91bmRzIHRvIHByb3Blcmx5IG1lYXN1cmVkLCBhbGxvd2lu ZyBpdCB0byBiZSBkcmF3biBwcm9wZXJseS4KCiogV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9X ZWJGcmFtZUxvYWRlckNsaWVudC5jcHA6CihXZWJLaXQ6OldlYkZyYW1lTG9hZGVyQ2xpZW50Ojpv YmplY3RDb250ZW50VHlwZSk6IFVzZSBQbHVnaW5EYXRhJ3Mgc3VwcG9ydHNNaW1lVHlwZSwgcmF0 aGVyIHRoYW4gaXRzCiAgICBzdXBwb3J0c1dlYlZpc2libGVNaW1lVHlwZSwgd2hlbiBkZXRlcm1p bmluZyB0aGUgT2JqZWN0Q29udGVudFR5cGUgZm9yIGEgTUlNRSB0eXBlIG9uIGEgdXJsLgotLS0K IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyAgICAgICAgICAgICAgICAgICAgICAgICAgIHwgMjIg KysrKysrKysrKysrKysrKysrKwogU291cmNlL1dlYkNvcmUvcGx1Z2lucy9QbHVnaW5EYXRhLmNw cCAgICAgICAgICAgICAgfCAyNSArKysrKysrKysrKysrKysrKysrKystCiBTb3VyY2UvV2ViQ29y ZS9wbHVnaW5zL1BsdWdpbkRhdGEuaCAgICAgICAgICAgICAgICB8ICA0ICsrKysKIFNvdXJjZS9X ZWJLaXQyL0NoYW5nZUxvZyAgICAgICAgICAgICAgICAgICAgICAgICAgIHwgMTkgKysrKysrKysr KysrKysrKwogLi4uL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmNwcCAgICAg ICAgfCAgNCArKy0tCiA1IGZpbGVzIGNoYW5nZWQsIDcxIGluc2VydGlvbnMoKyksIDMgZGVsZXRp b25zKC0pCgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291cmNlL1dl YkNvcmUvQ2hhbmdlTG9nCmluZGV4IGIyMjE4ZmEuLjgzOWZlNTEgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyNSBAQAorMjAxNS0xMC0wMiAgUmlja3kgTW9uZGVsbG8gIDxybW9uZGVsbG9AYXBwbGUu Y29tPgorCisgICAgICAgICJQbHVnLWluIGlzIGJsb2NrZWQiIG1lc3NhZ2UgZG9lc24ndCBkcmF3 IGNvcnJlY3RseQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTQ5NzQxCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8yMjkyMDk0OT4KKworICAgICAgICBQ YXRjaCBieSBDb25yYWQgU2h1bHR6IGFuZCBSaWNreSBNb25kZWxsby4KKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBObyBuZXcgdGVzdHMgYXJlIGFkZGVk LgorCisgICAgICAgIEFkZCBQbHVnaW5EYXRhIEFQSSB0byBjaGVjayB3aGV0aGVyIGEgTUlNRSB0 eXBlIGlzIHN1cHBvcnRlZCwgcmVnYXJkbGVzcyBvZiBwbHVnLWluIHZpc2liaWxpdHkuCisKKyAg ICAgICAgKiBwbHVnaW5zL1BsdWdpbkRhdGEuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UGx1Z2lu RGF0YTo6Z2V0V2ViVmlzaWJsZU1pbWVzQW5kUGx1Z2luSW5kaWNlcyk6IEFkb3B0IGdldE1pbWVz QW5kUGx1Z2luSW5kaWNpZXNGb3JQbHVnaW5zLgorICAgICAgICAoV2ViQ29yZTo6UGx1Z2luRGF0 YTo6Z2V0TWltZXNBbmRQbHVnaW5JbmRpY2VzKTogQWRkZWQuCisgICAgICAgIChXZWJDb3JlOjpQ bHVnaW5EYXRhOjpnZXRNaW1lc0FuZFBsdWdpbkluZGljaWVzRm9yUGx1Z2lucyk6IEVzc2VudGlh bGx5IGZhY3RvcmVkIG91dCBvZgorICAgICAgICAgICAgZ2V0V2ViVmlzaWJsZU1pbWVzQW5kUGx1 Z2luSW5kaWNlcy4KKyAgICAgICAgKFdlYkNvcmU6OlBsdWdpbkRhdGE6OnN1cHBvcnRzTWltZVR5 cGUpOiBBZGRlZC4gU29tZXdoYXQgc2ltaWxhciB0byBwcmVleGlzdGluZyBzdXBwb3J0c1dlYlZp c2libGVNaW1lVHlwZS4KKyAgICAgICAgKiBwbHVnaW5zL1BsdWdpbkRhdGEuaDogRGVjbGFyZSBz dXBwb3J0c01pbWVUeXBlLgorCiAyMDE0LTAyLTE3ICBSaWNreSBNb25kZWxsbyAgPHJtb25kZWxs b0BhcHBsZS5jb20+CiAKICAgICAgICAgRXhwb3NlIGEgd2F5IHRvIGNsZWFyIGNvb2tpZXMgbW9k aWZpZWQgYWZ0ZXIgYSBnaXZlbiBkYXRlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbHVn aW5zL1BsdWdpbkRhdGEuY3BwIGIvU291cmNlL1dlYkNvcmUvcGx1Z2lucy9QbHVnaW5EYXRhLmNw cAppbmRleCBhMTc4YWRiLi5hMDgyNjIxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbHVn aW5zL1BsdWdpbkRhdGEuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsdWdpbnMvUGx1Z2luRGF0 YS5jcHAKQEAgLTQ2LDEwICs0NiwxOSBAQCBWZWN0b3I8UGx1Z2luSW5mbz4gUGx1Z2luRGF0YTo6 d2ViVmlzaWJsZVBsdWdpbnMoKSBjb25zdAogCiB2b2lkIFBsdWdpbkRhdGE6OmdldFdlYlZpc2li bGVNaW1lc0FuZFBsdWdpbkluZGljZXMoVmVjdG9yPE1pbWVDbGFzc0luZm8+JiBtaW1lcywgVmVj dG9yPHNpemVfdD4mIG1pbWVQbHVnaW5JbmRpY2VzKSBjb25zdAogeworICAgIGdldE1pbWVzQW5k UGx1Z2luSW5kaWNpZXNGb3JQbHVnaW5zKHdlYlZpc2libGVQbHVnaW5zKCksIG1pbWVzLCBtaW1l UGx1Z2luSW5kaWNlcyk7Cit9CisKK3ZvaWQgUGx1Z2luRGF0YTo6Z2V0TWltZXNBbmRQbHVnaW5J bmRpY2VzKFZlY3RvcjxNaW1lQ2xhc3NJbmZvPiYgbWltZXMsIFZlY3RvcjxzaXplX3Q+JiBtaW1l UGx1Z2luSW5kaWNlcykgY29uc3QKK3sKKyAgICBnZXRNaW1lc0FuZFBsdWdpbkluZGljaWVzRm9y UGx1Z2lucyhwbHVnaW5zKCksIG1pbWVzLCBtaW1lUGx1Z2luSW5kaWNlcyk7Cit9CisKK3ZvaWQg UGx1Z2luRGF0YTo6Z2V0TWltZXNBbmRQbHVnaW5JbmRpY2llc0ZvclBsdWdpbnMoY29uc3QgVmVj dG9yPFBsdWdpbkluZm8+JiBwbHVnaW5zLCBWZWN0b3I8TWltZUNsYXNzSW5mbz4mIG1pbWVzLCBW ZWN0b3I8c2l6ZV90PiYgbWltZVBsdWdpbkluZGljZXMpIGNvbnN0Cit7CiAgICAgQVNTRVJUX0FS RyhtaW1lcywgbWltZXMuaXNFbXB0eSgpKTsKICAgICBBU1NFUlRfQVJHKG1pbWVQbHVnaW5JbmRp Y2VzLCBtaW1lUGx1Z2luSW5kaWNlcy5pc0VtcHR5KCkpOwogCi0gICAgY29uc3QgVmVjdG9yPFBs dWdpbkluZm8+JiBwbHVnaW5zID0gd2ViVmlzaWJsZVBsdWdpbnMoKTsKICAgICBmb3IgKHVuc2ln bmVkIGkgPSAwOyBpIDwgcGx1Z2lucy5zaXplKCk7ICsraSkgewogICAgICAgICBjb25zdCBQbHVn aW5JbmZvJiBwbHVnaW4gPSBwbHVnaW5zW2ldOwogICAgICAgICBmb3IgKGF1dG8mIG1pbWUgOiBw bHVnaW4ubWltZXMpIHsKQEAgLTEwOCw2ICsxMTcsMjAgQEAgU3RyaW5nIFBsdWdpbkRhdGE6OnBs dWdpbkZpbGVGb3JXZWJWaXNpYmxlTWltZVR5cGUoY29uc3QgU3RyaW5nJiBtaW1lVHlwZSkgY29u c3QKICAgICByZXR1cm4gU3RyaW5nKCk7CiB9CiAKK2Jvb2wgUGx1Z2luRGF0YTo6c3VwcG9ydHNN aW1lVHlwZShjb25zdCBTdHJpbmcmIG1pbWVUeXBlLCBjb25zdCBBbGxvd2VkUGx1Z2luVHlwZXMg YWxsb3dlZFBsdWdpblR5cGVzKSBjb25zdAoreworICAgIFZlY3RvcjxNaW1lQ2xhc3NJbmZvPiBt aW1lczsKKyAgICBWZWN0b3I8c2l6ZV90PiBtaW1lUGx1Z2luSW5kaWNlczsKKyAgICBjb25zdCBW ZWN0b3I8UGx1Z2luSW5mbz4mIHBsdWdpbnMgPSB0aGlzLT5wbHVnaW5zKCk7CisgICAgZ2V0TWlt ZXNBbmRQbHVnaW5JbmRpY2VzKG1pbWVzLCBtaW1lUGx1Z2luSW5kaWNlcyk7CisKKyAgICBmb3Ig KHVuc2lnbmVkIGkgPSAwOyBpIDwgbWltZXMuc2l6ZSgpOyArK2kpIHsKKyAgICAgICAgaWYgKG1p bWVzW2ldLnR5cGUgPT0gbWltZVR5cGUgJiYgKGFsbG93ZWRQbHVnaW5UeXBlcyA9PSBBbGxQbHVn aW5zIHx8IHBsdWdpbnNbbWltZVBsdWdpbkluZGljZXNbaV1dLmlzQXBwbGljYXRpb25QbHVnaW4p KQorICAgICAgICAgICAgcmV0dXJuIHRydWU7CisgICAgfQorICAgIHJldHVybiBmYWxzZTsKK30K Kwogdm9pZCBQbHVnaW5EYXRhOjpyZWZyZXNoKCkKIHsKICAgICBwbGF0Zm9ybVN0cmF0ZWdpZXMo KS0+cGx1Z2luU3RyYXRlZ3koKS0+cmVmcmVzaFBsdWdpbnMoKTsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3BsdWdpbnMvUGx1Z2luRGF0YS5oIGIvU291cmNlL1dlYkNvcmUvcGx1Z2lucy9Q bHVnaW5EYXRhLmgKaW5kZXggNzYxMTJkNC4uZjUyODNmMCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvcGx1Z2lucy9QbHVnaW5EYXRhLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGx1Z2lucy9Q bHVnaW5EYXRhLmgKQEAgLTEwMCwxMiArMTAwLDE2IEBAIHB1YmxpYzoKICAgICBTdHJpbmcgcGx1 Z2luTmFtZUZvcldlYlZpc2libGVNaW1lVHlwZShjb25zdCBTdHJpbmcmIG1pbWVUeXBlKSBjb25z dDsKICAgICBTdHJpbmcgcGx1Z2luRmlsZUZvcldlYlZpc2libGVNaW1lVHlwZShjb25zdCBTdHJp bmcmIG1pbWVUeXBlKSBjb25zdDsKIAorICAgIFdFQkNPUkVfRVhQT1JUIGJvb2wgc3VwcG9ydHNN aW1lVHlwZShjb25zdCBTdHJpbmcmIG1pbWVUeXBlLCBjb25zdCBBbGxvd2VkUGx1Z2luVHlwZXMp IGNvbnN0OworCiAgICAgc3RhdGljIHZvaWQgcmVmcmVzaCgpOwogCiBwcml2YXRlOgogICAgIGV4 cGxpY2l0IFBsdWdpbkRhdGEoY29uc3QgUGFnZSopOwogICAgIHZvaWQgaW5pdFBsdWdpbnMoKTsK ICAgICBib29sIGdldFBsdWdpbkluZm9Gb3JXZWJWaXNpYmxlTWltZVR5cGUoY29uc3QgU3RyaW5n JiBtaW1lVHlwZSwgUGx1Z2luSW5mbyYpIGNvbnN0OworICAgIHZvaWQgZ2V0TWltZXNBbmRQbHVn aW5JbmRpY2VzKFZlY3RvcjxNaW1lQ2xhc3NJbmZvPiYsIFZlY3RvcjxzaXplX3Q+JikgY29uc3Q7 CisgICAgdm9pZCBnZXRNaW1lc0FuZFBsdWdpbkluZGljaWVzRm9yUGx1Z2lucyhjb25zdCBWZWN0 b3I8UGx1Z2luSW5mbz4mLCBWZWN0b3I8TWltZUNsYXNzSW5mbz4mLCBWZWN0b3I8c2l6ZV90PiYp IGNvbnN0OwogCiBwcm90ZWN0ZWQ6CiAjaWYgZGVmaW5lZCBFTkFCTEVfV0VCX1JFUExBWSAmJiBF TkFCTEVfV0VCX1JFUExBWQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nIGIv U291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCmluZGV4IDI2OWVlZjUuLmRiZjVjZWEgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VM b2cKQEAgLTEsMyArMSwyMiBAQAorMjAxNS0xMC0wMiAgUmlja3kgTW9uZGVsbG8gIDxybW9uZGVs bG9AYXBwbGUuY29tPgorCisgICAgICAgICJQbHVnLWluIGlzIGJsb2NrZWQiIG1lc3NhZ2UgZG9l c24ndCBkcmF3IGNvcnJlY3RseQorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xNDk3NDEKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzIyOTIwOTQ5Pgor CisgICAgICAgIFBhdGNoIGJ5IENvbnJhZCBTaHVsdHogYW5kIFJpY2t5IE1vbmRlbGxvLgorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIElmIGEgV2ViS2l0 IGNsaWVudCBzZXRzIHBsdWctaW4gWCB0byBub3QgYmUgdmlzaWJsZSB0byB0aGUgd2ViLCB0aGF0 IGRvZXNuJ3QgbWVhbiB3ZSBzaG91bGRuJ3QgY29uc3VsdAorICAgICAgICB0aGF0IHBsdWctaW4g d2hlbiBkZXRlcm1pbmluZyB3aGF0IGtpbmQgb2Ygb2JqZWN0IHR5cGUgYW4gb2JqZWN0IGlzLiBQ cm9wZXJseSBjbGFzc2lmeWluZyBhIG5vbi13ZWItdmlzaWJsZQorICAgICAgICBOZXRzY2FwZSBw bHVnLWluIGFzIHN1Y2ggYWxsb3dzIGl0cyBib3VuZHMgdG8gcHJvcGVybHkgbWVhc3VyZWQsIGFs bG93aW5nIGl0IHRvIGJlIGRyYXduIHByb3Blcmx5LgorCisgICAgICAgICogV2ViUHJvY2Vzcy9X ZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5jcHA6CisgICAgICAgIChXZWJLaXQ6 OldlYkZyYW1lTG9hZGVyQ2xpZW50OjpvYmplY3RDb250ZW50VHlwZSk6IFVzZSBQbHVnaW5EYXRh J3Mgc3VwcG9ydHNNaW1lVHlwZSwgcmF0aGVyIHRoYW4gaXRzCisgICAgICAgICAgICBzdXBwb3J0 c1dlYlZpc2libGVNaW1lVHlwZSwgd2hlbiBkZXRlcm1pbmluZyB0aGUgT2JqZWN0Q29udGVudFR5 cGUgZm9yIGEgTUlNRSB0eXBlIG9uIGEgdXJsLgorCiAyMDE0LTAyLTE3ICBSaWNreSBNb25kZWxs byAgPHJtb25kZWxsb0BhcHBsZS5jb20+CiAKICAgICAgICAgRXhwb3NlIGEgd2F5IHRvIGNsZWFy IGNvb2tpZXMgbW9kaWZpZWQgYWZ0ZXIgYSBnaXZlbiBkYXRlCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmNw cCBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2Fk ZXJDbGllbnQuY3BwCmluZGV4IDdmY2M0NTAuLjYwMGM2ZWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuY3Bw CisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVM b2FkZXJDbGllbnQuY3BwCkBAIC0xNTM3LDkgKzE1MzcsOSBAQCBPYmplY3RDb250ZW50VHlwZSBX ZWJGcmFtZUxvYWRlckNsaWVudDo6b2JqZWN0Q29udGVudFR5cGUoY29uc3QgVVJMJiB1cmwsIGNv bnN0CiAgICAgYm9vbCBwbHVnSW5TdXBwb3J0c01JTUVUeXBlID0gZmFsc2U7CiAgICAgaWYgKFdl YlBhZ2UqIHdlYlBhZ2UgPSBtX2ZyYW1lLT5wYWdlKCkpIHsKICAgICAgICAgY29uc3QgUGx1Z2lu RGF0YSYgcGx1Z2luRGF0YSA9IHdlYlBhZ2UtPmNvcmVQYWdlKCktPnBsdWdpbkRhdGEoKTsKLSAg ICAgICAgaWYgKHBsdWdpbkRhdGEuc3VwcG9ydHNXZWJWaXNpYmxlTWltZVR5cGUobWltZVR5cGUs IFBsdWdpbkRhdGE6OkFsbFBsdWdpbnMpICYmIHdlYkZyYW1lKCktPmNvcmVGcmFtZSgpLT5sb2Fk ZXIoKS5zdWJmcmFtZUxvYWRlcigpLmFsbG93UGx1Z2lucygpKQorICAgICAgICBpZiAocGx1Z2lu RGF0YS5zdXBwb3J0c01pbWVUeXBlKG1pbWVUeXBlLCBQbHVnaW5EYXRhOjpBbGxQbHVnaW5zKSAm JiB3ZWJGcmFtZSgpLT5jb3JlRnJhbWUoKS0+bG9hZGVyKCkuc3ViZnJhbWVMb2FkZXIoKS5hbGxv d1BsdWdpbnMoKSkKICAgICAgICAgICAgIHBsdWdJblN1cHBvcnRzTUlNRVR5cGUgPSB0cnVlOwot ICAgICAgICBlbHNlIGlmIChwbHVnaW5EYXRhLnN1cHBvcnRzV2ViVmlzaWJsZU1pbWVUeXBlKG1p bWVUeXBlLCBQbHVnaW5EYXRhOjpPbmx5QXBwbGljYXRpb25QbHVnaW5zKSkKKyAgICAgICAgZWxz ZSBpZiAocGx1Z2luRGF0YS5zdXBwb3J0c01pbWVUeXBlKG1pbWVUeXBlLCBQbHVnaW5EYXRhOjpP bmx5QXBwbGljYXRpb25QbHVnaW5zKSkKICAgICAgICAgICAgIHBsdWdJblN1cHBvcnRzTUlNRVR5 cGUgPSB0cnVlOwogICAgIH0KICAgICAKLS0gCjIuMy44IChBcHBsZSBHaXQtNTgpCgo= 262324 2015-10-02 01:27:22 -0700 2015-10-03 19:38:50 -0700 Third attempt 0001-Plug-in-is-blocked-message-doesn-t-draw-correctly.patch text/plain 8565 rmondello RnJvbSA3YTE1ZjE1Y2ViNGM4MGQyNTdjNDQ4ZjMwZmYxMDA2ZWZjNDNlZTI3IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBSaWNreSBNb25kZWxsbyA8cm1vbmRlbGxvQGFwcGxlLmNvbT4K RGF0ZTogRnJpLCAyIE9jdCAyMDE1IDAwOjQ4OjAxIC0wNzAwClN1YmplY3Q6IFtQQVRDSF0gIlBs dWctaW4gaXMgYmxvY2tlZCIgbWVzc2FnZSBkb2Vzbid0IGRyYXcgY29ycmVjdGx5CiBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ5NzQxIDxyZGFyOi8vcHJvYmxlbS8y MjkyMDk0OT4KClBhdGNoIGJ5IENvbnJhZCBTaHVsdHogYW5kIFJpY2t5IE1vbmRlbGxvLgoKUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCgpTb3VyY2UvV2ViQ29yZToKCk5vIG5ldyB0ZXN0cyBh cmUgYWRkZWQuCgpBZGQgUGx1Z2luRGF0YSBBUEkgdG8gY2hlY2sgd2hldGhlciBhIE1JTUUgdHlw ZSBpcyBzdXBwb3J0ZWQsIHJlZ2FyZGxlc3Mgb2YgcGx1Zy1pbiB2aXNpYmlsaXR5LgoKKiBwbHVn aW5zL1BsdWdpbkRhdGEuY3BwOgooV2ViQ29yZTo6UGx1Z2luRGF0YTo6Z2V0V2ViVmlzaWJsZU1p bWVzQW5kUGx1Z2luSW5kaWNlcyk6IEFkb3B0IGdldE1pbWVzQW5kUGx1Z2luSW5kaWNpZXNGb3JQ bHVnaW5zLgooV2ViQ29yZTo6UGx1Z2luRGF0YTo6Z2V0TWltZXNBbmRQbHVnaW5JbmRpY2VzKTog QWRkZWQuCihXZWJDb3JlOjpQbHVnaW5EYXRhOjpnZXRNaW1lc0FuZFBsdWdpbkluZGljaWVzRm9y UGx1Z2lucyk6IEVzc2VudGlhbGx5IGZhY3RvcmVkIG91dCBvZgogICAgZ2V0V2ViVmlzaWJsZU1p bWVzQW5kUGx1Z2luSW5kaWNlcy4KKFdlYkNvcmU6OlBsdWdpbkRhdGE6OnN1cHBvcnRzTWltZVR5 cGUpOiBBZGRlZC4gU29tZXdoYXQgc2ltaWxhciB0byBwcmVleGlzdGluZyBzdXBwb3J0c1dlYlZp c2libGVNaW1lVHlwZS4KKiBwbHVnaW5zL1BsdWdpbkRhdGEuaDogRGVjbGFyZSBzdXBwb3J0c01p bWVUeXBlLgoKU291cmNlL1dlYktpdDI6CgpJZiBhIFdlYktpdCBjbGllbnQgc2V0cyBwbHVnLWlu IFggdG8gbm90IGJlIHZpc2libGUgdG8gdGhlIHdlYiwgdGhhdCBkb2Vzbid0IG1lYW4gd2Ugc2hv dWxkbid0IGNvbnN1bHQKdGhhdCBwbHVnLWluIHdoZW4gZGV0ZXJtaW5pbmcgd2hhdCBraW5kIG9m IG9iamVjdCB0eXBlIGFuIG9iamVjdCBpcy4gUHJvcGVybHkgY2xhc3NpZnlpbmcgYSBub24td2Vi LXZpc2libGUKTmV0c2NhcGUgcGx1Zy1pbiBhcyBzdWNoIGFsbG93cyBpdHMgYm91bmRzIHRvIHBy b3Blcmx5IG1lYXN1cmVkLCBhbGxvd2luZyBpdCB0byBiZSBkcmF3biBwcm9wZXJseS4KCiogV2Vi UHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5jcHA6CihXZWJLaXQ6 OldlYkZyYW1lTG9hZGVyQ2xpZW50OjpvYmplY3RDb250ZW50VHlwZSk6IFVzZSBQbHVnaW5EYXRh J3Mgc3VwcG9ydHNNaW1lVHlwZSwgcmF0aGVyIHRoYW4gaXRzCiAgICBzdXBwb3J0c1dlYlZpc2li bGVNaW1lVHlwZSwgd2hlbiBkZXRlcm1pbmluZyB0aGUgT2JqZWN0Q29udGVudFR5cGUgZm9yIGEg TUlNRSB0eXBlIG9uIGEgdXJsLgotLS0KIFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyAgICAgICAg ICAgICAgICAgICAgICAgICAgIHwgMjIgKysrKysrKysrKysrKysrKysrKwogU291cmNlL1dlYkNv cmUvcGx1Z2lucy9QbHVnaW5EYXRhLmNwcCAgICAgICAgICAgICAgfCAyNSArKysrKysrKysrKysr KysrKysrKystCiBTb3VyY2UvV2ViQ29yZS9wbHVnaW5zL1BsdWdpbkRhdGEuaCAgICAgICAgICAg ICAgICB8ICA0ICsrKysKIFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyAgICAgICAgICAgICAgICAg ICAgICAgICAgIHwgMTggKysrKysrKysrKysrKysrKwogLi4uL1dlYkNvcmVTdXBwb3J0L1dlYkZy YW1lTG9hZGVyQ2xpZW50LmNwcCAgICAgICAgfCAgNCArKy0tCiA1IGZpbGVzIGNoYW5nZWQsIDcw IGluc2VydGlvbnMoKyksIDMgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IGIyMjE4ZmEuLjgz OWZlNTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2Uv V2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNSBAQAorMjAxNS0xMC0wMiAgUmlja3kgTW9u ZGVsbG8gIDxybW9uZGVsbG9AYXBwbGUuY29tPgorCisgICAgICAgICJQbHVnLWluIGlzIGJsb2Nr ZWQiIG1lc3NhZ2UgZG9lc24ndCBkcmF3IGNvcnJlY3RseQorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ5NzQxCisgICAgICAgIDxyZGFyOi8vcHJvYmxl bS8yMjkyMDk0OT4KKworICAgICAgICBQYXRjaCBieSBDb25yYWQgU2h1bHR6IGFuZCBSaWNreSBN b25kZWxsby4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBObyBuZXcgdGVzdHMgYXJlIGFkZGVkLgorCisgICAgICAgIEFkZCBQbHVnaW5EYXRhIEFQSSB0 byBjaGVjayB3aGV0aGVyIGEgTUlNRSB0eXBlIGlzIHN1cHBvcnRlZCwgcmVnYXJkbGVzcyBvZiBw bHVnLWluIHZpc2liaWxpdHkuCisKKyAgICAgICAgKiBwbHVnaW5zL1BsdWdpbkRhdGEuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6UGx1Z2luRGF0YTo6Z2V0V2ViVmlzaWJsZU1pbWVzQW5kUGx1Z2lu SW5kaWNlcyk6IEFkb3B0IGdldE1pbWVzQW5kUGx1Z2luSW5kaWNpZXNGb3JQbHVnaW5zLgorICAg ICAgICAoV2ViQ29yZTo6UGx1Z2luRGF0YTo6Z2V0TWltZXNBbmRQbHVnaW5JbmRpY2VzKTogQWRk ZWQuCisgICAgICAgIChXZWJDb3JlOjpQbHVnaW5EYXRhOjpnZXRNaW1lc0FuZFBsdWdpbkluZGlj aWVzRm9yUGx1Z2lucyk6IEVzc2VudGlhbGx5IGZhY3RvcmVkIG91dCBvZgorICAgICAgICAgICAg Z2V0V2ViVmlzaWJsZU1pbWVzQW5kUGx1Z2luSW5kaWNlcy4KKyAgICAgICAgKFdlYkNvcmU6OlBs dWdpbkRhdGE6OnN1cHBvcnRzTWltZVR5cGUpOiBBZGRlZC4gU29tZXdoYXQgc2ltaWxhciB0byBw cmVleGlzdGluZyBzdXBwb3J0c1dlYlZpc2libGVNaW1lVHlwZS4KKyAgICAgICAgKiBwbHVnaW5z L1BsdWdpbkRhdGEuaDogRGVjbGFyZSBzdXBwb3J0c01pbWVUeXBlLgorCiAyMDE0LTAyLTE3ICBS aWNreSBNb25kZWxsbyAgPHJtb25kZWxsb0BhcHBsZS5jb20+CiAKICAgICAgICAgRXhwb3NlIGEg d2F5IHRvIGNsZWFyIGNvb2tpZXMgbW9kaWZpZWQgYWZ0ZXIgYSBnaXZlbiBkYXRlCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9wbHVnaW5zL1BsdWdpbkRhdGEuY3BwIGIvU291cmNlL1dlYkNv cmUvcGx1Z2lucy9QbHVnaW5EYXRhLmNwcAppbmRleCBhMTc4YWRiLi5hMDgyNjIxIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9wbHVnaW5zL1BsdWdpbkRhdGEuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3BsdWdpbnMvUGx1Z2luRGF0YS5jcHAKQEAgLTQ2LDEwICs0NiwxOSBAQCBWZWN0b3I8 UGx1Z2luSW5mbz4gUGx1Z2luRGF0YTo6d2ViVmlzaWJsZVBsdWdpbnMoKSBjb25zdAogCiB2b2lk IFBsdWdpbkRhdGE6OmdldFdlYlZpc2libGVNaW1lc0FuZFBsdWdpbkluZGljZXMoVmVjdG9yPE1p bWVDbGFzc0luZm8+JiBtaW1lcywgVmVjdG9yPHNpemVfdD4mIG1pbWVQbHVnaW5JbmRpY2VzKSBj b25zdAogeworICAgIGdldE1pbWVzQW5kUGx1Z2luSW5kaWNpZXNGb3JQbHVnaW5zKHdlYlZpc2li bGVQbHVnaW5zKCksIG1pbWVzLCBtaW1lUGx1Z2luSW5kaWNlcyk7Cit9CisKK3ZvaWQgUGx1Z2lu RGF0YTo6Z2V0TWltZXNBbmRQbHVnaW5JbmRpY2VzKFZlY3RvcjxNaW1lQ2xhc3NJbmZvPiYgbWlt ZXMsIFZlY3RvcjxzaXplX3Q+JiBtaW1lUGx1Z2luSW5kaWNlcykgY29uc3QKK3sKKyAgICBnZXRN aW1lc0FuZFBsdWdpbkluZGljaWVzRm9yUGx1Z2lucyhwbHVnaW5zKCksIG1pbWVzLCBtaW1lUGx1 Z2luSW5kaWNlcyk7Cit9CisKK3ZvaWQgUGx1Z2luRGF0YTo6Z2V0TWltZXNBbmRQbHVnaW5JbmRp Y2llc0ZvclBsdWdpbnMoY29uc3QgVmVjdG9yPFBsdWdpbkluZm8+JiBwbHVnaW5zLCBWZWN0b3I8 TWltZUNsYXNzSW5mbz4mIG1pbWVzLCBWZWN0b3I8c2l6ZV90PiYgbWltZVBsdWdpbkluZGljZXMp IGNvbnN0Cit7CiAgICAgQVNTRVJUX0FSRyhtaW1lcywgbWltZXMuaXNFbXB0eSgpKTsKICAgICBB U1NFUlRfQVJHKG1pbWVQbHVnaW5JbmRpY2VzLCBtaW1lUGx1Z2luSW5kaWNlcy5pc0VtcHR5KCkp OwogCi0gICAgY29uc3QgVmVjdG9yPFBsdWdpbkluZm8+JiBwbHVnaW5zID0gd2ViVmlzaWJsZVBs dWdpbnMoKTsKICAgICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwgcGx1Z2lucy5zaXplKCk7ICsr aSkgewogICAgICAgICBjb25zdCBQbHVnaW5JbmZvJiBwbHVnaW4gPSBwbHVnaW5zW2ldOwogICAg ICAgICBmb3IgKGF1dG8mIG1pbWUgOiBwbHVnaW4ubWltZXMpIHsKQEAgLTEwOCw2ICsxMTcsMjAg QEAgU3RyaW5nIFBsdWdpbkRhdGE6OnBsdWdpbkZpbGVGb3JXZWJWaXNpYmxlTWltZVR5cGUoY29u c3QgU3RyaW5nJiBtaW1lVHlwZSkgY29uc3QKICAgICByZXR1cm4gU3RyaW5nKCk7CiB9CiAKK2Jv b2wgUGx1Z2luRGF0YTo6c3VwcG9ydHNNaW1lVHlwZShjb25zdCBTdHJpbmcmIG1pbWVUeXBlLCBj b25zdCBBbGxvd2VkUGx1Z2luVHlwZXMgYWxsb3dlZFBsdWdpblR5cGVzKSBjb25zdAoreworICAg IFZlY3RvcjxNaW1lQ2xhc3NJbmZvPiBtaW1lczsKKyAgICBWZWN0b3I8c2l6ZV90PiBtaW1lUGx1 Z2luSW5kaWNlczsKKyAgICBjb25zdCBWZWN0b3I8UGx1Z2luSW5mbz4mIHBsdWdpbnMgPSB0aGlz LT5wbHVnaW5zKCk7CisgICAgZ2V0TWltZXNBbmRQbHVnaW5JbmRpY2VzKG1pbWVzLCBtaW1lUGx1 Z2luSW5kaWNlcyk7CisKKyAgICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwgbWltZXMuc2l6ZSgp OyArK2kpIHsKKyAgICAgICAgaWYgKG1pbWVzW2ldLnR5cGUgPT0gbWltZVR5cGUgJiYgKGFsbG93 ZWRQbHVnaW5UeXBlcyA9PSBBbGxQbHVnaW5zIHx8IHBsdWdpbnNbbWltZVBsdWdpbkluZGljZXNb aV1dLmlzQXBwbGljYXRpb25QbHVnaW4pKQorICAgICAgICAgICAgcmV0dXJuIHRydWU7CisgICAg fQorICAgIHJldHVybiBmYWxzZTsKK30KKwogdm9pZCBQbHVnaW5EYXRhOjpyZWZyZXNoKCkKIHsK ICAgICBwbGF0Zm9ybVN0cmF0ZWdpZXMoKS0+cGx1Z2luU3RyYXRlZ3koKS0+cmVmcmVzaFBsdWdp bnMoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsdWdpbnMvUGx1Z2luRGF0YS5oIGIv U291cmNlL1dlYkNvcmUvcGx1Z2lucy9QbHVnaW5EYXRhLmgKaW5kZXggNzYxMTJkNC4uZjUyODNm MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGx1Z2lucy9QbHVnaW5EYXRhLmgKKysrIGIv U291cmNlL1dlYkNvcmUvcGx1Z2lucy9QbHVnaW5EYXRhLmgKQEAgLTEwMCwxMiArMTAwLDE2IEBA IHB1YmxpYzoKICAgICBTdHJpbmcgcGx1Z2luTmFtZUZvcldlYlZpc2libGVNaW1lVHlwZShjb25z dCBTdHJpbmcmIG1pbWVUeXBlKSBjb25zdDsKICAgICBTdHJpbmcgcGx1Z2luRmlsZUZvcldlYlZp c2libGVNaW1lVHlwZShjb25zdCBTdHJpbmcmIG1pbWVUeXBlKSBjb25zdDsKIAorICAgIFdFQkNP UkVfRVhQT1JUIGJvb2wgc3VwcG9ydHNNaW1lVHlwZShjb25zdCBTdHJpbmcmIG1pbWVUeXBlLCBj b25zdCBBbGxvd2VkUGx1Z2luVHlwZXMpIGNvbnN0OworCiAgICAgc3RhdGljIHZvaWQgcmVmcmVz aCgpOwogCiBwcml2YXRlOgogICAgIGV4cGxpY2l0IFBsdWdpbkRhdGEoY29uc3QgUGFnZSopOwog ICAgIHZvaWQgaW5pdFBsdWdpbnMoKTsKICAgICBib29sIGdldFBsdWdpbkluZm9Gb3JXZWJWaXNp YmxlTWltZVR5cGUoY29uc3QgU3RyaW5nJiBtaW1lVHlwZSwgUGx1Z2luSW5mbyYpIGNvbnN0Owor ICAgIHZvaWQgZ2V0TWltZXNBbmRQbHVnaW5JbmRpY2VzKFZlY3RvcjxNaW1lQ2xhc3NJbmZvPiYs IFZlY3RvcjxzaXplX3Q+JikgY29uc3Q7CisgICAgdm9pZCBnZXRNaW1lc0FuZFBsdWdpbkluZGlj aWVzRm9yUGx1Z2lucyhjb25zdCBWZWN0b3I8UGx1Z2luSW5mbz4mLCBWZWN0b3I8TWltZUNsYXNz SW5mbz4mLCBWZWN0b3I8c2l6ZV90PiYpIGNvbnN0OwogCiBwcm90ZWN0ZWQ6CiAjaWYgZGVmaW5l ZCBFTkFCTEVfV0VCX1JFUExBWSAmJiBFTkFCTEVfV0VCX1JFUExBWQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdDIvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCmluZGV4IDI2 OWVlZjUuLjMwYjRlZjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZworKysg Yi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMSBAQAorMjAxNS0xMC0wMiAg Umlja3kgTW9uZGVsbG8gIDxybW9uZGVsbG9AYXBwbGUuY29tPgorCisgICAgICAgICJQbHVnLWlu IGlzIGJsb2NrZWQiIG1lc3NhZ2UgZG9lc24ndCBkcmF3IGNvcnJlY3RseQorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ5NzQxCisgICAgICAgIDxyZGFy Oi8vcHJvYmxlbS8yMjkyMDk0OT4KKworICAgICAgICBQYXRjaCBieSBDb25yYWQgU2h1bHR6IGFu ZCBSaWNreSBNb25kZWxsby4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBJZiBhIFdlYktpdCBjbGllbnQgc2V0cyBwbHVnLWluIFggdG8gbm90IGJlIHZp c2libGUgdG8gdGhlIHdlYiwgdGhhdCBkb2Vzbid0IG1lYW4gd2Ugc2hvdWxkbid0IGNvbnN1bHQK KyAgICAgICAgdGhhdCBwbHVnLWluIHdoZW4gZGV0ZXJtaW5pbmcgd2hhdCBraW5kIG9mIG9iamVj dCB0eXBlIGFuIG9iamVjdCBpcy4gUHJvcGVybHkgY2xhc3NpZnlpbmcgYSBub24td2ViLXZpc2li bGUKKyAgICAgICAgTmV0c2NhcGUgcGx1Zy1pbiBhcyBzdWNoIGFsbG93cyBpdHMgYm91bmRzIHRv IHByb3Blcmx5IG1lYXN1cmVkLCBhbGxvd2luZyBpdCB0byBiZSBkcmF3biBwcm9wZXJseS4KKwor ICAgICAgICAqIFdlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQu Y3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJGcmFtZUxvYWRlckNsaWVudDo6b2JqZWN0Q29udGVu dFR5cGUpOiBVc2UgUGx1Z2luRGF0YSdzIHN1cHBvcnRzTWltZVR5cGUsIHJhdGhlciB0aGFuIGl0 cworICAgICAgICAgICAgc3VwcG9ydHNXZWJWaXNpYmxlTWltZVR5cGUsIHdoZW4gZGV0ZXJtaW5p bmcgdGhlIE9iamVjdENvbnRlbnRUeXBlIGZvciBhIE1JTUUgdHlwZSBvbiBhIHVybC4KKwogMjAx NC0wMi0xNyAgUmlja3kgTW9uZGVsbG8gIDxybW9uZGVsbG9AYXBwbGUuY29tPgogCiAgICAgICAg IEV4cG9zZSBhIHdheSB0byBjbGVhciBjb29raWVzIG1vZGlmaWVkIGFmdGVyIGEgZ2l2ZW4gZGF0 ZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9X ZWJGcmFtZUxvYWRlckNsaWVudC5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNv cmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmNwcAppbmRleCA3ZmNjNDUwLi42MDBjNmVk IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dl YkZyYW1lTG9hZGVyQ2xpZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dl YkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmNwcApAQCAtMTUzNyw5ICsxNTM3LDkg QEAgT2JqZWN0Q29udGVudFR5cGUgV2ViRnJhbWVMb2FkZXJDbGllbnQ6Om9iamVjdENvbnRlbnRU eXBlKGNvbnN0IFVSTCYgdXJsLCBjb25zdAogICAgIGJvb2wgcGx1Z0luU3VwcG9ydHNNSU1FVHlw ZSA9IGZhbHNlOwogICAgIGlmIChXZWJQYWdlKiB3ZWJQYWdlID0gbV9mcmFtZS0+cGFnZSgpKSB7 CiAgICAgICAgIGNvbnN0IFBsdWdpbkRhdGEmIHBsdWdpbkRhdGEgPSB3ZWJQYWdlLT5jb3JlUGFn ZSgpLT5wbHVnaW5EYXRhKCk7Ci0gICAgICAgIGlmIChwbHVnaW5EYXRhLnN1cHBvcnRzV2ViVmlz aWJsZU1pbWVUeXBlKG1pbWVUeXBlLCBQbHVnaW5EYXRhOjpBbGxQbHVnaW5zKSAmJiB3ZWJGcmFt ZSgpLT5jb3JlRnJhbWUoKS0+bG9hZGVyKCkuc3ViZnJhbWVMb2FkZXIoKS5hbGxvd1BsdWdpbnMo KSkKKyAgICAgICAgaWYgKHBsdWdpbkRhdGEuc3VwcG9ydHNNaW1lVHlwZShtaW1lVHlwZSwgUGx1 Z2luRGF0YTo6QWxsUGx1Z2lucykgJiYgd2ViRnJhbWUoKS0+Y29yZUZyYW1lKCktPmxvYWRlcigp LnN1YmZyYW1lTG9hZGVyKCkuYWxsb3dQbHVnaW5zKCkpCiAgICAgICAgICAgICBwbHVnSW5TdXBw b3J0c01JTUVUeXBlID0gdHJ1ZTsKLSAgICAgICAgZWxzZSBpZiAocGx1Z2luRGF0YS5zdXBwb3J0 c1dlYlZpc2libGVNaW1lVHlwZShtaW1lVHlwZSwgUGx1Z2luRGF0YTo6T25seUFwcGxpY2F0aW9u UGx1Z2lucykpCisgICAgICAgIGVsc2UgaWYgKHBsdWdpbkRhdGEuc3VwcG9ydHNNaW1lVHlwZSht aW1lVHlwZSwgUGx1Z2luRGF0YTo6T25seUFwcGxpY2F0aW9uUGx1Z2lucykpCiAgICAgICAgICAg ICBwbHVnSW5TdXBwb3J0c01JTUVUeXBlID0gdHJ1ZTsKICAgICB9CiAgICAgCi0tIAoyLjMuOCAo QXBwbGUgR2l0LTU4KQoK