73107 2011-11-24 21:26:32 -0800 Implement CSS hyphenate-limit properties in CSSStyleApplyProperty 2011-11-28 02:03:07 -0800 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 macpherson macpherson eric kling koivisto macpherson webkit.review.bot oldest_to_newest 508943 0 macpherson 2011-11-24 21:26:32 -0800 Implement CSS hyphenate-limit properties in CSSStyleApplyProperty 508944 1 116558 macpherson 2011-11-24 21:31:16 -0800 Created attachment 116558 Patch 509174 2 116558 koivisto 2011-11-25 08:16:33 -0800 Comment on attachment 116558 Patch r=me 509471 3 116558 kling 2011-11-27 12:20:54 -0800 Comment on attachment 116558 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=116558&action=review > Source/WebCore/css/CSSStyleApplyProperty.cpp:154 > + if (primitiveValue->getIdent() == CSSValueAuto) This should check against CSSValueNoLimit, not CSSValueAuto, for CSSPropertyWebkitHyphenateLimitLines. 509474 4 koivisto 2011-11-27 12:27:31 -0800 If testing didn't pick that up, this should have a test case too. 509524 5 116689 macpherson 2011-11-27 18:14:17 -0800 Created attachment 116689 Patch 509529 6 macpherson 2011-11-27 18:17:03 -0800 Good catch Andreas. There is definitely test coverage for this path, but the tests passed because the default value (-1) is the same as the value being applied in that case. 509668 7 116689 webkit.review.bot 2011-11-28 02:03:03 -0800 Comment on attachment 116689 Patch Clearing flags on attachment: 116689 Committed r101237: <http://trac.webkit.org/changeset/101237> 509669 8 webkit.review.bot 2011-11-28 02:03:07 -0800 All reviewed patches have been landed. Closing bug. 116558 2011-11-24 21:31:16 -0800 2011-11-27 18:14:08 -0800 Patch bug-73107-20111125163114.patch text/plain 6658 macpherson SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEwMTE0NikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIwIEBACisyMDExLTExLTI0ICBMdWtlIE1h Y3BoZXJzb24gICA8bWFjcGhlcnNvbkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgSW1wbGVtZW50 IENTUyBoeXBoZW5hdGUtbGltaXQgcHJvcGVydGllcyBpbiBDU1NTdHlsZUFwcGx5UHJvcGVydHkK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTczMTA3CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQ292ZXJlZCBi eSBleGlzdGluZyB0ZXN0cyB1bmRlciBmYXN0L2NzcyAocGFyc2luZy1oeXBoZW5hdGUtbGltaXQt bGluZXMuaHRtbCBhbmQgcGFyc2luZy1oeXBoZW5hdGUtbGltaXQuaHRtbCkuCisKKyAgICAgICAg KiBjc3MvQ1NTU3R5bGVBcHBseVByb3BlcnR5LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkFwcGx5 UHJvcGVydHlOdW1iZXI6OnNldFZhbHVlKToKKyAgICAgICAgKFdlYkNvcmU6OkFwcGx5UHJvcGVy dHlOdW1iZXI6OmFwcGx5VmFsdWUpOgorICAgICAgICAoV2ViQ29yZTo6QXBwbHlQcm9wZXJ0eU51 bWJlcjo6Y3JlYXRlSGFuZGxlcik6CisgICAgICAgIChXZWJDb3JlOjpDU1NTdHlsZUFwcGx5UHJv cGVydHk6OkNTU1N0eWxlQXBwbHlQcm9wZXJ0eSk6CisgICAgICAgICogY3NzL0NTU1N0eWxlU2Vs ZWN0b3IuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q1NTU3R5bGVTZWxlY3Rvcjo6YXBwbHlQcm9w ZXJ0eSk6CisKIDIwMTEtMTEtMjQgIFBhdHJpY2sgR2Fuc3RlcmVyICA8cGFyb2dhQHdlYmtpdC5v cmc+CiAKICAgICAgICAgW0NNYWtlXSBCdWlsZCBmaXggZm9yIE5PVCBFTkFCTEVfV0VCX1NPQ0tF VFMuCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9jc3MvQ1NTU3R5bGVBcHBseVByb3BlcnR5LmNwcAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9jc3MvQ1NTU3R5bGVBcHBseVByb3BlcnR5LmNw cAkocmV2aXNpb24gMTAxMTQ2KQorKysgU291cmNlL1dlYkNvcmUvY3NzL0NTU1N0eWxlQXBwbHlQ cm9wZXJ0eS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTE0MSw2ICsxNDEsMjggQEAgcHVibGljOgog ICAgIH0KIH07CiAKK3RlbXBsYXRlIDx0eXBlbmFtZSBOdW1iZXJUeXBlLCBOdW1iZXJUeXBlIChS ZW5kZXJTdHlsZTo6KmdldHRlckZ1bmN0aW9uKSgpIGNvbnN0LCB2b2lkIChSZW5kZXJTdHlsZTo6 KnNldHRlckZ1bmN0aW9uKShOdW1iZXJUeXBlKSwgTnVtYmVyVHlwZSAoKmluaXRpYWxGdW5jdGlv bikoKT4KK2NsYXNzIEFwcGx5UHJvcGVydHlOdW1iZXIgeworcHVibGljOgorICAgIHN0YXRpYyB2 b2lkIHNldFZhbHVlKFJlbmRlclN0eWxlKiBzdHlsZSwgTnVtYmVyVHlwZSB2YWx1ZSkgeyAoc3R5 bGUtPipzZXR0ZXJGdW5jdGlvbikodmFsdWUpOyB9CisgICAgc3RhdGljIHZvaWQgYXBwbHlWYWx1 ZShDU1NTdHlsZVNlbGVjdG9yKiBzZWxlY3RvciwgQ1NTVmFsdWUqIHZhbHVlKQorICAgIHsKKyAg ICAgICAgaWYgKCF2YWx1ZS0+aXNQcmltaXRpdmVWYWx1ZSgpKQorICAgICAgICAgICAgcmV0dXJu OworCisgICAgICAgIENTU1ByaW1pdGl2ZVZhbHVlKiBwcmltaXRpdmVWYWx1ZSA9IHN0YXRpY19j YXN0PENTU1ByaW1pdGl2ZVZhbHVlKj4odmFsdWUpOworICAgICAgICBpZiAocHJpbWl0aXZlVmFs dWUtPmdldElkZW50KCkgPT0gQ1NTVmFsdWVBdXRvKQorICAgICAgICAgICAgc2V0VmFsdWUoc2Vs ZWN0b3ItPnN0eWxlKCksIC0xKTsKKyAgICAgICAgZWxzZQorICAgICAgICAgICAgc2V0VmFsdWUo c2VsZWN0b3ItPnN0eWxlKCksIHByaW1pdGl2ZVZhbHVlLT5nZXRWYWx1ZTxOdW1iZXJUeXBlPihD U1NQcmltaXRpdmVWYWx1ZTo6Q1NTX05VTUJFUikpOworICAgIH0KKyAgICBzdGF0aWMgUHJvcGVy dHlIYW5kbGVyIGNyZWF0ZUhhbmRsZXIoKQorICAgIHsKKyAgICAgICAgUHJvcGVydHlIYW5kbGVy IGhhbmRsZXIgPSBBcHBseVByb3BlcnR5RGVmYXVsdEJhc2U8TnVtYmVyVHlwZSwgZ2V0dGVyRnVu Y3Rpb24sIE51bWJlclR5cGUsIHNldHRlckZ1bmN0aW9uLCBOdW1iZXJUeXBlLCBpbml0aWFsRnVu Y3Rpb24+OjpjcmVhdGVIYW5kbGVyKCk7CisgICAgICAgIHJldHVybiBQcm9wZXJ0eUhhbmRsZXIo aGFuZGxlci5pbmhlcml0RnVuY3Rpb24oKSwgaGFuZGxlci5pbml0aWFsRnVuY3Rpb24oKSwgJmFw cGx5VmFsdWUpOworICAgIH0KK307CisKIHRlbXBsYXRlIDxTdHlsZUltYWdlKiAoUmVuZGVyU3R5 bGU6OipnZXR0ZXJGdW5jdGlvbikoKSBjb25zdCwgdm9pZCAoUmVuZGVyU3R5bGU6OipzZXR0ZXJG dW5jdGlvbikoUGFzc1JlZlB0cjxTdHlsZUltYWdlPiksIFN0eWxlSW1hZ2UqICgqaW5pdGlhbEZ1 bmN0aW9uKSgpLCBDU1NQcm9wZXJ0eUlEIHByb3BlcnR5PgogY2xhc3MgQXBwbHlQcm9wZXJ0eVN0 eWxlSW1hZ2UgewogcHVibGljOgpAQCAtMTA4MSw2ICsxMTAzLDEwIEBAIENTU1N0eWxlQXBwbHlQ cm9wZXJ0eTo6Q1NTU3R5bGVBcHBseVByb3AKICAgICBzZXRQcm9wZXJ0eUhhbmRsZXIoQ1NTUHJv cGVydHlXZWJraXRIaWdobGlnaHQsIEFwcGx5UHJvcGVydHlTdHJpbmc8TWFwTm9uZVRvTnVsbCwg JlJlbmRlclN0eWxlOjpoaWdobGlnaHQsICZSZW5kZXJTdHlsZTo6c2V0SGlnaGxpZ2h0LCAmUmVu ZGVyU3R5bGU6OmluaXRpYWxIaWdobGlnaHQ+OjpjcmVhdGVIYW5kbGVyKCkpOwogICAgIHNldFBy b3BlcnR5SGFuZGxlcihDU1NQcm9wZXJ0eVdlYmtpdEh5cGhlbmF0ZUNoYXJhY3RlciwgQXBwbHlQ cm9wZXJ0eVN0cmluZzxNYXBBdXRvVG9OdWxsLCAmUmVuZGVyU3R5bGU6Omh5cGhlbmF0aW9uU3Ry aW5nLCAmUmVuZGVyU3R5bGU6OnNldEh5cGhlbmF0aW9uU3RyaW5nLCAmUmVuZGVyU3R5bGU6Omlu aXRpYWxIeXBoZW5hdGlvblN0cmluZz46OmNyZWF0ZUhhbmRsZXIoKSk7CiAKKyAgICBzZXRQcm9w ZXJ0eUhhbmRsZXIoQ1NTUHJvcGVydHlXZWJraXRIeXBoZW5hdGVMaW1pdEFmdGVyLCBBcHBseVBy b3BlcnR5TnVtYmVyPHNob3J0LCAmUmVuZGVyU3R5bGU6Omh5cGhlbmF0aW9uTGltaXRBZnRlciwg JlJlbmRlclN0eWxlOjpzZXRIeXBoZW5hdGlvbkxpbWl0QWZ0ZXIsICZSZW5kZXJTdHlsZTo6aW5p dGlhbEh5cGhlbmF0aW9uTGltaXRBZnRlcj46OmNyZWF0ZUhhbmRsZXIoKSk7CisgICAgc2V0UHJv cGVydHlIYW5kbGVyKENTU1Byb3BlcnR5V2Via2l0SHlwaGVuYXRlTGltaXRCZWZvcmUsIEFwcGx5 UHJvcGVydHlOdW1iZXI8c2hvcnQsICZSZW5kZXJTdHlsZTo6aHlwaGVuYXRpb25MaW1pdEJlZm9y ZSwgJlJlbmRlclN0eWxlOjpzZXRIeXBoZW5hdGlvbkxpbWl0QmVmb3JlLCAmUmVuZGVyU3R5bGU6 OmluaXRpYWxIeXBoZW5hdGlvbkxpbWl0QmVmb3JlPjo6Y3JlYXRlSGFuZGxlcigpKTsKKyAgICBz ZXRQcm9wZXJ0eUhhbmRsZXIoQ1NTUHJvcGVydHlXZWJraXRIeXBoZW5hdGVMaW1pdExpbmVzLCBB cHBseVByb3BlcnR5TnVtYmVyPHNob3J0LCAmUmVuZGVyU3R5bGU6Omh5cGhlbmF0aW9uTGltaXRM aW5lcywgJlJlbmRlclN0eWxlOjpzZXRIeXBoZW5hdGlvbkxpbWl0TGluZXMsICZSZW5kZXJTdHls ZTo6aW5pdGlhbEh5cGhlbmF0aW9uTGltaXRMaW5lcz46OmNyZWF0ZUhhbmRsZXIoKSk7CisKICAg ICBzZXRQcm9wZXJ0eUhhbmRsZXIoQ1NTUHJvcGVydHlXZWJraXRUZXh0Q29tYmluZSwgQXBwbHlQ cm9wZXJ0eURlZmF1bHQ8VGV4dENvbWJpbmUsICZSZW5kZXJTdHlsZTo6dGV4dENvbWJpbmUsIFRl eHRDb21iaW5lLCAmUmVuZGVyU3R5bGU6OnNldFRleHRDb21iaW5lLCBUZXh0Q29tYmluZSwgJlJl bmRlclN0eWxlOjppbml0aWFsVGV4dENvbWJpbmU+OjpjcmVhdGVIYW5kbGVyKCkpOwogICAgIHNl dFByb3BlcnR5SGFuZGxlcihDU1NQcm9wZXJ0eVdlYmtpdFRleHRFbXBoYXNpc1Bvc2l0aW9uLCBB cHBseVByb3BlcnR5RGVmYXVsdDxUZXh0RW1waGFzaXNQb3NpdGlvbiwgJlJlbmRlclN0eWxlOjp0 ZXh0RW1waGFzaXNQb3NpdGlvbiwgVGV4dEVtcGhhc2lzUG9zaXRpb24sICZSZW5kZXJTdHlsZTo6 c2V0VGV4dEVtcGhhc2lzUG9zaXRpb24sIFRleHRFbXBoYXNpc1Bvc2l0aW9uLCAmUmVuZGVyU3R5 bGU6OmluaXRpYWxUZXh0RW1waGFzaXNQb3NpdGlvbj46OmNyZWF0ZUhhbmRsZXIoKSk7CiAgICAg c2V0UHJvcGVydHlIYW5kbGVyKENTU1Byb3BlcnR5V2Via2l0VGV4dEVtcGhhc2lzU3R5bGUsIEFw cGx5UHJvcGVydHlUZXh0RW1waGFzaXNTdHlsZTo6Y3JlYXRlSGFuZGxlcigpKTsKSW5kZXg6IFNv dXJjZS9XZWJDb3JlL2Nzcy9DU1NTdHlsZVNlbGVjdG9yLmNwcAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvV2ViQ29yZS9jc3MvQ1NTU3R5bGVTZWxlY3Rvci5jcHAJKHJldmlzaW9uIDEwMTE0NikKKysr IFNvdXJjZS9XZWJDb3JlL2Nzcy9DU1NTdHlsZVNlbGVjdG9yLmNwcAkod29ya2luZyBjb3B5KQpA QCAtMzU3OSwzMCArMzU3OSw2IEBAIHZvaWQgQ1NTU3R5bGVTZWxlY3Rvcjo6YXBwbHlQcm9wZXJ0 eShpbnQKICAgICBjYXNlIENTU1Byb3BlcnR5V2Via2l0SHlwaGVuczoKICAgICAgICAgSEFORExF X0lOSEVSSVRfQU5EX0lOSVRJQUxfQU5EX1BSSU1JVElWRShoeXBoZW5zLCBIeXBoZW5zKTsKICAg ICAgICAgcmV0dXJuOwotICAgIGNhc2UgQ1NTUHJvcGVydHlXZWJraXRIeXBoZW5hdGVMaW1pdEFm dGVyOiB7Ci0gICAgICAgIEhBTkRMRV9JTkhFUklUX0FORF9JTklUSUFMKGh5cGhlbmF0aW9uTGlt aXRBZnRlciwgSHlwaGVuYXRpb25MaW1pdEFmdGVyKTsKLSAgICAgICAgaWYgKHByaW1pdGl2ZVZh bHVlLT5nZXRJZGVudCgpID09IENTU1ZhbHVlQXV0bykKLSAgICAgICAgICAgIG1fc3R5bGUtPnNl dEh5cGhlbmF0aW9uTGltaXRBZnRlcigtMSk7Ci0gICAgICAgIGVsc2UKLSAgICAgICAgICAgIG1f c3R5bGUtPnNldEh5cGhlbmF0aW9uTGltaXRBZnRlcihwcmltaXRpdmVWYWx1ZS0+Z2V0VmFsdWU8 c2hvcnQ+KENTU1ByaW1pdGl2ZVZhbHVlOjpDU1NfTlVNQkVSKSk7Ci0gICAgICAgIHJldHVybjsK LSAgICB9Ci0gICAgY2FzZSBDU1NQcm9wZXJ0eVdlYmtpdEh5cGhlbmF0ZUxpbWl0QmVmb3JlOiB7 Ci0gICAgICAgIEhBTkRMRV9JTkhFUklUX0FORF9JTklUSUFMKGh5cGhlbmF0aW9uTGltaXRCZWZv cmUsIEh5cGhlbmF0aW9uTGltaXRCZWZvcmUpOwotICAgICAgICBpZiAocHJpbWl0aXZlVmFsdWUt PmdldElkZW50KCkgPT0gQ1NTVmFsdWVBdXRvKQotICAgICAgICAgICAgbV9zdHlsZS0+c2V0SHlw aGVuYXRpb25MaW1pdEJlZm9yZSgtMSk7Ci0gICAgICAgIGVsc2UKLSAgICAgICAgICAgIG1fc3R5 bGUtPnNldEh5cGhlbmF0aW9uTGltaXRCZWZvcmUocHJpbWl0aXZlVmFsdWUtPmdldFZhbHVlPHNo b3J0PihDU1NQcmltaXRpdmVWYWx1ZTo6Q1NTX05VTUJFUikpOwotICAgICAgICByZXR1cm47Ci0g ICAgfQotICAgIGNhc2UgQ1NTUHJvcGVydHlXZWJraXRIeXBoZW5hdGVMaW1pdExpbmVzOiB7Ci0g ICAgICAgIEhBTkRMRV9JTkhFUklUX0FORF9JTklUSUFMKGh5cGhlbmF0aW9uTGltaXRMaW5lcywg SHlwaGVuYXRpb25MaW1pdExpbmVzKTsKLSAgICAgICAgaWYgKHByaW1pdGl2ZVZhbHVlLT5nZXRJ ZGVudCgpID09IENTU1ZhbHVlTm9MaW1pdCkKLSAgICAgICAgICAgIG1fc3R5bGUtPnNldEh5cGhl bmF0aW9uTGltaXRMaW5lcygtMSk7Ci0gICAgICAgIGVsc2UKLSAgICAgICAgICAgIG1fc3R5bGUt PnNldEh5cGhlbmF0aW9uTGltaXRMaW5lcyhwcmltaXRpdmVWYWx1ZS0+Z2V0VmFsdWU8c2hvcnQ+ KENTU1ByaW1pdGl2ZVZhbHVlOjpDU1NfTlVNQkVSKSk7Ci0gICAgICAgIHJldHVybjsKLSAgICB9 CiAgICAgY2FzZSBDU1NQcm9wZXJ0eVdlYmtpdExvY2FsZTogewogICAgICAgICBIQU5ETEVfSU5I RVJJVF9BTkRfSU5JVElBTChsb2NhbGUsIExvY2FsZSk7CiAgICAgICAgIGlmIChwcmltaXRpdmVW YWx1ZS0+Z2V0SWRlbnQoKSA9PSBDU1NWYWx1ZUF1dG8pCkBAIC00MDU0LDYgKzQwMzAsOSBAQCB2 b2lkIENTU1N0eWxlU2VsZWN0b3I6OmFwcGx5UHJvcGVydHkoaW50CiAgICAgY2FzZSBDU1NQcm9w ZXJ0eVdlYmtpdENvbHVtbldpZHRoOgogICAgIGNhc2UgQ1NTUHJvcGVydHlXZWJraXRIaWdobGln aHQ6CiAgICAgY2FzZSBDU1NQcm9wZXJ0eVdlYmtpdEh5cGhlbmF0ZUNoYXJhY3RlcjoKKyAgICBj YXNlIENTU1Byb3BlcnR5V2Via2l0SHlwaGVuYXRlTGltaXRBZnRlcjoKKyAgICBjYXNlIENTU1By b3BlcnR5V2Via2l0SHlwaGVuYXRlTGltaXRCZWZvcmU6CisgICAgY2FzZSBDU1NQcm9wZXJ0eVdl YmtpdEh5cGhlbmF0ZUxpbWl0TGluZXM6CiAgICAgY2FzZSBDU1NQcm9wZXJ0eVdlYmtpdFRleHRD b21iaW5lOgogICAgIGNhc2UgQ1NTUHJvcGVydHlXZWJraXRUZXh0RW1waGFzaXNQb3NpdGlvbjoK ICAgICBjYXNlIENTU1Byb3BlcnR5V2Via2l0VGV4dEVtcGhhc2lzU3R5bGU6Cg== 116689 2011-11-27 18:14:17 -0800 2011-11-28 02:03:03 -0800 Patch bug-73107-20111128131414.patch text/plain 6789 macpherson SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEwMTIxNikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIwIEBACisyMDExLTExLTI3ICBMdWtlIE1h Y3BoZXJzb24gICA8bWFjcGhlcnNvbkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgSW1wbGVtZW50 IENTUyBoeXBoZW5hdGUtbGltaXQgcHJvcGVydGllcyBpbiBDU1NTdHlsZUFwcGx5UHJvcGVydHkK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTczMTA3CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQ292ZXJlZCBi eSBleGlzdGluZyB0ZXN0cyB1bmRlciBmYXN0L2NzcyAocGFyc2luZy1oeXBoZW5hdGUtbGltaXQt bGluZXMuaHRtbCwgcGFyc2luZy1oeXBoZW5hdGUtbGltaXQuaHRtbCwgdGV4dC9oeXBoZW5hdGUt bGltaXQtbGluZXMuaHRtbCkKKworICAgICAgICAqIGNzcy9DU1NTdHlsZUFwcGx5UHJvcGVydHku Y3BwOgorICAgICAgICAoV2ViQ29yZTo6QXBwbHlQcm9wZXJ0eU51bWJlcjo6c2V0VmFsdWUpOgor ICAgICAgICAoV2ViQ29yZTo6QXBwbHlQcm9wZXJ0eU51bWJlcjo6YXBwbHlWYWx1ZSk6CisgICAg ICAgIChXZWJDb3JlOjpBcHBseVByb3BlcnR5TnVtYmVyOjpjcmVhdGVIYW5kbGVyKToKKyAgICAg ICAgKFdlYkNvcmU6OkNTU1N0eWxlQXBwbHlQcm9wZXJ0eTo6Q1NTU3R5bGVBcHBseVByb3BlcnR5 KToKKyAgICAgICAgKiBjc3MvQ1NTU3R5bGVTZWxlY3Rvci5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpDU1NTdHlsZVNlbGVjdG9yOjphcHBseVByb3BlcnR5KToKKwogMjAxMS0xMS0yNyAgTWFyayBS b3dlICA8bXJvd2VAYXBwbGUuY29tPgogCiAgICAgICAgIDxodHRwOi8vd2Via2l0Lm9yZy9iLzcy NjY1PiBTd2l0Y2ggdG8gYSBtb3JlIG1vZGVybiBhcHByb2FjaCB0byByZXRyaWV2aW5nIHRoZSBP UyBtYXJrZXRpbmcgdmVyc2lvbgpJbmRleDogU291cmNlL1dlYkNvcmUvY3NzL0NTU1N0eWxlQXBw bHlQcm9wZXJ0eS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvY3NzL0NTU1N0eWxl QXBwbHlQcm9wZXJ0eS5jcHAJKHJldmlzaW9uIDEwMTIxNikKKysrIFNvdXJjZS9XZWJDb3JlL2Nz cy9DU1NTdHlsZUFwcGx5UHJvcGVydHkuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xNDEsNiArMTQx LDI4IEBAIHB1YmxpYzoKICAgICB9CiB9OwogCit0ZW1wbGF0ZSA8dHlwZW5hbWUgTnVtYmVyVHlw ZSwgTnVtYmVyVHlwZSAoUmVuZGVyU3R5bGU6OipnZXR0ZXJGdW5jdGlvbikoKSBjb25zdCwgdm9p ZCAoUmVuZGVyU3R5bGU6OipzZXR0ZXJGdW5jdGlvbikoTnVtYmVyVHlwZSksIE51bWJlclR5cGUg KCppbml0aWFsRnVuY3Rpb24pKCksIGludCBpZE1hcHNUb01pbnVzT25lID0gQ1NTVmFsdWVBdXRv PgorY2xhc3MgQXBwbHlQcm9wZXJ0eU51bWJlciB7CitwdWJsaWM6CisgICAgc3RhdGljIHZvaWQg c2V0VmFsdWUoUmVuZGVyU3R5bGUqIHN0eWxlLCBOdW1iZXJUeXBlIHZhbHVlKSB7IChzdHlsZS0+ KnNldHRlckZ1bmN0aW9uKSh2YWx1ZSk7IH0KKyAgICBzdGF0aWMgdm9pZCBhcHBseVZhbHVlKENT U1N0eWxlU2VsZWN0b3IqIHNlbGVjdG9yLCBDU1NWYWx1ZSogdmFsdWUpCisgICAgeworICAgICAg ICBpZiAoIXZhbHVlLT5pc1ByaW1pdGl2ZVZhbHVlKCkpCisgICAgICAgICAgICByZXR1cm47CisK KyAgICAgICAgQ1NTUHJpbWl0aXZlVmFsdWUqIHByaW1pdGl2ZVZhbHVlID0gc3RhdGljX2Nhc3Q8 Q1NTUHJpbWl0aXZlVmFsdWUqPih2YWx1ZSk7CisgICAgICAgIGlmIChwcmltaXRpdmVWYWx1ZS0+ Z2V0SWRlbnQoKSA9PSBpZE1hcHNUb01pbnVzT25lKQorICAgICAgICAgICAgc2V0VmFsdWUoc2Vs ZWN0b3ItPnN0eWxlKCksIC0xKTsKKyAgICAgICAgZWxzZQorICAgICAgICAgICAgc2V0VmFsdWUo c2VsZWN0b3ItPnN0eWxlKCksIHByaW1pdGl2ZVZhbHVlLT5nZXRWYWx1ZTxOdW1iZXJUeXBlPihD U1NQcmltaXRpdmVWYWx1ZTo6Q1NTX05VTUJFUikpOworICAgIH0KKyAgICBzdGF0aWMgUHJvcGVy dHlIYW5kbGVyIGNyZWF0ZUhhbmRsZXIoKQorICAgIHsKKyAgICAgICAgUHJvcGVydHlIYW5kbGVy IGhhbmRsZXIgPSBBcHBseVByb3BlcnR5RGVmYXVsdEJhc2U8TnVtYmVyVHlwZSwgZ2V0dGVyRnVu Y3Rpb24sIE51bWJlclR5cGUsIHNldHRlckZ1bmN0aW9uLCBOdW1iZXJUeXBlLCBpbml0aWFsRnVu Y3Rpb24+OjpjcmVhdGVIYW5kbGVyKCk7CisgICAgICAgIHJldHVybiBQcm9wZXJ0eUhhbmRsZXIo aGFuZGxlci5pbmhlcml0RnVuY3Rpb24oKSwgaGFuZGxlci5pbml0aWFsRnVuY3Rpb24oKSwgJmFw cGx5VmFsdWUpOworICAgIH0KK307CisKIHRlbXBsYXRlIDxTdHlsZUltYWdlKiAoUmVuZGVyU3R5 bGU6OipnZXR0ZXJGdW5jdGlvbikoKSBjb25zdCwgdm9pZCAoUmVuZGVyU3R5bGU6OipzZXR0ZXJG dW5jdGlvbikoUGFzc1JlZlB0cjxTdHlsZUltYWdlPiksIFN0eWxlSW1hZ2UqICgqaW5pdGlhbEZ1 bmN0aW9uKSgpLCBDU1NQcm9wZXJ0eUlEIHByb3BlcnR5PgogY2xhc3MgQXBwbHlQcm9wZXJ0eVN0 eWxlSW1hZ2UgewogcHVibGljOgpAQCAtMTA5Myw2ICsxMTE1LDEwIEBAIENTU1N0eWxlQXBwbHlQ cm9wZXJ0eTo6Q1NTU3R5bGVBcHBseVByb3AKICAgICBzZXRQcm9wZXJ0eUhhbmRsZXIoQ1NTUHJv cGVydHlXZWJraXRIaWdobGlnaHQsIEFwcGx5UHJvcGVydHlTdHJpbmc8TWFwTm9uZVRvTnVsbCwg JlJlbmRlclN0eWxlOjpoaWdobGlnaHQsICZSZW5kZXJTdHlsZTo6c2V0SGlnaGxpZ2h0LCAmUmVu ZGVyU3R5bGU6OmluaXRpYWxIaWdobGlnaHQ+OjpjcmVhdGVIYW5kbGVyKCkpOwogICAgIHNldFBy b3BlcnR5SGFuZGxlcihDU1NQcm9wZXJ0eVdlYmtpdEh5cGhlbmF0ZUNoYXJhY3RlciwgQXBwbHlQ cm9wZXJ0eVN0cmluZzxNYXBBdXRvVG9OdWxsLCAmUmVuZGVyU3R5bGU6Omh5cGhlbmF0aW9uU3Ry aW5nLCAmUmVuZGVyU3R5bGU6OnNldEh5cGhlbmF0aW9uU3RyaW5nLCAmUmVuZGVyU3R5bGU6Omlu aXRpYWxIeXBoZW5hdGlvblN0cmluZz46OmNyZWF0ZUhhbmRsZXIoKSk7CiAKKyAgICBzZXRQcm9w ZXJ0eUhhbmRsZXIoQ1NTUHJvcGVydHlXZWJraXRIeXBoZW5hdGVMaW1pdEFmdGVyLCBBcHBseVBy b3BlcnR5TnVtYmVyPHNob3J0LCAmUmVuZGVyU3R5bGU6Omh5cGhlbmF0aW9uTGltaXRBZnRlciwg JlJlbmRlclN0eWxlOjpzZXRIeXBoZW5hdGlvbkxpbWl0QWZ0ZXIsICZSZW5kZXJTdHlsZTo6aW5p dGlhbEh5cGhlbmF0aW9uTGltaXRBZnRlcj46OmNyZWF0ZUhhbmRsZXIoKSk7CisgICAgc2V0UHJv cGVydHlIYW5kbGVyKENTU1Byb3BlcnR5V2Via2l0SHlwaGVuYXRlTGltaXRCZWZvcmUsIEFwcGx5 UHJvcGVydHlOdW1iZXI8c2hvcnQsICZSZW5kZXJTdHlsZTo6aHlwaGVuYXRpb25MaW1pdEJlZm9y ZSwgJlJlbmRlclN0eWxlOjpzZXRIeXBoZW5hdGlvbkxpbWl0QmVmb3JlLCAmUmVuZGVyU3R5bGU6 OmluaXRpYWxIeXBoZW5hdGlvbkxpbWl0QmVmb3JlPjo6Y3JlYXRlSGFuZGxlcigpKTsKKyAgICBz ZXRQcm9wZXJ0eUhhbmRsZXIoQ1NTUHJvcGVydHlXZWJraXRIeXBoZW5hdGVMaW1pdExpbmVzLCBB cHBseVByb3BlcnR5TnVtYmVyPHNob3J0LCAmUmVuZGVyU3R5bGU6Omh5cGhlbmF0aW9uTGltaXRM aW5lcywgJlJlbmRlclN0eWxlOjpzZXRIeXBoZW5hdGlvbkxpbWl0TGluZXMsICZSZW5kZXJTdHls ZTo6aW5pdGlhbEh5cGhlbmF0aW9uTGltaXRMaW5lcywgQ1NTVmFsdWVOb0xpbWl0Pjo6Y3JlYXRl SGFuZGxlcigpKTsKKwogICAgIHNldFByb3BlcnR5SGFuZGxlcihDU1NQcm9wZXJ0eVdlYmtpdFRl eHRDb21iaW5lLCBBcHBseVByb3BlcnR5RGVmYXVsdDxUZXh0Q29tYmluZSwgJlJlbmRlclN0eWxl Ojp0ZXh0Q29tYmluZSwgVGV4dENvbWJpbmUsICZSZW5kZXJTdHlsZTo6c2V0VGV4dENvbWJpbmUs IFRleHRDb21iaW5lLCAmUmVuZGVyU3R5bGU6OmluaXRpYWxUZXh0Q29tYmluZT46OmNyZWF0ZUhh bmRsZXIoKSk7CiAgICAgc2V0UHJvcGVydHlIYW5kbGVyKENTU1Byb3BlcnR5V2Via2l0VGV4dEVt cGhhc2lzUG9zaXRpb24sIEFwcGx5UHJvcGVydHlEZWZhdWx0PFRleHRFbXBoYXNpc1Bvc2l0aW9u LCAmUmVuZGVyU3R5bGU6OnRleHRFbXBoYXNpc1Bvc2l0aW9uLCBUZXh0RW1waGFzaXNQb3NpdGlv biwgJlJlbmRlclN0eWxlOjpzZXRUZXh0RW1waGFzaXNQb3NpdGlvbiwgVGV4dEVtcGhhc2lzUG9z aXRpb24sICZSZW5kZXJTdHlsZTo6aW5pdGlhbFRleHRFbXBoYXNpc1Bvc2l0aW9uPjo6Y3JlYXRl SGFuZGxlcigpKTsKICAgICBzZXRQcm9wZXJ0eUhhbmRsZXIoQ1NTUHJvcGVydHlXZWJraXRUZXh0 RW1waGFzaXNTdHlsZSwgQXBwbHlQcm9wZXJ0eVRleHRFbXBoYXNpc1N0eWxlOjpjcmVhdGVIYW5k bGVyKCkpOwpJbmRleDogU291cmNlL1dlYkNvcmUvY3NzL0NTU1N0eWxlU2VsZWN0b3IuY3BwCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2Nzcy9DU1NTdHlsZVNlbGVjdG9yLmNwcAkocmV2 aXNpb24gMTAxMjE2KQorKysgU291cmNlL1dlYkNvcmUvY3NzL0NTU1N0eWxlU2VsZWN0b3IuY3Bw CSh3b3JraW5nIGNvcHkpCkBAIC0zNTc5LDMwICszNTc5LDYgQEAgdm9pZCBDU1NTdHlsZVNlbGVj dG9yOjphcHBseVByb3BlcnR5KGludAogICAgIGNhc2UgQ1NTUHJvcGVydHlXZWJraXRIeXBoZW5z OgogICAgICAgICBIQU5ETEVfSU5IRVJJVF9BTkRfSU5JVElBTF9BTkRfUFJJTUlUSVZFKGh5cGhl bnMsIEh5cGhlbnMpOwogICAgICAgICByZXR1cm47Ci0gICAgY2FzZSBDU1NQcm9wZXJ0eVdlYmtp dEh5cGhlbmF0ZUxpbWl0QWZ0ZXI6IHsKLSAgICAgICAgSEFORExFX0lOSEVSSVRfQU5EX0lOSVRJ QUwoaHlwaGVuYXRpb25MaW1pdEFmdGVyLCBIeXBoZW5hdGlvbkxpbWl0QWZ0ZXIpOwotICAgICAg ICBpZiAocHJpbWl0aXZlVmFsdWUtPmdldElkZW50KCkgPT0gQ1NTVmFsdWVBdXRvKQotICAgICAg ICAgICAgbV9zdHlsZS0+c2V0SHlwaGVuYXRpb25MaW1pdEFmdGVyKC0xKTsKLSAgICAgICAgZWxz ZQotICAgICAgICAgICAgbV9zdHlsZS0+c2V0SHlwaGVuYXRpb25MaW1pdEFmdGVyKHByaW1pdGl2 ZVZhbHVlLT5nZXRWYWx1ZTxzaG9ydD4oQ1NTUHJpbWl0aXZlVmFsdWU6OkNTU19OVU1CRVIpKTsK LSAgICAgICAgcmV0dXJuOwotICAgIH0KLSAgICBjYXNlIENTU1Byb3BlcnR5V2Via2l0SHlwaGVu YXRlTGltaXRCZWZvcmU6IHsKLSAgICAgICAgSEFORExFX0lOSEVSSVRfQU5EX0lOSVRJQUwoaHlw aGVuYXRpb25MaW1pdEJlZm9yZSwgSHlwaGVuYXRpb25MaW1pdEJlZm9yZSk7Ci0gICAgICAgIGlm IChwcmltaXRpdmVWYWx1ZS0+Z2V0SWRlbnQoKSA9PSBDU1NWYWx1ZUF1dG8pCi0gICAgICAgICAg ICBtX3N0eWxlLT5zZXRIeXBoZW5hdGlvbkxpbWl0QmVmb3JlKC0xKTsKLSAgICAgICAgZWxzZQot ICAgICAgICAgICAgbV9zdHlsZS0+c2V0SHlwaGVuYXRpb25MaW1pdEJlZm9yZShwcmltaXRpdmVW YWx1ZS0+Z2V0VmFsdWU8c2hvcnQ+KENTU1ByaW1pdGl2ZVZhbHVlOjpDU1NfTlVNQkVSKSk7Ci0g ICAgICAgIHJldHVybjsKLSAgICB9Ci0gICAgY2FzZSBDU1NQcm9wZXJ0eVdlYmtpdEh5cGhlbmF0 ZUxpbWl0TGluZXM6IHsKLSAgICAgICAgSEFORExFX0lOSEVSSVRfQU5EX0lOSVRJQUwoaHlwaGVu YXRpb25MaW1pdExpbmVzLCBIeXBoZW5hdGlvbkxpbWl0TGluZXMpOwotICAgICAgICBpZiAocHJp bWl0aXZlVmFsdWUtPmdldElkZW50KCkgPT0gQ1NTVmFsdWVOb0xpbWl0KQotICAgICAgICAgICAg bV9zdHlsZS0+c2V0SHlwaGVuYXRpb25MaW1pdExpbmVzKC0xKTsKLSAgICAgICAgZWxzZQotICAg ICAgICAgICAgbV9zdHlsZS0+c2V0SHlwaGVuYXRpb25MaW1pdExpbmVzKHByaW1pdGl2ZVZhbHVl LT5nZXRWYWx1ZTxzaG9ydD4oQ1NTUHJpbWl0aXZlVmFsdWU6OkNTU19OVU1CRVIpKTsKLSAgICAg ICAgcmV0dXJuOwotICAgIH0KICAgICBjYXNlIENTU1Byb3BlcnR5V2Via2l0TG9jYWxlOiB7CiAg ICAgICAgIEhBTkRMRV9JTkhFUklUX0FORF9JTklUSUFMKGxvY2FsZSwgTG9jYWxlKTsKICAgICAg ICAgaWYgKHByaW1pdGl2ZVZhbHVlLT5nZXRJZGVudCgpID09IENTU1ZhbHVlQXV0bykKQEAgLTQw NTQsNiArNDAzMCw5IEBAIHZvaWQgQ1NTU3R5bGVTZWxlY3Rvcjo6YXBwbHlQcm9wZXJ0eShpbnQK ICAgICBjYXNlIENTU1Byb3BlcnR5V2Via2l0Q29sdW1uV2lkdGg6CiAgICAgY2FzZSBDU1NQcm9w ZXJ0eVdlYmtpdEhpZ2hsaWdodDoKICAgICBjYXNlIENTU1Byb3BlcnR5V2Via2l0SHlwaGVuYXRl Q2hhcmFjdGVyOgorICAgIGNhc2UgQ1NTUHJvcGVydHlXZWJraXRIeXBoZW5hdGVMaW1pdEFmdGVy OgorICAgIGNhc2UgQ1NTUHJvcGVydHlXZWJraXRIeXBoZW5hdGVMaW1pdEJlZm9yZToKKyAgICBj YXNlIENTU1Byb3BlcnR5V2Via2l0SHlwaGVuYXRlTGltaXRMaW5lczoKICAgICBjYXNlIENTU1By b3BlcnR5V2Via2l0VGV4dENvbWJpbmU6CiAgICAgY2FzZSBDU1NQcm9wZXJ0eVdlYmtpdFRleHRF bXBoYXNpc1Bvc2l0aW9uOgogICAgIGNhc2UgQ1NTUHJvcGVydHlXZWJraXRUZXh0RW1waGFzaXNT dHlsZToK