79328 2012-02-22 22:04:39 -0800 [Qt] Build fix. macro "QSKIP" takes 1 arguments on Qt5, but takes 2 on Qt4. 2012-02-24 06:36:22 -0800 1 1 1 Unclassified WebKit WebKit Qt 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 79402 1 dongseong.hwang zecke abarth ariya.hidayat commit-queue hausmann jarred kenneth ossy skyul webkit.review.bot zecke oldest_to_newest 562820 0 dongseong.hwang 2012-02-22 22:04:39 -0800 Build fix. macro "QSKIP" takes 1 arguments on Qt5, but takes 2 on Qt4. This patch causes to be able to build WebKit2 on Qt5. 562822 1 128392 dongseong.hwang 2012-02-22 22:06:05 -0800 Created attachment 128392 patch 562938 2 128392 hausmann 2012-02-23 00:59:13 -0800 Comment on attachment 128392 patch This isn't pretty, but oh well :) 562976 3 128392 webkit.review.bot 2012-02-23 02:14:48 -0800 Comment on attachment 128392 patch Rejecting attachment 128392 from commit-queue. Failed to run "['/mnt/git/webkit-commit-queue/Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '-..." exit_code: 2 Last 500 characters of output: webkit.org/repository/webkit': could not connect to server (http://svn.webkit.org) at /usr/lib/git-core/git-svn line 2295 Died at Tools/Scripts/update-webkit line 164. Failed to run "['Tools/Scripts/update-webkit', '--chromium', '--force-update']" exit_code: 9 Updating OpenSource RA layer request failed: OPTIONS of 'http://svn.webkit.org/repository/webkit': could not connect to server (http://svn.webkit.org) at /usr/lib/git-core/git-svn line 2295 Died at Tools/Scripts/update-webkit line 164. Full output: http://queues.webkit.org/results/11610177 563152 4 zecke 2012-02-23 09:08:48 -0800 *** Bug 79323 has been marked as a duplicate of this bug. *** 563153 5 zecke 2012-02-23 09:09:36 -0800 (In reply to comment #2) > (From update of attachment 128392 [details]) > This isn't pretty, but oh well :) we have utils.h already and can have W_QSKIP.. anyway.. too late now. 563226 6 hausmann 2012-02-23 10:34:32 -0800 (In reply to comment #5) > (In reply to comment #2) > > (From update of attachment 128392 [details] [details]) > > This isn't pretty, but oh well :) > > we have utils.h already and can have W_QSKIP.. anyway.. too late now. Good idea :) and not too late, since the bot couldn't apply it. 563281 7 128510 zecke 2012-02-23 11:18:38 -0800 Created attachment 128510 Patch 563284 8 128512 zecke 2012-02-23 11:22:34 -0800 Created attachment 128512 Patch 563364 9 128512 ossy 2012-02-23 12:24:26 -0800 Comment on attachment 128512 Patch r=me. Just a quick question: Won't it break the build with previous version of Qt5? If yes, then I'll land it with updating Qt5 on the bots tomorrow morning. 563367 10 zecke 2012-02-23 12:26:18 -0800 Yeah, you are right. I wish Qt would have a date/week stamp we could use... 563371 11 ossy 2012-02-23 12:32:59 -0800 (In reply to comment #10) > Yeah, you are right. I wish Qt would have a date/week stamp we could use... Webkit trunk is always buildable with weekly pinned Qt5 hash which you can find here: https://github.com/ossy-szeged/qt5-tools - build-qt5-env - It contains an incremental revision number and the weekly Qt5 hash - build-qt5.sh - I use this script to update Qt5 on the bots. Additionally I always send a mail to webkit-qt mailing list after weekly update on all friday. (Sometimes it is postponed because of some regressions.) And you can find which WK revision use which Qt5 hash here: http://build.webkit.sed.hu/buildslaves/szeged-linux-22 PS. Thanks for the fix, I'll land it manually tomorrow morning. 564098 12 commit-queue 2012-02-24 01:53:46 -0800 Attachment 128512 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebKit/qt/ChangeLog', u'Source/WebK..." exit_code: 1 Source/WebKit/qt/tests/benchmarks/loading/tst_loading.cpp:28: Alphabetical sorting problem. [build/include_order] [4] Source/WebKit/qt/tests/benchmarks/painting/tst_painting.cpp:29: Alphabetical sorting problem. [build/include_order] [4] Total errors found: 2 in 8 files If any of these errors are false positives, please file a bug against check-webkit-style. 564279 13 128512 ossy 2012-02-24 06:36:14 -0800 Comment on attachment 128512 Patch Clearing flags on attachment: 128512 Committed r108786: <http://trac.webkit.org/changeset/108786> 564280 14 ossy 2012-02-24 06:36:22 -0800 All reviewed patches have been landed. Closing bug. 128392 2012-02-22 22:06:05 -0800 2012-02-23 11:18:22 -0800 patch 0001-Qt-Build-fix.-macro-QSKIP-takes-1-arguments-on-Qt5-b.patch text/plain 7378 dongseong.hwang RnJvbSAxMGYwMTgxNDI5YjA0NjM5NjE3OTVlOGI5ZDU2NzQ2N2Y3NGEzNTZhIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBIdWFuZyBEb25nc3VuZyA8bHV4dGVsbGFAY29tcGFueTEwMC5u ZXQ+CkRhdGU6IFRodSwgMjMgRmViIDIwMTIgMTQ6NTk6NTEgKzA5MDAKU3ViamVjdDogW1BBVENI XSBbUXRdIEJ1aWxkIGZpeC4gbWFjcm8gIlFTS0lQIiB0YWtlcyAxIGFyZ3VtZW50cyBvbiBRdDUs IGJ1dAogdGFrZXMgMiBvbiBRdDQuCiBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9NzkzMjgKCi0tLQogU291cmNlL1dlYktpdC9xdC9DaGFuZ2VMb2cgICAgICAgICAgICAg ICAgICAgICAgICAgfCAgIDIyICsrKysrKysrKysrKysrKysrKysrCiAuLi4vcXQvdGVzdHMvYmVu Y2htYXJrcy9sb2FkaW5nL3RzdF9sb2FkaW5nLmNwcCAgICB8ICAgIDQgKysrCiAuLi4vcXQvdGVz dHMvYmVuY2htYXJrcy9wYWludGluZy90c3RfcGFpbnRpbmcuY3BwICB8ICAgIDQgKysrCiAuLi4v dHN0X3FkZWNsYXJhdGl2ZXdlYnZpZXcuY3BwICAgICAgICAgICAgICAgICAgICB8ICAgIDQgKysr CiBTb3VyY2UvV2ViS2l0L3F0L3Rlc3RzL3F3ZWJmcmFtZS90c3RfcXdlYmZyYW1lLmNwcCB8ICAg IDQgKysrCiBTb3VyY2UvV2ViS2l0L3F0L3Rlc3RzL3F3ZWJwYWdlL3RzdF9xd2VicGFnZS5jcHAg ICB8ICAgMTIgKysrKysrKysrKwogU291cmNlL1dlYktpdC9xdC90ZXN0cy9xd2Vidmlldy90c3Rf cXdlYnZpZXcuY3BwICAgfCAgICA0ICsrKwogNyBmaWxlcyBjaGFuZ2VkLCA1NCBpbnNlcnRpb25z KCspLCAwIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvcXQvQ2hhbmdl TG9nIGIvU291cmNlL1dlYktpdC9xdC9DaGFuZ2VMb2cKaW5kZXggZGE1ZWI4Ny4uMDNjODVjZCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9xdC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktp dC9xdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNSBAQAorMjAxMi0wMi0yMiAgSHVhbmcgRG9uZ3N1 bmcgIDxsdXh0ZWxsYUBjb21wYW55MTAwLm5ldD4KKworICAgICAgICBbUXRdIEJ1aWxkIGZpeC4g bWFjcm8gIlFTS0lQIiB0YWtlcyAxIGFyZ3VtZW50cyBvbiBRdDUsIGJ1dCB0YWtlcyAyIG9uIFF0 NC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTc5MzI4 CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiB0ZXN0 cy9iZW5jaG1hcmtzL2xvYWRpbmcvdHN0X2xvYWRpbmcuY3BwOgorICAgICAgICAodHN0X0xvYWRp bmc6OmxvYWQpOgorICAgICAgICAqIHRlc3RzL2JlbmNobWFya3MvcGFpbnRpbmcvdHN0X3BhaW50 aW5nLmNwcDoKKyAgICAgICAgKHRzdF9QYWludGluZzo6cGFpbnQpOgorICAgICAgICAqIHRlc3Rz L3FkZWNsYXJhdGl2ZXdlYnZpZXcvdHN0X3FkZWNsYXJhdGl2ZXdlYnZpZXcuY3BwOgorICAgICAg ICAodHN0X1FEZWNsYXJhdGl2ZVdlYlZpZXc6OmVsZW1lbnRBcmVhQXQpOgorICAgICAgICAqIHRl c3RzL3F3ZWJmcmFtZS90c3RfcXdlYmZyYW1lLmNwcDoKKyAgICAgICAgKHRzdF9RV2ViRnJhbWU6 OnNldEh0bWxXaXRoQmFzZVVSTCk6CisgICAgICAgICogdGVzdHMvcXdlYnBhZ2UvdHN0X3F3ZWJw YWdlLmNwcDoKKyAgICAgICAgKHRzdF9RV2ViUGFnZTo6Z2VvbG9jYXRpb25SZXF1ZXN0SlMpOgor ICAgICAgICAodHN0X1FXZWJQYWdlOjpsb2FkSHRtbDVWaWRlbyk6CisgICAgICAgICh0c3RfUVdl YlBhZ2U6OnNjcmVlbnNob3QpOgorICAgICAgICAqIHRlc3RzL3F3ZWJ2aWV3L3RzdF9xd2Vidmll dy5jcHA6CisgICAgICAgICh0c3RfUVdlYlZpZXc6OnJldXNlUGFnZSk6CisKIDIwMTItMDItMjEg IFJ5b3N1a2UgTml3YSAgPHJuaXdhQHdlYmtpdC5vcmc+CiAKICAgICAgICAgUmVtb3ZlIHRoZSBy ZW1haW5pbmcgdXNlcyBvZiBDU1NTdHlsZURlY2xhcmF0aW9uIGluIEVkaXRvcgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdC9xdC90ZXN0cy9iZW5jaG1hcmtzL2xvYWRpbmcvdHN0X2xvYWRpbmcu Y3BwIGIvU291cmNlL1dlYktpdC9xdC90ZXN0cy9iZW5jaG1hcmtzL2xvYWRpbmcvdHN0X2xvYWRp bmcuY3BwCmluZGV4IDY2MWE3ZTMuLmNhYzRiYmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQv cXQvdGVzdHMvYmVuY2htYXJrcy9sb2FkaW5nL3RzdF9sb2FkaW5nLmNwcAorKysgYi9Tb3VyY2Uv V2ViS2l0L3F0L3Rlc3RzL2JlbmNobWFya3MvbG9hZGluZy90c3RfbG9hZGluZy5jcHAKQEAgLTk2 LDcgKzk2LDExIEBAIHZvaWQgdHN0X0xvYWRpbmc6OmxvYWQoKQogICAgIFFGRVRDSChRVXJsLCB1 cmwpOwogCiAgICAgaWYgKCFtX21hbmFnZXIuaXNPbmxpbmUoKSkKKyNpZiBRVF9WRVJTSU9OID49 IFFUX1ZFUlNJT05fQ0hFQ0soNSwgMCwgMCkKKyAgICAgICAgUVNLSVAoIlRoaXMgdGVzdCByZXF1 aXJlcyBhbiBhY3RpdmUgbmV0d29yayBjb25uZWN0aW9uIik7CisjZWxzZQogICAgICAgICBRU0tJ UCgiVGhpcyB0ZXN0IHJlcXVpcmVzIGFuIGFjdGl2ZSBuZXR3b3JrIGNvbm5lY3Rpb24iLCBTa2lw U2luZ2xlKTsKKyNlbmRpZgogCiAgICAgUUJFTkNITUFSSyB7CiAgICAgICAgIG1fdmlldy0+bG9h ZCh1cmwpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9xdC90ZXN0cy9iZW5jaG1hcmtzL3Bh aW50aW5nL3RzdF9wYWludGluZy5jcHAgYi9Tb3VyY2UvV2ViS2l0L3F0L3Rlc3RzL2JlbmNobWFy a3MvcGFpbnRpbmcvdHN0X3BhaW50aW5nLmNwcAppbmRleCA0N2QzNGRjLi5mNjNkOGUzIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0L3F0L3Rlc3RzL2JlbmNobWFya3MvcGFpbnRpbmcvdHN0X3Bh aW50aW5nLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L3F0L3Rlc3RzL2JlbmNobWFya3MvcGFpbnRp bmcvdHN0X3BhaW50aW5nLmNwcApAQCAtOTYsNyArOTYsMTEgQEAgdm9pZCB0c3RfUGFpbnRpbmc6 OnBhaW50KCkKICAgICBRRkVUQ0goUVVybCwgdXJsKTsKIAogICAgIGlmICghbV9tYW5hZ2VyLmlz T25saW5lKCkpCisjaWYgUVRfVkVSU0lPTiA+PSBRVF9WRVJTSU9OX0NIRUNLKDUsIDAsIDApCisg ICAgICAgIFFTS0lQKCJUaGlzIHRlc3QgcmVxdWlyZXMgYW4gYWN0aXZlIG5ldHdvcmsgY29ubmVj dGlvbiIpOworI2Vsc2UKICAgICAgICAgUVNLSVAoIlRoaXMgdGVzdCByZXF1aXJlcyBhbiBhY3Rp dmUgbmV0d29yayBjb25uZWN0aW9uIiwgU2tpcFNpbmdsZSk7CisjZW5kaWYKIAogICAgIG1fdmll dy0+bG9hZCh1cmwpOwogICAgIDo6d2FpdEZvclNpZ25hbChtX3ZpZXcsIFNJR05BTChsb2FkRmlu aXNoZWQoYm9vbCkpKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvcXQvdGVzdHMvcWRlY2xh cmF0aXZld2Vidmlldy90c3RfcWRlY2xhcmF0aXZld2Vidmlldy5jcHAgYi9Tb3VyY2UvV2ViS2l0 L3F0L3Rlc3RzL3FkZWNsYXJhdGl2ZXdlYnZpZXcvdHN0X3FkZWNsYXJhdGl2ZXdlYnZpZXcuY3Bw CmluZGV4IDFmOWEyZmYuLjU5ZTNiZDEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvcXQvdGVz dHMvcWRlY2xhcmF0aXZld2Vidmlldy90c3RfcWRlY2xhcmF0aXZld2Vidmlldy5jcHAKKysrIGIv U291cmNlL1dlYktpdC9xdC90ZXN0cy9xZGVjbGFyYXRpdmV3ZWJ2aWV3L3RzdF9xZGVjbGFyYXRp dmV3ZWJ2aWV3LmNwcApAQCAtMTM5LDcgKzEzOSwxMSBAQCB2b2lkIHRzdF9RRGVjbGFyYXRpdmVX ZWJWaWV3OjpiYXNpY1Byb3BlcnRpZXMoKQogCiB2b2lkIHRzdF9RRGVjbGFyYXRpdmVXZWJWaWV3 OjplbGVtZW50QXJlYUF0KCkKIHsKKyNpZiBRVF9WRVJTSU9OID49IFFUX1ZFUlNJT05fQ0hFQ0so NSwgMCwgMCkKKyAgICBRU0tJUCgiVGhpcyB0ZXN0IHNob3VsZCBiZSBjaGFuZ2VkIHRvIHRlc3Qg J2hldXJpc3RpY1pvb20nIGluc3RlYWQuIik7CisjZWxzZQogICAgIFFTS0lQKCJUaGlzIHRlc3Qg c2hvdWxkIGJlIGNoYW5nZWQgdG8gdGVzdCAnaGV1cmlzdGljWm9vbScgaW5zdGVhZC4iLCBTa2lw QWxsKTsKKyNlbmRpZgogICAgIFFEZWNsYXJhdGl2ZUVuZ2luZSBlbmdpbmU7CiAgICAgUURlY2xh cmF0aXZlQ29tcG9uZW50IGNvbXBvbmVudCgmZW5naW5lLCBRVXJsKCJxcmM6Ly8vcmVzb3VyY2Vz L2VsZW1lbnRzLnFtbCIpKTsKICAgICBjaGVja05vRXJyb3JzKGNvbXBvbmVudCk7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0L3F0L3Rlc3RzL3F3ZWJmcmFtZS90c3RfcXdlYmZyYW1lLmNwcCBi L1NvdXJjZS9XZWJLaXQvcXQvdGVzdHMvcXdlYmZyYW1lL3RzdF9xd2ViZnJhbWUuY3BwCmluZGV4 IDNlYjA4YzQuLjI3YWVlMDMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvcXQvdGVzdHMvcXdl YmZyYW1lL3RzdF9xd2ViZnJhbWUuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvcXQvdGVzdHMvcXdl YmZyYW1lL3RzdF9xd2ViZnJhbWUuY3BwCkBAIC0yNTU1LDcgKzI1NTUsMTEgQEAgdm9pZCB0c3Rf UVdlYkZyYW1lOjpzZXRIdG1sV2l0aEJhc2VVUkwoKQogICAgIC8vIEFzIHdlIGFyZSB1c2luZyBh IGxvY2FsIGZpbGUgYXMgYmFzZVVybCwgaXRzIHNlY3VyaXR5IG9yaWdpbiBzaG91bGQgYmUgYWJs ZSB0byBsb2FkIGxvY2FsIHJlc291cmNlcy4KIAogICAgIGlmICghUURpcihURVNUU19TT1VSQ0Vf RElSKS5leGlzdHMoKSkKKyNpZiBRVF9WRVJTSU9OID49IFFUX1ZFUlNJT05fQ0hFQ0soNSwgMCwg MCkKKyAgICAgICAgUVNLSVAoUVN0cmluZygiVGhpcyB0ZXN0IHJlcXVpcmVzIGFjY2VzcyB0byBy ZXNvdXJjZXMgZm91bmQgaW4gJyUxJyIpLmFyZyhURVNUU19TT1VSQ0VfRElSKS50b0xhdGluMSgp LmNvbnN0RGF0YSgpKTsKKyNlbHNlCiAgICAgICAgIFFTS0lQKFFTdHJpbmcoIlRoaXMgdGVzdCBy ZXF1aXJlcyBhY2Nlc3MgdG8gcmVzb3VyY2VzIGZvdW5kIGluICclMSciKS5hcmcoVEVTVFNfU09V UkNFX0RJUikudG9MYXRpbjEoKS5jb25zdERhdGEoKSwgU2tpcEFsbCk7CisjZW5kaWYKIAogICAg IFFEaXI6OnNldEN1cnJlbnQoVEVTVFNfU09VUkNFX0RJUik7CiAKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQvcXQvdGVzdHMvcXdlYnBhZ2UvdHN0X3F3ZWJwYWdlLmNwcCBiL1NvdXJjZS9XZWJL aXQvcXQvdGVzdHMvcXdlYnBhZ2UvdHN0X3F3ZWJwYWdlLmNwcAppbmRleCBjMGY3YmI5Li5mMDk3 MmM5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L3F0L3Rlc3RzL3F3ZWJwYWdlL3RzdF9xd2Vi cGFnZS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9xdC90ZXN0cy9xd2VicGFnZS90c3RfcXdlYnBh Z2UuY3BwCkBAIC0zMDUsNyArMzA1LDExIEBAIHZvaWQgdHN0X1FXZWJQYWdlOjpnZW9sb2NhdGlv blJlcXVlc3RKUygpCiAKICAgICBpZiAobmV3UGFnZS0+bWFpbkZyYW1lKCktPmV2YWx1YXRlSmF2 YVNjcmlwdChRTGF0aW4xU3RyaW5nKCIhbmF2aWdhdG9yLmdlb2xvY2F0aW9uIikpLnRvQm9vbCgp KSB7CiAgICAgICAgIGRlbGV0ZSBuZXdQYWdlOworI2lmIFFUX1ZFUlNJT04gPj0gUVRfVkVSU0lP Tl9DSEVDSyg1LCAwLCAwKQorICAgICAgICBRU0tJUCgiR2VvbG9jYXRpb24gaXMgbm90IHN1cHBv cnRlZC4iKTsKKyNlbHNlCiAgICAgICAgIFFTS0lQKCJHZW9sb2NhdGlvbiBpcyBub3Qgc3VwcG9y dGVkLiIsIFNraXBTaW5nbGUpOworI2VuZGlmCiAgICAgfQogCiAgICAgY29ubmVjdChuZXdQYWdl LCBTSUdOQUwoZmVhdHVyZVBlcm1pc3Npb25SZXF1ZXN0ZWQoUVdlYkZyYW1lKiwgUVdlYlBhZ2U6 OkZlYXR1cmUpKSwKQEAgLTUzNSw4ICs1MzksMTIgQEAgdm9pZCB0c3RfUVdlYlBhZ2U6OmxvYWRI dG1sNVZpZGVvKCkKICAgICBRRVhQRUNUX0ZBSUwoIiIsICJodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9NjU0NTIiLCBDb250aW51ZSk7CiAgICAgUUNPTVBBUkUobVVybC50 b0VuY29kZWQoKSwgdXJsKTsKICNlbHNlCisjaWYgUVRfVkVSU0lPTiA+PSBRVF9WRVJTSU9OX0NI RUNLKDUsIDAsIDApCisgICAgUVNLSVAoIlRoaXMgdGVzdCByZXF1aXJlcyBRdCBNdWx0aW1lZGlh Iik7CisjZWxzZQogICAgIFFTS0lQKCJUaGlzIHRlc3QgcmVxdWlyZXMgUXQgTXVsdGltZWRpYSIs IFNraXBBbGwpOwogI2VuZGlmCisjZW5kaWYKIH0KIAogdm9pZCB0c3RfUVdlYlBhZ2U6OnZpZXdN b2RlcygpCkBAIC0yNzQ0LDcgKzI3NTIsMTEgQEAgdm9pZCB0c3RfUVdlYlBhZ2U6OnNjcmVlbnNo b3RfZGF0YSgpCiB2b2lkIHRzdF9RV2ViUGFnZTo6c2NyZWVuc2hvdCgpCiB7CiAgICAgaWYgKCFR RGlyKFRFU1RTX1NPVVJDRV9ESVIpLmV4aXN0cygpKQorI2lmIFFUX1ZFUlNJT04gPj0gUVRfVkVS U0lPTl9DSEVDSyg1LCAwLCAwKQorICAgICAgICBRU0tJUChRU3RyaW5nKCJUaGlzIHRlc3QgcmVx dWlyZXMgYWNjZXNzIHRvIHJlc291cmNlcyBmb3VuZCBpbiAnJTEnIikuYXJnKFRFU1RTX1NPVVJD RV9ESVIpLnRvTGF0aW4xKCkuY29uc3REYXRhKCkpOworI2Vsc2UKICAgICAgICAgUVNLSVAoUVN0 cmluZygiVGhpcyB0ZXN0IHJlcXVpcmVzIGFjY2VzcyB0byByZXNvdXJjZXMgZm91bmQgaW4gJyUx JyIpLmFyZyhURVNUU19TT1VSQ0VfRElSKS50b0xhdGluMSgpLmNvbnN0RGF0YSgpLCBTa2lwQWxs KTsKKyNlbmRpZgogCiAgICAgUURpcjo6c2V0Q3VycmVudChURVNUU19TT1VSQ0VfRElSKTsKIApk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9xdC90ZXN0cy9xd2Vidmlldy90c3RfcXdlYnZpZXcu Y3BwIGIvU291cmNlL1dlYktpdC9xdC90ZXN0cy9xd2Vidmlldy90c3RfcXdlYnZpZXcuY3BwCmlu ZGV4IGJlMmM0YzkuLmVlNGZlMDEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvcXQvdGVzdHMv cXdlYnZpZXcvdHN0X3F3ZWJ2aWV3LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L3F0L3Rlc3RzL3F3 ZWJ2aWV3L3RzdF9xd2Vidmlldy5jcHAKQEAgLTEzMyw3ICsxMzMsMTEgQEAgdm9pZCB0c3RfUVdl YlZpZXc6OnJldXNlUGFnZV9kYXRhKCkKIHZvaWQgdHN0X1FXZWJWaWV3OjpyZXVzZVBhZ2UoKQog ewogICAgIGlmICghUURpcihURVNUU19TT1VSQ0VfRElSKS5leGlzdHMoKSkKKyNpZiBRVF9WRVJT SU9OID49IFFUX1ZFUlNJT05fQ0hFQ0soNSwgMCwgMCkKKyAgICAgICAgUVNLSVAoUVN0cmluZygi VGhpcyB0ZXN0IHJlcXVpcmVzIGFjY2VzcyB0byByZXNvdXJjZXMgZm91bmQgaW4gJyUxJyIpLmFy ZyhURVNUU19TT1VSQ0VfRElSKS50b0xhdGluMSgpLmNvbnN0RGF0YSgpKTsKKyNlbHNlCiAgICAg ICAgIFFTS0lQKFFTdHJpbmcoIlRoaXMgdGVzdCByZXF1aXJlcyBhY2Nlc3MgdG8gcmVzb3VyY2Vz IGZvdW5kIGluICclMSciKS5hcmcoVEVTVFNfU09VUkNFX0RJUikudG9MYXRpbjEoKS5jb25zdERh dGEoKSwgU2tpcEFsbCk7CisjZW5kaWYKIAogICAgIFFEaXI6OnNldEN1cnJlbnQoVEVTVFNfU09V UkNFX0RJUik7CiAKLS0gCjEuNy41LjQKCg== 128510 2012-02-23 11:18:38 -0800 2012-02-23 11:22:23 -0800 Patch bug-79328-20120223201836.patch text/plain 9618 zecke U3VidmVyc2lvbiBSZXZpc2lvbjogMTA4NTI4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L3F0 L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nCmluZGV4IDBmNDkxM2Y5N2Fm N2M5ODczOTY2ZTZhNmNiMjI3MmE5MmI0ZGJlMjkuLmY1YmRhMjMwZDY3NGNmMTM4YzJlNGIwNjY0 OGRlZmNjNGNlNGQ3YWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nCisr KyBiL1NvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjggQEAKKzIwMTItMDIt MjMgIEhvbGdlciBIYW5zIFBldGVyIEZyZXl0aGVyICA8emVja2VAc2VsZmlzaC5vcmc+CisKKyAg ICAgICAgW1F0XSBCdWlsZCBmaXguIG1hY3JvICJRU0tJUCIgbm93IG9ubHkgdGFrZXMgMSBhcmd1 bWVudCBvbiBRdDUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTc5MzI4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgSW50cm9kdWNlIGFuIGFsdGVybmF0aXZlIFFTS0lQIHRoYXQgY2FuIHdvcmsgd2l0aCBib3Ro IFF0NAorICAgICAgICBhbmQgUXQ1IHdpdGhvdXQgYWRkaW5nICNpZmRlZiB0byBlYWNoIHVzYWdl IHNpdGUuCisKKyAgICAgICAgKiB0ZXN0cy9iZW5jaG1hcmtzL2xvYWRpbmcvdHN0X2xvYWRpbmcu Y3BwOgorICAgICAgICAodHN0X0xvYWRpbmc6OmxvYWQpOgorICAgICAgICAqIHRlc3RzL2JlbmNo bWFya3MvcGFpbnRpbmcvdHN0X3BhaW50aW5nLmNwcDoKKyAgICAgICAgKHRzdF9QYWludGluZzo6 cGFpbnQpOgorICAgICAgICAqIHRlc3RzL3FkZWNsYXJhdGl2ZXdlYnZpZXcvdHN0X3FkZWNsYXJh dGl2ZXdlYnZpZXcuY3BwOgorICAgICAgICAodHN0X1FEZWNsYXJhdGl2ZVdlYlZpZXc6OmVsZW1l bnRBcmVhQXQpOgorICAgICAgICAqIHRlc3RzL3F3ZWJmcmFtZS90c3RfcXdlYmZyYW1lLmNwcDoK KyAgICAgICAgKHRzdF9RV2ViRnJhbWU6OnNldEh0bWxXaXRoQmFzZVVSTCk6CisgICAgICAgICog dGVzdHMvcXdlYnBhZ2UvdHN0X3F3ZWJwYWdlLmNwcDoKKyAgICAgICAgKHRzdF9RV2ViUGFnZTo6 Z2VvbG9jYXRpb25SZXF1ZXN0SlMpOgorICAgICAgICAodHN0X1FXZWJQYWdlOjpsb2FkSHRtbDVW aWRlbyk6CisgICAgICAgICh0c3RfUVdlYlBhZ2U6OnNjcmVlbnNob3QpOgorICAgICAgICAqIHRl c3RzL3F3ZWJ2aWV3L3RzdF9xd2Vidmlldy5jcHA6CisgICAgICAgICh0c3RfUVdlYlZpZXc6OnJl dXNlUGFnZSk6CisKIDIwMTItMDItMjIgIE1paG5lYSBPdmlkZW5pZSAgPG1paG5lYUBhZG9iZS5j b20+CiAKICAgICAgICAgW1F0XSBSRUdSRVNTSU9OKHIxMDgxMDgpOiBJdCBtYWRlIDMgZmFzdC9y ZXBhaW50IHRlc3RzIGZhaWwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvcXQvdGVzdHMvYmVu Y2htYXJrcy9sb2FkaW5nL3RzdF9sb2FkaW5nLmNwcCBiL1NvdXJjZS9XZWJLaXQvcXQvdGVzdHMv YmVuY2htYXJrcy9sb2FkaW5nL3RzdF9sb2FkaW5nLmNwcAppbmRleCA2NjFhN2UzY2I0NjQ1Yjdh OGNlZDA1ZmUxYWM0MWQ0ZGI5YjJmNjBlLi4xYzM5ODViODNjYTU1YmEyM2U2NjgzYmM1NDg5MmQ5 MjU0MDQ2OWQxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L3F0L3Rlc3RzL2JlbmNobWFya3Mv bG9hZGluZy90c3RfbG9hZGluZy5jcHAKKysrIGIvU291cmNlL1dlYktpdC9xdC90ZXN0cy9iZW5j aG1hcmtzL2xvYWRpbmcvdHN0X2xvYWRpbmcuY3BwCkBAIC0yNSwyOCArMjUsNyBAQAogI2luY2x1 ZGUgPHF3ZWJ2aWV3Lmg+CiAjaW5jbHVkZSA8cXBhaW50ZXIuaD4KIAotLyoqCi0gKiBTdGFydHMg YW4gZXZlbnQgbG9vcCB0aGF0IHJ1bnMgdW50aWwgdGhlIGdpdmVuIHNpZ25hbCBpcyByZWNlaXZl ZC4KLSBPcHRpb25hbGx5IHRoZSBldmVudCBsb29wCi0gKiBjYW4gcmV0dXJuIGVhcmxpZXIgb24g YSB0aW1lb3V0LgotICoKLSAqIFxyZXR1cm4gXHAgdHJ1ZSBpZiB0aGUgcmVxdWVzdGVkIHNpZ25h bCB3YXMgcmVjZWl2ZWQKLSAqICAgICAgICAgXHAgZmFsc2Ugb24gdGltZW91dAotICovCi1zdGF0 aWMgYm9vbCB3YWl0Rm9yU2lnbmFsKFFPYmplY3QqIG9iaiwgY29uc3QgY2hhciogc2lnbmFsLCBp bnQgdGltZW91dCA9IDApCi17Ci0gICAgUUV2ZW50TG9vcCBsb29wOwotICAgIFFPYmplY3Q6OmNv bm5lY3Qob2JqLCBzaWduYWwsICZsb29wLCBTTE9UKHF1aXQoKSkpOwotICAgIFFUaW1lciB0aW1l cjsKLSAgICBRU2lnbmFsU3B5IHRpbWVvdXRTcHkoJnRpbWVyLCBTSUdOQUwodGltZW91dCgpKSk7 Ci0gICAgaWYgKHRpbWVvdXQgPiAwKSB7Ci0gICAgICAgIFFPYmplY3Q6OmNvbm5lY3QoJnRpbWVy LCBTSUdOQUwodGltZW91dCgpKSwgJmxvb3AsIFNMT1QocXVpdCgpKSk7Ci0gICAgICAgIHRpbWVy LnNldFNpbmdsZVNob3QodHJ1ZSk7Ci0gICAgICAgIHRpbWVyLnN0YXJ0KHRpbWVvdXQpOwotICAg IH0KLSAgICBsb29wLmV4ZWMoKTsKLSAgICByZXR1cm4gdGltZW91dFNweS5pc0VtcHR5KCk7Ci19 CisjaW5jbHVkZSAidXRpbC5oIgogCiBjbGFzcyB0c3RfTG9hZGluZyA6IHB1YmxpYyBRT2JqZWN0 CiB7CkBAIC05NiwxMyArNzUsMTMgQEAgdm9pZCB0c3RfTG9hZGluZzo6bG9hZCgpCiAgICAgUUZF VENIKFFVcmwsIHVybCk7CiAKICAgICBpZiAoIW1fbWFuYWdlci5pc09ubGluZSgpKQotICAgICAg ICBRU0tJUCgiVGhpcyB0ZXN0IHJlcXVpcmVzIGFuIGFjdGl2ZSBuZXR3b3JrIGNvbm5lY3Rpb24i LCBTa2lwU2luZ2xlKTsKKyAgICAgICAgV19RU0tJUCgiVGhpcyB0ZXN0IHJlcXVpcmVzIGFuIGFj dGl2ZSBuZXR3b3JrIGNvbm5lY3Rpb24iLCBTa2lwU2luZ2xlKTsKIAogICAgIFFCRU5DSE1BUksg ewogICAgICAgICBtX3ZpZXctPmxvYWQodXJsKTsKIAogICAgICAgICAvLyByZWFsbHkgd2FpdCBm b3IgbG9hZGluZywgcGFpbnRpbmcgaXMgaW4gYW5vdGhlciB0ZXN0Ci0gICAgICAgIDo6d2FpdEZv clNpZ25hbChtX3ZpZXcsIFNJR05BTChsb2FkRmluaXNoZWQoYm9vbCkpKTsKKyAgICAgICAgOjp3 YWl0Rm9yU2lnbmFsKG1fdmlldywgU0lHTkFMKGxvYWRGaW5pc2hlZChib29sKSksIDApOwogICAg IH0KIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9xdC90ZXN0cy9iZW5jaG1hcmtzL3Bh aW50aW5nL3RzdF9wYWludGluZy5jcHAgYi9Tb3VyY2UvV2ViS2l0L3F0L3Rlc3RzL2JlbmNobWFy a3MvcGFpbnRpbmcvdHN0X3BhaW50aW5nLmNwcAppbmRleCA0N2QzNGRjYmQ0NjE1ZTRiMzQ2ZWFl NjM5YWYyOWI2MzJjZTA2NDY2Li4zZjk3YjVhZWFmMGZkMjA1MGYzZjMyMGZiMTJkYTBkZTZlMTI1 Mjk5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L3F0L3Rlc3RzL2JlbmNobWFya3MvcGFpbnRp bmcvdHN0X3BhaW50aW5nLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L3F0L3Rlc3RzL2JlbmNobWFy a3MvcGFpbnRpbmcvdHN0X3BhaW50aW5nLmNwcApAQCAtMjYsMjggKzI2LDcgQEAKICNpbmNsdWRl IDxxd2Vidmlldy5oPgogI2luY2x1ZGUgPHFwYWludGVyLmg+CiAKLS8qKgotICogU3RhcnRzIGFu IGV2ZW50IGxvb3AgdGhhdCBydW5zIHVudGlsIHRoZSBnaXZlbiBzaWduYWwgaXMgcmVjZWl2ZWQu Ci0gT3B0aW9uYWxseSB0aGUgZXZlbnQgbG9vcAotICogY2FuIHJldHVybiBlYXJsaWVyIG9uIGEg dGltZW91dC4KLSAqCi0gKiBccmV0dXJuIFxwIHRydWUgaWYgdGhlIHJlcXVlc3RlZCBzaWduYWwg d2FzIHJlY2VpdmVkCi0gKiAgICAgICAgIFxwIGZhbHNlIG9uIHRpbWVvdXQKLSAqLwotc3RhdGlj IGJvb2wgd2FpdEZvclNpZ25hbChRT2JqZWN0KiBvYmosIGNvbnN0IGNoYXIqIHNpZ25hbCwgaW50 IHRpbWVvdXQgPSAwKQotewotICAgIFFFdmVudExvb3AgbG9vcDsKLSAgICBRT2JqZWN0Ojpjb25u ZWN0KG9iaiwgc2lnbmFsLCAmbG9vcCwgU0xPVChxdWl0KCkpKTsKLSAgICBRVGltZXIgdGltZXI7 Ci0gICAgUVNpZ25hbFNweSB0aW1lb3V0U3B5KCZ0aW1lciwgU0lHTkFMKHRpbWVvdXQoKSkpOwot ICAgIGlmICh0aW1lb3V0ID4gMCkgewotICAgICAgICBRT2JqZWN0Ojpjb25uZWN0KCZ0aW1lciwg U0lHTkFMKHRpbWVvdXQoKSksICZsb29wLCBTTE9UKHF1aXQoKSkpOwotICAgICAgICB0aW1lci5z ZXRTaW5nbGVTaG90KHRydWUpOwotICAgICAgICB0aW1lci5zdGFydCh0aW1lb3V0KTsKLSAgICB9 Ci0gICAgbG9vcC5leGVjKCk7Ci0gICAgcmV0dXJuIHRpbWVvdXRTcHkuaXNFbXB0eSgpOwotfQor I2luY2x1ZGUgInV0aWwuaCIKIAogY2xhc3MgdHN0X1BhaW50aW5nIDogcHVibGljIFFPYmplY3QK IHsKQEAgLTk2LDEwICs3NSwxMCBAQCB2b2lkIHRzdF9QYWludGluZzo6cGFpbnQoKQogICAgIFFG RVRDSChRVXJsLCB1cmwpOwogCiAgICAgaWYgKCFtX21hbmFnZXIuaXNPbmxpbmUoKSkKLSAgICAg ICAgUVNLSVAoIlRoaXMgdGVzdCByZXF1aXJlcyBhbiBhY3RpdmUgbmV0d29yayBjb25uZWN0aW9u IiwgU2tpcFNpbmdsZSk7CisgICAgICAgIFdfUVNLSVAoIlRoaXMgdGVzdCByZXF1aXJlcyBhbiBh Y3RpdmUgbmV0d29yayBjb25uZWN0aW9uIiwgU2tpcFNpbmdsZSk7CiAKICAgICBtX3ZpZXctPmxv YWQodXJsKTsKLSAgICA6OndhaXRGb3JTaWduYWwobV92aWV3LCBTSUdOQUwobG9hZEZpbmlzaGVk KGJvb2wpKSk7CisgICAgOjp3YWl0Rm9yU2lnbmFsKG1fdmlldywgU0lHTkFMKGxvYWRGaW5pc2hl ZChib29sKSksIDApOwogCiAgICAgLyogZm9yY2UgYSBsYXlvdXQgKi8KICAgICBRV2ViRnJhbWUq IG1haW5GcmFtZSA9IG1fcGFnZS0+bWFpbkZyYW1lKCk7CkBAIC0xMTYsNyArOTUsNyBAQCB2b2lk IHRzdF9QYWludGluZzo6cGFpbnQoKQogdm9pZCB0c3RfUGFpbnRpbmc6OnRleHRBcmVhcygpCiB7 CiAgICAgbV92aWV3LT5sb2FkKFFVcmwoImRhdGE6dGV4dC9odG1sOzxodG1sPjxib2R5PjwvYm9k eT48L2h0bWw+IikpOwotICAgIDo6d2FpdEZvclNpZ25hbChtX3ZpZXcsIFNJR05BTChsb2FkRmlu aXNoZWQoYm9vbCkpKTsKKyAgICA6OndhaXRGb3JTaWduYWwobV92aWV3LCBTSUdOQUwobG9hZEZp bmlzaGVkKGJvb2wpKSwgMCk7CiAKICAgICBRV2ViRWxlbWVudCBib2R5RWxlbWVudCA9IG1fcGFn ZS0+bWFpbkZyYW1lKCktPmZpbmRGaXJzdEVsZW1lbnQoImJvZHkiKTsKIApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdC9xdC90ZXN0cy9xZGVjbGFyYXRpdmV3ZWJ2aWV3L3RzdF9xZGVjbGFyYXRp dmV3ZWJ2aWV3LmNwcCBiL1NvdXJjZS9XZWJLaXQvcXQvdGVzdHMvcWRlY2xhcmF0aXZld2Vidmll dy90c3RfcWRlY2xhcmF0aXZld2Vidmlldy5jcHAKaW5kZXggMWY5YTJmZjg0ZGNlNTU5ZjA4NDI3 M2MyMDI1OGNhZmI5ZmE1ZGNkNi4uZjk0MjFlM2NmZGRkOWExZjFhZTQwMGUwMDZkYmNiOWY1ZjQw OTFhZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9xdC90ZXN0cy9xZGVjbGFyYXRpdmV3ZWJ2 aWV3L3RzdF9xZGVjbGFyYXRpdmV3ZWJ2aWV3LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L3F0L3Rl c3RzL3FkZWNsYXJhdGl2ZXdlYnZpZXcvdHN0X3FkZWNsYXJhdGl2ZXdlYnZpZXcuY3BwCkBAIC0x MzksNyArMTM5LDcgQEAgdm9pZCB0c3RfUURlY2xhcmF0aXZlV2ViVmlldzo6YmFzaWNQcm9wZXJ0 aWVzKCkKIAogdm9pZCB0c3RfUURlY2xhcmF0aXZlV2ViVmlldzo6ZWxlbWVudEFyZWFBdCgpCiB7 Ci0gICAgUVNLSVAoIlRoaXMgdGVzdCBzaG91bGQgYmUgY2hhbmdlZCB0byB0ZXN0ICdoZXVyaXN0 aWNab29tJyBpbnN0ZWFkLiIsIFNraXBBbGwpOworICAgIFdfUVNLSVAoIlRoaXMgdGVzdCBzaG91 bGQgYmUgY2hhbmdlZCB0byB0ZXN0ICdoZXVyaXN0aWNab29tJyBpbnN0ZWFkLiIsIFNraXBBbGwp OwogICAgIFFEZWNsYXJhdGl2ZUVuZ2luZSBlbmdpbmU7CiAgICAgUURlY2xhcmF0aXZlQ29tcG9u ZW50IGNvbXBvbmVudCgmZW5naW5lLCBRVXJsKCJxcmM6Ly8vcmVzb3VyY2VzL2VsZW1lbnRzLnFt bCIpKTsKICAgICBjaGVja05vRXJyb3JzKGNvbXBvbmVudCk7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0L3F0L3Rlc3RzL3F3ZWJmcmFtZS90c3RfcXdlYmZyYW1lLmNwcCBiL1NvdXJjZS9XZWJL aXQvcXQvdGVzdHMvcXdlYmZyYW1lL3RzdF9xd2ViZnJhbWUuY3BwCmluZGV4IDNlYjA4YzQ1MDhk ODVmMzNhZDJhYWE0NjY1MjUzOWZmYWFkMWZiYmIuLjJjMjhhZWYxZjRkZTFmYWYwN2UyNWU0YjVi Y2Q0NWJiYTBlZTc0MzEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvcXQvdGVzdHMvcXdlYmZy YW1lL3RzdF9xd2ViZnJhbWUuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvcXQvdGVzdHMvcXdlYmZy YW1lL3RzdF9xd2ViZnJhbWUuY3BwCkBAIC0yNTU1LDcgKzI1NTUsNyBAQCB2b2lkIHRzdF9RV2Vi RnJhbWU6OnNldEh0bWxXaXRoQmFzZVVSTCgpCiAgICAgLy8gQXMgd2UgYXJlIHVzaW5nIGEgbG9j YWwgZmlsZSBhcyBiYXNlVXJsLCBpdHMgc2VjdXJpdHkgb3JpZ2luIHNob3VsZCBiZSBhYmxlIHRv IGxvYWQgbG9jYWwgcmVzb3VyY2VzLgogCiAgICAgaWYgKCFRRGlyKFRFU1RTX1NPVVJDRV9ESVIp LmV4aXN0cygpKQotICAgICAgICBRU0tJUChRU3RyaW5nKCJUaGlzIHRlc3QgcmVxdWlyZXMgYWNj ZXNzIHRvIHJlc291cmNlcyBmb3VuZCBpbiAnJTEnIikuYXJnKFRFU1RTX1NPVVJDRV9ESVIpLnRv TGF0aW4xKCkuY29uc3REYXRhKCksIFNraXBBbGwpOworICAgICAgICBXX1FTS0lQKFFTdHJpbmco IlRoaXMgdGVzdCByZXF1aXJlcyBhY2Nlc3MgdG8gcmVzb3VyY2VzIGZvdW5kIGluICclMSciKS5h cmcoVEVTVFNfU09VUkNFX0RJUikudG9MYXRpbjEoKS5jb25zdERhdGEoKSwgU2tpcEFsbCk7CiAK ICAgICBRRGlyOjpzZXRDdXJyZW50KFRFU1RTX1NPVVJDRV9ESVIpOwogCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0L3F0L3Rlc3RzL3F3ZWJwYWdlL3RzdF9xd2VicGFnZS5jcHAgYi9Tb3VyY2Uv V2ViS2l0L3F0L3Rlc3RzL3F3ZWJwYWdlL3RzdF9xd2VicGFnZS5jcHAKaW5kZXggYzBmN2JiOTIw Y2NiMGM0MDhiZDI3N2VkYThjOTA0NGY5MzIxZTllNi4uYjZmMGFlZWUzMDE5YzVjODJkNmNmYTkx YzAwOGMyYTNmM2FkMjliYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9xdC90ZXN0cy9xd2Vi cGFnZS90c3RfcXdlYnBhZ2UuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvcXQvdGVzdHMvcXdlYnBh Z2UvdHN0X3F3ZWJwYWdlLmNwcApAQCAtMzA1LDcgKzMwNSw3IEBAIHZvaWQgdHN0X1FXZWJQYWdl OjpnZW9sb2NhdGlvblJlcXVlc3RKUygpCiAKICAgICBpZiAobmV3UGFnZS0+bWFpbkZyYW1lKCkt PmV2YWx1YXRlSmF2YVNjcmlwdChRTGF0aW4xU3RyaW5nKCIhbmF2aWdhdG9yLmdlb2xvY2F0aW9u IikpLnRvQm9vbCgpKSB7CiAgICAgICAgIGRlbGV0ZSBuZXdQYWdlOwotICAgICAgICBRU0tJUCgi R2VvbG9jYXRpb24gaXMgbm90IHN1cHBvcnRlZC4iLCBTa2lwU2luZ2xlKTsKKyAgICAgICAgV19R U0tJUCgiR2VvbG9jYXRpb24gaXMgbm90IHN1cHBvcnRlZC4iLCBTa2lwU2luZ2xlKTsKICAgICB9 CiAKICAgICBjb25uZWN0KG5ld1BhZ2UsIFNJR05BTChmZWF0dXJlUGVybWlzc2lvblJlcXVlc3Rl ZChRV2ViRnJhbWUqLCBRV2ViUGFnZTo6RmVhdHVyZSkpLApAQCAtNTM1LDcgKzUzNSw3IEBAIHZv aWQgdHN0X1FXZWJQYWdlOjpsb2FkSHRtbDVWaWRlbygpCiAgICAgUUVYUEVDVF9GQUlMKCIiLCAi aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY1NDUyIiwgQ29udGludWUp OwogICAgIFFDT01QQVJFKG1VcmwudG9FbmNvZGVkKCksIHVybCk7CiAjZWxzZQotICAgIFFTS0lQ KCJUaGlzIHRlc3QgcmVxdWlyZXMgUXQgTXVsdGltZWRpYSIsIFNraXBBbGwpOworICAgIFdfUVNL SVAoIlRoaXMgdGVzdCByZXF1aXJlcyBRdCBNdWx0aW1lZGlhIiwgU2tpcEFsbCk7CiAjZW5kaWYK IH0KIApAQCAtMjc0NCw3ICsyNzQ0LDcgQEAgdm9pZCB0c3RfUVdlYlBhZ2U6OnNjcmVlbnNob3Rf ZGF0YSgpCiB2b2lkIHRzdF9RV2ViUGFnZTo6c2NyZWVuc2hvdCgpCiB7CiAgICAgaWYgKCFRRGly KFRFU1RTX1NPVVJDRV9ESVIpLmV4aXN0cygpKQotICAgICAgICBRU0tJUChRU3RyaW5nKCJUaGlz IHRlc3QgcmVxdWlyZXMgYWNjZXNzIHRvIHJlc291cmNlcyBmb3VuZCBpbiAnJTEnIikuYXJnKFRF U1RTX1NPVVJDRV9ESVIpLnRvTGF0aW4xKCkuY29uc3REYXRhKCksIFNraXBBbGwpOworICAgICAg ICBXX1FTS0lQKFFTdHJpbmcoIlRoaXMgdGVzdCByZXF1aXJlcyBhY2Nlc3MgdG8gcmVzb3VyY2Vz IGZvdW5kIGluICclMSciKS5hcmcoVEVTVFNfU09VUkNFX0RJUikudG9MYXRpbjEoKS5jb25zdERh dGEoKSwgU2tpcEFsbCk7CiAKICAgICBRRGlyOjpzZXRDdXJyZW50KFRFU1RTX1NPVVJDRV9ESVIp OwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L3F0L3Rlc3RzL3F3ZWJ2aWV3L3RzdF9xd2Vi dmlldy5jcHAgYi9Tb3VyY2UvV2ViS2l0L3F0L3Rlc3RzL3F3ZWJ2aWV3L3RzdF9xd2Vidmlldy5j cHAKaW5kZXggYmUyYzRjOTg1ZWRkMDhlYzQxNzgzYzg1ZjJmNmY2M2MxMzM2NjVjMS4uZjdkYzlj NWY0ZjUxYWQxZDY3MTkwMjY0MjJmZGE1YzBiYWI4OWYxZCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9xdC90ZXN0cy9xd2Vidmlldy90c3RfcXdlYnZpZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJL aXQvcXQvdGVzdHMvcXdlYnZpZXcvdHN0X3F3ZWJ2aWV3LmNwcApAQCAtMTMzLDcgKzEzMyw3IEBA IHZvaWQgdHN0X1FXZWJWaWV3OjpyZXVzZVBhZ2VfZGF0YSgpCiB2b2lkIHRzdF9RV2ViVmlldzo6 cmV1c2VQYWdlKCkKIHsKICAgICBpZiAoIVFEaXIoVEVTVFNfU09VUkNFX0RJUikuZXhpc3RzKCkp Ci0gICAgICAgIFFTS0lQKFFTdHJpbmcoIlRoaXMgdGVzdCByZXF1aXJlcyBhY2Nlc3MgdG8gcmVz b3VyY2VzIGZvdW5kIGluICclMSciKS5hcmcoVEVTVFNfU09VUkNFX0RJUikudG9MYXRpbjEoKS5j b25zdERhdGEoKSwgU2tpcEFsbCk7CisgICAgICAgIFdfUVNLSVAoUVN0cmluZygiVGhpcyB0ZXN0 IHJlcXVpcmVzIGFjY2VzcyB0byByZXNvdXJjZXMgZm91bmQgaW4gJyUxJyIpLmFyZyhURVNUU19T T1VSQ0VfRElSKS50b0xhdGluMSgpLmNvbnN0RGF0YSgpLCBTa2lwQWxsKTsKIAogICAgIFFEaXI6 OnNldEN1cnJlbnQoVEVTVFNfU09VUkNFX0RJUik7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQvcXQvdGVzdHMvdXRpbC5oIGIvU291cmNlL1dlYktpdC9xdC90ZXN0cy91dGlsLmgKaW5kZXgg OTQ2MjhjYTljMDkyNDc0YTUxZmIyMTNhNjRmNmJlNWYwODFiZjljYS4uMjIxOTJiYWQyZjkzZGU4 ZDc5ZjdjN2MyZGU1YTY4YWFlZTAzYzBiZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9xdC90 ZXN0cy91dGlsLmgKKysrIGIvU291cmNlL1dlYktpdC9xdC90ZXN0cy91dGlsLmgKQEAgLTc3LDQg Kzc3LDkgQEAgc3RhdGljIGJvb2wgd2FpdEZvclNpZ25hbChRT2JqZWN0KiBvYmosIGNvbnN0IGNo YXIqIHNpZ25hbCwgaW50IHRpbWVvdXQgPSAxMDAwMCkKICAgICAgICAgfSBcCiAgICAgICAgIFFD T01QQVJFKF9fZXhwciwgX19leHBlY3RlZCk7IFwKICAgICB9IHdoaWxlKDApCisKKy8vIENvbXBh dGliaWxpdHkgZm9yIFF0NQorI2RlZmluZSBXX1FTS0lQKGEsIGIpIFFTS0lQKGEsIGIpCisjZWxz ZQorI2RlZmluZSBXX1FTS0lQKGEsIGIpIFFTS0lQKGEpCiAjZW5kaWYK 128512 2012-02-23 11:22:34 -0800 2012-02-24 06:36:14 -0800 Patch bug-79328-20120223202231.patch text/plain 9624 zecke U3VidmVyc2lvbiBSZXZpc2lvbjogMTA4NTI4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L3F0 L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nCmluZGV4IDBmNDkxM2Y5N2Fm N2M5ODczOTY2ZTZhNmNiMjI3MmE5MmI0ZGJlMjkuLjg3YjkzMWY1NWI3ODQyYTZjNTBiNzcwMDI2 ZmY0NTMzYTY5NGRlNDAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nCisr KyBiL1NvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjggQEAKKzIwMTItMDIt MjMgIEhvbGdlciBIYW5zIFBldGVyIEZyZXl0aGVyICA8aG9sZ2VyQG1vaWppLW1vYmlsZS5jb20+ CisKKyAgICAgICAgW1F0XSBCdWlsZCBmaXguIG1hY3JvICJRU0tJUCIgbm93IG9ubHkgdGFrZXMg MSBhcmd1bWVudCBvbiBRdDUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTc5MzI4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgSW50cm9kdWNlIGFuIGFsdGVybmF0aXZlIFFTS0lQIHRoYXQgY2FuIHdvcmsgd2l0 aCBib3RoIFF0NAorICAgICAgICBhbmQgUXQ1IHdpdGhvdXQgYWRkaW5nICNpZmRlZiB0byBlYWNo IHVzYWdlIHNpdGUuCisKKyAgICAgICAgKiB0ZXN0cy9iZW5jaG1hcmtzL2xvYWRpbmcvdHN0X2xv YWRpbmcuY3BwOgorICAgICAgICAodHN0X0xvYWRpbmc6OmxvYWQpOgorICAgICAgICAqIHRlc3Rz L2JlbmNobWFya3MvcGFpbnRpbmcvdHN0X3BhaW50aW5nLmNwcDoKKyAgICAgICAgKHRzdF9QYWlu dGluZzo6cGFpbnQpOgorICAgICAgICAqIHRlc3RzL3FkZWNsYXJhdGl2ZXdlYnZpZXcvdHN0X3Fk ZWNsYXJhdGl2ZXdlYnZpZXcuY3BwOgorICAgICAgICAodHN0X1FEZWNsYXJhdGl2ZVdlYlZpZXc6 OmVsZW1lbnRBcmVhQXQpOgorICAgICAgICAqIHRlc3RzL3F3ZWJmcmFtZS90c3RfcXdlYmZyYW1l LmNwcDoKKyAgICAgICAgKHRzdF9RV2ViRnJhbWU6OnNldEh0bWxXaXRoQmFzZVVSTCk6CisgICAg ICAgICogdGVzdHMvcXdlYnBhZ2UvdHN0X3F3ZWJwYWdlLmNwcDoKKyAgICAgICAgKHRzdF9RV2Vi UGFnZTo6Z2VvbG9jYXRpb25SZXF1ZXN0SlMpOgorICAgICAgICAodHN0X1FXZWJQYWdlOjpsb2Fk SHRtbDVWaWRlbyk6CisgICAgICAgICh0c3RfUVdlYlBhZ2U6OnNjcmVlbnNob3QpOgorICAgICAg ICAqIHRlc3RzL3F3ZWJ2aWV3L3RzdF9xd2Vidmlldy5jcHA6CisgICAgICAgICh0c3RfUVdlYlZp ZXc6OnJldXNlUGFnZSk6CisKIDIwMTItMDItMjIgIE1paG5lYSBPdmlkZW5pZSAgPG1paG5lYUBh ZG9iZS5jb20+CiAKICAgICAgICAgW1F0XSBSRUdSRVNTSU9OKHIxMDgxMDgpOiBJdCBtYWRlIDMg ZmFzdC9yZXBhaW50IHRlc3RzIGZhaWwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvcXQvdGVz dHMvYmVuY2htYXJrcy9sb2FkaW5nL3RzdF9sb2FkaW5nLmNwcCBiL1NvdXJjZS9XZWJLaXQvcXQv dGVzdHMvYmVuY2htYXJrcy9sb2FkaW5nL3RzdF9sb2FkaW5nLmNwcAppbmRleCA2NjFhN2UzY2I0 NjQ1YjdhOGNlZDA1ZmUxYWM0MWQ0ZGI5YjJmNjBlLi4xYzM5ODViODNjYTU1YmEyM2U2NjgzYmM1 NDg5MmQ5MjU0MDQ2OWQxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L3F0L3Rlc3RzL2JlbmNo bWFya3MvbG9hZGluZy90c3RfbG9hZGluZy5jcHAKKysrIGIvU291cmNlL1dlYktpdC9xdC90ZXN0 cy9iZW5jaG1hcmtzL2xvYWRpbmcvdHN0X2xvYWRpbmcuY3BwCkBAIC0yNSwyOCArMjUsNyBAQAog I2luY2x1ZGUgPHF3ZWJ2aWV3Lmg+CiAjaW5jbHVkZSA8cXBhaW50ZXIuaD4KIAotLyoqCi0gKiBT dGFydHMgYW4gZXZlbnQgbG9vcCB0aGF0IHJ1bnMgdW50aWwgdGhlIGdpdmVuIHNpZ25hbCBpcyBy ZWNlaXZlZC4KLSBPcHRpb25hbGx5IHRoZSBldmVudCBsb29wCi0gKiBjYW4gcmV0dXJuIGVhcmxp ZXIgb24gYSB0aW1lb3V0LgotICoKLSAqIFxyZXR1cm4gXHAgdHJ1ZSBpZiB0aGUgcmVxdWVzdGVk IHNpZ25hbCB3YXMgcmVjZWl2ZWQKLSAqICAgICAgICAgXHAgZmFsc2Ugb24gdGltZW91dAotICov Ci1zdGF0aWMgYm9vbCB3YWl0Rm9yU2lnbmFsKFFPYmplY3QqIG9iaiwgY29uc3QgY2hhciogc2ln bmFsLCBpbnQgdGltZW91dCA9IDApCi17Ci0gICAgUUV2ZW50TG9vcCBsb29wOwotICAgIFFPYmpl Y3Q6OmNvbm5lY3Qob2JqLCBzaWduYWwsICZsb29wLCBTTE9UKHF1aXQoKSkpOwotICAgIFFUaW1l ciB0aW1lcjsKLSAgICBRU2lnbmFsU3B5IHRpbWVvdXRTcHkoJnRpbWVyLCBTSUdOQUwodGltZW91 dCgpKSk7Ci0gICAgaWYgKHRpbWVvdXQgPiAwKSB7Ci0gICAgICAgIFFPYmplY3Q6OmNvbm5lY3Qo JnRpbWVyLCBTSUdOQUwodGltZW91dCgpKSwgJmxvb3AsIFNMT1QocXVpdCgpKSk7Ci0gICAgICAg IHRpbWVyLnNldFNpbmdsZVNob3QodHJ1ZSk7Ci0gICAgICAgIHRpbWVyLnN0YXJ0KHRpbWVvdXQp OwotICAgIH0KLSAgICBsb29wLmV4ZWMoKTsKLSAgICByZXR1cm4gdGltZW91dFNweS5pc0VtcHR5 KCk7Ci19CisjaW5jbHVkZSAidXRpbC5oIgogCiBjbGFzcyB0c3RfTG9hZGluZyA6IHB1YmxpYyBR T2JqZWN0CiB7CkBAIC05NiwxMyArNzUsMTMgQEAgdm9pZCB0c3RfTG9hZGluZzo6bG9hZCgpCiAg ICAgUUZFVENIKFFVcmwsIHVybCk7CiAKICAgICBpZiAoIW1fbWFuYWdlci5pc09ubGluZSgpKQot ICAgICAgICBRU0tJUCgiVGhpcyB0ZXN0IHJlcXVpcmVzIGFuIGFjdGl2ZSBuZXR3b3JrIGNvbm5l Y3Rpb24iLCBTa2lwU2luZ2xlKTsKKyAgICAgICAgV19RU0tJUCgiVGhpcyB0ZXN0IHJlcXVpcmVz IGFuIGFjdGl2ZSBuZXR3b3JrIGNvbm5lY3Rpb24iLCBTa2lwU2luZ2xlKTsKIAogICAgIFFCRU5D SE1BUksgewogICAgICAgICBtX3ZpZXctPmxvYWQodXJsKTsKIAogICAgICAgICAvLyByZWFsbHkg d2FpdCBmb3IgbG9hZGluZywgcGFpbnRpbmcgaXMgaW4gYW5vdGhlciB0ZXN0Ci0gICAgICAgIDo6 d2FpdEZvclNpZ25hbChtX3ZpZXcsIFNJR05BTChsb2FkRmluaXNoZWQoYm9vbCkpKTsKKyAgICAg ICAgOjp3YWl0Rm9yU2lnbmFsKG1fdmlldywgU0lHTkFMKGxvYWRGaW5pc2hlZChib29sKSksIDAp OwogICAgIH0KIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9xdC90ZXN0cy9iZW5jaG1h cmtzL3BhaW50aW5nL3RzdF9wYWludGluZy5jcHAgYi9Tb3VyY2UvV2ViS2l0L3F0L3Rlc3RzL2Jl bmNobWFya3MvcGFpbnRpbmcvdHN0X3BhaW50aW5nLmNwcAppbmRleCA0N2QzNGRjYmQ0NjE1ZTRi MzQ2ZWFlNjM5YWYyOWI2MzJjZTA2NDY2Li4zZjk3YjVhZWFmMGZkMjA1MGYzZjMyMGZiMTJkYTBk ZTZlMTI1Mjk5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L3F0L3Rlc3RzL2JlbmNobWFya3Mv cGFpbnRpbmcvdHN0X3BhaW50aW5nLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L3F0L3Rlc3RzL2Jl bmNobWFya3MvcGFpbnRpbmcvdHN0X3BhaW50aW5nLmNwcApAQCAtMjYsMjggKzI2LDcgQEAKICNp bmNsdWRlIDxxd2Vidmlldy5oPgogI2luY2x1ZGUgPHFwYWludGVyLmg+CiAKLS8qKgotICogU3Rh cnRzIGFuIGV2ZW50IGxvb3AgdGhhdCBydW5zIHVudGlsIHRoZSBnaXZlbiBzaWduYWwgaXMgcmVj ZWl2ZWQuCi0gT3B0aW9uYWxseSB0aGUgZXZlbnQgbG9vcAotICogY2FuIHJldHVybiBlYXJsaWVy IG9uIGEgdGltZW91dC4KLSAqCi0gKiBccmV0dXJuIFxwIHRydWUgaWYgdGhlIHJlcXVlc3RlZCBz aWduYWwgd2FzIHJlY2VpdmVkCi0gKiAgICAgICAgIFxwIGZhbHNlIG9uIHRpbWVvdXQKLSAqLwot c3RhdGljIGJvb2wgd2FpdEZvclNpZ25hbChRT2JqZWN0KiBvYmosIGNvbnN0IGNoYXIqIHNpZ25h bCwgaW50IHRpbWVvdXQgPSAwKQotewotICAgIFFFdmVudExvb3AgbG9vcDsKLSAgICBRT2JqZWN0 Ojpjb25uZWN0KG9iaiwgc2lnbmFsLCAmbG9vcCwgU0xPVChxdWl0KCkpKTsKLSAgICBRVGltZXIg dGltZXI7Ci0gICAgUVNpZ25hbFNweSB0aW1lb3V0U3B5KCZ0aW1lciwgU0lHTkFMKHRpbWVvdXQo KSkpOwotICAgIGlmICh0aW1lb3V0ID4gMCkgewotICAgICAgICBRT2JqZWN0Ojpjb25uZWN0KCZ0 aW1lciwgU0lHTkFMKHRpbWVvdXQoKSksICZsb29wLCBTTE9UKHF1aXQoKSkpOwotICAgICAgICB0 aW1lci5zZXRTaW5nbGVTaG90KHRydWUpOwotICAgICAgICB0aW1lci5zdGFydCh0aW1lb3V0KTsK LSAgICB9Ci0gICAgbG9vcC5leGVjKCk7Ci0gICAgcmV0dXJuIHRpbWVvdXRTcHkuaXNFbXB0eSgp OwotfQorI2luY2x1ZGUgInV0aWwuaCIKIAogY2xhc3MgdHN0X1BhaW50aW5nIDogcHVibGljIFFP YmplY3QKIHsKQEAgLTk2LDEwICs3NSwxMCBAQCB2b2lkIHRzdF9QYWludGluZzo6cGFpbnQoKQog ICAgIFFGRVRDSChRVXJsLCB1cmwpOwogCiAgICAgaWYgKCFtX21hbmFnZXIuaXNPbmxpbmUoKSkK LSAgICAgICAgUVNLSVAoIlRoaXMgdGVzdCByZXF1aXJlcyBhbiBhY3RpdmUgbmV0d29yayBjb25u ZWN0aW9uIiwgU2tpcFNpbmdsZSk7CisgICAgICAgIFdfUVNLSVAoIlRoaXMgdGVzdCByZXF1aXJl cyBhbiBhY3RpdmUgbmV0d29yayBjb25uZWN0aW9uIiwgU2tpcFNpbmdsZSk7CiAKICAgICBtX3Zp ZXctPmxvYWQodXJsKTsKLSAgICA6OndhaXRGb3JTaWduYWwobV92aWV3LCBTSUdOQUwobG9hZEZp bmlzaGVkKGJvb2wpKSk7CisgICAgOjp3YWl0Rm9yU2lnbmFsKG1fdmlldywgU0lHTkFMKGxvYWRG aW5pc2hlZChib29sKSksIDApOwogCiAgICAgLyogZm9yY2UgYSBsYXlvdXQgKi8KICAgICBRV2Vi RnJhbWUqIG1haW5GcmFtZSA9IG1fcGFnZS0+bWFpbkZyYW1lKCk7CkBAIC0xMTYsNyArOTUsNyBA QCB2b2lkIHRzdF9QYWludGluZzo6cGFpbnQoKQogdm9pZCB0c3RfUGFpbnRpbmc6OnRleHRBcmVh cygpCiB7CiAgICAgbV92aWV3LT5sb2FkKFFVcmwoImRhdGE6dGV4dC9odG1sOzxodG1sPjxib2R5 PjwvYm9keT48L2h0bWw+IikpOwotICAgIDo6d2FpdEZvclNpZ25hbChtX3ZpZXcsIFNJR05BTChs b2FkRmluaXNoZWQoYm9vbCkpKTsKKyAgICA6OndhaXRGb3JTaWduYWwobV92aWV3LCBTSUdOQUwo bG9hZEZpbmlzaGVkKGJvb2wpKSwgMCk7CiAKICAgICBRV2ViRWxlbWVudCBib2R5RWxlbWVudCA9 IG1fcGFnZS0+bWFpbkZyYW1lKCktPmZpbmRGaXJzdEVsZW1lbnQoImJvZHkiKTsKIApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdC9xdC90ZXN0cy9xZGVjbGFyYXRpdmV3ZWJ2aWV3L3RzdF9xZGVj bGFyYXRpdmV3ZWJ2aWV3LmNwcCBiL1NvdXJjZS9XZWJLaXQvcXQvdGVzdHMvcWRlY2xhcmF0aXZl d2Vidmlldy90c3RfcWRlY2xhcmF0aXZld2Vidmlldy5jcHAKaW5kZXggMWY5YTJmZjg0ZGNlNTU5 ZjA4NDI3M2MyMDI1OGNhZmI5ZmE1ZGNkNi4uZjk0MjFlM2NmZGRkOWExZjFhZTQwMGUwMDZkYmNi OWY1ZjQwOTFhZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9xdC90ZXN0cy9xZGVjbGFyYXRp dmV3ZWJ2aWV3L3RzdF9xZGVjbGFyYXRpdmV3ZWJ2aWV3LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0 L3F0L3Rlc3RzL3FkZWNsYXJhdGl2ZXdlYnZpZXcvdHN0X3FkZWNsYXJhdGl2ZXdlYnZpZXcuY3Bw CkBAIC0xMzksNyArMTM5LDcgQEAgdm9pZCB0c3RfUURlY2xhcmF0aXZlV2ViVmlldzo6YmFzaWNQ cm9wZXJ0aWVzKCkKIAogdm9pZCB0c3RfUURlY2xhcmF0aXZlV2ViVmlldzo6ZWxlbWVudEFyZWFB dCgpCiB7Ci0gICAgUVNLSVAoIlRoaXMgdGVzdCBzaG91bGQgYmUgY2hhbmdlZCB0byB0ZXN0ICdo ZXVyaXN0aWNab29tJyBpbnN0ZWFkLiIsIFNraXBBbGwpOworICAgIFdfUVNLSVAoIlRoaXMgdGVz dCBzaG91bGQgYmUgY2hhbmdlZCB0byB0ZXN0ICdoZXVyaXN0aWNab29tJyBpbnN0ZWFkLiIsIFNr aXBBbGwpOwogICAgIFFEZWNsYXJhdGl2ZUVuZ2luZSBlbmdpbmU7CiAgICAgUURlY2xhcmF0aXZl Q29tcG9uZW50IGNvbXBvbmVudCgmZW5naW5lLCBRVXJsKCJxcmM6Ly8vcmVzb3VyY2VzL2VsZW1l bnRzLnFtbCIpKTsKICAgICBjaGVja05vRXJyb3JzKGNvbXBvbmVudCk7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0L3F0L3Rlc3RzL3F3ZWJmcmFtZS90c3RfcXdlYmZyYW1lLmNwcCBiL1NvdXJj ZS9XZWJLaXQvcXQvdGVzdHMvcXdlYmZyYW1lL3RzdF9xd2ViZnJhbWUuY3BwCmluZGV4IDNlYjA4 YzQ1MDhkODVmMzNhZDJhYWE0NjY1MjUzOWZmYWFkMWZiYmIuLjJjMjhhZWYxZjRkZTFmYWYwN2Uy NWU0YjViY2Q0NWJiYTBlZTc0MzEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvcXQvdGVzdHMv cXdlYmZyYW1lL3RzdF9xd2ViZnJhbWUuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvcXQvdGVzdHMv cXdlYmZyYW1lL3RzdF9xd2ViZnJhbWUuY3BwCkBAIC0yNTU1LDcgKzI1NTUsNyBAQCB2b2lkIHRz dF9RV2ViRnJhbWU6OnNldEh0bWxXaXRoQmFzZVVSTCgpCiAgICAgLy8gQXMgd2UgYXJlIHVzaW5n IGEgbG9jYWwgZmlsZSBhcyBiYXNlVXJsLCBpdHMgc2VjdXJpdHkgb3JpZ2luIHNob3VsZCBiZSBh YmxlIHRvIGxvYWQgbG9jYWwgcmVzb3VyY2VzLgogCiAgICAgaWYgKCFRRGlyKFRFU1RTX1NPVVJD RV9ESVIpLmV4aXN0cygpKQotICAgICAgICBRU0tJUChRU3RyaW5nKCJUaGlzIHRlc3QgcmVxdWly ZXMgYWNjZXNzIHRvIHJlc291cmNlcyBmb3VuZCBpbiAnJTEnIikuYXJnKFRFU1RTX1NPVVJDRV9E SVIpLnRvTGF0aW4xKCkuY29uc3REYXRhKCksIFNraXBBbGwpOworICAgICAgICBXX1FTS0lQKFFT dHJpbmcoIlRoaXMgdGVzdCByZXF1aXJlcyBhY2Nlc3MgdG8gcmVzb3VyY2VzIGZvdW5kIGluICcl MSciKS5hcmcoVEVTVFNfU09VUkNFX0RJUikudG9MYXRpbjEoKS5jb25zdERhdGEoKSwgU2tpcEFs bCk7CiAKICAgICBRRGlyOjpzZXRDdXJyZW50KFRFU1RTX1NPVVJDRV9ESVIpOwogCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0L3F0L3Rlc3RzL3F3ZWJwYWdlL3RzdF9xd2VicGFnZS5jcHAgYi9T b3VyY2UvV2ViS2l0L3F0L3Rlc3RzL3F3ZWJwYWdlL3RzdF9xd2VicGFnZS5jcHAKaW5kZXggYzBm N2JiOTIwY2NiMGM0MDhiZDI3N2VkYThjOTA0NGY5MzIxZTllNi4uYjZmMGFlZWUzMDE5YzVjODJk NmNmYTkxYzAwOGMyYTNmM2FkMjliYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9xdC90ZXN0 cy9xd2VicGFnZS90c3RfcXdlYnBhZ2UuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvcXQvdGVzdHMv cXdlYnBhZ2UvdHN0X3F3ZWJwYWdlLmNwcApAQCAtMzA1LDcgKzMwNSw3IEBAIHZvaWQgdHN0X1FX ZWJQYWdlOjpnZW9sb2NhdGlvblJlcXVlc3RKUygpCiAKICAgICBpZiAobmV3UGFnZS0+bWFpbkZy YW1lKCktPmV2YWx1YXRlSmF2YVNjcmlwdChRTGF0aW4xU3RyaW5nKCIhbmF2aWdhdG9yLmdlb2xv Y2F0aW9uIikpLnRvQm9vbCgpKSB7CiAgICAgICAgIGRlbGV0ZSBuZXdQYWdlOwotICAgICAgICBR U0tJUCgiR2VvbG9jYXRpb24gaXMgbm90IHN1cHBvcnRlZC4iLCBTa2lwU2luZ2xlKTsKKyAgICAg ICAgV19RU0tJUCgiR2VvbG9jYXRpb24gaXMgbm90IHN1cHBvcnRlZC4iLCBTa2lwU2luZ2xlKTsK ICAgICB9CiAKICAgICBjb25uZWN0KG5ld1BhZ2UsIFNJR05BTChmZWF0dXJlUGVybWlzc2lvblJl cXVlc3RlZChRV2ViRnJhbWUqLCBRV2ViUGFnZTo6RmVhdHVyZSkpLApAQCAtNTM1LDcgKzUzNSw3 IEBAIHZvaWQgdHN0X1FXZWJQYWdlOjpsb2FkSHRtbDVWaWRlbygpCiAgICAgUUVYUEVDVF9GQUlM KCIiLCAiaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY1NDUyIiwgQ29u dGludWUpOwogICAgIFFDT01QQVJFKG1VcmwudG9FbmNvZGVkKCksIHVybCk7CiAjZWxzZQotICAg IFFTS0lQKCJUaGlzIHRlc3QgcmVxdWlyZXMgUXQgTXVsdGltZWRpYSIsIFNraXBBbGwpOworICAg IFdfUVNLSVAoIlRoaXMgdGVzdCByZXF1aXJlcyBRdCBNdWx0aW1lZGlhIiwgU2tpcEFsbCk7CiAj ZW5kaWYKIH0KIApAQCAtMjc0NCw3ICsyNzQ0LDcgQEAgdm9pZCB0c3RfUVdlYlBhZ2U6OnNjcmVl bnNob3RfZGF0YSgpCiB2b2lkIHRzdF9RV2ViUGFnZTo6c2NyZWVuc2hvdCgpCiB7CiAgICAgaWYg KCFRRGlyKFRFU1RTX1NPVVJDRV9ESVIpLmV4aXN0cygpKQotICAgICAgICBRU0tJUChRU3RyaW5n KCJUaGlzIHRlc3QgcmVxdWlyZXMgYWNjZXNzIHRvIHJlc291cmNlcyBmb3VuZCBpbiAnJTEnIiku YXJnKFRFU1RTX1NPVVJDRV9ESVIpLnRvTGF0aW4xKCkuY29uc3REYXRhKCksIFNraXBBbGwpOwor ICAgICAgICBXX1FTS0lQKFFTdHJpbmcoIlRoaXMgdGVzdCByZXF1aXJlcyBhY2Nlc3MgdG8gcmVz b3VyY2VzIGZvdW5kIGluICclMSciKS5hcmcoVEVTVFNfU09VUkNFX0RJUikudG9MYXRpbjEoKS5j b25zdERhdGEoKSwgU2tpcEFsbCk7CiAKICAgICBRRGlyOjpzZXRDdXJyZW50KFRFU1RTX1NPVVJD RV9ESVIpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L3F0L3Rlc3RzL3F3ZWJ2aWV3L3Rz dF9xd2Vidmlldy5jcHAgYi9Tb3VyY2UvV2ViS2l0L3F0L3Rlc3RzL3F3ZWJ2aWV3L3RzdF9xd2Vi dmlldy5jcHAKaW5kZXggYmUyYzRjOTg1ZWRkMDhlYzQxNzgzYzg1ZjJmNmY2M2MxMzM2NjVjMS4u ZjdkYzljNWY0ZjUxYWQxZDY3MTkwMjY0MjJmZGE1YzBiYWI4OWYxZCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdC9xdC90ZXN0cy9xd2Vidmlldy90c3RfcXdlYnZpZXcuY3BwCisrKyBiL1NvdXJj ZS9XZWJLaXQvcXQvdGVzdHMvcXdlYnZpZXcvdHN0X3F3ZWJ2aWV3LmNwcApAQCAtMTMzLDcgKzEz Myw3IEBAIHZvaWQgdHN0X1FXZWJWaWV3OjpyZXVzZVBhZ2VfZGF0YSgpCiB2b2lkIHRzdF9RV2Vi Vmlldzo6cmV1c2VQYWdlKCkKIHsKICAgICBpZiAoIVFEaXIoVEVTVFNfU09VUkNFX0RJUikuZXhp c3RzKCkpCi0gICAgICAgIFFTS0lQKFFTdHJpbmcoIlRoaXMgdGVzdCByZXF1aXJlcyBhY2Nlc3Mg dG8gcmVzb3VyY2VzIGZvdW5kIGluICclMSciKS5hcmcoVEVTVFNfU09VUkNFX0RJUikudG9MYXRp bjEoKS5jb25zdERhdGEoKSwgU2tpcEFsbCk7CisgICAgICAgIFdfUVNLSVAoUVN0cmluZygiVGhp cyB0ZXN0IHJlcXVpcmVzIGFjY2VzcyB0byByZXNvdXJjZXMgZm91bmQgaW4gJyUxJyIpLmFyZyhU RVNUU19TT1VSQ0VfRElSKS50b0xhdGluMSgpLmNvbnN0RGF0YSgpLCBTa2lwQWxsKTsKIAogICAg IFFEaXI6OnNldEN1cnJlbnQoVEVTVFNfU09VUkNFX0RJUik7CiAKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQvcXQvdGVzdHMvdXRpbC5oIGIvU291cmNlL1dlYktpdC9xdC90ZXN0cy91dGlsLmgK aW5kZXggOTQ2MjhjYTljMDkyNDc0YTUxZmIyMTNhNjRmNmJlNWYwODFiZjljYS4uMjIxOTJiYWQy ZjkzZGU4ZDc5ZjdjN2MyZGU1YTY4YWFlZTAzYzBiZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dC9xdC90ZXN0cy91dGlsLmgKKysrIGIvU291cmNlL1dlYktpdC9xdC90ZXN0cy91dGlsLmgKQEAg LTc3LDQgKzc3LDkgQEAgc3RhdGljIGJvb2wgd2FpdEZvclNpZ25hbChRT2JqZWN0KiBvYmosIGNv bnN0IGNoYXIqIHNpZ25hbCwgaW50IHRpbWVvdXQgPSAxMDAwMCkKICAgICAgICAgfSBcCiAgICAg ICAgIFFDT01QQVJFKF9fZXhwciwgX19leHBlY3RlZCk7IFwKICAgICB9IHdoaWxlKDApCisKKy8v IENvbXBhdGliaWxpdHkgZm9yIFF0NQorI2RlZmluZSBXX1FTS0lQKGEsIGIpIFFTS0lQKGEsIGIp CisjZWxzZQorI2RlZmluZSBXX1FTS0lQKGEsIGIpIFFTS0lQKGEpCiAjZW5kaWYK