121187 2013-09-11 15:45:06 -0700 [CSS Shapes] Turn shape's logicalwidth/height into a LayoutSize 2013-09-12 13:44:11 -0700 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 89256 1 zoltan zoltan commit-queue esprehn+autocc glenn kondapallykalyan oldest_to_newest 928021 0 zoltan 2013-09-11 15:45:06 -0700 Turn shape's logicalwidth/height into a LayoutSize 928022 1 211360 zoltan 2013-09-11 15:51:34 -0700 Created attachment 211360 proposed patch 928031 2 211362 zoltan 2013-09-11 16:12:08 -0700 Created attachment 211362 proposed patch 928331 3 211362 hyatt 2013-09-12 09:26:58 -0700 Comment on attachment 211362 proposed patch r=me 928332 4 211362 hyatt 2013-09-12 09:27:33 -0700 Comment on attachment 211362 proposed patch View in context: https://bugs.webkit.org/attachment.cgi?id=211362&action=review > Source/WebCore/rendering/shapes/ShapeInfo.h:99 > + LayoutUnit shapeContainingBlockHeight() const { return (m_renderer->style()->boxSizing() == CONTENT_BOX) ? (m_shapeLogicalSize.height() + m_renderer->borderAndPaddingLogicalHeight()) : m_shapeLogicalSize.height(); } Just an observation for a future patch, but this should really be shapeContainingBockLogicalHeight(). 928347 5 211362 commit-queue 2013-09-12 09:48:41 -0700 Comment on attachment 211362 proposed patch Clearing flags on attachment: 211362 Committed r155626: <http://trac.webkit.org/changeset/155626> 928348 6 commit-queue 2013-09-12 09:48:43 -0700 All reviewed patches have been landed. Closing bug. 211360 2013-09-11 15:51:34 -0700 2013-09-11 16:12:08 -0700 proposed patch turnunittosize.patch text/plain 4118 zoltan ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA0NTk1MzAxLi45YWYwYzYzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTgg QEAKKzIwMTMtMDktMTEgIFpvbHRhbiBIb3J2YXRoICA8em9sdGFuQHdlYmtpdC5vcmc+CisKKyAg ICAgICAgW0NTUyBTaGFwZXNdIFR1cm4gc2hhcGUncyBsb2dpY2Fsd2lkdGgvaGVpZ2h0IGludG8g YSBMYXlvdXRTaXplCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xMjExODcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBObyBuZXcgdGVzdHMsIG5vIGJlaGF2aW9yIGNoYW5nZS4KKworICAgICAgICAqIHJlbmRl cmluZy9zaGFwZXMvU2hhcGVJbmZvLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Ojo6Y29tcHV0ZWRT aGFwZSk6CisgICAgICAgICogcmVuZGVyaW5nL3NoYXBlcy9TaGFwZUluZm8uaDoKKyAgICAgICAg KFdlYkNvcmU6OlNoYXBlSW5mbzo6c2V0U2hhcGVTaXplKToKKyAgICAgICAgKFdlYkNvcmU6OlNo YXBlSW5mbzo6c2hhcGVDb250YWluaW5nQmxvY2tIZWlnaHQpOgorCiAyMDEzLTA5LTExICBCcmVu dCBGdWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29tPgogCiAgICAgICAgIFtXaW5kb3dzXSBBdm9p ZCBjb252ZXJ0aW5nIGZyb20gSW50U2l6ZS0+U0laRS0+SW50U2l6ZS4KZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zaGFwZXMvU2hhcGVJbmZvLmNwcCBiL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9zaGFwZXMvU2hhcGVJbmZvLmNwcAppbmRleCBiZjk0ZTQyLi42NDUzMTY4 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc2hhcGVzL1NoYXBlSW5mby5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3NoYXBlcy9TaGFwZUluZm8uY3BwCkBA IC00NSw3ICs0NSw2IEBAIGNvbnN0IFNoYXBlKiBTaGFwZUluZm88UmVuZGVyVHlwZSwgc2hhcGVH ZXR0ZXIsIGludGVydmFsR2V0dGVyPjo6Y29tcHV0ZWRTaGFwZSgpCiAgICAgaWYgKFNoYXBlKiBz aGFwZSA9IG1fc2hhcGUuZ2V0KCkpCiAgICAgICAgIHJldHVybiBzaGFwZTsKIAotICAgIGNvbnN0 IExheW91dFNpemUgbG9naWNhbEJveFNpemUobV9zaGFwZUxvZ2ljYWxXaWR0aCwgbV9zaGFwZUxv Z2ljYWxIZWlnaHQpOwogICAgIFdyaXRpbmdNb2RlIHdyaXRpbmdNb2RlID0gbV9yZW5kZXJlci0+ c3R5bGUoKS0+d3JpdGluZ01vZGUoKTsKICAgICBMZW5ndGggbWFyZ2luID0gbV9yZW5kZXJlci0+ c3R5bGUoKS0+c2hhcGVNYXJnaW4oKTsKICAgICBMZW5ndGggcGFkZGluZyA9IG1fcmVuZGVyZXIt PnN0eWxlKCktPnNoYXBlUGFkZGluZygpOwpAQCAtNTUsMTEgKzU0LDExIEBAIGNvbnN0IFNoYXBl KiBTaGFwZUluZm88UmVuZGVyVHlwZSwgc2hhcGVHZXR0ZXIsIGludGVydmFsR2V0dGVyPjo6Y29t cHV0ZWRTaGFwZSgpCiAgICAgc3dpdGNoIChzaGFwZVZhbHVlLT50eXBlKCkpIHsKICAgICBjYXNl IFNoYXBlVmFsdWU6OlNoYXBlOgogICAgICAgICBBU1NFUlQoc2hhcGVWYWx1ZS0+c2hhcGUoKSk7 Ci0gICAgICAgIG1fc2hhcGUgPSBTaGFwZTo6Y3JlYXRlU2hhcGUoc2hhcGVWYWx1ZS0+c2hhcGUo KSwgbG9naWNhbEJveFNpemUsIHdyaXRpbmdNb2RlLCBtYXJnaW4sIHBhZGRpbmcpOworICAgICAg ICBtX3NoYXBlID0gU2hhcGU6OmNyZWF0ZVNoYXBlKHNoYXBlVmFsdWUtPnNoYXBlKCksIG1fc2hh cGVMb2dpY2FsU2l6ZSwgd3JpdGluZ01vZGUsIG1hcmdpbiwgcGFkZGluZyk7CiAgICAgICAgIGJy ZWFrOwogICAgIGNhc2UgU2hhcGVWYWx1ZTo6SW1hZ2U6CiAgICAgICAgIEFTU0VSVChzaGFwZVZh bHVlLT5pbWFnZSgpKTsKLSAgICAgICAgbV9zaGFwZSA9IFNoYXBlOjpjcmVhdGVTaGFwZShzaGFw ZVZhbHVlLT5pbWFnZSgpLCAwLCBsb2dpY2FsQm94U2l6ZSwgd3JpdGluZ01vZGUsIG1hcmdpbiwg cGFkZGluZyk7CisgICAgICAgIG1fc2hhcGUgPSBTaGFwZTo6Y3JlYXRlU2hhcGUoc2hhcGVWYWx1 ZS0+aW1hZ2UoKSwgMCwgbV9zaGFwZUxvZ2ljYWxTaXplLCB3cml0aW5nTW9kZSwgbWFyZ2luLCBw YWRkaW5nKTsKICAgICAgICAgYnJlYWs7CiAgICAgZGVmYXVsdDoKICAgICAgICAgQVNTRVJUX05P VF9SRUFDSEVEKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc2hhcGVz L1NoYXBlSW5mby5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3NoYXBlcy9TaGFwZUluZm8u aAppbmRleCAwNGVlNDcxLi5kNmRmMTZhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvc2hhcGVzL1NoYXBlSW5mby5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9z aGFwZXMvU2hhcGVJbmZvLmgKQEAgLTc3LDExICs3NywxMSBAQCBwdWJsaWM6CiAgICAgICAgICAg ICBsb2dpY2FsSGVpZ2h0IC09IG1fcmVuZGVyZXItPmJvcmRlckFuZFBhZGRpbmdMb2dpY2FsSGVp Z2h0KCk7CiAgICAgICAgIH0KIAotICAgICAgICBpZiAobV9zaGFwZUxvZ2ljYWxXaWR0aCA9PSBs b2dpY2FsV2lkdGggJiYgbV9zaGFwZUxvZ2ljYWxIZWlnaHQgPT0gbG9naWNhbEhlaWdodCkKKyAg ICAgICAgaWYgKG1fc2hhcGVMb2dpY2FsU2l6ZS53aWR0aCgpID09IGxvZ2ljYWxXaWR0aCAmJiBt X3NoYXBlTG9naWNhbFNpemUuaGVpZ2h0KCkgPT0gbG9naWNhbEhlaWdodCkKICAgICAgICAgICAg IHJldHVybjsKICAgICAgICAgZGlydHlTaGFwZVNpemUoKTsKLSAgICAgICAgbV9zaGFwZUxvZ2lj YWxXaWR0aCA9IGxvZ2ljYWxXaWR0aDsKLSAgICAgICAgbV9zaGFwZUxvZ2ljYWxIZWlnaHQgPSBs b2dpY2FsSGVpZ2h0OworICAgICAgICBtX3NoYXBlTG9naWNhbFNpemUuc2V0V2lkdGgobG9naWNh bFdpZHRoKTsKKyAgICAgICAgbV9zaGFwZUxvZ2ljYWxTaXplLnNldEhlaWdodChsb2dpY2FsSGVp Z2h0KTsKICAgICB9CiAKICAgICB2aXJ0dWFsIGJvb2wgY29tcHV0ZVNlZ21lbnRzRm9yTGluZShM YXlvdXRVbml0IGxpbmVUb3AsIExheW91dFVuaXQgbGluZUhlaWdodCk7CkBAIC05Nyw3ICs5Nyw3 IEBAIHB1YmxpYzoKICAgICBMYXlvdXRVbml0IGxvZ2ljYWxMaW5lVG9wKCkgY29uc3QgeyByZXR1 cm4gbV9zaGFwZUxpbmVUb3AgKyBsb2dpY2FsVG9wT2Zmc2V0KCk7IH0KICAgICBMYXlvdXRVbml0 IGxvZ2ljYWxMaW5lQm90dG9tKCkgY29uc3QgeyByZXR1cm4gbV9zaGFwZUxpbmVUb3AgKyBtX2xp bmVIZWlnaHQgKyBsb2dpY2FsVG9wT2Zmc2V0KCk7IH0KIAotICAgIExheW91dFVuaXQgc2hhcGVD b250YWluaW5nQmxvY2tIZWlnaHQoKSBjb25zdCB7IHJldHVybiAobV9yZW5kZXJlci0+c3R5bGUo KS0+Ym94U2l6aW5nKCkgPT0gQ09OVEVOVF9CT1gpID8gKG1fc2hhcGVMb2dpY2FsSGVpZ2h0ICsg bV9yZW5kZXJlci0+Ym9yZGVyQW5kUGFkZGluZ0xvZ2ljYWxIZWlnaHQoKSkgOiBtX3NoYXBlTG9n aWNhbEhlaWdodDsgfQorICAgIExheW91dFVuaXQgc2hhcGVDb250YWluaW5nQmxvY2tIZWlnaHQo KSBjb25zdCB7IHJldHVybiAobV9yZW5kZXJlci0+c3R5bGUoKS0+Ym94U2l6aW5nKCkgPT0gQ09O VEVOVF9CT1gpID8gKG1fc2hhcGVMb2dpY2FsU2l6ZS5oZWlnaHQoKSArIG1fcmVuZGVyZXItPmJv cmRlckFuZFBhZGRpbmdMb2dpY2FsSGVpZ2h0KCkpIDogbV9zaGFwZUxvZ2ljYWxTaXplLmhlaWdo dCgpOyB9CiAKICAgICBib29sIGxpbmVPdmVybGFwc1NoYXBlQm91bmRzKCkgY29uc3QgeyByZXR1 cm4gbG9naWNhbExpbmVUb3AoKSA8IHNoYXBlTG9naWNhbEJvdHRvbSgpICYmIHNoYXBlTG9naWNh bFRvcCgpIDw9IGxvZ2ljYWxMaW5lQm90dG9tKCk7IH0KIApAQCAtMTIyLDkgKzEyMiw3IEBAIHBy b3RlY3RlZDoKIAogcHJpdmF0ZToKICAgICBtdXRhYmxlIE93blB0cjxTaGFwZT4gbV9zaGFwZTsK LQotICAgIExheW91dFVuaXQgbV9zaGFwZUxvZ2ljYWxXaWR0aDsKLSAgICBMYXlvdXRVbml0IG1f c2hhcGVMb2dpY2FsSGVpZ2h0OworICAgIExheW91dFNpemUgbV9zaGFwZUxvZ2ljYWxTaXplOwog fTsKIH0KICNlbmRpZgo= 211362 2013-09-11 16:12:08 -0700 2013-09-12 09:48:41 -0700 proposed patch shapelogicalsize.patch text/plain 4486 zoltan ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA0NTk1MzAxLi45YWYwYzYzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTgg QEAKKzIwMTMtMDktMTEgIFpvbHRhbiBIb3J2YXRoICA8em9sdGFuQHdlYmtpdC5vcmc+CisKKyAg ICAgICAgW0NTUyBTaGFwZXNdIFR1cm4gc2hhcGUncyBsb2dpY2Fsd2lkdGgvaGVpZ2h0IGludG8g YSBMYXlvdXRTaXplCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xMjExODcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBObyBuZXcgdGVzdHMsIG5vIGJlaGF2aW9yIGNoYW5nZS4KKworICAgICAgICAqIHJlbmRl cmluZy9zaGFwZXMvU2hhcGVJbmZvLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Ojo6Y29tcHV0ZWRT aGFwZSk6CisgICAgICAgICogcmVuZGVyaW5nL3NoYXBlcy9TaGFwZUluZm8uaDoKKyAgICAgICAg KFdlYkNvcmU6OlNoYXBlSW5mbzo6c2V0U2hhcGVTaXplKToKKyAgICAgICAgKFdlYkNvcmU6OlNo YXBlSW5mbzo6c2hhcGVDb250YWluaW5nQmxvY2tIZWlnaHQpOgorCiAyMDEzLTA5LTExICBCcmVu dCBGdWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29tPgogCiAgICAgICAgIFtXaW5kb3dzXSBBdm9p ZCBjb252ZXJ0aW5nIGZyb20gSW50U2l6ZS0+U0laRS0+SW50U2l6ZS4KZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zaGFwZXMvU2hhcGVJbmZvLmNwcCBiL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9zaGFwZXMvU2hhcGVJbmZvLmNwcAppbmRleCBiZjk0ZTQyLi42NDUzMTY4 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc2hhcGVzL1NoYXBlSW5mby5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3NoYXBlcy9TaGFwZUluZm8uY3BwCkBA IC00NSw3ICs0NSw2IEBAIGNvbnN0IFNoYXBlKiBTaGFwZUluZm88UmVuZGVyVHlwZSwgc2hhcGVH ZXR0ZXIsIGludGVydmFsR2V0dGVyPjo6Y29tcHV0ZWRTaGFwZSgpCiAgICAgaWYgKFNoYXBlKiBz aGFwZSA9IG1fc2hhcGUuZ2V0KCkpCiAgICAgICAgIHJldHVybiBzaGFwZTsKIAotICAgIGNvbnN0 IExheW91dFNpemUgbG9naWNhbEJveFNpemUobV9zaGFwZUxvZ2ljYWxXaWR0aCwgbV9zaGFwZUxv Z2ljYWxIZWlnaHQpOwogICAgIFdyaXRpbmdNb2RlIHdyaXRpbmdNb2RlID0gbV9yZW5kZXJlci0+ c3R5bGUoKS0+d3JpdGluZ01vZGUoKTsKICAgICBMZW5ndGggbWFyZ2luID0gbV9yZW5kZXJlci0+ c3R5bGUoKS0+c2hhcGVNYXJnaW4oKTsKICAgICBMZW5ndGggcGFkZGluZyA9IG1fcmVuZGVyZXIt PnN0eWxlKCktPnNoYXBlUGFkZGluZygpOwpAQCAtNTUsMTEgKzU0LDExIEBAIGNvbnN0IFNoYXBl KiBTaGFwZUluZm88UmVuZGVyVHlwZSwgc2hhcGVHZXR0ZXIsIGludGVydmFsR2V0dGVyPjo6Y29t cHV0ZWRTaGFwZSgpCiAgICAgc3dpdGNoIChzaGFwZVZhbHVlLT50eXBlKCkpIHsKICAgICBjYXNl IFNoYXBlVmFsdWU6OlNoYXBlOgogICAgICAgICBBU1NFUlQoc2hhcGVWYWx1ZS0+c2hhcGUoKSk7 Ci0gICAgICAgIG1fc2hhcGUgPSBTaGFwZTo6Y3JlYXRlU2hhcGUoc2hhcGVWYWx1ZS0+c2hhcGUo KSwgbG9naWNhbEJveFNpemUsIHdyaXRpbmdNb2RlLCBtYXJnaW4sIHBhZGRpbmcpOworICAgICAg ICBtX3NoYXBlID0gU2hhcGU6OmNyZWF0ZVNoYXBlKHNoYXBlVmFsdWUtPnNoYXBlKCksIG1fc2hh cGVMb2dpY2FsU2l6ZSwgd3JpdGluZ01vZGUsIG1hcmdpbiwgcGFkZGluZyk7CiAgICAgICAgIGJy ZWFrOwogICAgIGNhc2UgU2hhcGVWYWx1ZTo6SW1hZ2U6CiAgICAgICAgIEFTU0VSVChzaGFwZVZh bHVlLT5pbWFnZSgpKTsKLSAgICAgICAgbV9zaGFwZSA9IFNoYXBlOjpjcmVhdGVTaGFwZShzaGFw ZVZhbHVlLT5pbWFnZSgpLCAwLCBsb2dpY2FsQm94U2l6ZSwgd3JpdGluZ01vZGUsIG1hcmdpbiwg cGFkZGluZyk7CisgICAgICAgIG1fc2hhcGUgPSBTaGFwZTo6Y3JlYXRlU2hhcGUoc2hhcGVWYWx1 ZS0+aW1hZ2UoKSwgMCwgbV9zaGFwZUxvZ2ljYWxTaXplLCB3cml0aW5nTW9kZSwgbWFyZ2luLCBw YWRkaW5nKTsKICAgICAgICAgYnJlYWs7CiAgICAgZGVmYXVsdDoKICAgICAgICAgQVNTRVJUX05P VF9SRUFDSEVEKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc2hhcGVz L1NoYXBlSW5mby5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3NoYXBlcy9TaGFwZUluZm8u aAppbmRleCAwNGVlNDcxLi5lNGU5MDczYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL3NoYXBlcy9TaGFwZUluZm8uaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv c2hhcGVzL1NoYXBlSW5mby5oCkBAIC03MiwxNiArNzIsMTUgQEAgcHVibGljOgogCiAgICAgdm9p ZCBzZXRTaGFwZVNpemUoTGF5b3V0VW5pdCBsb2dpY2FsV2lkdGgsIExheW91dFVuaXQgbG9naWNh bEhlaWdodCkKICAgICB7Ci0gICAgICAgIGlmIChtX3JlbmRlcmVyLT5zdHlsZSgpLT5ib3hTaXpp bmcoKSA9PSBDT05URU5UX0JPWCkgewotICAgICAgICAgICAgbG9naWNhbFdpZHRoIC09IG1fcmVu ZGVyZXItPmJvcmRlckFuZFBhZGRpbmdMb2dpY2FsV2lkdGgoKTsKLSAgICAgICAgICAgIGxvZ2lj YWxIZWlnaHQgLT0gbV9yZW5kZXJlci0+Ym9yZGVyQW5kUGFkZGluZ0xvZ2ljYWxIZWlnaHQoKTsK LSAgICAgICAgfQorICAgICAgICBMYXlvdXRTaXplIG5ld0xvZ2ljYWxTaXplKGxvZ2ljYWxXaWR0 aCwgbG9naWNhbEhlaWdodCk7CiAKLSAgICAgICAgaWYgKG1fc2hhcGVMb2dpY2FsV2lkdGggPT0g bG9naWNhbFdpZHRoICYmIG1fc2hhcGVMb2dpY2FsSGVpZ2h0ID09IGxvZ2ljYWxIZWlnaHQpCisg ICAgICAgIGlmIChtX3JlbmRlcmVyLT5zdHlsZSgpLT5ib3hTaXppbmcoKSA9PSBDT05URU5UX0JP WCkKKyAgICAgICAgICAgIG5ld0xvZ2ljYWxTaXplIC09IExheW91dFNpemUobV9yZW5kZXJlci0+ Ym9yZGVyQW5kUGFkZGluZ0xvZ2ljYWxXaWR0aCgpLCBtX3JlbmRlcmVyLT5ib3JkZXJBbmRQYWRk aW5nTG9naWNhbEhlaWdodCgpKTsKKworICAgICAgICBpZiAobV9zaGFwZUxvZ2ljYWxTaXplID09 IG5ld0xvZ2ljYWxTaXplKQogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICBkaXJ0eVNoYXBl U2l6ZSgpOwotICAgICAgICBtX3NoYXBlTG9naWNhbFdpZHRoID0gbG9naWNhbFdpZHRoOwotICAg ICAgICBtX3NoYXBlTG9naWNhbEhlaWdodCA9IGxvZ2ljYWxIZWlnaHQ7CisgICAgICAgIG1fc2hh cGVMb2dpY2FsU2l6ZSA9IG5ld0xvZ2ljYWxTaXplOwogICAgIH0KIAogICAgIHZpcnR1YWwgYm9v bCBjb21wdXRlU2VnbWVudHNGb3JMaW5lKExheW91dFVuaXQgbGluZVRvcCwgTGF5b3V0VW5pdCBs aW5lSGVpZ2h0KTsKQEAgLTk3LDcgKzk2LDcgQEAgcHVibGljOgogICAgIExheW91dFVuaXQgbG9n aWNhbExpbmVUb3AoKSBjb25zdCB7IHJldHVybiBtX3NoYXBlTGluZVRvcCArIGxvZ2ljYWxUb3BP ZmZzZXQoKTsgfQogICAgIExheW91dFVuaXQgbG9naWNhbExpbmVCb3R0b20oKSBjb25zdCB7IHJl dHVybiBtX3NoYXBlTGluZVRvcCArIG1fbGluZUhlaWdodCArIGxvZ2ljYWxUb3BPZmZzZXQoKTsg fQogCi0gICAgTGF5b3V0VW5pdCBzaGFwZUNvbnRhaW5pbmdCbG9ja0hlaWdodCgpIGNvbnN0IHsg cmV0dXJuIChtX3JlbmRlcmVyLT5zdHlsZSgpLT5ib3hTaXppbmcoKSA9PSBDT05URU5UX0JPWCkg PyAobV9zaGFwZUxvZ2ljYWxIZWlnaHQgKyBtX3JlbmRlcmVyLT5ib3JkZXJBbmRQYWRkaW5nTG9n aWNhbEhlaWdodCgpKSA6IG1fc2hhcGVMb2dpY2FsSGVpZ2h0OyB9CisgICAgTGF5b3V0VW5pdCBz aGFwZUNvbnRhaW5pbmdCbG9ja0hlaWdodCgpIGNvbnN0IHsgcmV0dXJuIChtX3JlbmRlcmVyLT5z dHlsZSgpLT5ib3hTaXppbmcoKSA9PSBDT05URU5UX0JPWCkgPyAobV9zaGFwZUxvZ2ljYWxTaXpl LmhlaWdodCgpICsgbV9yZW5kZXJlci0+Ym9yZGVyQW5kUGFkZGluZ0xvZ2ljYWxIZWlnaHQoKSkg OiBtX3NoYXBlTG9naWNhbFNpemUuaGVpZ2h0KCk7IH0KIAogICAgIGJvb2wgbGluZU92ZXJsYXBz U2hhcGVCb3VuZHMoKSBjb25zdCB7IHJldHVybiBsb2dpY2FsTGluZVRvcCgpIDwgc2hhcGVMb2dp Y2FsQm90dG9tKCkgJiYgc2hhcGVMb2dpY2FsVG9wKCkgPD0gbG9naWNhbExpbmVCb3R0b20oKTsg fQogCkBAIC0xMjIsOSArMTIxLDcgQEAgcHJvdGVjdGVkOgogCiBwcml2YXRlOgogICAgIG11dGFi bGUgT3duUHRyPFNoYXBlPiBtX3NoYXBlOwotCi0gICAgTGF5b3V0VW5pdCBtX3NoYXBlTG9naWNh bFdpZHRoOwotICAgIExheW91dFVuaXQgbV9zaGFwZUxvZ2ljYWxIZWlnaHQ7CisgICAgTGF5b3V0 U2l6ZSBtX3NoYXBlTG9naWNhbFNpemU7CiB9OwogfQogI2VuZGlmCg==