119607 2013-08-08 16:49:52 -0700 navigator.plugins has plugins in it when plugins are disabled 2013-08-11 14:19:06 -0700 1 1 1 Unclassified WebKit Plug-ins 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 thorton thorton andersca ap beidson gustavo mrobinson sam oldest_to_newest 915647 0 thorton 2013-08-08 16:49:52 -0700 ... and it shouldn't! Except it actually should have PDFPlugin in it. But only application plugins. <rdar://problem/14678030> 915649 1 208382 thorton 2013-08-08 17:02:38 -0700 Created attachment 208382 patch 915651 2 208382 andersca 2013-08-08 17:08:07 -0700 Comment on attachment 208382 patch View in context: https://bugs.webkit.org/attachment.cgi?id=208382&action=review > Source/WebKit/mac/WebCoreSupport/WebPlatformStrategies.mm:134 > + if (Frame* frame = page->mainFrame()) { I don’t think Page::mainFrame can be null. > Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp:288 > + if (Frame* frame = page->mainFrame()) { Ditto. 915702 3 thorton 2013-08-08 23:44:18 -0700 http://trac.webkit.org/changeset/153877 916078 4 gustavo 2013-08-10 18:30:18 -0700 This patch seems to have caused a huge regression in the time it takes to create WebViews in GTK, according to my bisection (> 3 seconds when the java plugin is present - eek). It's now scanning all plugins when a new WebView is created, I guess it might be related to the changes to Settings::setPluginsEnabled, but haven't investigated in detail yet. 916080 5 thorton 2013-08-10 19:42:45 -0700 (In reply to comment #4) > This patch seems to have caused a huge regression in the time it takes to create WebViews in GTK, according to my bisection (> 3 seconds when the java plugin is present - eek). It's now scanning all plugins when a new WebView is created, I guess it might be related to the changes to Settings::setPluginsEnabled, but haven't investigated in detail yet. Hmm, we should make it only-refresh-if-you-already-have-cached-data. 916081 6 thorton 2013-08-10 19:42:57 -0700 (In reply to comment #5) > (In reply to comment #4) > > This patch seems to have caused a huge regression in the time it takes to create WebViews in GTK, according to my bisection (> 3 seconds when the java plugin is present - eek). It's now scanning all plugins when a new WebView is created, I guess it might be related to the changes to Settings::setPluginsEnabled, but haven't investigated in detail yet. > > Hmm, we should make it only-refresh-if-you-already-have-cached-data. Please file another bug and I'll do that. 916150 7 gustavo 2013-08-11 14:19:06 -0700 Filed https://bugs.webkit.org/show_bug.cgi?id=119665, thanks! 208382 2013-08-08 17:02:38 -0700 2013-08-08 17:08:07 -0700 patch plugin.diff text/plain 12279 thorton ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBhMjI3NWJjLi5kMTlmY2ViIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTMtMDgt MDggIFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CisKKyAgICAgICAgbmF2 aWdhdG9yLnBsdWdpbnMgaGFzIHBsdWdpbnMgaW4gaXQgd2hlbiBwbHVnaW5zIGFyZSBkaXNhYmxl ZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTE5NjA3 CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8xNDY3ODAzMD4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgYSB0ZXN0IHRoYXQgZW5zdXJlcyB0aGF0 IG5hdmlnYXRvci5wbHVnaW5zIG9ubHkgY29udGFpbnMKKyAgICAgICAgYXBwbGljYXRpb24gcGx1 Z2lucyB3aGVuIHBsdWdpbnMgYXJlIGRpc2FibGVkLgorCisgICAgICAgICogcGx1Z2lucy9uYXZp Z2F0b3ItcGx1Z2lucy1kaXNhYmxlZC1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIHBs dWdpbnMvbmF2aWdhdG9yLXBsdWdpbnMtZGlzYWJsZWQuaHRtbDogQWRkZWQuCisKIDIwMTMtMDgt MDggIFJvYiBCdWlzICA8cndsYnVpc0B3ZWJraXQub3JnPgogCiAgICAgICAgIHN2Zy9jdXN0b20v dXNlLWhyZWYtdXBkYXRlLWNyYXNoLnN2ZyBmYWlsaW5nIG9uIGNlcnRhaW4gcGxhdGZvcm1zCmRp ZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9wbHVnaW5zL25hdmlnYXRvci1wbHVnaW5zLWRpc2FibGVk LWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL3BsdWdpbnMvbmF2aWdhdG9yLXBsdWdpbnMtZGlz YWJsZWQtZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjUz ZTA5MzUKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9wbHVnaW5zL25hdmlnYXRvci1w bHVnaW5zLWRpc2FibGVkLWV4cGVjdGVkLnR4dApAQCAtMCwwICsxIEBACitQYXNzZWQhCmRpZmYg LS1naXQgYS9MYXlvdXRUZXN0cy9wbHVnaW5zL25hdmlnYXRvci1wbHVnaW5zLWRpc2FibGVkLmh0 bWwgYi9MYXlvdXRUZXN0cy9wbHVnaW5zL25hdmlnYXRvci1wbHVnaW5zLWRpc2FibGVkLmh0bWwK bmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uYmFmMDY2NAotLS0gL2Rldi9udWxs CisrKyBiL0xheW91dFRlc3RzL3BsdWdpbnMvbmF2aWdhdG9yLXBsdWdpbnMtZGlzYWJsZWQuaHRt bApAQCAtMCwwICsxLDI2IEBACis8aHRtbD4KKzxoZWFkPgorICAgIDx0aXRsZT5UZXN0IGlmIG5h dmlnYXRvci5wbHVnaW5zIGlzIChtb3N0bHkpIGVtcHR5IHdoZW4gcGx1Z2lucyBhcmUgZGlzYWJs ZWQuPC90aXRsZT4KKzxib2R5PgorPHNjcmlwdD4KK2lmICh3aW5kb3cudGVzdFJ1bm5lcikgewor ICAgIHRlc3RSdW5uZXIuc2V0UGx1Z2luc0VuYWJsZWQoZmFsc2UpOworICAgIHRlc3RSdW5uZXIu ZHVtcEFzVGV4dCgpOworfQorCit2YXIgaGFzTm9uQXBwbGljYXRpb25QbHVnaW4gPSBmYWxzZTsK KworZm9yICh2YXIgaSA9IDA7IGkgPCBuYXZpZ2F0b3IucGx1Z2lucy5sZW5ndGg7ICsraSkgewor ICAgIHZhciBwbHVnaW4gPSBuYXZpZ2F0b3IucGx1Z2luc1tpXTsKKworICAgIC8vIEFwcGxpY2F0 aW9uIHBsdWdpbnMgaGF2ZSBhbiBlbXB0eSBmaWxlbmFtZSBhbmQgYXJlIE9LIGV2ZW4gd2hlbiBw bHVnaW5zIGFyZSBkaXNhYmxlZC4KKyAgICBpZiAocGx1Z2luLmZpbGVuYW1lICE9ICIiKSB7Cisg ICAgICAgIGhhc05vbkFwcGxpY2F0aW9uUGx1Z2luID0gdHJ1ZTsKKyAgICAgICAgZG9jdW1lbnQu d3JpdGUoIkZvdW5kIG5vbi1hcHBsaWNhdGlvbiBwbHVnLWluOiAiICsgcGx1Z2luLm5hbWUgKyAi PGJyPiIpOworICAgIH0KK30KKworZG9jdW1lbnQud3JpdGUoaGFzTm9uQXBwbGljYXRpb25QbHVn aW4gPyAiRmFpbGVkISIgOiAiUGFzc2VkISIpOworPC9zY3JpcHQ+Cis8L2JvZHk+Cis8L2h0bWw+ CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cKaW5kZXggZmYwZWU0Mi4uMWYwODBkZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIx IEBACisyMDEzLTA4LTA4ICBUaW0gSG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgor CisgICAgICAgIG5hdmlnYXRvci5wbHVnaW5zIGhhcyBwbHVnaW5zIGluIGl0IHdoZW4gcGx1Z2lu cyBhcmUgZGlzYWJsZWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTExOTYwNworICAgICAgICA8cmRhcjovL3Byb2JsZW0vMTQ2NzgwMzA+CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGVzdDogcGx1Z2lucy9u YXZpZ2F0b3ItcGx1Z2lucy1kaXNhYmxlZC5odG1sCisKKyAgICAgICAgKiBwYWdlL1NldHRpbmdz LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNldHRpbmdzOjpzZXRQbHVnaW5zRW5hYmxlZCk6Cisg ICAgICAgIFJlZnJlc2ggdGhlIHBsdWdpbiBkYXRhYmFzZSB3aGVuIHBsdWdpbnMgYXJlIGVuYWJs ZWQgb3IgZGlzYWJsZWQuCisgICAgICAgIFRoaXMgaXMgbmVjZXNzYXJ5IHRvIGVuc3VyZSB0aGF0 IG5hdmlnYXRvci5wbHVnaW5zIHdpbGwgaGF2ZSB0aGUKKyAgICAgICAgY29ycmVjdCBzZXQgb2Yg cGx1Z2lucyBhZnRlciBkeW5hbWljYWxseSBjaGFuZ2luZyB3aGV0aGVyIHBsdWdpbnMKKyAgICAg ICAgYXJlIGVuYWJsZWQsIHdoaWNoIG1ha2VzIHRoZSB0ZXN0IGZvciB0aGlzIHBhdGNoIHBvc3Np YmxlIChidXQgaXQKKyAgICAgICAgbWFrZXMgc2Vuc2UgaW4gdGhlIGJyb3dzZXIgYXMgd2VsbCku CisKIDIwMTMtMDgtMDggIFJvYmVydCBIb2dhbiAgPHJvYmVydEB3ZWJraXQub3JnPgogCiAgICAg ICAgIFJFR1JFU1NJT04ocjE0NzAxOSk6IFBhZ2UgaGFzIGV4dHJhIHNwYWNlCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9wYWdlL1NldHRpbmdzLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uv U2V0dGluZ3MuY3BwCmluZGV4IDE3NzVkYWUuLjEyYjQzOGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3BhZ2UvU2V0dGluZ3MuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvU2V0dGlu Z3MuY3BwCkBAIC0zOTAsNyArMzkwLDExIEBAIHZvaWQgU2V0dGluZ3M6OnNldEltYWdlc0VuYWJs ZWQoYm9vbCBhcmVJbWFnZXNFbmFibGVkKQogCiB2b2lkIFNldHRpbmdzOjpzZXRQbHVnaW5zRW5h YmxlZChib29sIGFyZVBsdWdpbnNFbmFibGVkKQogeworICAgIGlmIChtX2FyZVBsdWdpbnNFbmFi bGVkID09IGFyZVBsdWdpbnNFbmFibGVkKQorICAgICAgICByZXR1cm47CisKICAgICBtX2FyZVBs dWdpbnNFbmFibGVkID0gYXJlUGx1Z2luc0VuYWJsZWQ7CisgICAgUGFnZTo6cmVmcmVzaFBsdWdp bnMoZmFsc2UpOwogfQogCiB2b2lkIFNldHRpbmdzOjpzZXRQcml2YXRlQnJvd3NpbmdFbmFibGVk KGJvb2wgcHJpdmF0ZUJyb3dzaW5nRW5hYmxlZCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQv bWFjL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZwppbmRleCAzMjQxMWZk Li41OGYzYWFiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cKKysrIGIv U291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTMtMDgtMDgg IFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CisKKyAgICAgICAgbmF2aWdh dG9yLnBsdWdpbnMgaGFzIHBsdWdpbnMgaW4gaXQgd2hlbiBwbHVnaW5zIGFyZSBkaXNhYmxlZAor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTE5NjA3Cisg ICAgICAgIDxyZGFyOi8vcHJvYmxlbS8xNDY3ODAzMD4KKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L1dlYlBsYXRmb3JtU3Ry YXRlZ2llcy5tbToKKyAgICAgICAgKFdlYlBsYXRmb3JtU3RyYXRlZ2llczo6Z2V0UGx1Z2luSW5m byk6CisgICAgICAgIElmIHBsdWdpbnMgYXJlIGRpc2FibGVkIGZvciB0aGUgZ2l2ZW4gcGFnZSwg Z2l2ZSBXZWJDb3JlIGFuIGVtcHR5IGxpc3Qgb2YKKyAgICAgICAgcGx1Z2lucy4gSWYgV2ViS2l0 MSBoYWQgYW55IGFwcGxpY2F0aW9uIHBsdWdpbnMsIHdlJ2QgcmV0dXJuIGp1c3QgdGhlbQorICAg ICAgICBpbnN0ZWFkLgorCiAyMDEzLTA4LTA2ICBTdGVwaGFuaWUgTGV3aXMgIDxzbGV3aXNAYXBw bGUuY29tPgogCiAgICAgICAgIFVwZGF0ZSBPcmRlciBGaWxlcyBmb3IgU2FmYXJpCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0L21hYy9XZWJDb3JlU3VwcG9ydC9XZWJQbGF0Zm9ybVN0cmF0ZWdp ZXMubW0gYi9Tb3VyY2UvV2ViS2l0L21hYy9XZWJDb3JlU3VwcG9ydC9XZWJQbGF0Zm9ybVN0cmF0 ZWdpZXMubW0KaW5kZXggNjRhNWEzNi4uMzQ0NGY0MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dC9tYWMvV2ViQ29yZVN1cHBvcnQvV2ViUGxhdGZvcm1TdHJhdGVnaWVzLm1tCisrKyBiL1NvdXJj ZS9XZWJLaXQvbWFjL1dlYkNvcmVTdXBwb3J0L1dlYlBsYXRmb3JtU3RyYXRlZ2llcy5tbQpAQCAt MTI2LDEwICsxMjYsMTYgQEAgdm9pZCBXZWJQbGF0Zm9ybVN0cmF0ZWdpZXM6OnJlZnJlc2hQbHVn aW5zKCkKICAgICBbW1dlYlBsdWdpbkRhdGFiYXNlIHNoYXJlZERhdGFiYXNlXSByZWZyZXNoXTsK IH0KIAotdm9pZCBXZWJQbGF0Zm9ybVN0cmF0ZWdpZXM6OmdldFBsdWdpbkluZm8oY29uc3QgUGFn ZSosIFZlY3RvcjxQbHVnaW5JbmZvPiYgcGx1Z2lucykKK3ZvaWQgV2ViUGxhdGZvcm1TdHJhdGVn aWVzOjpnZXRQbHVnaW5JbmZvKGNvbnN0IFBhZ2UqIHBhZ2UsIFZlY3RvcjxQbHVnaW5JbmZvPiYg cGx1Z2lucykKIHsKICAgICBCRUdJTl9CTE9DS19PQkpDX0VYQ0VQVElPTlM7CiAKKyAgICAvLyBX ZWJLaXQxIGhhcyBubyBhcHBsaWNhdGlvbiBwbHVnLWlucywgc28gd2UgZG9uJ3QgbmVlZCB0byBh ZGQgdGhlbSBoZXJlLgorICAgIGlmIChGcmFtZSogZnJhbWUgPSBwYWdlLT5tYWluRnJhbWUoKSkg eworICAgICAgICBpZiAoIWZyYW1lLT5sb2FkZXIoKS0+c3ViZnJhbWVMb2FkZXIoKS0+YWxsb3dQ bHVnaW5zKE5vdEFib3V0VG9JbnN0YW50aWF0ZVBsdWdpbikpCisgICAgICAgICAgICByZXR1cm47 CisgICAgfQorCiAgICAgTlNBcnJheSogcGx1Z2luc0FycmF5ID0gW1tXZWJQbHVnaW5EYXRhYmFz ZSBzaGFyZWREYXRhYmFzZV0gcGx1Z2luc107CiAgICAgZm9yICh1bnNpZ25lZCBpbnQgaSA9IDA7 IGkgPCBbcGx1Z2luc0FycmF5IGNvdW50XTsgKytpKSB7CiAgICAgICAgIFdlYlBsdWdpblBhY2th Z2UgKnBsdWdpbiA9IFtwbHVnaW5zQXJyYXkgb2JqZWN0QXRJbmRleDppXTsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwppbmRl eCA1NTk1MjEwLi45MGYxZWNlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cK KysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjcgQEAKKzIwMTMtMDgt MDggIFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CisKKyAgICAgICAgbmF2 aWdhdG9yLnBsdWdpbnMgaGFzIHBsdWdpbnMgaW4gaXQgd2hlbiBwbHVnaW5zIGFyZSBkaXNhYmxl ZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTE5NjA3 CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8xNDY3ODAzMD4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQcm9jZXNzUHJveHku Y3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQcm9jZXNzUHJveHk6OmdldFBsdWdpbnMpOgorICAg ICAgICBSZXR1cm4gYSBsaXN0IG9mIGFsbCBwbHVnaW5zLCBhbmQgYSBsaXN0IG9mIG9ubHkgYXBw bGljYXRpb24gcGx1Z2lucy4KKworICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQcm9jZXNzUHJveHku aDoKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUHJvY2Vzc1Byb3h5Lm1lc3NhZ2VzLmluOgorICAg ICAgICAqIFdlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViUGxhdGZvcm1TdHJhdGVnaWVzLmg6 CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJQbGF0Zm9ybVN0cmF0ZWdp ZXMuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQbGF0Zm9ybVN0cmF0ZWdpZXM6OmdldFBsdWdp bkluZm8pOgorICAgICAgICBBZGQgYXBwbGljYXRpb25QbHVnaW4gcGFyYW1ldGVyIHRvIGdldFBs dWdpbnMsIGFuZCBzdG9yYWdlIGZvciB0aGUgcmV0dXJuZWQgbGlzdC4KKworICAgICAgICAoV2Vi S2l0OjpXZWJQbGF0Zm9ybVN0cmF0ZWdpZXM6OnBvcHVsYXRlUGx1Z2luQ2FjaGUpOgorICAgICAg ICBJZiBwbHVnaW5zIGFyZSBkaXNhYmxlZCBmb3IgdGhlIGdpdmVuIHBhZ2UsIGdpdmUgV2ViQ29y ZSB0aGUgbGlzdCB0aGF0CisgICAgICAgIG9ubHkgaW5jbHVkZXMgYXBwbGljYXRpb24gcGx1Z2lu cy4gT3RoZXJ3aXNlLCBnaXZlIGl0IHRoZSB3aG9sZSBsaXN0CisgICAgICAgIGFzIHdlIGFyZSBk b2luZyBjdXJyZW50bHkuCisKIDIwMTMtMDgtMDcgIEFudHRpIEtvaXZpc3RvICA8YW50dGlAYXBw bGUuY29tPgogCiAgICAgICAgIFRyeSB0byBmaXggRUZMIGJ1aWxkLgpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlByb2Nlc3NQcm94eS5jcHAgYi9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Byb3h5LmNwcAppbmRleCA3ZGU4YmI5Li5jNDZmYTNkIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Byb3h5LmNwcAor KysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Byb3h5LmNwcApAQCAtMzA2 LDcgKzMwNiw3IEBAIHZvaWQgV2ViUHJvY2Vzc1Byb3h5OjphZGRCYWNrRm9yd2FyZEl0ZW0odWlu dDY0X3QgaXRlbUlELCBjb25zdCBTdHJpbmcmIG9yaWdpbmFsCiB9CiAKICNpZiBFTkFCTEUoTkVU U0NBUEVfUExVR0lOX0FQSSkKLXZvaWQgV2ViUHJvY2Vzc1Byb3h5OjpnZXRQbHVnaW5zKGJvb2wg cmVmcmVzaCwgVmVjdG9yPFBsdWdpbkluZm8+JiBwbHVnaW5zKQordm9pZCBXZWJQcm9jZXNzUHJv eHk6OmdldFBsdWdpbnMoYm9vbCByZWZyZXNoLCBWZWN0b3I8UGx1Z2luSW5mbz4mIHBsdWdpbnMs IFZlY3RvcjxQbHVnaW5JbmZvPiYgYXBwbGljYXRpb25QbHVnaW5zKQogewogICAgIGlmIChyZWZy ZXNoKQogICAgICAgICBtX2NvbnRleHQtPnBsdWdpbkluZm9TdG9yZSgpLnJlZnJlc2goKTsKQEAg LTMxNyw4ICszMTcsMTAgQEAgdm9pZCBXZWJQcm9jZXNzUHJveHk6OmdldFBsdWdpbnMoYm9vbCBy ZWZyZXNoLCBWZWN0b3I8UGx1Z2luSW5mbz4mIHBsdWdpbnMpCiAKICNpZiBFTkFCTEUoUERGS0lU X1BMVUdJTikKICAgICAvLyBBZGQgYnVpbHQtaW4gUERGIGxhc3QsIHNvIHRoYXQgaXQncyBub3Qg dXNlZCB3aGVuIGEgcmVhbCBwbHVnLWluIGlzIGluc3RhbGxlZC4KLSAgICBpZiAoIW1fY29udGV4 dC0+b21pdFBERlN1cHBvcnQoKSkKKyAgICBpZiAoIW1fY29udGV4dC0+b21pdFBERlN1cHBvcnQo KSkgewogICAgICAgICBwbHVnaW5zLmFwcGVuZChQREZQbHVnaW46OnBsdWdpbkluZm8oKSk7Cisg ICAgICAgIGFwcGxpY2F0aW9uUGx1Z2lucy5hcHBlbmQoUERGUGx1Z2luOjpwbHVnaW5JbmZvKCkp OworICAgIH0KICNlbmRpZgogfQogI2VuZGlmIC8vIEVOQUJMRShORVRTQ0FQRV9QTFVHSU5fQVBJ KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlByb2Nlc3NQcm94eS5o IGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlByb2Nlc3NQcm94eS5oCmluZGV4IDdkOWI3 ZjYuLjc4NzcxNDAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQcm9j ZXNzUHJveHkuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Byb3h5 LmgKQEAgLTE0NCw3ICsxNDQsNyBAQCBwcml2YXRlOgogCiAgICAgLy8gUGx1Z2lucwogI2lmIEVO QUJMRShORVRTQ0FQRV9QTFVHSU5fQVBJKQotICAgIHZvaWQgZ2V0UGx1Z2lucyhib29sIHJlZnJl c2gsIFZlY3RvcjxXZWJDb3JlOjpQbHVnaW5JbmZvPiYgcGx1Z2lucyk7CisgICAgdm9pZCBnZXRQ bHVnaW5zKGJvb2wgcmVmcmVzaCwgVmVjdG9yPFdlYkNvcmU6OlBsdWdpbkluZm8+JiBwbHVnaW5z LCBWZWN0b3I8V2ViQ29yZTo6UGx1Z2luSW5mbz4mIGFwcGxpY2F0aW9uUGx1Z2lucyk7CiAjZW5k aWYgLy8gRU5BQkxFKE5FVFNDQVBFX1BMVUdJTl9BUEkpCiAjaWYgRU5BQkxFKFBMVUdJTl9QUk9D RVNTKQogICAgIHZvaWQgZ2V0UGx1Z2luUHJvY2Vzc0Nvbm5lY3Rpb24odWludDY0X3QgcGx1Z2lu UHJvY2Vzc1Rva2VuLCBQYXNzUmVmUHRyPE1lc3NhZ2VzOjpXZWJQcm9jZXNzUHJveHk6OkdldFBs dWdpblByb2Nlc3NDb25uZWN0aW9uOjpEZWxheWVkUmVwbHk+KTsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQcm9jZXNzUHJveHkubWVzc2FnZXMuaW4gYi9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Byb3h5Lm1lc3NhZ2VzLmluCmluZGV4IGZlNmQz YTIuLjA2NDc5ODIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQcm9j ZXNzUHJveHkubWVzc2FnZXMuaW4KKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBy b2Nlc3NQcm94eS5tZXNzYWdlcy5pbgpAQCAtMzgsNyArMzgsNyBAQCBtZXNzYWdlcyAtPiBXZWJQ cm9jZXNzUHJveHkgTGVnYWN5UmVjZWl2ZXIgewogCiAgICAgIyBQbHVnaW4gbWVzc2FnZXMuCiAj aWYgRU5BQkxFKE5FVFNDQVBFX1BMVUdJTl9BUEkpCi0gICAgR2V0UGx1Z2lucyhib29sIHJlZnJl c2gpIC0+IChWZWN0b3I8V2ViQ29yZTo6UGx1Z2luSW5mbz4gcGx1Z2lucykKKyAgICBHZXRQbHVn aW5zKGJvb2wgcmVmcmVzaCkgLT4gKFZlY3RvcjxXZWJDb3JlOjpQbHVnaW5JbmZvPiBwbHVnaW5z LCBWZWN0b3I8V2ViQ29yZTo6UGx1Z2luSW5mbz4gYXBwbGljYXRpb25QbHVnaW5zKQogI2VuZGlm IC8vIEVOQUJMRShORVRTQ0FQRV9QTFVHSU5fQVBJKQogI2lmIEVOQUJMRShQTFVHSU5fUFJPQ0VT UykKICAgICBHZXRQbHVnaW5Qcm9jZXNzQ29ubmVjdGlvbih1aW50NjRfdCBwbHVnaW5Qcm9jZXNz VG9rZW4pIC0+IChDb3JlSVBDOjpBdHRhY2htZW50IGNvbm5lY3Rpb25IYW5kbGUsIGJvb2wgc3Vw cG9ydHNBc3luY2hyb25vdXNJbml0aWFsaXphdGlvbikgRGVsYXllZApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJQbGF0Zm9ybVN0cmF0ZWdp ZXMuY3BwIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJQbGF0 Zm9ybVN0cmF0ZWdpZXMuY3BwCmluZGV4IDQ3NGU1NzQuLjBiNTgwNGEgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViUGxhdGZvcm1TdHJhdGVn aWVzLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dl YlBsYXRmb3JtU3RyYXRlZ2llcy5jcHAKQEAgLTM5LDYgKzM5LDcgQEAKICNpbmNsdWRlICJXZWJQ cm9jZXNzLmgiCiAjaW5jbHVkZSAiV2ViUHJvY2Vzc1Byb3h5TWVzc2FnZXMuaCIKICNpbmNsdWRl IDxXZWJDb3JlL0NvbG9yLmg+CisjaW5jbHVkZSA8V2ViQ29yZS9GcmFtZS5oPgogI2luY2x1ZGUg PFdlYkNvcmUvS1VSTC5oPgogI2luY2x1ZGUgPFdlYkNvcmUvTG9hZGVyU3RyYXRlZ3kuaD4KICNp bmNsdWRlIDxXZWJDb3JlL05ldHdvcmtTdG9yYWdlU2Vzc2lvbi5oPgpAQCAtMjc5LDExICsyODAs MTkgQEAgdm9pZCBXZWJQbGF0Zm9ybVN0cmF0ZWdpZXM6OnJlZnJlc2hQbHVnaW5zKCkKICNlbmRp ZiAvLyBFTkFCTEUoTkVUU0NBUEVfUExVR0lOX0FQSSkKIH0KIAotdm9pZCBXZWJQbGF0Zm9ybVN0 cmF0ZWdpZXM6OmdldFBsdWdpbkluZm8oY29uc3QgV2ViQ29yZTo6UGFnZSosIFZlY3RvcjxXZWJD b3JlOjpQbHVnaW5JbmZvPiYgcGx1Z2lucykKK3ZvaWQgV2ViUGxhdGZvcm1TdHJhdGVnaWVzOjpn ZXRQbHVnaW5JbmZvKGNvbnN0IFdlYkNvcmU6OlBhZ2UqIHBhZ2UsIFZlY3RvcjxXZWJDb3JlOjpQ bHVnaW5JbmZvPiYgcGx1Z2lucykKIHsKICNpZiBFTkFCTEUoTkVUU0NBUEVfUExVR0lOX0FQSSkK ICAgICBwb3B1bGF0ZVBsdWdpbkNhY2hlKCk7Ci0gICAgcGx1Z2lucyA9IG1fY2FjaGVkUGx1Z2lu czsKKworICAgIGlmIChGcmFtZSogZnJhbWUgPSBwYWdlLT5tYWluRnJhbWUoKSkgeworICAgICAg ICBpZiAoZnJhbWUtPmxvYWRlcigpLT5zdWJmcmFtZUxvYWRlcigpLT5hbGxvd1BsdWdpbnMoTm90 QWJvdXRUb0luc3RhbnRpYXRlUGx1Z2luKSkgeworICAgICAgICAgICAgcGx1Z2lucyA9IG1fY2Fj aGVkUGx1Z2luczsKKyAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgfQorICAgIH0KKworICAg IHBsdWdpbnMgPSBtX2NhY2hlZEFwcGxpY2F0aW9uUGx1Z2luczsKICNlbmRpZiAvLyBFTkFCTEUo TkVUU0NBUEVfUExVR0lOX0FQSSkKIH0KIApAQCAtMjk2LDcgKzMwNSw3IEBAIHZvaWQgV2ViUGxh dGZvcm1TdHJhdGVnaWVzOjpwb3B1bGF0ZVBsdWdpbkNhY2hlKCkKICAgICBBU1NFUlQobV9jYWNo ZWRQbHVnaW5zLmlzRW1wdHkoKSk7CiAgICAgCiAgICAgLy8gRklYTUU6IFNob3VsZCB3ZSBkbyBz b21ldGhpbmcgaW4gY2FzZSBvZiBlcnJvciBoZXJlPwotICAgIGlmICghV2ViUHJvY2Vzczo6c2hh cmVkKCkucGFyZW50UHJvY2Vzc0Nvbm5lY3Rpb24oKS0+c2VuZFN5bmMoTWVzc2FnZXM6OldlYlBy b2Nlc3NQcm94eTo6R2V0UGx1Z2lucyhtX3Nob3VsZFJlZnJlc2hQbHVnaW5zKSwgTWVzc2FnZXM6 OldlYlByb2Nlc3NQcm94eTo6R2V0UGx1Z2luczo6UmVwbHkobV9jYWNoZWRQbHVnaW5zKSwgMCkp CisgICAgaWYgKCFXZWJQcm9jZXNzOjpzaGFyZWQoKS5wYXJlbnRQcm9jZXNzQ29ubmVjdGlvbigp LT5zZW5kU3luYyhNZXNzYWdlczo6V2ViUHJvY2Vzc1Byb3h5OjpHZXRQbHVnaW5zKG1fc2hvdWxk UmVmcmVzaFBsdWdpbnMpLCBNZXNzYWdlczo6V2ViUHJvY2Vzc1Byb3h5OjpHZXRQbHVnaW5zOjpS ZXBseShtX2NhY2hlZFBsdWdpbnMsIG1fY2FjaGVkQXBwbGljYXRpb25QbHVnaW5zKSwgMCkpCiAg ICAgICAgIHJldHVybjsKIAogICAgIG1fc2hvdWxkUmVmcmVzaFBsdWdpbnMgPSBmYWxzZTsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViUGxh dGZvcm1TdHJhdGVnaWVzLmggYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBw b3J0L1dlYlBsYXRmb3JtU3RyYXRlZ2llcy5oCmluZGV4IDcyNjI4MjguLmRhZWRjNGQgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViUGxhdGZv cm1TdHJhdGVnaWVzLmgKKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3Vw cG9ydC9XZWJQbGF0Zm9ybVN0cmF0ZWdpZXMuaApAQCAtMTE4LDExICsxMTgsMTIgQEAgcHJpdmF0 ZToKICAgICBib29sIG1fcGx1Z2luQ2FjaGVJc1BvcHVsYXRlZDsKICAgICBib29sIG1fc2hvdWxk UmVmcmVzaFBsdWdpbnM7CiAgICAgVmVjdG9yPFdlYkNvcmU6OlBsdWdpbkluZm8+IG1fY2FjaGVk UGx1Z2luczsKKyAgICBWZWN0b3I8V2ViQ29yZTo6UGx1Z2luSW5mbz4gbV9jYWNoZWRBcHBsaWNh dGlvblBsdWdpbnM7CiAjZW5kaWYgLy8gRU5BQkxFKFBMVUdJTl9QUk9DRVNTKQogfTsKIAogI2lm IEVOQUJMRShORVRTQ0FQRV9QTFVHSU5fQVBJKQotdm9pZCBoYW5kbGVEaWRHZXRQbHVnaW5zKHVp bnQ2NF90IHJlcXVlc3RJRCwgY29uc3QgVmVjdG9yPFdlYkNvcmU6OlBsdWdpbkluZm8+Jik7Cit2 b2lkIGhhbmRsZURpZEdldFBsdWdpbnModWludDY0X3QgcmVxdWVzdElELCBjb25zdCBWZWN0b3I8 V2ViQ29yZTo6UGx1Z2luSW5mbz4mLCBjb25zdCBWZWN0b3I8V2ViQ29yZTo6UGx1Z2luSW5mbz4m IGFwcGxpY2F0aW9uUGx1Z2lucyk7CiAjZW5kaWYgLy8gRU5BQkxFKFBMVUdJTl9QUk9DRVNTKQog CiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQK