113298 2013-03-26 05:16:49 -0700 Move remaining marquee applying code to StyleBuilder 2013-04-01 12:47:43 -0700 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 89879 1 eae eae allan.jensen eric esprehn+autocc macpherson menard ojan.autocc webkit.review.bot oldest_to_newest 863581 0 eae 2013-03-26 05:16:49 -0700 Move applying logic for CSSPropertyWebkitMarqueeIncrement, CSSPropertyWebkitMarqueeRepetition and CSSPropertyWebkitMarqueeSpeed from StyleResolver::applyProperty. 863584 1 195062 eae 2013-03-26 05:20:12 -0700 Created attachment 195062 Patch 865425 2 195062 allan.jensen 2013-03-28 06:14:13 -0700 Comment on attachment 195062 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=195062&action=review r=me, assuming we have layout tests of marquee CSS. > Source/WebCore/ChangeLog:12 > + No new tests, no change in functionality. Do we have tests testing marquee CSS? If not we should add some. 867279 3 eae 2013-04-01 12:24:11 -0700 (In reply to comment #2) > (From update of attachment 195062 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=195062&action=review > > r=me, assuming we have layout tests of marquee CSS. > > > Source/WebCore/ChangeLog:12 > > + No new tests, no change in functionality. > > Do we have tests testing marquee CSS? If not we should add some. We have a handful of tests for it, most notably fast/html/marquee-element.html and fast/css/MarqueeLayoutTest.html 867290 4 195062 webkit.review.bot 2013-04-01 12:47:39 -0700 Comment on attachment 195062 Patch Clearing flags on attachment: 195062 Committed r147350: <http://trac.webkit.org/changeset/147350> 867291 5 webkit.review.bot 2013-04-01 12:47:43 -0700 All reviewed patches have been landed. Closing bug. 195062 2013-03-26 05:20:12 -0700 2013-04-01 12:47:39 -0700 Patch bug-113298-20130326051555.patch text/plain 12030 eae SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE0Njg3MikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM3IEBACisyMDEzLTAzLTI2ICBFbWlsIEEg RWtsdW5kICA8ZWFlQGNocm9taXVtLm9yZz4KKworICAgICAgICBNb3ZlIHJlbWFpbmluZyBtYXJx dWVlIGFwcGx5aW5nIGNvZGUgdG8gU3R5bGVCdWlsZGVyCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTMyOTgKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBNb3ZlIGFwcGx5aW5nIGxvZ2ljIGZvciBDU1NQcm9w ZXJ0eVdlYmtpdE1hcnF1ZWVJbmNyZW1lbnQsCisgICAgICAgIENTU1Byb3BlcnR5V2Via2l0TWFy cXVlZVJlcGV0aXRpb24gYW5kIENTU1Byb3BlcnR5V2Via2l0TWFycXVlZVNwZWVkCisgICAgICAg IGZyb20gU3R5bGVSZXNvbHZlcjo6YXBwbHlQcm9wZXJ0eS4KKworICAgICAgICBObyBuZXcgdGVz dHMsIG5vIGNoYW5nZSBpbiBmdW5jdGlvbmFsaXR5LgorCisgICAgICAgICogY3NzL1N0eWxlQnVp bGRlci5jcHA6CisgICAgICAgIChBcHBseVByb3BlcnR5TWFycXVlZUluY3JlbWVudCk6CisgICAg ICAgIChXZWJDb3JlOjpBcHBseVByb3BlcnR5TWFycXVlZUluY3JlbWVudDo6YXBwbHlWYWx1ZSk6 CisgICAgICAgIChXZWJDb3JlOjpBcHBseVByb3BlcnR5TWFycXVlZUluY3JlbWVudDo6Y3JlYXRl SGFuZGxlcik6CisgICAgICAgIChXZWJDb3JlKToKKyAgICAgICAgKEFwcGx5UHJvcGVydHlNYXJx dWVlUmVwZXRpdGlvbik6CisgICAgICAgIChXZWJDb3JlOjpBcHBseVByb3BlcnR5TWFycXVlZVJl cGV0aXRpb246OmFwcGx5VmFsdWUpOgorICAgICAgICAoV2ViQ29yZTo6QXBwbHlQcm9wZXJ0eU1h cnF1ZWVSZXBldGl0aW9uOjpjcmVhdGVIYW5kbGVyKToKKyAgICAgICAgKEFwcGx5UHJvcGVydHlN YXJxdWVlU3BlZWQpOgorICAgICAgICAoV2ViQ29yZTo6QXBwbHlQcm9wZXJ0eU1hcnF1ZWVTcGVl ZDo6YXBwbHlWYWx1ZSk6CisgICAgICAgIChXZWJDb3JlOjpBcHBseVByb3BlcnR5TWFycXVlZVNw ZWVkOjpjcmVhdGVIYW5kbGVyKToKKyAgICAgICAgKFdlYkNvcmU6OlN0eWxlQnVpbGRlcjo6U3R5 bGVCdWlsZGVyKToKKyAgICAgICAgKiBjc3MvU3R5bGVSZXNvbHZlci5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpTdHlsZVJlc29sdmVyOjphcHBseVByb3BlcnR5KToKKyAgICAgICAgTW92ZSBtYXJx dWVlIGFwcGx5aW5nIGxvZ2ljIGZyb20gU3R5bGVSZXNvbHZlciB0byBTdHlsZUJ1aWxkZXIuCisg ICAgICAgIAorICAgICAgICAqIHJlbmRlcmluZy9zdHlsZS9SZW5kZXJTdHlsZS5oOgorICAgICAg ICBDaGFuZ2Ugc2V0TWFycXVlZUluY3JlbWVudCB0byBwYXNzIExlbmd0aCBieSB2YWx1ZSBpbnN0 ZWFkIG9mIGNvbnN0CisgICAgICAgIHJlZmVyZW5jZS4gVGhpcyBpcyBjb25zaXN0ZW50IHdpdGgg b3RoZXIgbGVuZ3RoIHNldHRlcnMgYW5kIHdvcmtzIHdpdGgKKyAgICAgICAgdGhlIEFwcGx5UHJv cGVydHlMZW5ndGggdGVtcGxhdGUuCisKIDIwMTMtMDMtMjYgIFNoZXJpZmYgQm90ICA8d2Via2l0 LnJldmlldy5ib3RAZ21haWwuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQsIHJvbGxpbmcgb3V0 IHIxNDY3NjcuCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVCdWlsZGVyLmNwcAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVCdWlsZGVyLmNwcAkocmV2aXNpb24g MTQ2NzcyKQorKysgU291cmNlL1dlYkNvcmUvY3NzL1N0eWxlQnVpbGRlci5jcHAJKHdvcmtpbmcg Y29weSkKQEAgLTEyNjMsNiArMTI2Myw5MSBAQCBwdWJsaWM6CiAgICAgfQogfTsKIAorY2xhc3Mg QXBwbHlQcm9wZXJ0eU1hcnF1ZWVJbmNyZW1lbnQgeworcHVibGljOgorICAgIHN0YXRpYyB2b2lk IGFwcGx5VmFsdWUoQ1NTUHJvcGVydHlJRCwgU3R5bGVSZXNvbHZlciogc3R5bGVSZXNvbHZlciwg Q1NTVmFsdWUqIHZhbHVlKQorICAgIHsKKyAgICAgICAgaWYgKCF2YWx1ZS0+aXNQcmltaXRpdmVW YWx1ZSgpKQorICAgICAgICAgICAgcmV0dXJuOworCisgICAgICAgIENTU1ByaW1pdGl2ZVZhbHVl KiBwcmltaXRpdmVWYWx1ZSA9IHN0YXRpY19jYXN0PENTU1ByaW1pdGl2ZVZhbHVlKj4odmFsdWUp OworICAgICAgICBpZiAocHJpbWl0aXZlVmFsdWUtPmdldElkZW50KCkpIHsKKyAgICAgICAgICAg IHN3aXRjaCAocHJpbWl0aXZlVmFsdWUtPmdldElkZW50KCkpIHsKKyAgICAgICAgICAgIGNhc2Ug Q1NTVmFsdWVTbWFsbDoKKyAgICAgICAgICAgICAgICBzdHlsZVJlc29sdmVyLT5zdHlsZSgpLT5z ZXRNYXJxdWVlSW5jcmVtZW50KExlbmd0aCgxLCBGaXhlZCkpOyAvLyAxcHguCisgICAgICAgICAg ICAgICAgYnJlYWs7CisgICAgICAgICAgICBjYXNlIENTU1ZhbHVlTm9ybWFsOgorICAgICAgICAg ICAgICAgIHN0eWxlUmVzb2x2ZXItPnN0eWxlKCktPnNldE1hcnF1ZWVJbmNyZW1lbnQoTGVuZ3Ro KDYsIEZpeGVkKSk7IC8vIDZweC4gVGhlIFdpbklFIGRlZmF1bHQuCisgICAgICAgICAgICAgICAg YnJlYWs7CisgICAgICAgICAgICBjYXNlIENTU1ZhbHVlTGFyZ2U6CisgICAgICAgICAgICAgICAg c3R5bGVSZXNvbHZlci0+c3R5bGUoKS0+c2V0TWFycXVlZUluY3JlbWVudChMZW5ndGgoMzYsIEZp eGVkKSk7IC8vIDM2cHguCisgICAgICAgICAgICAgICAgYnJlYWs7CisgICAgICAgICAgICB9Cisg ICAgICAgIH0gZWxzZSB7CisgICAgICAgICAgICBMZW5ndGggbWFycXVlZUxlbmd0aCA9IHN0eWxl UmVzb2x2ZXItPmNvbnZlcnRUb0ludExlbmd0aChwcmltaXRpdmVWYWx1ZSwgc3R5bGVSZXNvbHZl ci0+c3R5bGUoKSwgc3R5bGVSZXNvbHZlci0+cm9vdEVsZW1lbnRTdHlsZSgpKTsKKyAgICAgICAg ICAgIGlmICghbWFycXVlZUxlbmd0aC5pc1VuZGVmaW5lZCgpKQorICAgICAgICAgICAgICAgIHN0 eWxlUmVzb2x2ZXItPnN0eWxlKCktPnNldE1hcnF1ZWVJbmNyZW1lbnQobWFycXVlZUxlbmd0aCk7 CisgICAgICAgIH0KKyAgICB9CisgICAgc3RhdGljIFByb3BlcnR5SGFuZGxlciBjcmVhdGVIYW5k bGVyKCkKKyAgICB7CisgICAgICAgIFByb3BlcnR5SGFuZGxlciBoYW5kbGVyID0gQXBwbHlQcm9w ZXJ0eUxlbmd0aDwmUmVuZGVyU3R5bGU6Om1hcnF1ZWVJbmNyZW1lbnQsICZSZW5kZXJTdHlsZTo6 c2V0TWFycXVlZUluY3JlbWVudCwgJlJlbmRlclN0eWxlOjppbml0aWFsTWFycXVlZUluY3JlbWVu dD46OmNyZWF0ZUhhbmRsZXIoKTsKKyAgICAgICAgcmV0dXJuIFByb3BlcnR5SGFuZGxlcihoYW5k bGVyLmluaGVyaXRGdW5jdGlvbigpLCBoYW5kbGVyLmluaXRpYWxGdW5jdGlvbigpLCAmYXBwbHlW YWx1ZSk7CisgICAgfQorfTsKKworY2xhc3MgQXBwbHlQcm9wZXJ0eU1hcnF1ZWVSZXBldGl0aW9u IHsKK3B1YmxpYzoKKyAgICBzdGF0aWMgdm9pZCBhcHBseVZhbHVlKENTU1Byb3BlcnR5SUQsIFN0 eWxlUmVzb2x2ZXIqIHN0eWxlUmVzb2x2ZXIsIENTU1ZhbHVlKiB2YWx1ZSkKKyAgICB7CisgICAg ICAgIGlmICghdmFsdWUtPmlzUHJpbWl0aXZlVmFsdWUoKSkKKyAgICAgICAgICAgIHJldHVybjsK KworICAgICAgICBDU1NQcmltaXRpdmVWYWx1ZSogcHJpbWl0aXZlVmFsdWUgPSBzdGF0aWNfY2Fz dDxDU1NQcmltaXRpdmVWYWx1ZSo+KHZhbHVlKTsKKyAgICAgICAgaWYgKHByaW1pdGl2ZVZhbHVl LT5nZXRJZGVudCgpID09IENTU1ZhbHVlSW5maW5pdGUpCisgICAgICAgICAgICBzdHlsZVJlc29s dmVyLT5zdHlsZSgpLT5zZXRNYXJxdWVlTG9vcENvdW50KC0xKTsgLy8gLTEgbWVhbnMgcmVwZWF0 IGZvcmV2ZXIuCisgICAgICAgIGVsc2UgaWYgKHByaW1pdGl2ZVZhbHVlLT5pc051bWJlcigpKQor ICAgICAgICAgICAgc3R5bGVSZXNvbHZlci0+c3R5bGUoKS0+c2V0TWFycXVlZUxvb3BDb3VudChw cmltaXRpdmVWYWx1ZS0+Z2V0SW50VmFsdWUoKSk7CisgICAgfQorICAgIHN0YXRpYyBQcm9wZXJ0 eUhhbmRsZXIgY3JlYXRlSGFuZGxlcigpCisgICAgeworICAgICAgICBQcm9wZXJ0eUhhbmRsZXIg aGFuZGxlciA9IEFwcGx5UHJvcGVydHlEZWZhdWx0PGludCwgJlJlbmRlclN0eWxlOjptYXJxdWVl TG9vcENvdW50LCBpbnQsICZSZW5kZXJTdHlsZTo6c2V0TWFycXVlZUxvb3BDb3VudCwgaW50LCAm UmVuZGVyU3R5bGU6OmluaXRpYWxNYXJxdWVlTG9vcENvdW50Pjo6Y3JlYXRlSGFuZGxlcigpOwor ICAgICAgICByZXR1cm4gUHJvcGVydHlIYW5kbGVyKGhhbmRsZXIuaW5oZXJpdEZ1bmN0aW9uKCks IGhhbmRsZXIuaW5pdGlhbEZ1bmN0aW9uKCksICZhcHBseVZhbHVlKTsKKyAgICB9Cit9OworCitj bGFzcyBBcHBseVByb3BlcnR5TWFycXVlZVNwZWVkIHsKK3B1YmxpYzoKKyAgICBzdGF0aWMgdm9p ZCBhcHBseVZhbHVlKENTU1Byb3BlcnR5SUQsIFN0eWxlUmVzb2x2ZXIqIHN0eWxlUmVzb2x2ZXIs IENTU1ZhbHVlKiB2YWx1ZSkKKyAgICB7CisgICAgICAgIGlmICghdmFsdWUtPmlzUHJpbWl0aXZl VmFsdWUoKSkKKyAgICAgICAgICAgIHJldHVybjsKKworICAgICAgICBDU1NQcmltaXRpdmVWYWx1 ZSogcHJpbWl0aXZlVmFsdWUgPSBzdGF0aWNfY2FzdDxDU1NQcmltaXRpdmVWYWx1ZSo+KHZhbHVl KTsKKyAgICAgICAgaWYgKGludCBpZGVudCA9IHByaW1pdGl2ZVZhbHVlLT5nZXRJZGVudCgpKSB7 CisgICAgICAgICAgICBzd2l0Y2ggKGlkZW50KSB7CisgICAgICAgICAgICBjYXNlIENTU1ZhbHVl U2xvdzoKKyAgICAgICAgICAgICAgICBzdHlsZVJlc29sdmVyLT5zdHlsZSgpLT5zZXRNYXJxdWVl U3BlZWQoNTAwKTsgLy8gNTAwIG1zZWMuCisgICAgICAgICAgICAgICAgYnJlYWs7CisgICAgICAg ICAgICBjYXNlIENTU1ZhbHVlTm9ybWFsOgorICAgICAgICAgICAgICAgIHN0eWxlUmVzb2x2ZXIt PnN0eWxlKCktPnNldE1hcnF1ZWVTcGVlZCg4NSk7IC8vIDg1bXNlYy4gVGhlIFdpbklFIGRlZmF1 bHQuCisgICAgICAgICAgICAgICAgYnJlYWs7CisgICAgICAgICAgICBjYXNlIENTU1ZhbHVlRmFz dDoKKyAgICAgICAgICAgICAgICBzdHlsZVJlc29sdmVyLT5zdHlsZSgpLT5zZXRNYXJxdWVlU3Bl ZWQoMTApOyAvLyAxMG1zZWMuIFN1cGVyIGZhc3QuCisgICAgICAgICAgICAgICAgYnJlYWs7Cisg ICAgICAgICAgICB9CisgICAgICAgIH0gZWxzZSBpZiAocHJpbWl0aXZlVmFsdWUtPmlzVGltZSgp KQorICAgICAgICAgICAgc3R5bGVSZXNvbHZlci0+c3R5bGUoKS0+c2V0TWFycXVlZVNwZWVkKHBy aW1pdGl2ZVZhbHVlLT5jb21wdXRlVGltZTxpbnQsIENTU1ByaW1pdGl2ZVZhbHVlOjpNaWxsaXNl Y29uZHM+KCkpOworICAgICAgICBlbHNlIGlmIChwcmltaXRpdmVWYWx1ZS0+aXNOdW1iZXIoKSkg Ly8gRm9yIHNjcm9sbGFtb3VudCBzdXBwb3J0LgorICAgICAgICAgICAgc3R5bGVSZXNvbHZlci0+ c3R5bGUoKS0+c2V0TWFycXVlZVNwZWVkKHByaW1pdGl2ZVZhbHVlLT5nZXRJbnRWYWx1ZSgpKTsK KyAgICB9CisgICAgc3RhdGljIFByb3BlcnR5SGFuZGxlciBjcmVhdGVIYW5kbGVyKCkKKyAgICB7 CisgICAgICAgIFByb3BlcnR5SGFuZGxlciBoYW5kbGVyID0gQXBwbHlQcm9wZXJ0eURlZmF1bHQ8 aW50LCAmUmVuZGVyU3R5bGU6Om1hcnF1ZWVTcGVlZCwgaW50LCAmUmVuZGVyU3R5bGU6OnNldE1h cnF1ZWVTcGVlZCwgaW50LCAmUmVuZGVyU3R5bGU6OmluaXRpYWxNYXJxdWVlU3BlZWQ+OjpjcmVh dGVIYW5kbGVyKCk7CisgICAgICAgIHJldHVybiBQcm9wZXJ0eUhhbmRsZXIoaGFuZGxlci5pbmhl cml0RnVuY3Rpb24oKSwgaGFuZGxlci5pbml0aWFsRnVuY3Rpb24oKSwgJmFwcGx5VmFsdWUpOwor ICAgIH0KK307CisKICNpZiBFTkFCTEUoQ1NTM19URVhUKQogY2xhc3MgQXBwbHlQcm9wZXJ0eVRl eHRVbmRlcmxpbmVQb3NpdGlvbiB7CiBwdWJsaWM6CkBAIC0yMTkyLDYgKzIyNzcsOSBAQCBTdHls ZUJ1aWxkZXI6OlN0eWxlQnVpbGRlcigpCiAgICAgc2V0UHJvcGVydHlIYW5kbGVyKENTU1Byb3Bl cnR5V2Via2l0TWFyZ2luQm90dG9tQ29sbGFwc2UsIENTU1Byb3BlcnR5V2Via2l0TWFyZ2luQWZ0 ZXJDb2xsYXBzZSk7CiAgICAgc2V0UHJvcGVydHlIYW5kbGVyKENTU1Byb3BlcnR5V2Via2l0TWFy Z2luVG9wQ29sbGFwc2UsIENTU1Byb3BlcnR5V2Via2l0TWFyZ2luQmVmb3JlQ29sbGFwc2UpOwog ICAgIHNldFByb3BlcnR5SGFuZGxlcihDU1NQcm9wZXJ0eVdlYmtpdE1hcnF1ZWVEaXJlY3Rpb24s IEFwcGx5UHJvcGVydHlEZWZhdWx0PEVNYXJxdWVlRGlyZWN0aW9uLCAmUmVuZGVyU3R5bGU6Om1h cnF1ZWVEaXJlY3Rpb24sIEVNYXJxdWVlRGlyZWN0aW9uLCAmUmVuZGVyU3R5bGU6OnNldE1hcnF1 ZWVEaXJlY3Rpb24sIEVNYXJxdWVlRGlyZWN0aW9uLCAmUmVuZGVyU3R5bGU6OmluaXRpYWxNYXJx dWVlRGlyZWN0aW9uPjo6Y3JlYXRlSGFuZGxlcigpKTsKKyAgICBzZXRQcm9wZXJ0eUhhbmRsZXIo Q1NTUHJvcGVydHlXZWJraXRNYXJxdWVlSW5jcmVtZW50LCBBcHBseVByb3BlcnR5TWFycXVlZUlu Y3JlbWVudDo6Y3JlYXRlSGFuZGxlcigpKTsKKyAgICBzZXRQcm9wZXJ0eUhhbmRsZXIoQ1NTUHJv cGVydHlXZWJraXRNYXJxdWVlUmVwZXRpdGlvbiwgQXBwbHlQcm9wZXJ0eU1hcnF1ZWVSZXBldGl0 aW9uOjpjcmVhdGVIYW5kbGVyKCkpOworICAgIHNldFByb3BlcnR5SGFuZGxlcihDU1NQcm9wZXJ0 eVdlYmtpdE1hcnF1ZWVTcGVlZCwgQXBwbHlQcm9wZXJ0eU1hcnF1ZWVTcGVlZDo6Y3JlYXRlSGFu ZGxlcigpKTsKICAgICBzZXRQcm9wZXJ0eUhhbmRsZXIoQ1NTUHJvcGVydHlXZWJraXRNYXJxdWVl U3R5bGUsIEFwcGx5UHJvcGVydHlEZWZhdWx0PEVNYXJxdWVlQmVoYXZpb3IsICZSZW5kZXJTdHls ZTo6bWFycXVlZUJlaGF2aW9yLCBFTWFycXVlZUJlaGF2aW9yLCAmUmVuZGVyU3R5bGU6OnNldE1h cnF1ZWVCZWhhdmlvciwgRU1hcnF1ZWVCZWhhdmlvciwgJlJlbmRlclN0eWxlOjppbml0aWFsTWFy cXVlZUJlaGF2aW9yPjo6Y3JlYXRlSGFuZGxlcigpKTsKICAgICBzZXRQcm9wZXJ0eUhhbmRsZXIo Q1NTUHJvcGVydHlXZWJraXRNYXNrQm94SW1hZ2UsIEFwcGx5UHJvcGVydHlCb3JkZXJJbWFnZTxC b3JkZXJNYXNrLCBDU1NQcm9wZXJ0eVdlYmtpdE1hc2tCb3hJbWFnZSwgJlJlbmRlclN0eWxlOjpt YXNrQm94SW1hZ2UsICZSZW5kZXJTdHlsZTo6c2V0TWFza0JveEltYWdlPjo6Y3JlYXRlSGFuZGxl cigpKTsKICAgICBzZXRQcm9wZXJ0eUhhbmRsZXIoQ1NTUHJvcGVydHlXZWJraXRNYXNrQm94SW1h Z2VPdXRzZXQsIEFwcGx5UHJvcGVydHlCb3JkZXJJbWFnZU1vZGlmaWVyPEJvcmRlck1hc2ssIE91 dHNldD46OmNyZWF0ZUhhbmRsZXIoKSk7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVS ZXNvbHZlci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvY3NzL1N0eWxlUmVzb2x2 ZXIuY3BwCShyZXZpc2lvbiAxNDY3NzIpCisrKyBTb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVSZXNv bHZlci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTI1NjEsNjEgKzI1NjEsNiBAQCB2b2lkIFN0eWxl UmVzb2x2ZXI6OmFwcGx5UHJvcGVydHkoQ1NTUHJvCiAgICAgICAgIHJldHVybjsKICAgICBjYXNl IENTU1Byb3BlcnR5VW5pY29kZVJhbmdlOiAvLyBPbmx5IHVzZWQgaW4gQGZvbnQtZmFjZSBydWxl cy4KICAgICAgICAgcmV0dXJuOwotICAgIGNhc2UgQ1NTUHJvcGVydHlXZWJraXRNYXJxdWVlUmVw ZXRpdGlvbjogewotICAgICAgICBIQU5ETEVfSU5IRVJJVF9BTkRfSU5JVElBTChtYXJxdWVlTG9v cENvdW50LCBNYXJxdWVlTG9vcENvdW50KQotICAgICAgICBpZiAoIXByaW1pdGl2ZVZhbHVlKQot ICAgICAgICAgICAgcmV0dXJuOwotICAgICAgICBpZiAocHJpbWl0aXZlVmFsdWUtPmdldElkZW50 KCkgPT0gQ1NTVmFsdWVJbmZpbml0ZSkKLSAgICAgICAgICAgIHN0YXRlLnN0eWxlKCktPnNldE1h cnF1ZWVMb29wQ291bnQoLTEpOyAvLyAtMSBtZWFucyByZXBlYXQgZm9yZXZlci4KLSAgICAgICAg ZWxzZSBpZiAocHJpbWl0aXZlVmFsdWUtPmlzTnVtYmVyKCkpCi0gICAgICAgICAgICBzdGF0ZS5z dHlsZSgpLT5zZXRNYXJxdWVlTG9vcENvdW50KHByaW1pdGl2ZVZhbHVlLT5nZXRJbnRWYWx1ZSgp KTsKLSAgICAgICAgcmV0dXJuOwotICAgIH0KLSAgICBjYXNlIENTU1Byb3BlcnR5V2Via2l0TWFy cXVlZVNwZWVkOiB7Ci0gICAgICAgIEhBTkRMRV9JTkhFUklUX0FORF9JTklUSUFMKG1hcnF1ZWVT cGVlZCwgTWFycXVlZVNwZWVkKQotICAgICAgICBpZiAoIXByaW1pdGl2ZVZhbHVlKQotICAgICAg ICAgICAgcmV0dXJuOwotICAgICAgICBpZiAoaW50IGlkZW50ID0gcHJpbWl0aXZlVmFsdWUtPmdl dElkZW50KCkpIHsKLSAgICAgICAgICAgIHN3aXRjaCAoaWRlbnQpIHsKLSAgICAgICAgICAgIGNh c2UgQ1NTVmFsdWVTbG93OgotICAgICAgICAgICAgICAgIHN0YXRlLnN0eWxlKCktPnNldE1hcnF1 ZWVTcGVlZCg1MDApOyAvLyA1MDAgbXNlYy4KLSAgICAgICAgICAgICAgICBicmVhazsKLSAgICAg ICAgICAgIGNhc2UgQ1NTVmFsdWVOb3JtYWw6Ci0gICAgICAgICAgICAgICAgc3RhdGUuc3R5bGUo KS0+c2V0TWFycXVlZVNwZWVkKDg1KTsgLy8gODVtc2VjLiBUaGUgV2luSUUgZGVmYXVsdC4KLSAg ICAgICAgICAgICAgICBicmVhazsKLSAgICAgICAgICAgIGNhc2UgQ1NTVmFsdWVGYXN0OgotICAg ICAgICAgICAgICAgIHN0YXRlLnN0eWxlKCktPnNldE1hcnF1ZWVTcGVlZCgxMCk7IC8vIDEwbXNl Yy4gU3VwZXIgZmFzdC4KLSAgICAgICAgICAgICAgICBicmVhazsKLSAgICAgICAgICAgIH0KLSAg ICAgICAgfSBlbHNlIGlmIChwcmltaXRpdmVWYWx1ZS0+aXNUaW1lKCkpCi0gICAgICAgICAgICBz dGF0ZS5zdHlsZSgpLT5zZXRNYXJxdWVlU3BlZWQocHJpbWl0aXZlVmFsdWUtPmNvbXB1dGVUaW1l PGludCwgQ1NTUHJpbWl0aXZlVmFsdWU6Ok1pbGxpc2Vjb25kcz4oKSk7Ci0gICAgICAgIGVsc2Ug aWYgKHByaW1pdGl2ZVZhbHVlLT5pc051bWJlcigpKSAvLyBGb3Igc2Nyb2xsYW1vdW50IHN1cHBv cnQuCi0gICAgICAgICAgICBzdGF0ZS5zdHlsZSgpLT5zZXRNYXJxdWVlU3BlZWQocHJpbWl0aXZl VmFsdWUtPmdldEludFZhbHVlKCkpOwotICAgICAgICByZXR1cm47Ci0gICAgfQotICAgIGNhc2Ug Q1NTUHJvcGVydHlXZWJraXRNYXJxdWVlSW5jcmVtZW50OiB7Ci0gICAgICAgIEhBTkRMRV9JTkhF UklUX0FORF9JTklUSUFMKG1hcnF1ZWVJbmNyZW1lbnQsIE1hcnF1ZWVJbmNyZW1lbnQpCi0gICAg ICAgIGlmICghcHJpbWl0aXZlVmFsdWUpCi0gICAgICAgICAgICByZXR1cm47Ci0gICAgICAgIGlm IChwcmltaXRpdmVWYWx1ZS0+Z2V0SWRlbnQoKSkgewotICAgICAgICAgICAgc3dpdGNoIChwcmlt aXRpdmVWYWx1ZS0+Z2V0SWRlbnQoKSkgewotICAgICAgICAgICAgY2FzZSBDU1NWYWx1ZVNtYWxs OgotICAgICAgICAgICAgICAgIHN0YXRlLnN0eWxlKCktPnNldE1hcnF1ZWVJbmNyZW1lbnQoTGVu Z3RoKDEsIEZpeGVkKSk7IC8vIDFweC4KLSAgICAgICAgICAgICAgICBicmVhazsKLSAgICAgICAg ICAgIGNhc2UgQ1NTVmFsdWVOb3JtYWw6Ci0gICAgICAgICAgICAgICAgc3RhdGUuc3R5bGUoKS0+ c2V0TWFycXVlZUluY3JlbWVudChMZW5ndGgoNiwgRml4ZWQpKTsgLy8gNnB4LiBUaGUgV2luSUUg ZGVmYXVsdC4KLSAgICAgICAgICAgICAgICBicmVhazsKLSAgICAgICAgICAgIGNhc2UgQ1NTVmFs dWVMYXJnZToKLSAgICAgICAgICAgICAgICBzdGF0ZS5zdHlsZSgpLT5zZXRNYXJxdWVlSW5jcmVt ZW50KExlbmd0aCgzNiwgRml4ZWQpKTsgLy8gMzZweC4KLSAgICAgICAgICAgICAgICBicmVhazsK LSAgICAgICAgICAgIH0KLSAgICAgICAgfSBlbHNlIHsKLSAgICAgICAgICAgIExlbmd0aCBtYXJx dWVlTGVuZ3RoID0gY29udmVydFRvSW50TGVuZ3RoKHByaW1pdGl2ZVZhbHVlLCBzdGF0ZS5zdHls ZSgpLCBzdGF0ZS5yb290RWxlbWVudFN0eWxlKCkpOwotICAgICAgICAgICAgaWYgKCFtYXJxdWVl TGVuZ3RoLmlzVW5kZWZpbmVkKCkpCi0gICAgICAgICAgICAgICAgc3RhdGUuc3R5bGUoKS0+c2V0 TWFycXVlZUluY3JlbWVudChtYXJxdWVlTGVuZ3RoKTsKLSAgICAgICAgfQotICAgICAgICByZXR1 cm47Ci0gICAgfQogICAgIGNhc2UgQ1NTUHJvcGVydHlXZWJraXRMb2NhbGU6IHsKICAgICAgICAg SEFORExFX0lOSEVSSVRfQU5EX0lOSVRJQUwobG9jYWxlLCBMb2NhbGUpOwogICAgICAgICBpZiAo IXByaW1pdGl2ZVZhbHVlKQpAQCAtMzEzNSw2ICszMDgwLDkgQEAgdm9pZCBTdHlsZVJlc29sdmVy OjphcHBseVByb3BlcnR5KENTU1BybwogICAgIGNhc2UgQ1NTUHJvcGVydHlXZWJraXRMaW5lR3Jp ZDoKICAgICBjYXNlIENTU1Byb3BlcnR5V2Via2l0TGluZVNuYXA6CiAgICAgY2FzZSBDU1NQcm9w ZXJ0eVdlYmtpdE1hcnF1ZWVEaXJlY3Rpb246CisgICAgY2FzZSBDU1NQcm9wZXJ0eVdlYmtpdE1h cnF1ZWVJbmNyZW1lbnQ6CisgICAgY2FzZSBDU1NQcm9wZXJ0eVdlYmtpdE1hcnF1ZWVSZXBldGl0 aW9uOgorICAgIGNhc2UgQ1NTUHJvcGVydHlXZWJraXRNYXJxdWVlU3BlZWQ6CiAgICAgY2FzZSBD U1NQcm9wZXJ0eVdlYmtpdE1hcnF1ZWVTdHlsZToKICAgICBjYXNlIENTU1Byb3BlcnR5V2Via2l0 TWFza0JveEltYWdlOgogICAgIGNhc2UgQ1NTUHJvcGVydHlXZWJraXRNYXNrQm94SW1hZ2VPdXRz ZXQ6CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5bGUuaAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5bGUu aAkocmV2aXNpb24gMTQ2NzcyKQorKysgU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1Jl bmRlclN0eWxlLmgJKHdvcmtpbmcgY29weSkKQEAgLTEzMDUsNyArMTMwNSw3IEBAIHB1YmxpYzoK ICAgICB2b2lkIHNldEdyaWRJdGVtQmVmb3JlKGNvbnN0IEdyaWRQb3NpdGlvbiYgYmVmb3JlUG9z aXRpb24pIHsgU0VUX1ZBUihyYXJlTm9uSW5oZXJpdGVkRGF0YS5hY2Nlc3MoKS0+bV9ncmlkSXRl bSwgbV9ncmlkQmVmb3JlLCBiZWZvcmVQb3NpdGlvbik7IH0KICAgICB2b2lkIHNldEdyaWRJdGVt QWZ0ZXIoY29uc3QgR3JpZFBvc2l0aW9uJiBhZnRlclBvc2l0aW9uKSB7IFNFVF9WQVIocmFyZU5v bkluaGVyaXRlZERhdGEuYWNjZXNzKCktPm1fZ3JpZEl0ZW0sIG1fZ3JpZEFmdGVyLCBhZnRlclBv c2l0aW9uKTsgfQogCi0gICAgdm9pZCBzZXRNYXJxdWVlSW5jcmVtZW50KGNvbnN0IExlbmd0aCYg ZikgeyBTRVRfVkFSKHJhcmVOb25Jbmhlcml0ZWREYXRhLmFjY2VzcygpLT5tX21hcnF1ZWUsIGlu Y3JlbWVudCwgZik7IH0KKyAgICB2b2lkIHNldE1hcnF1ZWVJbmNyZW1lbnQoTGVuZ3RoIGYpIHsg U0VUX1ZBUihyYXJlTm9uSW5oZXJpdGVkRGF0YS5hY2Nlc3MoKS0+bV9tYXJxdWVlLCBpbmNyZW1l bnQsIGYpOyB9CiAgICAgdm9pZCBzZXRNYXJxdWVlU3BlZWQoaW50IGYpIHsgU0VUX1ZBUihyYXJl Tm9uSW5oZXJpdGVkRGF0YS5hY2Nlc3MoKS0+bV9tYXJxdWVlLCBzcGVlZCwgZik7IH0KICAgICB2 b2lkIHNldE1hcnF1ZWVEaXJlY3Rpb24oRU1hcnF1ZWVEaXJlY3Rpb24gZCkgeyBTRVRfVkFSKHJh cmVOb25Jbmhlcml0ZWREYXRhLmFjY2VzcygpLT5tX21hcnF1ZWUsIGRpcmVjdGlvbiwgZCk7IH0K ICAgICB2b2lkIHNldE1hcnF1ZWVCZWhhdmlvcihFTWFycXVlZUJlaGF2aW9yIGIpIHsgU0VUX1ZB UihyYXJlTm9uSW5oZXJpdGVkRGF0YS5hY2Nlc3MoKS0+bV9tYXJxdWVlLCBiZWhhdmlvciwgYik7 IH0K