107561 2013-01-22 10:35:43 -0800 Make BackgroundHTMLParser track line/column numbers 2013-01-22 14:14:24 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 106127 1 tonyg tonyg eric ojan.autocc webkit.review.bot oldest_to_newest 813160 0 tonyg 2013-01-22 10:35:43 -0800 Make BackgroundHTMLParser track line/column numbers 813163 1 184010 tonyg 2013-01-22 10:36:37 -0800 Created attachment 184010 Patch 813215 2 184010 eric 2013-01-22 11:01:26 -0800 Comment on attachment 184010 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=184010&action=review > Source/WebCore/html/parser/BackgroundHTMLParser.cpp:128 > + m_pendingTokens.append(CompactHTMLToken(m_token, TextPosition(m_input.current().currentLine(), m_input.current().currentColumn()))); That's unfortunate. I guess tokens are less compact now. :) 813216 3 eric 2013-01-22 11:02:10 -0800 I guess we need lines for each token to handle event handler lines properly? 813224 4 eric 2013-01-22 11:05:39 -0800 This is going to conflict with bug 107317. I think we're also probably going to change compact token to just carry the deltas from the previous token. Those will take up less than 32-bits each, and allow compact token to be smaller again. 813226 5 eric 2013-01-22 11:06:39 -0800 Then we would send the real line number separately in the "Delivery" object, and only the deltas in each token. That means that if for some reason we ever got off, we'd only be off for at max tokenLimit tokens. 813258 6 184010 webkit.review.bot 2013-01-22 11:30:19 -0800 Comment on attachment 184010 Patch Rejecting attachment 184010 from commit-queue. Failed to run "['/mnt/git/webkit-commit-queue/Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '-..." exit_code: 2 cwd: /mnt/git/webkit-commit-queue Last 500 characters of output: rce/WebKit/chromium/webkit/media/crypto/ppapi/cdm --revision 173055 --non-interactive --force --accept theirs-conflict --ignore-externals' in '/mnt/git/webkit-commit-queue/Source/WebKit/chromium' 56>At revision 173055. ________ 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://queues.webkit.org/results/16043681 813260 7 eric 2013-01-22 11:30:51 -0800 The question of where to draw the line between line number accuracy and parser speed is a separate one we can solve after this. If we only stored per-token-deltas, then we could yield after any token where the delta would be too large. (trading speed for accuracy) or simply ignore the error, or use a solution like you did (which trades some potential speed for accuracy on all documents). I'll follow-up with a separate bug after we get perf data. 813307 8 184033 tonyg 2013-01-22 12:21:59 -0800 Created attachment 184033 Patch for landing 813340 9 184033 webkit.review.bot 2013-01-22 13:12:42 -0800 Comment on attachment 184033 Patch for landing Rejecting attachment 184033 from commit-queue. Failed to run "['/mnt/git/webkit-commit-queue/Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '-..." exit_code: 2 cwd: /mnt/git/webkit-commit-queue Last 500 characters of output: z 2 (offset 8 lines). patching file Source/WebCore/html/parser/CompactHTMLToken.h Hunk #3 succeeded at 65 with fuzz 2. Hunk #4 FAILED at 75. 1 out of 4 hunks FAILED -- saving rejects to file Source/WebCore/html/parser/CompactHTMLToken.h.rej patching file Source/WebCore/html/parser/HTMLDocumentParser.cpp patching file Source/WebCore/html/parser/HTMLDocumentParser.h Failed to run "[u'/mnt/git/webkit-commit-queue/Tools/Scripts/svn-apply', '--force']" exit_code: 1 cwd: /mnt/git/webkit-commit-queue Full output: http://queues.webkit.org/results/16044730 813341 10 eric 2013-01-22 13:14:16 -0800 It appears my patch won the commit-queue race. :( We'll need to add this to "SameSizeAsCompactToken", which I can do if you'd like: http://trac.webkit.org/changeset/140453/trunk/Source/WebCore/html/parser/CompactHTMLToken.cpp 813377 11 184041 tonyg 2013-01-22 13:39:07 -0800 Created attachment 184041 Patch for landing 813399 12 184041 webkit.review.bot 2013-01-22 14:14:20 -0800 Comment on attachment 184041 Patch for landing Clearing flags on attachment: 184041 Committed r140467: <http://trac.webkit.org/changeset/140467> 813400 13 webkit.review.bot 2013-01-22 14:14:24 -0800 All reviewed patches have been landed. Closing bug. 184010 2013-01-22 10:36:37 -0800 2013-01-22 12:21:57 -0800 Patch bug-107561-20130122103331.patch text/plain 6327 tonyg U3VidmVyc2lvbiBSZXZpc2lvbjogMTQwNDMxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNWVmZTg2YjgzZDA5OTAy OTg4ODg0ZmZlZTY1YzliNTcwYzI3M2E1Yy4uZDFiZGM3NjA3OTc0MGQ3MWQ3MzQ0MDBkZjVjZmE5 OGRiN2ZlODBhMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDEzLTAxLTIyICBUb255 IEdlbnRpbGNvcmUgIDx0b255Z0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgTWFrZSBCYWNrZ3Jv dW5kSFRNTFBhcnNlciB0cmFjayBsaW5lL2NvbHVtbiBudW1iZXJzCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDc1NjEKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBObyBuZXcgdGVzdHMgYmVjYXVzZSBjb3Zl cmVkIGJ5IGV4aXN0aW5nIGZhc3QvcGFyc2VyIHRlc3RzLgorCisgICAgICAgICogaHRtbC9wYXJz ZXIvQmFja2dyb3VuZEhUTUxQYXJzZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6QmFja2dyb3Vu ZEhUTUxQYXJzZXI6OnB1bXBUb2tlbml6ZXIpOgorICAgICAgICAqIGh0bWwvcGFyc2VyL0NvbXBh Y3RIVE1MVG9rZW4uY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q29tcGFjdEhUTUxUb2tlbjo6Q29t cGFjdEhUTUxUb2tlbik6CisgICAgICAgICogaHRtbC9wYXJzZXIvQ29tcGFjdEhUTUxUb2tlbi5o OgorICAgICAgICAoQ29tcGFjdEhUTUxUb2tlbik6CisgICAgICAgIChXZWJDb3JlOjpDb21wYWN0 SFRNTFRva2VuOjp0ZXh0UG9zaXRpb24pOgorICAgICAgICAqIGh0bWwvcGFyc2VyL0hUTUxEb2N1 bWVudFBhcnNlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpIVE1MRG9jdW1lbnRQYXJzZXI6OmRp ZFJlY2VpdmVUb2tlbnNGcm9tQmFja2dyb3VuZFBhcnNlcik6CisgICAgICAgIChXZWJDb3JlOjpI VE1MRG9jdW1lbnRQYXJzZXI6OmxpbmVOdW1iZXIpOgorICAgICAgICAoV2ViQ29yZTo6SFRNTERv Y3VtZW50UGFyc2VyOjp0ZXh0UG9zaXRpb24pOgorICAgICAgICAqIGh0bWwvcGFyc2VyL0hUTUxE b2N1bWVudFBhcnNlci5oOgorICAgICAgICAoSFRNTERvY3VtZW50UGFyc2VyKToKKwogMjAxMy0w MS0yMiAgWmFuIERvYmVyc2VrICA8emRvYmVyc2VrQGlnYWxpYS5jb20+CiAKICAgICAgICAgW0F1 dG90b29sc10gUmVtb3ZlIHRoZSBDYW52YXMgUGF0aCBjb25maWd1cmF0aW9uIG9wdGlvbgpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9wYXJzZXIvQmFja2dyb3VuZEhUTUxQYXJzZXIu Y3BwIGIvU291cmNlL1dlYkNvcmUvaHRtbC9wYXJzZXIvQmFja2dyb3VuZEhUTUxQYXJzZXIuY3Bw CmluZGV4IGFmMGQ3OGYzMDcxOTI5MzY3YjA3ODI1YTZmYzUzNDVhMDIxOTc4ZTYuLjczNmQzNzAw ZWQzNTZkNWE5ZGQ2NDE0ZjU3ZWQxOTM0ZWI1ZTM0ZDkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2h0bWwvcGFyc2VyL0JhY2tncm91bmRIVE1MUGFyc2VyLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9odG1sL3BhcnNlci9CYWNrZ3JvdW5kSFRNTFBhcnNlci5jcHAKQEAgLTM3LDYgKzM3LDcg QEAKICNpbmNsdWRlICJTVkdOYW1lcy5oIgogI2luY2x1ZGUgPHd0Zi9NYWluVGhyZWFkLmg+CiAj aW5jbHVkZSA8d3RmL1ZlY3Rvci5oPgorI2luY2x1ZGUgPHd0Zi90ZXh0L1RleHRQb3NpdGlvbi5o PgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKQEAgLTEyNCw3ICsxMjUsNyBAQCB2b2lkIEJhY2tn cm91bmRIVE1MUGFyc2VyOjpwdW1wVG9rZW5pemVyKCkKICAgICAgICAgcmV0dXJuOwogCiAgICAg d2hpbGUgKG1fdG9rZW5pemVyLT5uZXh0VG9rZW4obV9pbnB1dC5jdXJyZW50KCksIG1fdG9rZW4p KSB7Ci0gICAgICAgIG1fcGVuZGluZ1Rva2Vucy5hcHBlbmQoQ29tcGFjdEhUTUxUb2tlbihtX3Rv a2VuKSk7CisgICAgICAgIG1fcGVuZGluZ1Rva2Vucy5hcHBlbmQoQ29tcGFjdEhUTUxUb2tlbiht X3Rva2VuLCBUZXh0UG9zaXRpb24obV9pbnB1dC5jdXJyZW50KCkuY3VycmVudExpbmUoKSwgbV9p bnB1dC5jdXJyZW50KCkuY3VycmVudENvbHVtbigpKSkpOwogCiAgICAgICAgIGNvbnN0IENvbXBh Y3RIVE1MVG9rZW4mIHRva2VuID0gbV9wZW5kaW5nVG9rZW5zLmxhc3QoKTsKIApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvaHRtbC9wYXJzZXIvQ29tcGFjdEhUTUxUb2tlbi5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9odG1sL3BhcnNlci9Db21wYWN0SFRNTFRva2VuLmNwcAppbmRleCAwOTMyOGVl ODYwZGY0MzMzNTVkYmIzMjY1ZjNlN2UxMjYwYTZkMzVhLi40YWM2NTMwYTYyYjg1NGQzY2NiMDg5 OTJjZDZlOWRjMjJmZmUyZWU5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL3BhcnNl ci9Db21wYWN0SFRNTFRva2VuLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL3BhcnNlci9D b21wYWN0SFRNTFRva2VuLmNwcApAQCAtMzMsOCArMzMsOSBAQAogCiBuYW1lc3BhY2UgV2ViQ29y ZSB7CiAKLUNvbXBhY3RIVE1MVG9rZW46OkNvbXBhY3RIVE1MVG9rZW4oY29uc3QgSFRNTFRva2Vu JiB0b2tlbikKK0NvbXBhY3RIVE1MVG9rZW46OkNvbXBhY3RIVE1MVG9rZW4oY29uc3QgSFRNTFRv a2VuJiB0b2tlbiwgY29uc3QgVGV4dFBvc2l0aW9uJiB0ZXh0UG9zaXRpb24pCiAgICAgOiBtX3R5 cGUodG9rZW4udHlwZSgpKQorICAgICwgbV90ZXh0UG9zaXRpb24odGV4dFBvc2l0aW9uKQogewog ICAgIHN3aXRjaCAobV90eXBlKSB7CiAgICAgY2FzZSBIVE1MVG9rZW5UeXBlczo6VW5pbml0aWFs aXplZDoKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvcGFyc2VyL0NvbXBhY3RIVE1M VG9rZW4uaCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvcGFyc2VyL0NvbXBhY3RIVE1MVG9rZW4uaApp bmRleCA0MTA0MTVjZTk4M2ZkMjI4NWFmMDAzNzIxMzNjZjk1NmU4ZGM3Zjg0Li4xMTExZDFiNzI0 MjVmYmEyZTc5MDI3NDA0NTVjNTliMTE3Y2RiYTllIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9odG1sL3BhcnNlci9Db21wYWN0SFRNTFRva2VuLmgKKysrIGIvU291cmNlL1dlYkNvcmUvaHRt bC9wYXJzZXIvQ29tcGFjdEhUTUxUb2tlbi5oCkBAIC0zMiw2ICszMiw3IEBACiAjaW5jbHVkZSA8 d3RmL1JlZkNvdW50ZWQuaD4KICNpbmNsdWRlIDx3dGYvUmVmUHRyLmg+CiAjaW5jbHVkZSA8d3Rm L1ZlY3Rvci5oPgorI2luY2x1ZGUgPHd0Zi90ZXh0L1RleHRQb3NpdGlvbi5oPgogI2luY2x1ZGUg PHd0Zi90ZXh0L1dURlN0cmluZy5oPgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CkBAIC01Niw3ICs1 Nyw3IEBAIHByaXZhdGU6CiAKIGNsYXNzIENvbXBhY3RIVE1MVG9rZW4gewogcHVibGljOgotICAg IGV4cGxpY2l0IENvbXBhY3RIVE1MVG9rZW4oY29uc3QgSFRNTFRva2VuJik7CisgICAgZXhwbGlj aXQgQ29tcGFjdEhUTUxUb2tlbihjb25zdCBIVE1MVG9rZW4mLCBjb25zdCBUZXh0UG9zaXRpb24m KTsKIAogICAgIGJvb2wgaXNTYWZlVG9TZW5kVG9Bbm90aGVyVGhyZWFkKCkgY29uc3Q7CiAKQEAg LTY0LDYgKzY1LDcgQEAgcHVibGljOgogICAgIGNvbnN0IFN0cmluZyYgZGF0YSgpIGNvbnN0IHsg cmV0dXJuIG1fZGF0YTsgfQogICAgIGJvb2wgc2VsZkNsb3NpbmcoKSBjb25zdCB7IHJldHVybiBt X3NlbGZDbG9zaW5nOyB9CiAgICAgY29uc3QgVmVjdG9yPENvbXBhY3RBdHRyaWJ1dGU+JiBhdHRy aWJ1dGVzKCkgY29uc3QgeyByZXR1cm4gbV9hdHRyaWJ1dGVzOyB9CisgICAgY29uc3QgVGV4dFBv c2l0aW9uJiB0ZXh0UG9zaXRpb24oKSBjb25zdCB7IHJldHVybiBtX3RleHRQb3NpdGlvbjsgfQog CiAgICAgY29uc3QgU3RyaW5nJiBwdWJsaWNJZGVudGlmaWVyKCkgY29uc3QgeyByZXR1cm4gbV9w dWJsaWNJZGVudGlmaWVyOyB9CiAgICAgY29uc3QgU3RyaW5nJiBzeXN0ZW1JZGVudGlmaWVyKCkg Y29uc3QgeyByZXR1cm4gbV9zeXN0ZW1JZGVudGlmaWVyOyB9CkBAIC03Myw2ICs3NSw3IEBAIHBy aXZhdGU6CiAgICAgU3RyaW5nIG1fZGF0YTsgLy8gIm5hbWUiLCAiY2hhcmFjdGVycyIsIG9yICJk YXRhIiBkZXBlbmRpbmcgb24gbV90eXBlCiAgICAgYm9vbCBtX3NlbGZDbG9zaW5nOwogICAgIFZl Y3RvcjxDb21wYWN0QXR0cmlidXRlPiBtX2F0dHJpYnV0ZXM7CisgICAgVGV4dFBvc2l0aW9uIG1f dGV4dFBvc2l0aW9uOwogCiAgICAgLy8gRm9yIGRvY3R5cGUgb25seS4KICAgICBTdHJpbmcgbV9w dWJsaWNJZGVudGlmaWVyOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9wYXJzZXIv SFRNTERvY3VtZW50UGFyc2VyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvcGFyc2VyL0hUTUxE b2N1bWVudFBhcnNlci5jcHAKaW5kZXggNjc2ZmUyNWIxOTk4MTAxMWJjYWE4NTVmMDVhNzFiNTgx YzM3ZjUyYy4uMzkwMGU3MzkxNDAyNzRmOGYwMzhmN2UxYzFjZjVjMDQyZGZkZDE3MCAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9wYXJzZXIvSFRNTERvY3VtZW50UGFyc2VyLmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL3BhcnNlci9IVE1MRG9jdW1lbnRQYXJzZXIuY3BwCkBA IC0yNzYsNiArMjc2LDcgQEAgdm9pZCBIVE1MRG9jdW1lbnRQYXJzZXI6OmRpZFJlY2VpdmVUb2tl bnNGcm9tQmFja2dyb3VuZFBhcnNlcihjb25zdCBWZWN0b3I8Q29tcGEKICAgICAgICAgQVNTRVJU KCFpc1dhaXRpbmdGb3JTY3JpcHRzKCkpOwogCiAgICAgICAgIC8vIEZJWE1FOiBDYWxsIG1feHNz QXVkaXRvci5maWx0ZXJUb2tlbigqaXQpLgorICAgICAgICBtX3RleHRQb3NpdGlvbiA9IGl0LT50 ZXh0UG9zaXRpb24oKTsKICAgICAgICAgY29uc3RydWN0VHJlZUZyb21Db21wYWN0SFRNTFRva2Vu KCppdCk7CiAKICAgICAgICAgaWYgKGlzU3RvcHBlZCgpKQpAQCAtNjEzLDExICs2MTQsMjEgQEAg U3RyaW5nIEhUTUxEb2N1bWVudFBhcnNlcjo6c291cmNlRm9yVG9rZW4oY29uc3QgSFRNTFRva2Vu JiB0b2tlbikKIAogT3JkaW5hbE51bWJlciBIVE1MRG9jdW1lbnRQYXJzZXI6OmxpbmVOdW1iZXIo KSBjb25zdAogeworI2lmIEVOQUJMRShUSFJFQURFRF9IVE1MX1BBUlNFUikKKyAgICBpZiAoc2hv dWxkVXNlVGhyZWFkaW5nKCkpCisgICAgICAgIHJldHVybiBtX3RleHRQb3NpdGlvbi5tX2xpbmU7 CisjZW5kaWYKKwogICAgIHJldHVybiBtX2lucHV0LmN1cnJlbnQoKS5jdXJyZW50TGluZSgpOwog fQogCiBUZXh0UG9zaXRpb24gSFRNTERvY3VtZW50UGFyc2VyOjp0ZXh0UG9zaXRpb24oKSBjb25z dAogeworI2lmIEVOQUJMRShUSFJFQURFRF9IVE1MX1BBUlNFUikKKyAgICBpZiAoc2hvdWxkVXNl VGhyZWFkaW5nKCkpCisgICAgICAgIHJldHVybiBtX3RleHRQb3NpdGlvbjsKKyNlbmRpZgorCiAg ICAgY29uc3QgU2VnbWVudGVkU3RyaW5nJiBjdXJyZW50U3RyaW5nID0gbV9pbnB1dC5jdXJyZW50 KCk7CiAgICAgT3JkaW5hbE51bWJlciBsaW5lID0gY3VycmVudFN0cmluZy5jdXJyZW50TGluZSgp OwogICAgIE9yZGluYWxOdW1iZXIgY29sdW1uID0gY3VycmVudFN0cmluZy5jdXJyZW50Q29sdW1u KCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL3BhcnNlci9IVE1MRG9jdW1lbnRQ YXJzZXIuaCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvcGFyc2VyL0hUTUxEb2N1bWVudFBhcnNlci5o CmluZGV4IGY4OTExMzhiNTc0ZWI0NzFiNjU4MDRlZWUzMjA5MjE4NzI1ZjVlOGMuLjQ3NzBmMWQ1 ZGUxNDUwNTlhMTE3ZGRlMDIzODk3MmQ2MzIxOGIwNGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2h0bWwvcGFyc2VyL0hUTUxEb2N1bWVudFBhcnNlci5oCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2h0bWwvcGFyc2VyL0hUTUxEb2N1bWVudFBhcnNlci5oCkBAIC0zOCw2ICszOCw3IEBACiAjaW5j bHVkZSAiVGltZXIuaCIKICNpbmNsdWRlICJYU1NBdWRpdG9yLmgiCiAjaW5jbHVkZSA8d3RmL093 blB0ci5oPgorI2luY2x1ZGUgPHd0Zi90ZXh0L1RleHRQb3NpdGlvbi5oPgogCiBuYW1lc3BhY2Ug V2ViQ29yZSB7CiAKQEAgLTE2Myw2ICsxNjQsNyBAQCBwcml2YXRlOgogICAgIE93blB0cjxIVE1M UHJlbG9hZFNjYW5uZXI+IG1faW5zZXJ0aW9uUHJlbG9hZFNjYW5uZXI7CiAgICAgT3duUHRyPEhU TUxQYXJzZXJTY2hlZHVsZXI+IG1fcGFyc2VyU2NoZWR1bGVyOwogICAgIEhUTUxTb3VyY2VUcmFj a2VyIG1fc291cmNlVHJhY2tlcjsKKyAgICBUZXh0UG9zaXRpb24gbV90ZXh0UG9zaXRpb247CiAg ICAgWFNTQXVkaXRvciBtX3hzc0F1ZGl0b3I7CiAKICAgICBib29sIG1fZW5kV2FzRGVsYXllZDsK 184033 2013-01-22 12:21:59 -0800 2013-01-22 13:39:05 -0800 Patch for landing bug-107561-20130122121853.patch text/plain 6304 tonyg U3VidmVyc2lvbiBSZXZpc2lvbjogMTQwNDQ4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjI1M2FiZmU2ODI2NDMy ZWZhNjIyNGJkY2Y1Yzg5ZjYwMjVhMWRkNS4uMzUwNmE5MWE4MzcwZGVhN2E0ZjQ2ZTczNWQyODhm MWJiYWIyMzZmZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDEzLTAxLTIyICBUb255 IEdlbnRpbGNvcmUgIDx0b255Z0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgTWFrZSBCYWNrZ3Jv dW5kSFRNTFBhcnNlciB0cmFjayBsaW5lL2NvbHVtbiBudW1iZXJzCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDc1NjEKKworICAgICAgICBSZXZpZXdl ZCBieSBBZGFtIEJhcnRoLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cyBiZWNhdXNlIGNvdmVyZWQg YnkgZXhpc3RpbmcgZmFzdC9wYXJzZXIgdGVzdHMuCisKKyAgICAgICAgKiBodG1sL3BhcnNlci9C YWNrZ3JvdW5kSFRNTFBhcnNlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpCYWNrZ3JvdW5kSFRN TFBhcnNlcjo6cHVtcFRva2VuaXplcik6CisgICAgICAgICogaHRtbC9wYXJzZXIvQ29tcGFjdEhU TUxUb2tlbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDb21wYWN0SFRNTFRva2VuOjpDb21wYWN0 SFRNTFRva2VuKToKKyAgICAgICAgKiBodG1sL3BhcnNlci9Db21wYWN0SFRNTFRva2VuLmg6Cisg ICAgICAgIChDb21wYWN0SFRNTFRva2VuKToKKyAgICAgICAgKFdlYkNvcmU6OkNvbXBhY3RIVE1M VG9rZW46OnRleHRQb3NpdGlvbik6CisgICAgICAgICogaHRtbC9wYXJzZXIvSFRNTERvY3VtZW50 UGFyc2VyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxEb2N1bWVudFBhcnNlcjo6ZGlkUmVj ZWl2ZVRva2Vuc0Zyb21CYWNrZ3JvdW5kUGFyc2VyKToKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxE b2N1bWVudFBhcnNlcjo6bGluZU51bWJlcik6CisgICAgICAgIChXZWJDb3JlOjpIVE1MRG9jdW1l bnRQYXJzZXI6OnRleHRQb3NpdGlvbik6CisgICAgICAgICogaHRtbC9wYXJzZXIvSFRNTERvY3Vt ZW50UGFyc2VyLmg6CisgICAgICAgIChIVE1MRG9jdW1lbnRQYXJzZXIpOgorCiAyMDEzLTAxLTIy ICBBbGV4aXMgTWVuYXJkICA8YWxleGlzQHdlYmtpdC5vcmc+CiAKICAgICAgICAgQWxsb3cgY29u c3RydWN0aW9uIG9mIHVucHJlZml4ZWQgdHJhbnNpdGlvbiBET00gZXZlbnRzLgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvaHRtbC9wYXJzZXIvQmFja2dyb3VuZEhUTUxQYXJzZXIuY3BwIGIv U291cmNlL1dlYkNvcmUvaHRtbC9wYXJzZXIvQmFja2dyb3VuZEhUTUxQYXJzZXIuY3BwCmluZGV4 IDQwZmJiYjExNGIwZTEzMDNiMzM1NzdmZWJhNDFjOWNiODA3MGJjYWIuLmRkMzE5OGE0NjM5ODFh NmI5MWE1OGQxMDg3MDkxZWVhMTM2NzM0YzcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0 bWwvcGFyc2VyL0JhY2tncm91bmRIVE1MUGFyc2VyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9o dG1sL3BhcnNlci9CYWNrZ3JvdW5kSFRNTFBhcnNlci5jcHAKQEAgLTM3LDYgKzM3LDcgQEAKICNp bmNsdWRlICJTVkdOYW1lcy5oIgogI2luY2x1ZGUgPHd0Zi9NYWluVGhyZWFkLmg+CiAjaW5jbHVk ZSA8d3RmL1ZlY3Rvci5oPgorI2luY2x1ZGUgPHd0Zi90ZXh0L1RleHRQb3NpdGlvbi5oPgogCiBu YW1lc3BhY2UgV2ViQ29yZSB7CiAKQEAgLTE3MCw3ICsxNzEsNyBAQCB2b2lkIEJhY2tncm91bmRI VE1MUGFyc2VyOjpwdW1wVG9rZW5pemVyKCkKICAgICAgICAgcmV0dXJuOwogCiAgICAgd2hpbGUg KG1fdG9rZW5pemVyLT5uZXh0VG9rZW4obV9pbnB1dCwgbV90b2tlbikpIHsKLSAgICAgICAgbV9w ZW5kaW5nVG9rZW5zLmFwcGVuZChDb21wYWN0SFRNTFRva2VuKG1fdG9rZW4pKTsKKyAgICAgICAg bV9wZW5kaW5nVG9rZW5zLmFwcGVuZChDb21wYWN0SFRNTFRva2VuKG1fdG9rZW4sIFRleHRQb3Np dGlvbihtX2lucHV0LmN1cnJlbnRMaW5lKCksIG1faW5wdXQuY3VycmVudENvbHVtbigpKSkpOwog ICAgICAgICBtX3Rva2VuLmNsZWFyKCk7CiAKICAgICAgICAgc2ltdWxhdGVUcmVlQnVpbGRlciht X3BlbmRpbmdUb2tlbnMubGFzdCgpKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwv cGFyc2VyL0NvbXBhY3RIVE1MVG9rZW4uY3BwIGIvU291cmNlL1dlYkNvcmUvaHRtbC9wYXJzZXIv Q29tcGFjdEhUTUxUb2tlbi5jcHAKaW5kZXggMDkzMjhlZTg2MGRmNDMzMzU1ZGJiMzI2NWYzZTdl MTI2MGE2ZDM1YS4uNGFjNjUzMGE2MmI4NTRkM2NjYjA4OTkyY2Q2ZTlkYzIyZmZlMmVlOSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9wYXJzZXIvQ29tcGFjdEhUTUxUb2tlbi5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9wYXJzZXIvQ29tcGFjdEhUTUxUb2tlbi5jcHAKQEAg LTMzLDggKzMzLDkgQEAKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCi1Db21wYWN0SFRNTFRva2Vu OjpDb21wYWN0SFRNTFRva2VuKGNvbnN0IEhUTUxUb2tlbiYgdG9rZW4pCitDb21wYWN0SFRNTFRv a2VuOjpDb21wYWN0SFRNTFRva2VuKGNvbnN0IEhUTUxUb2tlbiYgdG9rZW4sIGNvbnN0IFRleHRQ b3NpdGlvbiYgdGV4dFBvc2l0aW9uKQogICAgIDogbV90eXBlKHRva2VuLnR5cGUoKSkKKyAgICAs IG1fdGV4dFBvc2l0aW9uKHRleHRQb3NpdGlvbikKIHsKICAgICBzd2l0Y2ggKG1fdHlwZSkgewog ICAgIGNhc2UgSFRNTFRva2VuVHlwZXM6OlVuaW5pdGlhbGl6ZWQ6CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9odG1sL3BhcnNlci9Db21wYWN0SFRNTFRva2VuLmggYi9Tb3VyY2UvV2ViQ29y ZS9odG1sL3BhcnNlci9Db21wYWN0SFRNTFRva2VuLmgKaW5kZXggNDEwNDE1Y2U5ODNmZDIyODVh ZjAwMzcyMTMzY2Y5NTZlOGRjN2Y4NC4uMTExMWQxYjcyNDI1ZmJhMmU3OTAyNzQwNDU1YzU5YjEx N2NkYmE5ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9wYXJzZXIvQ29tcGFjdEhU TUxUb2tlbi5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvcGFyc2VyL0NvbXBhY3RIVE1MVG9r ZW4uaApAQCAtMzIsNiArMzIsNyBAQAogI2luY2x1ZGUgPHd0Zi9SZWZDb3VudGVkLmg+CiAjaW5j bHVkZSA8d3RmL1JlZlB0ci5oPgogI2luY2x1ZGUgPHd0Zi9WZWN0b3IuaD4KKyNpbmNsdWRlIDx3 dGYvdGV4dC9UZXh0UG9zaXRpb24uaD4KICNpbmNsdWRlIDx3dGYvdGV4dC9XVEZTdHJpbmcuaD4K IAogbmFtZXNwYWNlIFdlYkNvcmUgewpAQCAtNTYsNyArNTcsNyBAQCBwcml2YXRlOgogCiBjbGFz cyBDb21wYWN0SFRNTFRva2VuIHsKIHB1YmxpYzoKLSAgICBleHBsaWNpdCBDb21wYWN0SFRNTFRv a2VuKGNvbnN0IEhUTUxUb2tlbiYpOworICAgIGV4cGxpY2l0IENvbXBhY3RIVE1MVG9rZW4oY29u c3QgSFRNTFRva2VuJiwgY29uc3QgVGV4dFBvc2l0aW9uJik7CiAKICAgICBib29sIGlzU2FmZVRv U2VuZFRvQW5vdGhlclRocmVhZCgpIGNvbnN0OwogCkBAIC02NCw2ICs2NSw3IEBAIHB1YmxpYzoK ICAgICBjb25zdCBTdHJpbmcmIGRhdGEoKSBjb25zdCB7IHJldHVybiBtX2RhdGE7IH0KICAgICBi b29sIHNlbGZDbG9zaW5nKCkgY29uc3QgeyByZXR1cm4gbV9zZWxmQ2xvc2luZzsgfQogICAgIGNv bnN0IFZlY3RvcjxDb21wYWN0QXR0cmlidXRlPiYgYXR0cmlidXRlcygpIGNvbnN0IHsgcmV0dXJu IG1fYXR0cmlidXRlczsgfQorICAgIGNvbnN0IFRleHRQb3NpdGlvbiYgdGV4dFBvc2l0aW9uKCkg Y29uc3QgeyByZXR1cm4gbV90ZXh0UG9zaXRpb247IH0KIAogICAgIGNvbnN0IFN0cmluZyYgcHVi bGljSWRlbnRpZmllcigpIGNvbnN0IHsgcmV0dXJuIG1fcHVibGljSWRlbnRpZmllcjsgfQogICAg IGNvbnN0IFN0cmluZyYgc3lzdGVtSWRlbnRpZmllcigpIGNvbnN0IHsgcmV0dXJuIG1fc3lzdGVt SWRlbnRpZmllcjsgfQpAQCAtNzMsNiArNzUsNyBAQCBwcml2YXRlOgogICAgIFN0cmluZyBtX2Rh dGE7IC8vICJuYW1lIiwgImNoYXJhY3RlcnMiLCBvciAiZGF0YSIgZGVwZW5kaW5nIG9uIG1fdHlw ZQogICAgIGJvb2wgbV9zZWxmQ2xvc2luZzsKICAgICBWZWN0b3I8Q29tcGFjdEF0dHJpYnV0ZT4g bV9hdHRyaWJ1dGVzOworICAgIFRleHRQb3NpdGlvbiBtX3RleHRQb3NpdGlvbjsKIAogICAgIC8v IEZvciBkb2N0eXBlIG9ubHkuCiAgICAgU3RyaW5nIG1fcHVibGljSWRlbnRpZmllcjsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvcGFyc2VyL0hUTUxEb2N1bWVudFBhcnNlci5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9odG1sL3BhcnNlci9IVE1MRG9jdW1lbnRQYXJzZXIuY3BwCmluZGV4 IDY3NmZlMjViMTk5ODEwMTFiY2FhODU1ZjA1YTcxYjU4MWMzN2Y1MmMuLjM5MDBlNzM5MTQwMjc0 ZjhmMDM4ZjdlMWMxY2Y1YzA0MmRmZGQxNzAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0 bWwvcGFyc2VyL0hUTUxEb2N1bWVudFBhcnNlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaHRt bC9wYXJzZXIvSFRNTERvY3VtZW50UGFyc2VyLmNwcApAQCAtMjc2LDYgKzI3Niw3IEBAIHZvaWQg SFRNTERvY3VtZW50UGFyc2VyOjpkaWRSZWNlaXZlVG9rZW5zRnJvbUJhY2tncm91bmRQYXJzZXIo Y29uc3QgVmVjdG9yPENvbXBhCiAgICAgICAgIEFTU0VSVCghaXNXYWl0aW5nRm9yU2NyaXB0cygp KTsKIAogICAgICAgICAvLyBGSVhNRTogQ2FsbCBtX3hzc0F1ZGl0b3IuZmlsdGVyVG9rZW4oKml0 KS4KKyAgICAgICAgbV90ZXh0UG9zaXRpb24gPSBpdC0+dGV4dFBvc2l0aW9uKCk7CiAgICAgICAg IGNvbnN0cnVjdFRyZWVGcm9tQ29tcGFjdEhUTUxUb2tlbigqaXQpOwogCiAgICAgICAgIGlmIChp c1N0b3BwZWQoKSkKQEAgLTYxMywxMSArNjE0LDIxIEBAIFN0cmluZyBIVE1MRG9jdW1lbnRQYXJz ZXI6OnNvdXJjZUZvclRva2VuKGNvbnN0IEhUTUxUb2tlbiYgdG9rZW4pCiAKIE9yZGluYWxOdW1i ZXIgSFRNTERvY3VtZW50UGFyc2VyOjpsaW5lTnVtYmVyKCkgY29uc3QKIHsKKyNpZiBFTkFCTEUo VEhSRUFERURfSFRNTF9QQVJTRVIpCisgICAgaWYgKHNob3VsZFVzZVRocmVhZGluZygpKQorICAg ICAgICByZXR1cm4gbV90ZXh0UG9zaXRpb24ubV9saW5lOworI2VuZGlmCisKICAgICByZXR1cm4g bV9pbnB1dC5jdXJyZW50KCkuY3VycmVudExpbmUoKTsKIH0KIAogVGV4dFBvc2l0aW9uIEhUTUxE b2N1bWVudFBhcnNlcjo6dGV4dFBvc2l0aW9uKCkgY29uc3QKIHsKKyNpZiBFTkFCTEUoVEhSRUFE RURfSFRNTF9QQVJTRVIpCisgICAgaWYgKHNob3VsZFVzZVRocmVhZGluZygpKQorICAgICAgICBy ZXR1cm4gbV90ZXh0UG9zaXRpb247CisjZW5kaWYKKwogICAgIGNvbnN0IFNlZ21lbnRlZFN0cmlu ZyYgY3VycmVudFN0cmluZyA9IG1faW5wdXQuY3VycmVudCgpOwogICAgIE9yZGluYWxOdW1iZXIg bGluZSA9IGN1cnJlbnRTdHJpbmcuY3VycmVudExpbmUoKTsKICAgICBPcmRpbmFsTnVtYmVyIGNv bHVtbiA9IGN1cnJlbnRTdHJpbmcuY3VycmVudENvbHVtbigpOwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvaHRtbC9wYXJzZXIvSFRNTERvY3VtZW50UGFyc2VyLmggYi9Tb3VyY2UvV2ViQ29y ZS9odG1sL3BhcnNlci9IVE1MRG9jdW1lbnRQYXJzZXIuaAppbmRleCBmODkxMTM4YjU3NGViNDcx YjY1ODA0ZWVlMzIwOTIxODcyNWY1ZThjLi40NzcwZjFkNWRlMTQ1MDU5YTExN2RkZTAyMzg5NzJk NjMyMThiMDRmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL3BhcnNlci9IVE1MRG9j dW1lbnRQYXJzZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL3BhcnNlci9IVE1MRG9jdW1l bnRQYXJzZXIuaApAQCAtMzgsNiArMzgsNyBAQAogI2luY2x1ZGUgIlRpbWVyLmgiCiAjaW5jbHVk ZSAiWFNTQXVkaXRvci5oIgogI2luY2x1ZGUgPHd0Zi9Pd25QdHIuaD4KKyNpbmNsdWRlIDx3dGYv dGV4dC9UZXh0UG9zaXRpb24uaD4KIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCkBAIC0xNjMsNiAr MTY0LDcgQEAgcHJpdmF0ZToKICAgICBPd25QdHI8SFRNTFByZWxvYWRTY2FubmVyPiBtX2luc2Vy dGlvblByZWxvYWRTY2FubmVyOwogICAgIE93blB0cjxIVE1MUGFyc2VyU2NoZWR1bGVyPiBtX3Bh cnNlclNjaGVkdWxlcjsKICAgICBIVE1MU291cmNlVHJhY2tlciBtX3NvdXJjZVRyYWNrZXI7Cisg ICAgVGV4dFBvc2l0aW9uIG1fdGV4dFBvc2l0aW9uOwogICAgIFhTU0F1ZGl0b3IgbV94c3NBdWRp dG9yOwogCiAgICAgYm9vbCBtX2VuZFdhc0RlbGF5ZWQ7Cg== 184041 2013-01-22 13:39:07 -0800 2013-01-22 14:14:20 -0800 Patch for landing bug-107561-20130122133602.patch text/plain 6473 tonyg U3VidmVyc2lvbiBSZXZpc2lvbjogMTQwNDYyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2I3YmQ1YjExNDAyNWE1 MGIzYjc1MjVjN2Y0M2JmZTFiOTRkZDFkYy4uZTZhZWMxNGVhZGUzNjM4ZTg0NTgzMTQ3NjY0ZTcz Mjk4YmU4MzBjNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDEzLTAxLTIyICBUb255 IEdlbnRpbGNvcmUgIDx0b255Z0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgTWFrZSBCYWNrZ3Jv dW5kSFRNTFBhcnNlciB0cmFjayBsaW5lL2NvbHVtbiBudW1iZXJzCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDc1NjEKKworICAgICAgICBSZXZpZXdl ZCBieSBBZGFtIEJhcnRoLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cyBiZWNhdXNlIGNvdmVyZWQg YnkgZXhpc3RpbmcgZmFzdC9wYXJzZXIgdGVzdHMuCisKKyAgICAgICAgKiBodG1sL3BhcnNlci9C YWNrZ3JvdW5kSFRNTFBhcnNlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpCYWNrZ3JvdW5kSFRN TFBhcnNlcjo6cHVtcFRva2VuaXplcik6CisgICAgICAgICogaHRtbC9wYXJzZXIvQ29tcGFjdEhU TUxUb2tlbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDb21wYWN0SFRNTFRva2VuOjpDb21wYWN0 SFRNTFRva2VuKToKKyAgICAgICAgKiBodG1sL3BhcnNlci9Db21wYWN0SFRNTFRva2VuLmg6Cisg ICAgICAgIChDb21wYWN0SFRNTFRva2VuKToKKyAgICAgICAgKFdlYkNvcmU6OkNvbXBhY3RIVE1M VG9rZW46OnRleHRQb3NpdGlvbik6CisgICAgICAgICogaHRtbC9wYXJzZXIvSFRNTERvY3VtZW50 UGFyc2VyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxEb2N1bWVudFBhcnNlcjo6ZGlkUmVj ZWl2ZVRva2Vuc0Zyb21CYWNrZ3JvdW5kUGFyc2VyKToKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxE b2N1bWVudFBhcnNlcjo6bGluZU51bWJlcik6CisgICAgICAgIChXZWJDb3JlOjpIVE1MRG9jdW1l bnRQYXJzZXI6OnRleHRQb3NpdGlvbik6CisgICAgICAgICogaHRtbC9wYXJzZXIvSFRNTERvY3Vt ZW50UGFyc2VyLmg6CisgICAgICAgIChIVE1MRG9jdW1lbnRQYXJzZXIpOgorCiAyMDEzLTAxLTIy ICBaYW4gRG9iZXJzZWsgIDx6YW5kb2JlcnNla0BnbWFpbC5jb20+CiAKICAgICAgICAgW0dUS10g RGlzYWJsZSBDU1MgUmVnaW9ucyBpbiByZWxlYXNlIGJ1aWxkcwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvaHRtbC9wYXJzZXIvQmFja2dyb3VuZEhUTUxQYXJzZXIuY3BwIGIvU291cmNlL1dl YkNvcmUvaHRtbC9wYXJzZXIvQmFja2dyb3VuZEhUTUxQYXJzZXIuY3BwCmluZGV4IDQwZmJiYjEx NGIwZTEzMDNiMzM1NzdmZWJhNDFjOWNiODA3MGJjYWIuLmRkMzE5OGE0NjM5ODFhNmI5MWE1OGQx MDg3MDkxZWVhMTM2NzM0YzcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvcGFyc2Vy L0JhY2tncm91bmRIVE1MUGFyc2VyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL3BhcnNl ci9CYWNrZ3JvdW5kSFRNTFBhcnNlci5jcHAKQEAgLTM3LDYgKzM3LDcgQEAKICNpbmNsdWRlICJT VkdOYW1lcy5oIgogI2luY2x1ZGUgPHd0Zi9NYWluVGhyZWFkLmg+CiAjaW5jbHVkZSA8d3RmL1Zl Y3Rvci5oPgorI2luY2x1ZGUgPHd0Zi90ZXh0L1RleHRQb3NpdGlvbi5oPgogCiBuYW1lc3BhY2Ug V2ViQ29yZSB7CiAKQEAgLTE3MCw3ICsxNzEsNyBAQCB2b2lkIEJhY2tncm91bmRIVE1MUGFyc2Vy OjpwdW1wVG9rZW5pemVyKCkKICAgICAgICAgcmV0dXJuOwogCiAgICAgd2hpbGUgKG1fdG9rZW5p emVyLT5uZXh0VG9rZW4obV9pbnB1dCwgbV90b2tlbikpIHsKLSAgICAgICAgbV9wZW5kaW5nVG9r ZW5zLmFwcGVuZChDb21wYWN0SFRNTFRva2VuKG1fdG9rZW4pKTsKKyAgICAgICAgbV9wZW5kaW5n VG9rZW5zLmFwcGVuZChDb21wYWN0SFRNTFRva2VuKG1fdG9rZW4sIFRleHRQb3NpdGlvbihtX2lu cHV0LmN1cnJlbnRMaW5lKCksIG1faW5wdXQuY3VycmVudENvbHVtbigpKSkpOwogICAgICAgICBt X3Rva2VuLmNsZWFyKCk7CiAKICAgICAgICAgc2ltdWxhdGVUcmVlQnVpbGRlcihtX3BlbmRpbmdU b2tlbnMubGFzdCgpKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvcGFyc2VyL0Nv bXBhY3RIVE1MVG9rZW4uY3BwIGIvU291cmNlL1dlYkNvcmUvaHRtbC9wYXJzZXIvQ29tcGFjdEhU TUxUb2tlbi5jcHAKaW5kZXggNWVmMmI3MzViMWFiYWQ4NjJhOGU4Zjk5ZDM4ZmFlNzI5MjEyYzQ0 YS4uNDM3NGM3ODcxNzBiNjRiYjBlM2NmODNmODA1MzJlZjQzYmJkN2YyOSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvaHRtbC9wYXJzZXIvQ29tcGFjdEhUTUxUb2tlbi5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvaHRtbC9wYXJzZXIvQ29tcGFjdEhUTUxUb2tlbi5jcHAKQEAgLTM3LDEyICsz NywxNCBAQCBzdHJ1Y3QgU2FtZVNpemVBc0NvbXBhY3RIVE1MVG9rZW4gIHsKICAgICB1bnNpZ25l ZCBiaXRmaWVsZHM7CiAgICAgU3RyaW5nIG5hbWU7CiAgICAgVmVjdG9yPENvbXBhY3RBdHRyaWJ1 dGU+IHZlY3RvcjsKKyAgICBUZXh0UG9zaXRpb24gdGV4dFBvc2l0aW9uOwogfTsKIAogQ09NUElM RV9BU1NFUlQoc2l6ZW9mKENvbXBhY3RIVE1MVG9rZW4pID09IHNpemVvZihTYW1lU2l6ZUFzQ29t cGFjdEhUTUxUb2tlbiksIENvbXBhY3RIVE1MVG9rZW5fc2hvdWxkX3N0YXlfc21hbGwpOwogCi1D b21wYWN0SFRNTFRva2VuOjpDb21wYWN0SFRNTFRva2VuKGNvbnN0IEhUTUxUb2tlbiYgdG9rZW4p CitDb21wYWN0SFRNTFRva2VuOjpDb21wYWN0SFRNTFRva2VuKGNvbnN0IEhUTUxUb2tlbiYgdG9r ZW4sIGNvbnN0IFRleHRQb3NpdGlvbiYgdGV4dFBvc2l0aW9uKQogICAgIDogbV90eXBlKHRva2Vu LnR5cGUoKSkKKyAgICAsIG1fdGV4dFBvc2l0aW9uKHRleHRQb3NpdGlvbikKIHsKICAgICBzd2l0 Y2ggKG1fdHlwZSkgewogICAgIGNhc2UgSFRNTFRva2VuVHlwZXM6OlVuaW5pdGlhbGl6ZWQ6CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL3BhcnNlci9Db21wYWN0SFRNTFRva2VuLmgg Yi9Tb3VyY2UvV2ViQ29yZS9odG1sL3BhcnNlci9Db21wYWN0SFRNTFRva2VuLmgKaW5kZXggYTE1 MWViMjJkNDVkMDc3YTdlN2IwOThlYjlmZjM5ZjJjNzA0NTk0NC4uN2ViMzg4NTZiZjhhNzdhY2M4 YmY2OTY3YWJjZjgyOTc5MzI3ODM5NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9w YXJzZXIvQ29tcGFjdEhUTUxUb2tlbi5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvcGFyc2Vy L0NvbXBhY3RIVE1MVG9rZW4uaApAQCAtMzIsNiArMzIsNyBAQAogI2luY2x1ZGUgPHd0Zi9SZWZD b3VudGVkLmg+CiAjaW5jbHVkZSA8d3RmL1JlZlB0ci5oPgogI2luY2x1ZGUgPHd0Zi9WZWN0b3Iu aD4KKyNpbmNsdWRlIDx3dGYvdGV4dC9UZXh0UG9zaXRpb24uaD4KICNpbmNsdWRlIDx3dGYvdGV4 dC9XVEZTdHJpbmcuaD4KIAogbmFtZXNwYWNlIFdlYkNvcmUgewpAQCAtNTYsNyArNTcsNyBAQCBw cml2YXRlOgogCiBjbGFzcyBDb21wYWN0SFRNTFRva2VuIHsKIHB1YmxpYzoKLSAgICBleHBsaWNp dCBDb21wYWN0SFRNTFRva2VuKGNvbnN0IEhUTUxUb2tlbiYpOworICAgIGV4cGxpY2l0IENvbXBh Y3RIVE1MVG9rZW4oY29uc3QgSFRNTFRva2VuJiwgY29uc3QgVGV4dFBvc2l0aW9uJik7CiAKICAg ICBib29sIGlzU2FmZVRvU2VuZFRvQW5vdGhlclRocmVhZCgpIGNvbnN0OwogCkBAIC02NCw2ICs2 NSw3IEBAIHB1YmxpYzoKICAgICBjb25zdCBTdHJpbmcmIGRhdGEoKSBjb25zdCB7IHJldHVybiBt X2RhdGE7IH0KICAgICBib29sIHNlbGZDbG9zaW5nKCkgY29uc3QgeyByZXR1cm4gbV9zZWxmQ2xv c2luZzsgfQogICAgIGNvbnN0IFZlY3RvcjxDb21wYWN0QXR0cmlidXRlPiYgYXR0cmlidXRlcygp IGNvbnN0IHsgcmV0dXJuIG1fYXR0cmlidXRlczsgfQorICAgIGNvbnN0IFRleHRQb3NpdGlvbiYg dGV4dFBvc2l0aW9uKCkgY29uc3QgeyByZXR1cm4gbV90ZXh0UG9zaXRpb247IH0KIAogICAgIC8v IFRoZXJlIGlzIG9ubHkgMSBET0NUWVBFIHRva2VuIHBlciBkb2N1bWVudCwgc28gdG8gYXZvaWQg aW5jcmVhc2luZyB0aGUKICAgICAvLyBzaXplIG9mIENvbXBhY3RIVE1MVG9rZW4sIHdlIGp1c3Qg dXNlIHRoZSBtX2F0dHJpYnV0ZXMgdmVjdG9yLgpAQCAtNzYsNiArNzgsNyBAQCBwcml2YXRlOgog CiAgICAgU3RyaW5nIG1fZGF0YTsgLy8gIm5hbWUiLCAiY2hhcmFjdGVycyIsIG9yICJkYXRhIiBk ZXBlbmRpbmcgb24gbV90eXBlCiAgICAgVmVjdG9yPENvbXBhY3RBdHRyaWJ1dGU+IG1fYXR0cmli dXRlczsKKyAgICBUZXh0UG9zaXRpb24gbV90ZXh0UG9zaXRpb247CiB9OwogCiB9CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL3BhcnNlci9IVE1MRG9jdW1lbnRQYXJzZXIuY3BwIGIv U291cmNlL1dlYkNvcmUvaHRtbC9wYXJzZXIvSFRNTERvY3VtZW50UGFyc2VyLmNwcAppbmRleCA2 NzZmZTI1YjE5OTgxMDExYmNhYTg1NWYwNWE3MWI1ODFjMzdmNTJjLi4zOTAwZTczOTE0MDI3NGY4 ZjAzOGY3ZTFjMWNmNWMwNDJkZmRkMTcwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1s L3BhcnNlci9IVE1MRG9jdW1lbnRQYXJzZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwv cGFyc2VyL0hUTUxEb2N1bWVudFBhcnNlci5jcHAKQEAgLTI3Niw2ICsyNzYsNyBAQCB2b2lkIEhU TUxEb2N1bWVudFBhcnNlcjo6ZGlkUmVjZWl2ZVRva2Vuc0Zyb21CYWNrZ3JvdW5kUGFyc2VyKGNv bnN0IFZlY3RvcjxDb21wYQogICAgICAgICBBU1NFUlQoIWlzV2FpdGluZ0ZvclNjcmlwdHMoKSk7 CiAKICAgICAgICAgLy8gRklYTUU6IENhbGwgbV94c3NBdWRpdG9yLmZpbHRlclRva2VuKCppdCku CisgICAgICAgIG1fdGV4dFBvc2l0aW9uID0gaXQtPnRleHRQb3NpdGlvbigpOwogICAgICAgICBj b25zdHJ1Y3RUcmVlRnJvbUNvbXBhY3RIVE1MVG9rZW4oKml0KTsKIAogICAgICAgICBpZiAoaXNT dG9wcGVkKCkpCkBAIC02MTMsMTEgKzYxNCwyMSBAQCBTdHJpbmcgSFRNTERvY3VtZW50UGFyc2Vy Ojpzb3VyY2VGb3JUb2tlbihjb25zdCBIVE1MVG9rZW4mIHRva2VuKQogCiBPcmRpbmFsTnVtYmVy IEhUTUxEb2N1bWVudFBhcnNlcjo6bGluZU51bWJlcigpIGNvbnN0CiB7CisjaWYgRU5BQkxFKFRI UkVBREVEX0hUTUxfUEFSU0VSKQorICAgIGlmIChzaG91bGRVc2VUaHJlYWRpbmcoKSkKKyAgICAg ICAgcmV0dXJuIG1fdGV4dFBvc2l0aW9uLm1fbGluZTsKKyNlbmRpZgorCiAgICAgcmV0dXJuIG1f aW5wdXQuY3VycmVudCgpLmN1cnJlbnRMaW5lKCk7CiB9CiAKIFRleHRQb3NpdGlvbiBIVE1MRG9j dW1lbnRQYXJzZXI6OnRleHRQb3NpdGlvbigpIGNvbnN0CiB7CisjaWYgRU5BQkxFKFRIUkVBREVE X0hUTUxfUEFSU0VSKQorICAgIGlmIChzaG91bGRVc2VUaHJlYWRpbmcoKSkKKyAgICAgICAgcmV0 dXJuIG1fdGV4dFBvc2l0aW9uOworI2VuZGlmCisKICAgICBjb25zdCBTZWdtZW50ZWRTdHJpbmcm IGN1cnJlbnRTdHJpbmcgPSBtX2lucHV0LmN1cnJlbnQoKTsKICAgICBPcmRpbmFsTnVtYmVyIGxp bmUgPSBjdXJyZW50U3RyaW5nLmN1cnJlbnRMaW5lKCk7CiAgICAgT3JkaW5hbE51bWJlciBjb2x1 bW4gPSBjdXJyZW50U3RyaW5nLmN1cnJlbnRDb2x1bW4oKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2h0bWwvcGFyc2VyL0hUTUxEb2N1bWVudFBhcnNlci5oIGIvU291cmNlL1dlYkNvcmUv aHRtbC9wYXJzZXIvSFRNTERvY3VtZW50UGFyc2VyLmgKaW5kZXggZjg5MTEzOGI1NzRlYjQ3MWI2 NTgwNGVlZTMyMDkyMTg3MjVmNWU4Yy4uNDc3MGYxZDVkZTE0NTA1OWExMTdkZGUwMjM4OTcyZDYz MjE4YjA0ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9wYXJzZXIvSFRNTERvY3Vt ZW50UGFyc2VyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9wYXJzZXIvSFRNTERvY3VtZW50 UGFyc2VyLmgKQEAgLTM4LDYgKzM4LDcgQEAKICNpbmNsdWRlICJUaW1lci5oIgogI2luY2x1ZGUg IlhTU0F1ZGl0b3IuaCIKICNpbmNsdWRlIDx3dGYvT3duUHRyLmg+CisjaW5jbHVkZSA8d3RmL3Rl eHQvVGV4dFBvc2l0aW9uLmg+CiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIApAQCAtMTYzLDYgKzE2 NCw3IEBAIHByaXZhdGU6CiAgICAgT3duUHRyPEhUTUxQcmVsb2FkU2Nhbm5lcj4gbV9pbnNlcnRp b25QcmVsb2FkU2Nhbm5lcjsKICAgICBPd25QdHI8SFRNTFBhcnNlclNjaGVkdWxlcj4gbV9wYXJz ZXJTY2hlZHVsZXI7CiAgICAgSFRNTFNvdXJjZVRyYWNrZXIgbV9zb3VyY2VUcmFja2VyOworICAg IFRleHRQb3NpdGlvbiBtX3RleHRQb3NpdGlvbjsKICAgICBYU1NBdWRpdG9yIG1feHNzQXVkaXRv cjsKIAogICAgIGJvb2wgbV9lbmRXYXNEZWxheWVkOwo=