69162 2011-09-30 12:43:37 -0700 [Qt] Build fix: Qt::escape is deprecated in Qt5 2011-10-03 08:58:52 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 69206 1 pierre.rossi pierre.rossi menard ossy webkit.review.bot oldest_to_newest 476254 0 pierre.rossi 2011-09-30 12:43:37 -0700 [Qt] Build fix: Qt::escape is deprecated in Qt5 476267 1 109332 pierre.rossi 2011-09-30 12:59:05 -0700 Created attachment 109332 Patch 476281 2 109332 kling 2011-09-30 13:28:10 -0700 Comment on attachment 109332 Patch r=me 476292 3 109332 webkit.review.bot 2011-09-30 13:46:49 -0700 Comment on attachment 109332 Patch Clearing flags on attachment: 109332 Committed r96421: <http://trac.webkit.org/changeset/96421> 476293 4 webkit.review.bot 2011-09-30 13:46:53 -0700 All reviewed patches have been landed. Closing bug. 476546 5 ossy 2011-09-30 23:47:41 -0700 It broke the WK2 bot ... :-/ In file included from /ramdisk/qt-linux-32-release-webkit2/build/Source/WebKit/qt/WebCoreSupport/ChromeClientQt.cpp:79: /ramdisk/qt-linux-32-release-webkit2/build/Source/JavaScriptCore/wtf/qt/UtilsQt.h: In function ‘QString escapeHtml(const QString&)’: /ramdisk/qt-linux-32-release-webkit2/build/Source/JavaScriptCore/wtf/qt/UtilsQt.h:31: error: ‘const class QString’ has no member named ‘toHtmlEscaped’ 476547 6 ossy 2011-09-30 23:47:54 -0700 Reopen to fix it ... 476549 7 ossy 2011-10-01 00:10:57 -0700 Guys, what kind of Qt5 branch do you use? I updated Qt5 yesterday and "toHtmlEscaped" isn't exist in it. 476558 8 ossy 2011-10-01 00:23:12 -0700 Rolled out by http://trac.webkit.org/changeset/96455 to make WK2 bot happier to be able catch regressions on WebKit trunk. 476562 9 pierre.rossi 2011-10-01 00:57:14 -0700 My bad, I guess I should have put commit-queue: - on this one. The commit is on the public gitorious though: http://qt.gitorious.org/qt/qtbase/commit/b863df7de926448cf0057272c16da04b7cfb11ee 476929 10 menard 2011-10-03 05:58:58 -0700 (In reply to comment #9) > My bad, I guess I should have put commit-queue: - on this one. > > The commit is on the public gitorious though: http://qt.gitorious.org/qt/qtbase/commit/b863df7de926448cf0057272c16da04b7cfb11ee It is on the public gitorious on *master*. What we track is the stable combination in Qt5, which the CI sha keys, the one you have when you use the Qt5 repo and init-repository, the one you get with git pull and git submodule update. Now It went through the CI we can land it. 476932 11 109478 menard 2011-10-03 06:04:39 -0700 Created attachment 109478 Patch for landing 476937 12 109478 ossy 2011-10-03 06:13:38 -0700 Comment on attachment 109478 Patch for landing We shouldn't land it before updating the buildbot ... :S 476987 13 109478 ossy 2011-10-03 08:26:39 -0700 Comment on attachment 109478 Patch for landing Let's go ahead. And I'll update Qt on the bot ASAP. 477007 14 ossy 2011-10-03 08:58:12 -0700 Landed manually in http://trac.webkit.org/changeset/96503 (And I updated the buildbot too.) 477008 15 109478 ossy 2011-10-03 08:58:52 -0700 Comment on attachment 109478 Patch for landing View in context: https://bugs.webkit.org/attachment.cgi?id=109478&action=review I fixed the changelog before landing .... > Source/JavaScriptCore/ChangeLog:8 > + Reviewed by Andreas. Reviewed by Andreas Kling. > Source/WebCore/ChangeLog:8 > + Reviewed by Andreas. Reviewed by Andreas. 109332 2011-09-30 12:59:05 -0700 2011-10-03 06:04:32 -0700 Patch bug-69162-20110930220002.patch text/plain 8818 pierre.rossi U3VidmVyc2lvbiBSZXZpc2lvbjogOTY0MDIKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0 Q29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCmluZGV4IDlk MWQ2YWU0NTA0Y2QwNTE0ZjJmODU3OTFmODVmZjYxOGM4NGI4Y2MuLjNkNzRlMjc1Zjc3ZDExMDgy NGRmZDFjNTM2OTdjNjk5N2QxMDBjNWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwpAQCAtMSw1 ICsxLDE5IEBACiAyMDExLTA5LTMwICBQaWVycmUgUm9zc2kgIDxwaWVycmUucm9zc2lAZ21haWwu Y29tPgogCisgICAgICAgIFtRdF0gQnVpbGQgZml4OiBRdDo6ZXNjYXBlIGlzIGRlcHJlY2F0ZWQg aW4gUXQ1CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02 OTE2MgorCisgICAgICAgIFVzZSBRU3RyaW5nOjp0b0h0bWxFc2NhcGVkIGluIHRoZSBRdDUgY2Fz ZS4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIEph dmFTY3JpcHRDb3JlLnByaToKKyAgICAgICAgKiB3dGYvcXQvVXRpbHNRdC5oOiBBZGRlZC4KKyAg ICAgICAgKGVzY2FwZUh0bWwpOgorICAgICAgICAqIHd0Zi93dGYucHJpOgorCisyMDExLTA5LTMw ICBQaWVycmUgUm9zc2kgIDxwaWVycmUucm9zc2lAZ21haWwuY29tPgorCiAgICAgICAgIFtRdF0g d3RmIGhlYWRlciBmaWxlcyBhcmUgdW5rbm93biB0byBRdCBDcmVhdG9yCiAgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02OTE1OAogCmRpZmYgLS1naXQgYS9T b3VyY2UvSmF2YVNjcmlwdENvcmUvSmF2YVNjcmlwdENvcmUucHJpIGIvU291cmNlL0phdmFTY3Jp cHRDb3JlL0phdmFTY3JpcHRDb3JlLnByaQppbmRleCA2MThlZTA4ZTlmYTA0YzJiZjVjYjMzODRi YzJjNmI1MDM1OTM3MTk2Li4zZGI0YzA2NTQxY2RmNGRkYWE1ODg4MmNhYzc4NThmMTc0YWFiYTU4 IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvSmF2YVNjcmlwdENvcmUucHJpCisr KyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9KYXZhU2NyaXB0Q29yZS5wcmkKQEAgLTMzLDYgKzMz LDcgQEAgSkFWQVNDUklQVENPUkVfSU5DTFVERVBBVEggPSBcCiAgICAgJCRQV0QvcnVudGltZSBc CiAgICAgJCRQV0Qvd3RmIFwKICAgICAkJFBXRC93dGYvZ29iamVjdCBcCisgICAgJCRQV0Qvd3Rm L3F0IFwKICAgICAkJFBXRC93dGYvc3ltYmlhbiBcCiAgICAgJCRQV0Qvd3RmL3VuaWNvZGUgXAog ICAgICQkUFdEL3lhcnIgXApkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3d0Zi9x dC9VdGlsc1F0LmggYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvd3RmL3F0L1V0aWxzUXQuaApuZXcg ZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwLi43NDA2N2E4ZWViNGU2YTQ0OWQxOWE3MTMzZjdlNmIzZjk1YTVkZTYwCi0tLSAvZGV2 L251bGwKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3d0Zi9xdC9VdGlsc1F0LmgKQEAgLTAs MCArMSwzNyBAQAorLyoKKyAgICBDb3B5cmlnaHQgKEMpIDIwMTEgTm9raWEgQ29ycG9yYXRpb24g YW5kL29yIGl0cyBzdWJzaWRpYXJ5KC1pZXMpCisKKyAgICBUaGlzIGxpYnJhcnkgaXMgZnJlZSBz b2Z0d2FyZTsgeW91IGNhbiByZWRpc3RyaWJ1dGUgaXQgYW5kL29yCisgICAgbW9kaWZ5IGl0IHVu ZGVyIHRoZSB0ZXJtcyBvZiB0aGUgR05VIExpYnJhcnkgR2VuZXJhbCBQdWJsaWMKKyAgICBMaWNl bnNlIGFzIHB1Ymxpc2hlZCBieSB0aGUgRnJlZSBTb2Z0d2FyZSBGb3VuZGF0aW9uOyBlaXRoZXIK KyAgICB2ZXJzaW9uIDIgb2YgdGhlIExpY2Vuc2UsIG9yIChhdCB5b3VyIG9wdGlvbikgYW55IGxh dGVyIHZlcnNpb24uCisKKyAgICBUaGlzIGxpYnJhcnkgaXMgZGlzdHJpYnV0ZWQgaW4gdGhlIGhv cGUgdGhhdCBpdCB3aWxsIGJlIHVzZWZ1bCwKKyAgICBidXQgV0lUSE9VVCBBTlkgV0FSUkFOVFk7 IHdpdGhvdXQgZXZlbiB0aGUgaW1wbGllZCB3YXJyYW50eSBvZgorICAgIE1FUkNIQU5UQUJJTElU WSBvciBGSVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIgUFVSUE9TRS4gIFNlZSB0aGUgR05VCisgICAg TGlicmFyeSBHZW5lcmFsIFB1YmxpYyBMaWNlbnNlIGZvciBtb3JlIGRldGFpbHMuCisKKyAgICBZ b3Ugc2hvdWxkIGhhdmUgcmVjZWl2ZWQgYSBjb3B5IG9mIHRoZSBHTlUgTGlicmFyeSBHZW5lcmFs IFB1YmxpYyBMaWNlbnNlCisgICAgYWxvbmcgd2l0aCB0aGlzIGxpYnJhcnk7IHNlZSB0aGUgZmls ZSBDT1BZSU5HLkxJQi4gIElmIG5vdCwgd3JpdGUgdG8KKyAgICB0aGUgRnJlZSBTb2Z0d2FyZSBG b3VuZGF0aW9uLCBJbmMuLCA1MSBGcmFua2xpbiBTdHJlZXQsIEZpZnRoIEZsb29yLAorICAgIEJv c3RvbiwgTUEgMDIxMTAtMTMwMSwgVVNBLgorKi8KKworI2lmbmRlZiBXVEZfVXRpbHNRdF9oCisj ZGVmaW5lIFdURl9VdGlsc1F0X2gKKworI2luY2x1ZGUgPFFTdHJpbmc+CisjaWYgUVRfVkVSU0lP TiA8IFFUX1ZFUlNJT05fQ0hFQ0soNSwgMCwgMCkKKyNpbmNsdWRlIDxRVGV4dERvY3VtZW50Pgor I2VuZGlmCisKK2lubGluZSBRU3RyaW5nIGVzY2FwZUh0bWwoY29uc3QgUVN0cmluZyYgc3RyaW5n KQoreworI2lmIFFUX1ZFUlNJT04gPj0gUVRfVkVSU0lPTl9DSEVDSyg1LCAwLCAwKQorICAgIHJl dHVybiBzdHJpbmcudG9IdG1sRXNjYXBlZCgpOworI2Vsc2UKKyAgICByZXR1cm4gUXQ6OmVzY2Fw ZShzdHJpbmcpOworI2VuZGlmCit9CisKKyNlbmRpZiAvLyBXVEZfVXRpbHNRdF9oCmRpZmYgLS1n aXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvd3RmL3d0Zi5wcmkgYi9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvd3RmL3d0Zi5wcmkKaW5kZXggOGNhN2E1ODcyNmRiYWUwZWU0Njk3YTg0MzA4MTE5YWVh NzZmODIxMS4uNmU1MGJiMWJhY2E2NjY5NzM4OTIzNjk3NmExN2RhNDRhY2IzMTQ3NyAxMDA2NDQK LS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3d0Zi93dGYucHJpCisrKyBiL1NvdXJjZS9KYXZh U2NyaXB0Q29yZS93dGYvd3RmLnByaQpAQCAtODQsNiArODQsNyBAQCBIRUFERVJTICs9IFwKICAg ICB3dGYvUGFzc1RyYWl0cy5oIFwKICAgICB3dGYvUGxhdGZvcm0uaCBcCiAgICAgd3RmL1Bvc3Np Ymx5TnVsbC5oIFwKKyAgICB3dGYvcXQvVXRpbHNRdC5oIFwKICAgICB3dGYvUmFuZG9tTnVtYmVy LmggXAogICAgIHd0Zi9SYW5kb21OdW1iZXJTZWVkLmggXAogICAgIHd0Zi9SZWRCbGFja1RyZWUu aCBcCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKaW5kZXggNGI5ZWM5YjY5MTJhYzcxNTY1ZjRjN2QxMjA3ZTNhMDAwNmNmNzVl Zi4uMDI4ZTY4OGFkMWUyZGVmNDZjZTc0MmQwY2E2NDdmNDBjZmExMDUyMiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpA QCAtMSwzICsxLDE3IEBACisyMDExLTA5LTMwICBQaWVycmUgUm9zc2kgIDxwaWVycmUucm9zc2lA Z21haWwuY29tPgorCisgICAgICAgIFtRdF0gQnVpbGQgZml4OiBRdDo6ZXNjYXBlIGlzIGRlcHJl Y2F0ZWQgaW4gUXQ1CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD02OTE2MgorCisgICAgICAgIFVzZSBRU3RyaW5nOjp0b0h0bWxFc2NhcGVkIGluIHRoZSBR dDUgY2FzZS4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBObyBuZXcgdGVzdHMgbmVlZGVkLgorCisgICAgICAgICogV2ViQ29yZS5wcm86IGFkanVzdCB0 aGUgaW5jbHVkZSBwYXRoIGFjY29yZGluZ2x5CisgICAgICAgIGluIHRoZSB2OCBjYXNlLgorCiAy MDExLTA5LTMwICBQYXZlbCBGZWxkbWFuICA8cGZlbGRtYW5AZ29vZ2xlLmNvbT4KIAogICAgICAg ICBXZWIgSW5zcGVjdG9yOiBbY2hyb21pdW1dIGV4cG9zZSBpbnNwZWN0b3IgcHJvdG9jb2wgdmVy c2lvbiB0byB0aGUgZW1iZWRkZXIuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9XZWJDb3Jl LnBybyBiL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUucHJvCmluZGV4IGVjMjAyM2MzN2VkMmE2ZDgy MTI1ZDUyNjg0ZGVjMWRjOTljMmI0ZmIuLjMzZWU1MjQ1NTBmMjRjNDViNWZhZWExMDAzYWZiMzFm OWNiYWRkNGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUucHJvCisrKyBiL1Nv dXJjZS9XZWJDb3JlL1dlYkNvcmUucHJvCkBAIC01OCw2ICs1OCw4IEBAIHY4IHsKICAgICBpbmNs dWRlKCQkUFdELy4uL0phdmFTY3JpcHRDb3JlL3lhcnIveWFyci5wcmkpCiAgICAgaW5jbHVkZSgk JFBXRC8uLi9KYXZhU2NyaXB0Q29yZS93dGYvd3RmLnByaSkKIAorICAgIElOQ0xVREVQQVRIID0g JCRQV0QvLi4vSmF2YVNjcmlwdENvcmUvd3RmL3F0ICQkSU5DTFVERVBBVEgKKwogICAgIFNPVVJD RVMgKz0gXAogICAgICAgICBwbGF0Zm9ybS9xdC9QbGF0Zm9ybVN1cHBvcnRRdC5jcHAgXAogICAg ICAgICBiaW5kaW5ncy9nZW5lcmljL0JpbmRpbmdTZWN1cml0eUJhc2UuY3BwIFwKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQvcXQvQXBpL3F3ZWJwYWdlLmNwcCBiL1NvdXJjZS9XZWJLaXQvcXQv QXBpL3F3ZWJwYWdlLmNwcAppbmRleCAzNzZlZTcwZTZlY2E5ZjQ5ZDNmMTQ2MjJkZjIwZmY2MGVj MTA5MGFhLi5kZTE4MjY2NDczNWEzMDhkZTdkZDYzY2JjOTc5ODk5ODU0NDQxOGZjIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0L3F0L0FwaS9xd2VicGFnZS5jcHAKKysrIGIvU291cmNlL1dlYktp dC9xdC9BcGkvcXdlYnBhZ2UuY3BwCkBAIC0xMDgsNiArMTA4LDcgQEAKICNpbmNsdWRlICJTeXN0 ZW1JbmZvLmgiCiAjZW5kaWYgLy8gUV9PU19XSU4zMgogI2luY2x1ZGUgIlRleHRJdGVyYXRvci5o IgorI2luY2x1ZGUgIlV0aWxzUXQuaCIKICNpbmNsdWRlICJXZWJQbGF0Zm9ybVN0cmF0ZWdpZXMu aCIKICNpZiBVU0UoUVRLSVQpCiAjaW5jbHVkZSAiV2ViU3lzdGVtSW50ZXJmYWNlLmgiCkBAIC0x MzksNyArMTQwLDYgQEAKICNpbmNsdWRlIDxRU3R5bGU+CiAjaW5jbHVkZSA8UVN5c0luZm8+CiAj aW5jbHVkZSA8UVRleHRDaGFyRm9ybWF0PgotI2luY2x1ZGUgPFFUZXh0RG9jdW1lbnQ+CiAjaW5j bHVkZSA8UVRvdWNoRXZlbnQ+CiAjaW5jbHVkZSA8UU5ldHdvcmtBY2Nlc3NNYW5hZ2VyPgogI2lu Y2x1ZGUgPFFOZXR3b3JrUmVxdWVzdD4KQEAgLTIxMTAsNyArMjExMCw3IEBAIHZvaWQgUVdlYlBh Z2U6OmphdmFTY3JpcHRBbGVydChRV2ViRnJhbWUgKmZyYW1lLCBjb25zdCBRU3RyaW5nJiBtc2cp CiAgICAgUV9VTlVTRUQoZnJhbWUpCiAjaWZuZGVmIFFUX05PX01FU1NBR0VCT1gKICAgICBRV2lk Z2V0KiBwYXJlbnQgPSAoZC0+Y2xpZW50KSA/IGQtPmNsaWVudC0+b3duZXJXaWRnZXQoKSA6IDA7 Ci0gICAgUU1lc3NhZ2VCb3g6OmluZm9ybWF0aW9uKHBhcmVudCwgdHIoIkphdmFTY3JpcHQgQWxl cnQgLSAlMSIpLmFyZyhtYWluRnJhbWUoKS0+dXJsKCkuaG9zdCgpKSwgUXQ6OmVzY2FwZShtc2cp LCBRTWVzc2FnZUJveDo6T2spOworICAgIFFNZXNzYWdlQm94OjppbmZvcm1hdGlvbihwYXJlbnQs IHRyKCJKYXZhU2NyaXB0IEFsZXJ0IC0gJTEiKS5hcmcobWFpbkZyYW1lKCktPnVybCgpLmhvc3Qo KSksIGVzY2FwZUh0bWwobXNnKSwgUU1lc3NhZ2VCb3g6Ok9rKTsKICNlbmRpZgogfQogCkBAIC0y MTI3LDcgKzIxMjcsNyBAQCBib29sIFFXZWJQYWdlOjpqYXZhU2NyaXB0Q29uZmlybShRV2ViRnJh bWUgKmZyYW1lLCBjb25zdCBRU3RyaW5nJiBtc2cpCiAgICAgcmV0dXJuIHRydWU7CiAjZWxzZQog ICAgIFFXaWRnZXQqIHBhcmVudCA9IChkLT5jbGllbnQpID8gZC0+Y2xpZW50LT5vd25lcldpZGdl dCgpIDogMDsKLSAgICByZXR1cm4gUU1lc3NhZ2VCb3g6OlllcyA9PSBRTWVzc2FnZUJveDo6aW5m b3JtYXRpb24ocGFyZW50LCB0cigiSmF2YVNjcmlwdCBDb25maXJtIC0gJTEiKS5hcmcobWFpbkZy YW1lKCktPnVybCgpLmhvc3QoKSksIFF0Ojplc2NhcGUobXNnKSwgUU1lc3NhZ2VCb3g6Olllcywg UU1lc3NhZ2VCb3g6Ok5vKTsKKyAgICByZXR1cm4gUU1lc3NhZ2VCb3g6OlllcyA9PSBRTWVzc2Fn ZUJveDo6aW5mb3JtYXRpb24ocGFyZW50LCB0cigiSmF2YVNjcmlwdCBDb25maXJtIC0gJTEiKS5h cmcobWFpbkZyYW1lKCktPnVybCgpLmhvc3QoKSksIGVzY2FwZUh0bWwobXNnKSwgUU1lc3NhZ2VC b3g6OlllcywgUU1lc3NhZ2VCb3g6Ok5vKTsKICNlbmRpZgogfQogCkBAIC0yMTQ3LDcgKzIxNDcs NyBAQCBib29sIFFXZWJQYWdlOjpqYXZhU2NyaXB0UHJvbXB0KFFXZWJGcmFtZSAqZnJhbWUsIGNv bnN0IFFTdHJpbmcmIG1zZywgY29uc3QgUVN0cgogICAgIGJvb2wgb2sgPSBmYWxzZTsKICNpZm5k ZWYgUVRfTk9fSU5QVVRESUFMT0cKICAgICBRV2lkZ2V0KiBwYXJlbnQgPSAoZC0+Y2xpZW50KSA/ IGQtPmNsaWVudC0+b3duZXJXaWRnZXQoKSA6IDA7Ci0gICAgUVN0cmluZyB4ID0gUUlucHV0RGlh bG9nOjpnZXRUZXh0KHBhcmVudCwgdHIoIkphdmFTY3JpcHQgUHJvbXB0IC0gJTEiKS5hcmcobWFp bkZyYW1lKCktPnVybCgpLmhvc3QoKSksIFF0Ojplc2NhcGUobXNnKSwgUUxpbmVFZGl0OjpOb3Jt YWwsIGRlZmF1bHRWYWx1ZSwgJm9rKTsKKyAgICBRU3RyaW5nIHggPSBRSW5wdXREaWFsb2c6Omdl dFRleHQocGFyZW50LCB0cigiSmF2YVNjcmlwdCBQcm9tcHQgLSAlMSIpLmFyZyhtYWluRnJhbWUo KS0+dXJsKCkuaG9zdCgpKSwgZXNjYXBlSHRtbChtc2cpLCBRTGluZUVkaXQ6Ok5vcm1hbCwgZGVm YXVsdFZhbHVlLCAmb2spOwogICAgIGlmIChvayAmJiByZXN1bHQpCiAgICAgICAgICpyZXN1bHQg PSB4OwogI2VuZGlmCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L3F0L0NoYW5nZUxvZyBiL1Nv dXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nCmluZGV4IDE5MGFiMWFlYmVjNTM4ZDEwOTQxYzExY2Fi NGM2MmE2MjVjYjcyYzkuLmE3NTg1MWQ0ZmY2M2RjZGQ2ZmYwOWFjODYxNjZjZDE3ZGU1OWRiNDkg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJL aXQvcXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTEtMDktMzAgIFBpZXJyZSBSb3Nz aSAgPHBpZXJyZS5yb3NzaUBnbWFpbC5jb20+CisKKyAgICAgICAgW1F0XSBCdWlsZCBmaXg6IFF0 Ojplc2NhcGUgaXMgZGVwcmVjYXRlZCBpbiBRdDUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTY5MTYyCisKKyAgICAgICAgVXNlIFFTdHJpbmc6OnRvSHRt bEVzY2FwZWQgaW4gdGhlIFF0NSBjYXNlLgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgICogQXBpL3F3ZWJwYWdlLmNwcDoKKyAgICAgICAgKFFXZWJQYWdl OjpqYXZhU2NyaXB0QWxlcnQpOgorICAgICAgICAoUVdlYlBhZ2U6OmphdmFTY3JpcHRDb25maXJt KToKKyAgICAgICAgKFFXZWJQYWdlOjpqYXZhU2NyaXB0UHJvbXB0KToKKyAgICAgICAgKiBXZWJD b3JlU3VwcG9ydC9DaHJvbWVDbGllbnRRdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDaHJvbWVD bGllbnRRdDo6c2V0VG9vbFRpcCk6CisKIDIwMTEtMDktMjMgIFRvciBBcm5lIFZlc3Riw7ggIDx0 b3IuYXJuZS52ZXN0Ym9Abm9raWEuY29tPgogCiAgICAgICAgIFtRdF0gRml4IGJ1aWxkIGFnYWlu c3QgUXQ1IGFmdGVyIHJlZmFjdG9yIG9mIHdpZGdldHMgb3V0IG9mIFF0R1VpCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L0Nocm9tZUNsaWVudFF0LmNwcCBiL1Nv dXJjZS9XZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvQ2hyb21lQ2xpZW50UXQuY3BwCmluZGV4IDk5 M2ZmODJjYTRiMmE3Y2ZhMjg1YzA1MTM4NmUxMmFmY2Y1OWFmMjAuLmY2NGU0NTRlNzNmNWU5OGI4 NmExODI3N2NhNDY1NDY2YjU2YjU1M2QgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvcXQvV2Vi Q29yZVN1cHBvcnQvQ2hyb21lQ2xpZW50UXQuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvcXQvV2Vi Q29yZVN1cHBvcnQvQ2hyb21lQ2xpZW50UXQuY3BwCkBAIC03NCw5ICs3NCw5IEBACiAjaW5jbHVk ZSAicXdlYnZpZXcuaCIKICNpbmNsdWRlIDxxZGVidWcuaD4KICNpbmNsdWRlIDxxZXZlbnRsb29w Lmg+Ci0jaW5jbHVkZSA8cXRleHRkb2N1bWVudC5oPgogI2luY2x1ZGUgPHF0b29sdGlwLmg+CiAj aW5jbHVkZSA8d3RmL093blB0ci5oPgorI2luY2x1ZGUgPHd0Zi9xdC9VdGlsc1F0Lmg+CiAKICNp ZiBFTkFCTEUoVklERU8pICYmIChVU0UoR1NUUkVBTUVSKSB8fCBVU0UoUVRfTVVMVElNRURJQSkg fHwgVVNFKFFUS0lUKSkKICNpbmNsdWRlICJGdWxsU2NyZWVuVmlkZW9RdC5oIgpAQCAtNTE2LDcg KzUxNiw3IEBAIHZvaWQgQ2hyb21lQ2xpZW50UXQ6OnNldFRvb2xUaXAoY29uc3QgU3RyaW5nICZ0 aXAsIFRleHREaXJlY3Rpb24pCiAgICAgICAgIHZpZXctPnNldFRvb2xUaXAoUVN0cmluZygpKTsK ICAgICAgICAgUVRvb2xUaXA6OmhpZGVUZXh0KCk7CiAgICAgfSBlbHNlIHsKLSAgICAgICAgUVN0 cmluZyBkdGlwID0gUUxhdGluMVN0cmluZygiPHA+IikgKyBRdDo6ZXNjYXBlKHRpcCkgKyBRTGF0 aW4xU3RyaW5nKCI8L3A+Iik7CisgICAgICAgIFFTdHJpbmcgZHRpcCA9IFFMYXRpbjFTdHJpbmco IjxwPiIpICsgZXNjYXBlSHRtbCh0aXApICsgUUxhdGluMVN0cmluZygiPC9wPiIpOwogICAgICAg ICB2aWV3LT5zZXRUb29sVGlwKGR0aXApOwogICAgIH0KICNlbHNlCg== 109478 2011-10-03 06:04:39 -0700 2011-10-03 08:58:52 -0700 Patch for landing bug-69162-20111003100424.patch text/plain 8199 menard SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gOTY0ODkpCisrKyBTb3VyY2Uv SmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTcgQEAK KzIwMTEtMTAtMDMgIFBpZXJyZSBSb3NzaSAgPHBpZXJyZS5yb3NzaUBnbWFpbC5jb20+CisKKyAg ICAgICAgW1F0XSBCdWlsZCBmaXg6IFF0Ojplc2NhcGUgaXMgZGVwcmVjYXRlZCBpbiBRdDUKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY5MTYyCisKKyAg ICAgICAgVXNlIFFTdHJpbmc6OnRvSHRtbEVzY2FwZWQgaW4gdGhlIFF0NSBjYXNlLgorCisgICAg ICAgIFJldmlld2VkIGJ5IEFuZHJlYXMuCisKKyAgICAgICAgKiBKYXZhU2NyaXB0Q29yZS5wcmk6 CisgICAgICAgICogd3RmL3F0L1V0aWxzUXQuaDogQWRkZWQuCisgICAgICAgIChlc2NhcGVIdG1s KToKKyAgICAgICAgKiB3dGYvd3RmLnByaToKKwogMjAxMS0xMC0wMiAgWm9sdGFuIEhlcmN6ZWcg IDx6aGVyY3plZ0B3ZWJraXQub3JnPgogCiAgICAgICAgIFtRdF1SRUdSRVNTSU9OKHI5NTkxMik6 IEl0IG1hZGUgc3B1dG5payB0ZXN0cyBmbGFrZXkKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29y ZS9KYXZhU2NyaXB0Q29yZS5wcmkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3Jl L0phdmFTY3JpcHRDb3JlLnByaQkocmV2aXNpb24gOTY0ODkpCisrKyBTb3VyY2UvSmF2YVNjcmlw dENvcmUvSmF2YVNjcmlwdENvcmUucHJpCSh3b3JraW5nIGNvcHkpCkBAIC0zMyw2ICszMyw3IEBA IEpBVkFTQ1JJUFRDT1JFX0lOQ0xVREVQQVRIID0gXAogICAgICQkUFdEL3J1bnRpbWUgXAogICAg ICQkUFdEL3d0ZiBcCiAgICAgJCRQV0Qvd3RmL2dvYmplY3QgXAorICAgICQkUFdEL3d0Zi9xdCBc CiAgICAgJCRQV0Qvd3RmL3N5bWJpYW4gXAogICAgICQkUFdEL3d0Zi91bmljb2RlIFwKICAgICAk JFBXRC95YXJyIFwKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS93dGYvd3RmLnByaQo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvd3RmL3d0Zi5wcmkJKHJldmlzaW9uIDk2 NDg5KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL3d0Zi93dGYucHJpCSh3b3JraW5nIGNvcHkp CkBAIC04NCw2ICs4NCw3IEBAIEhFQURFUlMgKz0gXAogICAgIHd0Zi9QYXNzVHJhaXRzLmggXAog ICAgIHd0Zi9QbGF0Zm9ybS5oIFwKICAgICB3dGYvUG9zc2libHlOdWxsLmggXAorICAgIHd0Zi9x dC9VdGlsc1F0LmggXAogICAgIHd0Zi9SYW5kb21OdW1iZXIuaCBcCiAgICAgd3RmL1JhbmRvbU51 bWJlclNlZWQuaCBcCiAgICAgd3RmL1JlZEJsYWNrVHJlZS5oIFwKSW5kZXg6IFNvdXJjZS9KYXZh U2NyaXB0Q29yZS93dGYvcXQvVXRpbHNRdC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2Ny aXB0Q29yZS93dGYvcXQvVXRpbHNRdC5oCShyZXZpc2lvbiAwKQorKysgU291cmNlL0phdmFTY3Jp cHRDb3JlL3d0Zi9xdC9VdGlsc1F0LmgJKHJldmlzaW9uIDApCkBAIC0wLDAgKzEsMzcgQEAKKy8q CisgICAgQ29weXJpZ2h0IChDKSAyMDExIE5va2lhIENvcnBvcmF0aW9uIGFuZC9vciBpdHMgc3Vi c2lkaWFyeSgtaWVzKQorCisgICAgVGhpcyBsaWJyYXJ5IGlzIGZyZWUgc29mdHdhcmU7IHlvdSBj YW4gcmVkaXN0cmlidXRlIGl0IGFuZC9vcgorICAgIG1vZGlmeSBpdCB1bmRlciB0aGUgdGVybXMg b2YgdGhlIEdOVSBMaWJyYXJ5IEdlbmVyYWwgUHVibGljCisgICAgTGljZW5zZSBhcyBwdWJsaXNo ZWQgYnkgdGhlIEZyZWUgU29mdHdhcmUgRm91bmRhdGlvbjsgZWl0aGVyCisgICAgdmVyc2lvbiAy IG9mIHRoZSBMaWNlbnNlLCBvciAoYXQgeW91ciBvcHRpb24pIGFueSBsYXRlciB2ZXJzaW9uLgor CisgICAgVGhpcyBsaWJyYXJ5IGlzIGRpc3RyaWJ1dGVkIGluIHRoZSBob3BlIHRoYXQgaXQgd2ls bCBiZSB1c2VmdWwsCisgICAgYnV0IFdJVEhPVVQgQU5ZIFdBUlJBTlRZOyB3aXRob3V0IGV2ZW4g dGhlIGltcGxpZWQgd2FycmFudHkgb2YKKyAgICBNRVJDSEFOVEFCSUxJVFkgb3IgRklUTkVTUyBG T1IgQSBQQVJUSUNVTEFSIFBVUlBPU0UuICBTZWUgdGhlIEdOVQorICAgIExpYnJhcnkgR2VuZXJh bCBQdWJsaWMgTGljZW5zZSBmb3IgbW9yZSBkZXRhaWxzLgorCisgICAgWW91IHNob3VsZCBoYXZl IHJlY2VpdmVkIGEgY29weSBvZiB0aGUgR05VIExpYnJhcnkgR2VuZXJhbCBQdWJsaWMgTGljZW5z ZQorICAgIGFsb25nIHdpdGggdGhpcyBsaWJyYXJ5OyBzZWUgdGhlIGZpbGUgQ09QWUlORy5MSUIu ICBJZiBub3QsIHdyaXRlIHRvCisgICAgdGhlIEZyZWUgU29mdHdhcmUgRm91bmRhdGlvbiwgSW5j LiwgNTEgRnJhbmtsaW4gU3RyZWV0LCBGaWZ0aCBGbG9vciwKKyAgICBCb3N0b24sIE1BIDAyMTEw LTEzMDEsIFVTQS4KKyovCisKKyNpZm5kZWYgV1RGX1V0aWxzUXRfaAorI2RlZmluZSBXVEZfVXRp bHNRdF9oCisKKyNpbmNsdWRlIDxRU3RyaW5nPgorI2lmIFFUX1ZFUlNJT04gPCBRVF9WRVJTSU9O X0NIRUNLKDUsIDAsIDApCisjaW5jbHVkZSA8UVRleHREb2N1bWVudD4KKyNlbmRpZgorCitpbmxp bmUgUVN0cmluZyBlc2NhcGVIdG1sKGNvbnN0IFFTdHJpbmcmIHN0cmluZykKK3sKKyNpZiBRVF9W RVJTSU9OID49IFFUX1ZFUlNJT05fQ0hFQ0soNSwgMCwgMCkKKyAgICByZXR1cm4gc3RyaW5nLnRv SHRtbEVzY2FwZWQoKTsKKyNlbHNlCisgICAgcmV0dXJuIFF0Ojplc2NhcGUoc3RyaW5nKTsKKyNl bmRpZgorfQorCisjZW5kaWYgLy8gV1RGX1V0aWxzUXRfaApJbmRleDogU291cmNlL1dlYkNvcmUv Q2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwkocmV2aXNp b24gOTY0ODkpCisrKyBTb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAg LTEsMyArMSwxNyBAQAorMjAxMS0xMC0wMyAgUGllcnJlIFJvc3NpICA8cGllcnJlLnJvc3NpQGdt YWlsLmNvbT4KKworICAgICAgICBbUXRdIEJ1aWxkIGZpeDogUXQ6OmVzY2FwZSBpcyBkZXByZWNh dGVkIGluIFF0NQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9NjkxNjIKKworICAgICAgICBVc2UgUVN0cmluZzo6dG9IdG1sRXNjYXBlZCBpbiB0aGUgUXQ1 IGNhc2UuCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgQW5kcmVhcy4KKworICAgICAgICBObyBuZXcg dGVzdHMgbmVlZGVkLgorCisgICAgICAgICogV2ViQ29yZS5wcm86IGFkanVzdCB0aGUgaW5jbHVk ZSBwYXRoIGFjY29yZGluZ2x5CisgICAgICAgIGluIHRoZSB2OCBjYXNlLgorCiAyMDExLTEwLTAz ICBQYXZlbCBGZWxkbWFuICA8cGZlbGRtYW5AZ29vZ2xlLmNvbT4KIAogICAgICAgICBXZWIgSW5z cGVjdG9yOiBtb3ZlIGNvbnNvbGUgbWVzc2FnZSBmb3JtYXR0aW5nIGZyb20gQ29uc29sZVZpZXcu anMgaW50byBDb25zb2xlTWVzc2FnZS5qcwpJbmRleDogU291cmNlL1dlYkNvcmUvV2ViQ29yZS5w cm8KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvV2ViQ29yZS5wcm8JKHJldmlzaW9uIDk2 NDg5KQorKysgU291cmNlL1dlYkNvcmUvV2ViQ29yZS5wcm8JKHdvcmtpbmcgY29weSkKQEAgLTU4 LDYgKzU4LDggQEAgdjggewogICAgIGluY2x1ZGUoJCRQV0QvLi4vSmF2YVNjcmlwdENvcmUveWFy ci95YXJyLnByaSkKICAgICBpbmNsdWRlKCQkUFdELy4uL0phdmFTY3JpcHRDb3JlL3d0Zi93dGYu cHJpKQogCisgICAgSU5DTFVERVBBVEggPSAkJFBXRC8uLi9KYXZhU2NyaXB0Q29yZS93dGYvcXQg JCRJTkNMVURFUEFUSAorCiAgICAgU09VUkNFUyArPSBcCiAgICAgICAgIHBsYXRmb3JtL3F0L1Bs YXRmb3JtU3VwcG9ydFF0LmNwcCBcCiAgICAgICAgIGJpbmRpbmdzL2dlbmVyaWMvQmluZGluZ1Nl Y3VyaXR5QmFzZS5jcHAgXApJbmRleDogU291cmNlL1dlYktpdC9xdC9DaGFuZ2VMb2cKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYktpdC9xdC9DaGFuZ2VMb2cJKHJldmlzaW9uIDk2NDg5KQorKysg U291cmNlL1dlYktpdC9xdC9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxOSBA QAorMjAxMS0xMC0wMyAgUGllcnJlIFJvc3NpICA8cGllcnJlLnJvc3NpQGdtYWlsLmNvbT4KKwor ICAgICAgICBbUXRdIEJ1aWxkIGZpeDogUXQ6OmVzY2FwZSBpcyBkZXByZWNhdGVkIGluIFF0NQor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjkxNjIKKwor ICAgICAgICBVc2UgUVN0cmluZzo6dG9IdG1sRXNjYXBlZCBpbiB0aGUgUXQ1IGNhc2UuCisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgQW5kcmVhcy4KKworICAgICAgICAqIEFwaS9xd2VicGFnZS5jcHA6 CisgICAgICAgIChRV2ViUGFnZTo6amF2YVNjcmlwdEFsZXJ0KToKKyAgICAgICAgKFFXZWJQYWdl OjpqYXZhU2NyaXB0Q29uZmlybSk6CisgICAgICAgIChRV2ViUGFnZTo6amF2YVNjcmlwdFByb21w dCk6CisgICAgICAgICogV2ViQ29yZVN1cHBvcnQvQ2hyb21lQ2xpZW50UXQuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6Q2hyb21lQ2xpZW50UXQ6OnNldFRvb2xUaXApOgorCiAyMDExLTEwLTAxICBT aGVyaWZmIEJvdCAgPHdlYmtpdC5yZXZpZXcuYm90QGdtYWlsLmNvbT4KIAogICAgICAgICBVbnJl dmlld2VkLCByb2xsaW5nIG91dCByOTY0MjEuCkluZGV4OiBTb3VyY2UvV2ViS2l0L3F0L0FwaS9x d2VicGFnZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9xdC9BcGkvcXdlYnBhZ2Uu Y3BwCShyZXZpc2lvbiA5NjQ4OSkKKysrIFNvdXJjZS9XZWJLaXQvcXQvQXBpL3F3ZWJwYWdlLmNw cAkod29ya2luZyBjb3B5KQpAQCAtMTA4LDYgKzEwOCw3IEBACiAjaW5jbHVkZSAiU3lzdGVtSW5m by5oIgogI2VuZGlmIC8vIFFfT1NfV0lOMzIKICNpbmNsdWRlICJUZXh0SXRlcmF0b3IuaCIKKyNp bmNsdWRlICJVdGlsc1F0LmgiCiAjaW5jbHVkZSAiV2ViUGxhdGZvcm1TdHJhdGVnaWVzLmgiCiAj aWYgVVNFKFFUS0lUKQogI2luY2x1ZGUgIldlYlN5c3RlbUludGVyZmFjZS5oIgpAQCAtMTM5LDcg KzE0MCw2IEBACiAjaW5jbHVkZSA8UVN0eWxlPgogI2luY2x1ZGUgPFFTeXNJbmZvPgogI2luY2x1 ZGUgPFFUZXh0Q2hhckZvcm1hdD4KLSNpbmNsdWRlIDxRVGV4dERvY3VtZW50PgogI2luY2x1ZGUg PFFUb3VjaEV2ZW50PgogI2luY2x1ZGUgPFFOZXR3b3JrQWNjZXNzTWFuYWdlcj4KICNpbmNsdWRl IDxRTmV0d29ya1JlcXVlc3Q+CkBAIC0yMTEwLDcgKzIxMTAsNyBAQCB2b2lkIFFXZWJQYWdlOjpq YXZhU2NyaXB0QWxlcnQoUVdlYkZyYW1lCiAgICAgUV9VTlVTRUQoZnJhbWUpCiAjaWZuZGVmIFFU X05PX01FU1NBR0VCT1gKICAgICBRV2lkZ2V0KiBwYXJlbnQgPSAoZC0+Y2xpZW50KSA/IGQtPmNs aWVudC0+b3duZXJXaWRnZXQoKSA6IDA7Ci0gICAgUU1lc3NhZ2VCb3g6OmluZm9ybWF0aW9uKHBh cmVudCwgdHIoIkphdmFTY3JpcHQgQWxlcnQgLSAlMSIpLmFyZyhtYWluRnJhbWUoKS0+dXJsKCku aG9zdCgpKSwgUXQ6OmVzY2FwZShtc2cpLCBRTWVzc2FnZUJveDo6T2spOworICAgIFFNZXNzYWdl Qm94OjppbmZvcm1hdGlvbihwYXJlbnQsIHRyKCJKYXZhU2NyaXB0IEFsZXJ0IC0gJTEiKS5hcmco bWFpbkZyYW1lKCktPnVybCgpLmhvc3QoKSksIGVzY2FwZUh0bWwobXNnKSwgUU1lc3NhZ2VCb3g6 Ok9rKTsKICNlbmRpZgogfQogCkBAIC0yMTI3LDcgKzIxMjcsNyBAQCBib29sIFFXZWJQYWdlOjpq YXZhU2NyaXB0Q29uZmlybShRV2ViRnJhCiAgICAgcmV0dXJuIHRydWU7CiAjZWxzZQogICAgIFFX aWRnZXQqIHBhcmVudCA9IChkLT5jbGllbnQpID8gZC0+Y2xpZW50LT5vd25lcldpZGdldCgpIDog MDsKLSAgICByZXR1cm4gUU1lc3NhZ2VCb3g6OlllcyA9PSBRTWVzc2FnZUJveDo6aW5mb3JtYXRp b24ocGFyZW50LCB0cigiSmF2YVNjcmlwdCBDb25maXJtIC0gJTEiKS5hcmcobWFpbkZyYW1lKCkt PnVybCgpLmhvc3QoKSksIFF0Ojplc2NhcGUobXNnKSwgUU1lc3NhZ2VCb3g6OlllcywgUU1lc3Nh Z2VCb3g6Ok5vKTsKKyAgICByZXR1cm4gUU1lc3NhZ2VCb3g6OlllcyA9PSBRTWVzc2FnZUJveDo6 aW5mb3JtYXRpb24ocGFyZW50LCB0cigiSmF2YVNjcmlwdCBDb25maXJtIC0gJTEiKS5hcmcobWFp bkZyYW1lKCktPnVybCgpLmhvc3QoKSksIGVzY2FwZUh0bWwobXNnKSwgUU1lc3NhZ2VCb3g6Olll cywgUU1lc3NhZ2VCb3g6Ok5vKTsKICNlbmRpZgogfQogCkBAIC0yMTQ3LDcgKzIxNDcsNyBAQCBi b29sIFFXZWJQYWdlOjpqYXZhU2NyaXB0UHJvbXB0KFFXZWJGcmFtCiAgICAgYm9vbCBvayA9IGZh bHNlOwogI2lmbmRlZiBRVF9OT19JTlBVVERJQUxPRwogICAgIFFXaWRnZXQqIHBhcmVudCA9IChk LT5jbGllbnQpID8gZC0+Y2xpZW50LT5vd25lcldpZGdldCgpIDogMDsKLSAgICBRU3RyaW5nIHgg PSBRSW5wdXREaWFsb2c6OmdldFRleHQocGFyZW50LCB0cigiSmF2YVNjcmlwdCBQcm9tcHQgLSAl MSIpLmFyZyhtYWluRnJhbWUoKS0+dXJsKCkuaG9zdCgpKSwgUXQ6OmVzY2FwZShtc2cpLCBRTGlu ZUVkaXQ6Ok5vcm1hbCwgZGVmYXVsdFZhbHVlLCAmb2spOworICAgIFFTdHJpbmcgeCA9IFFJbnB1 dERpYWxvZzo6Z2V0VGV4dChwYXJlbnQsIHRyKCJKYXZhU2NyaXB0IFByb21wdCAtICUxIikuYXJn KG1haW5GcmFtZSgpLT51cmwoKS5ob3N0KCkpLCBlc2NhcGVIdG1sKG1zZyksIFFMaW5lRWRpdDo6 Tm9ybWFsLCBkZWZhdWx0VmFsdWUsICZvayk7CiAgICAgaWYgKG9rICYmIHJlc3VsdCkKICAgICAg ICAgKnJlc3VsdCA9IHg7CiAjZW5kaWYKSW5kZXg6IFNvdXJjZS9XZWJLaXQvcXQvV2ViQ29yZVN1 cHBvcnQvQ2hyb21lQ2xpZW50UXQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvcXQv V2ViQ29yZVN1cHBvcnQvQ2hyb21lQ2xpZW50UXQuY3BwCShyZXZpc2lvbiA5NjQ4OSkKKysrIFNv dXJjZS9XZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvQ2hyb21lQ2xpZW50UXQuY3BwCSh3b3JraW5n IGNvcHkpCkBAIC03NCw5ICs3NCw5IEBACiAjaW5jbHVkZSAicXdlYnZpZXcuaCIKICNpbmNsdWRl IDxxZGVidWcuaD4KICNpbmNsdWRlIDxxZXZlbnRsb29wLmg+Ci0jaW5jbHVkZSA8cXRleHRkb2N1 bWVudC5oPgogI2luY2x1ZGUgPHF0b29sdGlwLmg+CiAjaW5jbHVkZSA8d3RmL093blB0ci5oPgor I2luY2x1ZGUgPHd0Zi9xdC9VdGlsc1F0Lmg+CiAKICNpZiBFTkFCTEUoVklERU8pICYmIChVU0Uo R1NUUkVBTUVSKSB8fCBVU0UoUVRfTVVMVElNRURJQSkgfHwgVVNFKFFUS0lUKSkKICNpbmNsdWRl ICJGdWxsU2NyZWVuVmlkZW9RdC5oIgpAQCAtNTE2LDcgKzUxNiw3IEBAIHZvaWQgQ2hyb21lQ2xp ZW50UXQ6OnNldFRvb2xUaXAoY29uc3QgU3QKICAgICAgICAgdmlldy0+c2V0VG9vbFRpcChRU3Ry aW5nKCkpOwogICAgICAgICBRVG9vbFRpcDo6aGlkZVRleHQoKTsKICAgICB9IGVsc2UgewotICAg ICAgICBRU3RyaW5nIGR0aXAgPSBRTGF0aW4xU3RyaW5nKCI8cD4iKSArIFF0Ojplc2NhcGUodGlw KSArIFFMYXRpbjFTdHJpbmcoIjwvcD4iKTsKKyAgICAgICAgUVN0cmluZyBkdGlwID0gUUxhdGlu MVN0cmluZygiPHA+IikgKyBlc2NhcGVIdG1sKHRpcCkgKyBRTGF0aW4xU3RyaW5nKCI8L3A+Iik7 CiAgICAgICAgIHZpZXctPnNldFRvb2xUaXAoZHRpcCk7CiAgICAgfQogI2Vsc2UK