78527 2012-02-13 13:46:47 -0800 [chromium] CSS Filters on accelerated layers: Brightness and Contrast don't work, Saturation is wrong 2012-02-13 14:23:11 -0800 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 senorblanco senorblanco cc-bugs jamesr kbr webkit.review.bot oldest_to_newest 555542 0 senorblanco 2012-02-13 13:46:47 -0800 The Brightness and Contrast filters are unimplemented on accelerated layers. The saturation filter is wrong (colours are inverted -- see css3/filters/effect-saturate-hw.html). 555550 1 126824 senorblanco 2012-02-13 13:53:21 -0800 Created attachment 126824 Patch 555559 2 126824 kbr 2012-02-13 13:58:12 -0800 Comment on attachment 126824 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=126824&action=review Looks good to me though I'm no expert on the math. Couple of minor nits. > Source/WebCore/platform/graphics/chromium/cc/CCRenderSurfaceFilters.cpp:43 > + memset(matrix, 0, 20 * sizeof(SkScalar)); Instead of "20 * sizeof(SkScalar)" how about just sizeof(matrix)? > Source/WebCore/platform/graphics/chromium/cc/CCRenderSurfaceFilters.cpp:58 > + memset(matrix, 0, 20 * sizeof(SkScalar)); Same here. 555562 3 senorblanco 2012-02-13 14:00:13 -0800 (In reply to comment #2) > (From update of attachment 126824 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=126824&action=review > > Looks good to me though I'm no expert on the math. Couple of minor nits. > > > Source/WebCore/platform/graphics/chromium/cc/CCRenderSurfaceFilters.cpp:43 > > + memset(matrix, 0, 20 * sizeof(SkScalar)); > > Instead of "20 * sizeof(SkScalar)" how about just sizeof(matrix)? Doesn't work for array parameters, since they're actually pointers. You get sizeof(SkScalar*). (I actually wrote it this way first, and only a clang warning saved me!) > > Source/WebCore/platform/graphics/chromium/cc/CCRenderSurfaceFilters.cpp:58 > > + memset(matrix, 0, 20 * sizeof(SkScalar)); > > Same here. 555563 4 126828 senorblanco 2012-02-13 14:00:39 -0800 Created attachment 126828 unskip the css3/filters layout tests 555580 5 126824 kbr 2012-02-13 14:07:57 -0800 Comment on attachment 126824 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=126824&action=review >>> Source/WebCore/platform/graphics/chromium/cc/CCRenderSurfaceFilters.cpp:43 >>> + memset(matrix, 0, 20 * sizeof(SkScalar)); >> >> Instead of "20 * sizeof(SkScalar)" how about just sizeof(matrix)? > > Doesn't work for array parameters, since they're actually pointers. You get sizeof(SkScalar*). (I actually wrote it this way first, and only a clang warning saved me!) Huh, I didn't know that! 555583 6 126828 kbr 2012-02-13 14:08:16 -0800 Comment on attachment 126828 unskip the css3/filters layout tests Still looks good. 555603 7 senorblanco 2012-02-13 14:23:11 -0800 Committed r107611: <http://trac.webkit.org/changeset/107611> 126824 2012-02-13 13:53:21 -0800 2012-02-13 14:07:57 -0800 Patch bug-78527-20120213165320.patch text/plain 3842 senorblanco SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEwNzYwMSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE2IEBACisyMDEyLTAyLTEzICBTdGVwaGVu IFdoaXRlICA8c2Vub3JibGFuY29AY2hyb21pdW0ub3JnPgorCisgICAgICAgIFtjaHJvbWl1bV0g SW1wbGVtZW50IEJyaWdodG5lc3MgYW5kIENvbnRyYXN0IGZpbHRlcnMgb24gY29tcG9zaXRlZAor ICAgICAgICBsYXllcnMuICBGaXggU2F0dXJhdGlvbiBmaWx0ZXIuCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03ODUyNworCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdpbGwgYmUgY292ZXJlZCBieSBleGlzdGlu ZyB0ZXN0cyBpbiBjc3MzL2ZpbHRlcnMsIHdoZW4gZW5hYmxlZC4KKworICAgICAgICAqIHBsYXRm b3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDUmVuZGVyU3VyZmFjZUZpbHRlcnMuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6Q0NSZW5kZXJTdXJmYWNlRmlsdGVyczo6YXBwbHkpOgorCiAyMDEyLTAy LTEzICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKICAgICAgICAgVGhl IHNjcm9sbGluZyB0cmVlIG5lZWRzIHRvIGtub3cgYWJvdXQgdGhlIGJhY2sgZm9yd2FyZCBzdGF0 ZSBvZiB0aGUgcGFnZQpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hy b21pdW0vY2MvQ0NSZW5kZXJTdXJmYWNlRmlsdGVycy5jcHAKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NSZW5kZXJTdXJmYWNlRmls dGVycy5jcHAJKHJldmlzaW9uIDEwNzYwMSkKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL2Nocm9taXVtL2NjL0NDUmVuZGVyU3VyZmFjZUZpbHRlcnMuY3BwCSh3b3JraW5nIGNv cHkpCkBAIC0zOCw2ICszOCwyOSBAQAogCiBuYW1lc3BhY2UgewogCit2b2lkIGdldEJyaWdodG5l c3NNYXRyaXgoZmxvYXQgYW1vdW50LCBTa1NjYWxhciBtYXRyaXhbMjBdKQoreworICAgIG1lbXNl dChtYXRyaXgsIDAsIDIwICogc2l6ZW9mKFNrU2NhbGFyKSk7CisgICAgLy8gICAgT2xkIGltcGxl bWVudGF0aW9uLCBhIGxhIHRoZSBkcmFmdCBzcGVjLCBhIHN0cmFpZ2h0LXVwIHNjYWxlLAorICAg IC8vICAgIHJlcHJlc2VudGluZyA8ZmVGdW5jW1J8R3xCXSB0eXBlPSJsaW5lYXIiIHNsb3BlPSJb YW1vdW50XSI+CisgICAgLy8gICAgKFNlZSBodHRwOi8vZHZjcy53My5vcmcvaGcvRlhURi9yYXct ZmlsZS90aXAvZmlsdGVycy9pbmRleC5odG1sI2JyaWdodG5lc3NFcXVpdmFsZW50KQorICAgIC8v IG1hdHJpeFswXSA9IG1hdHJpeFs2XSA9IG1hdHJpeFsxMl0gPSBhbW91bnQ7CisgICAgLy8gbWF0 cml4WzE4XSA9IDE7CisgICAgLy8gICAgTmV3IGltcGxlbWVudGF0aW9uLCBhIHRyYW5zbGF0aW9u IGluIGNvbG9yIHNwYWNlLCByZXByZXNlbnRpbmcKKyAgICAvLyAgICA8ZmVGdW5jW1J8R3xCXSB0 eXBlPSJsaW5lYXIiIGludGVyY2VwdD0iW2Ftb3VudF0iLz4KKyAgICAvLyAgICAoU2VlIGh0dHBz Oi8vd3d3LnczLm9yZy9CdWdzL1B1YmxpYy9zaG93X2J1Zy5jZ2k/aWQ9MTU2NDcpCisgICAgbWF0 cml4WzBdID0gbWF0cml4WzZdID0gbWF0cml4WzEyXSA9IG1hdHJpeFsxOF0gPSAxOworICAgIG1h dHJpeFs0XSA9IG1hdHJpeFs5XSA9IG1hdHJpeFsxNF0gPSBhbW91bnQgKiAyNTU7Cit9CisKK3Zv aWQgZ2V0Q29udHJhc3RNYXRyaXgoZmxvYXQgYW1vdW50LCBTa1NjYWxhciBtYXRyaXhbMjBdKQor eworICAgIG1lbXNldChtYXRyaXgsIDAsIDIwICogc2l6ZW9mKFNrU2NhbGFyKSk7CisgICAgbWF0 cml4WzBdID0gbWF0cml4WzZdID0gbWF0cml4WzEyXSA9IGFtb3VudDsKKyAgICBtYXRyaXhbNF0g PSBtYXRyaXhbOV0gPSBtYXRyaXhbMTRdID0gKC0wLjVmICogYW1vdW50ICsgMC41ZikgKiAyNTU7 CisgICAgbWF0cml4WzE4XSA9IDE7Cit9CisKIHZvaWQgZ2V0U2F0dXJhdGVNYXRyaXgoZmxvYXQg YW1vdW50LCBTa1NjYWxhciBtYXRyaXhbMjBdKQogewogICAgIG1hdHJpeFswXSA9IDAuMjEzZiAr IDAuNzg3ZiAqIGFtb3VudDsKQEAgLTE4OCw2ICsyMTEsMjAgQEAgU2tCaXRtYXAgQ0NSZW5kZXJT dXJmYWNlRmlsdGVyczo6YXBwbHkoYwogICAgICAgICBTa0NhbnZhcyBjYW52YXMoJmRldmljZSk7 CiAgICAgICAgIGNhbnZhcy5jbGVhcigweDApOwogICAgICAgICBzd2l0Y2ggKGZpbHRlck9wZXJh dGlvbi0+Z2V0T3BlcmF0aW9uVHlwZSgpKSB7CisgICAgICAgIGNhc2UgRmlsdGVyT3BlcmF0aW9u OjpCUklHSFRORVNTOiB7CisgICAgICAgICAgICBjb25zdCBCYXNpY0NvbG9yTWF0cml4RmlsdGVy T3BlcmF0aW9uKiBvcCA9IHN0YXRpY19jYXN0PGNvbnN0IEJhc2ljQ29sb3JNYXRyaXhGaWx0ZXJP cGVyYXRpb24qPihmaWx0ZXJPcGVyYXRpb24pOworICAgICAgICAgICAgU2tTY2FsYXIgbWF0cml4 WzIwXTsKKyAgICAgICAgICAgIGdldEJyaWdodG5lc3NNYXRyaXgob3AtPmFtb3VudCgpLCBtYXRy aXgpOworICAgICAgICAgICAgYXBwbHlDb2xvck1hdHJpeCgmY2FudmFzLCBzb3VyY2UsIG1hdHJp eCk7CisgICAgICAgICAgICBicmVhazsKKyAgICAgICAgfQorICAgICAgICBjYXNlIEZpbHRlck9w ZXJhdGlvbjo6Q09OVFJBU1Q6IHsKKyAgICAgICAgICAgIGNvbnN0IEJhc2ljQ29sb3JNYXRyaXhG aWx0ZXJPcGVyYXRpb24qIG9wID0gc3RhdGljX2Nhc3Q8Y29uc3QgQmFzaWNDb2xvck1hdHJpeEZp bHRlck9wZXJhdGlvbio+KGZpbHRlck9wZXJhdGlvbik7CisgICAgICAgICAgICBTa1NjYWxhciBt YXRyaXhbMjBdOworICAgICAgICAgICAgZ2V0Q29udHJhc3RNYXRyaXgob3AtPmFtb3VudCgpLCBt YXRyaXgpOworICAgICAgICAgICAgYXBwbHlDb2xvck1hdHJpeCgmY2FudmFzLCBzb3VyY2UsIG1h dHJpeCk7CisgICAgICAgICAgICBicmVhazsKKyAgICAgICAgfQogICAgICAgICBjYXNlIEZpbHRl ck9wZXJhdGlvbjo6R1JBWVNDQUxFOiB7CiAgICAgICAgICAgICBjb25zdCBCYXNpY0NvbG9yTWF0 cml4RmlsdGVyT3BlcmF0aW9uKiBvcCA9IHN0YXRpY19jYXN0PGNvbnN0IEJhc2ljQ29sb3JNYXRy aXhGaWx0ZXJPcGVyYXRpb24qPihmaWx0ZXJPcGVyYXRpb24pOwogICAgICAgICAgICAgU2tTY2Fs YXIgbWF0cml4WzIwXTsKQEAgLTIwNSw3ICsyNDIsNyBAQCBTa0JpdG1hcCBDQ1JlbmRlclN1cmZh Y2VGaWx0ZXJzOjphcHBseShjCiAgICAgICAgIGNhc2UgRmlsdGVyT3BlcmF0aW9uOjpTQVRVUkFU RTogewogICAgICAgICAgICAgY29uc3QgQmFzaWNDb2xvck1hdHJpeEZpbHRlck9wZXJhdGlvbiog b3AgPSBzdGF0aWNfY2FzdDxjb25zdCBCYXNpY0NvbG9yTWF0cml4RmlsdGVyT3BlcmF0aW9uKj4o ZmlsdGVyT3BlcmF0aW9uKTsKICAgICAgICAgICAgIFNrU2NhbGFyIG1hdHJpeFsyMF07Ci0gICAg ICAgICAgICBnZXRTYXR1cmF0ZU1hdHJpeCgxIC0gb3AtPmFtb3VudCgpLCBtYXRyaXgpOworICAg ICAgICAgICAgZ2V0U2F0dXJhdGVNYXRyaXgob3AtPmFtb3VudCgpLCBtYXRyaXgpOwogICAgICAg ICAgICAgYXBwbHlDb2xvck1hdHJpeCgmY2FudmFzLCBzb3VyY2UsIG1hdHJpeCk7CiAgICAgICAg ICAgICBicmVhazsKICAgICAgICAgfQo= 126828 2012-02-13 14:00:39 -0800 2012-02-13 14:08:16 -0800 unskip the css3/filters layout tests bug-78527-20120213170038.patch text/plain 5097 senorblanco SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEwNzYwMikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE2IEBACisyMDEyLTAyLTEzICBTdGVwaGVu IFdoaXRlICA8c2Vub3JibGFuY29AY2hyb21pdW0ub3JnPgorCisgICAgICAgIFtjaHJvbWl1bV0g SW1wbGVtZW50IEJyaWdodG5lc3MgYW5kIENvbnRyYXN0IGZpbHRlcnMgb24gY29tcG9zaXRlZAor ICAgICAgICBsYXllcnMuICBGaXggU2F0dXJhdGlvbiBmaWx0ZXIuCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03ODUyNworCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdpbGwgYmUgY292ZXJlZCBieSBleGlzdGlu ZyB0ZXN0cyBpbiBjc3MzL2ZpbHRlcnMsIHdoZW4gZW5hYmxlZC4KKworICAgICAgICAqIHBsYXRm b3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDUmVuZGVyU3VyZmFjZUZpbHRlcnMuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6Q0NSZW5kZXJTdXJmYWNlRmlsdGVyczo6YXBwbHkpOgorCiAyMDEyLTAy LTEzICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKICAgICAgICAgVGhl IHNjcm9sbGluZyB0cmVlIG5lZWRzIHRvIGtub3cgYWJvdXQgdGhlIGJhY2sgZm9yd2FyZCBzdGF0 ZSBvZiB0aGUgcGFnZQpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hy b21pdW0vY2MvQ0NSZW5kZXJTdXJmYWNlRmlsdGVycy5jcHAKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NSZW5kZXJTdXJmYWNlRmls dGVycy5jcHAJKHJldmlzaW9uIDEwNzYwMSkKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL2Nocm9taXVtL2NjL0NDUmVuZGVyU3VyZmFjZUZpbHRlcnMuY3BwCSh3b3JraW5nIGNv cHkpCkBAIC0zOCw2ICszOCwyOSBAQAogCiBuYW1lc3BhY2UgewogCit2b2lkIGdldEJyaWdodG5l c3NNYXRyaXgoZmxvYXQgYW1vdW50LCBTa1NjYWxhciBtYXRyaXhbMjBdKQoreworICAgIG1lbXNl dChtYXRyaXgsIDAsIDIwICogc2l6ZW9mKFNrU2NhbGFyKSk7CisgICAgLy8gICAgT2xkIGltcGxl bWVudGF0aW9uLCBhIGxhIHRoZSBkcmFmdCBzcGVjLCBhIHN0cmFpZ2h0LXVwIHNjYWxlLAorICAg IC8vICAgIHJlcHJlc2VudGluZyA8ZmVGdW5jW1J8R3xCXSB0eXBlPSJsaW5lYXIiIHNsb3BlPSJb YW1vdW50XSI+CisgICAgLy8gICAgKFNlZSBodHRwOi8vZHZjcy53My5vcmcvaGcvRlhURi9yYXct ZmlsZS90aXAvZmlsdGVycy9pbmRleC5odG1sI2JyaWdodG5lc3NFcXVpdmFsZW50KQorICAgIC8v IG1hdHJpeFswXSA9IG1hdHJpeFs2XSA9IG1hdHJpeFsxMl0gPSBhbW91bnQ7CisgICAgLy8gbWF0 cml4WzE4XSA9IDE7CisgICAgLy8gICAgTmV3IGltcGxlbWVudGF0aW9uLCBhIHRyYW5zbGF0aW9u IGluIGNvbG9yIHNwYWNlLCByZXByZXNlbnRpbmcKKyAgICAvLyAgICA8ZmVGdW5jW1J8R3xCXSB0 eXBlPSJsaW5lYXIiIGludGVyY2VwdD0iW2Ftb3VudF0iLz4KKyAgICAvLyAgICAoU2VlIGh0dHBz Oi8vd3d3LnczLm9yZy9CdWdzL1B1YmxpYy9zaG93X2J1Zy5jZ2k/aWQ9MTU2NDcpCisgICAgbWF0 cml4WzBdID0gbWF0cml4WzZdID0gbWF0cml4WzEyXSA9IG1hdHJpeFsxOF0gPSAxOworICAgIG1h dHJpeFs0XSA9IG1hdHJpeFs5XSA9IG1hdHJpeFsxNF0gPSBhbW91bnQgKiAyNTU7Cit9CisKK3Zv aWQgZ2V0Q29udHJhc3RNYXRyaXgoZmxvYXQgYW1vdW50LCBTa1NjYWxhciBtYXRyaXhbMjBdKQor eworICAgIG1lbXNldChtYXRyaXgsIDAsIDIwICogc2l6ZW9mKFNrU2NhbGFyKSk7CisgICAgbWF0 cml4WzBdID0gbWF0cml4WzZdID0gbWF0cml4WzEyXSA9IGFtb3VudDsKKyAgICBtYXRyaXhbNF0g PSBtYXRyaXhbOV0gPSBtYXRyaXhbMTRdID0gKC0wLjVmICogYW1vdW50ICsgMC41ZikgKiAyNTU7 CisgICAgbWF0cml4WzE4XSA9IDE7Cit9CisKIHZvaWQgZ2V0U2F0dXJhdGVNYXRyaXgoZmxvYXQg YW1vdW50LCBTa1NjYWxhciBtYXRyaXhbMjBdKQogewogICAgIG1hdHJpeFswXSA9IDAuMjEzZiAr IDAuNzg3ZiAqIGFtb3VudDsKQEAgLTE4OCw2ICsyMTEsMjAgQEAgU2tCaXRtYXAgQ0NSZW5kZXJT dXJmYWNlRmlsdGVyczo6YXBwbHkoYwogICAgICAgICBTa0NhbnZhcyBjYW52YXMoJmRldmljZSk7 CiAgICAgICAgIGNhbnZhcy5jbGVhcigweDApOwogICAgICAgICBzd2l0Y2ggKGZpbHRlck9wZXJh dGlvbi0+Z2V0T3BlcmF0aW9uVHlwZSgpKSB7CisgICAgICAgIGNhc2UgRmlsdGVyT3BlcmF0aW9u OjpCUklHSFRORVNTOiB7CisgICAgICAgICAgICBjb25zdCBCYXNpY0NvbG9yTWF0cml4RmlsdGVy T3BlcmF0aW9uKiBvcCA9IHN0YXRpY19jYXN0PGNvbnN0IEJhc2ljQ29sb3JNYXRyaXhGaWx0ZXJP cGVyYXRpb24qPihmaWx0ZXJPcGVyYXRpb24pOworICAgICAgICAgICAgU2tTY2FsYXIgbWF0cml4 WzIwXTsKKyAgICAgICAgICAgIGdldEJyaWdodG5lc3NNYXRyaXgob3AtPmFtb3VudCgpLCBtYXRy aXgpOworICAgICAgICAgICAgYXBwbHlDb2xvck1hdHJpeCgmY2FudmFzLCBzb3VyY2UsIG1hdHJp eCk7CisgICAgICAgICAgICBicmVhazsKKyAgICAgICAgfQorICAgICAgICBjYXNlIEZpbHRlck9w ZXJhdGlvbjo6Q09OVFJBU1Q6IHsKKyAgICAgICAgICAgIGNvbnN0IEJhc2ljQ29sb3JNYXRyaXhG aWx0ZXJPcGVyYXRpb24qIG9wID0gc3RhdGljX2Nhc3Q8Y29uc3QgQmFzaWNDb2xvck1hdHJpeEZp bHRlck9wZXJhdGlvbio+KGZpbHRlck9wZXJhdGlvbik7CisgICAgICAgICAgICBTa1NjYWxhciBt YXRyaXhbMjBdOworICAgICAgICAgICAgZ2V0Q29udHJhc3RNYXRyaXgob3AtPmFtb3VudCgpLCBt YXRyaXgpOworICAgICAgICAgICAgYXBwbHlDb2xvck1hdHJpeCgmY2FudmFzLCBzb3VyY2UsIG1h dHJpeCk7CisgICAgICAgICAgICBicmVhazsKKyAgICAgICAgfQogICAgICAgICBjYXNlIEZpbHRl ck9wZXJhdGlvbjo6R1JBWVNDQUxFOiB7CiAgICAgICAgICAgICBjb25zdCBCYXNpY0NvbG9yTWF0 cml4RmlsdGVyT3BlcmF0aW9uKiBvcCA9IHN0YXRpY19jYXN0PGNvbnN0IEJhc2ljQ29sb3JNYXRy aXhGaWx0ZXJPcGVyYXRpb24qPihmaWx0ZXJPcGVyYXRpb24pOwogICAgICAgICAgICAgU2tTY2Fs YXIgbWF0cml4WzIwXTsKQEAgLTIwNSw3ICsyNDIsNyBAQCBTa0JpdG1hcCBDQ1JlbmRlclN1cmZh Y2VGaWx0ZXJzOjphcHBseShjCiAgICAgICAgIGNhc2UgRmlsdGVyT3BlcmF0aW9uOjpTQVRVUkFU RTogewogICAgICAgICAgICAgY29uc3QgQmFzaWNDb2xvck1hdHJpeEZpbHRlck9wZXJhdGlvbiog b3AgPSBzdGF0aWNfY2FzdDxjb25zdCBCYXNpY0NvbG9yTWF0cml4RmlsdGVyT3BlcmF0aW9uKj4o ZmlsdGVyT3BlcmF0aW9uKTsKICAgICAgICAgICAgIFNrU2NhbGFyIG1hdHJpeFsyMF07Ci0gICAg ICAgICAgICBnZXRTYXR1cmF0ZU1hdHJpeCgxIC0gb3AtPmFtb3VudCgpLCBtYXRyaXgpOworICAg ICAgICAgICAgZ2V0U2F0dXJhdGVNYXRyaXgob3AtPmFtb3VudCgpLCBtYXRyaXgpOwogICAgICAg ICAgICAgYXBwbHlDb2xvck1hdHJpeCgmY2FudmFzLCBzb3VyY2UsIG1hdHJpeCk7CiAgICAgICAg ICAgICBicmVhazsKICAgICAgICAgfQpJbmRleDogTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIExheW91dFRlc3RzL0NoYW5nZUxvZwkocmV2aXNpb24gMTA3NjAyKQorKysgTGF5 b3V0VGVzdHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTIt MDItMTMgIFN0ZXBoZW4gV2hpdGUgIDxzZW5vcmJsYW5jb0BjaHJvbWl1bS5vcmc+CisKKyAgICAg ICAgVW5za2lwIHRoZSBjc3MzL2ZpbHRlcnMgdGVzdHMsIHNvIHdlIGNhbiBnZXQgc29tZSBiYXNl bGluZXMgb2ZmIHRoZQorICAgICAgICBib3RzLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Nzg1MjcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICAqIHBsYXRmb3JtL2Nocm9taXVtL3Rlc3RfZXhwZWN0YXRpb25z LnR4dDoKKwogMjAxMi0wMi0xMyAgVG9ueSBDaGFuZyAgPHRvbnlAY2hyb21pdW0ub3JnPgogCiAg ICAgICAgIFtjaHJvbWl1bV0gVW5yZXZpZXdlZCBnYXJkZW5pbmcuICBNYXJraW5nIHNvbWUgZGVi dWcgdGVzdHMgYXMgZmFpbGluZy4KSW5kZXg6IExheW91dFRlc3RzL3BsYXRmb3JtL2Nocm9taXVt L3Rlc3RfZXhwZWN0YXRpb25zLnR4dAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9wbGF0Zm9y bS9jaHJvbWl1bS90ZXN0X2V4cGVjdGF0aW9ucy50eHQJKHJldmlzaW9uIDEwNzYwMSkKKysrIExh eW91dFRlc3RzL3BsYXRmb3JtL2Nocm9taXVtL3Rlc3RfZXhwZWN0YXRpb25zLnR4dAkod29ya2lu ZyBjb3B5KQpAQCAtMzE2Myw3ICszMTYzLDcgQEAgQlVHV0s3NDEzNyA6IGZhc3QvcmVnaW9ucy93 ZWJraXQtZmxvdy1pbgogQlVHV0s3NDEzNyA6IGZhc3QvcmVnaW9ucy93ZWJraXQtZmxvdy1pbmxp bmVzLWluc2lkZS1yZWdpb25zLWJvdW5kcy5odG1sID0gUEFTUyBGQUlMIE1JU1NJTkcKIAogLy8g Q1NTIEZpbHRlcnMgc3VwcG9ydCBub3QgeWV0IGVuYWJsZWQKLUJVR1dLNjg0NjkgU0tJUCA6IGNz czMvZmlsdGVycyA9IFBBU1MKK0JVR1dLNjg0NjkgOiBjc3MzL2ZpbHRlcnMgPSBGQUlMCiAKIC8v IDxzdHlsZSBzY29wZWQ+IG5vdCB5ZXQgZW5hYmxlZC4KIEJVR1dLNDkxNDIgU0tJUCA6IGZhc3Qv Y3NzL3N0eWxlLXNjb3BlZCA9IFBBU1MK