102575 2012-11-16 18:02:43 -0800 [chromium] Add conversion between WebTransformation and gfx::Transform 2012-11-16 20:20:08 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 danakj danakj abarth cc-bugs dglazkov enne fishd jamesr shawnsingh tkent+wkapi webkit.review.bot oldest_to_newest 769813 0 danakj 2012-11-16 18:02:43 -0800 [chromium] Add conversion between WebTransformation and gfx::Transform 769816 1 174791 danakj 2012-11-16 18:06:12 -0800 Created attachment 174791 Patch 769818 2 webkit.review.bot 2012-11-16 18:08:07 -0800 Please wait for approval from abarth@webkit.org, dglazkov@chromium.org, fishd@chromium.org, jamesr@chromium.org or tkent@chromium.org before submitting, as this patch contains changes to the Chromium public API. See also https://trac.webkit.org/wiki/ChromiumWebKitAPI. 769829 3 174791 jamesr 2012-11-16 18:22:42 -0800 Comment on attachment 174791 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=174791&action=review Are you sure about adding these before we finish transitioning chromium code? I'm worried about accidentally adding copies. > Source/Platform/chromium/public/WebTransformationMatrix.h:160 > + gfx::Transform t; we don't use 1-letter variable names for anything but loop counters in WebKit 769830 4 174791 aelias 2012-11-16 18:29:11 -0800 Comment on attachment 174791 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=174791&action=review > Source/Platform/chromium/public/WebTransformationMatrix.h:147 > + m_matrix[i][j] = t.matrix().getDouble(i, j); One of these should go "j, i" because you need to transpose to convert between WebKit matrices and Skia matrices. 769837 5 174793 danakj 2012-11-16 18:34:57 -0800 Created attachment 174793 Patch 769840 6 174791 danakj 2012-11-16 18:38:15 -0800 Comment on attachment 174791 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=174791&action=review >> Source/Platform/chromium/public/WebTransformationMatrix.h:147 >> + m_matrix[i][j] = t.matrix().getDouble(i, j); > > One of these should go "j, i" because you need to transpose to convert between WebKit matrices and Skia matrices. Oh snap, I thought I checked and it wasn't. Here's translateX WebKit: m_matrix[3][0] Skia (via gfx): matrix_.set(0, 3, SkFloatToScalar(x)) You're right. I misread! Will fix. >> Source/Platform/chromium/public/WebTransformationMatrix.h:160 >> + gfx::Transform t; > > we don't use 1-letter variable names for anything but loop counters in WebKit Oops, fixing. 769842 7 174794 danakj 2012-11-16 18:39:52 -0800 Created attachment 174794 Patch 769843 8 danakj 2012-11-16 18:41:27 -0800 (In reply to comment #3) > (From update of attachment 174791 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=174791&action=review > > Are you sure about adding these before we finish transitioning chromium code? I'm worried about accidentally adding copies. I am expecting the cc/ conversion to be ~1 patch, but it could be more than one, and then we should be careful. So, we can explicitly convert somewhere else, then delete it and add implicit conversions here. Or, we can have explicit ones here, and then make them implicit later. I leave that to your discretion. I like them here because it's where the code is going to end up eventually anyways. 769846 9 174794 jamesr 2012-11-16 18:49:56 -0800 Comment on attachment 174794 Patch I'd be fine with having these implicit if we can complete the conversion fast enough (1 patch would be ideal). I don't want to get caught out in an intermediate state for too long. R=me, up to you on the implicit/explicit 769851 10 174794 vollick 2012-11-16 18:58:04 -0800 Comment on attachment 174794 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=174794&action=review > Source/Platform/chromium/public/WebTransformationMatrix.h:148 > + m_matrix[i][j] = transform.matrix().getDouble(j, i); Maybe use SkMatrix44::asColMajord or asRowMajord? 769858 11 danakj 2012-11-16 19:35:00 -0800 (In reply to comment #9) > (From update of attachment 174794 [details]) > I'd be fine with having these implicit if we can complete the conversion fast enough (1 patch would be ideal). I don't want to get caught out in an intermediate state for too long. > > R=me, up to you on the implicit/explicit I do like being safe! And don't mind following up on this after. Thanks for the review. 769863 12 174794 webkit.review.bot 2012-11-16 19:42:52 -0800 Comment on attachment 174794 Patch Attachment 174794 did not pass chromium-ews (chromium-xvfb): Output: http://queues.webkit.org/results/14857848 New failing tests: inspector-protocol/debugger-terminate-dedicated-worker-while-paused.html 769864 13 174794 danakj 2012-11-16 19:45:18 -0800 Comment on attachment 174794 Patch Pretty sure this isn't crashing a test. Let's try this again. 769871 14 174794 webkit.review.bot 2012-11-16 20:20:03 -0800 Comment on attachment 174794 Patch Clearing flags on attachment: 174794 Committed r135031: <http://trac.webkit.org/changeset/135031> 769872 15 webkit.review.bot 2012-11-16 20:20:08 -0800 All reviewed patches have been landed. Closing bug. 174791 2012-11-16 18:06:12 -0800 2012-11-16 18:38:15 -0800 Patch bug-102575-20121116210407.patch text/plain 2418 danakj U3VidmVyc2lvbiBSZXZpc2lvbjogMTM0OTYyCmRpZmYgLS1naXQgYS9Tb3VyY2UvUGxhdGZvcm0v Q2hhbmdlTG9nIGIvU291cmNlL1BsYXRmb3JtL0NoYW5nZUxvZwppbmRleCBlN2ZmYjZiZDk5NmM3 MmZlZmNmNGQ2YzQzMWE3ZjJhOWMzNmY3NDk2Li43MzNmY2ZlNWI2YTFiNDYwNmFmMjE4M2Y2ZThm MTJjZDdmNGUwZWI1IDEwMDY0NAotLS0gYS9Tb3VyY2UvUGxhdGZvcm0vQ2hhbmdlTG9nCisrKyBi L1NvdXJjZS9QbGF0Zm9ybS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBAQAorMjAxMi0xMS0xNiAg RGFuYSBKYW5zZW5zICA8ZGFuYWtqQGNocm9taXVtLm9yZz4KKworICAgICAgICBbY2hyb21pdW1d IEFkZCBjb252ZXJzaW9uIGJldHdlZW4gV2ViVHJhbnNmb3JtYXRpb24gYW5kIGdmeDo6VHJhbnNm b3JtCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDI1 NzUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGNo cm9taXVtL3B1YmxpYy9XZWJUcmFuc2Zvcm1hdGlvbk1hdHJpeC5oOgorICAgICAgICAoV2ViVHJh bnNmb3JtYXRpb25NYXRyaXgpOgorICAgICAgICAoV2ViS2l0OjpXZWJUcmFuc2Zvcm1hdGlvbk1h dHJpeDo6V2ViVHJhbnNmb3JtYXRpb25NYXRyaXgpOgorICAgICAgICAoV2ViS2l0OjpXZWJUcmFu c2Zvcm1hdGlvbk1hdHJpeDo6b3BlcmF0b3I9KToKKyAgICAgICAgKFdlYktpdDo6V2ViVHJhbnNm b3JtYXRpb25NYXRyaXg6Om9wZXJhdG9yIGdmeDo6VHJhbnNmb3JtKToKKwogMjAxMi0xMS0xNSAg U2NvdHQgVmlvbGV0ICA8c2t5QGNocm9taXVtLm9yZz4KIAogICAgICAgICBbY2hyb21pdW1dIENy ZWF0ZSBkZWZhdWx0IGRpcmVjdG9yeSBzbyB0aGF0IGNxIGNhbiBhcHBseSBwYXRjaApkaWZmIC0t Z2l0IGEvU291cmNlL1BsYXRmb3JtL2Nocm9taXVtL3B1YmxpYy9XZWJUcmFuc2Zvcm1hdGlvbk1h dHJpeC5oIGIvU291cmNlL1BsYXRmb3JtL2Nocm9taXVtL3B1YmxpYy9XZWJUcmFuc2Zvcm1hdGlv bk1hdHJpeC5oCmluZGV4IDBlY2IzNGMyZjY3ZGYzN2U2YTA3ZmY3YmVkMDQ3NjU5ZmMwMDAzZjcu LjlhNWFlOGJmNDBhNmNlMzUwYTQ0YWU5MTMzN2RkM2RiYTFmYjRkZmQgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9QbGF0Zm9ybS9jaHJvbWl1bS9wdWJsaWMvV2ViVHJhbnNmb3JtYXRpb25NYXRyaXguaAor KysgYi9Tb3VyY2UvUGxhdGZvcm0vY2hyb21pdW0vcHVibGljL1dlYlRyYW5zZm9ybWF0aW9uTWF0 cml4LmgKQEAgLTM2LDYgKzM2LDggQEAKICNpbmNsdWRlICJGbG9hdFBvaW50M0QuaCIKICNpbmNs dWRlICJGbG9hdFF1YWQuaCIKICNpbmNsdWRlICJUcmFuc2Zvcm1hdGlvbk1hdHJpeC5oIgorI2Vs c2UKKyNpbmNsdWRlIDx1aS9nZngvdHJhbnNmb3JtLmg+CiAjZW5kaWYKIAogI2luY2x1ZGUgIldl YkNvbW1vbi5oIgpAQCAtMTM3LDYgKzEzOSwzMCBAQCBwdWJsaWM6CiAgICAgLy8gQ29udmVyc2lv bnMgYmV0d2VlbiBXZWJLaXQ6OldlYlRyYW5zZm9ybWF0aW9uTWF0cml4IGFuZCBXZWJDb3JlOjpU cmFuc2Zvcm1hdGlvbk1hdHJpeAogICAgIGV4cGxpY2l0IFdlYlRyYW5zZm9ybWF0aW9uTWF0cml4 KGNvbnN0IFdlYkNvcmU6OlRyYW5zZm9ybWF0aW9uTWF0cml4Jik7CiAgICAgV2ViQ29yZTo6VHJh bnNmb3JtYXRpb25NYXRyaXggdG9XZWJDb3JlVHJhbnNmb3JtKCkgY29uc3Q7CisjZWxzZQorICAg IFdlYlRyYW5zZm9ybWF0aW9uTWF0cml4KGNvbnN0IGdmeDo6VHJhbnNmb3JtJiB0KQorICAgIHsK KyAgICAgICAgZm9yIChpbnQgaSA9IDA7IGkgPCA0OyArK2kpCisgICAgICAgICAgICBmb3IgKGlu dCBqID0gMDsgaiA8IDQ7ICsraikKKyAgICAgICAgICAgICAgICBtX21hdHJpeFtpXVtqXSA9IHQu bWF0cml4KCkuZ2V0RG91YmxlKGksIGopOworICAgIH0KKworICAgIFdlYlRyYW5zZm9ybWF0aW9u TWF0cml4JiBvcGVyYXRvcj0oY29uc3QgZ2Z4OjpUcmFuc2Zvcm0mIHQpCisgICAgeworICAgICAg ICBmb3IgKGludCBpID0gMDsgaSA8IDQ7ICsraSkKKyAgICAgICAgICAgIGZvciAoaW50IGogPSAw OyBqIDwgNDsgKytqKQorICAgICAgICAgICAgICAgIG1fbWF0cml4W2ldW2pdID0gdC5tYXRyaXgo KS5nZXREb3VibGUoaSwgaik7CisgICAgICAgIHJldHVybiAqdGhpczsKKyAgICB9CisKKyAgICBv cGVyYXRvciBnZng6OlRyYW5zZm9ybSgpIGNvbnN0CisgICAgeworICAgICAgICBnZng6OlRyYW5z Zm9ybSB0OworICAgICAgICBmb3IgKGludCBpID0gMDsgaSA8IDQ7ICsraSkKKyAgICAgICAgICAg IGZvciAoaW50IGogPSAwOyBqIDwgNDsgKytqKQorICAgICAgICAgICAgICAgIHQubWF0cml4KCku c2V0RG91YmxlKGksIGosIG1fbWF0cml4W2ldW2pdKTsKKyAgICAgICAgcmV0dXJuIHQ7CisgICAg fQogI2VuZGlmCiAKIHByb3RlY3RlZDoK 174793 2012-11-16 18:34:57 -0800 2012-11-16 18:39:49 -0800 Patch bug-102575-20121116213251.patch text/plain 2661 danakj U3VidmVyc2lvbiBSZXZpc2lvbjogMTM0OTYyCmRpZmYgLS1naXQgYS9Tb3VyY2UvUGxhdGZvcm0v Q2hhbmdlTG9nIGIvU291cmNlL1BsYXRmb3JtL0NoYW5nZUxvZwppbmRleCBlN2ZmYjZiZDk5NmM3 MmZlZmNmNGQ2YzQzMWE3ZjJhOWMzNmY3NDk2Li43MzNmY2ZlNWI2YTFiNDYwNmFmMjE4M2Y2ZThm MTJjZDdmNGUwZWI1IDEwMDY0NAotLS0gYS9Tb3VyY2UvUGxhdGZvcm0vQ2hhbmdlTG9nCisrKyBi L1NvdXJjZS9QbGF0Zm9ybS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBAQAorMjAxMi0xMS0xNiAg RGFuYSBKYW5zZW5zICA8ZGFuYWtqQGNocm9taXVtLm9yZz4KKworICAgICAgICBbY2hyb21pdW1d IEFkZCBjb252ZXJzaW9uIGJldHdlZW4gV2ViVHJhbnNmb3JtYXRpb24gYW5kIGdmeDo6VHJhbnNm b3JtCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDI1 NzUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGNo cm9taXVtL3B1YmxpYy9XZWJUcmFuc2Zvcm1hdGlvbk1hdHJpeC5oOgorICAgICAgICAoV2ViVHJh bnNmb3JtYXRpb25NYXRyaXgpOgorICAgICAgICAoV2ViS2l0OjpXZWJUcmFuc2Zvcm1hdGlvbk1h dHJpeDo6V2ViVHJhbnNmb3JtYXRpb25NYXRyaXgpOgorICAgICAgICAoV2ViS2l0OjpXZWJUcmFu c2Zvcm1hdGlvbk1hdHJpeDo6b3BlcmF0b3I9KToKKyAgICAgICAgKFdlYktpdDo6V2ViVHJhbnNm b3JtYXRpb25NYXRyaXg6Om9wZXJhdG9yIGdmeDo6VHJhbnNmb3JtKToKKwogMjAxMi0xMS0xNSAg U2NvdHQgVmlvbGV0ICA8c2t5QGNocm9taXVtLm9yZz4KIAogICAgICAgICBbY2hyb21pdW1dIENy ZWF0ZSBkZWZhdWx0IGRpcmVjdG9yeSBzbyB0aGF0IGNxIGNhbiBhcHBseSBwYXRjaApkaWZmIC0t Z2l0IGEvU291cmNlL1BsYXRmb3JtL2Nocm9taXVtL3B1YmxpYy9XZWJUcmFuc2Zvcm1hdGlvbk1h dHJpeC5oIGIvU291cmNlL1BsYXRmb3JtL2Nocm9taXVtL3B1YmxpYy9XZWJUcmFuc2Zvcm1hdGlv bk1hdHJpeC5oCmluZGV4IDBlY2IzNGMyZjY3ZGYzN2U2YTA3ZmY3YmVkMDQ3NjU5ZmMwMDAzZjcu LmY1ZDRlMGU2NDEwZjE1NWM3MWVmZmViNGM5OWI2YWEwNjE4YTYxMzkgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9QbGF0Zm9ybS9jaHJvbWl1bS9wdWJsaWMvV2ViVHJhbnNmb3JtYXRpb25NYXRyaXguaAor KysgYi9Tb3VyY2UvUGxhdGZvcm0vY2hyb21pdW0vcHVibGljL1dlYlRyYW5zZm9ybWF0aW9uTWF0 cml4LmgKQEAgLTM2LDYgKzM2LDggQEAKICNpbmNsdWRlICJGbG9hdFBvaW50M0QuaCIKICNpbmNs dWRlICJGbG9hdFF1YWQuaCIKICNpbmNsdWRlICJUcmFuc2Zvcm1hdGlvbk1hdHJpeC5oIgorI2Vs c2UKKyNpbmNsdWRlIDx1aS9nZngvdHJhbnNmb3JtLmg+CiAjZW5kaWYKIAogI2luY2x1ZGUgIldl YkNvbW1vbi5oIgpAQCAtMTM3LDYgKzEzOSwzMiBAQCBwdWJsaWM6CiAgICAgLy8gQ29udmVyc2lv bnMgYmV0d2VlbiBXZWJLaXQ6OldlYlRyYW5zZm9ybWF0aW9uTWF0cml4IGFuZCBXZWJDb3JlOjpU cmFuc2Zvcm1hdGlvbk1hdHJpeAogICAgIGV4cGxpY2l0IFdlYlRyYW5zZm9ybWF0aW9uTWF0cml4 KGNvbnN0IFdlYkNvcmU6OlRyYW5zZm9ybWF0aW9uTWF0cml4Jik7CiAgICAgV2ViQ29yZTo6VHJh bnNmb3JtYXRpb25NYXRyaXggdG9XZWJDb3JlVHJhbnNmb3JtKCkgY29uc3Q7CisjZWxzZQorICAg IC8vIEZJWE1FOiBNYWtlIHRoaXMgaW1wbGljaXQgb25jZSBjb21wb3NpdG9yIGlzIG5vdCB1c2lu ZyB0aGlzIGNsYXNzIGludGVybmFsbHkuCisgICAgZXhwbGljaXQgV2ViVHJhbnNmb3JtYXRpb25N YXRyaXgoY29uc3QgZ2Z4OjpUcmFuc2Zvcm0mIHRyYW5zZm9ybSkKKyAgICB7CisgICAgICAgIGZv ciAoaW50IGkgPSAwOyBpIDwgNDsgKytpKQorICAgICAgICAgICAgZm9yIChpbnQgaiA9IDA7IGog PCA0OyArK2opCisgICAgICAgICAgICAgICAgbV9tYXRyaXhbaV1bal0gPSB0cmFuc2Zvcm0ubWF0 cml4KCkuZ2V0RG91YmxlKGksIGopOworICAgIH0KKworICAgIFdlYlRyYW5zZm9ybWF0aW9uTWF0 cml4JiBvcGVyYXRvcj0oY29uc3QgZ2Z4OjpUcmFuc2Zvcm0mIHRyYW5zZm9ybSkKKyAgICB7Cisg ICAgICAgIGZvciAoaW50IGkgPSAwOyBpIDwgNDsgKytpKQorICAgICAgICAgICAgZm9yIChpbnQg aiA9IDA7IGogPCA0OyArK2opCisgICAgICAgICAgICAgICAgbV9tYXRyaXhbaV1bal0gPSB0cmFu c2Zvcm0ubWF0cml4KCkuZ2V0RG91YmxlKGksIGopOworICAgICAgICByZXR1cm4gKnRoaXM7Cisg ICAgfQorCisgICAgLy8gRklYTUU6IE1ha2UgdGhpcyBhbiBvcGVyYXRvciBvbmNlIGNvbXBvc2l0 b3IgaXMgbm90IHVzaW5nIHRoaXMgY2xhc3MgaW50ZXJuYWxseS4KKyAgICBnZng6OlRyYW5zZm9y bSB0b1RyYW5zZm9ybSgpIGNvbnN0CisgICAgeworICAgICAgICBnZng6OlRyYW5zZm9ybSB0cmFu c2Zvcm07CisgICAgICAgIGZvciAoaW50IGkgPSAwOyBpIDwgNDsgKytpKQorICAgICAgICAgICAg Zm9yIChpbnQgaiA9IDA7IGogPCA0OyArK2opCisgICAgICAgICAgICAgICAgdHJhbnNmb3JtLm1h dHJpeCgpLnNldERvdWJsZShpLCBqLCBtX21hdHJpeFtpXVtqXSk7CisgICAgICAgIHJldHVybiB0 cmFuc2Zvcm07CisgICAgfQogI2VuZGlmCiAKIHByb3RlY3RlZDoK 174794 2012-11-16 18:39:52 -0800 2012-11-16 20:20:03 -0800 Patch bug-102575-20121116213747.patch text/plain 2661 danakj U3VidmVyc2lvbiBSZXZpc2lvbjogMTM0OTYyCmRpZmYgLS1naXQgYS9Tb3VyY2UvUGxhdGZvcm0v Q2hhbmdlTG9nIGIvU291cmNlL1BsYXRmb3JtL0NoYW5nZUxvZwppbmRleCBlN2ZmYjZiZDk5NmM3 MmZlZmNmNGQ2YzQzMWE3ZjJhOWMzNmY3NDk2Li43MzNmY2ZlNWI2YTFiNDYwNmFmMjE4M2Y2ZThm MTJjZDdmNGUwZWI1IDEwMDY0NAotLS0gYS9Tb3VyY2UvUGxhdGZvcm0vQ2hhbmdlTG9nCisrKyBi L1NvdXJjZS9QbGF0Zm9ybS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBAQAorMjAxMi0xMS0xNiAg RGFuYSBKYW5zZW5zICA8ZGFuYWtqQGNocm9taXVtLm9yZz4KKworICAgICAgICBbY2hyb21pdW1d IEFkZCBjb252ZXJzaW9uIGJldHdlZW4gV2ViVHJhbnNmb3JtYXRpb24gYW5kIGdmeDo6VHJhbnNm b3JtCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDI1 NzUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGNo cm9taXVtL3B1YmxpYy9XZWJUcmFuc2Zvcm1hdGlvbk1hdHJpeC5oOgorICAgICAgICAoV2ViVHJh bnNmb3JtYXRpb25NYXRyaXgpOgorICAgICAgICAoV2ViS2l0OjpXZWJUcmFuc2Zvcm1hdGlvbk1h dHJpeDo6V2ViVHJhbnNmb3JtYXRpb25NYXRyaXgpOgorICAgICAgICAoV2ViS2l0OjpXZWJUcmFu c2Zvcm1hdGlvbk1hdHJpeDo6b3BlcmF0b3I9KToKKyAgICAgICAgKFdlYktpdDo6V2ViVHJhbnNm b3JtYXRpb25NYXRyaXg6Om9wZXJhdG9yIGdmeDo6VHJhbnNmb3JtKToKKwogMjAxMi0xMS0xNSAg U2NvdHQgVmlvbGV0ICA8c2t5QGNocm9taXVtLm9yZz4KIAogICAgICAgICBbY2hyb21pdW1dIENy ZWF0ZSBkZWZhdWx0IGRpcmVjdG9yeSBzbyB0aGF0IGNxIGNhbiBhcHBseSBwYXRjaApkaWZmIC0t Z2l0IGEvU291cmNlL1BsYXRmb3JtL2Nocm9taXVtL3B1YmxpYy9XZWJUcmFuc2Zvcm1hdGlvbk1h dHJpeC5oIGIvU291cmNlL1BsYXRmb3JtL2Nocm9taXVtL3B1YmxpYy9XZWJUcmFuc2Zvcm1hdGlv bk1hdHJpeC5oCmluZGV4IDBlY2IzNGMyZjY3ZGYzN2U2YTA3ZmY3YmVkMDQ3NjU5ZmMwMDAzZjcu LjQwYzMxZjczNTY1NjVmZmZhNWNjMTNjYWVlY2Y1NDRhOGYyMzNiNjQgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9QbGF0Zm9ybS9jaHJvbWl1bS9wdWJsaWMvV2ViVHJhbnNmb3JtYXRpb25NYXRyaXguaAor KysgYi9Tb3VyY2UvUGxhdGZvcm0vY2hyb21pdW0vcHVibGljL1dlYlRyYW5zZm9ybWF0aW9uTWF0 cml4LmgKQEAgLTM2LDYgKzM2LDggQEAKICNpbmNsdWRlICJGbG9hdFBvaW50M0QuaCIKICNpbmNs dWRlICJGbG9hdFF1YWQuaCIKICNpbmNsdWRlICJUcmFuc2Zvcm1hdGlvbk1hdHJpeC5oIgorI2Vs c2UKKyNpbmNsdWRlIDx1aS9nZngvdHJhbnNmb3JtLmg+CiAjZW5kaWYKIAogI2luY2x1ZGUgIldl YkNvbW1vbi5oIgpAQCAtMTM3LDYgKzEzOSwzMiBAQCBwdWJsaWM6CiAgICAgLy8gQ29udmVyc2lv bnMgYmV0d2VlbiBXZWJLaXQ6OldlYlRyYW5zZm9ybWF0aW9uTWF0cml4IGFuZCBXZWJDb3JlOjpU cmFuc2Zvcm1hdGlvbk1hdHJpeAogICAgIGV4cGxpY2l0IFdlYlRyYW5zZm9ybWF0aW9uTWF0cml4 KGNvbnN0IFdlYkNvcmU6OlRyYW5zZm9ybWF0aW9uTWF0cml4Jik7CiAgICAgV2ViQ29yZTo6VHJh bnNmb3JtYXRpb25NYXRyaXggdG9XZWJDb3JlVHJhbnNmb3JtKCkgY29uc3Q7CisjZWxzZQorICAg IC8vIEZJWE1FOiBNYWtlIHRoaXMgaW1wbGljaXQgb25jZSBjb21wb3NpdG9yIGlzIG5vdCB1c2lu ZyB0aGlzIGNsYXNzIGludGVybmFsbHkuCisgICAgZXhwbGljaXQgV2ViVHJhbnNmb3JtYXRpb25N YXRyaXgoY29uc3QgZ2Z4OjpUcmFuc2Zvcm0mIHRyYW5zZm9ybSkKKyAgICB7CisgICAgICAgIGZv ciAoaW50IGkgPSAwOyBpIDwgNDsgKytpKQorICAgICAgICAgICAgZm9yIChpbnQgaiA9IDA7IGog PCA0OyArK2opCisgICAgICAgICAgICAgICAgbV9tYXRyaXhbaV1bal0gPSB0cmFuc2Zvcm0ubWF0 cml4KCkuZ2V0RG91YmxlKGosIGkpOworICAgIH0KKworICAgIFdlYlRyYW5zZm9ybWF0aW9uTWF0 cml4JiBvcGVyYXRvcj0oY29uc3QgZ2Z4OjpUcmFuc2Zvcm0mIHRyYW5zZm9ybSkKKyAgICB7Cisg ICAgICAgIGZvciAoaW50IGkgPSAwOyBpIDwgNDsgKytpKQorICAgICAgICAgICAgZm9yIChpbnQg aiA9IDA7IGogPCA0OyArK2opCisgICAgICAgICAgICAgICAgbV9tYXRyaXhbaV1bal0gPSB0cmFu c2Zvcm0ubWF0cml4KCkuZ2V0RG91YmxlKGosIGkpOworICAgICAgICByZXR1cm4gKnRoaXM7Cisg ICAgfQorCisgICAgLy8gRklYTUU6IE1ha2UgdGhpcyBhbiBvcGVyYXRvciBvbmNlIGNvbXBvc2l0 b3IgaXMgbm90IHVzaW5nIHRoaXMgY2xhc3MgaW50ZXJuYWxseS4KKyAgICBnZng6OlRyYW5zZm9y bSB0b1RyYW5zZm9ybSgpIGNvbnN0CisgICAgeworICAgICAgICBnZng6OlRyYW5zZm9ybSB0cmFu c2Zvcm07CisgICAgICAgIGZvciAoaW50IGkgPSAwOyBpIDwgNDsgKytpKQorICAgICAgICAgICAg Zm9yIChpbnQgaiA9IDA7IGogPCA0OyArK2opCisgICAgICAgICAgICAgICAgdHJhbnNmb3JtLm1h dHJpeCgpLnNldERvdWJsZShpLCBqLCBtX21hdHJpeFtqXVtpXSk7CisgICAgICAgIHJldHVybiB0 cmFuc2Zvcm07CisgICAgfQogI2VuZGlmCiAKIHByb3RlY3RlZDoK