87257 2012-05-23 05:59:37 -0700 [Qt] Buildfix for newer Qt5 2012-05-25 03:35:06 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) All All RESOLVED FIXED Qt, QtTriaged P1 Blocker --- 1 ossy ossy hausmann ossy webkit.review.bot oldest_to_newest 631566 0 ossy 2012-05-23 05:59:37 -0700 I'm on it. 631609 1 143559 ossy 2012-05-23 06:44:25 -0700 Created attachment 143559 proposed buildfix 631612 2 ossy 2012-05-23 06:45:53 -0700 (In reply to comment #1) > Created an attachment (id=143559) [details] > proposed buildfix I tested on the latest Qt5 - 9985003ac4a42adfa35db286eda1b2ae9656d85b, and the buildfix based on the following changes in Qt5: QIcon: move back to QtGui qtbase - 6c06e14a49773ce5572935864ed6b9be219c6103 Change-Id: I1b63759f892ebc02dfc30f41bb6e76e0b7451182 Make QCoreApp::translate and related methods use UTF-8 qtbase - 83645377e98fb1312b6f80a1c996a013b62f0b46 Change-Id: Ic62d6947046dee9be0cbd37f2d2f6976b9e572a7 Remove QtDeclarative compatibility module qtdeclarative - 35dd4cbd3d09fbcc11804995b65dd8dea03da5ee Change-Id: I05a9727013d9e38c2262577f68260a4382bfbeea 631615 3 143559 ossy 2012-05-23 06:48:05 -0700 Comment on attachment 143559 proposed buildfix cq- of course, because I'm going to land the fix sync with the Qt5 update. 631616 4 webkit.review.bot 2012-05-23 06:48:51 -0700 Attachment 143559 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebKit/qt/Api/qgraphicswebview.h', ..." exit_code: 1 Source/WebKit/qt/Api/qgraphicswebview.h:31: Alphabetical sorting problem. [build/include_order] [4] Source/WebKit/qt/declarative/plugin.cpp:48: Failed to find complete declaration of class WebKitQmlPlugin [build/class] [5] Total errors found: 2 in 8 files If any of these errors are false positives, please file a bug against check-webkit-style. 631627 5 143559 ossy 2012-05-23 06:59:16 -0700 Comment on attachment 143559 proposed buildfix View in context: https://bugs.webkit.org/attachment.cgi?id=143559&action=review >> Source/WebKit/qt/Api/qgraphicswebview.h:31 >> +#include <QtGui/qicon.h> > > Alphabetical sorting problem. [build/include_order] [4] Will fix before landing. >> Source/WebKit/qt/declarative/plugin.cpp:48 >> +class WebKitQmlPlugin : public QQmlExtensionPlugin { > > Failed to find complete declaration of class WebKitQmlPlugin [build/class] [5] It is an ugly fix which can't be understandable by style checker, but I had no better idea to make Qt4 and Qt5 happy. 631631 6 143559 hausmann 2012-05-23 07:02:24 -0700 Comment on attachment 143559 proposed buildfix View in context: https://bugs.webkit.org/attachment.cgi?id=143559&action=review > Source/WebKit/qt/declarative/plugin.cpp:47 > +#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)) I'm surprised this works with the moc...... > Source/WebKit/qt/declarative/plugin.cpp:51 > +class WebKitQmlPlugin : public QQmlExtensionPlugin { > +#else > class WebKitQmlPlugin : public QDeclarativeExtensionPlugin { > +#endif If this works, then it's okay for now. I'll try to split up the plugin into a proper QtQuick1 based plugin that exports QDeclarativeWebView and one that exports the QML2 components. 631646 7 143559 webkit-ews 2012-05-23 07:24:10 -0700 Comment on attachment 143559 proposed buildfix Attachment 143559 did not pass qt-wk2-ews (qt): Output: http://queues.webkit.org/results/12772226 631651 8 143559 webkit-ews 2012-05-23 07:29:30 -0700 Comment on attachment 143559 proposed buildfix Attachment 143559 did not pass qt-ews (qt): Output: http://queues.webkit.org/results/12767285 632566 9 143559 ossy 2012-05-24 02:51:32 -0700 Comment on attachment 143559 proposed buildfix I'm fixing the 4.8 build. 632572 10 143775 ossy 2012-05-24 03:08:17 -0700 Created attachment 143775 Patch style error fixed, try to make MOC happier 632573 11 webkit.review.bot 2012-05-24 03:11:27 -0700 Attachment 143775 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebKit/qt/Api/qgraphicswebview.h', ..." exit_code: 1 Source/WebKit/qt/declarative/plugin.cpp:48: Failed to find complete declaration of class WebKitQmlPlugin [build/class] [5] Total errors found: 1 in 8 files If any of these errors are false positives, please file a bug against check-webkit-style. 632574 12 143775 hausmann 2012-05-24 03:13:10 -0700 Comment on attachment 143775 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=143775&action=review > Source/WebKit/qt/declarative/plugin.cpp:47 > +#if QT_VERSION >= 0x050000 Yeah, I think moc can handle this one much better :) 632586 13 143775 webkit-ews 2012-05-24 03:33:37 -0700 Comment on attachment 143775 Patch Attachment 143775 did not pass qt-wk2-ews (qt): Output: http://queues.webkit.org/results/12805097 633796 14 143775 ossy 2012-05-25 03:34:59 -0700 Comment on attachment 143775 Patch Clearing flags on attachment: 143775 Committed r118511: <http://trac.webkit.org/changeset/118511> 633797 15 ossy 2012-05-25 03:35:06 -0700 All reviewed patches have been landed. Closing bug. 143559 2012-05-23 06:44:25 -0700 2012-05-24 02:51:31 -0700 proposed buildfix bug-87257-20120523154423.patch text/plain 10649 ossy U3VidmVyc2lvbiBSZXZpc2lvbjogMTE4MTYzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L3F0 L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nCmluZGV4IDQ2OWRiZWZhODEx MWY0NTRiZmZjNzgyMzc5NGFhNmQ2YjRiYzAzMTYuLjIzMTNhYjgzNDBkYTg1ODJmYzNmN2E2NmM0 Y2IxMjU5Y2MxZTU4MmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nCisr KyBiL1NvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjcgQEAKKzIwMTItMDUt MjMgIENzYWJhIE9zenRyb2dvbsOhYyAgPG9zc3lAd2Via2l0Lm9yZz4KKworICAgICAgICBbUXRd IEJ1aWxkZml4IGZvciBuZXdlciBRdDUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTg3MjU3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgKiBBcGkvcWdyYXBoaWNzd2Vidmlldy5oOiBRdFdpZGdldHMvcWljb24u aCAtPiBRdEd1aS9xaWNvbi5oIHJlbmFtaW5nLgorICAgICAgICAqIEFwaS9xd2ViZnJhbWUuaDog UXRXaWRnZXRzL3FpY29uLmggLT4gUXRHdWkvcWljb24uaCByZW5hbWluZy4KKyAgICAgICAgKiBB cGkvcXdlYmhpc3RvcnkuaDogUXRXaWRnZXRzL3FpY29uLmggLT4gUXRHdWkvcWljb24uaCByZW5h bWluZy4KKyAgICAgICAgKiBBcGkvcXdlYnNldHRpbmdzLmg6IFF0V2lkZ2V0cy9xaWNvbi5oIC0+ IFF0R3VpL3FpY29uLmggcmVuYW1pbmcuCisgICAgICAgICogQXBpL3F3ZWJ2aWV3Lmg6IFF0V2lk Z2V0cy9xaWNvbi5oIC0+IFF0R3VpL3FpY29uLmggcmVuYW1pbmcuCisgICAgICAgICogV2ViQ29y ZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRRdC5jcHA6IEFkanVzdCBRQ29yZUFwcGxpY2F0aW9u Ojp0cmFuc2xhdGUoKSBwYXJhbWV0ZXIgbGlzdCB0byBuZXdlciBRdCA1LgorICAgICAgICAoV2Vi Q29yZTo6RnJhbWVMb2FkZXJDbGllbnRRdDo6Y2FuY2VsbGVkRXJyb3IpOgorICAgICAgICAoV2Vi Q29yZTo6RnJhbWVMb2FkZXJDbGllbnRRdDo6YmxvY2tlZEVycm9yKToKKyAgICAgICAgKFdlYkNv cmU6OkZyYW1lTG9hZGVyQ2xpZW50UXQ6OmNhbm5vdFNob3dVUkxFcnJvcik6CisgICAgICAgIChX ZWJDb3JlOjpGcmFtZUxvYWRlckNsaWVudFF0OjppbnRlcnJ1cHRlZEZvclBvbGljeUNoYW5nZUVy cm9yKToKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lTG9hZGVyQ2xpZW50UXQ6OmNhbm5vdFNob3dN SU1FVHlwZUVycm9yKToKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lTG9hZGVyQ2xpZW50UXQ6OmZp bGVEb2VzTm90RXhpc3RFcnJvcik6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRlckNsaWVu dFF0OjpwbHVnaW5XaWxsSGFuZGxlTG9hZEVycm9yKToKKyAgICAgICAgKiBkZWNsYXJhdGl2ZS9l eHBlcmltZW50YWwvcGx1Z2luLmNwcDogUURlY2xhcmF0aXZlRXh0ZW5zaW9uUGx1Z2luIC0+IFFR bWxFeHRlbnNpb25QbHVnaW4gcmVuYW1pbmcuCisgICAgICAgICogZGVjbGFyYXRpdmUvcGx1Z2lu LmNwcDogUURlY2xhcmF0aXZlRXh0ZW5zaW9uUGx1Z2luIC0+IFFRbWxFeHRlbnNpb25QbHVnaW4g cmVuYW1pbmcuCisgICAgICAgIChXZWJLaXRRbWxQbHVnaW4pOgorCiAyMDEyLTA1LTIxICBDYWlv IE1hcmNlbG8gZGUgT2xpdmVpcmEgRmlsaG8gIDxjYWlvLm9saXZlaXJhQG9wZW5ib3NzYS5vcmc+ CiAKICAgICAgICAgTW92ZSBzZXRFZGl0aW5nQmVoYXZpb3IoKSBmcm9tIGxheW91dFRlc3RDb250 cm9sbGVyIHRvIHdpbmRvdy5pbnRlcm5hbHMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvcXQv QXBpL3FncmFwaGljc3dlYnZpZXcuaCBiL1NvdXJjZS9XZWJLaXQvcXQvQXBpL3FncmFwaGljc3dl YnZpZXcuaAppbmRleCAyOWU3ZmZkYWNkZmVlYzQ3YjAyYWViNTRkN2VlYWUzODY0ODNjMjM0Li45 YzVlZjczNjRmYjY0Njc2NWNhMGNkMzM1MzAwNjdhNzI4MzQ4NGRlIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0L3F0L0FwaS9xZ3JhcGhpY3N3ZWJ2aWV3LmgKKysrIGIvU291cmNlL1dlYktpdC9x dC9BcGkvcWdyYXBoaWNzd2Vidmlldy5oCkBAIC0yNSwxMSArMjUsMTAgQEAKICNpbmNsdWRlIDxR dENvcmUvcXVybC5oPgogI2lmIFFUX1ZFUlNJT04gPj0gUVRfVkVSU0lPTl9DSEVDSyg1LCAwLCAw KQogI2luY2x1ZGUgPFF0V2lkZ2V0cy9xZ3JhcGhpY3N3aWRnZXQuaD4KLSNpbmNsdWRlIDxRdFdp ZGdldHMvcWljb24uaD4KICNlbHNlCiAjaW5jbHVkZSA8UXRHdWkvcWdyYXBoaWNzd2lkZ2V0Lmg+ Ci0jaW5jbHVkZSA8UXRHdWkvcWljb24uaD4KICNlbmRpZgorI2luY2x1ZGUgPFF0R3VpL3FpY29u Lmg+CiAjaW5jbHVkZSA8UXRHdWkvcWV2ZW50Lmg+CiAjaW5jbHVkZSA8UXRHdWkvcXBhaW50ZXIu aD4KICNpbmNsdWRlIDxRdE5ldHdvcmsvcW5ldHdvcmthY2Nlc3NtYW5hZ2VyLmg+CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0L3F0L0FwaS9xd2ViZnJhbWUuaCBiL1NvdXJjZS9XZWJLaXQvcXQv QXBpL3F3ZWJmcmFtZS5oCmluZGV4IGZmMTU3NzcxZjBiZjQ5MzZhMDE0MzFlZjQ0MzVhMjAwZGFh ZDc1ZDguLjBhOGU2ZmM2NWZlNjYwOTliMjFiNmMyNThiMzJiYjllZGViODQ2YzYgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQvcXQvQXBpL3F3ZWJmcmFtZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQv cXQvQXBpL3F3ZWJmcmFtZS5oCkBAIC0yNCwxMSArMjQsNyBAQAogI2luY2x1ZGUgPFF0Q29yZS9x b2JqZWN0Lmg+CiAjaW5jbHVkZSA8UXRDb3JlL3F1cmwuaD4KICNpbmNsdWRlIDxRdENvcmUvcXZh cmlhbnQuaD4KLSNpZiBRVF9WRVJTSU9OID49IFFUX1ZFUlNJT05fQ0hFQ0soNSwgMCwgMCkKLSNp bmNsdWRlIDxRdFdpZGdldHMvcWljb24uaD4KLSNlbHNlCiAjaW5jbHVkZSA8UXRHdWkvcWljb24u aD4KLSNlbmRpZgogI2luY2x1ZGUgPFF0U2NyaXB0L3FzY3JpcHRlbmdpbmUuaD4KICNpbmNsdWRl IDxRdE5ldHdvcmsvcW5ldHdvcmthY2Nlc3NtYW5hZ2VyLmg+CiAjaW5jbHVkZSAicXdlYmtpdGds b2JhbC5oIgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9xdC9BcGkvcXdlYmhpc3RvcnkuaCBi L1NvdXJjZS9XZWJLaXQvcXQvQXBpL3F3ZWJoaXN0b3J5LmgKaW5kZXggMGQ1OTA0MTRlOWNjYjEx Mzg0ZGI0MDY3N2EyZDViZjAyZWI5NzIyYS4uNzUzZWI2Mzc2ZGQ1YmRhZjBmYzcyNjFlMTc1NDM1 NjcwZTI3YzllMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9xdC9BcGkvcXdlYmhpc3Rvcnku aAorKysgYi9Tb3VyY2UvV2ViS2l0L3F0L0FwaS9xd2ViaGlzdG9yeS5oCkBAIC0yNCwxMSArMjQs NyBAQAogI2luY2x1ZGUgPFF0Q29yZS9xc3RyaW5nLmg+CiAjaW5jbHVkZSA8UXRDb3JlL3FkYXRl dGltZS5oPgogI2luY2x1ZGUgPFF0Q29yZS9xc2hhcmVkZGF0YS5oPgotI2lmIFFUX1ZFUlNJT04g Pj0gUVRfVkVSU0lPTl9DSEVDSyg1LCAwLCAwKQotI2luY2x1ZGUgPFF0V2lkZ2V0cy9xaWNvbi5o PgotI2Vsc2UKICNpbmNsdWRlIDxRdEd1aS9xaWNvbi5oPgotI2VuZGlmCiAKICNpbmNsdWRlICJx d2Via2l0Z2xvYmFsLmgiCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvcXQvQXBpL3F3ZWJz ZXR0aW5ncy5oIGIvU291cmNlL1dlYktpdC9xdC9BcGkvcXdlYnNldHRpbmdzLmgKaW5kZXggMTM2 ZWU4ZGM0Mzg1YTBjOTBjY2I3ZWFlYjMwOGIzOTIxNDliYmYyZS4uMGFlZTUyNWIwZGU0YTM1NzY2 ZTI1ZTNmODFhM2RjNWUzN2NhZTMwMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9xdC9BcGkv cXdlYnNldHRpbmdzLmgKKysrIGIvU291cmNlL1dlYktpdC9xdC9BcGkvcXdlYnNldHRpbmdzLmgK QEAgLTI0LDExICsyNCw3IEBACiAKICNpbmNsdWRlIDxRdENvcmUvcXN0cmluZy5oPgogI2luY2x1 ZGUgPFF0R3VpL3FwaXhtYXAuaD4KLSNpZiBRVF9WRVJTSU9OID49IFFUX1ZFUlNJT05fQ0hFQ0so NSwgMCwgMCkKLSNpbmNsdWRlIDxRdFdpZGdldHMvcWljb24uaD4KLSNlbHNlCiAjaW5jbHVkZSA8 UXRHdWkvcWljb24uaD4KLSNlbmRpZgogI2luY2x1ZGUgPFF0Q29yZS9xc2hhcmVkZGF0YS5oPgog CiBuYW1lc3BhY2UgV2ViQ29yZSB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L3F0L0FwaS9x d2Vidmlldy5oIGIvU291cmNlL1dlYktpdC9xdC9BcGkvcXdlYnZpZXcuaAppbmRleCAwN2UzMGQz OTEwMjFiM2E1NDFjYWE2OGExYjNmM2ZjZTkxNjI2NzgwLi45MGQwYThlM2IyMDcxNGVjZWIxZTE4 MjMyYjk0MDBhZGM0MzU3MzQwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L3F0L0FwaS9xd2Vi dmlldy5oCisrKyBiL1NvdXJjZS9XZWJLaXQvcXQvQXBpL3F3ZWJ2aWV3LmgKQEAgLTI1LDExICsy NSwxMCBAQAogI2luY2x1ZGUgInF3ZWJwYWdlLmgiCiAjaWYgUVRfVkVSU0lPTiA+PSBRVF9WRVJT SU9OX0NIRUNLKDUsIDAsIDApCiAjaW5jbHVkZSA8UXRXaWRnZXRzL3F3aWRnZXQuaD4KLSNpbmNs dWRlIDxRdFdpZGdldHMvcWljb24uaD4KICNlbHNlCiAjaW5jbHVkZSA8UXRHdWkvcXdpZGdldC5o PgotI2luY2x1ZGUgPFF0R3VpL3FpY29uLmg+CiAjZW5kaWYKKyNpbmNsdWRlIDxRdEd1aS9xaWNv bi5oPgogI2luY2x1ZGUgPFF0R3VpL3FwYWludGVyLmg+CiAjaW5jbHVkZSA8UXRDb3JlL3F1cmwu aD4KICNpbmNsdWRlIDxRdE5ldHdvcmsvcW5ldHdvcmthY2Nlc3NtYW5hZ2VyLmg+CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50UXQu Y3BwIGIvU291cmNlL1dlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudFF0 LmNwcAppbmRleCBjMjMzMTFkYWE0MjNjN2ZlZGFiMmViZGI4MTBhZDdmNWU0YTFmZDBmLi5lODE2 YjlmMjFiMzgxOTgwNDg4YzdkMWJlOTI1Mzg3OGYzNzg0ZTQ0IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50UXQuY3BwCisrKyBiL1Nv dXJjZS9XZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRRdC5jcHAKQEAg LTkwOSw3ICs5MDksNyBAQCB2b2lkIEZyYW1lTG9hZGVyQ2xpZW50UXQ6OmNvbW1pdHRlZExvYWQo V2ViQ29yZTo6RG9jdW1lbnRMb2FkZXIqIGxvYWRlciwgY29uc3QgYwogV2ViQ29yZTo6UmVzb3Vy Y2VFcnJvciBGcmFtZUxvYWRlckNsaWVudFF0OjpjYW5jZWxsZWRFcnJvcihjb25zdCBXZWJDb3Jl OjpSZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3QpCiB7CiAgICAgUmVzb3VyY2VFcnJvciBlcnJvciA9 IFJlc291cmNlRXJyb3IoIlF0TmV0d29yayIsIFFOZXR3b3JrUmVwbHk6Ok9wZXJhdGlvbkNhbmNl bGVkRXJyb3IsIHJlcXVlc3QudXJsKCkuc3RyaW5nKCksCi0gICAgICAgICAgICBRQ29yZUFwcGxp Y2F0aW9uOjp0cmFuc2xhdGUoIlFXZWJGcmFtZSIsICJSZXF1ZXN0IGNhbmNlbGxlZCIsIDAsIFFD b3JlQXBwbGljYXRpb246OlVuaWNvZGVVVEY4KSk7CisgICAgICAgICAgICBRQ29yZUFwcGxpY2F0 aW9uOjp0cmFuc2xhdGUoIlFXZWJGcmFtZSIsICJSZXF1ZXN0IGNhbmNlbGxlZCIsIDApKTsKICAg ICBlcnJvci5zZXRJc0NhbmNlbGxhdGlvbih0cnVlKTsKICAgICByZXR1cm4gZXJyb3I7CiB9CkBA IC05MjksMzggKzkyOSwzOCBAQCBlbnVtIHsKIFdlYkNvcmU6OlJlc291cmNlRXJyb3IgRnJhbWVM b2FkZXJDbGllbnRRdDo6YmxvY2tlZEVycm9yKGNvbnN0IFdlYkNvcmU6OlJlc291cmNlUmVxdWVz dCYgcmVxdWVzdCkKIHsKICAgICByZXR1cm4gUmVzb3VyY2VFcnJvcigiV2ViS2l0RXJyb3JEb21h aW4iLCBXZWJLaXRFcnJvckNhbm5vdFVzZVJlc3RyaWN0ZWRQb3J0LCByZXF1ZXN0LnVybCgpLnN0 cmluZygpLAotICAgICAgICAgICAgUUNvcmVBcHBsaWNhdGlvbjo6dHJhbnNsYXRlKCJRV2ViRnJh bWUiLCAiUmVxdWVzdCBibG9ja2VkIiwgMCwgUUNvcmVBcHBsaWNhdGlvbjo6VW5pY29kZVVURjgp KTsKKyAgICAgICAgICAgIFFDb3JlQXBwbGljYXRpb246OnRyYW5zbGF0ZSgiUVdlYkZyYW1lIiwg IlJlcXVlc3QgYmxvY2tlZCIsIDApKTsKIH0KIAogCiBXZWJDb3JlOjpSZXNvdXJjZUVycm9yIEZy YW1lTG9hZGVyQ2xpZW50UXQ6OmNhbm5vdFNob3dVUkxFcnJvcihjb25zdCBXZWJDb3JlOjpSZXNv dXJjZVJlcXVlc3QmIHJlcXVlc3QpCiB7CiAgICAgcmV0dXJuIFJlc291cmNlRXJyb3IoIldlYktp dEVycm9yRG9tYWluIiwgV2ViS2l0RXJyb3JDYW5ub3RTaG93VVJMLCByZXF1ZXN0LnVybCgpLnN0 cmluZygpLAotICAgICAgICAgICAgUUNvcmVBcHBsaWNhdGlvbjo6dHJhbnNsYXRlKCJRV2ViRnJh bWUiLCAiQ2Fubm90IHNob3cgVVJMIiwgMCwgUUNvcmVBcHBsaWNhdGlvbjo6VW5pY29kZVVURjgp KTsKKyAgICAgICAgICAgIFFDb3JlQXBwbGljYXRpb246OnRyYW5zbGF0ZSgiUVdlYkZyYW1lIiwg IkNhbm5vdCBzaG93IFVSTCIsIDApKTsKIH0KIAogV2ViQ29yZTo6UmVzb3VyY2VFcnJvciBGcmFt ZUxvYWRlckNsaWVudFF0OjppbnRlcnJ1cHRlZEZvclBvbGljeUNoYW5nZUVycm9yKGNvbnN0IFdl YkNvcmU6OlJlc291cmNlUmVxdWVzdCYgcmVxdWVzdCkKIHsKICAgICByZXR1cm4gUmVzb3VyY2VF cnJvcigiV2ViS2l0RXJyb3JEb21haW4iLCBXZWJLaXRFcnJvckZyYW1lTG9hZEludGVycnVwdGVk QnlQb2xpY3lDaGFuZ2UsIHJlcXVlc3QudXJsKCkuc3RyaW5nKCksCi0gICAgICAgICAgICBRQ29y ZUFwcGxpY2F0aW9uOjp0cmFuc2xhdGUoIlFXZWJGcmFtZSIsICJGcmFtZSBsb2FkIGludGVycnVw dGVkIGJ5IHBvbGljeSBjaGFuZ2UiLCAwLCBRQ29yZUFwcGxpY2F0aW9uOjpVbmljb2RlVVRGOCkp OworICAgICAgICAgICAgUUNvcmVBcHBsaWNhdGlvbjo6dHJhbnNsYXRlKCJRV2ViRnJhbWUiLCAi RnJhbWUgbG9hZCBpbnRlcnJ1cHRlZCBieSBwb2xpY3kgY2hhbmdlIiwgMCkpOwogfQogCiBXZWJD b3JlOjpSZXNvdXJjZUVycm9yIEZyYW1lTG9hZGVyQ2xpZW50UXQ6OmNhbm5vdFNob3dNSU1FVHlw ZUVycm9yKGNvbnN0IFdlYkNvcmU6OlJlc291cmNlUmVzcG9uc2UmIHJlc3BvbnNlKQogewogICAg IHJldHVybiBSZXNvdXJjZUVycm9yKCJXZWJLaXRFcnJvckRvbWFpbiIsIFdlYktpdEVycm9yQ2Fu bm90U2hvd01JTUVUeXBlLCByZXNwb25zZS51cmwoKS5zdHJpbmcoKSwKLSAgICAgICAgICAgIFFD b3JlQXBwbGljYXRpb246OnRyYW5zbGF0ZSgiUVdlYkZyYW1lIiwgIkNhbm5vdCBzaG93IG1pbWV0 eXBlIiwgMCwgUUNvcmVBcHBsaWNhdGlvbjo6VW5pY29kZVVURjgpKTsKKyAgICAgICAgICAgIFFD b3JlQXBwbGljYXRpb246OnRyYW5zbGF0ZSgiUVdlYkZyYW1lIiwgIkNhbm5vdCBzaG93IG1pbWV0 eXBlIiwgMCkpOwogfQogCiBXZWJDb3JlOjpSZXNvdXJjZUVycm9yIEZyYW1lTG9hZGVyQ2xpZW50 UXQ6OmZpbGVEb2VzTm90RXhpc3RFcnJvcihjb25zdCBXZWJDb3JlOjpSZXNvdXJjZVJlc3BvbnNl JiByZXNwb25zZSkKIHsKICAgICByZXR1cm4gUmVzb3VyY2VFcnJvcigiUXROZXR3b3JrIiwgUU5l dHdvcmtSZXBseTo6Q29udGVudE5vdEZvdW5kRXJyb3IsIHJlc3BvbnNlLnVybCgpLnN0cmluZygp LAotICAgICAgICAgICAgUUNvcmVBcHBsaWNhdGlvbjo6dHJhbnNsYXRlKCJRV2ViRnJhbWUiLCAi RmlsZSBkb2VzIG5vdCBleGlzdCIsIDAsIFFDb3JlQXBwbGljYXRpb246OlVuaWNvZGVVVEY4KSk7 CisgICAgICAgICAgICBRQ29yZUFwcGxpY2F0aW9uOjp0cmFuc2xhdGUoIlFXZWJGcmFtZSIsICJG aWxlIGRvZXMgbm90IGV4aXN0IiwgMCkpOwogfQogCiBXZWJDb3JlOjpSZXNvdXJjZUVycm9yIEZy YW1lTG9hZGVyQ2xpZW50UXQ6OnBsdWdpbldpbGxIYW5kbGVMb2FkRXJyb3IoY29uc3QgV2ViQ29y ZTo6UmVzb3VyY2VSZXNwb25zZSYgcmVzcG9uc2UpCiB7CiAgICAgcmV0dXJuIFJlc291cmNlRXJy b3IoIldlYktpdCIsIFdlYktpdEVycm9yUGx1Z2luV2lsbEhhbmRsZUxvYWQsIHJlc3BvbnNlLnVy bCgpLnN0cmluZygpLAotICAgICAgICAgICAgICAgICAgICAgICAgIFFDb3JlQXBwbGljYXRpb246 OnRyYW5zbGF0ZSgiUVdlYkZyYW1lIiwgIkxvYWRpbmcgaXMgaGFuZGxlZCBieSB0aGUgbWVkaWEg ZW5naW5lIiwgMCwgUUNvcmVBcHBsaWNhdGlvbjo6VW5pY29kZVVURjgpKTsKKyAgICAgICAgICAg ICAgICAgICAgICAgICBRQ29yZUFwcGxpY2F0aW9uOjp0cmFuc2xhdGUoIlFXZWJGcmFtZSIsICJM b2FkaW5nIGlzIGhhbmRsZWQgYnkgdGhlIG1lZGlhIGVuZ2luZSIsIDApKTsKIH0KIAogYm9vbCBG cmFtZUxvYWRlckNsaWVudFF0OjpzaG91bGRGYWxsQmFjayhjb25zdCBXZWJDb3JlOjpSZXNvdXJj ZUVycm9yJiBlcnJvcikKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvcXQvZGVjbGFyYXRpdmUv ZXhwZXJpbWVudGFsL3BsdWdpbi5jcHAgYi9Tb3VyY2UvV2ViS2l0L3F0L2RlY2xhcmF0aXZlL2V4 cGVyaW1lbnRhbC9wbHVnaW4uY3BwCmluZGV4IDQ5NWIzMDhjNjdkZTI2YjRkMzg2Njk0MTE0YjE5 YmJmYzFiYmIzMzMuLjU2NzQ3NjcwMDc3ZGZkODE3NWZmOGViNWNhZGUyYTQzMTgzZWU0MzkgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvcXQvZGVjbGFyYXRpdmUvZXhwZXJpbWVudGFsL3BsdWdp bi5jcHAKKysrIGIvU291cmNlL1dlYktpdC9xdC9kZWNsYXJhdGl2ZS9leHBlcmltZW50YWwvcGx1 Z2luLmNwcApAQCAtNDMsNyArNDMsNyBAQCBwdWJsaWM6CiAgICAgUVF1aWNrV2ViVmlld0V4cGVy aW1lbnRhbCogZXhwZXJpbWVudGFsKCkgeyByZXR1cm4gc3RhdGljX2Nhc3Q8UVF1aWNrV2ViVmll dyo+KHBhcmVudCgpKS0+ZXhwZXJpbWVudGFsKCk7IH0KIH07CiAKLWNsYXNzIFdlYktpdFFtbEV4 cGVyaW1lbnRhbEV4dGVuc2lvblBsdWdpbjogcHVibGljIFFEZWNsYXJhdGl2ZUV4dGVuc2lvblBs dWdpbiB7CitjbGFzcyBXZWJLaXRRbWxFeHBlcmltZW50YWxFeHRlbnNpb25QbHVnaW46IHB1Ymxp YyBRUW1sRXh0ZW5zaW9uUGx1Z2luIHsKICAgICBRX09CSkVDVAogcHVibGljOgogICAgIHZpcnR1 YWwgdm9pZCByZWdpc3RlclR5cGVzKGNvbnN0IGNoYXIqIHVyaSkKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQvcXQvZGVjbGFyYXRpdmUvcGx1Z2luLmNwcCBiL1NvdXJjZS9XZWJLaXQvcXQvZGVj bGFyYXRpdmUvcGx1Z2luLmNwcAppbmRleCAwODUzMmJmMDFmNmM5NjI1NTZkYjE4OWE5MTllZmJl ZjkyZmU2M2JkLi40OWE0NjJjYjQ1MjNkM2IzYTRmNGYwZTUzOTZlMWQ3MjFhZDc3MWMzIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0L3F0L2RlY2xhcmF0aXZlL3BsdWdpbi5jcHAKKysrIGIvU291 cmNlL1dlYktpdC9xdC9kZWNsYXJhdGl2ZS9wbHVnaW4uY3BwCkBAIC00NCw3ICs0NCwxMSBAQAog CiBRVF9CRUdJTl9OQU1FU1BBQ0UKIAorI2lmIChRVF9WRVJTSU9OID49IFFUX1ZFUlNJT05fQ0hF Q0soNSwgMCwgMCkpCitjbGFzcyBXZWJLaXRRbWxQbHVnaW4gOiBwdWJsaWMgUVFtbEV4dGVuc2lv blBsdWdpbiB7CisjZWxzZQogY2xhc3MgV2ViS2l0UW1sUGx1Z2luIDogcHVibGljIFFEZWNsYXJh dGl2ZUV4dGVuc2lvblBsdWdpbiB7CisjZW5kaWYKICAgICBRX09CSkVDVAogcHVibGljOgogI2lm IGRlZmluZWQoSEFWRV9XRUJLSVQyKQpkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9v bHMvQ2hhbmdlTG9nCmluZGV4IDhhYjVjMDc2ZjQzNmVkODk0MzU2Y2UzMDE3YjFhNjRkY2FjZWVi ODAuLmI4NDZjMzI5ZGJlNjlmZjg5N2Y4Y2E0NzY3NGM1MWZhMjE0OTg2ZWYgMTAwNjQ0Ci0tLSBh L1Rvb2xzL0NoYW5nZUxvZworKysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMiBAQAor MjAxMi0wNS0yMyAgQ3NhYmEgT3N6dHJvZ29uw6FjICA8b3NzeUB3ZWJraXQub3JnPgorCisgICAg ICAgIFtRdF0gQnVpbGRmaXggZm9yIG5ld2VyIFF0NQorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODcyNTcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICAqIE1pbmlCcm93c2VyL3F0L01pbmlCcm93c2VyQXBwbGlj YXRpb24uaDogUXREZWNsYXJhdGl2ZSAtPiBRdFFtbCByZW5hbWluZy4KKwogMjAxMi0wNC0xOCAg VG9yIEFybmUgVmVzdGLDuCAgPHRvci5hcm5lLnZlc3Rib0Bub2tpYS5jb20+CiAKICAgICAgICAg W1F0XSBNYWtlIHRoZSB3ZWIgdmlldydzIHVybCBwcm9wZXJ0eSBmb2xsb3cgdGhlIGFjdGl2ZSB1 cmwKZGlmZiAtLWdpdCBhL1Rvb2xzL01pbmlCcm93c2VyL3F0L01pbmlCcm93c2VyQXBwbGljYXRp b24uaCBiL1Rvb2xzL01pbmlCcm93c2VyL3F0L01pbmlCcm93c2VyQXBwbGljYXRpb24uaAppbmRl eCA2Y2EyYzhmN2ZlMDViNjczYWUwMzcwYjFmMGFkMzZlYjUyOTUyOTQ2Li5lNThjOWExOTY5NWI2 NjliYzNmZWQ2M2YyNmRhM2JlYjdhZThhZTFmIDEwMDY0NAotLS0gYS9Ub29scy9NaW5pQnJvd3Nl ci9xdC9NaW5pQnJvd3NlckFwcGxpY2F0aW9uLmgKKysrIGIvVG9vbHMvTWluaUJyb3dzZXIvcXQv TWluaUJyb3dzZXJBcHBsaWNhdGlvbi5oCkBAIC0zMiw3ICszMiw3IEBACiAjaW5jbHVkZSA8UUhh c2g+CiAjaW5jbHVkZSA8UU9iamVjdD4KICNpbmNsdWRlIDxRU3RyaW5nTGlzdD4KLSNpbmNsdWRl IDxRdERlY2xhcmF0aXZlPgorI2luY2x1ZGUgPFF0UW1sPgogI2luY2x1ZGUgPFFHdWlBcHBsaWNh dGlvbj4KICNpbmNsdWRlIDxRVG91Y2hFdmVudD4KICNpbmNsdWRlIDxRVXJsPgo= 143775 2012-05-24 03:08:17 -0700 2012-05-25 03:34:59 -0700 Patch bug-87257-20120524030815.patch text/plain 10674 ossy U3VidmVyc2lvbiBSZXZpc2lvbjogMTE4MzM4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L3F0 L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nCmluZGV4IDQ2OWRiZWZhODEx MWY0NTRiZmZjNzgyMzc5NGFhNmQ2YjRiYzAzMTYuLjcyZDI2ZGU1YzhmOTVjY2VmZDg1ODJjNDdl YTIyM2IzN2JkN2ZjN2YgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nCisr KyBiL1NvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjcgQEAKKzIwMTItMDUt MjQgIENzYWJhIE9zenRyb2dvbsOhYyAgPG9zc3lAd2Via2l0Lm9yZz4KKworICAgICAgICBbUXRd IEJ1aWxkZml4IGZvciBuZXdlciBRdDUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTg3MjU3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgKiBBcGkvcWdyYXBoaWNzd2Vidmlldy5oOiBRdFdpZGdldHMvcWljb24u aCAtPiBRdEd1aS9xaWNvbi5oIHJlbmFtaW5nLgorICAgICAgICAqIEFwaS9xd2ViZnJhbWUuaDog UXRXaWRnZXRzL3FpY29uLmggLT4gUXRHdWkvcWljb24uaCByZW5hbWluZy4KKyAgICAgICAgKiBB cGkvcXdlYmhpc3RvcnkuaDogUXRXaWRnZXRzL3FpY29uLmggLT4gUXRHdWkvcWljb24uaCByZW5h bWluZy4KKyAgICAgICAgKiBBcGkvcXdlYnNldHRpbmdzLmg6IFF0V2lkZ2V0cy9xaWNvbi5oIC0+ IFF0R3VpL3FpY29uLmggcmVuYW1pbmcuCisgICAgICAgICogQXBpL3F3ZWJ2aWV3Lmg6IFF0V2lk Z2V0cy9xaWNvbi5oIC0+IFF0R3VpL3FpY29uLmggcmVuYW1pbmcuCisgICAgICAgICogV2ViQ29y ZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRRdC5jcHA6IEFkanVzdCBRQ29yZUFwcGxpY2F0aW9u Ojp0cmFuc2xhdGUoKSBwYXJhbWV0ZXIgbGlzdCB0byBuZXdlciBRdCA1LgorICAgICAgICAoV2Vi Q29yZTo6RnJhbWVMb2FkZXJDbGllbnRRdDo6Y2FuY2VsbGVkRXJyb3IpOgorICAgICAgICAoV2Vi Q29yZTo6RnJhbWVMb2FkZXJDbGllbnRRdDo6YmxvY2tlZEVycm9yKToKKyAgICAgICAgKFdlYkNv cmU6OkZyYW1lTG9hZGVyQ2xpZW50UXQ6OmNhbm5vdFNob3dVUkxFcnJvcik6CisgICAgICAgIChX ZWJDb3JlOjpGcmFtZUxvYWRlckNsaWVudFF0OjppbnRlcnJ1cHRlZEZvclBvbGljeUNoYW5nZUVy cm9yKToKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lTG9hZGVyQ2xpZW50UXQ6OmNhbm5vdFNob3dN SU1FVHlwZUVycm9yKToKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lTG9hZGVyQ2xpZW50UXQ6OmZp bGVEb2VzTm90RXhpc3RFcnJvcik6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRlckNsaWVu dFF0OjpwbHVnaW5XaWxsSGFuZGxlTG9hZEVycm9yKToKKyAgICAgICAgKiBkZWNsYXJhdGl2ZS9l eHBlcmltZW50YWwvcGx1Z2luLmNwcDogUURlY2xhcmF0aXZlRXh0ZW5zaW9uUGx1Z2luIC0+IFFR bWxFeHRlbnNpb25QbHVnaW4gcmVuYW1pbmcuCisgICAgICAgICogZGVjbGFyYXRpdmUvcGx1Z2lu LmNwcDogUURlY2xhcmF0aXZlRXh0ZW5zaW9uUGx1Z2luIC0+IFFRbWxFeHRlbnNpb25QbHVnaW4g cmVuYW1pbmcuCisgICAgICAgIChXZWJLaXRRbWxQbHVnaW4pOgorCiAyMDEyLTA1LTIxICBDYWlv IE1hcmNlbG8gZGUgT2xpdmVpcmEgRmlsaG8gIDxjYWlvLm9saXZlaXJhQG9wZW5ib3NzYS5vcmc+ CiAKICAgICAgICAgTW92ZSBzZXRFZGl0aW5nQmVoYXZpb3IoKSBmcm9tIGxheW91dFRlc3RDb250 cm9sbGVyIHRvIHdpbmRvdy5pbnRlcm5hbHMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvcXQv QXBpL3FncmFwaGljc3dlYnZpZXcuaCBiL1NvdXJjZS9XZWJLaXQvcXQvQXBpL3FncmFwaGljc3dl YnZpZXcuaAppbmRleCAyOWU3ZmZkYWNkZmVlYzQ3YjAyYWViNTRkN2VlYWUzODY0ODNjMjM0Li4x NWZlMDg3ZDYxOTcwYTFhYmIxM2M2NGIyNDdmOGM1YTk5NzE1NGEwIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0L3F0L0FwaS9xZ3JhcGhpY3N3ZWJ2aWV3LmgKKysrIGIvU291cmNlL1dlYktpdC9x dC9BcGkvcWdyYXBoaWNzd2Vidmlldy5oCkBAIC0yNSwxMiArMjUsMTEgQEAKICNpbmNsdWRlIDxR dENvcmUvcXVybC5oPgogI2lmIFFUX1ZFUlNJT04gPj0gUVRfVkVSU0lPTl9DSEVDSyg1LCAwLCAw KQogI2luY2x1ZGUgPFF0V2lkZ2V0cy9xZ3JhcGhpY3N3aWRnZXQuaD4KLSNpbmNsdWRlIDxRdFdp ZGdldHMvcWljb24uaD4KICNlbHNlCiAjaW5jbHVkZSA8UXRHdWkvcWdyYXBoaWNzd2lkZ2V0Lmg+ Ci0jaW5jbHVkZSA8UXRHdWkvcWljb24uaD4KICNlbmRpZgogI2luY2x1ZGUgPFF0R3VpL3FldmVu dC5oPgorI2luY2x1ZGUgPFF0R3VpL3FpY29uLmg+CiAjaW5jbHVkZSA8UXRHdWkvcXBhaW50ZXIu aD4KICNpbmNsdWRlIDxRdE5ldHdvcmsvcW5ldHdvcmthY2Nlc3NtYW5hZ2VyLmg+CiAKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQvcXQvQXBpL3F3ZWJmcmFtZS5oIGIvU291cmNlL1dlYktpdC9x dC9BcGkvcXdlYmZyYW1lLmgKaW5kZXggZmYxNTc3NzFmMGJmNDkzNmEwMTQzMWVmNDQzNWEyMDBk YWFkNzVkOC4uMGE4ZTZmYzY1ZmU2NjA5OWIyMWI2YzI1OGIzMmJiOWVkZWI4NDZjNiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdC9xdC9BcGkvcXdlYmZyYW1lLmgKKysrIGIvU291cmNlL1dlYktp dC9xdC9BcGkvcXdlYmZyYW1lLmgKQEAgLTI0LDExICsyNCw3IEBACiAjaW5jbHVkZSA8UXRDb3Jl L3FvYmplY3QuaD4KICNpbmNsdWRlIDxRdENvcmUvcXVybC5oPgogI2luY2x1ZGUgPFF0Q29yZS9x dmFyaWFudC5oPgotI2lmIFFUX1ZFUlNJT04gPj0gUVRfVkVSU0lPTl9DSEVDSyg1LCAwLCAwKQot I2luY2x1ZGUgPFF0V2lkZ2V0cy9xaWNvbi5oPgotI2Vsc2UKICNpbmNsdWRlIDxRdEd1aS9xaWNv bi5oPgotI2VuZGlmCiAjaW5jbHVkZSA8UXRTY3JpcHQvcXNjcmlwdGVuZ2luZS5oPgogI2luY2x1 ZGUgPFF0TmV0d29yay9xbmV0d29ya2FjY2Vzc21hbmFnZXIuaD4KICNpbmNsdWRlICJxd2Via2l0 Z2xvYmFsLmgiCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L3F0L0FwaS9xd2ViaGlzdG9yeS5o IGIvU291cmNlL1dlYktpdC9xdC9BcGkvcXdlYmhpc3RvcnkuaAppbmRleCAwZDU5MDQxNGU5Y2Ni MTEzODRkYjQwNjc3YTJkNWJmMDJlYjk3MjJhLi43NTNlYjYzNzZkZDViZGFmMGZjNzI2MWUxNzU0 MzU2NzBlMjdjOWUyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L3F0L0FwaS9xd2ViaGlzdG9y eS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvcXQvQXBpL3F3ZWJoaXN0b3J5LmgKQEAgLTI0LDExICsy NCw3IEBACiAjaW5jbHVkZSA8UXRDb3JlL3FzdHJpbmcuaD4KICNpbmNsdWRlIDxRdENvcmUvcWRh dGV0aW1lLmg+CiAjaW5jbHVkZSA8UXRDb3JlL3FzaGFyZWRkYXRhLmg+Ci0jaWYgUVRfVkVSU0lP TiA+PSBRVF9WRVJTSU9OX0NIRUNLKDUsIDAsIDApCi0jaW5jbHVkZSA8UXRXaWRnZXRzL3FpY29u Lmg+Ci0jZWxzZQogI2luY2x1ZGUgPFF0R3VpL3FpY29uLmg+Ci0jZW5kaWYKIAogI2luY2x1ZGUg InF3ZWJraXRnbG9iYWwuaCIKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9xdC9BcGkvcXdl YnNldHRpbmdzLmggYi9Tb3VyY2UvV2ViS2l0L3F0L0FwaS9xd2Vic2V0dGluZ3MuaAppbmRleCAx MzZlZThkYzQzODVhMGM5MGNjYjdlYWViMzA4YjM5MjE0OWJiZjJlLi4wYWVlNTI1YjBkZTRhMzU3 NjZlMjVlM2Y4MWEzZGM1ZTM3Y2FlMzAwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L3F0L0Fw aS9xd2Vic2V0dGluZ3MuaAorKysgYi9Tb3VyY2UvV2ViS2l0L3F0L0FwaS9xd2Vic2V0dGluZ3Mu aApAQCAtMjQsMTEgKzI0LDcgQEAKIAogI2luY2x1ZGUgPFF0Q29yZS9xc3RyaW5nLmg+CiAjaW5j bHVkZSA8UXRHdWkvcXBpeG1hcC5oPgotI2lmIFFUX1ZFUlNJT04gPj0gUVRfVkVSU0lPTl9DSEVD Syg1LCAwLCAwKQotI2luY2x1ZGUgPFF0V2lkZ2V0cy9xaWNvbi5oPgotI2Vsc2UKICNpbmNsdWRl IDxRdEd1aS9xaWNvbi5oPgotI2VuZGlmCiAjaW5jbHVkZSA8UXRDb3JlL3FzaGFyZWRkYXRhLmg+ CiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvcXQvQXBp L3F3ZWJ2aWV3LmggYi9Tb3VyY2UvV2ViS2l0L3F0L0FwaS9xd2Vidmlldy5oCmluZGV4IDA3ZTMw ZDM5MTAyMWIzYTU0MWNhYTY4YTFiM2YzZmNlOTE2MjY3ODAuLjkwZDBhOGUzYjIwNzE0ZWNlYjFl MTgyMzJiOTQwMGFkYzQzNTczNDAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvcXQvQXBpL3F3 ZWJ2aWV3LmgKKysrIGIvU291cmNlL1dlYktpdC9xdC9BcGkvcXdlYnZpZXcuaApAQCAtMjUsMTEg KzI1LDEwIEBACiAjaW5jbHVkZSAicXdlYnBhZ2UuaCIKICNpZiBRVF9WRVJTSU9OID49IFFUX1ZF UlNJT05fQ0hFQ0soNSwgMCwgMCkKICNpbmNsdWRlIDxRdFdpZGdldHMvcXdpZGdldC5oPgotI2lu Y2x1ZGUgPFF0V2lkZ2V0cy9xaWNvbi5oPgogI2Vsc2UKICNpbmNsdWRlIDxRdEd1aS9xd2lkZ2V0 Lmg+Ci0jaW5jbHVkZSA8UXRHdWkvcWljb24uaD4KICNlbmRpZgorI2luY2x1ZGUgPFF0R3VpL3Fp Y29uLmg+CiAjaW5jbHVkZSA8UXRHdWkvcXBhaW50ZXIuaD4KICNpbmNsdWRlIDxRdENvcmUvcXVy bC5oPgogI2luY2x1ZGUgPFF0TmV0d29yay9xbmV0d29ya2FjY2Vzc21hbmFnZXIuaD4KZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRR dC5jcHAgYi9Tb3VyY2UvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50 UXQuY3BwCmluZGV4IGMyMzMxMWRhYTQyM2M3ZmVkYWIyZWJkYjgxMGFkN2Y1ZTRhMWZkMGYuLmU4 MTZiOWYyMWIzODE5ODA0ODhjN2QxYmU5MjUzODc4ZjM3ODRlNDQgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRRdC5jcHAKKysrIGIv U291cmNlL1dlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudFF0LmNwcApA QCAtOTA5LDcgKzkwOSw3IEBAIHZvaWQgRnJhbWVMb2FkZXJDbGllbnRRdDo6Y29tbWl0dGVkTG9h ZChXZWJDb3JlOjpEb2N1bWVudExvYWRlciogbG9hZGVyLCBjb25zdCBjCiBXZWJDb3JlOjpSZXNv dXJjZUVycm9yIEZyYW1lTG9hZGVyQ2xpZW50UXQ6OmNhbmNlbGxlZEVycm9yKGNvbnN0IFdlYkNv cmU6OlJlc291cmNlUmVxdWVzdCYgcmVxdWVzdCkKIHsKICAgICBSZXNvdXJjZUVycm9yIGVycm9y ID0gUmVzb3VyY2VFcnJvcigiUXROZXR3b3JrIiwgUU5ldHdvcmtSZXBseTo6T3BlcmF0aW9uQ2Fu Y2VsZWRFcnJvciwgcmVxdWVzdC51cmwoKS5zdHJpbmcoKSwKLSAgICAgICAgICAgIFFDb3JlQXBw bGljYXRpb246OnRyYW5zbGF0ZSgiUVdlYkZyYW1lIiwgIlJlcXVlc3QgY2FuY2VsbGVkIiwgMCwg UUNvcmVBcHBsaWNhdGlvbjo6VW5pY29kZVVURjgpKTsKKyAgICAgICAgICAgIFFDb3JlQXBwbGlj YXRpb246OnRyYW5zbGF0ZSgiUVdlYkZyYW1lIiwgIlJlcXVlc3QgY2FuY2VsbGVkIiwgMCkpOwog ICAgIGVycm9yLnNldElzQ2FuY2VsbGF0aW9uKHRydWUpOwogICAgIHJldHVybiBlcnJvcjsKIH0K QEAgLTkyOSwzOCArOTI5LDM4IEBAIGVudW0gewogV2ViQ29yZTo6UmVzb3VyY2VFcnJvciBGcmFt ZUxvYWRlckNsaWVudFF0OjpibG9ja2VkRXJyb3IoY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VSZXF1 ZXN0JiByZXF1ZXN0KQogewogICAgIHJldHVybiBSZXNvdXJjZUVycm9yKCJXZWJLaXRFcnJvckRv bWFpbiIsIFdlYktpdEVycm9yQ2Fubm90VXNlUmVzdHJpY3RlZFBvcnQsIHJlcXVlc3QudXJsKCku c3RyaW5nKCksCi0gICAgICAgICAgICBRQ29yZUFwcGxpY2F0aW9uOjp0cmFuc2xhdGUoIlFXZWJG cmFtZSIsICJSZXF1ZXN0IGJsb2NrZWQiLCAwLCBRQ29yZUFwcGxpY2F0aW9uOjpVbmljb2RlVVRG OCkpOworICAgICAgICAgICAgUUNvcmVBcHBsaWNhdGlvbjo6dHJhbnNsYXRlKCJRV2ViRnJhbWUi LCAiUmVxdWVzdCBibG9ja2VkIiwgMCkpOwogfQogCiAKIFdlYkNvcmU6OlJlc291cmNlRXJyb3Ig RnJhbWVMb2FkZXJDbGllbnRRdDo6Y2Fubm90U2hvd1VSTEVycm9yKGNvbnN0IFdlYkNvcmU6OlJl c291cmNlUmVxdWVzdCYgcmVxdWVzdCkKIHsKICAgICByZXR1cm4gUmVzb3VyY2VFcnJvcigiV2Vi S2l0RXJyb3JEb21haW4iLCBXZWJLaXRFcnJvckNhbm5vdFNob3dVUkwsIHJlcXVlc3QudXJsKCku c3RyaW5nKCksCi0gICAgICAgICAgICBRQ29yZUFwcGxpY2F0aW9uOjp0cmFuc2xhdGUoIlFXZWJG cmFtZSIsICJDYW5ub3Qgc2hvdyBVUkwiLCAwLCBRQ29yZUFwcGxpY2F0aW9uOjpVbmljb2RlVVRG OCkpOworICAgICAgICAgICAgUUNvcmVBcHBsaWNhdGlvbjo6dHJhbnNsYXRlKCJRV2ViRnJhbWUi LCAiQ2Fubm90IHNob3cgVVJMIiwgMCkpOwogfQogCiBXZWJDb3JlOjpSZXNvdXJjZUVycm9yIEZy YW1lTG9hZGVyQ2xpZW50UXQ6OmludGVycnVwdGVkRm9yUG9saWN5Q2hhbmdlRXJyb3IoY29uc3Qg V2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0JiByZXF1ZXN0KQogewogICAgIHJldHVybiBSZXNvdXJj ZUVycm9yKCJXZWJLaXRFcnJvckRvbWFpbiIsIFdlYktpdEVycm9yRnJhbWVMb2FkSW50ZXJydXB0 ZWRCeVBvbGljeUNoYW5nZSwgcmVxdWVzdC51cmwoKS5zdHJpbmcoKSwKLSAgICAgICAgICAgIFFD b3JlQXBwbGljYXRpb246OnRyYW5zbGF0ZSgiUVdlYkZyYW1lIiwgIkZyYW1lIGxvYWQgaW50ZXJy dXB0ZWQgYnkgcG9saWN5IGNoYW5nZSIsIDAsIFFDb3JlQXBwbGljYXRpb246OlVuaWNvZGVVVEY4 KSk7CisgICAgICAgICAgICBRQ29yZUFwcGxpY2F0aW9uOjp0cmFuc2xhdGUoIlFXZWJGcmFtZSIs ICJGcmFtZSBsb2FkIGludGVycnVwdGVkIGJ5IHBvbGljeSBjaGFuZ2UiLCAwKSk7CiB9CiAKIFdl YkNvcmU6OlJlc291cmNlRXJyb3IgRnJhbWVMb2FkZXJDbGllbnRRdDo6Y2Fubm90U2hvd01JTUVU eXBlRXJyb3IoY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VSZXNwb25zZSYgcmVzcG9uc2UpCiB7CiAg ICAgcmV0dXJuIFJlc291cmNlRXJyb3IoIldlYktpdEVycm9yRG9tYWluIiwgV2ViS2l0RXJyb3JD YW5ub3RTaG93TUlNRVR5cGUsIHJlc3BvbnNlLnVybCgpLnN0cmluZygpLAotICAgICAgICAgICAg UUNvcmVBcHBsaWNhdGlvbjo6dHJhbnNsYXRlKCJRV2ViRnJhbWUiLCAiQ2Fubm90IHNob3cgbWlt ZXR5cGUiLCAwLCBRQ29yZUFwcGxpY2F0aW9uOjpVbmljb2RlVVRGOCkpOworICAgICAgICAgICAg UUNvcmVBcHBsaWNhdGlvbjo6dHJhbnNsYXRlKCJRV2ViRnJhbWUiLCAiQ2Fubm90IHNob3cgbWlt ZXR5cGUiLCAwKSk7CiB9CiAKIFdlYkNvcmU6OlJlc291cmNlRXJyb3IgRnJhbWVMb2FkZXJDbGll bnRRdDo6ZmlsZURvZXNOb3RFeGlzdEVycm9yKGNvbnN0IFdlYkNvcmU6OlJlc291cmNlUmVzcG9u c2UmIHJlc3BvbnNlKQogewogICAgIHJldHVybiBSZXNvdXJjZUVycm9yKCJRdE5ldHdvcmsiLCBR TmV0d29ya1JlcGx5OjpDb250ZW50Tm90Rm91bmRFcnJvciwgcmVzcG9uc2UudXJsKCkuc3RyaW5n KCksCi0gICAgICAgICAgICBRQ29yZUFwcGxpY2F0aW9uOjp0cmFuc2xhdGUoIlFXZWJGcmFtZSIs ICJGaWxlIGRvZXMgbm90IGV4aXN0IiwgMCwgUUNvcmVBcHBsaWNhdGlvbjo6VW5pY29kZVVURjgp KTsKKyAgICAgICAgICAgIFFDb3JlQXBwbGljYXRpb246OnRyYW5zbGF0ZSgiUVdlYkZyYW1lIiwg IkZpbGUgZG9lcyBub3QgZXhpc3QiLCAwKSk7CiB9CiAKIFdlYkNvcmU6OlJlc291cmNlRXJyb3Ig RnJhbWVMb2FkZXJDbGllbnRRdDo6cGx1Z2luV2lsbEhhbmRsZUxvYWRFcnJvcihjb25zdCBXZWJD b3JlOjpSZXNvdXJjZVJlc3BvbnNlJiByZXNwb25zZSkKIHsKICAgICByZXR1cm4gUmVzb3VyY2VF cnJvcigiV2ViS2l0IiwgV2ViS2l0RXJyb3JQbHVnaW5XaWxsSGFuZGxlTG9hZCwgcmVzcG9uc2Uu dXJsKCkuc3RyaW5nKCksCi0gICAgICAgICAgICAgICAgICAgICAgICAgUUNvcmVBcHBsaWNhdGlv bjo6dHJhbnNsYXRlKCJRV2ViRnJhbWUiLCAiTG9hZGluZyBpcyBoYW5kbGVkIGJ5IHRoZSBtZWRp YSBlbmdpbmUiLCAwLCBRQ29yZUFwcGxpY2F0aW9uOjpVbmljb2RlVVRGOCkpOworICAgICAgICAg ICAgICAgICAgICAgICAgIFFDb3JlQXBwbGljYXRpb246OnRyYW5zbGF0ZSgiUVdlYkZyYW1lIiwg IkxvYWRpbmcgaXMgaGFuZGxlZCBieSB0aGUgbWVkaWEgZW5naW5lIiwgMCkpOwogfQogCiBib29s IEZyYW1lTG9hZGVyQ2xpZW50UXQ6OnNob3VsZEZhbGxCYWNrKGNvbnN0IFdlYkNvcmU6OlJlc291 cmNlRXJyb3ImIGVycm9yKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9xdC9kZWNsYXJhdGl2 ZS9leHBlcmltZW50YWwvcGx1Z2luLmNwcCBiL1NvdXJjZS9XZWJLaXQvcXQvZGVjbGFyYXRpdmUv ZXhwZXJpbWVudGFsL3BsdWdpbi5jcHAKaW5kZXggNDk1YjMwOGM2N2RlMjZiNGQzODY2OTQxMTRi MTliYmZjMWJiYjMzMy4uNTY3NDc2NzAwNzdkZmQ4MTc1ZmY4ZWI1Y2FkZTJhNDMxODNlZTQzOSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9xdC9kZWNsYXJhdGl2ZS9leHBlcmltZW50YWwvcGx1 Z2luLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L3F0L2RlY2xhcmF0aXZlL2V4cGVyaW1lbnRhbC9w bHVnaW4uY3BwCkBAIC00Myw3ICs0Myw3IEBAIHB1YmxpYzoKICAgICBRUXVpY2tXZWJWaWV3RXhw ZXJpbWVudGFsKiBleHBlcmltZW50YWwoKSB7IHJldHVybiBzdGF0aWNfY2FzdDxRUXVpY2tXZWJW aWV3Kj4ocGFyZW50KCkpLT5leHBlcmltZW50YWwoKTsgfQogfTsKIAotY2xhc3MgV2ViS2l0UW1s RXhwZXJpbWVudGFsRXh0ZW5zaW9uUGx1Z2luOiBwdWJsaWMgUURlY2xhcmF0aXZlRXh0ZW5zaW9u UGx1Z2luIHsKK2NsYXNzIFdlYktpdFFtbEV4cGVyaW1lbnRhbEV4dGVuc2lvblBsdWdpbjogcHVi bGljIFFRbWxFeHRlbnNpb25QbHVnaW4gewogICAgIFFfT0JKRUNUCiBwdWJsaWM6CiAgICAgdmly dHVhbCB2b2lkIHJlZ2lzdGVyVHlwZXMoY29uc3QgY2hhciogdXJpKQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdC9xdC9kZWNsYXJhdGl2ZS9wbHVnaW4uY3BwIGIvU291cmNlL1dlYktpdC9xdC9k ZWNsYXJhdGl2ZS9wbHVnaW4uY3BwCmluZGV4IDA4NTMyYmYwMWY2Yzk2MjU1NmRiMTg5YTkxOWVm YmVmOTJmZTYzYmQuLmY4YzUzMmEwNjJhZjgyNTdmYzQ0MDA2NDc1MjJjYjU5ODY4ZjNiNzYgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvcXQvZGVjbGFyYXRpdmUvcGx1Z2luLmNwcAorKysgYi9T b3VyY2UvV2ViS2l0L3F0L2RlY2xhcmF0aXZlL3BsdWdpbi5jcHAKQEAgLTQ0LDcgKzQ0LDExIEBA CiAKIFFUX0JFR0lOX05BTUVTUEFDRQogCisjaWYgUVRfVkVSU0lPTiA+PSAweDA1MDAwMAorY2xh c3MgV2ViS2l0UW1sUGx1Z2luIDogcHVibGljIFFRbWxFeHRlbnNpb25QbHVnaW4geworI2Vsc2UK IGNsYXNzIFdlYktpdFFtbFBsdWdpbiA6IHB1YmxpYyBRRGVjbGFyYXRpdmVFeHRlbnNpb25QbHVn aW4geworI2VuZGlmCiAgICAgUV9PQkpFQ1QKIHB1YmxpYzoKICNpZiBkZWZpbmVkKEhBVkVfV0VC S0lUMikKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRl eCA2M2M1NzhlZDlkY2E3YWZmNWFlOTRjYTNlNTAyODY1MDFkMjlhOWFjLi43YmFiYjY2YmVjNGIw MWMwZjU2MDFjNTA3OGUzZTRkYWU1OTllMzlhIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cK KysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTQgQEAKIDIwMTItMDUtMjQgIENzYWJh IE9zenRyb2dvbsOhYyAgPG9zc3lAd2Via2l0Lm9yZz4KIAorICAgICAgICBbUXRdIEJ1aWxkZml4 IGZvciBuZXdlciBRdDUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTg3MjU3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgKiBNaW5pQnJvd3Nlci9xdC9NaW5pQnJvd3NlckFwcGxpY2F0aW9uLmg6IFF0RGVjbGFy YXRpdmUgLT4gUXRRbWwgcmVuYW1pbmcuCisKKzIwMTItMDUtMjQgIENzYWJhIE9zenRyb2dvbsOh YyAgPG9zc3lAd2Via2l0Lm9yZz4KKwogICAgICAgICBbUXRdIFVucmV2aWV3ZWQgZml4LCBhZGQg RU5BQkxFX0NTUzNfRkxFWEJPWCBhZnRlciByMTE4MzA0LgogCiAgICAgICAgICogcW1ha2UvbWtz cGVjcy9mZWF0dXJlcy9mZWF0dXJlcy5wcmk6CmRpZmYgLS1naXQgYS9Ub29scy9NaW5pQnJvd3Nl ci9xdC9NaW5pQnJvd3NlckFwcGxpY2F0aW9uLmggYi9Ub29scy9NaW5pQnJvd3Nlci9xdC9NaW5p QnJvd3NlckFwcGxpY2F0aW9uLmgKaW5kZXggNmNhMmM4ZjdmZTA1YjY3M2FlMDM3MGIxZjBhZDM2 ZWI1Mjk1Mjk0Ni4uZTU4YzlhMTk2OTViNjY5YmMzZmVkNjNmMjZkYTNiZWI3YWU4YWUxZiAxMDA2 NDQKLS0tIGEvVG9vbHMvTWluaUJyb3dzZXIvcXQvTWluaUJyb3dzZXJBcHBsaWNhdGlvbi5oCisr KyBiL1Rvb2xzL01pbmlCcm93c2VyL3F0L01pbmlCcm93c2VyQXBwbGljYXRpb24uaApAQCAtMzIs NyArMzIsNyBAQAogI2luY2x1ZGUgPFFIYXNoPgogI2luY2x1ZGUgPFFPYmplY3Q+CiAjaW5jbHVk ZSA8UVN0cmluZ0xpc3Q+Ci0jaW5jbHVkZSA8UXREZWNsYXJhdGl2ZT4KKyNpbmNsdWRlIDxRdFFt bD4KICNpbmNsdWRlIDxRR3VpQXBwbGljYXRpb24+CiAjaW5jbHVkZSA8UVRvdWNoRXZlbnQ+CiAj aW5jbHVkZSA8UVVybD4K