88310 2012-06-05 01:28:42 -0700 [Qt][Win] Fix UString related build problem in Source/WebCore/bridge/qt/qt_instance.cpp 2012-06-11 03:24:52 -0700 1 1 1 Unclassified WebKit Tools / Tests 420+ All All RESOLVED FIXED Qt, QtTriaged P1 Blocker --- 88300 1 ossy ossy hausmann kent.hansen ossy vestbo oldest_to_newest 641298 0 ossy 2012-06-05 01:28:42 -0700 Source/WebCore/bridge/qt/qt_instance.cpp doesn't build because of some UString related problem. (Details are coming soon.) 641483 1 ossy 2012-06-05 06:17:08 -0700 Error log: f:\WebKit\Source\WebCore\bridge\qt\qt_instance.cpp(242) : error C2665: 'JSC::UString::UString' : none of the 11 overloads could convert all the argument types f:\webkit\source\javascriptcore\runtime\UString.h(36): could be 'JSC::UString::UString(const UChar *,unsigned int)' f:\webkit\source\javascriptcore\runtime\UString.h(42): or 'JSC::UString::UString(const LChar *,unsigned int)' f:\webkit\source\javascriptcore\runtime\UString.h(43): or 'JSC::UString::UString(const char *,unsigned int)' while trying to match the argument list '(const ushort *, int)' qt_instance.cpp: ----------------- 240: #if HAVE(QT5) 241: QString sig = QString::fromLatin1(method.methodSignature()); 242: array.add(Identifier(exec, UString(sig.utf16(), sig.length()))); 243: #else 244: array.add(Identifier(exec, method.signature())); 245: #endif Qstring.utf16() returns with const ushort * on all platform, but it works fine on Linux 32/64 bit too. Maybe the sizeof(ushort) is different on win. 641498 2 145782 ossy 2012-06-05 07:03:01 -0700 Created attachment 145782 Patch It's only a speculative fix, I'm not sure if it is proper or not. Could you confirm if I'm on good or bad way? 641885 3 145782 hausmann 2012-06-05 14:17:01 -0700 Comment on attachment 145782 Patch So what's happening here is that method.methodSignature() returns a QByteArray (latin1 encoded string), that is converted to a utf-16 encoded QString, which is then supposed to get converted to a UString - except that the compiler is confused. Fortunately UString supports also latin1 encoded 8-bit strings, so I think the much simpler fix is to avoid conversion from 8-bit latin1 to utf-16 and instead construct the UString straight from 8-bit, i.e. QByteArray sig = method.methodSignature(); .... UString(sig.constData(), sig.length()); 643447 4 146260 ossy 2012-06-07 05:25:01 -0700 Created attachment 146260 Patch fixed patch 643449 5 146260 webkit-ews 2012-06-07 05:31:05 -0700 Comment on attachment 146260 Patch Attachment 146260 did not pass qt-wk2-ews (qt): Output: http://queues.webkit.org/results/12913198 643450 6 146261 ossy 2012-06-07 05:33:58 -0700 Created attachment 146261 Patch typo fixed 643454 7 146261 webkit-ews 2012-06-07 05:40:09 -0700 Comment on attachment 146261 Patch Attachment 146261 did not pass qt-wk2-ews (qt): Output: http://queues.webkit.org/results/12920154 643456 8 146264 ossy 2012-06-07 05:49:57 -0700 Created attachment 146264 Patch typo fixed - 2nd attempt 643460 9 146265 ossy 2012-06-07 05:52:55 -0700 Created attachment 146265 Patch typo fixed - 3rd attempt. It's not my day. :) 643473 10 146265 webkit-ews 2012-06-07 06:06:27 -0700 Comment on attachment 146265 Patch Attachment 146265 did not pass qt-wk2-ews (qt): Output: http://queues.webkit.org/results/12922134 643474 11 146265 ossy 2012-06-07 06:08:12 -0700 Comment on attachment 146265 Patch It isn't my day. :( I'll try again once I'm in a better shape ... 643524 12 ossy 2012-06-07 07:13:41 -0700 Kent updated this part of code after renaming by http://trac.webkit.org/changeset/116102 (and reviewed by Tor Arne) 96f2365cf4cebc074c3171878dcd25ce19ee7486 was "Rename QMetaMethod::signature() to methodSignature()" in Qt5/qtbase I've lost the labyrinth of QString/QByteArray/latin1/utf8/utf16 things, I can't fix it myself, I gave it up. :( Could you guys pick up this bug? 643530 13 146285 ossy 2012-06-07 07:18:32 -0700 Created attachment 146285 Patch It is my last attempt. I can't copy/paste anything today ... :-/ 645878 14 146285 ossy 2012-06-11 03:24:44 -0700 Comment on attachment 146285 Patch Clearing flags on attachment: 146285 Committed r119969: <http://trac.webkit.org/changeset/119969> 645879 15 ossy 2012-06-11 03:24:52 -0700 All reviewed patches have been landed. Closing bug. 145782 2012-06-05 07:03:01 -0700 2012-06-07 05:24:55 -0700 Patch bug-88310-20120605160300.patch text/plain 1564 ossy U3VidmVyc2lvbiBSZXZpc2lvbjogMTE5NDg0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODZkYWViNjg5MDNhNjA1 NjdkZjk3MTdjN2JjZGEyZjNjNjY0OWM2MS4uNjkzMTVlMWRlOTMzMTA1YTdlMjA5YzZjNWNhYTg1 N2VlODRjMTAzMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDEyLTA2LTA1ICBDc2Fi YSBPc3p0cm9nb27DoWMgIDxvc3N5QHdlYmtpdC5vcmc+CisKKyAgICAgICAgW1F0XVtXaW5dIEZp eCBVU3RyaW5nIHJlbGF0ZWQgYnVpbGQgcHJvYmxlbSBpbiBTb3VyY2UvV2ViQ29yZS9icmlkZ2Uv cXQvcXRfaW5zdGFuY2UuY3BwCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD04ODMxMAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgICogYnJpZGdlL3F0L3F0X2luc3RhbmNlLmNwcDoKKyAgICAgICAgKEpTQzo6Qmlu ZGluZ3M6OlF0SW5zdGFuY2U6OmdldFByb3BlcnR5TmFtZXMpOgorCiAyMDEyLTA2LTA1ICBDaGFy bGVzIFdlaSAgPGNoYXJsZXMud2VpQHRvcmNobW9iaWxlLmNvbS5jbj4KIAogICAgICAgICBKU0M6 bmVlZCB0byBpbXBsZW1lbnQgRGljdGlvbmFyeTo6Z2V0V2l0aFVuZGVmaW5lZE9yTnVsbENoZWNr IGZvciBJREIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JyaWRnZS9xdC9xdF9pbnN0YW5j ZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9icmlkZ2UvcXQvcXRfaW5zdGFuY2UuY3BwCmluZGV4IGM3 OTA5NmQ1YTYyYWRmNzU1Y2FhMzYzY2M2NjkxMjJkMzc5M2I5YTguLjJhN2EyNGY4ZDNhN2UyOWEy ZmIzYjlmZjQyMzgyMmIwOWUwYjg3YWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JyaWRn ZS9xdC9xdF9pbnN0YW5jZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYnJpZGdlL3F0L3F0X2lu c3RhbmNlLmNwcApAQCAtMjM5LDcgKzIzOSw3IEBAIHZvaWQgUXRJbnN0YW5jZTo6Z2V0UHJvcGVy dHlOYW1lcyhFeGVjU3RhdGUqIGV4ZWMsIFByb3BlcnR5TmFtZUFycmF5JiBhcnJheSkKICAgICAg ICAgICAgIGlmIChtZXRob2QuYWNjZXNzKCkgIT0gUU1ldGFNZXRob2Q6OlByaXZhdGUpIHsKICNp ZiBIQVZFKFFUNSkKICAgICAgICAgICAgICAgICBRU3RyaW5nIHNpZyA9IFFTdHJpbmc6OmZyb21M YXRpbjEobWV0aG9kLm1ldGhvZFNpZ25hdHVyZSgpKTsKLSAgICAgICAgICAgICAgICBhcnJheS5h ZGQoSWRlbnRpZmllcihleGVjLCBVU3RyaW5nKHNpZy51dGYxNigpLCBzaWcubGVuZ3RoKCkpKSk7 CisgICAgICAgICAgICAgICAgYXJyYXkuYWRkKElkZW50aWZpZXIoZXhlYywgVVN0cmluZyhyZWlu dGVycHJldF9jYXN0PGNvbnN0IFVDaGFyKj4oc2lnLnV0ZjE2KCkpLCBzaWcubGVuZ3RoKCkpKSk7 CiAjZWxzZQogICAgICAgICAgICAgICAgIGFycmF5LmFkZChJZGVudGlmaWVyKGV4ZWMsIG1ldGhv ZC5zaWduYXR1cmUoKSkpOwogI2VuZGlmCg== 146260 2012-06-07 05:25:01 -0700 2012-06-07 05:33:51 -0700 Patch bug-88310-20120607052500.patch text/plain 1600 ossy U3VidmVyc2lvbiBSZXZpc2lvbjogMTE5NzA3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzFmYzZkMWQ0MDcxM2E1 ZWE2ZmZhNTMzMmZmNDBjODY2OTljOGIxMi4uNDQwYmJkYjY0NjVhODY4ZjNiMjg2MzE3MDAyNmQ3 MDk5OGE2NzZmNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDE1IEBACiAyMDEyLTA2LTA3ICBDc2Fi YSBPc3p0cm9nb27DoWMgIDxvc3N5QHdlYmtpdC5vcmc+CiAKKyAgICAgICAgW1F0XVtXaW5dIEZp eCBVU3RyaW5nIHJlbGF0ZWQgYnVpbGQgcHJvYmxlbSBpbiBTb3VyY2UvV2ViQ29yZS9icmlkZ2Uv cXQvcXRfaW5zdGFuY2UuY3BwCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD04ODMxMAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgICogYnJpZGdlL3F0L3F0X2luc3RhbmNlLmNwcDoKKyAgICAgICAgKEpTQzo6Qmlu ZGluZ3M6OlF0SW5zdGFuY2U6OmdldFByb3BlcnR5TmFtZXMpOgorCisyMDEyLTA2LTA3ICBDc2Fi YSBPc3p0cm9nb27DoWMgIDxvc3N5QHdlYmtpdC5vcmc+CisKICAgICAgICAgW1F0XVtXaW5dIFVz ZSBPUyhXSU5ET1dTKSBpbnN0ZWFkIG9mIFFfV1NfV0lOIGluIFdlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvR3JhcGhpY3NDb250ZXh0LmgKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTg4MzA1CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JyaWRn ZS9xdC9xdF9pbnN0YW5jZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9icmlkZ2UvcXQvcXRfaW5zdGFu Y2UuY3BwCmluZGV4IDBkZjI2M2EzYjViODIzNmZlZjBjZTI5OWVlY2I5OGYxYzQ2YTdkMTAuLjAx MWU0OTE4MWM4MzBlNDgyMTViODcwYTRjYmE3YTc3Y2ExNDNiZDcgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2JyaWRnZS9xdC9xdF9pbnN0YW5jZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv YnJpZGdlL3F0L3F0X2luc3RhbmNlLmNwcApAQCAtMjI0LDcgKzIyNCw3IEBAIHZvaWQgUXRJbnN0 YW5jZTo6Z2V0UHJvcGVydHlOYW1lcyhFeGVjU3RhdGUqIGV4ZWMsIFByb3BlcnR5TmFtZUFycmF5 JiBhcnJheSkKICAgICAgICAgICAgIGlmIChtZXRob2QuYWNjZXNzKCkgIT0gUU1ldGFNZXRob2Q6 OlByaXZhdGUpIHsKICNpZiBIQVZFKFFUNSkKICAgICAgICAgICAgICAgICBRU3RyaW5nIHNpZyA9 IFFTdHJpbmc6OmZyb21MYXRpbjEobWV0aG9kLm1ldGhvZFNpZ25hdHVyZSgpKTsKLSAgICAgICAg ICAgICAgICBhcnJheS5hZGQoSWRlbnRpZmllcihleGVjLCBVU3RyaW5nKHNpZy51dGYxNigpLCBz aWcubGVuZ3RoKCkpKSk7CisgICAgICAgICAgICAgICAgYXJyYXkuYWRkKElkZW50aWZpZXIoZXhl Yywgc2lnLmNvbnN0RGF0YSgpLCBzaWcubGVuZ3RoKCkpKSk7CiAjZWxzZQogICAgICAgICAgICAg ICAgIGFycmF5LmFkZChJZGVudGlmaWVyKGV4ZWMsIG1ldGhvZC5zaWduYXR1cmUoKSkpOwogI2Vu ZGlmCg== 146261 2012-06-07 05:33:58 -0700 2012-06-07 05:46:34 -0700 Patch bug-88310-20120607053356.patch text/plain 1599 ossy U3VidmVyc2lvbiBSZXZpc2lvbjogMTE5NzA3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzFmYzZkMWQ0MDcxM2E1 ZWE2ZmZhNTMzMmZmNDBjODY2OTljOGIxMi4uNDQwYmJkYjY0NjVhODY4ZjNiMjg2MzE3MDAyNmQ3 MDk5OGE2NzZmNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDE1IEBACiAyMDEyLTA2LTA3ICBDc2Fi YSBPc3p0cm9nb27DoWMgIDxvc3N5QHdlYmtpdC5vcmc+CiAKKyAgICAgICAgW1F0XVtXaW5dIEZp eCBVU3RyaW5nIHJlbGF0ZWQgYnVpbGQgcHJvYmxlbSBpbiBTb3VyY2UvV2ViQ29yZS9icmlkZ2Uv cXQvcXRfaW5zdGFuY2UuY3BwCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD04ODMxMAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgICogYnJpZGdlL3F0L3F0X2luc3RhbmNlLmNwcDoKKyAgICAgICAgKEpTQzo6Qmlu ZGluZ3M6OlF0SW5zdGFuY2U6OmdldFByb3BlcnR5TmFtZXMpOgorCisyMDEyLTA2LTA3ICBDc2Fi YSBPc3p0cm9nb27DoWMgIDxvc3N5QHdlYmtpdC5vcmc+CisKICAgICAgICAgW1F0XVtXaW5dIFVz ZSBPUyhXSU5ET1dTKSBpbnN0ZWFkIG9mIFFfV1NfV0lOIGluIFdlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvR3JhcGhpY3NDb250ZXh0LmgKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTg4MzA1CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JyaWRn ZS9xdC9xdF9pbnN0YW5jZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9icmlkZ2UvcXQvcXRfaW5zdGFu Y2UuY3BwCmluZGV4IDBkZjI2M2EzYjViODIzNmZlZjBjZTI5OWVlY2I5OGYxYzQ2YTdkMTAuLmI4 ZjEwZjYxYWYzMDk0OGU4ZGU5YmMzNDc4ZTkwODgyNzhmMDE4NTQgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2JyaWRnZS9xdC9xdF9pbnN0YW5jZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv YnJpZGdlL3F0L3F0X2luc3RhbmNlLmNwcApAQCAtMjI0LDcgKzIyNCw3IEBAIHZvaWQgUXRJbnN0 YW5jZTo6Z2V0UHJvcGVydHlOYW1lcyhFeGVjU3RhdGUqIGV4ZWMsIFByb3BlcnR5TmFtZUFycmF5 JiBhcnJheSkKICAgICAgICAgICAgIGlmIChtZXRob2QuYWNjZXNzKCkgIT0gUU1ldGFNZXRob2Q6 OlByaXZhdGUpIHsKICNpZiBIQVZFKFFUNSkKICAgICAgICAgICAgICAgICBRU3RyaW5nIHNpZyA9 IFFTdHJpbmc6OmZyb21MYXRpbjEobWV0aG9kLm1ldGhvZFNpZ25hdHVyZSgpKTsKLSAgICAgICAg ICAgICAgICBhcnJheS5hZGQoSWRlbnRpZmllcihleGVjLCBVU3RyaW5nKHNpZy51dGYxNigpLCBz aWcubGVuZ3RoKCkpKSk7CisgICAgICAgICAgICAgICAgYXJyYXkuYWRkKElkZW50aWZpZXIoZXhl Yywgc2lnLmNvbnN0RGF0YSgpLCBzaWcubGVuZ3RoKCkpKTsKICNlbHNlCiAgICAgICAgICAgICAg ICAgYXJyYXkuYWRkKElkZW50aWZpZXIoZXhlYywgbWV0aG9kLnNpZ25hdHVyZSgpKSk7CiAjZW5k aWYK 146264 2012-06-07 05:49:57 -0700 2012-06-07 05:52:45 -0700 Patch bug-88310-20120607054956.patch text/plain 1585 ossy U3VidmVyc2lvbiBSZXZpc2lvbjogMTE5NzA3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzFmYzZkMWQ0MDcxM2E1 ZWE2ZmZhNTMzMmZmNDBjODY2OTljOGIxMi4uNDQwYmJkYjY0NjVhODY4ZjNiMjg2MzE3MDAyNmQ3 MDk5OGE2NzZmNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDE1IEBACiAyMDEyLTA2LTA3ICBDc2Fi YSBPc3p0cm9nb27DoWMgIDxvc3N5QHdlYmtpdC5vcmc+CiAKKyAgICAgICAgW1F0XVtXaW5dIEZp eCBVU3RyaW5nIHJlbGF0ZWQgYnVpbGQgcHJvYmxlbSBpbiBTb3VyY2UvV2ViQ29yZS9icmlkZ2Uv cXQvcXRfaW5zdGFuY2UuY3BwCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD04ODMxMAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgICogYnJpZGdlL3F0L3F0X2luc3RhbmNlLmNwcDoKKyAgICAgICAgKEpTQzo6Qmlu ZGluZ3M6OlF0SW5zdGFuY2U6OmdldFByb3BlcnR5TmFtZXMpOgorCisyMDEyLTA2LTA3ICBDc2Fi YSBPc3p0cm9nb27DoWMgIDxvc3N5QHdlYmtpdC5vcmc+CisKICAgICAgICAgW1F0XVtXaW5dIFVz ZSBPUyhXSU5ET1dTKSBpbnN0ZWFkIG9mIFFfV1NfV0lOIGluIFdlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvR3JhcGhpY3NDb250ZXh0LmgKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTg4MzA1CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JyaWRn ZS9xdC9xdF9pbnN0YW5jZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9icmlkZ2UvcXQvcXRfaW5zdGFu Y2UuY3BwCmluZGV4IDBkZjI2M2EzYjViODIzNmZlZjBjZTI5OWVlY2I5OGYxYzQ2YTdkMTAuLjNl ODg5ZTE0YmViYTU0OWM1ZDNkNzZlOGUxNGE0M2I1MTExMmM2ZjkgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2JyaWRnZS9xdC9xdF9pbnN0YW5jZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv YnJpZGdlL3F0L3F0X2luc3RhbmNlLmNwcApAQCAtMjI0LDcgKzIyNCw3IEBAIHZvaWQgUXRJbnN0 YW5jZTo6Z2V0UHJvcGVydHlOYW1lcyhFeGVjU3RhdGUqIGV4ZWMsIFByb3BlcnR5TmFtZUFycmF5 JiBhcnJheSkKICAgICAgICAgICAgIGlmIChtZXRob2QuYWNjZXNzKCkgIT0gUU1ldGFNZXRob2Q6 OlByaXZhdGUpIHsKICNpZiBIQVZFKFFUNSkKICAgICAgICAgICAgICAgICBRU3RyaW5nIHNpZyA9 IFFTdHJpbmc6OmZyb21MYXRpbjEobWV0aG9kLm1ldGhvZFNpZ25hdHVyZSgpKTsKLSAgICAgICAg ICAgICAgICBhcnJheS5hZGQoSWRlbnRpZmllcihleGVjLCBVU3RyaW5nKHNpZy51dGYxNigpLCBz aWcubGVuZ3RoKCkpKSk7CisgICAgICAgICAgICAgICAgYXJyYXkuYWRkKElkZW50aWZpZXIoZXhl Yywgc2lnLmNvbnN0RGF0YSgpKSk7CiAjZWxzZQogICAgICAgICAgICAgICAgIGFycmF5LmFkZChJ ZGVudGlmaWVyKGV4ZWMsIG1ldGhvZC5zaWduYXR1cmUoKSkpOwogI2VuZGlmCg== 146265 2012-06-07 05:52:55 -0700 2012-06-07 06:08:12 -0700 Patch bug-88310-20120607055254.patch text/plain 1608 ossy U3VidmVyc2lvbiBSZXZpc2lvbjogMTE5NzA3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzFmYzZkMWQ0MDcxM2E1 ZWE2ZmZhNTMzMmZmNDBjODY2OTljOGIxMi4uNDQwYmJkYjY0NjVhODY4ZjNiMjg2MzE3MDAyNmQ3 MDk5OGE2NzZmNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDE1IEBACiAyMDEyLTA2LTA3ICBDc2Fi YSBPc3p0cm9nb27DoWMgIDxvc3N5QHdlYmtpdC5vcmc+CiAKKyAgICAgICAgW1F0XVtXaW5dIEZp eCBVU3RyaW5nIHJlbGF0ZWQgYnVpbGQgcHJvYmxlbSBpbiBTb3VyY2UvV2ViQ29yZS9icmlkZ2Uv cXQvcXRfaW5zdGFuY2UuY3BwCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD04ODMxMAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgICogYnJpZGdlL3F0L3F0X2luc3RhbmNlLmNwcDoKKyAgICAgICAgKEpTQzo6Qmlu ZGluZ3M6OlF0SW5zdGFuY2U6OmdldFByb3BlcnR5TmFtZXMpOgorCisyMDEyLTA2LTA3ICBDc2Fi YSBPc3p0cm9nb27DoWMgIDxvc3N5QHdlYmtpdC5vcmc+CisKICAgICAgICAgW1F0XVtXaW5dIFVz ZSBPUyhXSU5ET1dTKSBpbnN0ZWFkIG9mIFFfV1NfV0lOIGluIFdlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvR3JhcGhpY3NDb250ZXh0LmgKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTg4MzA1CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JyaWRn ZS9xdC9xdF9pbnN0YW5jZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9icmlkZ2UvcXQvcXRfaW5zdGFu Y2UuY3BwCmluZGV4IDBkZjI2M2EzYjViODIzNmZlZjBjZTI5OWVlY2I5OGYxYzQ2YTdkMTAuLjY1 Y2ZhNDYyY2M2YmExODgwYjllYWY2OTk3NDhjOTZiMTc3MTczZTEgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2JyaWRnZS9xdC9xdF9pbnN0YW5jZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv YnJpZGdlL3F0L3F0X2luc3RhbmNlLmNwcApAQCAtMjI0LDcgKzIyNCw3IEBAIHZvaWQgUXRJbnN0 YW5jZTo6Z2V0UHJvcGVydHlOYW1lcyhFeGVjU3RhdGUqIGV4ZWMsIFByb3BlcnR5TmFtZUFycmF5 JiBhcnJheSkKICAgICAgICAgICAgIGlmIChtZXRob2QuYWNjZXNzKCkgIT0gUU1ldGFNZXRob2Q6 OlByaXZhdGUpIHsKICNpZiBIQVZFKFFUNSkKICAgICAgICAgICAgICAgICBRU3RyaW5nIHNpZyA9 IFFTdHJpbmc6OmZyb21MYXRpbjEobWV0aG9kLm1ldGhvZFNpZ25hdHVyZSgpKTsKLSAgICAgICAg ICAgICAgICBhcnJheS5hZGQoSWRlbnRpZmllcihleGVjLCBVU3RyaW5nKHNpZy51dGYxNigpLCBz aWcubGVuZ3RoKCkpKSk7CisgICAgICAgICAgICAgICAgYXJyYXkuYWRkKElkZW50aWZpZXIoZXhl YywgVVN0cmluZyhzaWcuY29uc3REYXRhKCksIHNpZy5sZW5ndGgoKSkpKTsKICNlbHNlCiAgICAg ICAgICAgICAgICAgYXJyYXkuYWRkKElkZW50aWZpZXIoZXhlYywgbWV0aG9kLnNpZ25hdHVyZSgp KSk7CiAjZW5kaWYK 146285 2012-06-07 07:18:32 -0700 2012-06-11 03:24:43 -0700 Patch bug-88310-20120607071830.patch text/plain 1649 ossy U3VidmVyc2lvbiBSZXZpc2lvbjogMTE5NzE1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTU0YzJjYTg3NTQwMmE3 OTMxNDM3ZGI4YmFhMmQ2NWY1MmZkZjk1My4uMzVjMmNjNDFlM2YxY2YzYjQzMDkxMGIxNjM4ZDg1 Mjk5MjA2Njg5YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDEyLTA2LTA3ICBDc2Fi YSBPc3p0cm9nb27DoWMgIDxvc3N5QHdlYmtpdC5vcmc+CisKKyAgICAgICAgW1F0XVtXaW5dIEZp eCBVU3RyaW5nIHJlbGF0ZWQgYnVpbGQgcHJvYmxlbSBpbiBTb3VyY2UvV2ViQ29yZS9icmlkZ2Uv cXQvcXRfaW5zdGFuY2UuY3BwCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD04ODMxMAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgICogYnJpZGdlL3F0L3F0X2luc3RhbmNlLmNwcDoKKyAgICAgICAgKEpTQzo6Qmlu ZGluZ3M6OlF0SW5zdGFuY2U6OmdldFByb3BlcnR5TmFtZXMpOgorCiAyMDEyLTA2LTA3ICBBbGV4 ZWkgRmlsaXBwb3YgIDxhbGV4ZWlmQGNocm9taXVtLm9yZz4KIAogICAgICAgICBXZWIgSW5zcGVj dG9yOiByZXVzZSBlZGdlX2NvdW50IGZpZWxkIG9mIGhlYXAgc25hcHNob3QgdG8gc3RvcmUgcmV0 YWluZWQgc2l6ZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYnJpZGdlL3F0L3F0X2luc3Rh bmNlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2JyaWRnZS9xdC9xdF9pbnN0YW5jZS5jcHAKaW5kZXgg MGRmMjYzYTNiNWI4MjM2ZmVmMGNlMjk5ZWVjYjk4ZjFjNDZhN2QxMC4uOWNmOGQ1ZWIwNDVmYjJm M2NlYTAzMzg3ZThmNTVjMGYxYjcxN2I0ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYnJp ZGdlL3F0L3F0X2luc3RhbmNlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9icmlkZ2UvcXQvcXRf aW5zdGFuY2UuY3BwCkBAIC0yMjMsOCArMjIzLDggQEAgdm9pZCBRdEluc3RhbmNlOjpnZXRQcm9w ZXJ0eU5hbWVzKEV4ZWNTdGF0ZSogZXhlYywgUHJvcGVydHlOYW1lQXJyYXkmIGFycmF5KQogICAg ICAgICAgICAgUU1ldGFNZXRob2QgbWV0aG9kID0gbWV0YS0+bWV0aG9kKGkpOwogICAgICAgICAg ICAgaWYgKG1ldGhvZC5hY2Nlc3MoKSAhPSBRTWV0YU1ldGhvZDo6UHJpdmF0ZSkgewogI2lmIEhB VkUoUVQ1KQotICAgICAgICAgICAgICAgIFFTdHJpbmcgc2lnID0gUVN0cmluZzo6ZnJvbUxhdGlu MShtZXRob2QubWV0aG9kU2lnbmF0dXJlKCkpOwotICAgICAgICAgICAgICAgIGFycmF5LmFkZChJ ZGVudGlmaWVyKGV4ZWMsIFVTdHJpbmcoc2lnLnV0ZjE2KCksIHNpZy5sZW5ndGgoKSkpKTsKKyAg ICAgICAgICAgICAgICBRQnl0ZUFycmF5IHNpZyA9IG1ldGhvZC5tZXRob2RTaWduYXR1cmUoKTsK KyAgICAgICAgICAgICAgICBhcnJheS5hZGQoSWRlbnRpZmllcihleGVjLCBVU3RyaW5nKHNpZy5j b25zdERhdGEoKSwgc2lnLmxlbmd0aCgpKSkpOwogI2Vsc2UKICAgICAgICAgICAgICAgICBhcnJh eS5hZGQoSWRlbnRpZmllcihleGVjLCBtZXRob2Quc2lnbmF0dXJlKCkpKTsKICNlbmRpZgo=