89668 2012-06-21 09:29:44 -0700 Move CSSWrapShape style resolution from StyleResolver to StyleBuilder 2012-06-29 17:41:52 -0700 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 89671 1 giles_joplin giles_joplin betravis cmarcelo macpherson menard webkit.review.bot oldest_to_newest 654593 0 giles_joplin 2012-06-21 09:29:44 -0700 All of the CSS Exclusions properties are handled by the StyleBuilder class, except for shapeInside and shapeOutside. Move the implementation there, without changing the (current) semantics. 654630 1 148827 giles_joplin 2012-06-21 10:02:48 -0700 Created attachment 148827 Patch 656464 2 148827 kling 2012-06-25 03:40:10 -0700 Comment on attachment 148827 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=148827&action=review Looks good. r=me with one change: > Source/WebCore/css/StyleBuilder.cpp:1782 > + else > + setValue(styleResolver->style(), primitiveValue->getShapeValue()); The previous version of the code had a check for primitiveValue->isShape(), if we know that this should always be the case, we could put an ASSERT(primitiveValue->isShape()) here. 658122 3 149636 betravis 2012-06-26 17:01:33 -0700 Created attachment 149636 patch with isShape condition Trying to shepherd this through. Eventually shape-inside / shape-outside will support a URI value referencing SVG content. shape-inside will additionally support the value "shape-outside". http://dev.w3.org/csswg/css3-exclusions/#shape-outside http://dev.w3.org/csswg/css3-exclusions/#shape-inside I added back the "isShape" condition, but did not add the assert, as we will eventually be supporting additional values. 658704 4 149636 webkit.review.bot 2012-06-27 10:45:40 -0700 Comment on attachment 149636 patch with isShape condition Clearing flags on attachment: 149636 Committed r121349: <http://trac.webkit.org/changeset/121349> 660893 5 betravis 2012-06-29 17:41:52 -0700 Closing the bug 148827 2012-06-21 10:02:48 -0700 2012-06-25 03:40:10 -0700 Patch bug-89668-20120621100249.patch text/plain 6123 giles_joplin U3VidmVyc2lvbiBSZXZpc2lvbjogMTIwODMxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjNmNjY1YTVmZjBmNzgx YjIyY2VkOWZlZWFlMWYwMGZiOGYwYTM0MS4uMGQ4Njc5YzVkNTYxNDg1MzI3Y2E4OGNkOGE3NmFj NGZiODNiYWUyZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDEyLTA2LTIxICBIYW5z IE11bGxlciAgPGhtdWxsZXJAYWRvYmUuY29tPgorCisgICAgICAgIE1vdmUgQ1NTV3JhcFNoYXBl IHN0eWxlIHJlc29sdXRpb24gZnJvbSBTdHlsZVJlc29sdmVyIHRvIFN0eWxlQnVpbGRlcgorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODk2NjgKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBNb3ZlZCB0aGUgcmVz b2x1dGlvbiBvZiB0aGUgc2hhcGVJbnNpZGUgYW5kIHNoYXBlT3V0c2lkZSBDU1MgcHJvcGVydGll cworICAgICAgICBmcm9tIHRoZSBTdHlsZVJlc29sdmVyIGNsYXNzIHRvIFN0eWxlQnVpbGRlci4g VGhpcyBpcyBqdXN0IHJlZmFjdG9yaW5nCisgICAgICAgIGluIHByZXBhcmF0aW9uIGZvciBmaXhp bmcgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg5NjcwLgorCisgICAg ICAgIE5vIG5ldyB0ZXN0cyB3ZXJlIHJlcXVpcmVkLgorCisgICAgICAgICogY3NzL1N0eWxlQnVp bGRlci5jcHA6CisgICAgICAgIChXZWJDb3JlKToKKyAgICAgICAgKEFwcGx5UHJvcGVydHlXcmFw U2hhcGUpOgorICAgICAgICAoV2ViQ29yZTo6QXBwbHlQcm9wZXJ0eVdyYXBTaGFwZTo6c2V0VmFs dWUpOgorICAgICAgICAoV2ViQ29yZTo6QXBwbHlQcm9wZXJ0eVdyYXBTaGFwZTo6YXBwbHlWYWx1 ZSk6CisgICAgICAgIChXZWJDb3JlOjpBcHBseVByb3BlcnR5V3JhcFNoYXBlOjpjcmVhdGVIYW5k bGVyKToKKyAgICAgICAgKFdlYkNvcmU6OlN0eWxlQnVpbGRlcjo6U3R5bGVCdWlsZGVyKToKKyAg ICAgICAgKiBjc3MvU3R5bGVSZXNvbHZlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTdHlsZVJl c29sdmVyOjpjb2xsZWN0TWF0Y2hpbmdSdWxlc0Zvckxpc3QpOgorCiAyMDEyLTA2LTIwICBBbGV4 ZWkgRmlsaXBwb3YgIDxhbGV4ZWlmQGNocm9taXVtLm9yZz4KIAogICAgICAgICBXZWIgSW5zcGVj dG9yOiBtYXJrIHVzZWQvYWxsb2NhdGVkIEpTIGhlYXAgb24gdGhlIG5hdGl2ZSBtZW1vcnkgYmFy IGNoYXJ0LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL1N0eWxlQnVpbGRlci5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVCdWlsZGVyLmNwcAppbmRleCAzMDRkYjdjZGY3MWFm ZDVjNTk0ZTE0ZWZjNmY5Y2Q1NjU1ZWU3Y2ZiLi5lN2Y5ODkwMTExNzljYjcyZGY5MWY3ODI1NjU4 ODRhODA4N2NlZjQ1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVCdWlsZGVy LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVCdWlsZGVyLmNwcApAQCAtMTc2Nyw2 ICsxNzY3LDI5IEBAIHByaXZhdGU6CiAKIH07CiAKKyNpZiBFTkFCTEUoQ1NTX0VYQ0xVU0lPTlMp Cit0ZW1wbGF0ZSA8Q1NTV3JhcFNoYXBlKiAoUmVuZGVyU3R5bGU6OipnZXR0ZXJGdW5jdGlvbiko KSBjb25zdCwgdm9pZCAoUmVuZGVyU3R5bGU6OipzZXR0ZXJGdW5jdGlvbikoUGFzc1JlZlB0cjxD U1NXcmFwU2hhcGU+KSwgQ1NTV3JhcFNoYXBlKiAoKmluaXRpYWxGdW5jdGlvbikoKT4KK2NsYXNz IEFwcGx5UHJvcGVydHlXcmFwU2hhcGUgeworcHVibGljOgorICAgIHN0YXRpYyB2b2lkIHNldFZh bHVlKFJlbmRlclN0eWxlKiBzdHlsZSwgUGFzc1JlZlB0cjxDU1NXcmFwU2hhcGU+IHZhbHVlKSB7 IChzdHlsZS0+KnNldHRlckZ1bmN0aW9uKSh2YWx1ZSk7IH0KKyAgICBzdGF0aWMgdm9pZCBhcHBs eVZhbHVlKFN0eWxlUmVzb2x2ZXIqIHN0eWxlUmVzb2x2ZXIsIENTU1ZhbHVlKiB2YWx1ZSkKKyAg ICB7CisgICAgICAgIGlmICh2YWx1ZS0+aXNQcmltaXRpdmVWYWx1ZSgpKSB7CisgICAgICAgICAg ICBDU1NQcmltaXRpdmVWYWx1ZSogcHJpbWl0aXZlVmFsdWUgPSBzdGF0aWNfY2FzdDxDU1NQcmlt aXRpdmVWYWx1ZSo+KHZhbHVlKTsKKyAgICAgICAgICAgIGlmIChwcmltaXRpdmVWYWx1ZS0+Z2V0 SWRlbnQoKSA9PSBDU1NWYWx1ZUF1dG8pCisgICAgICAgICAgICAgICAgc2V0VmFsdWUoc3R5bGVS ZXNvbHZlci0+c3R5bGUoKSwgMCk7CisgICAgICAgICAgICBlbHNlCisgICAgICAgICAgICAgICAg c2V0VmFsdWUoc3R5bGVSZXNvbHZlci0+c3R5bGUoKSwgcHJpbWl0aXZlVmFsdWUtPmdldFNoYXBl VmFsdWUoKSk7CisgICAgICAgIH0KKyAgICB9CisgICAgc3RhdGljIFByb3BlcnR5SGFuZGxlciBj cmVhdGVIYW5kbGVyKCkKKyAgICB7CisgICAgICAgIFByb3BlcnR5SGFuZGxlciBoYW5kbGVyID0g QXBwbHlQcm9wZXJ0eURlZmF1bHRCYXNlPENTU1dyYXBTaGFwZSosIGdldHRlckZ1bmN0aW9uLCBQ YXNzUmVmUHRyPENTU1dyYXBTaGFwZT4sIHNldHRlckZ1bmN0aW9uLCBDU1NXcmFwU2hhcGUqLCBp bml0aWFsRnVuY3Rpb24+OjpjcmVhdGVIYW5kbGVyKCk7CisgICAgICAgIHJldHVybiBQcm9wZXJ0 eUhhbmRsZXIoaGFuZGxlci5pbmhlcml0RnVuY3Rpb24oKSwgaGFuZGxlci5pbml0aWFsRnVuY3Rp b24oKSwgJmFwcGx5VmFsdWUpOworICAgIH0KK307CisjZW5kaWYKKwogI2lmIEVOQUJMRShDU1Nf SU1BR0VfUkVTT0xVVElPTikKIGNsYXNzIEFwcGx5UHJvcGVydHlJbWFnZVJlc29sdXRpb24gewog cHVibGljOgpAQCAtMjA3NSw2ICsyMDk4LDggQEAgU3R5bGVCdWlsZGVyOjpTdHlsZUJ1aWxkZXIo KQogICAgIHNldFByb3BlcnR5SGFuZGxlcihDU1NQcm9wZXJ0eVdlYmtpdFdyYXBNYXJnaW4sIEFw cGx5UHJvcGVydHlMZW5ndGg8JlJlbmRlclN0eWxlOjp3cmFwTWFyZ2luLCAmUmVuZGVyU3R5bGU6 OnNldFdyYXBNYXJnaW4sICZSZW5kZXJTdHlsZTo6aW5pdGlhbFdyYXBNYXJnaW4+OjpjcmVhdGVI YW5kbGVyKCkpOwogICAgIHNldFByb3BlcnR5SGFuZGxlcihDU1NQcm9wZXJ0eVdlYmtpdFdyYXBQ YWRkaW5nLCBBcHBseVByb3BlcnR5TGVuZ3RoPCZSZW5kZXJTdHlsZTo6d3JhcFBhZGRpbmcsICZS ZW5kZXJTdHlsZTo6c2V0V3JhcFBhZGRpbmcsICZSZW5kZXJTdHlsZTo6aW5pdGlhbFdyYXBQYWRk aW5nPjo6Y3JlYXRlSGFuZGxlcigpKTsKICAgICBzZXRQcm9wZXJ0eUhhbmRsZXIoQ1NTUHJvcGVy dHlXZWJraXRXcmFwVGhyb3VnaCwgQXBwbHlQcm9wZXJ0eURlZmF1bHQ8V3JhcFRocm91Z2gsICZS ZW5kZXJTdHlsZTo6d3JhcFRocm91Z2gsIFdyYXBUaHJvdWdoLCAmUmVuZGVyU3R5bGU6OnNldFdy YXBUaHJvdWdoLCBXcmFwVGhyb3VnaCwgJlJlbmRlclN0eWxlOjppbml0aWFsV3JhcFRocm91Z2g+ OjpjcmVhdGVIYW5kbGVyKCkpOworICAgIHNldFByb3BlcnR5SGFuZGxlcihDU1NQcm9wZXJ0eVdl YmtpdFNoYXBlSW5zaWRlLCBBcHBseVByb3BlcnR5V3JhcFNoYXBlPCZSZW5kZXJTdHlsZTo6d3Jh cFNoYXBlSW5zaWRlLCAmUmVuZGVyU3R5bGU6OnNldFdyYXBTaGFwZUluc2lkZSwgJlJlbmRlclN0 eWxlOjppbml0aWFsV3JhcFNoYXBlSW5zaWRlPjo6Y3JlYXRlSGFuZGxlcigpKTsKKyAgICBzZXRQ cm9wZXJ0eUhhbmRsZXIoQ1NTUHJvcGVydHlXZWJraXRTaGFwZU91dHNpZGUsIEFwcGx5UHJvcGVy dHlXcmFwU2hhcGU8JlJlbmRlclN0eWxlOjp3cmFwU2hhcGVPdXRzaWRlLCAmUmVuZGVyU3R5bGU6 OnNldFdyYXBTaGFwZU91dHNpZGUsICZSZW5kZXJTdHlsZTo6aW5pdGlhbFdyYXBTaGFwZU91dHNp ZGU+OjpjcmVhdGVIYW5kbGVyKCkpOwogI2VuZGlmCiAgICAgc2V0UHJvcGVydHlIYW5kbGVyKENT U1Byb3BlcnR5V2hpdGVTcGFjZSwgQXBwbHlQcm9wZXJ0eURlZmF1bHQ8RVdoaXRlU3BhY2UsICZS ZW5kZXJTdHlsZTo6d2hpdGVTcGFjZSwgRVdoaXRlU3BhY2UsICZSZW5kZXJTdHlsZTo6c2V0V2hp dGVTcGFjZSwgRVdoaXRlU3BhY2UsICZSZW5kZXJTdHlsZTo6aW5pdGlhbFdoaXRlU3BhY2U+Ojpj cmVhdGVIYW5kbGVyKCkpOwogICAgIHNldFByb3BlcnR5SGFuZGxlcihDU1NQcm9wZXJ0eVdpZG93 cywgQXBwbHlQcm9wZXJ0eURlZmF1bHQ8c2hvcnQsICZSZW5kZXJTdHlsZTo6d2lkb3dzLCBzaG9y dCwgJlJlbmRlclN0eWxlOjpzZXRXaWRvd3MsIHNob3J0LCAmUmVuZGVyU3R5bGU6OmluaXRpYWxX aWRvd3M+OjpjcmVhdGVIYW5kbGVyKCkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3Nz L1N0eWxlUmVzb2x2ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvY3NzL1N0eWxlUmVzb2x2ZXIuY3Bw CmluZGV4IDAzZGMzMTA2Yzg1M2MwZTQ3MjM0NDMwZTg0ZTJlN2FkMTViMzZlNGUuLmFlNmI1ZTU2 OTM1ZjczM2YxMzZhMjQwZjc4MzY4NGNiMmEyMzlmYWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2Nzcy9TdHlsZVJlc29sdmVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVS ZXNvbHZlci5jcHAKQEAgLTQwNzIsMjcgKzQwNzIsNyBAQCB2b2lkIFN0eWxlUmVzb2x2ZXI6OmFw cGx5UHJvcGVydHkoQ1NTUHJvcGVydHlJRCBpZCwgQ1NTVmFsdWUqIHZhbHVlKQogICAgICAgICBt X3N0eWxlLT5zZXRMaW5lQm94Q29udGFpbihsaW5lQm94Q29udGFpblZhbHVlLT52YWx1ZSgpKTsK ICAgICAgICAgcmV0dXJuOwogICAgIH0KLSNpZiBFTkFCTEUoQ1NTX0VYQ0xVU0lPTlMpCi0gICAg Y2FzZSBDU1NQcm9wZXJ0eVdlYmtpdFNoYXBlSW5zaWRlOgotICAgICAgICBIQU5ETEVfSU5IRVJJ VF9BTkRfSU5JVElBTCh3cmFwU2hhcGVJbnNpZGUsIFdyYXBTaGFwZUluc2lkZSk7Ci0gICAgICAg IGlmICghcHJpbWl0aXZlVmFsdWUpCi0gICAgICAgICAgICByZXR1cm47Ci0gICAgICAgIGlmIChw cmltaXRpdmVWYWx1ZS0+Z2V0SWRlbnQoKSA9PSBDU1NWYWx1ZUF1dG8pCi0gICAgICAgICAgICBt X3N0eWxlLT5zZXRXcmFwU2hhcGVJbnNpZGUoMCk7Ci0gICAgICAgIGVsc2UgaWYgKHByaW1pdGl2 ZVZhbHVlLT5pc1NoYXBlKCkpCi0gICAgICAgICAgICBtX3N0eWxlLT5zZXRXcmFwU2hhcGVJbnNp ZGUocHJpbWl0aXZlVmFsdWUtPmdldFNoYXBlVmFsdWUoKSk7Ci0gICAgICAgIHJldHVybjsKIAot ICAgIGNhc2UgQ1NTUHJvcGVydHlXZWJraXRTaGFwZU91dHNpZGU6Ci0gICAgICAgIEhBTkRMRV9J TkhFUklUX0FORF9JTklUSUFMKHdyYXBTaGFwZU91dHNpZGUsIFdyYXBTaGFwZU91dHNpZGUpOwot ICAgICAgICBpZiAoIXByaW1pdGl2ZVZhbHVlKQotICAgICAgICAgICAgcmV0dXJuOwotICAgICAg ICBpZiAocHJpbWl0aXZlVmFsdWUtPmdldElkZW50KCkgPT0gQ1NTVmFsdWVBdXRvKQotICAgICAg ICAgICAgbV9zdHlsZS0+c2V0V3JhcFNoYXBlT3V0c2lkZSgwKTsKLSAgICAgICAgZWxzZSBpZiAo cHJpbWl0aXZlVmFsdWUtPmlzU2hhcGUoKSkKLSAgICAgICAgICAgIG1fc3R5bGUtPnNldFdyYXBT aGFwZU91dHNpZGUocHJpbWl0aXZlVmFsdWUtPmdldFNoYXBlVmFsdWUoKSk7Ci0gICAgICAgIHJl dHVybjsKLSNlbmRpZgogICAgIC8vIENTUyBGb250cyBNb2R1bGUgTGV2ZWwgMwogICAgIGNhc2Ug Q1NTUHJvcGVydHlXZWJraXRGb250RmVhdHVyZVNldHRpbmdzOiB7CiAgICAgICAgIGlmIChwcmlt aXRpdmVWYWx1ZSAmJiBwcmltaXRpdmVWYWx1ZS0+Z2V0SWRlbnQoKSA9PSBDU1NWYWx1ZU5vcm1h bCkgewpAQCAtNDQwNyw2ICs0Mzg3LDggQEAgdm9pZCBTdHlsZVJlc29sdmVyOjphcHBseVByb3Bl cnR5KENTU1Byb3BlcnR5SUQgaWQsIENTU1ZhbHVlKiB2YWx1ZSkKICAgICBjYXNlIENTU1Byb3Bl cnR5V2Via2l0V3JhcE1hcmdpbjoKICAgICBjYXNlIENTU1Byb3BlcnR5V2Via2l0V3JhcFBhZGRp bmc6CiAgICAgY2FzZSBDU1NQcm9wZXJ0eVdlYmtpdFdyYXBUaHJvdWdoOgorICAgIGNhc2UgQ1NT UHJvcGVydHlXZWJraXRTaGFwZUluc2lkZToKKyAgICBjYXNlIENTU1Byb3BlcnR5V2Via2l0U2hh cGVPdXRzaWRlOgogI2VuZGlmCiAgICAgY2FzZSBDU1NQcm9wZXJ0eVdoaXRlU3BhY2U6CiAgICAg Y2FzZSBDU1NQcm9wZXJ0eVdpZG93czoK 149636 2012-06-26 17:01:33 -0700 2012-06-27 10:45:40 -0700 patch with isShape condition 89668.patch text/plain 5911 betravis ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA1OTdmNmEyLi4wOTExNWM1IDEwMDc1NQotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjYg QEAKKzIwMTItMDYtMjYgIEhhbnMgTXVsbGVyICA8aG11bGxlckBhZG9iZS5jb20+CisKKyAgICAg ICAgTW92ZSBDU1NXcmFwU2hhcGUgc3R5bGUgcmVzb2x1dGlvbiBmcm9tIFN0eWxlUmVzb2x2ZXIg dG8gU3R5bGVCdWlsZGVyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD04OTY2OAorCisgICAgICAgIFJldmlld2VkIGJ5IEFuZHJlYXMgS2xpbmcuCisKKyAg ICAgICAgTW92ZWQgdGhlIHJlc29sdXRpb24gb2YgdGhlIHNoYXBlSW5zaWRlIGFuZCBzaGFwZU91 dHNpZGUgQ1NTIHByb3BlcnRpZXMKKyAgICAgICAgZnJvbSB0aGUgU3R5bGVSZXNvbHZlciBjbGFz cyB0byBTdHlsZUJ1aWxkZXIuIFRoaXMgaXMganVzdCByZWZhY3RvcmluZworICAgICAgICBpbiBw cmVwYXJhdGlvbiBmb3IgZml4aW5nIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD04OTY3MC4KKworICAgICAgICBObyBuZXcgdGVzdHMgd2VyZSByZXF1aXJlZC4KKworICAg ICAgICAqIGNzcy9TdHlsZUJ1aWxkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZSk6CisgICAgICAg IChBcHBseVByb3BlcnR5V3JhcFNoYXBlKToKKyAgICAgICAgKFdlYkNvcmU6OkFwcGx5UHJvcGVy dHlXcmFwU2hhcGU6OnNldFZhbHVlKToKKyAgICAgICAgKFdlYkNvcmU6OkFwcGx5UHJvcGVydHlX cmFwU2hhcGU6OmFwcGx5VmFsdWUpOgorICAgICAgICAoV2ViQ29yZTo6QXBwbHlQcm9wZXJ0eVdy YXBTaGFwZTo6Y3JlYXRlSGFuZGxlcik6CisgICAgICAgIChXZWJDb3JlOjpTdHlsZUJ1aWxkZXI6 OlN0eWxlQnVpbGRlcik6CisgICAgICAgICogY3NzL1N0eWxlUmVzb2x2ZXIuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6U3R5bGVSZXNvbHZlcjo6Y29sbGVjdE1hdGNoaW5nUnVsZXNGb3JMaXN0KToK KwogMjAxMi0wNi0yNiAgSm9zaHVhIEJlbGwgIDxqc2JlbGxAY2hyb21pdW0ub3JnPgogCiAgICAg ICAgIEluZGV4ZWREQjogTW92ZSBtZXRob2QgcHJlY29uZGl0aW9uIGNoZWNrcyB0byBmcm9udCBl bmQgb2JqZWN0cwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL1N0eWxlQnVpbGRlci5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVCdWlsZGVyLmNwcAppbmRleCAyMGQwMmNjLi5j MmIxMjQwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVCdWlsZGVyLmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVCdWlsZGVyLmNwcApAQCAtMTc4MCw2ICsxNzgw LDI5IEBAIHByaXZhdGU6CiAKIH07CiAKKyNpZiBFTkFCTEUoQ1NTX0VYQ0xVU0lPTlMpCit0ZW1w bGF0ZSA8Q1NTV3JhcFNoYXBlKiAoUmVuZGVyU3R5bGU6OipnZXR0ZXJGdW5jdGlvbikoKSBjb25z dCwgdm9pZCAoUmVuZGVyU3R5bGU6OipzZXR0ZXJGdW5jdGlvbikoUGFzc1JlZlB0cjxDU1NXcmFw U2hhcGU+KSwgQ1NTV3JhcFNoYXBlKiAoKmluaXRpYWxGdW5jdGlvbikoKT4KK2NsYXNzIEFwcGx5 UHJvcGVydHlXcmFwU2hhcGUgeworcHVibGljOgorICAgIHN0YXRpYyB2b2lkIHNldFZhbHVlKFJl bmRlclN0eWxlKiBzdHlsZSwgUGFzc1JlZlB0cjxDU1NXcmFwU2hhcGU+IHZhbHVlKSB7IChzdHls ZS0+KnNldHRlckZ1bmN0aW9uKSh2YWx1ZSk7IH0KKyAgICBzdGF0aWMgdm9pZCBhcHBseVZhbHVl KFN0eWxlUmVzb2x2ZXIqIHN0eWxlUmVzb2x2ZXIsIENTU1ZhbHVlKiB2YWx1ZSkKKyAgICB7Cisg ICAgICAgIGlmICh2YWx1ZS0+aXNQcmltaXRpdmVWYWx1ZSgpKSB7CisgICAgICAgICAgICBDU1NQ cmltaXRpdmVWYWx1ZSogcHJpbWl0aXZlVmFsdWUgPSBzdGF0aWNfY2FzdDxDU1NQcmltaXRpdmVW YWx1ZSo+KHZhbHVlKTsKKyAgICAgICAgICAgIGlmIChwcmltaXRpdmVWYWx1ZS0+Z2V0SWRlbnQo KSA9PSBDU1NWYWx1ZUF1dG8pCisgICAgICAgICAgICAgICAgc2V0VmFsdWUoc3R5bGVSZXNvbHZl ci0+c3R5bGUoKSwgMCk7CisgICAgICAgICAgICBlbHNlIGlmIChwcmltaXRpdmVWYWx1ZS0+aXNT aGFwZSgpKQorICAgICAgICAgICAgICAgIHNldFZhbHVlKHN0eWxlUmVzb2x2ZXItPnN0eWxlKCks IHByaW1pdGl2ZVZhbHVlLT5nZXRTaGFwZVZhbHVlKCkpOworICAgICAgICB9CisgICAgfQorICAg IHN0YXRpYyBQcm9wZXJ0eUhhbmRsZXIgY3JlYXRlSGFuZGxlcigpCisgICAgeworICAgICAgICBQ cm9wZXJ0eUhhbmRsZXIgaGFuZGxlciA9IEFwcGx5UHJvcGVydHlEZWZhdWx0QmFzZTxDU1NXcmFw U2hhcGUqLCBnZXR0ZXJGdW5jdGlvbiwgUGFzc1JlZlB0cjxDU1NXcmFwU2hhcGU+LCBzZXR0ZXJG dW5jdGlvbiwgQ1NTV3JhcFNoYXBlKiwgaW5pdGlhbEZ1bmN0aW9uPjo6Y3JlYXRlSGFuZGxlcigp OworICAgICAgICByZXR1cm4gUHJvcGVydHlIYW5kbGVyKGhhbmRsZXIuaW5oZXJpdEZ1bmN0aW9u KCksIGhhbmRsZXIuaW5pdGlhbEZ1bmN0aW9uKCksICZhcHBseVZhbHVlKTsKKyAgICB9Cit9Owor I2VuZGlmCisKICNpZiBFTkFCTEUoQ1NTX0lNQUdFX1JFU09MVVRJT04pCiBjbGFzcyBBcHBseVBy b3BlcnR5SW1hZ2VSZXNvbHV0aW9uIHsKIHB1YmxpYzoKQEAgLTIwOTQsNiArMjExNyw4IEBAIFN0 eWxlQnVpbGRlcjo6U3R5bGVCdWlsZGVyKCkKICAgICBzZXRQcm9wZXJ0eUhhbmRsZXIoQ1NTUHJv cGVydHlXZWJraXRXcmFwTWFyZ2luLCBBcHBseVByb3BlcnR5TGVuZ3RoPCZSZW5kZXJTdHlsZTo6 d3JhcE1hcmdpbiwgJlJlbmRlclN0eWxlOjpzZXRXcmFwTWFyZ2luLCAmUmVuZGVyU3R5bGU6Omlu aXRpYWxXcmFwTWFyZ2luPjo6Y3JlYXRlSGFuZGxlcigpKTsKICAgICBzZXRQcm9wZXJ0eUhhbmRs ZXIoQ1NTUHJvcGVydHlXZWJraXRXcmFwUGFkZGluZywgQXBwbHlQcm9wZXJ0eUxlbmd0aDwmUmVu ZGVyU3R5bGU6OndyYXBQYWRkaW5nLCAmUmVuZGVyU3R5bGU6OnNldFdyYXBQYWRkaW5nLCAmUmVu ZGVyU3R5bGU6OmluaXRpYWxXcmFwUGFkZGluZz46OmNyZWF0ZUhhbmRsZXIoKSk7CiAgICAgc2V0 UHJvcGVydHlIYW5kbGVyKENTU1Byb3BlcnR5V2Via2l0V3JhcFRocm91Z2gsIEFwcGx5UHJvcGVy dHlEZWZhdWx0PFdyYXBUaHJvdWdoLCAmUmVuZGVyU3R5bGU6OndyYXBUaHJvdWdoLCBXcmFwVGhy b3VnaCwgJlJlbmRlclN0eWxlOjpzZXRXcmFwVGhyb3VnaCwgV3JhcFRocm91Z2gsICZSZW5kZXJT dHlsZTo6aW5pdGlhbFdyYXBUaHJvdWdoPjo6Y3JlYXRlSGFuZGxlcigpKTsKKyAgICBzZXRQcm9w ZXJ0eUhhbmRsZXIoQ1NTUHJvcGVydHlXZWJraXRTaGFwZUluc2lkZSwgQXBwbHlQcm9wZXJ0eVdy YXBTaGFwZTwmUmVuZGVyU3R5bGU6OndyYXBTaGFwZUluc2lkZSwgJlJlbmRlclN0eWxlOjpzZXRX cmFwU2hhcGVJbnNpZGUsICZSZW5kZXJTdHlsZTo6aW5pdGlhbFdyYXBTaGFwZUluc2lkZT46OmNy ZWF0ZUhhbmRsZXIoKSk7CisgICAgc2V0UHJvcGVydHlIYW5kbGVyKENTU1Byb3BlcnR5V2Via2l0 U2hhcGVPdXRzaWRlLCBBcHBseVByb3BlcnR5V3JhcFNoYXBlPCZSZW5kZXJTdHlsZTo6d3JhcFNo YXBlT3V0c2lkZSwgJlJlbmRlclN0eWxlOjpzZXRXcmFwU2hhcGVPdXRzaWRlLCAmUmVuZGVyU3R5 bGU6OmluaXRpYWxXcmFwU2hhcGVPdXRzaWRlPjo6Y3JlYXRlSGFuZGxlcigpKTsKICNlbmRpZgog ICAgIHNldFByb3BlcnR5SGFuZGxlcihDU1NQcm9wZXJ0eVdoaXRlU3BhY2UsIEFwcGx5UHJvcGVy dHlEZWZhdWx0PEVXaGl0ZVNwYWNlLCAmUmVuZGVyU3R5bGU6OndoaXRlU3BhY2UsIEVXaGl0ZVNw YWNlLCAmUmVuZGVyU3R5bGU6OnNldFdoaXRlU3BhY2UsIEVXaGl0ZVNwYWNlLCAmUmVuZGVyU3R5 bGU6OmluaXRpYWxXaGl0ZVNwYWNlPjo6Y3JlYXRlSGFuZGxlcigpKTsKICAgICBzZXRQcm9wZXJ0 eUhhbmRsZXIoQ1NTUHJvcGVydHlXaWRvd3MsIEFwcGx5UHJvcGVydHlEZWZhdWx0PHNob3J0LCAm UmVuZGVyU3R5bGU6OndpZG93cywgc2hvcnQsICZSZW5kZXJTdHlsZTo6c2V0V2lkb3dzLCBzaG9y dCwgJlJlbmRlclN0eWxlOjppbml0aWFsV2lkb3dzPjo6Y3JlYXRlSGFuZGxlcigpKTsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9TdHlsZVJlc29sdmVyLmNwcCBiL1NvdXJjZS9XZWJD b3JlL2Nzcy9TdHlsZVJlc29sdmVyLmNwcAppbmRleCBkZTNhMGE5Li43ZTg1N2FkIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVSZXNvbHZlci5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvY3NzL1N0eWxlUmVzb2x2ZXIuY3BwCkBAIC00MDc1LDI3ICs0MDc1LDcgQEAgdm9pZCBT dHlsZVJlc29sdmVyOjphcHBseVByb3BlcnR5KENTU1Byb3BlcnR5SUQgaWQsIENTU1ZhbHVlKiB2 YWx1ZSkKICAgICAgICAgbV9zdHlsZS0+c2V0TGluZUJveENvbnRhaW4obGluZUJveENvbnRhaW5W YWx1ZS0+dmFsdWUoKSk7CiAgICAgICAgIHJldHVybjsKICAgICB9Ci0jaWYgRU5BQkxFKENTU19F WENMVVNJT05TKQotICAgIGNhc2UgQ1NTUHJvcGVydHlXZWJraXRTaGFwZUluc2lkZToKLSAgICAg ICAgSEFORExFX0lOSEVSSVRfQU5EX0lOSVRJQUwod3JhcFNoYXBlSW5zaWRlLCBXcmFwU2hhcGVJ bnNpZGUpOwotICAgICAgICBpZiAoIXByaW1pdGl2ZVZhbHVlKQotICAgICAgICAgICAgcmV0dXJu OwotICAgICAgICBpZiAocHJpbWl0aXZlVmFsdWUtPmdldElkZW50KCkgPT0gQ1NTVmFsdWVBdXRv KQotICAgICAgICAgICAgbV9zdHlsZS0+c2V0V3JhcFNoYXBlSW5zaWRlKDApOwotICAgICAgICBl bHNlIGlmIChwcmltaXRpdmVWYWx1ZS0+aXNTaGFwZSgpKQotICAgICAgICAgICAgbV9zdHlsZS0+ c2V0V3JhcFNoYXBlSW5zaWRlKHByaW1pdGl2ZVZhbHVlLT5nZXRTaGFwZVZhbHVlKCkpOwotICAg ICAgICByZXR1cm47CiAKLSAgICBjYXNlIENTU1Byb3BlcnR5V2Via2l0U2hhcGVPdXRzaWRlOgot ICAgICAgICBIQU5ETEVfSU5IRVJJVF9BTkRfSU5JVElBTCh3cmFwU2hhcGVPdXRzaWRlLCBXcmFw U2hhcGVPdXRzaWRlKTsKLSAgICAgICAgaWYgKCFwcmltaXRpdmVWYWx1ZSkKLSAgICAgICAgICAg IHJldHVybjsKLSAgICAgICAgaWYgKHByaW1pdGl2ZVZhbHVlLT5nZXRJZGVudCgpID09IENTU1Zh bHVlQXV0bykKLSAgICAgICAgICAgIG1fc3R5bGUtPnNldFdyYXBTaGFwZU91dHNpZGUoMCk7Ci0g ICAgICAgIGVsc2UgaWYgKHByaW1pdGl2ZVZhbHVlLT5pc1NoYXBlKCkpCi0gICAgICAgICAgICBt X3N0eWxlLT5zZXRXcmFwU2hhcGVPdXRzaWRlKHByaW1pdGl2ZVZhbHVlLT5nZXRTaGFwZVZhbHVl KCkpOwotICAgICAgICByZXR1cm47Ci0jZW5kaWYKICAgICAvLyBDU1MgRm9udHMgTW9kdWxlIExl dmVsIDMKICAgICBjYXNlIENTU1Byb3BlcnR5V2Via2l0Rm9udEZlYXR1cmVTZXR0aW5nczogewog ICAgICAgICBpZiAocHJpbWl0aXZlVmFsdWUgJiYgcHJpbWl0aXZlVmFsdWUtPmdldElkZW50KCkg PT0gQ1NTVmFsdWVOb3JtYWwpIHsKQEAgLTQ0MTQsNiArNDM5NCw4IEBAIHZvaWQgU3R5bGVSZXNv bHZlcjo6YXBwbHlQcm9wZXJ0eShDU1NQcm9wZXJ0eUlEIGlkLCBDU1NWYWx1ZSogdmFsdWUpCiAg ICAgY2FzZSBDU1NQcm9wZXJ0eVdlYmtpdFdyYXBNYXJnaW46CiAgICAgY2FzZSBDU1NQcm9wZXJ0 eVdlYmtpdFdyYXBQYWRkaW5nOgogICAgIGNhc2UgQ1NTUHJvcGVydHlXZWJraXRXcmFwVGhyb3Vn aDoKKyAgICBjYXNlIENTU1Byb3BlcnR5V2Via2l0U2hhcGVJbnNpZGU6CisgICAgY2FzZSBDU1NQ cm9wZXJ0eVdlYmtpdFNoYXBlT3V0c2lkZToKICNlbmRpZgogICAgIGNhc2UgQ1NTUHJvcGVydHlX aGl0ZVNwYWNlOgogICAgIGNhc2UgQ1NTUHJvcGVydHlXaWRvd3M6Cg==