27215 2009-07-13 07:37:56 -0700 [QT] suppress (un)desired launcher output that can make layout test to fail with stderr 2009-07-17 06:34:51 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) PC Linux RESOLVED FIXED P2 Normal --- 26886 0 tonikitoo webkit-unassigned gustavo hausmann kenneth manyoso zecke oldest_to_newest 131311 0 tonikitoo 2009-07-13 07:37:56 -0700 4778 test cases (98%) succeeded 9 test cases (<1%) had incorrect layout 34 test cases (<1%) were new 8 test cases (<1%) crashed 18 test cases (<1%) had stderr output --> Something noticeable and annoying: I got 18 tests w/ "stderr output" but all of them output either Xlib: extension "RANDR" missing on display ":0.0". or ** Message: NP_Initialize ** Message: NP_Initialize succeeded ** Message: NP_Initialize ** Message: NP_Initialize succeeded ** Message: NP_Initialize ** Message: NP_Initialize succeeded ** Message: NP_Initialize ** Message: NP_Initialize succeeded 131649 1 kenneth 2009-07-14 13:11:11 -0700 I think that we should atleast filter out the NP Plugin messages starting with "** Message:" 131656 2 32733 kenneth 2009-07-14 13:47:00 -0700 Created attachment 32733 For Qt, suppress NP Plugin stderr output that is out of our control 131661 3 tonikitoo 2009-07-14 13:53:39 -0700 as per chat on IRC, that can be not qt specific, but linux so gtk could be interested ? cc'ing kov 131671 4 kenneth 2009-07-14 14:23:54 -0700 Actually, this seems linux specific so is useful for Qt, Chromium and Gtk+ 131673 5 32735 kenneth 2009-07-14 14:26:47 -0700 Created attachment 32735 For Linux, suppress NP Plugin stderr output that is out of our control 131852 6 manyoso 2009-07-15 04:44:12 -0700 Why is this out of our control? What exactly is printing this information? Coming from outside WebKit altogether? Can plugins not be loaded by Qt DRT as an alternative? Are you sure that GTK DRT has this problem? At the very least, you should document why you are suppressing those messages in the source code as it is not obvious. 131865 7 kenneth 2009-07-15 06:04:55 -0700 It is because of the PLUGINDEBUGSTR that most netscape plugins use, but just enabling the test plugin for DRT would be better, but depends on a patch to change the default plugin directories. 131869 8 zecke 2009-07-15 06:10:52 -0700 (In reply to comment #0) > ** Message: NP_Initialize > ** Message: NP_Initialize succeeded > ** Message: NP_Initialize > ** Message: NP_Initialize succeeded > ** Message: NP_Initialize > ** Message: NP_Initialize succeeded > ** Message: NP_Initialize > ** Message: NP_Initialize succeeded This is coming from the totem plugin. My take on this is that tests do not fail, so we should not bother. 131957 9 32796 kenneth 2009-07-15 11:03:26 -0700 Created attachment 32796 For Qt,overwrite the plugin directories for the DRT to only those defined in QTWEBKIT_PLUGIN_PATH 131987 10 32796 manyoso 2009-07-15 12:07:45 -0700 Comment on attachment 32796 For Qt,overwrite the plugin directories for the DRT to only those defined in QTWEBKIT_PLUGIN_PATH I like the approach of the patch and think this will work, but a few problems: > -PluginDatabase* PluginDatabase::installedPlugins() > +PluginDatabase* PluginDatabase::installedPlugins(bool populate) This reason for this populate arg should be documented in code as it is not obvious. > +void PluginDatabase::clear() > +{ > + m_plugins.clear(); > + m_pluginsByPath.clear(); > + m_registeredMIMETypes.clear(); > +} Sure, but no deletion needed? > + void setPluginDirectories(const Vector<String>& directories) > + { > + clear(); > + m_pluginDirectories = directories; > + } Looks suspect as you're changing the behavior of this method. Where is this method currently called from? Any obvious side effects? > + bool m_pluginSetChanged; Adding a member variable that is never used or initialized? > +void QWEBKIT_EXPORT qt_drt_overwritePluginDirectories() > +{ > + PluginDatabase *db = PluginDatabase::installedPlugins(/* populate */ false); The decorator is in wrong place according to webkit coding style guidelines. With these things fixed I think it'll be in good shape. Cheers, Adam 132033 11 kenneth 2009-07-15 14:18:30 -0700 > > +void PluginDatabase::clear() > > +{ > > + m_plugins.clear(); > > + m_pluginsByPath.clear(); > > + m_registeredMIMETypes.clear(); > > +} > Sure, but no deletion needed? It does the same as the remove() functions. It also doesn't delete anything. > > + void setPluginDirectories(const Vector<String>& directories) > > + { > > + clear(); > > + m_pluginDirectories = directories; > > + } > > Looks suspect as you're changing the behavior of this method. Where is this > method currently called from? Any obvious side effects? Only from the installedPlugins() function, so no. > > + bool m_pluginSetChanged; > > Adding a member variable that is never used or initialized? That is a leftover, thanks for spotting. > > +void QWEBKIT_EXPORT qt_drt_overwritePluginDirectories() > > +{ > > + PluginDatabase *db = PluginDatabase::installedPlugins(/* populate */ false); > > The decorator is in wrong place according to webkit coding style guidelines. decorator? the /* populate */ ? Btw, this in in Qt code and should thus follow the Qt coding style, but it might still be wrong though. 132042 12 manyoso 2009-07-15 14:33:48 -0700 (In reply to comment #11) > decorator? the /* populate */ ? Btw, this in in Qt code and should thus follow > the Qt coding style, but it might still be wrong though. No, the decorator on 'PluginDatabase *db' and a decision was made that all Qt port code, whether in WebKit/qt or in WebCore or where ever in should follow the webkit coding style. See here: http://trac.webkit.org/wiki/QtWebKitContrib#CodingStyle That decision was made after a lengthy meeting and discussion on the topic in #qtwebkit that included Simon, Ariya, Zecke, Torarne, Ben and myself and others. 132556 13 32936 kenneth 2009-07-17 06:12:13 -0700 Created attachment 32936 For Qt,overwrite the plugin directories for the DRT to only those defined in QTWEBKIT_PLUGIN_PATH 132557 14 32937 kenneth 2009-07-17 06:17:02 -0700 Created attachment 32937 For Qt,overwrite the plugin directories for the DRT to only those defined in QTWEBKIT_PLUGIN_PATH Submitted patch with garbage by mistake. This one should be alright 132558 15 tonikitoo 2009-07-17 06:20:52 -0700 kenne, could you please exactly say how many fake-failing tests are you supposed to be enabling, so I can try to match on my 32-bit box. 132559 16 32937 hausmann 2009-07-17 06:30:24 -0700 Comment on attachment 32937 For Qt,overwrite the plugin directories for the DRT to only those defined in QTWEBKIT_PLUGIN_PATH r=me 132560 17 manyoso 2009-07-17 06:31:32 -0700 > (WebCore::PluginDatabase::clear): Make is possible to clear the s/is/it/ > + (WebCore::PluginDatabase::clear): Make is possible to clear the s/is/it/ > if (!plugins) { > plugins = new PluginDatabase; > - plugins->setPluginDirectories(PluginDatabase::defaultPluginDirectories()); > - plugins->refresh(); > + > + if (populate) { > + plugins->setPluginDirectories(PluginDatabase::defaultPluginDirectories()); > + plugins->refresh(); > + } No reason for the extra line break. > + m_plugins.clear(); > + m_pluginsByPath.clear(); > + > + m_registeredMIMETypes.clear(); No reason for the extra line break. r=me with these minor nits. Great work! One more step to getting the DRT into reasonable shape :) 132561 18 hausmann 2009-07-17 06:34:51 -0700 Landed in 46030 with the ChangeLog typo fixup commit in 46031 32733 2009-07-14 13:47:00 -0700 2009-07-14 14:26:47 -0700 For Qt, suppress NP Plugin stderr output that is out of our control 0001-2009-07-14-Kenneth-Rohde-Christiansen-kenneth.chr.patch text/plain 2290 kenneth RnJvbSA4ODJlNWMwZmQ0OGRiYTY4ODgwYjg2ZWRmODFmYzdmMzAwOGIwYmQ2IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBLZW5uZXRoIFJvaGRlIENocmlzdGlhbnNlbiA8a2VubmV0aC5j aHJpc3RpYW5zZW5Ab3BlbmJvc3NhLm9yZz4KRGF0ZTogVHVlLCAxNCBKdWwgMjAwOSAxNzo0NTo1 MSAtMDMwMApTdWJqZWN0OiBbUEFUQ0hdIDIwMDktMDctMTQgIEtlbm5ldGggUm9oZGUgQ2hyaXN0 aWFuc2VuICA8a2VubmV0aC5jaHJpc3RpYW5zZW5Ab3BlbmJvc3NhLm9yZz4KCiAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCgogICAgICAgIEZvciBRdCwgc3VwcHJlc3MgTlAgUGx1 Z2luIHN0ZGVyciBvdXRwdXQgdGhhdCBpcyBvdXQgb2Ygb3VyIGNvbnRyb2wuCiAgICAgICAgUGFy dCBvZiBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjcyMTUKCiAgICAg ICAgKiBTY3JpcHRzL3J1bi13ZWJraXQtdGVzdHM6IEludHJvZHVjZSBzdXBwcmVzc0Vycm9yIHN1 YnJ1dGluZS4KLS0tCiBXZWJLaXRUb29scy9DaGFuZ2VMb2cgICAgICAgICAgICAgICAgfCAgICA5 ICsrKysrKysrKwogV2ViS2l0VG9vbHMvU2NyaXB0cy9ydW4td2Via2l0LXRlc3RzIHwgICAxNCAr KysrKysrKysrKysrLQogMiBmaWxlcyBjaGFuZ2VkLCAyMiBpbnNlcnRpb25zKCspLCAxIGRlbGV0 aW9ucygtKQoKZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xz L0NoYW5nZUxvZwppbmRleCAwMjA3YjgzLi5iYzljNTRmIDEwMDY0NAotLS0gYS9XZWJLaXRUb29s cy9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAK KzIwMDktMDctMTQgIEtlbm5ldGggUm9oZGUgQ2hyaXN0aWFuc2VuICA8a2VubmV0aC5jaHJpc3Rp YW5zZW5Ab3BlbmJvc3NhLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBGb3IgUXQsIHN1cHByZXNzIE5QIFBsdWdpbiBzdGRlcnIgb3V0cHV0IHRo YXQgaXMgb3V0IG9mIG91ciBjb250cm9sLgorICAgICAgICBQYXJ0IG9mIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNzIxNQorCisgICAgICAgICogU2NyaXB0cy9ydW4t d2Via2l0LXRlc3RzOiBJbnRyb2R1Y2Ugc3VwcHJlc3NFcnJvciBzdWJydXRpbmUuCisKIDIwMDkt MDctMTQgIFNoaW5pY2hpcm8gSGFtYWppICA8aGFtYWppQGNocm9taXVtLm9yZz4KIAogICAgICAg ICBSZXZpZXdlZCBieSBEYXZpZCBMZXZpbi4KZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1Njcmlw dHMvcnVuLXdlYmtpdC10ZXN0cyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvcnVuLXdlYmtpdC10ZXN0 cwppbmRleCBhMzg1ZDA0Li4wZmMwY2E0IDEwMDc1NQotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRz L3J1bi13ZWJraXQtdGVzdHMKKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy9ydW4td2Via2l0LXRl c3RzCkBAIC03Niw2ICs3Niw3IEBAIHN1YiBvcGVuRHVtcFRvb2woKTsKIHN1YiBjbG9zZUR1bXBU b29sKCk7CiBzdWIgZHVtcFRvb2xEaWRDcmFzaCgpOwogc3ViIGNsb3NlSFRUUEQoKTsKK3N1YiBz dXBwcmVzc0Vycm9yKCQpOwogc3ViIGNvdW50QW5kUHJpbnRMZWFrcygkJCQpOwogc3ViIGZpbGVO YW1lV2l0aE51bWJlcigkJCk7CiBzdWIgbnVtZXJpY2NtcCgkJCk7CkBAIC05MzQsNyArOTM1LDcg QEAgZm9yIG15ICR0ZXN0IChAdGVzdHMpIHsKICAgICAgICAgfQogICAgIH0KIAotICAgIGlmICgk ZXJyb3IpIHsKKyAgICBpZiAoJGVycm9yICYmICFzdXBwcmVzc0Vycm9yKCRlcnJvcikpIHsKICAg ICAgICAgbXkgJGRpciA9ICIkdGVzdFJlc3VsdHNEaXJlY3RvcnkvJGJhc2UiOwogICAgICAgICAk ZGlyID1+IHN8LyhbXi9dKykkfHwgb3IgZGllICJGYWlsZWQgdG8gZmluZCB0ZXN0IG5hbWUgZnJv bSBiYXNlXG4iOwogICAgICAgICBta3BhdGggJGRpcjsKQEAgLTEwNTksNiArMTA2MCwxNyBAQCBj bG9zZUN5Z3BhdGhzKCkgaWYgaXNDeWd3aW4oKTsKIAogZXhpdCAxOwogCitzdWIgc3VwcHJlc3NF cnJvcigkKQoreworICAgIG15ICgkZXJyb3IpID0gQF87CisKKyAgICBpZiAoaXNRdCgpICYmICRl cnJvciA9fiAvXlwqXCogTWVzc2FnZTovKSB7CisgICAgICAgIHJldHVybiAxOworICAgIH0KKwor ICAgIHJldHVybiAwOworfQorCiBzdWIgY291bnRBbmRQcmludExlYWtzKCQkJCkKIHsKICAgICBt eSAoJGR1bXBUb29sTmFtZSwgJGR1bXBUb29sUElELCAkbGVha3NGaWxlUGF0aCkgPSBAXzsKLS0g CjEuNi4wLjQKCg== 32735 2009-07-14 14:26:47 -0700 2009-07-15 11:03:26 -0700 For Linux, suppress NP Plugin stderr output that is out of our control 0001-2009-07-14-Kenneth-Rohde-Christiansen-kenneth.chr-2.patch text/plain 2453 kenneth RnJvbSA5NGZjZWQ2OWQ3OTAxNTNlZmZhNGYxMGJkYjY5YTc4ZTA5YTNlZmMyIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBLZW5uZXRoIFJvaGRlIENocmlzdGlhbnNlbiA8a2VubmV0aC5j aHJpc3RpYW5zZW5Ab3BlbmJvc3NhLm9yZz4KRGF0ZTogVHVlLCAxNCBKdWwgMjAwOSAxNzo0NTo1 MSAtMDMwMApTdWJqZWN0OiBbUEFUQ0hdIDIwMDktMDctMTQgIEtlbm5ldGggUm9oZGUgQ2hyaXN0 aWFuc2VuICA8a2VubmV0aC5jaHJpc3RpYW5zZW5Ab3BlbmJvc3NhLm9yZz4KCiAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCgogICAgICAgIEZvciBMaW51eCwgc3VwcHJlc3MgTlAg UGx1Z2luIHN0ZGVyciBvdXRwdXQgdGhhdCBpcyBvdXQgb2Ygb3VyIGNvbnRyb2wuCiAgICAgICAg UGFydCBvZiBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjcyMTUKCiAg ICAgICAgKiBTY3JpcHRzL3J1bi13ZWJraXQtdGVzdHM6IEludHJvZHVjZSBzdXBwcmVzc0Vycm9y IGFuZCBpc0xpbnV4T1MKICAgICAgICBzdWJydXRpbmVzLgotLS0KIFdlYktpdFRvb2xzL0NoYW5n ZUxvZyAgICAgICAgICAgICAgICB8ICAgMTAgKysrKysrKysrKwogV2ViS2l0VG9vbHMvU2NyaXB0 cy9ydW4td2Via2l0LXRlc3RzIHwgICAyMyArKysrKysrKysrKysrKysrKysrKysrLQogMiBmaWxl cyBjaGFuZ2VkLCAzMiBpbnNlcnRpb25zKCspLCAxIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBh L1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxvZwppbmRleCAwMjA3 YjgzLi44OGYzZWNhIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VMb2cKKysrIGIvV2Vi S2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMDktMDctMTQgIEtlbm5ldGgg Um9oZGUgQ2hyaXN0aWFuc2VuICA8a2VubmV0aC5jaHJpc3RpYW5zZW5Ab3BlbmJvc3NhLm9yZz4K KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBGb3IgTGlu dXgsIHN1cHByZXNzIE5QIFBsdWdpbiBzdGRlcnIgb3V0cHV0IHRoYXQgaXMgb3V0IG9mIG91ciBj b250cm9sLgorICAgICAgICBQYXJ0IG9mIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0yNzIxNQorCisgICAgICAgICogU2NyaXB0cy9ydW4td2Via2l0LXRlc3RzOiBJbnRy b2R1Y2Ugc3VwcHJlc3NFcnJvciBhbmQgaXNMaW51eE9TCisgICAgICAgIHN1YnJ1dGluZXMuCisK IDIwMDktMDctMTQgIFNoaW5pY2hpcm8gSGFtYWppICA8aGFtYWppQGNocm9taXVtLm9yZz4KIAog ICAgICAgICBSZXZpZXdlZCBieSBEYXZpZCBMZXZpbi4KZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xz L1NjcmlwdHMvcnVuLXdlYmtpdC10ZXN0cyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvcnVuLXdlYmtp dC10ZXN0cwppbmRleCBhMzg1ZDA0Li42NjA2YTQxIDEwMDc1NQotLS0gYS9XZWJLaXRUb29scy9T Y3JpcHRzL3J1bi13ZWJraXQtdGVzdHMKKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy9ydW4td2Vi a2l0LXRlc3RzCkBAIC03Niw2ICs3Niw3IEBAIHN1YiBvcGVuRHVtcFRvb2woKTsKIHN1YiBjbG9z ZUR1bXBUb29sKCk7CiBzdWIgZHVtcFRvb2xEaWRDcmFzaCgpOwogc3ViIGNsb3NlSFRUUEQoKTsK K3N1YiBzdXBwcmVzc0Vycm9yKCQpOwogc3ViIGNvdW50QW5kUHJpbnRMZWFrcygkJCQpOwogc3Vi IGZpbGVOYW1lV2l0aE51bWJlcigkJCk7CiBzdWIgbnVtZXJpY2NtcCgkJCk7CkBAIC05MzQsNyAr OTM1LDcgQEAgZm9yIG15ICR0ZXN0IChAdGVzdHMpIHsKICAgICAgICAgfQogICAgIH0KIAotICAg IGlmICgkZXJyb3IpIHsKKyAgICBpZiAoJGVycm9yICYmICFzdXBwcmVzc0Vycm9yKCRlcnJvcikp IHsKICAgICAgICAgbXkgJGRpciA9ICIkdGVzdFJlc3VsdHNEaXJlY3RvcnkvJGJhc2UiOwogICAg ICAgICAkZGlyID1+IHN8LyhbXi9dKykkfHwgb3IgZGllICJGYWlsZWQgdG8gZmluZCB0ZXN0IG5h bWUgZnJvbSBiYXNlXG4iOwogICAgICAgICBta3BhdGggJGRpcjsKQEAgLTEwNTksNiArMTA2MCwy NiBAQCBjbG9zZUN5Z3BhdGhzKCkgaWYgaXNDeWd3aW4oKTsKIAogZXhpdCAxOwogCitzdWIgaXNM aW51eE9TKCkKK3sKKyAgICBpZiAoJF5PIGVxICJsaW51eCIpIHsKKyAgICAgICAgcmV0dXJuIDE7 CisgICAgfQorCisgICAgcmV0dXJuIDA7Cit9CisKK3N1YiBzdXBwcmVzc0Vycm9yKCQpCit7Cisg ICAgbXkgKCRlcnJvcikgPSBAXzsKKworICAgIGlmIChpc0xpbnV4T1MoKSAmJiAkZXJyb3IgPX4g L15cKlwqIE1lc3NhZ2U6LykgeworICAgICAgICByZXR1cm4gMTsKKyAgICB9CisKKyAgICByZXR1 cm4gMDsKK30KKwogc3ViIGNvdW50QW5kUHJpbnRMZWFrcygkJCQpCiB7CiAgICAgbXkgKCRkdW1w VG9vbE5hbWUsICRkdW1wVG9vbFBJRCwgJGxlYWtzRmlsZVBhdGgpID0gQF87Ci0tIAoxLjYuMC40 Cgo= 32796 2009-07-15 11:03:26 -0700 2009-07-17 06:12:13 -0700 For Qt,overwrite the plugin directories for the DRT to only those defined in QTWEBKIT_PLUGIN_PATH 0001-WebCore.patch text/plain 8570 kenneth RnJvbSBkOTMxNjM1OGU0OWExYjU5Y2I2ZDgzYzEzZTI5ZTI2ZmY4YTQ5NmUzIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBLZW5uZXRoIFJvaGRlIENocmlzdGlhbnNlbiA8a2VubmV0aC5j aHJpc3RpYW5zZW5Ab3BlbmJvc3NhLm9yZz4KRGF0ZTogV2VkLCAxNSBKdWwgMjAwOSAxNTowMjow MCAtMDMwMApTdWJqZWN0OiBbUEFUQ0hdIFdlYkNvcmU6CgoyMDA5LTA3LTE1ICBLZW5uZXRoIFJv aGRlIENocmlzdGlhbnNlbiAgPGtlbm5ldGguY2hyaXN0aWFuc2VuQG9wZW5ib3NzYS5vcmc+Cgog ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgoKICAgICAgICBNYWtlIGl0IHBvc3Np YmxlIHRvIHNldCB0aGUgcGx1Z2luIGRpcmVjdG9yaWVzIGZyb20gdGhlIERSVC4KICAgICAgICBQ YXJ0IG9mIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNzIxNQoKICAg ICAgICAqIHBsdWdpbnMvUGx1Z2luRGF0YWJhc2UuY3BwOgogICAgICAgIChXZWJDb3JlOjpQbHVn aW5EYXRhYmFzZTo6aW5zdGFsbGVkUGx1Z2lucyk6IE5vdyBvcHRpb25hbGx5IHRha2VzCiAgICAg ICAgYSBwb3B1bGF0ZSBhcmd1bWVudCwgc28gd2UgY2FuIGF2b2lkIGxvYWRpbmcgc3lzdGVtIHBs dWdpbnMgZnJvbSB0aGUKICAgICAgICBEUlQgYW5kIHRodXMgYXZvaWQgdGhlaXIgc3RyZXJyIGVy cm9ycyB0aGF0IGNhbiBtYWtlIHRlc3RzIGZhaWwuCiAgICAgICAgKFdlYkNvcmU6OlBsdWdpbkRh dGFiYXNlOjpjbGVhcik6IE1ha2UgaXMgcG9zc2libGUgdG8gY2xlYXIgdGhlCiAgICAgICAgZGF0 YWJhc2UuIENhbGxlZCBmcm9tIHNldFBsdWdpbkRpcmVjdG9yaWVzLgogICAgICAgICogcGx1Z2lu cy9QbHVnaW5EYXRhYmFzZS5oOgogICAgICAgIChXZWJDb3JlOjpQbHVnaW5EYXRhYmFzZTo6c2V0 UGx1Z2luRGlyZWN0b3JpZXMpOiBNYWtlIHB1YmxpYwoKV2ViS2l0L3F0OgoKMjAwOS0wNy0xNSAg S2VubmV0aCBSb2hkZSBDaHJpc3RpYW5zZW4gIDxrZW5uZXRoLmNocmlzdGlhbnNlbkBvcGVuYm9z c2Eub3JnPgoKICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KCiAgICAgICAgT3Zl cndyaXRlIHRoZSBwbHVnaW4gZGlyZWN0b3JpZXMgZm9yIHRoZSBEUlQuCiAgICAgICAgUGFydCBv ZiBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjcyMTUKCiAgICAgICAg KiBBcGkvcXdlYnBhZ2UuY3BwOgogICAgICAgIChxdF9kcnRfb3ZlcndyaXRlUGx1Z2luRGlyZWN0 b3JpZXMpOiBPbmx5IHNldCB0aGUgcGx1Z2luIGRpcmVjdG9yaWVzCiAgICAgICAgdG8gdGhlIG9u ZXMgaW4gdGhlIFFUV0VCS0lUX1BMVUdJTl9QQVRIIGVudmlyb25tZW50IHZhcmlhYmxlLgoKV2Vi S2l0VG9vbHM6CgoyMDA5LTA3LTE1ICBLZW5uZXRoIFJvaGRlIENocmlzdGlhbnNlbiAgPGtlbm5l dGguY2hyaXN0aWFuc2VuQG9wZW5ib3NzYS5vcmc+CgogICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgoKICAgICAgICBPdmVyd3JpdGUgdGhlIHBsdWdpbiBkaXJlY3RvcmllcyBmb3Ig dGhlIERSVC4KICAgICAgICBQYXJ0IG9mIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0yNzIxNQoKICAgICAgICAqIER1bXBSZW5kZXJUcmVlL3F0L0R1bXBSZW5kZXJUcmVl LmNwcDoKICAgICAgICAoV2ViQ29yZTo6RHVtcFJlbmRlclRyZWU6OkR1bXBSZW5kZXJUcmVlKToK LS0tCiBXZWJDb3JlL0NoYW5nZUxvZyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgfCAg IDE2ICsrKysrKysrKysrKysrKysKIFdlYkNvcmUvcGx1Z2lucy9QbHVnaW5EYXRhYmFzZS5jcHAg ICAgICAgICAgICAgICB8ICAgMTYgKysrKysrKysrKysrKy0tLQogV2ViQ29yZS9wbHVnaW5zL1Bs dWdpbkRhdGFiYXNlLmggICAgICAgICAgICAgICAgIHwgICAxMyArKysrKysrKysrLS0tCiBXZWJL aXQvcXQvQXBpL3F3ZWJwYWdlLmNwcCAgICAgICAgICAgICAgICAgICAgICAgfCAgIDEzICsrKysr KysrKysrKysKIFdlYktpdC9xdC9DaGFuZ2VMb2cgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICB8ICAgMTEgKysrKysrKysrKysKIFdlYktpdFRvb2xzL0NoYW5nZUxvZyAgICAgICAgICAgICAg ICAgICAgICAgICAgICB8ICAgMTAgKysrKysrKysrKwogV2ViS2l0VG9vbHMvRHVtcFJlbmRlclRy ZWUvcXQvRHVtcFJlbmRlclRyZWUuY3BwIHwgICAgMyArKysKIDcgZmlsZXMgY2hhbmdlZCwgNzYg aW5zZXJ0aW9ucygrKSwgNiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9XZWJDb3JlL0NoYW5n ZUxvZyBiL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IGRiMjA2ODMuLjk1OWM0NzYgMTAwNjQ0Ci0t LSBhL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEs MTkgQEAKKzIwMDktMDctMTUgIEtlbm5ldGggUm9oZGUgQ2hyaXN0aWFuc2VuICA8a2VubmV0aC5j aHJpc3RpYW5zZW5Ab3BlbmJvc3NhLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBNYWtlIGl0IHBvc3NpYmxlIHRvIHNldCB0aGUgcGx1Z2luIGRp cmVjdG9yaWVzIGZyb20gdGhlIERSVC4KKyAgICAgICAgUGFydCBvZiBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjcyMTUKKworICAgICAgICAqIHBsdWdpbnMvUGx1Z2lu RGF0YWJhc2UuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UGx1Z2luRGF0YWJhc2U6Omluc3RhbGxl ZFBsdWdpbnMpOiBOb3cgb3B0aW9uYWxseSB0YWtlcworICAgICAgICBhIHBvcHVsYXRlIGFyZ3Vt ZW50LCBzbyB3ZSBjYW4gYXZvaWQgbG9hZGluZyBzeXN0ZW0gcGx1Z2lucyBmcm9tIHRoZQorICAg ICAgICBEUlQgYW5kIHRodXMgYXZvaWQgdGhlaXIgc3RyZXJyIGVycm9ycyB0aGF0IGNhbiBtYWtl IHRlc3RzIGZhaWwuCisgICAgICAgIChXZWJDb3JlOjpQbHVnaW5EYXRhYmFzZTo6Y2xlYXIpOiBN YWtlIGlzIHBvc3NpYmxlIHRvIGNsZWFyIHRoZQorICAgICAgICBkYXRhYmFzZS4gQ2FsbGVkIGZy b20gc2V0UGx1Z2luRGlyZWN0b3JpZXMuCisgICAgICAgICogcGx1Z2lucy9QbHVnaW5EYXRhYmFz ZS5oOgorICAgICAgICAoV2ViQ29yZTo6UGx1Z2luRGF0YWJhc2U6OnNldFBsdWdpbkRpcmVjdG9y aWVzKTogTWFrZSBwdWJsaWMKKwogMjAwOS0wNy0xNCAgUGF2ZWwgRmVsZG1hbiAgPHBmZWxkbWFu QGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBUaW1vdGh5IEhhdGNoZXIuCmRp ZmYgLS1naXQgYS9XZWJDb3JlL3BsdWdpbnMvUGx1Z2luRGF0YWJhc2UuY3BwIGIvV2ViQ29yZS9w bHVnaW5zL1BsdWdpbkRhdGFiYXNlLmNwcAppbmRleCA4NjI2Mjc3Li40OTI3NjdmIDEwMDY0NAot LS0gYS9XZWJDb3JlL3BsdWdpbnMvUGx1Z2luRGF0YWJhc2UuY3BwCisrKyBiL1dlYkNvcmUvcGx1 Z2lucy9QbHVnaW5EYXRhYmFzZS5jcHAKQEAgLTM0LDE5ICszNCwyOSBAQAogCiBuYW1lc3BhY2Ug V2ViQ29yZSB7CiAKLVBsdWdpbkRhdGFiYXNlKiBQbHVnaW5EYXRhYmFzZTo6aW5zdGFsbGVkUGx1 Z2lucygpCitQbHVnaW5EYXRhYmFzZSogUGx1Z2luRGF0YWJhc2U6Omluc3RhbGxlZFBsdWdpbnMo Ym9vbCBwb3B1bGF0ZSkKIHsKICAgICBzdGF0aWMgUGx1Z2luRGF0YWJhc2UqIHBsdWdpbnMgPSAw OwogICAgIAogICAgIGlmICghcGx1Z2lucykgewogICAgICAgICBwbHVnaW5zID0gbmV3IFBsdWdp bkRhdGFiYXNlOwotICAgICAgICBwbHVnaW5zLT5zZXRQbHVnaW5EaXJlY3RvcmllcyhQbHVnaW5E YXRhYmFzZTo6ZGVmYXVsdFBsdWdpbkRpcmVjdG9yaWVzKCkpOwotICAgICAgICBwbHVnaW5zLT5y ZWZyZXNoKCk7CisKKyAgICAgICAgaWYgKHBvcHVsYXRlKSB7CisgICAgICAgICAgICBwbHVnaW5z LT5zZXRQbHVnaW5EaXJlY3RvcmllcyhQbHVnaW5EYXRhYmFzZTo6ZGVmYXVsdFBsdWdpbkRpcmVj dG9yaWVzKCkpOworICAgICAgICAgICAgcGx1Z2lucy0+cmVmcmVzaCgpOworICAgICAgICB9CiAg ICAgfQogCiAgICAgcmV0dXJuIHBsdWdpbnM7CiB9CiAKK3ZvaWQgUGx1Z2luRGF0YWJhc2U6OmNs ZWFyKCkKK3sKKyAgICBtX3BsdWdpbnMuY2xlYXIoKTsKKyAgICBtX3BsdWdpbnNCeVBhdGguY2xl YXIoKTsKKyAgICBtX3JlZ2lzdGVyZWRNSU1FVHlwZXMuY2xlYXIoKTsKK30KKwogYm9vbCBQbHVn aW5EYXRhYmFzZTo6aXNNSU1FVHlwZVJlZ2lzdGVyZWQoY29uc3QgU3RyaW5nJiBtaW1lVHlwZSkK IHsKICAgICBpZiAobWltZVR5cGUuaXNOdWxsKCkpCmRpZmYgLS1naXQgYS9XZWJDb3JlL3BsdWdp bnMvUGx1Z2luRGF0YWJhc2UuaCBiL1dlYkNvcmUvcGx1Z2lucy9QbHVnaW5EYXRhYmFzZS5oCmlu ZGV4IDU4ODM5YTIuLjFkM2RiOGQgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGx1Z2lucy9QbHVnaW5E YXRhYmFzZS5oCisrKyBiL1dlYkNvcmUvcGx1Z2lucy9QbHVnaW5EYXRhYmFzZS5oCkBAIC00NSw5 ICs0NSwxMCBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgIAogICAgIGNsYXNzIFBsdWdpbkRhdGFi YXNlIHsKICAgICBwdWJsaWM6Ci0gICAgICAgIHN0YXRpYyBQbHVnaW5EYXRhYmFzZSogaW5zdGFs bGVkUGx1Z2lucygpOworICAgICAgICBzdGF0aWMgUGx1Z2luRGF0YWJhc2UqIGluc3RhbGxlZFBs dWdpbnMoYm9vbCBwb3B1bGF0ZSA9IHRydWUpOwogCiAgICAgICAgIGJvb2wgcmVmcmVzaCgpOwor ICAgICAgICB2b2lkIGNsZWFyKCk7CiAgICAgICAgIFZlY3RvcjxQbHVnaW5QYWNrYWdlKj4gcGx1 Z2lucygpIGNvbnN0OwogICAgICAgICBib29sIGlzTUlNRVR5cGVSZWdpc3RlcmVkKGNvbnN0IFN0 cmluZyYgbWltZVR5cGUpOwogICAgICAgICB2b2lkIGFkZEV4dHJhUGx1Z2luRGlyZWN0b3J5KGNv bnN0IFN0cmluZyYpOwpAQCAtNTcsOSArNTgsMTMgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogCiAg ICAgICAgIFBsdWdpblBhY2thZ2UqIGZpbmRQbHVnaW4oY29uc3QgS1VSTCYsIFN0cmluZyYgbWlt ZVR5cGUpOwogCi0gICAgcHJpdmF0ZToKLSAgICAgICAgdm9pZCBzZXRQbHVnaW5EaXJlY3Rvcmll cyhjb25zdCBWZWN0b3I8U3RyaW5nPiYgZGlyZWN0b3JpZXMpIHsgbV9wbHVnaW5EaXJlY3Rvcmll cyA9IGRpcmVjdG9yaWVzOyB9CisgICAgICAgIHZvaWQgc2V0UGx1Z2luRGlyZWN0b3JpZXMoY29u c3QgVmVjdG9yPFN0cmluZz4mIGRpcmVjdG9yaWVzKQorICAgICAgICB7CisgICAgICAgICAgICBj bGVhcigpOworICAgICAgICAgICAgbV9wbHVnaW5EaXJlY3RvcmllcyA9IGRpcmVjdG9yaWVzOwor ICAgICAgICB9CiAKKyAgICBwcml2YXRlOgogICAgICAgICB2b2lkIGdldFBsdWdpblBhdGhzSW5E aXJlY3RvcmllcyhIYXNoU2V0PFN0cmluZz4mKSBjb25zdDsKICAgICAgICAgdm9pZCBnZXREZWxl dGVkUGx1Z2lucyhQbHVnaW5TZXQmKSBjb25zdDsKIApAQCAtNzIsNiArNzcsOCBAQCBuYW1lc3Bh Y2UgV2ViQ29yZSB7CiAKICAgICAgICAgc3RhdGljIFZlY3RvcjxTdHJpbmc+IGRlZmF1bHRQbHVn aW5EaXJlY3RvcmllcygpOwogCisgICAgICAgIGJvb2wgbV9wbHVnaW5TZXRDaGFuZ2VkOworCiAg ICAgICAgIFZlY3RvcjxTdHJpbmc+IG1fcGx1Z2luRGlyZWN0b3JpZXM7CiAgICAgICAgIEhhc2hT ZXQ8U3RyaW5nPiBtX3JlZ2lzdGVyZWRNSU1FVHlwZXM7CiAgICAgICAgIFBsdWdpblNldCBtX3Bs dWdpbnM7CmRpZmYgLS1naXQgYS9XZWJLaXQvcXQvQXBpL3F3ZWJwYWdlLmNwcCBiL1dlYktpdC9x dC9BcGkvcXdlYnBhZ2UuY3BwCmluZGV4IDg0NzUzYmQuLmI5YzAwZDAgMTAwNjQ0Ci0tLSBhL1dl YktpdC9xdC9BcGkvcXdlYnBhZ2UuY3BwCisrKyBiL1dlYktpdC9xdC9BcGkvcXdlYnBhZ2UuY3Bw CkBAIC01OSw2ICs1OSw3IEBACiAjaW5jbHVkZSAiU2Nyb2xsYmFyLmgiCiAjaW5jbHVkZSAiUGxh dGZvcm1LZXlib2FyZEV2ZW50LmgiCiAjaW5jbHVkZSAiUGxhdGZvcm1XaGVlbEV2ZW50LmgiCisj aW5jbHVkZSAiUGx1Z2luRGF0YWJhc2UuaCIKICNpbmNsdWRlICJQcm9ncmVzc1RyYWNrZXIuaCIK ICNpbmNsdWRlICJSZWZQdHIuaCIKICNpbmNsdWRlICJIYXNoTWFwLmgiCkBAIC05OSw2ICsxMDAs MTggQEAKIAogdXNpbmcgbmFtZXNwYWNlIFdlYkNvcmU7CiAKK3ZvaWQgUVdFQktJVF9FWFBPUlQg cXRfZHJ0X292ZXJ3cml0ZVBsdWdpbkRpcmVjdG9yaWVzKCkKK3sKKyAgICBQbHVnaW5EYXRhYmFz ZSAqZGIgPSBQbHVnaW5EYXRhYmFzZTo6aW5zdGFsbGVkUGx1Z2lucygvKiBwb3B1bGF0ZSAqLyBm YWxzZSk7CisKKyAgICBWZWN0b3I8U3RyaW5nPiBwYXRoczsKKyAgICBTdHJpbmcgcXRQYXRoKGdl dGVudigiUVRXRUJLSVRfUExVR0lOX1BBVEgiKSk7CisgICAgcXRQYXRoLnNwbGl0KFVDaGFyKCc6 JyksIC8qIGFsbG93RW1wdHlFbnRyaWVzICovIGZhbHNlLCBwYXRocyk7CisKKyAgICBkYi0+c2V0 UGx1Z2luRGlyZWN0b3JpZXMocGF0aHMpOworICAgIGRiLT5yZWZyZXNoKCk7Cit9CisKIGJvb2wg UVdlYlBhZ2VQcml2YXRlOjpkcnRSdW4gPSBmYWxzZTsKIHZvaWQgUVdFQktJVF9FWFBPUlQgcXRf ZHJ0X3J1bihib29sIGIpCiB7CmRpZmYgLS1naXQgYS9XZWJLaXQvcXQvQ2hhbmdlTG9nIGIvV2Vi S2l0L3F0L0NoYW5nZUxvZwppbmRleCA4ZjQ1ZGU1Li5iNmYyZTdkIDEwMDY0NAotLS0gYS9XZWJL aXQvcXQvQ2hhbmdlTG9nCisrKyBiL1dlYktpdC9xdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNCBA QAorMjAwOS0wNy0xNSAgS2VubmV0aCBSb2hkZSBDaHJpc3RpYW5zZW4gIDxrZW5uZXRoLmNocmlz dGlhbnNlbkBvcGVuYm9zc2Eub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIE92ZXJ3cml0ZSB0aGUgcGx1Z2luIGRpcmVjdG9yaWVzIGZvciB0aGUg RFJULgorICAgICAgICBQYXJ0IG9mIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0yNzIxNQorCisgICAgICAgICogQXBpL3F3ZWJwYWdlLmNwcDoKKyAgICAgICAgKHF0X2Ry dF9vdmVyd3JpdGVQbHVnaW5EaXJlY3Rvcmllcyk6IE9ubHkgc2V0IHRoZSBwbHVnaW4gZGlyZWN0 b3JpZXMKKyAgICAgICAgdG8gdGhlIG9uZXMgaW4gdGhlIFFUV0VCS0lUX1BMVUdJTl9QQVRIIGVu dmlyb25tZW50IHZhcmlhYmxlLgorCiAyMDA5LTA3LTE0ICBBZGFtIFRyZWF0ICA8YWRhbS50cmVh dEB0b3JjaG1vYmlsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgWmFjayBSdXNpbi4KZGlm ZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxvZwpp bmRleCAxYTFmNzFiLi4xYjU2NmVkIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VMb2cK KysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMDktMDctMTUg IEtlbm5ldGggUm9oZGUgQ2hyaXN0aWFuc2VuICA8a2VubmV0aC5jaHJpc3RpYW5zZW5Ab3BlbmJv c3NhLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBPdmVyd3JpdGUgdGhlIHBsdWdpbiBkaXJlY3RvcmllcyBmb3IgdGhlIERSVC4KKyAgICAgICAg UGFydCBvZiBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjcyMTUKKwor ICAgICAgICAqIER1bXBSZW5kZXJUcmVlL3F0L0R1bXBSZW5kZXJUcmVlLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OkR1bXBSZW5kZXJUcmVlOjpEdW1wUmVuZGVyVHJlZSk6CisKIDIwMDktMDctMTUg IFNpbW9uIEhhdXNtYW5uICA8c2ltb24uaGF1c21hbm5Abm9raWEuY29tPgogCiAgICAgICAgIFJl dmlld2VkIGJ5IEFkYW0gVHJlYXQuCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9EdW1wUmVuZGVy VHJlZS9xdC9EdW1wUmVuZGVyVHJlZS5jcHAgYi9XZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS9x dC9EdW1wUmVuZGVyVHJlZS5jcHAKaW5kZXggMTY3OThjNy4uNzNmZjhiMSAxMDA2NDQKLS0tIGEv V2ViS2l0VG9vbHMvRHVtcFJlbmRlclRyZWUvcXQvRHVtcFJlbmRlclRyZWUuY3BwCisrKyBiL1dl YktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL3F0L0R1bXBSZW5kZXJUcmVlLmNwcApAQCAtNjAsNiAr NjAsNyBAQCBleHRlcm4gdm9pZCBxdF9kcnRfcnVuKGJvb2wgYik7CiBleHRlcm4gdm9pZCBxdF9k dW1wX3NldF9hY2NlcHRzX2VkaXRpbmcoYm9vbCBiKTsKIGV4dGVybiB2b2lkIHF0X2R1bXBfZnJh bWVfbG9hZGVyKGJvb2wgYik7CiBleHRlcm4gdm9pZCBxdF9kcnRfY2xlYXJGcmFtZU5hbWUoUVdl YkZyYW1lKiBxRnJhbWUpOworZXh0ZXJuIHZvaWQgcXRfZHJ0X292ZXJ3cml0ZVBsdWdpbkRpcmVj dG9yaWVzKCk7CiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIApAQCAtMTQzLDYgKzE0NCw4IEBAIER1 bXBSZW5kZXJUcmVlOjpEdW1wUmVuZGVyVHJlZSgpCiAgICAgOiBtX3N0ZGluKDApCiAgICAgLCBt X25vdGlmaWVyKDApCiB7CisgICAgcXRfZHJ0X292ZXJ3cml0ZVBsdWdpbkRpcmVjdG9yaWVzKCk7 CisKICAgICBtX2NvbnRyb2xsZXIgPSBuZXcgTGF5b3V0VGVzdENvbnRyb2xsZXIodGhpcyk7CiAg ICAgY29ubmVjdChtX2NvbnRyb2xsZXIsIFNJR05BTChkb25lKCkpLCB0aGlzLCBTTE9UKGR1bXAo KSkpOwogCi0tIAoxLjYuMC40Cgo= 32936 2009-07-17 06:12:13 -0700 2009-07-17 06:17:02 -0700 For Qt,overwrite the plugin directories for the DRT to only those defined in QTWEBKIT_PLUGIN_PATH 0001-plugin.patch text/plain 11180 kenneth RnJvbSAxMDc1NDZjYzk5MzdiNjQ0NjU2ZmNiMGYxZGViZmM1NDViZmM3ZDgyIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBLZW5uZXRoIFJvaGRlIENocmlzdGlhbnNlbiA8a2VubmV0aC5j aHJpc3RpYW5zZW5Ab3BlbmJvc3NhLm9yZz4KRGF0ZTogV2VkLCAxNSBKdWwgMjAwOSAxNTowMjow MCAtMDMwMApTdWJqZWN0OiBbUEFUQ0hdIFdlYkNvcmU6CgoyMDA5LTA3LTE1ICBLZW5uZXRoIFJv aGRlIENocmlzdGlhbnNlbiAgPGtlbm5ldGguY2hyaXN0aWFuc2VuQG9wZW5ib3NzYS5vcmc+Cgog ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgoKICAgICAgICBNYWtlIGl0IHBvc3Np YmxlIHRvIHNldCB0aGUgcGx1Z2luIGRpcmVjdG9yaWVzIGZyb20gdGhlIERSVC4KICAgICAgICBQ YXJ0IG9mIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNzIxNQoKICAg ICAgICAqIHBsdWdpbnMvUGx1Z2luRGF0YWJhc2UuY3BwOgogICAgICAgIChXZWJDb3JlOjpQbHVn aW5EYXRhYmFzZTo6aW5zdGFsbGVkUGx1Z2lucyk6IE5vdyBvcHRpb25hbGx5IHRha2VzCiAgICAg ICAgYSBwb3B1bGF0ZSBhcmd1bWVudCwgc28gd2UgY2FuIGF2b2lkIGxvYWRpbmcgc3lzdGVtIHBs dWdpbnMgZnJvbSB0aGUKICAgICAgICBEUlQgYW5kIHRodXMgYXZvaWQgdGhlaXIgc3RyZXJyIGVy cm9ycyB0aGF0IGNhbiBtYWtlIHRlc3RzIGZhaWwuCiAgICAgICAgKFdlYkNvcmU6OlBsdWdpbkRh dGFiYXNlOjpjbGVhcik6IE1ha2UgaXMgcG9zc2libGUgdG8gY2xlYXIgdGhlCiAgICAgICAgZGF0 YWJhc2UuIENhbGxlZCBmcm9tIHNldFBsdWdpbkRpcmVjdG9yaWVzLgogICAgICAgICogcGx1Z2lu cy9QbHVnaW5EYXRhYmFzZS5oOgogICAgICAgIChXZWJDb3JlOjpQbHVnaW5EYXRhYmFzZTo6c2V0 UGx1Z2luRGlyZWN0b3JpZXMpOiBNYWtlIHB1YmxpYwoKV2ViS2l0L3F0OgoKMjAwOS0wNy0xNSAg S2VubmV0aCBSb2hkZSBDaHJpc3RpYW5zZW4gIDxrZW5uZXRoLmNocmlzdGlhbnNlbkBvcGVuYm9z c2Eub3JnPgoKICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KCiAgICAgICAgT3Zl cndyaXRlIHRoZSBwbHVnaW4gZGlyZWN0b3JpZXMgZm9yIHRoZSBEUlQuCiAgICAgICAgUGFydCBv ZiBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjcyMTUKCiAgICAgICAg KiBBcGkvcXdlYnBhZ2UuY3BwOgogICAgICAgIChxdF9kcnRfb3ZlcndyaXRlUGx1Z2luRGlyZWN0 b3JpZXMpOiBPbmx5IHNldCB0aGUgcGx1Z2luIGRpcmVjdG9yaWVzCiAgICAgICAgdG8gdGhlIG9u ZXMgaW4gdGhlIFFUV0VCS0lUX1BMVUdJTl9QQVRIIGVudmlyb25tZW50IHZhcmlhYmxlLgoKV2Vi S2l0VG9vbHM6CgoyMDA5LTA3LTE1ICBLZW5uZXRoIFJvaGRlIENocmlzdGlhbnNlbiAgPGtlbm5l dGguY2hyaXN0aWFuc2VuQG9wZW5ib3NzYS5vcmc+CgogICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgoKICAgICAgICBPdmVyd3JpdGUgdGhlIHBsdWdpbiBkaXJlY3RvcmllcyBmb3Ig dGhlIERSVC4KICAgICAgICBQYXJ0IG9mIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0yNzIxNQoKICAgICAgICAqIER1bXBSZW5kZXJUcmVlL3F0L0R1bXBSZW5kZXJUcmVl LmNwcDoKICAgICAgICAoV2ViQ29yZTo6RHVtcFJlbmRlclRyZWU6OkR1bXBSZW5kZXJUcmVlKToK LS0tCiBMYXlvdXRUZXN0cy9mYXN0L2Zvcm1zL3RleHRhcmVhLWlucHV0LWV2ZW50Lmh0bWwgfCAg QmluIDQ1OCAtPiAxMjI4OCBieXRlcwogTGF5b3V0VGVzdHMvZmFzdC9qcy90b1N0cmluZy1mb3It dmFyLWRlY2wuaHRtbCAgIHwgIEJpbiAzNTkgLT4gMTIyODggYnl0ZXMKIFdlYkNvcmUvQ2hhbmdl TG9nICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB8ICAgMTYgKysrKysrKysrKysrKysr KwogV2ViQ29yZS9wbHVnaW5zL1BsdWdpbkRhdGFiYXNlLmNwcCAgICAgICAgICAgICAgIHwgICAy MSArKysrKysrKysrKysrKysrLS0tLS0KIFdlYkNvcmUvcGx1Z2lucy9QbHVnaW5EYXRhYmFzZS5o ICAgICAgICAgICAgICAgICB8ICAgMTkgKysrKysrKysrKysrKysrLS0tLQogV2ViS2l0L3F0L0Fw aS9xd2VicGFnZS5jcHAgICAgICAgICAgICAgICAgICAgICAgIHwgICAxMyArKysrKysrKysrKysr CiBXZWJLaXQvcXQvQ2hhbmdlTG9nICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgfCAgIDEx ICsrKysrKysrKysrCiBXZWJLaXRUb29scy9DaGFuZ2VMb2cgICAgICAgICAgICAgICAgICAgICAg ICAgICAgfCAgIDEwICsrKysrKysrKysKIFdlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL3F0L0R1 bXBSZW5kZXJUcmVlLmNwcCB8ICAgIDMgKysrCiA5IGZpbGVzIGNoYW5nZWQsIDg0IGluc2VydGlv bnMoKyksIDkgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9mb3Jt cy90ZXh0YXJlYS1pbnB1dC1ldmVudC5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9mb3Jtcy90ZXh0 YXJlYS1pbnB1dC1ldmVudC5odG1sCmluZGV4IDNiYWQwNDEyMWRmMjM5MWYyZDBjMDIxMTRiZWQ4 NTc3NDhhNTY5MGQuLjkyOTFlN2M0ODRlZTMwOTVlMjhhNWQxMzA0MzlmNTEzY2U1YzY5NWYgMTAw NjQ0CkdJVCBiaW5hcnkgcGF0Y2gKbGl0ZXJhbCAxMjI4OAp6Y21lSSN1fTtHPDVDJmktaEhpeyhB cmxPVlNCOWh2bCExalp1JnwofUBrTWI3YzRXSTFvZT9fPXlhST92VkNEczIKej5jKWFWJSk5X2oo dSU1NSl3JEFkTVQrZTZJcmJNWDd3dlNxaGlCKWZNX3o4UGlncWlTeShyPFhSfHQ5T1gpMHBoCnoq bHxIN0MkaGVtWXN6OWo0NEhlZiM4QF5rT3B7U1Zvc3d+I3o+PXsrb2VgJFNfLS1NU1lFZkZ4PXlZ e3JzVk4rfAp6dGNXI1BFfWlBZ2UpQGAhVUFPY0VrOXwlfVRxcyNoRT90MCZRNXtOXkdeKEkjKmJU Sz9PKy1seyVifF9eSmR3UGgKemp1Pl8yYVclM19CYShLe1pQYXJ1dlVGX3xPLWEzIVA1Z0dCR05t YkV2cH1fQD5BTGQ9YCF8P1A0QylVQ180MTJuCnpuJEtLaVN0P0B9XlZ0LUdITlJ7RjRGVjg9MDBi WmEwU0dfPDB1WD16MVIkX2ZWMUxyUC1TUkhCZCVjWG1lRSlvKQp6e3p2YDRecypvVDBTR188MHVY PXoxUnd3YjJ0V1Y9WWIpQDZeNj5lKWQycypze0JgcXFfeGduVEFOQnYqVVNAMEAKWDB1WD16MVJ3 d2IydFdWPTVQJCMjbUowajxxJEFkeQoKZGVsdGEgNwpPY21ab2pJS3tsLTZlOW8pWTZCPyUKCmRp ZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2pzL3RvU3RyaW5nLWZvci12YXItZGVjbC5odG1s IGIvTGF5b3V0VGVzdHMvZmFzdC9qcy90b1N0cmluZy1mb3ItdmFyLWRlY2wuaHRtbAppbmRleCBm NjkzM2E1ZmYzMDU0NzI0M2ZjZTdiMzc3NDk2ZGUxYWU4ZTQyNDc1Li43N2MyODEzMTExODAwZDg1 ZjI5ZjMyNTkzNWU3MDE5M2QyNDg2MzI1IDEwMDY0NApHSVQgYmluYXJ5IHBhdGNoCmxpdGVyYWwg MTIyODgKemNtZUkjSng7P2c2YkVvLTVMWkFaVm9nMEVieDEmPjM4R1NmTih9PThMen0hM21rPnZg c25pMT8yMWRscCpjKCgjCnpvUCtAKGFSOChxZlA4ZVNLdWxHWnpaYzdYJndrY1ZVWUBoLW9wLXte cDNoRmcofTQ5WmopSEU3U3ZLY2dLUm84Iwp6MyV4NEJ4cW9JSVkmd2EjUDBOVn1hV1NQTHlKM25f KlYxTzFsMV8rPiNTJXAkKkhXYkFvcip+RnY5PTlxVl49dz8Kek5iQis8OVZ3OTtyZDlNP1lPYmc/ Rjdnfis9TUBMfHZnVDA2KF8pITM1eFo3UWJ6STEtT3dObHlFR0FWYmw5YHElCnptRHxQRXBCMFZs OHpyKTlkbkE9VDg3TW9aQ3wjfW4mdHMpRnQwKHlLblk7JHV6PD5ZKkFPSGFmS21ZO3xmQip5Xwp6 MDA5VXpEZSZGPyptPUl7NThIM1NWIXIqamg1akc/ZjBPP2F3SUtpajJ0V1Y9NVAkIyNBT0hhZkt3 diFyUHBATTMKcl4wb2k0XyZqX1VkLUhxcnxMRmhNXlY0dUUxUnd3YjJ0V1Y9NVAkIyNBT0hhZkcl NEB7bTFBIXEKCmRlbHRhIDcKT2NtWm9qYytSdlRvZT07SEYjX1RNCgpkaWZmIC0tZ2l0IGEvV2Vi Q29yZS9DaGFuZ2VMb2cgYi9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBkYjIwNjgzLi45NTljNDc2 IDEwMDY0NAotLS0gYS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9XZWJDb3JlL0NoYW5nZUxvZwpA QCAtMSwzICsxLDE5IEBACisyMDA5LTA3LTE1ICBLZW5uZXRoIFJvaGRlIENocmlzdGlhbnNlbiAg PGtlbm5ldGguY2hyaXN0aWFuc2VuQG9wZW5ib3NzYS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTWFrZSBpdCBwb3NzaWJsZSB0byBzZXQgdGhl IHBsdWdpbiBkaXJlY3RvcmllcyBmcm9tIHRoZSBEUlQuCisgICAgICAgIFBhcnQgb2YgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI3MjE1CisKKyAgICAgICAgKiBwbHVn aW5zL1BsdWdpbkRhdGFiYXNlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlBsdWdpbkRhdGFiYXNl OjppbnN0YWxsZWRQbHVnaW5zKTogTm93IG9wdGlvbmFsbHkgdGFrZXMKKyAgICAgICAgYSBwb3B1 bGF0ZSBhcmd1bWVudCwgc28gd2UgY2FuIGF2b2lkIGxvYWRpbmcgc3lzdGVtIHBsdWdpbnMgZnJv bSB0aGUKKyAgICAgICAgRFJUIGFuZCB0aHVzIGF2b2lkIHRoZWlyIHN0cmVyciBlcnJvcnMgdGhh dCBjYW4gbWFrZSB0ZXN0cyBmYWlsLgorICAgICAgICAoV2ViQ29yZTo6UGx1Z2luRGF0YWJhc2U6 OmNsZWFyKTogTWFrZSBpcyBwb3NzaWJsZSB0byBjbGVhciB0aGUKKyAgICAgICAgZGF0YWJhc2Uu IENhbGxlZCBmcm9tIHNldFBsdWdpbkRpcmVjdG9yaWVzLgorICAgICAgICAqIHBsdWdpbnMvUGx1 Z2luRGF0YWJhc2UuaDoKKyAgICAgICAgKFdlYkNvcmU6OlBsdWdpbkRhdGFiYXNlOjpzZXRQbHVn aW5EaXJlY3Rvcmllcyk6IE1ha2UgcHVibGljCisKIDIwMDktMDctMTQgIFBhdmVsIEZlbGRtYW4g IDxwZmVsZG1hbkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgVGltb3RoeSBI YXRjaGVyLgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wbHVnaW5zL1BsdWdpbkRhdGFiYXNlLmNwcCBi L1dlYkNvcmUvcGx1Z2lucy9QbHVnaW5EYXRhYmFzZS5jcHAKaW5kZXggODYyNjI3Ny4uMDMzNThi NCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wbHVnaW5zL1BsdWdpbkRhdGFiYXNlLmNwcAorKysgYi9X ZWJDb3JlL3BsdWdpbnMvUGx1Z2luRGF0YWJhc2UuY3BwCkBAIC0zNCwxNCArMzQsMTcgQEAKIAog bmFtZXNwYWNlIFdlYkNvcmUgewogCi1QbHVnaW5EYXRhYmFzZSogUGx1Z2luRGF0YWJhc2U6Omlu c3RhbGxlZFBsdWdpbnMoKQorUGx1Z2luRGF0YWJhc2UqIFBsdWdpbkRhdGFiYXNlOjppbnN0YWxs ZWRQbHVnaW5zKGJvb2wgcG9wdWxhdGUpCiB7CiAgICAgc3RhdGljIFBsdWdpbkRhdGFiYXNlKiBw bHVnaW5zID0gMDsKLSAgICAKKwogICAgIGlmICghcGx1Z2lucykgewogICAgICAgICBwbHVnaW5z ID0gbmV3IFBsdWdpbkRhdGFiYXNlOwotICAgICAgICBwbHVnaW5zLT5zZXRQbHVnaW5EaXJlY3Rv cmllcyhQbHVnaW5EYXRhYmFzZTo6ZGVmYXVsdFBsdWdpbkRpcmVjdG9yaWVzKCkpOwotICAgICAg ICBwbHVnaW5zLT5yZWZyZXNoKCk7CisKKyAgICAgICAgaWYgKHBvcHVsYXRlKSB7CisgICAgICAg ICAgICBwbHVnaW5zLT5zZXRQbHVnaW5EaXJlY3RvcmllcyhQbHVnaW5EYXRhYmFzZTo6ZGVmYXVs dFBsdWdpbkRpcmVjdG9yaWVzKCkpOworICAgICAgICAgICAgcGx1Z2lucy0+cmVmcmVzaCgpOwor ICAgICAgICB9CiAgICAgfQogCiAgICAgcmV0dXJuIHBsdWdpbnM7CkBAIC02NCw3ICs2Nyw3IEBA IHZvaWQgUGx1Z2luRGF0YWJhc2U6OmFkZEV4dHJhUGx1Z2luRGlyZWN0b3J5KGNvbnN0IFN0cmlu ZyYgZGlyZWN0b3J5KQogfQogCiBib29sIFBsdWdpbkRhdGFiYXNlOjpyZWZyZXNoKCkKLXsgICAK K3sKICAgICBib29sIHBsdWdpblNldENoYW5nZWQgPSBmYWxzZTsKIAogICAgIGlmICghbV9wbHVn aW5zLmlzRW1wdHkoKSkgewpAQCAtMjY0LDYgKzI2NywxNCBAQCB2b2lkIFBsdWdpbkRhdGFiYXNl OjpyZW1vdmUoUGx1Z2luUGFja2FnZSogcGFja2FnZSkKICAgICBtX3BsdWdpbnNCeVBhdGgucmVt b3ZlKHBhY2thZ2UtPnBhdGgoKSk7CiB9CiAKK3ZvaWQgUGx1Z2luRGF0YWJhc2U6OmNsZWFyKCkK K3sKKyAgICBtX3BsdWdpbnMuY2xlYXIoKTsKKyAgICBtX3BsdWdpbnNCeVBhdGguY2xlYXIoKTsK KworICAgIG1fcmVnaXN0ZXJlZE1JTUVUeXBlcy5jbGVhcigpOworfQorCiAjaWYgIVBMQVRGT1JN KFdJTl9PUykgfHwgUExBVEZPUk0oV1gpCiAvLyBGb3IgU2FmYXJpL1dpbiB0aGUgZm9sbG93aW5n IHRocmVlIG1ldGhvZHMgYXJlIGltcGxlbWVudGVkCiAvLyBpbiBQbHVnaW5EYXRhYmFzZVdpbi5j cHAsIGJ1dCBpZiB3ZSBjYW4gdXNlIFdlYkNvcmUgY29uc3RydWN0cwpkaWZmIC0tZ2l0IGEvV2Vi Q29yZS9wbHVnaW5zL1BsdWdpbkRhdGFiYXNlLmggYi9XZWJDb3JlL3BsdWdpbnMvUGx1Z2luRGF0 YWJhc2UuaAppbmRleCA1ODgzOWEyLi5iOGQyYmZlIDEwMDY0NAotLS0gYS9XZWJDb3JlL3BsdWdp bnMvUGx1Z2luRGF0YWJhc2UuaAorKysgYi9XZWJDb3JlL3BsdWdpbnMvUGx1Z2luRGF0YWJhc2Uu aApAQCAtMSw2ICsxLDcgQEAKIC8qCiAgKiBDb3B5cmlnaHQgKEMpIDIwMDYsIDIwMDcgQXBwbGUg SW5jLiAgQWxsIHJpZ2h0cyByZXNlcnZlZC4KICAqIENvcHlyaWdodCAoQykgMjAwOCBDb2xsYWJv cmEsIEx0ZC4gIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKiBDb3B5cmlnaHQgKEMpIDIwMDkgTm9r aWEgQ29ycG9yYXRpb24gYW5kL29yIGl0cyBzdWJzaWRpYXJ5KC1pZXMpCiAgKgogICogUmVkaXN0 cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRo b3V0CiAgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9s bG93aW5nIGNvbmRpdGlvbnMKQEAgLTQyLDEyICs0MywxOCBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7 CiAgICAgY2xhc3MgUGx1Z2luUGFja2FnZTsKIAogICAgIHR5cGVkZWYgSGFzaFNldDxSZWZQdHI8 UGx1Z2luUGFja2FnZT4sIFBsdWdpblBhY2thZ2VIYXNoPiBQbHVnaW5TZXQ7Ci0gIAorCiAgICAg Y2xhc3MgUGx1Z2luRGF0YWJhc2UgewogICAgIHB1YmxpYzoKLSAgICAgICAgc3RhdGljIFBsdWdp bkRhdGFiYXNlKiBpbnN0YWxsZWRQbHVnaW5zKCk7CisgICAgICAgIC8vIFRoZSBmaXJzdCBjYWxs IHRvIGluc3RhbGxlZFBsdWdpbnMgY3JlYXRlcyB0aGUgcGx1Z2luIGRhdGFiYXNlCisgICAgICAg IC8vIGFuZCBieSBkZWZhdWx0IHBvcHVsYXRlcyBpdCB3aXRoIHRoZSBwbHVnaW5zIGluc3RhbGxl ZCBvbiB0aGUgc3lzdGVtLgorICAgICAgICAvLyBGb3IgdGVzdGluZyBwdXJwb3NlcywgaXQgaXMg cG9zc2libGUgdG8gbm90IHBvcHVsYXRlIHRoZSBkYXRhYmFzZQorICAgICAgICAvLyBhdXRvbWF0 aWNhbGx5LCBhcyB0aGUgcGx1Z2lucyBtaWdodCBhZmZlY3QgdGhlIERSVCByZXN1bHRzIGJ5Cisg ICAgICAgIC8vIHdyaXRpbmcgdG8gYS5vLiBzdGRlcnIuCisgICAgICAgIHN0YXRpYyBQbHVnaW5E YXRhYmFzZSogaW5zdGFsbGVkUGx1Z2lucyhib29sIHBvcHVsYXRlID0gdHJ1ZSk7CiAKICAgICAg ICAgYm9vbCByZWZyZXNoKCk7CisgICAgICAgIHZvaWQgY2xlYXIoKTsKICAgICAgICAgVmVjdG9y PFBsdWdpblBhY2thZ2UqPiBwbHVnaW5zKCkgY29uc3Q7CiAgICAgICAgIGJvb2wgaXNNSU1FVHlw ZVJlZ2lzdGVyZWQoY29uc3QgU3RyaW5nJiBtaW1lVHlwZSk7CiAgICAgICAgIHZvaWQgYWRkRXh0 cmFQbHVnaW5EaXJlY3RvcnkoY29uc3QgU3RyaW5nJik7CkBAIC01Nyw5ICs2NCwxMyBAQCBuYW1l c3BhY2UgV2ViQ29yZSB7CiAKICAgICAgICAgUGx1Z2luUGFja2FnZSogZmluZFBsdWdpbihjb25z dCBLVVJMJiwgU3RyaW5nJiBtaW1lVHlwZSk7CiAKLSAgICBwcml2YXRlOgotICAgICAgICB2b2lk IHNldFBsdWdpbkRpcmVjdG9yaWVzKGNvbnN0IFZlY3RvcjxTdHJpbmc+JiBkaXJlY3Rvcmllcykg eyBtX3BsdWdpbkRpcmVjdG9yaWVzID0gZGlyZWN0b3JpZXM7IH0KKyAgICAgICAgdm9pZCBzZXRQ bHVnaW5EaXJlY3Rvcmllcyhjb25zdCBWZWN0b3I8U3RyaW5nPiYgZGlyZWN0b3JpZXMpCisgICAg ICAgIHsKKyAgICAgICAgICAgIGNsZWFyKCk7CisgICAgICAgICAgICBtX3BsdWdpbkRpcmVjdG9y aWVzID0gZGlyZWN0b3JpZXM7CisgICAgICAgIH0KIAorICAgIHByaXZhdGU6CiAgICAgICAgIHZv aWQgZ2V0UGx1Z2luUGF0aHNJbkRpcmVjdG9yaWVzKEhhc2hTZXQ8U3RyaW5nPiYpIGNvbnN0Owog ICAgICAgICB2b2lkIGdldERlbGV0ZWRQbHVnaW5zKFBsdWdpblNldCYpIGNvbnN0OwogCmRpZmYg LS1naXQgYS9XZWJLaXQvcXQvQXBpL3F3ZWJwYWdlLmNwcCBiL1dlYktpdC9xdC9BcGkvcXdlYnBh Z2UuY3BwCmluZGV4IDg0NzUzYmQuLjE3YzAyNTcgMTAwNjQ0Ci0tLSBhL1dlYktpdC9xdC9BcGkv cXdlYnBhZ2UuY3BwCisrKyBiL1dlYktpdC9xdC9BcGkvcXdlYnBhZ2UuY3BwCkBAIC01OSw2ICs1 OSw3IEBACiAjaW5jbHVkZSAiU2Nyb2xsYmFyLmgiCiAjaW5jbHVkZSAiUGxhdGZvcm1LZXlib2Fy ZEV2ZW50LmgiCiAjaW5jbHVkZSAiUGxhdGZvcm1XaGVlbEV2ZW50LmgiCisjaW5jbHVkZSAiUGx1 Z2luRGF0YWJhc2UuaCIKICNpbmNsdWRlICJQcm9ncmVzc1RyYWNrZXIuaCIKICNpbmNsdWRlICJS ZWZQdHIuaCIKICNpbmNsdWRlICJIYXNoTWFwLmgiCkBAIC05OSw2ICsxMDAsMTggQEAKIAogdXNp bmcgbmFtZXNwYWNlIFdlYkNvcmU7CiAKK3ZvaWQgUVdFQktJVF9FWFBPUlQgcXRfZHJ0X292ZXJ3 cml0ZVBsdWdpbkRpcmVjdG9yaWVzKCkKK3sKKyAgICBQbHVnaW5EYXRhYmFzZSogZGIgPSBQbHVn aW5EYXRhYmFzZTo6aW5zdGFsbGVkUGx1Z2lucygvKiBwb3B1bGF0ZSAqLyBmYWxzZSk7CisKKyAg ICBWZWN0b3I8U3RyaW5nPiBwYXRoczsKKyAgICBTdHJpbmcgcXRQYXRoKGdldGVudigiUVRXRUJL SVRfUExVR0lOX1BBVEgiKSk7CisgICAgcXRQYXRoLnNwbGl0KFVDaGFyKCc6JyksIC8qIGFsbG93 RW1wdHlFbnRyaWVzICovIGZhbHNlLCBwYXRocyk7CisKKyAgICBkYi0+c2V0UGx1Z2luRGlyZWN0 b3JpZXMocGF0aHMpOworICAgIGRiLT5yZWZyZXNoKCk7Cit9CisKIGJvb2wgUVdlYlBhZ2VQcml2 YXRlOjpkcnRSdW4gPSBmYWxzZTsKIHZvaWQgUVdFQktJVF9FWFBPUlQgcXRfZHJ0X3J1bihib29s IGIpCiB7CmRpZmYgLS1naXQgYS9XZWJLaXQvcXQvQ2hhbmdlTG9nIGIvV2ViS2l0L3F0L0NoYW5n ZUxvZwppbmRleCA4ZjQ1ZGU1Li5iNmYyZTdkIDEwMDY0NAotLS0gYS9XZWJLaXQvcXQvQ2hhbmdl TG9nCisrKyBiL1dlYktpdC9xdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNCBAQAorMjAwOS0wNy0x NSAgS2VubmV0aCBSb2hkZSBDaHJpc3RpYW5zZW4gIDxrZW5uZXRoLmNocmlzdGlhbnNlbkBvcGVu Ym9zc2Eub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIE92ZXJ3cml0ZSB0aGUgcGx1Z2luIGRpcmVjdG9yaWVzIGZvciB0aGUgRFJULgorICAgICAg ICBQYXJ0IG9mIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNzIxNQor CisgICAgICAgICogQXBpL3F3ZWJwYWdlLmNwcDoKKyAgICAgICAgKHF0X2RydF9vdmVyd3JpdGVQ bHVnaW5EaXJlY3Rvcmllcyk6IE9ubHkgc2V0IHRoZSBwbHVnaW4gZGlyZWN0b3JpZXMKKyAgICAg ICAgdG8gdGhlIG9uZXMgaW4gdGhlIFFUV0VCS0lUX1BMVUdJTl9QQVRIIGVudmlyb25tZW50IHZh cmlhYmxlLgorCiAyMDA5LTA3LTE0ICBBZGFtIFRyZWF0ICA8YWRhbS50cmVhdEB0b3JjaG1vYmls ZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgWmFjayBSdXNpbi4KZGlmZiAtLWdpdCBhL1dl YktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxvZwppbmRleCAxYTFmNzFi Li4xYjU2NmVkIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0 VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMDktMDctMTUgIEtlbm5ldGggUm9o ZGUgQ2hyaXN0aWFuc2VuICA8a2VubmV0aC5jaHJpc3RpYW5zZW5Ab3BlbmJvc3NhLm9yZz4KKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBPdmVyd3JpdGUg dGhlIHBsdWdpbiBkaXJlY3RvcmllcyBmb3IgdGhlIERSVC4KKyAgICAgICAgUGFydCBvZiBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjcyMTUKKworICAgICAgICAqIER1 bXBSZW5kZXJUcmVlL3F0L0R1bXBSZW5kZXJUcmVlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkR1 bXBSZW5kZXJUcmVlOjpEdW1wUmVuZGVyVHJlZSk6CisKIDIwMDktMDctMTUgIFNpbW9uIEhhdXNt YW5uICA8c2ltb24uaGF1c21hbm5Abm9raWEuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEFk YW0gVHJlYXQuCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS9xdC9EdW1w UmVuZGVyVHJlZS5jcHAgYi9XZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS9xdC9EdW1wUmVuZGVy VHJlZS5jcHAKaW5kZXggMTY3OThjNy4uNzNmZjhiMSAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMv RHVtcFJlbmRlclRyZWUvcXQvRHVtcFJlbmRlclRyZWUuY3BwCisrKyBiL1dlYktpdFRvb2xzL0R1 bXBSZW5kZXJUcmVlL3F0L0R1bXBSZW5kZXJUcmVlLmNwcApAQCAtNjAsNiArNjAsNyBAQCBleHRl cm4gdm9pZCBxdF9kcnRfcnVuKGJvb2wgYik7CiBleHRlcm4gdm9pZCBxdF9kdW1wX3NldF9hY2Nl cHRzX2VkaXRpbmcoYm9vbCBiKTsKIGV4dGVybiB2b2lkIHF0X2R1bXBfZnJhbWVfbG9hZGVyKGJv b2wgYik7CiBleHRlcm4gdm9pZCBxdF9kcnRfY2xlYXJGcmFtZU5hbWUoUVdlYkZyYW1lKiBxRnJh bWUpOworZXh0ZXJuIHZvaWQgcXRfZHJ0X292ZXJ3cml0ZVBsdWdpbkRpcmVjdG9yaWVzKCk7CiAK IG5hbWVzcGFjZSBXZWJDb3JlIHsKIApAQCAtMTQzLDYgKzE0NCw4IEBAIER1bXBSZW5kZXJUcmVl OjpEdW1wUmVuZGVyVHJlZSgpCiAgICAgOiBtX3N0ZGluKDApCiAgICAgLCBtX25vdGlmaWVyKDAp CiB7CisgICAgcXRfZHJ0X292ZXJ3cml0ZVBsdWdpbkRpcmVjdG9yaWVzKCk7CisKICAgICBtX2Nv bnRyb2xsZXIgPSBuZXcgTGF5b3V0VGVzdENvbnRyb2xsZXIodGhpcyk7CiAgICAgY29ubmVjdCht X2NvbnRyb2xsZXIsIFNJR05BTChkb25lKCkpLCB0aGlzLCBTTE9UKGR1bXAoKSkpOwogCi0tIAox LjYuMC40Cgo= 32937 2009-07-17 06:17:02 -0700 2009-07-17 06:30:23 -0700 For Qt,overwrite the plugin directories for the DRT to only those defined in QTWEBKIT_PLUGIN_PATH 0001-WebCore.patch text/plain 9528 kenneth RnJvbSBlN2Q5NTYxYTkzODhlNjRmNTFjOTA5YzJmMzcxZDMxMDM5ODJlYzYzIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBLZW5uZXRoIFJvaGRlIENocmlzdGlhbnNlbiA8a2VubmV0aC5j aHJpc3RpYW5zZW5Ab3BlbmJvc3NhLm9yZz4KRGF0ZTogRnJpLCAxNyBKdWwgMjAwOSAxMDoxNTo1 OCAtMDMwMApTdWJqZWN0OiBbUEFUQ0hdIFdlYkNvcmU6CgoyMDA5LTA3LTE1ICBLZW5uZXRoIFJv aGRlIENocmlzdGlhbnNlbiAgPGtlbm5ldGguY2hyaXN0aWFuc2VuQG9wZW5ib3NzYS5vcmc+Cgog ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgoKICAgICAgICBNYWtlIGl0IHBvc3Np YmxlIHRvIHNldCB0aGUgcGx1Z2luIGRpcmVjdG9yaWVzIGZyb20gdGhlIERSVC4KICAgICAgICBQ YXJ0IG9mIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNzIxNQoKICAg ICAgICAqIHBsdWdpbnMvUGx1Z2luRGF0YWJhc2UuY3BwOgogICAgICAgIChXZWJDb3JlOjpQbHVn aW5EYXRhYmFzZTo6aW5zdGFsbGVkUGx1Z2lucyk6IE5vdyBvcHRpb25hbGx5IHRha2VzCiAgICAg ICAgYSBwb3B1bGF0ZSBhcmd1bWVudCwgc28gd2UgY2FuIGF2b2lkIGxvYWRpbmcgc3lzdGVtIHBs dWdpbnMgZnJvbSB0aGUKICAgICAgICBEUlQgYW5kIHRodXMgYXZvaWQgdGhlaXIgc3RyZXJyIGVy cm9ycyB0aGF0IGNhbiBtYWtlIHRlc3RzIGZhaWwuCiAgICAgICAgKFdlYkNvcmU6OlBsdWdpbkRh dGFiYXNlOjpjbGVhcik6IE1ha2UgaXMgcG9zc2libGUgdG8gY2xlYXIgdGhlCiAgICAgICAgZGF0 YWJhc2UuIENhbGxlZCBmcm9tIHNldFBsdWdpbkRpcmVjdG9yaWVzLgogICAgICAgICogcGx1Z2lu cy9QbHVnaW5EYXRhYmFzZS5oOgogICAgICAgIChXZWJDb3JlOjpQbHVnaW5EYXRhYmFzZTo6c2V0 UGx1Z2luRGlyZWN0b3JpZXMpOiBNYWtlIHB1YmxpYwoKV2ViS2l0L3F0OgoKMjAwOS0wNy0xNSAg S2VubmV0aCBSb2hkZSBDaHJpc3RpYW5zZW4gIDxrZW5uZXRoLmNocmlzdGlhbnNlbkBvcGVuYm9z c2Eub3JnPgoKICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KCiAgICAgICAgT3Zl cndyaXRlIHRoZSBwbHVnaW4gZGlyZWN0b3JpZXMgZm9yIHRoZSBEUlQuCiAgICAgICAgUGFydCBv ZiBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjcyMTUKCiAgICAgICAg KiBBcGkvcXdlYnBhZ2UuY3BwOgogICAgICAgIChxdF9kcnRfb3ZlcndyaXRlUGx1Z2luRGlyZWN0 b3JpZXMpOiBPbmx5IHNldCB0aGUgcGx1Z2luIGRpcmVjdG9yaWVzCiAgICAgICAgdG8gdGhlIG9u ZXMgaW4gdGhlIFFUV0VCS0lUX1BMVUdJTl9QQVRIIGVudmlyb25tZW50IHZhcmlhYmxlLgoKV2Vi S2l0VG9vbHM6CgoyMDA5LTA3LTE1ICBLZW5uZXRoIFJvaGRlIENocmlzdGlhbnNlbiAgPGtlbm5l dGguY2hyaXN0aWFuc2VuQG9wZW5ib3NzYS5vcmc+CgogICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgoKICAgICAgICBPdmVyd3JpdGUgdGhlIHBsdWdpbiBkaXJlY3RvcmllcyBmb3Ig dGhlIERSVC4KICAgICAgICBQYXJ0IG9mIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0yNzIxNQoKICAgICAgICAqIER1bXBSZW5kZXJUcmVlL3F0L0R1bXBSZW5kZXJUcmVl LmNwcDoKICAgICAgICAoV2ViQ29yZTo6RHVtcFJlbmRlclRyZWU6OkR1bXBSZW5kZXJUcmVlKToK LS0tCiBXZWJDb3JlL0NoYW5nZUxvZyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgfCAg IDE2ICsrKysrKysrKysrKysrKysKIFdlYkNvcmUvcGx1Z2lucy9QbHVnaW5EYXRhYmFzZS5jcHAg ICAgICAgICAgICAgICB8ICAgMjEgKysrKysrKysrKysrKysrKy0tLS0tCiBXZWJDb3JlL3BsdWdp bnMvUGx1Z2luRGF0YWJhc2UuaCAgICAgICAgICAgICAgICAgfCAgIDE5ICsrKysrKysrKysrKysr Ky0tLS0KIFdlYktpdC9xdC9BcGkvcXdlYnBhZ2UuY3BwICAgICAgICAgICAgICAgICAgICAgICB8 ICAgMTMgKysrKysrKysrKysrKwogV2ViS2l0L3F0L0NoYW5nZUxvZyAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIHwgICAxMSArKysrKysrKysrKwogV2ViS2l0VG9vbHMvQ2hhbmdlTG9nICAg ICAgICAgICAgICAgICAgICAgICAgICAgIHwgICAxMCArKysrKysrKysrCiBXZWJLaXRUb29scy9E dW1wUmVuZGVyVHJlZS9xdC9EdW1wUmVuZGVyVHJlZS5jcHAgfCAgICAzICsrKwogNyBmaWxlcyBj aGFuZ2VkLCA4NCBpbnNlcnRpb25zKCspLCA5IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL1dl YkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGIyMDY4My4uOTU5YzQ3 NiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cK QEAgLTEsMyArMSwxOSBAQAorMjAwOS0wNy0xNSAgS2VubmV0aCBSb2hkZSBDaHJpc3RpYW5zZW4g IDxrZW5uZXRoLmNocmlzdGlhbnNlbkBvcGVuYm9zc2Eub3JnPgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE1ha2UgaXQgcG9zc2libGUgdG8gc2V0IHRo ZSBwbHVnaW4gZGlyZWN0b3JpZXMgZnJvbSB0aGUgRFJULgorICAgICAgICBQYXJ0IG9mIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNzIxNQorCisgICAgICAgICogcGx1 Z2lucy9QbHVnaW5EYXRhYmFzZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpQbHVnaW5EYXRhYmFz ZTo6aW5zdGFsbGVkUGx1Z2lucyk6IE5vdyBvcHRpb25hbGx5IHRha2VzCisgICAgICAgIGEgcG9w dWxhdGUgYXJndW1lbnQsIHNvIHdlIGNhbiBhdm9pZCBsb2FkaW5nIHN5c3RlbSBwbHVnaW5zIGZy b20gdGhlCisgICAgICAgIERSVCBhbmQgdGh1cyBhdm9pZCB0aGVpciBzdHJlcnIgZXJyb3JzIHRo YXQgY2FuIG1ha2UgdGVzdHMgZmFpbC4KKyAgICAgICAgKFdlYkNvcmU6OlBsdWdpbkRhdGFiYXNl OjpjbGVhcik6IE1ha2UgaXMgcG9zc2libGUgdG8gY2xlYXIgdGhlCisgICAgICAgIGRhdGFiYXNl LiBDYWxsZWQgZnJvbSBzZXRQbHVnaW5EaXJlY3Rvcmllcy4KKyAgICAgICAgKiBwbHVnaW5zL1Bs dWdpbkRhdGFiYXNlLmg6CisgICAgICAgIChXZWJDb3JlOjpQbHVnaW5EYXRhYmFzZTo6c2V0UGx1 Z2luRGlyZWN0b3JpZXMpOiBNYWtlIHB1YmxpYworCiAyMDA5LTA3LTE0ICBQYXZlbCBGZWxkbWFu ICA8cGZlbGRtYW5AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IFRpbW90aHkg SGF0Y2hlci4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGx1Z2lucy9QbHVnaW5EYXRhYmFzZS5jcHAg Yi9XZWJDb3JlL3BsdWdpbnMvUGx1Z2luRGF0YWJhc2UuY3BwCmluZGV4IDg2MjYyNzcuLjAzMzU4 YjQgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGx1Z2lucy9QbHVnaW5EYXRhYmFzZS5jcHAKKysrIGIv V2ViQ29yZS9wbHVnaW5zL1BsdWdpbkRhdGFiYXNlLmNwcApAQCAtMzQsMTQgKzM0LDE3IEBACiAK IG5hbWVzcGFjZSBXZWJDb3JlIHsKIAotUGx1Z2luRGF0YWJhc2UqIFBsdWdpbkRhdGFiYXNlOjpp bnN0YWxsZWRQbHVnaW5zKCkKK1BsdWdpbkRhdGFiYXNlKiBQbHVnaW5EYXRhYmFzZTo6aW5zdGFs bGVkUGx1Z2lucyhib29sIHBvcHVsYXRlKQogewogICAgIHN0YXRpYyBQbHVnaW5EYXRhYmFzZSog cGx1Z2lucyA9IDA7Ci0gICAgCisKICAgICBpZiAoIXBsdWdpbnMpIHsKICAgICAgICAgcGx1Z2lu cyA9IG5ldyBQbHVnaW5EYXRhYmFzZTsKLSAgICAgICAgcGx1Z2lucy0+c2V0UGx1Z2luRGlyZWN0 b3JpZXMoUGx1Z2luRGF0YWJhc2U6OmRlZmF1bHRQbHVnaW5EaXJlY3RvcmllcygpKTsKLSAgICAg ICAgcGx1Z2lucy0+cmVmcmVzaCgpOworCisgICAgICAgIGlmIChwb3B1bGF0ZSkgeworICAgICAg ICAgICAgcGx1Z2lucy0+c2V0UGx1Z2luRGlyZWN0b3JpZXMoUGx1Z2luRGF0YWJhc2U6OmRlZmF1 bHRQbHVnaW5EaXJlY3RvcmllcygpKTsKKyAgICAgICAgICAgIHBsdWdpbnMtPnJlZnJlc2goKTsK KyAgICAgICAgfQogICAgIH0KIAogICAgIHJldHVybiBwbHVnaW5zOwpAQCAtNjQsNyArNjcsNyBA QCB2b2lkIFBsdWdpbkRhdGFiYXNlOjphZGRFeHRyYVBsdWdpbkRpcmVjdG9yeShjb25zdCBTdHJp bmcmIGRpcmVjdG9yeSkKIH0KIAogYm9vbCBQbHVnaW5EYXRhYmFzZTo6cmVmcmVzaCgpCi17ICAg Cit7CiAgICAgYm9vbCBwbHVnaW5TZXRDaGFuZ2VkID0gZmFsc2U7CiAKICAgICBpZiAoIW1fcGx1 Z2lucy5pc0VtcHR5KCkpIHsKQEAgLTI2NCw2ICsyNjcsMTQgQEAgdm9pZCBQbHVnaW5EYXRhYmFz ZTo6cmVtb3ZlKFBsdWdpblBhY2thZ2UqIHBhY2thZ2UpCiAgICAgbV9wbHVnaW5zQnlQYXRoLnJl bW92ZShwYWNrYWdlLT5wYXRoKCkpOwogfQogCit2b2lkIFBsdWdpbkRhdGFiYXNlOjpjbGVhcigp Cit7CisgICAgbV9wbHVnaW5zLmNsZWFyKCk7CisgICAgbV9wbHVnaW5zQnlQYXRoLmNsZWFyKCk7 CisKKyAgICBtX3JlZ2lzdGVyZWRNSU1FVHlwZXMuY2xlYXIoKTsKK30KKwogI2lmICFQTEFURk9S TShXSU5fT1MpIHx8IFBMQVRGT1JNKFdYKQogLy8gRm9yIFNhZmFyaS9XaW4gdGhlIGZvbGxvd2lu ZyB0aHJlZSBtZXRob2RzIGFyZSBpbXBsZW1lbnRlZAogLy8gaW4gUGx1Z2luRGF0YWJhc2VXaW4u Y3BwLCBidXQgaWYgd2UgY2FuIHVzZSBXZWJDb3JlIGNvbnN0cnVjdHMKZGlmZiAtLWdpdCBhL1dl YkNvcmUvcGx1Z2lucy9QbHVnaW5EYXRhYmFzZS5oIGIvV2ViQ29yZS9wbHVnaW5zL1BsdWdpbkRh dGFiYXNlLmgKaW5kZXggNTg4MzlhMi4uYjhkMmJmZSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wbHVn aW5zL1BsdWdpbkRhdGFiYXNlLmgKKysrIGIvV2ViQ29yZS9wbHVnaW5zL1BsdWdpbkRhdGFiYXNl LmgKQEAgLTEsNiArMSw3IEBACiAvKgogICogQ29weXJpZ2h0IChDKSAyMDA2LCAyMDA3IEFwcGxl IEluYy4gIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAgKiBDb3B5cmlnaHQgKEMpIDIwMDggQ29sbGFi b3JhLCBMdGQuICBBbGwgcmlnaHRzIHJlc2VydmVkLgorICogQ29weXJpZ2h0IChDKSAyMDA5IE5v a2lhIENvcnBvcmF0aW9uIGFuZC9vciBpdHMgc3Vic2lkaWFyeSgtaWVzKQogICoKICAqIFJlZGlz dHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0 aG91dAogICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZv bGxvd2luZyBjb25kaXRpb25zCkBAIC00MiwxMiArNDMsMTggQEAgbmFtZXNwYWNlIFdlYkNvcmUg ewogICAgIGNsYXNzIFBsdWdpblBhY2thZ2U7CiAKICAgICB0eXBlZGVmIEhhc2hTZXQ8UmVmUHRy PFBsdWdpblBhY2thZ2U+LCBQbHVnaW5QYWNrYWdlSGFzaD4gUGx1Z2luU2V0OwotICAKKwogICAg IGNsYXNzIFBsdWdpbkRhdGFiYXNlIHsKICAgICBwdWJsaWM6Ci0gICAgICAgIHN0YXRpYyBQbHVn aW5EYXRhYmFzZSogaW5zdGFsbGVkUGx1Z2lucygpOworICAgICAgICAvLyBUaGUgZmlyc3QgY2Fs bCB0byBpbnN0YWxsZWRQbHVnaW5zIGNyZWF0ZXMgdGhlIHBsdWdpbiBkYXRhYmFzZQorICAgICAg ICAvLyBhbmQgYnkgZGVmYXVsdCBwb3B1bGF0ZXMgaXQgd2l0aCB0aGUgcGx1Z2lucyBpbnN0YWxs ZWQgb24gdGhlIHN5c3RlbS4KKyAgICAgICAgLy8gRm9yIHRlc3RpbmcgcHVycG9zZXMsIGl0IGlz IHBvc3NpYmxlIHRvIG5vdCBwb3B1bGF0ZSB0aGUgZGF0YWJhc2UKKyAgICAgICAgLy8gYXV0b21h dGljYWxseSwgYXMgdGhlIHBsdWdpbnMgbWlnaHQgYWZmZWN0IHRoZSBEUlQgcmVzdWx0cyBieQor ICAgICAgICAvLyB3cml0aW5nIHRvIGEuby4gc3RkZXJyLgorICAgICAgICBzdGF0aWMgUGx1Z2lu RGF0YWJhc2UqIGluc3RhbGxlZFBsdWdpbnMoYm9vbCBwb3B1bGF0ZSA9IHRydWUpOwogCiAgICAg ICAgIGJvb2wgcmVmcmVzaCgpOworICAgICAgICB2b2lkIGNsZWFyKCk7CiAgICAgICAgIFZlY3Rv cjxQbHVnaW5QYWNrYWdlKj4gcGx1Z2lucygpIGNvbnN0OwogICAgICAgICBib29sIGlzTUlNRVR5 cGVSZWdpc3RlcmVkKGNvbnN0IFN0cmluZyYgbWltZVR5cGUpOwogICAgICAgICB2b2lkIGFkZEV4 dHJhUGx1Z2luRGlyZWN0b3J5KGNvbnN0IFN0cmluZyYpOwpAQCAtNTcsOSArNjQsMTMgQEAgbmFt ZXNwYWNlIFdlYkNvcmUgewogCiAgICAgICAgIFBsdWdpblBhY2thZ2UqIGZpbmRQbHVnaW4oY29u c3QgS1VSTCYsIFN0cmluZyYgbWltZVR5cGUpOwogCi0gICAgcHJpdmF0ZToKLSAgICAgICAgdm9p ZCBzZXRQbHVnaW5EaXJlY3Rvcmllcyhjb25zdCBWZWN0b3I8U3RyaW5nPiYgZGlyZWN0b3JpZXMp IHsgbV9wbHVnaW5EaXJlY3RvcmllcyA9IGRpcmVjdG9yaWVzOyB9CisgICAgICAgIHZvaWQgc2V0 UGx1Z2luRGlyZWN0b3JpZXMoY29uc3QgVmVjdG9yPFN0cmluZz4mIGRpcmVjdG9yaWVzKQorICAg ICAgICB7CisgICAgICAgICAgICBjbGVhcigpOworICAgICAgICAgICAgbV9wbHVnaW5EaXJlY3Rv cmllcyA9IGRpcmVjdG9yaWVzOworICAgICAgICB9CiAKKyAgICBwcml2YXRlOgogICAgICAgICB2 b2lkIGdldFBsdWdpblBhdGhzSW5EaXJlY3RvcmllcyhIYXNoU2V0PFN0cmluZz4mKSBjb25zdDsK ICAgICAgICAgdm9pZCBnZXREZWxldGVkUGx1Z2lucyhQbHVnaW5TZXQmKSBjb25zdDsKIApkaWZm IC0tZ2l0IGEvV2ViS2l0L3F0L0FwaS9xd2VicGFnZS5jcHAgYi9XZWJLaXQvcXQvQXBpL3F3ZWJw YWdlLmNwcAppbmRleCA4NDc1M2JkLi4xN2MwMjU3IDEwMDY0NAotLS0gYS9XZWJLaXQvcXQvQXBp L3F3ZWJwYWdlLmNwcAorKysgYi9XZWJLaXQvcXQvQXBpL3F3ZWJwYWdlLmNwcApAQCAtNTksNiAr NTksNyBAQAogI2luY2x1ZGUgIlNjcm9sbGJhci5oIgogI2luY2x1ZGUgIlBsYXRmb3JtS2V5Ym9h cmRFdmVudC5oIgogI2luY2x1ZGUgIlBsYXRmb3JtV2hlZWxFdmVudC5oIgorI2luY2x1ZGUgIlBs dWdpbkRhdGFiYXNlLmgiCiAjaW5jbHVkZSAiUHJvZ3Jlc3NUcmFja2VyLmgiCiAjaW5jbHVkZSAi UmVmUHRyLmgiCiAjaW5jbHVkZSAiSGFzaE1hcC5oIgpAQCAtOTksNiArMTAwLDE4IEBACiAKIHVz aW5nIG5hbWVzcGFjZSBXZWJDb3JlOwogCit2b2lkIFFXRUJLSVRfRVhQT1JUIHF0X2RydF9vdmVy d3JpdGVQbHVnaW5EaXJlY3RvcmllcygpCit7CisgICAgUGx1Z2luRGF0YWJhc2UqIGRiID0gUGx1 Z2luRGF0YWJhc2U6Omluc3RhbGxlZFBsdWdpbnMoLyogcG9wdWxhdGUgKi8gZmFsc2UpOworCisg ICAgVmVjdG9yPFN0cmluZz4gcGF0aHM7CisgICAgU3RyaW5nIHF0UGF0aChnZXRlbnYoIlFUV0VC S0lUX1BMVUdJTl9QQVRIIikpOworICAgIHF0UGF0aC5zcGxpdChVQ2hhcignOicpLCAvKiBhbGxv d0VtcHR5RW50cmllcyAqLyBmYWxzZSwgcGF0aHMpOworCisgICAgZGItPnNldFBsdWdpbkRpcmVj dG9yaWVzKHBhdGhzKTsKKyAgICBkYi0+cmVmcmVzaCgpOworfQorCiBib29sIFFXZWJQYWdlUHJp dmF0ZTo6ZHJ0UnVuID0gZmFsc2U7CiB2b2lkIFFXRUJLSVRfRVhQT1JUIHF0X2RydF9ydW4oYm9v bCBiKQogewpkaWZmIC0tZ2l0IGEvV2ViS2l0L3F0L0NoYW5nZUxvZyBiL1dlYktpdC9xdC9DaGFu Z2VMb2cKaW5kZXggOGY0NWRlNS4uYjZmMmU3ZCAxMDA2NDQKLS0tIGEvV2ViS2l0L3F0L0NoYW5n ZUxvZworKysgYi9XZWJLaXQvcXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMDktMDct MTUgIEtlbm5ldGggUm9oZGUgQ2hyaXN0aWFuc2VuICA8a2VubmV0aC5jaHJpc3RpYW5zZW5Ab3Bl bmJvc3NhLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBPdmVyd3JpdGUgdGhlIHBsdWdpbiBkaXJlY3RvcmllcyBmb3IgdGhlIERSVC4KKyAgICAg ICAgUGFydCBvZiBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjcyMTUK KworICAgICAgICAqIEFwaS9xd2VicGFnZS5jcHA6CisgICAgICAgIChxdF9kcnRfb3ZlcndyaXRl UGx1Z2luRGlyZWN0b3JpZXMpOiBPbmx5IHNldCB0aGUgcGx1Z2luIGRpcmVjdG9yaWVzCisgICAg ICAgIHRvIHRoZSBvbmVzIGluIHRoZSBRVFdFQktJVF9QTFVHSU5fUEFUSCBlbnZpcm9ubWVudCB2 YXJpYWJsZS4KKwogMjAwOS0wNy0xNCAgQWRhbSBUcmVhdCAgPGFkYW0udHJlYXRAdG9yY2htb2Jp bGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IFphY2sgUnVzaW4uCmRpZmYgLS1naXQgYS9X ZWJLaXRUb29scy9DaGFuZ2VMb2cgYi9XZWJLaXRUb29scy9DaGFuZ2VMb2cKaW5kZXggMWExZjcx Yi4uMWI1NjZlZCAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCisrKyBiL1dlYktp dFRvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDA5LTA3LTE1ICBLZW5uZXRoIFJv aGRlIENocmlzdGlhbnNlbiAgPGtlbm5ldGguY2hyaXN0aWFuc2VuQG9wZW5ib3NzYS5vcmc+CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgT3ZlcndyaXRl IHRoZSBwbHVnaW4gZGlyZWN0b3JpZXMgZm9yIHRoZSBEUlQuCisgICAgICAgIFBhcnQgb2YgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI3MjE1CisKKyAgICAgICAgKiBE dW1wUmVuZGVyVHJlZS9xdC9EdW1wUmVuZGVyVHJlZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpE dW1wUmVuZGVyVHJlZTo6RHVtcFJlbmRlclRyZWUpOgorCiAyMDA5LTA3LTE1ICBTaW1vbiBIYXVz bWFubiAgPHNpbW9uLmhhdXNtYW5uQG5va2lhLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBB ZGFtIFRyZWF0LgpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvRHVtcFJlbmRlclRyZWUvcXQvRHVt cFJlbmRlclRyZWUuY3BwIGIvV2ViS2l0VG9vbHMvRHVtcFJlbmRlclRyZWUvcXQvRHVtcFJlbmRl clRyZWUuY3BwCmluZGV4IDE2Nzk4YzcuLjczZmY4YjEgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xz L0R1bXBSZW5kZXJUcmVlL3F0L0R1bXBSZW5kZXJUcmVlLmNwcAorKysgYi9XZWJLaXRUb29scy9E dW1wUmVuZGVyVHJlZS9xdC9EdW1wUmVuZGVyVHJlZS5jcHAKQEAgLTYwLDYgKzYwLDcgQEAgZXh0 ZXJuIHZvaWQgcXRfZHJ0X3J1bihib29sIGIpOwogZXh0ZXJuIHZvaWQgcXRfZHVtcF9zZXRfYWNj ZXB0c19lZGl0aW5nKGJvb2wgYik7CiBleHRlcm4gdm9pZCBxdF9kdW1wX2ZyYW1lX2xvYWRlcihi b29sIGIpOwogZXh0ZXJuIHZvaWQgcXRfZHJ0X2NsZWFyRnJhbWVOYW1lKFFXZWJGcmFtZSogcUZy YW1lKTsKK2V4dGVybiB2b2lkIHF0X2RydF9vdmVyd3JpdGVQbHVnaW5EaXJlY3RvcmllcygpOwog CiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKQEAgLTE0Myw2ICsxNDQsOCBAQCBEdW1wUmVuZGVyVHJl ZTo6RHVtcFJlbmRlclRyZWUoKQogICAgIDogbV9zdGRpbigwKQogICAgICwgbV9ub3RpZmllcigw KQogeworICAgIHF0X2RydF9vdmVyd3JpdGVQbHVnaW5EaXJlY3RvcmllcygpOworCiAgICAgbV9j b250cm9sbGVyID0gbmV3IExheW91dFRlc3RDb250cm9sbGVyKHRoaXMpOwogICAgIGNvbm5lY3Qo bV9jb250cm9sbGVyLCBTSUdOQUwoZG9uZSgpKSwgdGhpcywgU0xPVChkdW1wKCkpKTsKIAotLSAK MS42LjAuNAoK