130350 2014-03-17 10:26:30 -0700 [CSS Shapes] clamp RasterShape shapeMargin to reference box size 2014-03-20 16:32:25 -0700 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 giles_joplin giles_joplin commit-queue esprehn+autocc glenn kling kondapallykalyan oldest_to_newest 991288 0 giles_joplin 2014-03-17 10:26:30 -0700 Image valued shapes are represented internally as a vector of above threshold horizontal "runs"; just the start,end column for the above threshold pixels on a row. The vector's size is currently the image's height plus the user supplied shapeMargin length. The limiting case for the run-vector's size is just one above threshold pixel one the first or last image row. In that case the shapeMargin can be limited to the shape's reference box height, since the shape is clipped to the reference box after it's expanded by shapeMargin. Currently shapeMargin is incorrectly clamped to the image size in RasterShape::marginIntervals() int marginBoundaryRadius = std::min(clampToInteger(ceil(shapeMargin())), std::max(m_imageSize.width(), m_imageSize.height())); 991305 1 giles_joplin 2014-03-17 10:51:35 -0700 Note also: once this is fixed, the m_imageSize member can be removed. 992596 2 227304 giles_joplin 2014-03-20 11:14:12 -0700 Created attachment 227304 Patch Corrected the way the maximum shape-margin value was computed for image valued shapes. The limiting case is an image with just one above threshold pixel. The largest possible value for shapeMargin is the radius of a circle that encloses the size of the shape-outside element's margin-box, since the shape-outside's boundary is clipped to the margin-box. The radius is just sqrt(2) * the margin-box's largest dimension. Also cleaned up up a few poorly named parameters. 992716 3 227304 dino 2014-03-20 14:09:52 -0700 Comment on attachment 227304 Patch You're missing ChangeLogs. Looks ok otherwise though. 992762 4 227345 giles_joplin 2014-03-20 15:24:16 -0700 Created attachment 227345 Patch Added the ChangeLogs. Sorry about that. 992769 5 227345 dino 2014-03-20 15:43:29 -0700 Comment on attachment 227345 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=227345&action=review > Source/WebCore/rendering/shapes/Shape.h:71 > - static PassOwnPtr<Shape> createRasterShape(Image*, float threshold, const LayoutRect& drawRect, const LayoutRect& clipRect, WritingMode, Length margin, Length padding); > + static PassOwnPtr<Shape> createRasterShape(Image*, float threshold, const LayoutRect& imageRect, const LayoutRect& marginRect, WritingMode, Length margin, Length padding); Interesting that Shape.cpp already had that change. 992773 6 giles_joplin 2014-03-20 15:53:20 -0700 (In reply to comment #5) > (From update of attachment 227345 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=227345&action=review > > > Source/WebCore/rendering/shapes/Shape.h:71 > > - static PassOwnPtr<Shape> createRasterShape(Image*, float threshold, const LayoutRect& drawRect, const LayoutRect& clipRect, WritingMode, Length margin, Length padding); > > + static PassOwnPtr<Shape> createRasterShape(Image*, float threshold, const LayoutRect& imageRect, const LayoutRect& marginRect, WritingMode, Length margin, Length padding); > > Interesting that Shape.cpp already had that change. Yes. I had trouble deciding what to call this parameter and the code reflected as much. It's the rect that the overall shape is clipped to (so clipRect) and it's defined by the shape element's margin-box (so marginRect), which can be a little confusing since it's shape-margin that can grow the shape into the margin-box. The names still aren't great, but now at least they're consistent. 992793 7 227345 commit-queue 2014-03-20 16:32:22 -0700 Comment on attachment 227345 Patch Clearing flags on attachment: 227345 Committed r166019: <http://trac.webkit.org/changeset/166019> 992794 8 commit-queue 2014-03-20 16:32:25 -0700 All reviewed patches have been landed. Closing bug. 227304 2014-03-20 11:14:12 -0700 2014-03-20 15:24:16 -0700 Patch tmp.patch text/plain 5813 giles_joplin ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3Qvc2hhcGVzL3NoYXBlLW91dHNpZGUtZmxvYXRz L3NoYXBlLW91dHNpZGUtb25lLXBpeGVsLWV4cGVjdGVkLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0 L3NoYXBlcy9zaGFwZS1vdXRzaWRlLWZsb2F0cy9zaGFwZS1vdXRzaWRlLW9uZS1waXhlbC1leHBl Y3RlZC5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjg2OTRkMWEKLS0t IC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L3NoYXBlcy9zaGFwZS1vdXRzaWRlLWZs b2F0cy9zaGFwZS1vdXRzaWRlLW9uZS1waXhlbC1leHBlY3RlZC5odG1sCkBAIC0wLDAgKzEsMjYg QEAKKzwhRE9DVFlQRSBodG1sPgorPGh0bWw+Cis8aGVhZD4KKzxzdHlsZT4KKyAgICAjY29udGVu dCB7CisgICAgICAgIGZvbnQ6IDUwcHgvMSBBaGVtLCBzYW5zLXNlcmlmOworICAgICAgICAtd2Vi a2l0LWZvbnQtc21vb3RoaW5nOiBhbnRpYWxpYXNlZDsKKyAgICAgICAgY29sb3I6IGdyZWVuOwor ICAgIH0KKyAgICAjc2FuZGJhZyB7CisgICAgICAgIGZsb2F0OiBsZWZ0OworICAgICAgICB3aWR0 aDogMTUwcHg7IAorICAgICAgICBoZWlnaHQ6IDEwMHB4OyAKKyAgICB9Cis8L3N0eWxlPgorPC9o ZWFkPgorPGJvZHk+CisgIDxwPlRoZSBzaGFwZS1vdXRzaWRlIGluIHRoaXMgdGVzdCBpcyBhIDJ4 MiBpbWFnZSB3aXRoIG9ubHkgdGhlIHVwcGVyIGxlZnQgcGl4ZWwgc2V0LiBUaGUgc2hhcGUKKyAg ZWxlbWVudCdzIG1hcmdpbi1yZWN0IGlzIGFuZCB0aGUgdGhlIHNoYXBlLW1hcmdpbiBpcyBiaWcg ZW5vdWdoIChpcyBncmVhdGVyIHRoYW4gMTUwICogc3FydCgyKSkKKyAgc28gdGhhdCB0aGUgc2hh cGUtbWFyZ2luIGJvdW5kYXJ5IGV4dGVuZHMgYmV5b25kIHRoZSBtYXJnaW4gcmVjdCdzIGJvdW5k cy4gVGhlIHNoYXBlLW91dHNpZGUgYm91bmRhcnkKKyAgaXMgY2xpcHBlZCB0byB0aGUgbWFyZ2lu LXJlY3QsIHNvIGl0J3MgYXMgaWYgdGhlIHNoYXBlLW91dHNpZGUgd2FzIGVxdWFsIHRvIHRoZSBt YXJnaW4tcmVjdC48L3A+CisgIDxkaXYgaWQ9ImNvbnRlbnQiPgorICAgICAgPGRpdiBpZD0ic2Fu ZGJhZyI+PC9kaXY+WDxicj5YCisgIDwvZGl2PgorPC9ib2R5PgorPC9odG1sPgpkaWZmIC0tZ2l0 IGEvTGF5b3V0VGVzdHMvZmFzdC9zaGFwZXMvc2hhcGUtb3V0c2lkZS1mbG9hdHMvc2hhcGUtb3V0 c2lkZS1vbmUtcGl4ZWwuaHRtbCBiL0xheW91dFRlc3RzL2Zhc3Qvc2hhcGVzL3NoYXBlLW91dHNp ZGUtZmxvYXRzL3NoYXBlLW91dHNpZGUtb25lLXBpeGVsLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2 NDQKaW5kZXggMDAwMDAwMC4uZjE2NGRkYwotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3Rz L2Zhc3Qvc2hhcGVzL3NoYXBlLW91dHNpZGUtZmxvYXRzL3NoYXBlLW91dHNpZGUtb25lLXBpeGVs Lmh0bWwKQEAgLTAsMCArMSwzMSBAQAorPCFET0NUWVBFIGh0bWw+Cis8aHRtbD4KKzxoZWFkPgor PHN0eWxlPgorICAgICNjb250ZW50IHsKKyAgICAgICAgZm9udDogNTBweC8xIEFoZW0sIHNhbnMt c2VyaWY7CisgICAgICAgIC13ZWJraXQtZm9udC1zbW9vdGhpbmc6IGFudGlhbGlhc2VkOworICAg ICAgICBjb2xvcjogZ3JlZW47CisgICAgfQorICAgICNpbWFnZS1zaGFwZSB7CisgICAgICAgIGZs b2F0OiBsZWZ0OworICAgICAgICAtd2Via2l0LXNoYXBlLW91dHNpZGU6IHVybCgiZGF0YTppbWFn ZS9zdmcreG1sO3V0ZjgsPHN2ZyB4bWxucz0naHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmcnIHdp ZHRoPScycHgnIGhlaWdodD0nMnB4Jz48cmVjdCB3aWR0aD0nMScgaGVpZ2h0PScxJyBmaWxsPSdi bHVlJy8+PC9zdmc+Iik7CisgICAgICAgIC13ZWJraXQtc2hhcGUtbWFyZ2luOiA1MDBweDsKKyAg ICAgICAgbWFyZ2luLXJpZ2h0OiA1MHB4OworICAgICAgICBtYXJnaW4tYm90dG9tOiA1MHB4Owor ICAgICAgICB3aWR0aDogMTAwcHg7IAorICAgICAgICBoZWlnaHQ6IDUwcHg7CisgICAgfQorPC9z dHlsZT4KKzwvaGVhZD4KKzxib2R5PgorICA8cD5UaGUgc2hhcGUtb3V0c2lkZSBpbiB0aGlzIHRl c3QgaXMgYSAyeDIgaW1hZ2Ugd2l0aCBvbmx5IHRoZSB1cHBlciBsZWZ0IHBpeGVsIHNldC4gVGhl IHNoYXBlCisgIGVsZW1lbnQncyBtYXJnaW4tcmVjdCBpcyBhbmQgdGhlIHRoZSBzaGFwZS1tYXJn aW4gaXMgYmlnIGVub3VnaCAoaXMgZ3JlYXRlciB0aGFuIDE1MCAqIHNxcnQoMikpCisgIHNvIHRo YXQgdGhlIHNoYXBlLW1hcmdpbiBib3VuZGFyeSBleHRlbmRzIGJleW9uZCB0aGUgbWFyZ2luIHJl Y3QncyBib3VuZHMuIFRoZSBzaGFwZS1vdXRzaWRlIGJvdW5kYXJ5CisgIGlzIGNsaXBwZWQgdG8g dGhlIG1hcmdpbi1yZWN0LCBzbyBpdCdzIGFzIGlmIHRoZSBzaGFwZS1vdXRzaWRlIHdhcyBlcXVh bCB0byB0aGUgbWFyZ2luLXJlY3QuPC9wPgorICA8ZGl2IGlkPSJjb250ZW50Ij4KKyAgICAgIDxk aXYgaWQ9ImltYWdlLXNoYXBlIj48L2Rpdj4KKyAgICAgIFg8YnI+WAorICA8L2Rpdj4KKzwvYm9k eT4KKzwvaHRtbD4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zaGFwZXMv UmFzdGVyU2hhcGUuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3NoYXBlcy9SYXN0ZXJT aGFwZS5jcHAKaW5kZXggZDkyMTIxOS4uMDVkNzg4MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL3NoYXBlcy9SYXN0ZXJTaGFwZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL3NoYXBlcy9SYXN0ZXJTaGFwZS5jcHAKQEAgLTIxNSw4ICsyMTUsNiBAQCB2b2lk IFJhc3RlclNoYXBlSW50ZXJ2YWxzOjpnZXRFeGNsdWRlZEludGVydmFscyhpbnQgeTEsIGludCB5 MiwgSW50U2hhcGVJbnRlcnZhbAogICAgIH0KIH0KIAotLy8gQ3VycmVudGx5IGxpbWl0ZWQgdG8g Y29tcHV0aW5nIHRoZSBtYXJnaW4gYm91bmRhcnkgZm9yIHNoYXBlLW91dHNpZGUgZm9yIGZsb2F0 cywgc2VlIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTYzNDguCi0K IFBhc3NPd25QdHI8UmFzdGVyU2hhcGVJbnRlcnZhbHM+IFJhc3RlclNoYXBlSW50ZXJ2YWxzOjpj b21wdXRlU2hhcGVNYXJnaW5JbnRlcnZhbHMoaW50IHNoYXBlTWFyZ2luKSBjb25zdAogewogICAg IGludCBtYXJnaW5JbnRlcnZhbHNTaXplID0gKG9mZnNldCgpID4gc2hhcGVNYXJnaW4pID8gc2l6 ZSgpIDogc2l6ZSgpIC0gb2Zmc2V0KCkgKiAyICsgc2hhcGVNYXJnaW4gKiAyOwpAQCAtMjczLDEx ICsyNzEsMTAgQEAgY29uc3QgUmFzdGVyU2hhcGVJbnRlcnZhbHMmIFJhc3RlclNoYXBlOjptYXJn aW5JbnRlcnZhbHMoKSBjb25zdAogICAgIGlmICghc2hhcGVNYXJnaW4oKSkKICAgICAgICAgcmV0 dXJuICptX2ludGVydmFsczsKIAotICAgIGludCBtYXJnaW5Cb3VuZGFyeVJhZGl1cyA9IHN0ZDo6 bWluKGNsYW1wVG9JbnRlZ2VyKGNlaWwoc2hhcGVNYXJnaW4oKSkpLCBzdGQ6Om1heChtX2ltYWdl U2l6ZS53aWR0aCgpLCBtX2ltYWdlU2l6ZS5oZWlnaHQoKSkpOwotICAgIGlmICghbV9tYXJnaW5J bnRlcnZhbHMpIHsKLSAgICAgICAgQVNTRVJUKG1hcmdpbkJvdW5kYXJ5UmFkaXVzID49IDApOwot ICAgICAgICBtX21hcmdpbkludGVydmFscyA9IG1faW50ZXJ2YWxzLT5jb21wdXRlU2hhcGVNYXJn aW5JbnRlcnZhbHMobWFyZ2luQm91bmRhcnlSYWRpdXMpOwotICAgIH0KKyAgICBpbnQgc2hhcGVN YXJnaW5JbnQgPSBjbGFtcFRvUG9zaXRpdmVJbnRlZ2VyKGNlaWwoc2hhcGVNYXJnaW4oKSkpOwor ICAgIGludCBtYXhTaGFwZU1hcmdpbkludCA9IHN0ZDo6bWF4KG1fbWFyZ2luUmVjdFNpemUud2lk dGgoKSwgbV9tYXJnaW5SZWN0U2l6ZS5oZWlnaHQoKSkgKiBzcXJ0KDIpOworICAgIGlmICghbV9t YXJnaW5JbnRlcnZhbHMpCisgICAgICAgIG1fbWFyZ2luSW50ZXJ2YWxzID0gbV9pbnRlcnZhbHMt PmNvbXB1dGVTaGFwZU1hcmdpbkludGVydmFscyhzdGQ6Om1pbihzaGFwZU1hcmdpbkludCwgbWF4 U2hhcGVNYXJnaW5JbnQpKTsKIAogICAgIHJldHVybiAqbV9tYXJnaW5JbnRlcnZhbHM7CiB9CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc2hhcGVzL1Jhc3RlclNoYXBlLmgg Yi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc2hhcGVzL1Jhc3RlclNoYXBlLmgKaW5kZXggZTEw ZjcwOS4uYTFkZGM5NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3NoYXBl cy9SYXN0ZXJTaGFwZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zaGFwZXMvUmFz dGVyU2hhcGUuaApAQCAtOTIsOSArOTIsOSBAQCBwcml2YXRlOgogY2xhc3MgUmFzdGVyU2hhcGUg OiBwdWJsaWMgU2hhcGUgewogICAgIFdURl9NQUtFX05PTkNPUFlBQkxFKFJhc3RlclNoYXBlKTsK IHB1YmxpYzoKLSAgICBSYXN0ZXJTaGFwZShQYXNzT3duUHRyPFJhc3RlclNoYXBlSW50ZXJ2YWxz PiBpbnRlcnZhbHMsIGNvbnN0IEludFNpemUmIGltYWdlU2l6ZSkKKyAgICBSYXN0ZXJTaGFwZShQ YXNzT3duUHRyPFJhc3RlclNoYXBlSW50ZXJ2YWxzPiBpbnRlcnZhbHMsIGNvbnN0IEludFNpemUm IG1hcmdpblJlY3RTaXplKQogICAgICAgICA6IG1faW50ZXJ2YWxzKGludGVydmFscykKLSAgICAg ICAgLCBtX2ltYWdlU2l6ZShpbWFnZVNpemUpCisgICAgICAgICwgbV9tYXJnaW5SZWN0U2l6ZSht YXJnaW5SZWN0U2l6ZSkKICAgICB7CiAgICAgfQogCkBAIC0xMTgsNyArMTE4LDcgQEAgcHJpdmF0 ZToKIAogICAgIE93blB0cjxSYXN0ZXJTaGFwZUludGVydmFscz4gbV9pbnRlcnZhbHM7CiAgICAg bXV0YWJsZSBPd25QdHI8UmFzdGVyU2hhcGVJbnRlcnZhbHM+IG1fbWFyZ2luSW50ZXJ2YWxzOwot ICAgIEludFNpemUgbV9pbWFnZVNpemU7CisgICAgSW50U2l6ZSBtX21hcmdpblJlY3RTaXplOwog fTsKIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL3NoYXBlcy9TaGFwZS5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3NoYXBl cy9TaGFwZS5oCmluZGV4IDRlMzc5M2YuLjA5NDFjYTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9zaGFwZXMvU2hhcGUuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvc2hhcGVzL1NoYXBlLmgKQEAgLTY4LDcgKzY4LDcgQEAgcHVibGljOgogICAgIH07CiAKICAg ICBzdGF0aWMgUGFzc093blB0cjxTaGFwZT4gY3JlYXRlU2hhcGUoY29uc3QgQmFzaWNTaGFwZSos IGNvbnN0IExheW91dFNpemUmIGxvZ2ljYWxCb3hTaXplLCBXcml0aW5nTW9kZSwgTGVuZ3RoIG1h cmdpbiwgTGVuZ3RoIHBhZGRpbmcpOwotICAgIHN0YXRpYyBQYXNzT3duUHRyPFNoYXBlPiBjcmVh dGVSYXN0ZXJTaGFwZShJbWFnZSosIGZsb2F0IHRocmVzaG9sZCwgY29uc3QgTGF5b3V0UmVjdCYg ZHJhd1JlY3QsIGNvbnN0IExheW91dFJlY3QmIGNsaXBSZWN0LCBXcml0aW5nTW9kZSwgTGVuZ3Ro IG1hcmdpbiwgTGVuZ3RoIHBhZGRpbmcpOworICAgIHN0YXRpYyBQYXNzT3duUHRyPFNoYXBlPiBj cmVhdGVSYXN0ZXJTaGFwZShJbWFnZSosIGZsb2F0IHRocmVzaG9sZCwgY29uc3QgTGF5b3V0UmVj dCYgaW1hZ2VSZWN0LCBjb25zdCBMYXlvdXRSZWN0JiBtYXJnaW5SZWN0LCBXcml0aW5nTW9kZSwg TGVuZ3RoIG1hcmdpbiwgTGVuZ3RoIHBhZGRpbmcpOwogICAgIHN0YXRpYyBQYXNzT3duUHRyPFNo YXBlPiBjcmVhdGVCb3hTaGFwZShjb25zdCBSb3VuZGVkUmVjdCYsIFdyaXRpbmdNb2RlLCBMZW5n dGggbWFyZ2luLCBMZW5ndGggcGFkZGluZyk7CiAKICAgICB2aXJ0dWFsIH5TaGFwZSgpIHsgfQo= 227345 2014-03-20 15:24:16 -0700 2014-03-20 16:32:22 -0700 Patch tmp.patch text/plain 7999 giles_joplin ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA5MzJhMjRmLi45NWJlYTcyIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTQtMDMt MjAgIEhhbnMgTXVsbGVyICA8aG11bGxlckBhZG9iZS5jb20+CisKKyAgICAgICAgW0NTUyBTaGFw ZXNdIGNsYW1wIFJhc3RlclNoYXBlIHNoYXBlTWFyZ2luIHRvIHJlZmVyZW5jZSBib3ggc2l6ZQor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTMwMzUwCisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVmVyaWZ5IHRo YXQgYSB2ZXJ5IGxhcmdlIHNoYXBlLW1hcmdpbiB2YWx1ZSBjb21iaW5lZCB3aXRoIGEgdmVyeSBz bWFsbAorICAgICAgICBzaGFwZS1vdXRzaWRlIGltYWdlIGRlZmluZXMgYSBzaGFwZSB0aGF0IG1h dGNoZXMgdGhlIHNoYXBlLW91dHNpZGUKKyAgICAgICAgZWxlbWVudCdzIG1hcmdpbi1ib3guCisK KyAgICAgICAgKiBmYXN0L3NoYXBlcy9zaGFwZS1vdXRzaWRlLWZsb2F0cy9zaGFwZS1vdXRzaWRl LW9uZS1waXhlbC1leHBlY3RlZC5odG1sOiBBZGRlZC4KKyAgICAgICAgKiBmYXN0L3NoYXBlcy9z aGFwZS1vdXRzaWRlLWZsb2F0cy9zaGFwZS1vdXRzaWRlLW9uZS1waXhlbC5odG1sOiBBZGRlZC4K KwogMjAxNC0wMy0xOSAgQnJlbnQgRnVsZ2hhbSAgPGJmdWxnaGFtQGFwcGxlLmNvbT4KIAogICAg ICAgICBNZXJnZSBNaXNjLiBXZWJWVFQgVXBkYXRlcyBmcm9tIEJsaW5rLgpkaWZmIC0tZ2l0IGEv TGF5b3V0VGVzdHMvZmFzdC9zaGFwZXMvc2hhcGUtb3V0c2lkZS1mbG9hdHMvc2hhcGUtb3V0c2lk ZS1vbmUtcGl4ZWwtZXhwZWN0ZWQuaHRtbCBiL0xheW91dFRlc3RzL2Zhc3Qvc2hhcGVzL3NoYXBl LW91dHNpZGUtZmxvYXRzL3NoYXBlLW91dHNpZGUtb25lLXBpeGVsLWV4cGVjdGVkLmh0bWwKbmV3 IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uZDJkZjQyZQotLS0gL2Rldi9udWxsCisr KyBiL0xheW91dFRlc3RzL2Zhc3Qvc2hhcGVzL3NoYXBlLW91dHNpZGUtZmxvYXRzL3NoYXBlLW91 dHNpZGUtb25lLXBpeGVsLWV4cGVjdGVkLmh0bWwKQEAgLTAsMCArMSwyNiBAQAorPCFET0NUWVBF IGh0bWw+Cis8aHRtbD4KKzxoZWFkPgorPHN0eWxlPgorICAgICNjb250ZW50IHsKKyAgICAgICAg Zm9udDogNTBweC8xIEFoZW0sIHNhbnMtc2VyaWY7CisgICAgICAgIC13ZWJraXQtZm9udC1zbW9v dGhpbmc6IGFudGlhbGlhc2VkOworICAgICAgICBjb2xvcjogZ3JlZW47CisgICAgfQorICAgICNz YW5kYmFnIHsKKyAgICAgICAgZmxvYXQ6IGxlZnQ7CisgICAgICAgIHdpZHRoOiAxNTBweDsgCisg ICAgICAgIGhlaWdodDogMTAwcHg7IAorICAgIH0KKzwvc3R5bGU+Cis8L2hlYWQ+Cis8Ym9keT4K KyAgPHA+VGhlIHNoYXBlLW91dHNpZGUgaW4gdGhpcyB0ZXN0IGlzIGEgMngyIGltYWdlIHdpdGgg b25seSB0aGUgdXBwZXIgbGVmdCBwaXhlbCBzZXQuIFRoZSBzaGFwZQorICBlbGVtZW50J3MgbWFy Z2luLWJveCBpcyBhbmQgdGhlIHRoZSBzaGFwZS1tYXJnaW4gaXMgYmlnIGVub3VnaCAoaXMgZ3Jl YXRlciB0aGFuIDE1MCAqIHNxcnQoMikpCisgIHNvIHRoYXQgdGhlIHNoYXBlLW1hcmdpbiBib3Vu ZGFyeSBleHRlbmRzIGJleW9uZCB0aGUgbWFyZ2luLWJveCdzIGJvdW5kcy4gVGhlIHNoYXBlLW91 dHNpZGUgYm91bmRhcnkKKyAgaXMgY2xpcHBlZCB0byB0aGUgbWFyZ2luLWJveCwgc28gaXQncyBh cyBpZiB0aGUgc2hhcGUtb3V0c2lkZSB3YXMgZXF1YWwgdG8gdGhlIG1hcmdpbi1ib3guPC9wPgor ICA8ZGl2IGlkPSJjb250ZW50Ij4KKyAgICAgIDxkaXYgaWQ9InNhbmRiYWciPjwvZGl2Plg8YnI+ WAorICA8L2Rpdj4KKzwvYm9keT4KKzwvaHRtbD4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zh c3Qvc2hhcGVzL3NoYXBlLW91dHNpZGUtZmxvYXRzL3NoYXBlLW91dHNpZGUtb25lLXBpeGVsLmh0 bWwgYi9MYXlvdXRUZXN0cy9mYXN0L3NoYXBlcy9zaGFwZS1vdXRzaWRlLWZsb2F0cy9zaGFwZS1v dXRzaWRlLW9uZS1waXhlbC5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAu LmVkMmRiMTQKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L3NoYXBlcy9zaGFw ZS1vdXRzaWRlLWZsb2F0cy9zaGFwZS1vdXRzaWRlLW9uZS1waXhlbC5odG1sCkBAIC0wLDAgKzEs MzEgQEAKKzwhRE9DVFlQRSBodG1sPgorPGh0bWw+Cis8aGVhZD4KKzxzdHlsZT4KKyAgICAjY29u dGVudCB7CisgICAgICAgIGZvbnQ6IDUwcHgvMSBBaGVtLCBzYW5zLXNlcmlmOworICAgICAgICAt d2Via2l0LWZvbnQtc21vb3RoaW5nOiBhbnRpYWxpYXNlZDsKKyAgICAgICAgY29sb3I6IGdyZWVu OworICAgIH0KKyAgICAjaW1hZ2Utc2hhcGUgeworICAgICAgICBmbG9hdDogbGVmdDsKKyAgICAg ICAgLXdlYmtpdC1zaGFwZS1vdXRzaWRlOiB1cmwoImRhdGE6aW1hZ2Uvc3ZnK3htbDt1dGY4LDxz dmcgeG1sbnM9J2h0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnJyB3aWR0aD0nMnB4JyBoZWlnaHQ9 JzJweCc+PHJlY3Qgd2lkdGg9JzEnIGhlaWdodD0nMScgZmlsbD0nYmx1ZScvPjwvc3ZnPiIpOwor ICAgICAgICAtd2Via2l0LXNoYXBlLW1hcmdpbjogNTAwcHg7CisgICAgICAgIG1hcmdpbi1yaWdo dDogNTBweDsKKyAgICAgICAgbWFyZ2luLWJvdHRvbTogNTBweDsKKyAgICAgICAgd2lkdGg6IDEw MHB4OyAKKyAgICAgICAgaGVpZ2h0OiA1MHB4OworICAgIH0KKzwvc3R5bGU+Cis8L2hlYWQ+Cis8 Ym9keT4KKyAgPHA+VGhlIHNoYXBlLW91dHNpZGUgaW4gdGhpcyB0ZXN0IGlzIGEgMngyIGltYWdl IHdpdGggb25seSB0aGUgdXBwZXIgbGVmdCBwaXhlbCBzZXQuIFRoZSBzaGFwZQorICBlbGVtZW50 J3MgbWFyZ2luLWJveCBpcyBhbmQgdGhlIHRoZSBzaGFwZS1tYXJnaW4gaXMgYmlnIGVub3VnaCAo aXMgZ3JlYXRlciB0aGFuIDE1MCAqIHNxcnQoMikpCisgIHNvIHRoYXQgdGhlIHNoYXBlLW1hcmdp biBib3VuZGFyeSBleHRlbmRzIGJleW9uZCB0aGUgbWFyZ2luLWJveCdzIGJvdW5kcy4gVGhlIHNo YXBlLW91dHNpZGUgYm91bmRhcnkKKyAgaXMgY2xpcHBlZCB0byB0aGUgbWFyZ2luLWJveCwgc28g aXQncyBhcyBpZiB0aGUgc2hhcGUtb3V0c2lkZSB3YXMgZXF1YWwgdG8gdGhlIG1hcmdpbi1ib3gu PC9wPgorICA8ZGl2IGlkPSJjb250ZW50Ij4KKyAgICAgIDxkaXYgaWQ9ImltYWdlLXNoYXBlIj48 L2Rpdj4KKyAgICAgIFg8YnI+WAorICA8L2Rpdj4KKzwvYm9keT4KKzwvaHRtbD4KZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpp bmRleCA5ZmM0NWUzLi5hZmE0MzFjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VM b2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjcgQEAKKzIwMTQt MDMtMjAgIEhhbnMgTXVsbGVyICA8aG11bGxlckBhZG9iZS5jb20+CisKKyAgICAgICAgW0NTUyBT aGFwZXNdIGNsYW1wIFJhc3RlclNoYXBlIHNoYXBlTWFyZ2luIHRvIHJlZmVyZW5jZSBib3ggc2l6 ZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTMwMzUw CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQ29ycmVj dGVkIHRoZSB3YXkgdGhlIG1heGltdW0gc2hhcGUtbWFyZ2luIHZhbHVlIHdhcyBjb21wdXRlZCBm b3IgaW1hZ2UgdmFsdWVkCisgICAgICAgIHNoYXBlcy4gVGhlIGxpbWl0aW5nIGNhc2UgaXMgYW4g aW1hZ2Ugd2l0aCBqdXN0IG9uZSBhYm92ZSB0aHJlc2hvbGQgcGl4ZWwuIFRoZQorICAgICAgICBs YXJnZXN0IHBvc3NpYmxlIHZhbHVlIGZvciBzaGFwZU1hcmdpbiBpcyB0aGUgcmFkaXVzIG9mIGEg Y2lyY2xlIHRoYXQgZW5jbG9zZXMKKyAgICAgICAgdGhlIHNpemUgb2YgdGhlIHNoYXBlLW91dHNp ZGUgZWxlbWVudCdzIG1hcmdpbi1ib3gsIHNpbmNlIHRoZSBzaGFwZS1vdXRzaWRlJ3MKKyAgICAg ICAgYm91bmRhcnkgaXMgY2xpcHBlZCB0byB0aGUgbWFyZ2luLWJveC4gVGhlIHJhZGl1cyBpcyBq dXN0IHNxcnQoMikgKiB0aGUgbWFyZ2luLWJveCdzCisgICAgICAgIGxhcmdlc3QgZGltZW5zaW9u LgorCisgICAgICAgIEFsc28gY2xlYW5lZCB1cCB1cCBhIGZldyBwb29ybHkgbmFtZWQgcGFyYW1l dGVycy4KKworICAgICAgICBUZXN0OiBmYXN0L3NoYXBlcy9zaGFwZS1vdXRzaWRlLWZsb2F0cy9z aGFwZS1vdXRzaWRlLW9uZS1waXhlbC5odG1sCisKKyAgICAgICAgKiByZW5kZXJpbmcvc2hhcGVz L1Jhc3RlclNoYXBlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJhc3RlclNoYXBlOjptYXJnaW5J bnRlcnZhbHMpOgorICAgICAgICAqIHJlbmRlcmluZy9zaGFwZXMvUmFzdGVyU2hhcGUuaDoKKyAg ICAgICAgKFdlYkNvcmU6OlJhc3RlclNoYXBlOjpSYXN0ZXJTaGFwZSk6CisgICAgICAgICogcmVu ZGVyaW5nL3NoYXBlcy9TaGFwZS5oOgorCiAyMDE0LTAzLTE5ICBCeXVuZ3Nlb24gU2hpbiAgPHN1 bi5zaGluQGxnZS5jb20+CiAKICAgICAgICAgRml4ICJXRUJLSVRfV0VCR0xfY29tcHJlc3NlZF90 ZXh0dXJlX3B2cnRjIiBleHRlbnNpb24gc3VwcG9ydApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL3NoYXBlcy9SYXN0ZXJTaGFwZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvc2hhcGVzL1Jhc3RlclNoYXBlLmNwcAppbmRleCBkOTIxMjE5Li4wNWQ3ODgzIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc2hhcGVzL1Jhc3RlclNoYXBlLmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc2hhcGVzL1Jhc3RlclNoYXBlLmNwcApAQCAt MjE1LDggKzIxNSw2IEBAIHZvaWQgUmFzdGVyU2hhcGVJbnRlcnZhbHM6OmdldEV4Y2x1ZGVkSW50 ZXJ2YWxzKGludCB5MSwgaW50IHkyLCBJbnRTaGFwZUludGVydmFsCiAgICAgfQogfQogCi0vLyBD dXJyZW50bHkgbGltaXRlZCB0byBjb21wdXRpbmcgdGhlIG1hcmdpbiBib3VuZGFyeSBmb3Igc2hh cGUtb3V0c2lkZSBmb3IgZmxvYXRzLCBzZWUgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTExNjM0OC4KLQogUGFzc093blB0cjxSYXN0ZXJTaGFwZUludGVydmFscz4gUmFz dGVyU2hhcGVJbnRlcnZhbHM6OmNvbXB1dGVTaGFwZU1hcmdpbkludGVydmFscyhpbnQgc2hhcGVN YXJnaW4pIGNvbnN0CiB7CiAgICAgaW50IG1hcmdpbkludGVydmFsc1NpemUgPSAob2Zmc2V0KCkg PiBzaGFwZU1hcmdpbikgPyBzaXplKCkgOiBzaXplKCkgLSBvZmZzZXQoKSAqIDIgKyBzaGFwZU1h cmdpbiAqIDI7CkBAIC0yNzMsMTEgKzI3MSwxMCBAQCBjb25zdCBSYXN0ZXJTaGFwZUludGVydmFs cyYgUmFzdGVyU2hhcGU6Om1hcmdpbkludGVydmFscygpIGNvbnN0CiAgICAgaWYgKCFzaGFwZU1h cmdpbigpKQogICAgICAgICByZXR1cm4gKm1faW50ZXJ2YWxzOwogCi0gICAgaW50IG1hcmdpbkJv dW5kYXJ5UmFkaXVzID0gc3RkOjptaW4oY2xhbXBUb0ludGVnZXIoY2VpbChzaGFwZU1hcmdpbigp KSksIHN0ZDo6bWF4KG1faW1hZ2VTaXplLndpZHRoKCksIG1faW1hZ2VTaXplLmhlaWdodCgpKSk7 Ci0gICAgaWYgKCFtX21hcmdpbkludGVydmFscykgewotICAgICAgICBBU1NFUlQobWFyZ2luQm91 bmRhcnlSYWRpdXMgPj0gMCk7Ci0gICAgICAgIG1fbWFyZ2luSW50ZXJ2YWxzID0gbV9pbnRlcnZh bHMtPmNvbXB1dGVTaGFwZU1hcmdpbkludGVydmFscyhtYXJnaW5Cb3VuZGFyeVJhZGl1cyk7Ci0g ICAgfQorICAgIGludCBzaGFwZU1hcmdpbkludCA9IGNsYW1wVG9Qb3NpdGl2ZUludGVnZXIoY2Vp bChzaGFwZU1hcmdpbigpKSk7CisgICAgaW50IG1heFNoYXBlTWFyZ2luSW50ID0gc3RkOjptYXgo bV9tYXJnaW5SZWN0U2l6ZS53aWR0aCgpLCBtX21hcmdpblJlY3RTaXplLmhlaWdodCgpKSAqIHNx cnQoMik7CisgICAgaWYgKCFtX21hcmdpbkludGVydmFscykKKyAgICAgICAgbV9tYXJnaW5JbnRl cnZhbHMgPSBtX2ludGVydmFscy0+Y29tcHV0ZVNoYXBlTWFyZ2luSW50ZXJ2YWxzKHN0ZDo6bWlu KHNoYXBlTWFyZ2luSW50LCBtYXhTaGFwZU1hcmdpbkludCkpOwogCiAgICAgcmV0dXJuICptX21h cmdpbkludGVydmFsczsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9z aGFwZXMvUmFzdGVyU2hhcGUuaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zaGFwZXMvUmFz dGVyU2hhcGUuaAppbmRleCBlMTBmNzA5Li5hMWRkYzk2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvc2hhcGVzL1Jhc3RlclNoYXBlLmgKKysrIGIvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL3NoYXBlcy9SYXN0ZXJTaGFwZS5oCkBAIC05Miw5ICs5Miw5IEBAIHByaXZhdGU6 CiBjbGFzcyBSYXN0ZXJTaGFwZSA6IHB1YmxpYyBTaGFwZSB7CiAgICAgV1RGX01BS0VfTk9OQ09Q WUFCTEUoUmFzdGVyU2hhcGUpOwogcHVibGljOgotICAgIFJhc3RlclNoYXBlKFBhc3NPd25QdHI8 UmFzdGVyU2hhcGVJbnRlcnZhbHM+IGludGVydmFscywgY29uc3QgSW50U2l6ZSYgaW1hZ2VTaXpl KQorICAgIFJhc3RlclNoYXBlKFBhc3NPd25QdHI8UmFzdGVyU2hhcGVJbnRlcnZhbHM+IGludGVy dmFscywgY29uc3QgSW50U2l6ZSYgbWFyZ2luUmVjdFNpemUpCiAgICAgICAgIDogbV9pbnRlcnZh bHMoaW50ZXJ2YWxzKQotICAgICAgICAsIG1faW1hZ2VTaXplKGltYWdlU2l6ZSkKKyAgICAgICAg LCBtX21hcmdpblJlY3RTaXplKG1hcmdpblJlY3RTaXplKQogICAgIHsKICAgICB9CiAKQEAgLTEx OCw3ICsxMTgsNyBAQCBwcml2YXRlOgogCiAgICAgT3duUHRyPFJhc3RlclNoYXBlSW50ZXJ2YWxz PiBtX2ludGVydmFsczsKICAgICBtdXRhYmxlIE93blB0cjxSYXN0ZXJTaGFwZUludGVydmFscz4g bV9tYXJnaW5JbnRlcnZhbHM7Ci0gICAgSW50U2l6ZSBtX2ltYWdlU2l6ZTsKKyAgICBJbnRTaXpl IG1fbWFyZ2luUmVjdFNpemU7CiB9OwogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc2hhcGVzL1NoYXBlLmggYi9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvc2hhcGVzL1NoYXBlLmgKaW5kZXggNGUzNzkzZi4uMDk0MWNhMiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3NoYXBlcy9TaGFwZS5oCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zaGFwZXMvU2hhcGUuaApAQCAtNjgsNyArNjgsNyBAQCBw dWJsaWM6CiAgICAgfTsKIAogICAgIHN0YXRpYyBQYXNzT3duUHRyPFNoYXBlPiBjcmVhdGVTaGFw ZShjb25zdCBCYXNpY1NoYXBlKiwgY29uc3QgTGF5b3V0U2l6ZSYgbG9naWNhbEJveFNpemUsIFdy aXRpbmdNb2RlLCBMZW5ndGggbWFyZ2luLCBMZW5ndGggcGFkZGluZyk7Ci0gICAgc3RhdGljIFBh c3NPd25QdHI8U2hhcGU+IGNyZWF0ZVJhc3RlclNoYXBlKEltYWdlKiwgZmxvYXQgdGhyZXNob2xk LCBjb25zdCBMYXlvdXRSZWN0JiBkcmF3UmVjdCwgY29uc3QgTGF5b3V0UmVjdCYgY2xpcFJlY3Qs IFdyaXRpbmdNb2RlLCBMZW5ndGggbWFyZ2luLCBMZW5ndGggcGFkZGluZyk7CisgICAgc3RhdGlj IFBhc3NPd25QdHI8U2hhcGU+IGNyZWF0ZVJhc3RlclNoYXBlKEltYWdlKiwgZmxvYXQgdGhyZXNo b2xkLCBjb25zdCBMYXlvdXRSZWN0JiBpbWFnZVJlY3QsIGNvbnN0IExheW91dFJlY3QmIG1hcmdp blJlY3QsIFdyaXRpbmdNb2RlLCBMZW5ndGggbWFyZ2luLCBMZW5ndGggcGFkZGluZyk7CiAgICAg c3RhdGljIFBhc3NPd25QdHI8U2hhcGU+IGNyZWF0ZUJveFNoYXBlKGNvbnN0IFJvdW5kZWRSZWN0 JiwgV3JpdGluZ01vZGUsIExlbmd0aCBtYXJnaW4sIExlbmd0aCBwYWRkaW5nKTsKIAogICAgIHZp cnR1YWwgflNoYXBlKCkgeyB9Cg==