112928 2013-03-21 10:14:34 -0700 [chromium] Remove SK_SUPPORT_HINTING_SCALE_FACTOR flag and code 2013-03-21 14:25:20 -0700 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 tdanderson tdanderson cc-bugs jamesr junov senorblanco webkit.review.bot oldest_to_newest 860441 0 tdanderson 2013-03-21 10:14:34 -0700 This flag was only for ChromeOS builds with HighDPI. It is no longer needed and can be removed. See http://crbug.com/175506 860448 1 194288 tdanderson 2013-03-21 10:19:18 -0700 Created attachment 194288 WIP, not for review 860616 2 194288 senorblanco 2013-03-21 13:21:05 -0700 Comment on attachment 194288 WIP, not for review OK. r=me 860636 3 194288 webkit.review.bot 2013-03-21 13:46:16 -0700 Comment on attachment 194288 WIP, not for review Rejecting attachment 194288 from commit-queue. Failed to run "['/mnt/git/webkit-commit-queue/Tools/Scripts/webkit-patch', '--status-host=webkit-commit-queue.appspot.com', '--bot-id=gce-cq-03', 'land-attachment', '--force-clean', '--non-interactive', '--parent-command=commit-queue', 194288, '--port=chromium-xvfb']" exit_code: 2 cwd: /mnt/git/webkit-commit-queue Last 500 characters of output: rce/WebKit/chromium/webkit/media/crypto/ppapi/cdm --revision 181763 --non-interactive --force --accept theirs-conflict --ignore-externals' in '/mnt/git/webkit-commit-queue/Source/WebKit/chromium' 58>At revision 181763. ________ running '/usr/bin/python tools/clang/scripts/update.py --mac-only' in '/mnt/git/webkit-commit-queue/Source/WebKit/chromium' ________ running '/usr/bin/python gyp_webkit' in '/mnt/git/webkit-commit-queue/Source/WebKit/chromium' Updating webkit projects from gyp files... Full output: http://webkit-commit-queue.appspot.com/results/17206717 860663 4 194329 tdanderson 2013-03-21 14:02:52 -0700 Created attachment 194329 fixing merge conflict 860694 5 194329 webkit.review.bot 2013-03-21 14:25:17 -0700 Comment on attachment 194329 fixing merge conflict Clearing flags on attachment: 194329 Committed r146519: <http://trac.webkit.org/changeset/146519> 860696 6 webkit.review.bot 2013-03-21 14:25:20 -0700 All reviewed patches have been landed. Closing bug. 194288 2013-03-21 10:19:18 -0700 2013-03-21 14:02:49 -0700 WIP, not for review bug-112928-20130321131506.patch text/plain 9134 tdanderson U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ2NDc2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZmRkNWU2NmIyYjM4ODEz ZTJmYzMxMWQxNmE1YjU4NzU0MjM3YzdkYi4uNmI5Y2UxOGU4ZWE0YmRhMzRmMWIyYWVkZmMxMTVj OWQ3M2EwMjRkOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDEzLTAzLTIxICBUZXJy eSBBbmRlcnNvbiAgPHRkYW5kZXJzb25AY2hyb21pdW0ub3JnPgorCisgICAgICAgIFtjaHJvbWl1 bV0gUmVtb3ZlIFNLX1NVUFBPUlRfSElOVElOR19TQ0FMRV9GQUNUT1IgZmxhZyBhbmQgY29kZQor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTEyOTI4CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhpcyBmbGFn IHdhcyBvbmx5IGZvciBDaHJvbWVPUyBidWlsZHMgd2l0aCBIaWdoRFBJLiBJdCBpcyBubyBsb25n ZXIgbmVlZGVkIGFuZCBjYW4gYmUgcmVtb3ZlZC4gCisgICAgICAgIFNlZSBodHRwOi8vY3JidWcu Y29tLzE3NTUwCisKKyAgICAgICAgTm8gbmV3IHRlc3RzIG5lZWRlZCBzaW5jZSB0aGlzIGlzIGp1 c3QgcmVtb3ZpbmcgdW51c2VkIGNvZGUuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9j aHJvbWl1bS9PcGFxdWVSZWN0VHJhY2tpbmdDb250ZW50TGF5ZXJEZWxlZ2F0ZS5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpPcGFxdWVSZWN0VHJhY2tpbmdDb250ZW50TGF5ZXJEZWxlZ2F0ZTo6cGFp bnRDb250ZW50cyk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3Mvc2tpYS9QbGF0Zm9ybUNv bnRleHRTa2lhLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlBsYXRmb3JtQ29udGV4dFNraWE6OlBs YXRmb3JtQ29udGV4dFNraWEpOgorICAgICAgICAoV2ViQ29yZTo6UGxhdGZvcm1Db250ZXh0U2tp YTo6c2V0dXBQYWludENvbW1vbik6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3Mvc2tpYS9Q bGF0Zm9ybUNvbnRleHRTa2lhLmg6CisKIDIwMTMtMDMtMTggIEFuZHJleSBLb3N5YWtvdiAgPGNh c2VxQGNocm9taXVtLm9yZz4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBQYWludCByZWN0YW5n bGVzIHNob3duIG9uIGhvdmVyIG92ZXIgVGltZWxpbmUncyBwYWludCByZWNvcmRzIG9jY2FzaW9u YWxseSBoYXZlIHdyb25nIG9mZnNldHMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21p dW0vQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKaW5kZXggNmU3 OGIyNzU2NmQ4MmEwNzBjMzBjMzIyZmVjNWU3NTlkNTY2N2IxZi4uN2MwOGNhMWYxMmE0YTUwNWVh ODNhYzFiYTM1YzhlNTU3NWE5OThjZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1 bS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxNyBAQAorMjAxMy0wMy0yMSAgVGVycnkgQW5kZXJzb24gIDx0ZGFuZGVyc29uQGNocm9t aXVtLm9yZz4KKworICAgICAgICBbY2hyb21pdW1dIFJlbW92ZSBTS19TVVBQT1JUX0hJTlRJTkdf U0NBTEVfRkFDVE9SIGZsYWcgYW5kIGNvZGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTExMjkyOAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIFRoaXMgZmxhZyB3YXMgb25seSBmb3IgQ2hyb21lT1MgYnVpbGRz IHdpdGggSGlnaERQSS4gSXQgaXMgbm8gbG9uZ2VyIG5lZWRlZCBhbmQgY2FuIGJlIHJlbW92ZWQu IAorICAgICAgICBTZWUgaHR0cDovL2NyYnVnLmNvbS8xNzU1MAorCisgICAgICAgICogZmVhdHVy ZXMuZ3lwaToKKyAgICAgICAgKiB0ZXN0cy9PcGFxdWVSZWN0VHJhY2tpbmdDb250ZW50TGF5ZXJE ZWxlZ2F0ZVRlc3QuY3BwOgorICAgICAgICAqIHRlc3RzL1BsYXRmb3JtQ29udGV4dFNraWFUZXN0 LmNwcDoKKwogMjAxMy0wMy0yMCAgU2hlcmlmZiBCb3QgIDx3ZWJraXQucmV2aWV3LmJvdEBnbWFp bC5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZC4gIFJvbGxlZCBDaHJvbWl1bSBERVBTIHRvIHIx ODk0OTcuICBSZXF1ZXN0ZWQgYnkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL2Nocm9taXVtL09wYXF1ZVJlY3RUcmFja2luZ0NvbnRlbnRMYXllckRlbGVnYXRl LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL09wYXF1ZVJl Y3RUcmFja2luZ0NvbnRlbnRMYXllckRlbGVnYXRlLmNwcAppbmRleCAwYzQ5NmRmY2UzMmVlNGJl MWU4ZjdkYjg3NzBkNmVmZmVjMzQxYTY4Li4xZjAzOGQ5ODk1NDI2ZjgzMmY5YWNlNGFjYWU4MzZl NjQyOGI1ZTJjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9j aHJvbWl1bS9PcGFxdWVSZWN0VHJhY2tpbmdDb250ZW50TGF5ZXJEZWxlZ2F0ZS5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vT3BhcXVlUmVjdFRyYWNr aW5nQ29udGVudExheWVyRGVsZWdhdGUuY3BwCkBAIC01MiwxMCArNTIsNiBAQCBPcGFxdWVSZWN0 VHJhY2tpbmdDb250ZW50TGF5ZXJEZWxlZ2F0ZTo6fk9wYXF1ZVJlY3RUcmFja2luZ0NvbnRlbnRM YXllckRlbGVnYXRlKAogdm9pZCBPcGFxdWVSZWN0VHJhY2tpbmdDb250ZW50TGF5ZXJEZWxlZ2F0 ZTo6cGFpbnRDb250ZW50cyhTa0NhbnZhcyogY2FudmFzLCBjb25zdCBXZWJSZWN0JiBjbGlwLCBi b29sIGNhblBhaW50TENEVGV4dCwgV2ViRmxvYXRSZWN0JiBvcGFxdWUpCiB7CiAgICAgUGxhdGZv cm1Db250ZXh0U2tpYSBwbGF0Zm9ybUNvbnRleHQoY2FudmFzKTsKLSNpZiBkZWZpbmVkKFNLX1NV UFBPUlRfSElOVElOR19TQ0FMRV9GQUNUT1IpCi0gICAgaWYgKGNhbnZhcykKLSAgICAgICAgcGxh dGZvcm1Db250ZXh0LnNldEhpbnRpbmdTY2FsZUZhY3RvcihjYW52YXMtPmdldFRvdGFsTWF0cml4 KCkuZ2V0U2NhbGVYKCkpOwotI2VuZGlmCiAgICAgcGxhdGZvcm1Db250ZXh0LnNldFRyYWNrT3Bh cXVlUmVnaW9uKCFtX29wYXF1ZSk7CiAgICAgcGxhdGZvcm1Db250ZXh0LnNldERyYXdpbmdUb0lt YWdlQnVmZmVyKCFtX29wYXF1ZSk7CiAgICAgR3JhcGhpY3NDb250ZXh0IGNvbnRleHQoJnBsYXRm b3JtQ29udGV4dCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9za2lhL1BsYXRmb3JtQ29udGV4dFNraWEuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3Mvc2tpYS9QbGF0Zm9ybUNvbnRleHRTa2lhLmNwcAppbmRleCA1ZjI2ZDk3MTE0MjBh MzkzMzU2NzlkNmM5ZmIyMjg2OWQzZmQxOTlhLi42YmI4ODJhZDlhZTlhMDg0NzM1ZjcyOWExYjdh MTEyNTZkYTdiYjc0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9za2lhL1BsYXRmb3JtQ29udGV4dFNraWEuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL3NraWEvUGxhdGZvcm1Db250ZXh0U2tpYS5jcHAKQEAgLTE5Nyw5ICsxOTcs NiBAQCBQbGF0Zm9ybUNvbnRleHRTa2lhOjpQbGF0Zm9ybUNvbnRleHRTa2lhKFNrQ2FudmFzKiBj YW52YXMpCiAgICAgLCBtX2RlZmVycmVkKGZhbHNlKQogICAgICwgbV9kcmF3aW5nVG9JbWFnZUJ1 ZmZlcihmYWxzZSkKICAgICAsIG1fZGV2aWNlU2NhbGVGYWN0b3IoMSkKLSNpZiBkZWZpbmVkKFNL X1NVUFBPUlRfSElOVElOR19TQ0FMRV9GQUNUT1IpCi0gICAgLCBtX2hpbnRpbmdTY2FsZUZhY3Rv cihTS19TY2FsYXIxKQotI2VuZGlmCiB7CiAgICAgbV9zdGF0ZVN0YWNrLmFwcGVuZChTdGF0ZSgp KTsKICAgICBtX3N0YXRlID0gJm1fc3RhdGVTdGFjay5sYXN0KCk7CkBAIC0zNTksOSArMzU2LDYg QEAgdm9pZCBQbGF0Zm9ybUNvbnRleHRTa2lhOjpzZXR1cFBhaW50Q29tbW9uKFNrUGFpbnQqIHBh aW50KSBjb25zdAogICAgIHBhaW50LT5zZXRBbnRpQWxpYXMobV9zdGF0ZS0+bV91c2VBbnRpYWxp YXNpbmcpOwogICAgIHBhaW50LT5zZXRYZmVybW9kZU1vZGUobV9zdGF0ZS0+bV94ZmVyTW9kZSk7 CiAgICAgcGFpbnQtPnNldExvb3BlcihtX3N0YXRlLT5tX2xvb3Blcik7Ci0jaWYgZGVmaW5lZChT S19TVVBQT1JUX0hJTlRJTkdfU0NBTEVfRkFDVE9SKQotICAgIHBhaW50LT5zZXRIaW50aW5nU2Nh bGVGYWN0b3IobV9oaW50aW5nU2NhbGVGYWN0b3IpOwotI2VuZGlmCiB9CiAKIHZvaWQgUGxhdGZv cm1Db250ZXh0U2tpYTo6c2V0dXBTaGFkZXIoU2tQYWludCogcGFpbnQsIEdyYWRpZW50KiBncmFk LCBQYXR0ZXJuKiBwYXQsIFNrQ29sb3IgY29sb3IpIGNvbnN0CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9za2lhL1BsYXRmb3JtQ29udGV4dFNraWEuaCBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3NraWEvUGxhdGZvcm1Db250ZXh0U2tpYS5o CmluZGV4IDhiZTY5ZjZhZWU3MGVlM2U3OTNlNTA4YzY3NTllYzc3N2Y4MmEwMTMuLjA3ODk2MTI5 N2E5MmNjMTgxZGRjM2FkNjA5YmUyODZmOTVhZThhY2UgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL3NraWEvUGxhdGZvcm1Db250ZXh0U2tpYS5oCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3NraWEvUGxhdGZvcm1Db250ZXh0U2tpYS5o CkBAIC0yNTEsMTEgKzI1MSw2IEBAIHB1YmxpYzoKICAgICB2b2lkIGRyYXdUZXh0T25QYXRoKGNv bnN0IHZvaWQqIHRleHQsIHNpemVfdCBieXRlTGVuZ3RoLCBjb25zdCBTa1BhdGgmLAogICAgICAg ICBjb25zdCBTa01hdHJpeCosIGNvbnN0IFNrUGFpbnQmKTsKIAotI2lmIGRlZmluZWQoU0tfU1VQ UE9SVF9ISU5USU5HX1NDQUxFX0ZBQ1RPUikKLSAgICB2b2lkIHNldEhpbnRpbmdTY2FsZUZhY3Rv cihTa1NjYWxhciBmYWN0b3IpIHsgbV9oaW50aW5nU2NhbGVGYWN0b3IgPSBmYWN0b3I7IH0KLSAg ICBTa1NjYWxhciBoaW50aW5nU2NhbGVGYWN0b3IoKSBjb25zdCB7IHJldHVybiBtX2hpbnRpbmdT Y2FsZUZhY3RvcjsgfQotI2VuZGlmCi0KIHByaXZhdGU6CiAgICAgLy8gVXNlZCB3aGVuIHJlc3Rv cmluZyBhbmQgdGhlIHN0YXRlIGhhcyBhbiBpbWFnZSBjbGlwLiBPbmx5IHNob3dzIHRoZSBwaXhl bHMgaW4KICAgICAvLyBtX2NhbnZhcyB0aGF0IGFyZSBhbHNvIGluIGltYWdlQnVmZmVyLgpAQCAt Mjk5LDkgKzI5NCw2IEBAIHByaXZhdGU6CiAgICAgYm9vbCBtX2RlZmVycmVkOwogICAgIGJvb2wg bV9kcmF3aW5nVG9JbWFnZUJ1ZmZlcjsKICAgICBmbG9hdCBtX2RldmljZVNjYWxlRmFjdG9yOwot I2lmIGRlZmluZWQoU0tfU1VQUE9SVF9ISU5USU5HX1NDQUxFX0ZBQ1RPUikKLSAgICBTa1NjYWxh ciBtX2hpbnRpbmdTY2FsZUZhY3RvcjsKLSNlbmRpZgogfTsKIAogaW5saW5lIHZvaWQgUGxhdGZv cm1Db250ZXh0U2tpYTo6cmVhbGl6ZVNhdmUoU2tDYW52YXM6OlNhdmVGbGFncyBmbGFncykKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vZmVhdHVyZXMuZ3lwaSBiL1NvdXJjZS9X ZWJLaXQvY2hyb21pdW0vZmVhdHVyZXMuZ3lwaQppbmRleCA5YTJhY2MyOThiMGU0Zjc4MGNiYzZi YzYxY2EzM2FmNTFlNDgwZGYzLi5lMmI4M2M0ZjdhOTNlYmIyMmViNmQ0YTc2MWQ5MDFhNDcwOTUw ZGM2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL2ZlYXR1cmVzLmd5cGkKKysr IGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9mZWF0dXJlcy5neXBpCkBAIC0yNDcsMTEgKzI0Nyw2 IEBACiAgICAgICAgICAgJ1dURl9VU0VfSEFSRkJVWlo9MScsCiAgICAgICAgIF0sCiAgICAgICB9 XSwKLSAgICAgIFsnY2hyb21lb3M9PTEnLCB7Ci0gICAgICAgICdmZWF0dXJlX2RlZmluZXMnOiBb Ci0gICAgICAgICAgJ1NLX1NVUFBPUlRfSElOVElOR19TQ0FMRV9GQUNUT1InLAotICAgICAgICBd LAotICAgICAgfV0sCiAgICAgICBbJ3VzZV9kZWZhdWx0X3JlbmRlcl90aGVtZT09MScsIHsKICAg ICAgICAgJ2ZlYXR1cmVfZGVmaW5lcyc6IFsKICAgICAgICAgICAnRU5BQkxFX0RFRkFVTFRfUkVO REVSX1RIRU1FPTEnLApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0cy9P cGFxdWVSZWN0VHJhY2tpbmdDb250ZW50TGF5ZXJEZWxlZ2F0ZVRlc3QuY3BwIGIvU291cmNlL1dl YktpdC9jaHJvbWl1bS90ZXN0cy9PcGFxdWVSZWN0VHJhY2tpbmdDb250ZW50TGF5ZXJEZWxlZ2F0 ZVRlc3QuY3BwCmluZGV4IDM5ZTM2YTlmYjExNTU0OWI3ZGQ2Mzg4NGNkN2M2MzExOWM3ZTFmNDEu LjYyN2RjNzA4OWMxNTE5ZTIyNjgyNTM1Y2NiMjhjMjIxNWUwZGY4NjYgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMvT3BhcXVlUmVjdFRyYWNraW5nQ29udGVudExheWVy RGVsZWdhdGVUZXN0LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL09wYXF1 ZVJlY3RUcmFja2luZ0NvbnRlbnRMYXllckRlbGVnYXRlVGVzdC5jcHAKQEAgLTEwMSwyMiArMTAx LDYgQEAgc3RydWN0IFBhaW50RmlsbFBhcnRpYWxPcGFxdWUgOiBwdWJsaWMgUGFpbnRDYWxsYmFj ayB7CiAgICAgSW50UmVjdCBtX29wYXF1ZVJlY3Q7CiB9OwogCi0jaWYgZGVmaW5lZChTS19TVVBQ T1JUX0hJTlRJTkdfU0NBTEVfRkFDVE9SKQotc3RydWN0IEhpbnRpbmdTY2FsZUNhbGxiYWNrIDog cHVibGljIFBhaW50Q2FsbGJhY2sgewotICAgIEhpbnRpbmdTY2FsZUNhbGxiYWNrKCkKLSAgICAg ICAgOiBoaW50aW5nU2NhbGUoU0tfU2NhbGFyMSkKLSAgICB7Ci0gICAgfQotCi0gICAgdmlydHVh bCB2b2lkIG9wZXJhdG9yKCkoR3JhcGhpY3NDb250ZXh0JiBjb250ZXh0LCBjb25zdCBJbnRSZWN0 JiBjb250ZW50UmVjdCkKLSAgICB7Ci0gICAgICAgIGhpbnRpbmdTY2FsZSA9IGNvbnRleHQucGxh dGZvcm1Db250ZXh0KCktPmhpbnRpbmdTY2FsZUZhY3RvcigpOwotICAgIH0KLQotICAgIFNrU2Nh bGFyIGhpbnRpbmdTY2FsZTsKLX07Ci0jZW5kaWYKLQogI2RlZmluZSBFWFBFQ1RfRVFfUkVDVChh LCBiKSBcCiAgICAgRVhQRUNUX0VRKGEueCwgYi54KTsgXAogICAgIEVYUEVDVF9FUShhLndpZHRo LCBiLndpZHRoKTsgXApAQCAtMjExLDIzICsxOTUsNCBAQCBURVNUX0YoT3BhcXVlUmVjdFRyYWNr aW5nQ29udGVudExheWVyRGVsZWdhdGVUZXN0LCB0ZXN0UGFydGlhbE9wYXF1ZVJlY3RUcmFuc2xh dAogICAgIEVYUEVDVF9FUV9SRUNUKFdlYkZsb2F0UmVjdChwYXJ0aWFsUmVjdC54KCksIHBhcnRp YWxSZWN0LnkoKSwgcGFydGlhbFJlY3Qud2lkdGgoKSwgcGFydGlhbFJlY3QuaGVpZ2h0KCkpLCBv cGFxdWVSZWN0KTsKIH0KIAotI2lmIGRlZmluZWQoU0tfU1VQUE9SVF9ISU5USU5HX1NDQUxFX0ZB Q1RPUikKLVRFU1RfRihPcGFxdWVSZWN0VHJhY2tpbmdDb250ZW50TGF5ZXJEZWxlZ2F0ZVRlc3Qs IHRlc3RIaW50aW5nU2NhbGVGYWN0b3JTZXQpCi17Ci0gICAgSGludGluZ1NjYWxlQ2FsbGJhY2sg Y2FsbGJhY2s7Ci0gICAgVGVzdExheWVyUGFpbnRlckNocm9taXVtIHBhaW50ZXIoY2FsbGJhY2sp OwotICAgIE9wYXF1ZVJlY3RUcmFja2luZ0NvbnRlbnRMYXllckRlbGVnYXRlIGRlbGVnYXRlKCZw YWludGVyKTsKLQotICAgIFNrU2NhbGFyIGhpbnRpbmdTY2FsZSA9IFNrSW50VG9TY2FsYXIoMik7 Ci0gICAgU2tDYW52YXMgY2FudmFzOwotICAgIGNhbnZhcy5zY2FsZShoaW50aW5nU2NhbGUsIGhp bnRpbmdTY2FsZSk7Ci0gICAgRVhQRUNUX0VRKGNhbGxiYWNrLmhpbnRpbmdTY2FsZSwgU0tfU2Nh bGFyMSk7Ci0KLSAgICBJbnRSZWN0IHJlY3RBOwotICAgIFdlYkZsb2F0UmVjdCByZWN0QjsKLSAg ICBkZWxlZ2F0ZS5wYWludENvbnRlbnRzKCZjYW52YXMsIHJlY3RBLCBmYWxzZSwgcmVjdEIpOwot ICAgIEVYUEVDVF9FUShjYWxsYmFjay5oaW50aW5nU2NhbGUsIGhpbnRpbmdTY2FsZSk7Ci19Ci0j ZW5kaWYKLQogfSAvLyBuYW1lc3BhY2UKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21p dW0vdGVzdHMvUGxhdGZvcm1Db250ZXh0U2tpYVRlc3QuY3BwIGIvU291cmNlL1dlYktpdC9jaHJv bWl1bS90ZXN0cy9QbGF0Zm9ybUNvbnRleHRTa2lhVGVzdC5jcHAKaW5kZXggYTljNDM2MDM1ZTgy YmFjODE0N2NjYTFmMDU3NTE0NTQyYTM1OWEyMS4uZThlNDM5YzYwNDY4YTQ4NDRhYTE4NTNjNzg0 MTVlZDE4MWMzNzA1MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0cy9Q bGF0Zm9ybUNvbnRleHRTa2lhVGVzdC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS90 ZXN0cy9QbGF0Zm9ybUNvbnRleHRTa2lhVGVzdC5jcHAKQEAgLTExNTQsMjEgKzExNTQsNCBAQCBU RVNUKFBsYXRmb3JtQ29udGV4dFNraWFUZXN0LCBQcmVzZXJ2ZU9wYXF1ZU9ubHlNYXR0ZXJzRm9y Rmlyc3RMYXllcikKICAgICBFWFBFQ1RfUElYRUxTX01BVENIX0VYQUNUKGJpdG1hcCwgcGxhdGZv cm1Db250ZXh0Lm9wYXF1ZVJlZ2lvbigpLmFzUmVjdCgpKTsKIH0KIAotI2lmIGRlZmluZWQoU0tf U1VQUE9SVF9ISU5USU5HX1NDQUxFX0ZBQ1RPUikKLVRFU1QoUGxhdGZvcm1Db250ZXh0U2tpYVRl c3QsIGhpbnRpbmdTY2FsZUZhY3RvckFwcGxpZWRPblBhaW50KQotewotICAgIFNrQml0bWFwIGJp dG1hcDsKLSAgICBTa0NhbnZhcyBjYW52YXMoYml0bWFwKTsKLQotICAgIFNrU2NhbGFyIGhpbnRp bmdTY2FsZSA9IFNrSW50VG9TY2FsYXIoMik7Ci0gICAgUGxhdGZvcm1Db250ZXh0U2tpYSBwbGF0 Zm9ybUNvbnRleHQoJmNhbnZhcyk7Ci0gICAgcGxhdGZvcm1Db250ZXh0LnNldEhpbnRpbmdTY2Fs ZUZhY3RvcihoaW50aW5nU2NhbGUpOyAKLQotICAgIFNrUGFpbnQgcGFpbnQ7Ci0gICAgRVhQRUNU X0VRKHBhaW50LmdldEhpbnRpbmdTY2FsZUZhY3RvcigpLCBTS19TY2FsYXIxKTsKLSAgICBwbGF0 Zm9ybUNvbnRleHQuc2V0dXBQYWludENvbW1vbigmcGFpbnQpOwotICAgIEVYUEVDVF9FUShwYWlu dC5nZXRIaW50aW5nU2NhbGVGYWN0b3IoKSwgaGludGluZ1NjYWxlKTsKLX0KLSNlbmRpZgotCiB9 IC8vIG5hbWVzcGFjZQo= 194329 2013-03-21 14:02:52 -0700 2013-03-21 14:25:17 -0700 fixing merge conflict bug-112928-20130321165839.patch text/plain 9054 tdanderson U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ2NTE0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDAxOGNlYjM4ZGZiZDNh NDViNDMyODQ4YzJkY2JhMzg3ZTQ5MjgxYS4uMzQxOThmMGE0NWMyNWU1MmM1YTMyOWI2OGI4Y2Fk YjUzMWQ1OTNhZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDEzLTAzLTIxICBUZXJy eSBBbmRlcnNvbiAgPHRkYW5kZXJzb25AY2hyb21pdW0ub3JnPgorCisgICAgICAgIFtjaHJvbWl1 bV0gUmVtb3ZlIFNLX1NVUFBPUlRfSElOVElOR19TQ0FMRV9GQUNUT1IgZmxhZyBhbmQgY29kZQor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTEyOTI4CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgU3RlcGhlbiBXaGl0ZS4KKworICAgICAgICBUaGlzIGZsYWcg d2FzIG9ubHkgZm9yIENocm9tZU9TIGJ1aWxkcyB3aXRoIEhpZ2hEUEkuIEl0IGlzIG5vIGxvbmdl ciBuZWVkZWQgYW5kIGNhbiBiZSByZW1vdmVkLiAKKyAgICAgICAgU2VlIGh0dHA6Ly9jcmJ1Zy5j b20vMTc1NTAKKworICAgICAgICBObyBuZXcgdGVzdHMgbmVlZGVkIHNpbmNlIHRoaXMgaXMganVz dCByZW1vdmluZyB1bnVzZWQgY29kZS4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2No cm9taXVtL09wYXF1ZVJlY3RUcmFja2luZ0NvbnRlbnRMYXllckRlbGVnYXRlLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6Ok9wYXF1ZVJlY3RUcmFja2luZ0NvbnRlbnRMYXllckRlbGVnYXRlOjpwYWlu dENvbnRlbnRzKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9za2lhL1BsYXRmb3JtQ29u dGV4dFNraWEuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UGxhdGZvcm1Db250ZXh0U2tpYTo6UGxh dGZvcm1Db250ZXh0U2tpYSk6CisgICAgICAgIChXZWJDb3JlOjpQbGF0Zm9ybUNvbnRleHRTa2lh OjpzZXR1cFBhaW50Q29tbW9uKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9za2lhL1Bs YXRmb3JtQ29udGV4dFNraWEuaDoKKwogMjAxMy0wMy0yMSAgSm9zaHVhIEJlbGwgIDxqc2JlbGxA Y2hyb21pdW0ub3JnPgogCiAgICAgICAgIEluZGV4ZWREQjogUmVtb3ZlIG9uVmVyc2lvbkNoYW5n ZShzdHJpbmcpIHBsdW1iaW5nCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4IGZmZWY3OTc3 NTdiZWRmMTI1MGE4MTFiOGNhNGIxYjcyNGEwZWQ4OTguLjI0MTFkNDViZDExYzAxMWJiYTIwODQz YzVkYTVhYzQyMjNkZDAxNmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hh bmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBAIC0xLDMgKzEs MTcgQEAKKzIwMTMtMDMtMjEgIFRlcnJ5IEFuZGVyc29uICA8dGRhbmRlcnNvbkBjaHJvbWl1bS5v cmc+CisKKyAgICAgICAgW2Nocm9taXVtXSBSZW1vdmUgU0tfU1VQUE9SVF9ISU5USU5HX1NDQUxF X0ZBQ1RPUiBmbGFnIGFuZCBjb2RlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xMTI5MjgKKworICAgICAgICBSZXZpZXdlZCBieSBTdGVwaGVuIFdoaXRl LgorCisgICAgICAgIFRoaXMgZmxhZyB3YXMgb25seSBmb3IgQ2hyb21lT1MgYnVpbGRzIHdpdGgg SGlnaERQSS4gSXQgaXMgbm8gbG9uZ2VyIG5lZWRlZCBhbmQgY2FuIGJlIHJlbW92ZWQuIAorICAg ICAgICBTZWUgaHR0cDovL2NyYnVnLmNvbS8xNzU1MAorCisgICAgICAgICogZmVhdHVyZXMuZ3lw aToKKyAgICAgICAgKiB0ZXN0cy9PcGFxdWVSZWN0VHJhY2tpbmdDb250ZW50TGF5ZXJEZWxlZ2F0 ZVRlc3QuY3BwOgorICAgICAgICAqIHRlc3RzL1BsYXRmb3JtQ29udGV4dFNraWFUZXN0LmNwcDoK KwogMjAxMy0wMy0yMSAgSm9zaHVhIEJlbGwgIDxqc2JlbGxAY2hyb21pdW0ub3JnPgogCiAgICAg ICAgIEluZGV4ZWREQjogUmVtb3ZlIG9uVmVyc2lvbkNoYW5nZShzdHJpbmcpIHBsdW1iaW5nCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9PcGFx dWVSZWN0VHJhY2tpbmdDb250ZW50TGF5ZXJEZWxlZ2F0ZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9PcGFxdWVSZWN0VHJhY2tpbmdDb250ZW50TGF5ZXJE ZWxlZ2F0ZS5jcHAKaW5kZXggMGM0OTZkZmNlMzJlZTRiZTFlOGY3ZGI4NzcwZDZlZmZlYzM0MWE2 OC4uMWYwMzhkOTg5NTQyNmY4MzJmOWFjZTRhY2FlODM2ZTY0MjhiNWUyYyAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vT3BhcXVlUmVjdFRyYWNr aW5nQ29udGVudExheWVyRGVsZWdhdGUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL2Nocm9taXVtL09wYXF1ZVJlY3RUcmFja2luZ0NvbnRlbnRMYXllckRlbGVnYXRl LmNwcApAQCAtNTIsMTAgKzUyLDYgQEAgT3BhcXVlUmVjdFRyYWNraW5nQ29udGVudExheWVyRGVs ZWdhdGU6On5PcGFxdWVSZWN0VHJhY2tpbmdDb250ZW50TGF5ZXJEZWxlZ2F0ZSgKIHZvaWQgT3Bh cXVlUmVjdFRyYWNraW5nQ29udGVudExheWVyRGVsZWdhdGU6OnBhaW50Q29udGVudHMoU2tDYW52 YXMqIGNhbnZhcywgY29uc3QgV2ViUmVjdCYgY2xpcCwgYm9vbCBjYW5QYWludExDRFRleHQsIFdl YkZsb2F0UmVjdCYgb3BhcXVlKQogewogICAgIFBsYXRmb3JtQ29udGV4dFNraWEgcGxhdGZvcm1D b250ZXh0KGNhbnZhcyk7Ci0jaWYgZGVmaW5lZChTS19TVVBQT1JUX0hJTlRJTkdfU0NBTEVfRkFD VE9SKQotICAgIGlmIChjYW52YXMpCi0gICAgICAgIHBsYXRmb3JtQ29udGV4dC5zZXRIaW50aW5n U2NhbGVGYWN0b3IoY2FudmFzLT5nZXRUb3RhbE1hdHJpeCgpLmdldFNjYWxlWCgpKTsKLSNlbmRp ZgogICAgIHBsYXRmb3JtQ29udGV4dC5zZXRUcmFja09wYXF1ZVJlZ2lvbighbV9vcGFxdWUpOwog ICAgIHBsYXRmb3JtQ29udGV4dC5zZXREcmF3aW5nVG9JbWFnZUJ1ZmZlcighbV9vcGFxdWUpOwog ICAgIEdyYXBoaWNzQ29udGV4dCBjb250ZXh0KCZwbGF0Zm9ybUNvbnRleHQpOwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvc2tpYS9QbGF0Zm9ybUNvbnRleHRT a2lhLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3NraWEvUGxhdGZvcm1D b250ZXh0U2tpYS5jcHAKaW5kZXggNWYyNmQ5NzExNDIwYTM5MzM1Njc5ZDZjOWZiMjI4NjlkM2Zk MTk5YS4uNmJiODgyYWQ5YWU5YTA4NDczNWY3MjlhMWI3YTExMjU2ZGE3YmI3NCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvc2tpYS9QbGF0Zm9ybUNvbnRleHRT a2lhLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9za2lhL1BsYXRm b3JtQ29udGV4dFNraWEuY3BwCkBAIC0xOTcsOSArMTk3LDYgQEAgUGxhdGZvcm1Db250ZXh0U2tp YTo6UGxhdGZvcm1Db250ZXh0U2tpYShTa0NhbnZhcyogY2FudmFzKQogICAgICwgbV9kZWZlcnJl ZChmYWxzZSkKICAgICAsIG1fZHJhd2luZ1RvSW1hZ2VCdWZmZXIoZmFsc2UpCiAgICAgLCBtX2Rl dmljZVNjYWxlRmFjdG9yKDEpCi0jaWYgZGVmaW5lZChTS19TVVBQT1JUX0hJTlRJTkdfU0NBTEVf RkFDVE9SKQotICAgICwgbV9oaW50aW5nU2NhbGVGYWN0b3IoU0tfU2NhbGFyMSkKLSNlbmRpZgog ewogICAgIG1fc3RhdGVTdGFjay5hcHBlbmQoU3RhdGUoKSk7CiAgICAgbV9zdGF0ZSA9ICZtX3N0 YXRlU3RhY2subGFzdCgpOwpAQCAtMzU5LDkgKzM1Niw2IEBAIHZvaWQgUGxhdGZvcm1Db250ZXh0 U2tpYTo6c2V0dXBQYWludENvbW1vbihTa1BhaW50KiBwYWludCkgY29uc3QKICAgICBwYWludC0+ c2V0QW50aUFsaWFzKG1fc3RhdGUtPm1fdXNlQW50aWFsaWFzaW5nKTsKICAgICBwYWludC0+c2V0 WGZlcm1vZGVNb2RlKG1fc3RhdGUtPm1feGZlck1vZGUpOwogICAgIHBhaW50LT5zZXRMb29wZXIo bV9zdGF0ZS0+bV9sb29wZXIpOwotI2lmIGRlZmluZWQoU0tfU1VQUE9SVF9ISU5USU5HX1NDQUxF X0ZBQ1RPUikKLSAgICBwYWludC0+c2V0SGludGluZ1NjYWxlRmFjdG9yKG1faGludGluZ1NjYWxl RmFjdG9yKTsKLSNlbmRpZgogfQogCiB2b2lkIFBsYXRmb3JtQ29udGV4dFNraWE6OnNldHVwU2hh ZGVyKFNrUGFpbnQqIHBhaW50LCBHcmFkaWVudCogZ3JhZCwgUGF0dGVybiogcGF0LCBTa0NvbG9y IGNvbG9yKSBjb25zdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3Mvc2tpYS9QbGF0Zm9ybUNvbnRleHRTa2lhLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9za2lhL1BsYXRmb3JtQ29udGV4dFNraWEuaAppbmRleCA4YmU2OWY2YWVlNzBlZTNl NzkzZTUwOGM2NzU5ZWM3NzdmODJhMDEzLi4wNzg5NjEyOTdhOTJjYzE4MWRkYzNhZDYwOWJlMjg2 Zjk1YWU4YWNlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9z a2lhL1BsYXRmb3JtQ29udGV4dFNraWEuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9za2lhL1BsYXRmb3JtQ29udGV4dFNraWEuaApAQCAtMjUxLDExICsyNTEsNiBAQCBw dWJsaWM6CiAgICAgdm9pZCBkcmF3VGV4dE9uUGF0aChjb25zdCB2b2lkKiB0ZXh0LCBzaXplX3Qg Ynl0ZUxlbmd0aCwgY29uc3QgU2tQYXRoJiwKICAgICAgICAgY29uc3QgU2tNYXRyaXgqLCBjb25z dCBTa1BhaW50Jik7CiAKLSNpZiBkZWZpbmVkKFNLX1NVUFBPUlRfSElOVElOR19TQ0FMRV9GQUNU T1IpCi0gICAgdm9pZCBzZXRIaW50aW5nU2NhbGVGYWN0b3IoU2tTY2FsYXIgZmFjdG9yKSB7IG1f aGludGluZ1NjYWxlRmFjdG9yID0gZmFjdG9yOyB9Ci0gICAgU2tTY2FsYXIgaGludGluZ1NjYWxl RmFjdG9yKCkgY29uc3QgeyByZXR1cm4gbV9oaW50aW5nU2NhbGVGYWN0b3I7IH0KLSNlbmRpZgot CiBwcml2YXRlOgogICAgIC8vIFVzZWQgd2hlbiByZXN0b3JpbmcgYW5kIHRoZSBzdGF0ZSBoYXMg YW4gaW1hZ2UgY2xpcC4gT25seSBzaG93cyB0aGUgcGl4ZWxzIGluCiAgICAgLy8gbV9jYW52YXMg dGhhdCBhcmUgYWxzbyBpbiBpbWFnZUJ1ZmZlci4KQEAgLTI5OSw5ICsyOTQsNiBAQCBwcml2YXRl OgogICAgIGJvb2wgbV9kZWZlcnJlZDsKICAgICBib29sIG1fZHJhd2luZ1RvSW1hZ2VCdWZmZXI7 CiAgICAgZmxvYXQgbV9kZXZpY2VTY2FsZUZhY3RvcjsKLSNpZiBkZWZpbmVkKFNLX1NVUFBPUlRf SElOVElOR19TQ0FMRV9GQUNUT1IpCi0gICAgU2tTY2FsYXIgbV9oaW50aW5nU2NhbGVGYWN0b3I7 Ci0jZW5kaWYKIH07CiAKIGlubGluZSB2b2lkIFBsYXRmb3JtQ29udGV4dFNraWE6OnJlYWxpemVT YXZlKFNrQ2FudmFzOjpTYXZlRmxhZ3MgZmxhZ3MpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 L2Nocm9taXVtL2ZlYXR1cmVzLmd5cGkgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL2ZlYXR1cmVz Lmd5cGkKaW5kZXggOWEyYWNjMjk4YjBlNGY3ODBjYmM2YmM2MWNhMzNhZjUxZTQ4MGRmMy4uZTJi ODNjNGY3YTkzZWJiMjJlYjZkNGE3NjFkOTAxYTQ3MDk1MGRjNiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdC9jaHJvbWl1bS9mZWF0dXJlcy5neXBpCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21p dW0vZmVhdHVyZXMuZ3lwaQpAQCAtMjQ3LDExICsyNDcsNiBAQAogICAgICAgICAgICdXVEZfVVNF X0hBUkZCVVpaPTEnLAogICAgICAgICBdLAogICAgICAgfV0sCi0gICAgICBbJ2Nocm9tZW9zPT0x JywgewotICAgICAgICAnZmVhdHVyZV9kZWZpbmVzJzogWwotICAgICAgICAgICdTS19TVVBQT1JU X0hJTlRJTkdfU0NBTEVfRkFDVE9SJywKLSAgICAgICAgXSwKLSAgICAgIH1dLAogICAgICAgWyd1 c2VfZGVmYXVsdF9yZW5kZXJfdGhlbWU9PTEnLCB7CiAgICAgICAgICdmZWF0dXJlX2RlZmluZXMn OiBbCiAgICAgICAgICAgJ0VOQUJMRV9ERUZBVUxUX1JFTkRFUl9USEVNRT0xJywKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMvT3BhcXVlUmVjdFRyYWNraW5nQ29udGVu dExheWVyRGVsZWdhdGVUZXN0LmNwcCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMvT3Bh cXVlUmVjdFRyYWNraW5nQ29udGVudExheWVyRGVsZWdhdGVUZXN0LmNwcAppbmRleCAzOWUzNmE5 ZmIxMTU1NDliN2RkNjM4ODRjZDdjNjMxMTljN2UxZjQxLi42MjdkYzcwODljMTUxOWUyMjY4MjUz NWNjYjI4YzIyMTVlMGRmODY2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rl c3RzL09wYXF1ZVJlY3RUcmFja2luZ0NvbnRlbnRMYXllckRlbGVnYXRlVGVzdC5jcHAKKysrIGIv U291cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0cy9PcGFxdWVSZWN0VHJhY2tpbmdDb250ZW50TGF5 ZXJEZWxlZ2F0ZVRlc3QuY3BwCkBAIC0xMDEsMjIgKzEwMSw2IEBAIHN0cnVjdCBQYWludEZpbGxQ YXJ0aWFsT3BhcXVlIDogcHVibGljIFBhaW50Q2FsbGJhY2sgewogICAgIEludFJlY3QgbV9vcGFx dWVSZWN0OwogfTsKIAotI2lmIGRlZmluZWQoU0tfU1VQUE9SVF9ISU5USU5HX1NDQUxFX0ZBQ1RP UikKLXN0cnVjdCBIaW50aW5nU2NhbGVDYWxsYmFjayA6IHB1YmxpYyBQYWludENhbGxiYWNrIHsK LSAgICBIaW50aW5nU2NhbGVDYWxsYmFjaygpCi0gICAgICAgIDogaGludGluZ1NjYWxlKFNLX1Nj YWxhcjEpCi0gICAgewotICAgIH0KLQotICAgIHZpcnR1YWwgdm9pZCBvcGVyYXRvcigpKEdyYXBo aWNzQ29udGV4dCYgY29udGV4dCwgY29uc3QgSW50UmVjdCYgY29udGVudFJlY3QpCi0gICAgewot ICAgICAgICBoaW50aW5nU2NhbGUgPSBjb250ZXh0LnBsYXRmb3JtQ29udGV4dCgpLT5oaW50aW5n U2NhbGVGYWN0b3IoKTsKLSAgICB9Ci0KLSAgICBTa1NjYWxhciBoaW50aW5nU2NhbGU7Ci19Owot I2VuZGlmCi0KICNkZWZpbmUgRVhQRUNUX0VRX1JFQ1QoYSwgYikgXAogICAgIEVYUEVDVF9FUShh LngsIGIueCk7IFwKICAgICBFWFBFQ1RfRVEoYS53aWR0aCwgYi53aWR0aCk7IFwKQEAgLTIxMSwy MyArMTk1LDQgQEAgVEVTVF9GKE9wYXF1ZVJlY3RUcmFja2luZ0NvbnRlbnRMYXllckRlbGVnYXRl VGVzdCwgdGVzdFBhcnRpYWxPcGFxdWVSZWN0VHJhbnNsYXQKICAgICBFWFBFQ1RfRVFfUkVDVChX ZWJGbG9hdFJlY3QocGFydGlhbFJlY3QueCgpLCBwYXJ0aWFsUmVjdC55KCksIHBhcnRpYWxSZWN0 LndpZHRoKCksIHBhcnRpYWxSZWN0LmhlaWdodCgpKSwgb3BhcXVlUmVjdCk7CiB9CiAKLSNpZiBk ZWZpbmVkKFNLX1NVUFBPUlRfSElOVElOR19TQ0FMRV9GQUNUT1IpCi1URVNUX0YoT3BhcXVlUmVj dFRyYWNraW5nQ29udGVudExheWVyRGVsZWdhdGVUZXN0LCB0ZXN0SGludGluZ1NjYWxlRmFjdG9y U2V0KQotewotICAgIEhpbnRpbmdTY2FsZUNhbGxiYWNrIGNhbGxiYWNrOwotICAgIFRlc3RMYXll clBhaW50ZXJDaHJvbWl1bSBwYWludGVyKGNhbGxiYWNrKTsKLSAgICBPcGFxdWVSZWN0VHJhY2tp bmdDb250ZW50TGF5ZXJEZWxlZ2F0ZSBkZWxlZ2F0ZSgmcGFpbnRlcik7Ci0KLSAgICBTa1NjYWxh ciBoaW50aW5nU2NhbGUgPSBTa0ludFRvU2NhbGFyKDIpOwotICAgIFNrQ2FudmFzIGNhbnZhczsK LSAgICBjYW52YXMuc2NhbGUoaGludGluZ1NjYWxlLCBoaW50aW5nU2NhbGUpOwotICAgIEVYUEVD VF9FUShjYWxsYmFjay5oaW50aW5nU2NhbGUsIFNLX1NjYWxhcjEpOwotCi0gICAgSW50UmVjdCBy ZWN0QTsKLSAgICBXZWJGbG9hdFJlY3QgcmVjdEI7Ci0gICAgZGVsZWdhdGUucGFpbnRDb250ZW50 cygmY2FudmFzLCByZWN0QSwgZmFsc2UsIHJlY3RCKTsKLSAgICBFWFBFQ1RfRVEoY2FsbGJhY2su aGludGluZ1NjYWxlLCBoaW50aW5nU2NhbGUpOwotfQotI2VuZGlmCi0KIH0gLy8gbmFtZXNwYWNl CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL1BsYXRmb3JtQ29udGV4 dFNraWFUZXN0LmNwcCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMvUGxhdGZvcm1Db250 ZXh0U2tpYVRlc3QuY3BwCmluZGV4IGE5YzQzNjAzNWU4MmJhYzgxNDdjY2ExZjA1NzUxNDU0MmEz NTlhMjEuLmU4ZTQzOWM2MDQ2OGE0ODQ0YWExODUzYzc4NDE1ZWQxODFjMzcwNTMgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMvUGxhdGZvcm1Db250ZXh0U2tpYVRlc3Qu Y3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMvUGxhdGZvcm1Db250ZXh0U2tp YVRlc3QuY3BwCkBAIC0xMTU0LDIxICsxMTU0LDQgQEAgVEVTVChQbGF0Zm9ybUNvbnRleHRTa2lh VGVzdCwgUHJlc2VydmVPcGFxdWVPbmx5TWF0dGVyc0ZvckZpcnN0TGF5ZXIpCiAgICAgRVhQRUNU X1BJWEVMU19NQVRDSF9FWEFDVChiaXRtYXAsIHBsYXRmb3JtQ29udGV4dC5vcGFxdWVSZWdpb24o KS5hc1JlY3QoKSk7CiB9CiAKLSNpZiBkZWZpbmVkKFNLX1NVUFBPUlRfSElOVElOR19TQ0FMRV9G QUNUT1IpCi1URVNUKFBsYXRmb3JtQ29udGV4dFNraWFUZXN0LCBoaW50aW5nU2NhbGVGYWN0b3JB cHBsaWVkT25QYWludCkKLXsKLSAgICBTa0JpdG1hcCBiaXRtYXA7Ci0gICAgU2tDYW52YXMgY2Fu dmFzKGJpdG1hcCk7Ci0KLSAgICBTa1NjYWxhciBoaW50aW5nU2NhbGUgPSBTa0ludFRvU2NhbGFy KDIpOwotICAgIFBsYXRmb3JtQ29udGV4dFNraWEgcGxhdGZvcm1Db250ZXh0KCZjYW52YXMpOwot ICAgIHBsYXRmb3JtQ29udGV4dC5zZXRIaW50aW5nU2NhbGVGYWN0b3IoaGludGluZ1NjYWxlKTsg Ci0KLSAgICBTa1BhaW50IHBhaW50OwotICAgIEVYUEVDVF9FUShwYWludC5nZXRIaW50aW5nU2Nh bGVGYWN0b3IoKSwgU0tfU2NhbGFyMSk7Ci0gICAgcGxhdGZvcm1Db250ZXh0LnNldHVwUGFpbnRD b21tb24oJnBhaW50KTsKLSAgICBFWFBFQ1RfRVEocGFpbnQuZ2V0SGludGluZ1NjYWxlRmFjdG9y KCksIGhpbnRpbmdTY2FsZSk7Ci19Ci0jZW5kaWYKLQogfSAvLyBuYW1lc3BhY2UK