169153 2017-03-03 16:05:34 -0800 Clean up RenderImage and a RenderImageResource function 2017-03-03 17:45:08 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 simon.fraser simon.fraser commit-queue esprehn+autocc glenn kondapallykalyan simon.fraser oldest_to_newest 1283285 0 simon.fraser 2017-03-03 16:05:34 -0800 Clean up RenderImage and a RenderImageResource function 1283286 1 303351 simon.fraser 2017-03-03 16:08:48 -0800 Created attachment 303351 Patch 1283288 2 303351 zalan 2017-03-03 16:14:06 -0800 Comment on attachment 303351 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=303351&action=review auto pls. > Source/WebCore/rendering/RenderImageResourceStyleImage.h:46 > + RefPtr<Image> image(const IntSize& = { }) const override; What's the current recommendation on passing const reference vs. value? InSize has 2 ints. 1283335 3 simon.fraser 2017-03-03 17:45:08 -0800 https://trac.webkit.org/r213404 303351 2017-03-03 16:08:48 -0800 2017-03-03 16:14:06 -0800 Patch bug-169153-20170303160847.patch text/plain 15918 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjEzMjI3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMGZiNGJjODkxNWFiYTNh ZjA1NWM0ZTY4YjU2ZjY5YTI3ODhmM2EyOS4uNjBlZmMyYjAwMDk5MmM1OWQ2NmYzZjNiMzk0Mzhj OGVkNGVkNzhiMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM4IEBACisyMDE3LTAzLTAzICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIENsZWFuIHVwIFJl bmRlckltYWdlIGFuZCBhIFJlbmRlckltYWdlUmVzb3VyY2UgZnVuY3Rpb24KKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE2OTE1MworCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorICAgICAgICAKKyAgICAgICAgQ2hhbmdlIGFsbCBj YWxscyB0byBpbWFnZVJlc291cmNlKCkuY2FjaGVkSW1hZ2UoKSBpbiBSZW5kZXJJbWFnZSB0byB1 c2UgdGhlIGlubGluZQorICAgICAgICBjYWNoZWRJbWFnZSgpIGZ1bmN0aW9uLgorCisgICAgICAg IEluIFJlbmRlckltYWdlOjpwYWludFJlcGxhY2VkKCksIGVhcmx5IHJldHVybiBhZnRlciB0aGUg YnJva2VuIGltYWdlIGJsb2NrIChhbmQgbm8gbmVlZAorICAgICAgICB0byB0ZXN0IGltYWdlUmVz b3VyY2UoKS5oYXNJbWFnZSgpIGFnYWluIGluIHRoZSBzZWNvbmQgY29uZGl0aW9uKS4gQ29udmVy dCBoZWlnaHQvd2lkdGggdG8gc2l6ZSwKKyAgICAgICAgd2hpY2ggYWxzbyBmb3JjZXMgdXMgdG8g YmUgZXhwbGljaXQgYWJvdXQgdXNpbmcgZmxvb3JlZEludFNpemUoKSB3aGVuIGZldGNoaW5nIHRo ZSBpbWFnZQorICAgICAgICAocGVyaGFwcyB0aGlzIHNob3VsZCBiZSBhIHJvdW5kZWRJbnRTaXpl LCBidXQgSSBkaWRuJ3Qgd2FudCB0byBjaGFuZ2UgYmVoYXZpb3IpLgorCisgICAgICAgIENoYW5n ZSBSZW5kZXJJbWFnZVJlc291cmNlOjppbWFnZSgpIHRvIHRha2UgYW4gSW50U2l6ZSwgcmF0aGVy IHRoYW4gaW50IGhlaWdodCBhbmQgd2lkdGguCisKKyAgICAgICAgTm8gYmVoYXZpb3IgY2hhbmdl LgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckltYWdlLmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OlJlbmRlckltYWdlOjpzdHlsZURpZENoYW5nZSk6CisgICAgICAgIChXZWJDb3JlOjpSZW5k ZXJJbWFnZTo6aW1hZ2VDaGFuZ2VkKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckltYWdlOjpu b3RpZnlGaW5pc2hlZCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJJbWFnZTo6cGFpbnRSZXBs YWNlZCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJJbWFnZTo6cGFpbnRJbnRvUmVjdCk6Cisg ICAgICAgIChXZWJDb3JlOjpSZW5kZXJJbWFnZTo6Zm9yZWdyb3VuZElzS25vd25Ub0JlT3BhcXVl SW5SZWN0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckltYWdlOjplbWJlZGRlZENvbnRlbnRC b3gpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJJbWFnZVJlc291cmNlLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OlJlbmRlckltYWdlUmVzb3VyY2U6OmltYWdlKToKKyAgICAgICAgKiByZW5k ZXJpbmcvUmVuZGVySW1hZ2VSZXNvdXJjZS5oOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVySW1h Z2VSZXNvdXJjZTo6aW1hZ2UpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJJbWFnZVJlc291 cmNlU3R5bGVJbWFnZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJJbWFnZVJlc291cmNl U3R5bGVJbWFnZTo6aW1hZ2UpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJJbWFnZVJlc291 cmNlU3R5bGVJbWFnZS5oOgorCiAyMDE3LTAzLTAxICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFz ZXJAYXBwbGUuY29tPgogCiAgICAgICAgIFRyeSB0byBmaXggV2luZG93cyBidWlsZCBhZnRlciBy MjEzMTkxLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckltYWdl LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJJbWFnZS5jcHAKaW5kZXggOTVm MThkZmUzYmFiYzVkOTIxMTEzZWI3MmI2ZjVmYTI4YWZjZTRhYi4uN2EzM2JhYjhhOWM5MmMwMTlj NGZjYmI5Y2Y1NDQxNGNhMzUzMzg0YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlckltYWdlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy SW1hZ2UuY3BwCkBAIC0yMTAsNyArMjEwLDcgQEAgdm9pZCBSZW5kZXJJbWFnZTo6c3R5bGVEaWRD aGFuZ2UoU3R5bGVEaWZmZXJlbmNlIGRpZmYsIGNvbnN0IFJlbmRlclN0eWxlKiBvbGRTdHkKIHsK ICAgICBSZW5kZXJSZXBsYWNlZDo6c3R5bGVEaWRDaGFuZ2UoZGlmZiwgb2xkU3R5bGUpOwogICAg IGlmIChtX25lZWRzVG9TZXRTaXplRm9yQWx0VGV4dCkgewotICAgICAgICBpZiAoIW1fYWx0VGV4 dC5pc0VtcHR5KCkgJiYgc2V0SW1hZ2VTaXplRm9yQWx0VGV4dChpbWFnZVJlc291cmNlKCkuY2Fj aGVkSW1hZ2UoKSkpCisgICAgICAgIGlmICghbV9hbHRUZXh0LmlzRW1wdHkoKSAmJiBzZXRJbWFn ZVNpemVGb3JBbHRUZXh0KGNhY2hlZEltYWdlKCkpKQogICAgICAgICAgICAgcmVwYWludE9yTWFy a0ZvckxheW91dChJbWFnZVNpemVDaGFuZ2VGb3JBbHRUZXh0KTsKICAgICAgICAgbV9uZWVkc1Rv U2V0U2l6ZUZvckFsdFRleHQgPSBmYWxzZTsKICAgICB9CkBAIC0yNTcsNyArMjU3LDcgQEAgdm9p ZCBSZW5kZXJJbWFnZTo6aW1hZ2VDaGFuZ2VkKFdyYXBwZWRJbWFnZVB0ciBuZXdJbWFnZSwgY29u c3QgSW50UmVjdCogcmVjdCkKICAgICAgICAgICAgIH0KICAgICAgICAgICAgIHJldHVybjsKICAg ICAgICAgfQotICAgICAgICBpbWFnZVNpemVDaGFuZ2UgPSBzZXRJbWFnZVNpemVGb3JBbHRUZXh0 KGltYWdlUmVzb3VyY2UoKS5jYWNoZWRJbWFnZSgpKTsKKyAgICAgICAgaW1hZ2VTaXplQ2hhbmdl ID0gc2V0SW1hZ2VTaXplRm9yQWx0VGV4dChjYWNoZWRJbWFnZSgpKTsKICAgICB9CiAKICAgICBp ZiAoVU5MSUtFTFkoQVhPYmplY3RDYWNoZTo6YWNjZXNzaWJpbGl0eUVuYWJsZWQoKSkpIHsKQEAg LTM0Miw3ICszNDIsNyBAQCB2b2lkIFJlbmRlckltYWdlOjpub3RpZnlGaW5pc2hlZChDYWNoZWRS ZXNvdXJjZSYgbmV3SW1hZ2UpCiAKICAgICBpbnZhbGlkYXRlQmFja2dyb3VuZE9ic2N1cmF0aW9u U3RhdHVzKCk7CiAKLSAgICBpZiAoJm5ld0ltYWdlID09IGltYWdlUmVzb3VyY2UoKS5jYWNoZWRJ bWFnZSgpKSB7CisgICAgaWYgKCZuZXdJbWFnZSA9PSBjYWNoZWRJbWFnZSgpKSB7CiAgICAgICAg IC8vIHRlbGwgYW55IHBvdGVudGlhbCBjb21wb3NpdGluZyBsYXllcnMKICAgICAgICAgLy8gdGhh dCB0aGUgaW1hZ2UgaXMgZG9uZSBhbmQgdGhleSBjYW4gcmVmZXJlbmNlIGl0IGRpcmVjdGx5Lgog ICAgICAgICBjb250ZW50Q2hhbmdlZChJbWFnZUNoYW5nZWQpOwpAQCAtMzUxLDEyICszNTEsNyBA QCB2b2lkIFJlbmRlckltYWdlOjpub3RpZnlGaW5pc2hlZChDYWNoZWRSZXNvdXJjZSYgbmV3SW1h Z2UpCiAKIHZvaWQgUmVuZGVySW1hZ2U6OnBhaW50UmVwbGFjZWQoUGFpbnRJbmZvJiBwYWludElu Zm8sIGNvbnN0IExheW91dFBvaW50JiBwYWludE9mZnNldCkKIHsKLSAgICBMYXlvdXRVbml0IGNX aWR0aCA9IGNvbnRlbnRXaWR0aCgpOwotICAgIExheW91dFVuaXQgY0hlaWdodCA9IGNvbnRlbnRI ZWlnaHQoKTsKLSAgICBMYXlvdXRVbml0IGxlZnRCb3JkZXIgPSBib3JkZXJMZWZ0KCk7Ci0gICAg TGF5b3V0VW5pdCB0b3BCb3JkZXIgPSBib3JkZXJUb3AoKTsKLSAgICBMYXlvdXRVbml0IGxlZnRQ YWQgPSBwYWRkaW5nTGVmdCgpOwotICAgIExheW91dFVuaXQgdG9wUGFkID0gcGFkZGluZ1RvcCgp OworICAgIExheW91dFNpemUgY29udGVudFNpemUgPSB0aGlzLT5jb250ZW50U2l6ZSgpOwogCiAg ICAgR3JhcGhpY3NDb250ZXh0JiBjb250ZXh0ID0gcGFpbnRJbmZvLmNvbnRleHQoKTsKICAgICBm bG9hdCBkZXZpY2VTY2FsZUZhY3RvciA9IGRvY3VtZW50KCkuZGV2aWNlU2NhbGVGYWN0b3IoKTsK QEAgLTM2OCwzNSArMzYzLDM5IEBAIHZvaWQgUmVuZGVySW1hZ2U6OnBhaW50UmVwbGFjZWQoUGFp bnRJbmZvJiBwYWludEluZm8sIGNvbnN0IExheW91dFBvaW50JiBwYWludE9mCiAgICAgICAgIGlm IChwYWludEluZm8ucGhhc2UgPT0gUGFpbnRQaGFzZUZvcmVncm91bmQpCiAgICAgICAgICAgICBw YWdlKCkuYWRkUmVsZXZhbnRVbnBhaW50ZWRPYmplY3QodGhpcywgdmlzdWFsT3ZlcmZsb3dSZWN0 KCkpOwogCi0gICAgICAgIGlmIChjV2lkdGggPiAyICYmIGNIZWlnaHQgPiAyKSB7CisgICAgICAg IGlmIChjb250ZW50U2l6ZS53aWR0aCgpID4gMiAmJiBjb250ZW50U2l6ZS5oZWlnaHQoKSA+IDIp IHsKICAgICAgICAgICAgIExheW91dFVuaXQgYm9yZGVyV2lkdGggPSBMYXlvdXRVbml0KDEgLyBk ZXZpY2VTY2FsZUZhY3Rvcik7CiAKKyAgICAgICAgICAgIExheW91dFVuaXQgbGVmdEJvcmRlciA9 IGJvcmRlckxlZnQoKTsKKyAgICAgICAgICAgIExheW91dFVuaXQgdG9wQm9yZGVyID0gYm9yZGVy VG9wKCk7CisgICAgICAgICAgICBMYXlvdXRVbml0IGxlZnRQYWQgPSBwYWRkaW5nTGVmdCgpOwor ICAgICAgICAgICAgTGF5b3V0VW5pdCB0b3BQYWQgPSBwYWRkaW5nVG9wKCk7CisKICAgICAgICAg ICAgIC8vIERyYXcgYW4gb3V0bGluZSByZWN0IHdoZXJlIHRoZSBpbWFnZSBzaG91bGQgYmUuCiAg ICAgICAgICAgICBjb250ZXh0LnNldFN0cm9rZVN0eWxlKFNvbGlkU3Ryb2tlKTsKICAgICAgICAg ICAgIGNvbnRleHQuc2V0U3Ryb2tlQ29sb3IoQ29sb3I6OmxpZ2h0R3JheSk7CiAgICAgICAgICAg ICBjb250ZXh0LnNldEZpbGxDb2xvcihDb2xvcjo6dHJhbnNwYXJlbnQpOwotICAgICAgICAgICAg Y29udGV4dC5kcmF3UmVjdChzbmFwUmVjdFRvRGV2aWNlUGl4ZWxzKExheW91dFJlY3QocGFpbnRP ZmZzZXQueCgpICsgbGVmdEJvcmRlciArIGxlZnRQYWQsIHBhaW50T2Zmc2V0LnkoKSArIHRvcEJv cmRlciArIHRvcFBhZCwgY1dpZHRoLCBjSGVpZ2h0KSwgZGV2aWNlU2NhbGVGYWN0b3IpLCBib3Jk ZXJXaWR0aCk7CisgICAgICAgICAgICBjb250ZXh0LmRyYXdSZWN0KHNuYXBSZWN0VG9EZXZpY2VQ aXhlbHMoTGF5b3V0UmVjdCh7IHBhaW50T2Zmc2V0LngoKSArIGxlZnRCb3JkZXIgKyBsZWZ0UGFk LCBwYWludE9mZnNldC55KCkgKyB0b3BCb3JkZXIgKyB0b3BQYWQgfSwgY29udGVudFNpemUpLCBk ZXZpY2VTY2FsZUZhY3RvciksIGJvcmRlcldpZHRoKTsKIAogICAgICAgICAgICAgYm9vbCBlcnJv clBpY3R1cmVEcmF3biA9IGZhbHNlOwogICAgICAgICAgICAgTGF5b3V0U2l6ZSBpbWFnZU9mZnNl dDsKICAgICAgICAgICAgIC8vIFdoZW4gY2FsY3VsYXRpbmcgdGhlIHVzYWJsZSBkaW1lbnNpb25z LCBleGNsdWRlIHRoZSBwaXhlbHMgb2YKICAgICAgICAgICAgIC8vIHRoZSBvdWxpbmUgcmVjdCBz byB0aGUgZXJyb3IgaW1hZ2UvYWx0IHRleHQgZG9lc24ndCBkcmF3IG9uIGl0LgotICAgICAgICAg ICAgTGF5b3V0VW5pdCB1c2FibGVXaWR0aCA9IGNXaWR0aCAtIDIgKiBib3JkZXJXaWR0aDsKLSAg ICAgICAgICAgIExheW91dFVuaXQgdXNhYmxlSGVpZ2h0ID0gY0hlaWdodCAtIDIgKiBib3JkZXJX aWR0aDsKKyAgICAgICAgICAgIExheW91dFNpemUgdXNhYmxlU2l6ZSA9IGNvbnRlbnRTaXplIC0g TGF5b3V0U2l6ZSgyICogYm9yZGVyV2lkdGgsIDIgKiBib3JkZXJXaWR0aCk7CiAKICAgICAgICAg ICAgIFJlZlB0cjxJbWFnZT4gaW1hZ2UgPSBpbWFnZVJlc291cmNlKCkuaW1hZ2UoKTsKIAotICAg ICAgICAgICAgaWYgKGltYWdlUmVzb3VyY2UoKS5lcnJvck9jY3VycmVkKCkgJiYgIWltYWdlLT5p c051bGwoKSAmJiB1c2FibGVXaWR0aCA+PSBpbWFnZS0+d2lkdGgoKSAmJiB1c2FibGVIZWlnaHQg Pj0gaW1hZ2UtPmhlaWdodCgpKSB7CisgICAgICAgICAgICBpZiAoaW1hZ2VSZXNvdXJjZSgpLmVy cm9yT2NjdXJyZWQoKSAmJiAhaW1hZ2UtPmlzTnVsbCgpICYmIHVzYWJsZVNpemUud2lkdGgoKSA+ PSBpbWFnZS0+d2lkdGgoKSAmJiB1c2FibGVTaXplLmhlaWdodCgpID49IGltYWdlLT5oZWlnaHQo KSkgewogICAgICAgICAgICAgICAgIC8vIENhbGwgYnJva2VuSW1hZ2UoKSBleHBsaWNpdGx5IHRv IGVuc3VyZSB3ZSBnZXQgdGhlIGJyb2tlbiBpbWFnZSBpY29uIGF0IHRoZSBhcHByb3ByaWF0ZSBy ZXNvbHV0aW9uLgotICAgICAgICAgICAgICAgIHN0ZDo6cGFpcjxJbWFnZSosIGZsb2F0PiBicm9r ZW5JbWFnZUFuZEltYWdlU2NhbGVGYWN0b3IgPSBpbWFnZVJlc291cmNlKCkuY2FjaGVkSW1hZ2Uo KS0+YnJva2VuSW1hZ2UoZG9jdW1lbnQoKS5kZXZpY2VTY2FsZUZhY3RvcigpKTsKKyAgICAgICAg ICAgICAgICBzdGQ6OnBhaXI8SW1hZ2UqLCBmbG9hdD4gYnJva2VuSW1hZ2VBbmRJbWFnZVNjYWxl RmFjdG9yID0gY2FjaGVkSW1hZ2UoKS0+YnJva2VuSW1hZ2UoZG9jdW1lbnQoKS5kZXZpY2VTY2Fs ZUZhY3RvcigpKTsKICAgICAgICAgICAgICAgICBpbWFnZSA9IGJyb2tlbkltYWdlQW5kSW1hZ2VT Y2FsZUZhY3Rvci5maXJzdDsKICAgICAgICAgICAgICAgICBGbG9hdFNpemUgaW1hZ2VTaXplID0g aW1hZ2UtPnNpemUoKTsKICAgICAgICAgICAgICAgICBpbWFnZVNpemUuc2NhbGUoMSAvIGJyb2tl bkltYWdlQW5kSW1hZ2VTY2FsZUZhY3Rvci5zZWNvbmQpOwogICAgICAgICAgICAgICAgIC8vIENl bnRlciB0aGUgZXJyb3IgaW1hZ2UsIGFjY291bnRpbmcgZm9yIGJvcmRlciBhbmQgcGFkZGluZy4K LSAgICAgICAgICAgICAgICBMYXlvdXRVbml0IGNlbnRlclggPSAodXNhYmxlV2lkdGggLSBpbWFn ZVNpemUud2lkdGgoKSkgLyAyOworICAgICAgICAgICAgICAgIExheW91dFVuaXQgY2VudGVyWCA9 ICh1c2FibGVTaXplLndpZHRoKCkgLSBpbWFnZVNpemUud2lkdGgoKSkgLyAyOwogICAgICAgICAg ICAgICAgIGlmIChjZW50ZXJYIDwgMCkKICAgICAgICAgICAgICAgICAgICAgY2VudGVyWCA9IDA7 Ci0gICAgICAgICAgICAgICAgTGF5b3V0VW5pdCBjZW50ZXJZID0gKHVzYWJsZUhlaWdodCAtIGlt YWdlU2l6ZS5oZWlnaHQoKSkgLyAyOworICAgICAgICAgICAgICAgIExheW91dFVuaXQgY2VudGVy WSA9ICh1c2FibGVTaXplLmhlaWdodCgpIC0gaW1hZ2VTaXplLmhlaWdodCgpKSAvIDI7CiAgICAg ICAgICAgICAgICAgaWYgKGNlbnRlclkgPCAwKQogICAgICAgICAgICAgICAgICAgICBjZW50ZXJZ ID0gMDsKICAgICAgICAgICAgICAgICBpbWFnZU9mZnNldCA9IExheW91dFNpemUobGVmdEJvcmRl ciArIGxlZnRQYWQgKyBjZW50ZXJYICsgYm9yZGVyV2lkdGgsIHRvcEJvcmRlciArIHRvcFBhZCAr IGNlbnRlclkgKyBib3JkZXJXaWR0aCk7CkBAIC00MjMsNDAgKzQyMiw0NCBAQCB2b2lkIFJlbmRl ckltYWdlOjpwYWludFJlcGxhY2VkKFBhaW50SW5mbyYgcGFpbnRJbmZvLCBjb25zdCBMYXlvdXRQ b2ludCYgcGFpbnRPZgogICAgICAgICAgICAgICAgIFRleHRSdW4gdGV4dFJ1biA9IFJlbmRlckJs b2NrOjpjb25zdHJ1Y3RUZXh0UnVuKHRleHQsIHN0eWxlKCkpOwogICAgICAgICAgICAgICAgIExh eW91dFVuaXQgdGV4dFdpZHRoID0gZm9udC53aWR0aCh0ZXh0UnVuKTsKICAgICAgICAgICAgICAg ICBpZiAoZXJyb3JQaWN0dXJlRHJhd24pIHsKLSAgICAgICAgICAgICAgICAgICAgaWYgKHVzYWJs ZVdpZHRoID49IHRleHRXaWR0aCAmJiBmb250TWV0cmljcy5oZWlnaHQoKSA8PSBpbWFnZU9mZnNl dC5oZWlnaHQoKSkKKyAgICAgICAgICAgICAgICAgICAgaWYgKHVzYWJsZVNpemUud2lkdGgoKSA+ PSB0ZXh0V2lkdGggJiYgZm9udE1ldHJpY3MuaGVpZ2h0KCkgPD0gaW1hZ2VPZmZzZXQuaGVpZ2h0 KCkpCiAgICAgICAgICAgICAgICAgICAgICAgICBjb250ZXh0LmRyYXdUZXh0KGZvbnQsIHRleHRS dW4sIGFsdFRleHRPZmZzZXQpOwotICAgICAgICAgICAgICAgIH0gZWxzZSBpZiAodXNhYmxlV2lk dGggPj0gdGV4dFdpZHRoICYmIHVzYWJsZUhlaWdodCA+PSBmb250TWV0cmljcy5oZWlnaHQoKSkK KyAgICAgICAgICAgICAgICB9IGVsc2UgaWYgKHVzYWJsZVNpemUud2lkdGgoKSA+PSB0ZXh0V2lk dGggJiYgdXNhYmxlU2l6ZS5oZWlnaHQoKSA+PSBmb250TWV0cmljcy5oZWlnaHQoKSkKICAgICAg ICAgICAgICAgICAgICAgY29udGV4dC5kcmF3VGV4dChmb250LCB0ZXh0UnVuLCBhbHRUZXh0T2Zm c2V0KTsKICAgICAgICAgICAgIH0KICAgICAgICAgfQotICAgIH0gZWxzZSBpZiAoaW1hZ2VSZXNv dXJjZSgpLmhhc0ltYWdlKCkgJiYgY1dpZHRoID4gMCAmJiBjSGVpZ2h0ID4gMCkgewotICAgICAg ICBSZWZQdHI8SW1hZ2U+IGltZyA9IGltYWdlUmVzb3VyY2UoKS5pbWFnZShjV2lkdGgsIGNIZWln aHQpOwotICAgICAgICBpZiAoIWltZyB8fCBpbWctPmlzTnVsbCgpKSB7Ci0gICAgICAgICAgICBp ZiAocGFpbnRJbmZvLnBoYXNlID09IFBhaW50UGhhc2VGb3JlZ3JvdW5kKQotICAgICAgICAgICAg ICAgIHBhZ2UoKS5hZGRSZWxldmFudFVucGFpbnRlZE9iamVjdCh0aGlzLCB2aXN1YWxPdmVyZmxv d1JlY3QoKSk7Ci0gICAgICAgICAgICByZXR1cm47Ci0gICAgICAgIH0KKyAgICAgICAgcmV0dXJu OworICAgIH0KKyAgICAKKyAgICBpZiAoY29udGVudFNpemUuaXNFbXB0eSgpKQorICAgICAgICBy ZXR1cm47CiAKLSAgICAgICAgTGF5b3V0UmVjdCBjb250ZW50Qm94UmVjdCA9IHRoaXMtPmNvbnRl bnRCb3hSZWN0KCk7Ci0gICAgICAgIGNvbnRlbnRCb3hSZWN0Lm1vdmVCeShwYWludE9mZnNldCk7 Ci0gICAgICAgIExheW91dFJlY3QgcmVwbGFjZWRDb250ZW50UmVjdCA9IHRoaXMtPnJlcGxhY2Vk Q29udGVudFJlY3QoaW50cmluc2ljU2l6ZSgpKTsKLSAgICAgICAgcmVwbGFjZWRDb250ZW50UmVj dC5tb3ZlQnkocGFpbnRPZmZzZXQpOwotICAgICAgICBib29sIGNsaXAgPSAhY29udGVudEJveFJl Y3QuY29udGFpbnMocmVwbGFjZWRDb250ZW50UmVjdCk7Ci0gICAgICAgIEdyYXBoaWNzQ29udGV4 dFN0YXRlU2F2ZXIgc3RhdGVTYXZlcihjb250ZXh0LCBjbGlwKTsKLSAgICAgICAgaWYgKGNsaXAp Ci0gICAgICAgICAgICBjb250ZXh0LmNsaXAoY29udGVudEJveFJlY3QpOworICAgIFJlZlB0cjxJ bWFnZT4gaW1nID0gaW1hZ2VSZXNvdXJjZSgpLmltYWdlKGZsb29yZWRJbnRTaXplKGNvbnRlbnRT aXplKSk7CisgICAgaWYgKCFpbWcgfHwgaW1nLT5pc051bGwoKSkgeworICAgICAgICBpZiAocGFp bnRJbmZvLnBoYXNlID09IFBhaW50UGhhc2VGb3JlZ3JvdW5kKQorICAgICAgICAgICAgcGFnZSgp LmFkZFJlbGV2YW50VW5wYWludGVkT2JqZWN0KHRoaXMsIHZpc3VhbE92ZXJmbG93UmVjdCgpKTsK KyAgICAgICAgcmV0dXJuOworICAgIH0KIAotICAgICAgICBwYWludEludG9SZWN0KGNvbnRleHQs IHNuYXBSZWN0VG9EZXZpY2VQaXhlbHMocmVwbGFjZWRDb250ZW50UmVjdCwgZGV2aWNlU2NhbGVG YWN0b3IpKTsKLSAgICAgICAgCi0gICAgICAgIGlmIChjYWNoZWRJbWFnZSgpICYmIHBhaW50SW5m by5waGFzZSA9PSBQYWludFBoYXNlRm9yZWdyb3VuZCkgewotICAgICAgICAgICAgLy8gRm9yIG5v dywgY291bnQgaW1hZ2VzIGFzIHVucGFpbnRlZCBpZiB0aGV5IGFyZSBzdGlsbCBwcm9ncmVzc2l2 ZWx5IGxvYWRpbmcuIFdlIG1heSB3YW50IAotICAgICAgICAgICAgLy8gdG8gcmVmaW5lIHRoaXMg aW4gdGhlIGZ1dHVyZSB0byBhY2NvdW50IGZvciB0aGUgcG9ydGlvbiBvZiB0aGUgaW1hZ2UgdGhh dCBoYXMgcGFpbnRlZC4KLSAgICAgICAgICAgIExheW91dFJlY3QgdmlzaWJsZVJlY3QgPSBpbnRl cnNlY3Rpb24ocmVwbGFjZWRDb250ZW50UmVjdCwgY29udGVudEJveFJlY3QpOwotICAgICAgICAg ICAgaWYgKGNhY2hlZEltYWdlKCktPmlzTG9hZGluZygpKQotICAgICAgICAgICAgICAgIHBhZ2Uo KS5hZGRSZWxldmFudFVucGFpbnRlZE9iamVjdCh0aGlzLCB2aXNpYmxlUmVjdCk7Ci0gICAgICAg ICAgICBlbHNlCi0gICAgICAgICAgICAgICAgcGFnZSgpLmFkZFJlbGV2YW50UmVwYWludGVkT2Jq ZWN0KHRoaXMsIHZpc2libGVSZWN0KTsKLSAgICAgICAgfQorICAgIExheW91dFJlY3QgY29udGVu dEJveFJlY3QgPSB0aGlzLT5jb250ZW50Qm94UmVjdCgpOworICAgIGNvbnRlbnRCb3hSZWN0Lm1v dmVCeShwYWludE9mZnNldCk7CisgICAgTGF5b3V0UmVjdCByZXBsYWNlZENvbnRlbnRSZWN0ID0g dGhpcy0+cmVwbGFjZWRDb250ZW50UmVjdChpbnRyaW5zaWNTaXplKCkpOworICAgIHJlcGxhY2Vk Q29udGVudFJlY3QubW92ZUJ5KHBhaW50T2Zmc2V0KTsKKyAgICBib29sIGNsaXAgPSAhY29udGVu dEJveFJlY3QuY29udGFpbnMocmVwbGFjZWRDb250ZW50UmVjdCk7CisgICAgR3JhcGhpY3NDb250 ZXh0U3RhdGVTYXZlciBzdGF0ZVNhdmVyKGNvbnRleHQsIGNsaXApOworICAgIGlmIChjbGlwKQor ICAgICAgICBjb250ZXh0LmNsaXAoY29udGVudEJveFJlY3QpOworCisgICAgcGFpbnRJbnRvUmVj dChjb250ZXh0LCBzbmFwUmVjdFRvRGV2aWNlUGl4ZWxzKHJlcGxhY2VkQ29udGVudFJlY3QsIGRl dmljZVNjYWxlRmFjdG9yKSk7CisgICAgCisgICAgaWYgKGNhY2hlZEltYWdlKCkgJiYgcGFpbnRJ bmZvLnBoYXNlID09IFBhaW50UGhhc2VGb3JlZ3JvdW5kKSB7CisgICAgICAgIC8vIEZvciBub3cs IGNvdW50IGltYWdlcyBhcyB1bnBhaW50ZWQgaWYgdGhleSBhcmUgc3RpbGwgcHJvZ3Jlc3NpdmVs eSBsb2FkaW5nLiBXZSBtYXkgd2FudCAKKyAgICAgICAgLy8gdG8gcmVmaW5lIHRoaXMgaW4gdGhl IGZ1dHVyZSB0byBhY2NvdW50IGZvciB0aGUgcG9ydGlvbiBvZiB0aGUgaW1hZ2UgdGhhdCBoYXMg cGFpbnRlZC4KKyAgICAgICAgTGF5b3V0UmVjdCB2aXNpYmxlUmVjdCA9IGludGVyc2VjdGlvbihy ZXBsYWNlZENvbnRlbnRSZWN0LCBjb250ZW50Qm94UmVjdCk7CisgICAgICAgIGlmIChjYWNoZWRJ bWFnZSgpLT5pc0xvYWRpbmcoKSkKKyAgICAgICAgICAgIHBhZ2UoKS5hZGRSZWxldmFudFVucGFp bnRlZE9iamVjdCh0aGlzLCB2aXNpYmxlUmVjdCk7CisgICAgICAgIGVsc2UKKyAgICAgICAgICAg IHBhZ2UoKS5hZGRSZWxldmFudFJlcGFpbnRlZE9iamVjdCh0aGlzLCB2aXNpYmxlUmVjdCk7CiAg ICAgfQogfQogCkBAIC01MzYsNyArNTM5LDcgQEAgdm9pZCBSZW5kZXJJbWFnZTo6cGFpbnRJbnRv UmVjdChHcmFwaGljc0NvbnRleHQmIGNvbnRleHQsIGNvbnN0IEZsb2F0UmVjdCYgcmVjdCkKICAg ICBpZiAoIWltYWdlUmVzb3VyY2UoKS5oYXNJbWFnZSgpIHx8IGltYWdlUmVzb3VyY2UoKS5lcnJv ck9jY3VycmVkKCkgfHwgcmVjdC53aWR0aCgpIDw9IDAgfHwgcmVjdC5oZWlnaHQoKSA8PSAwKQog ICAgICAgICByZXR1cm47CiAKLSAgICBSZWZQdHI8SW1hZ2U+IGltZyA9IGltYWdlUmVzb3VyY2Uo KS5pbWFnZShyZWN0LndpZHRoKCksIHJlY3QuaGVpZ2h0KCkpOworICAgIFJlZlB0cjxJbWFnZT4g aW1nID0gaW1hZ2VSZXNvdXJjZSgpLmltYWdlKGZsb29yZWRJbnRTaXplKHJlY3Quc2l6ZSgpKSk7 CiAgICAgaWYgKCFpbWcgfHwgaW1nLT5pc051bGwoKSkKICAgICAgICAgcmV0dXJuOwogCkBAIC01 NjksNyArNTcyLDcgQEAgYm9vbCBSZW5kZXJJbWFnZTo6Zm9yZWdyb3VuZElzS25vd25Ub0JlT3Bh cXVlSW5SZWN0KGNvbnN0IExheW91dFJlY3QmIGxvY2FsUmVjdCwKICAgICBVTlVTRURfUEFSQU0o bWF4RGVwdGhUb1Rlc3QpOwogICAgIGlmICghaW1hZ2VSZXNvdXJjZSgpLmhhc0ltYWdlKCkgfHwg aW1hZ2VSZXNvdXJjZSgpLmVycm9yT2NjdXJyZWQoKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwot ICAgIGlmIChpbWFnZVJlc291cmNlKCkuY2FjaGVkSW1hZ2UoKSAmJiAhaW1hZ2VSZXNvdXJjZSgp LmNhY2hlZEltYWdlKCktPmlzTG9hZGVkKCkpCisgICAgaWYgKGNhY2hlZEltYWdlKCkgJiYgIWNh Y2hlZEltYWdlKCktPmlzTG9hZGVkKCkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICBpZiAo IWNvbnRlbnRCb3hSZWN0KCkuY29udGFpbnMobG9jYWxSZWN0KSkKICAgICAgICAgcmV0dXJuIGZh bHNlOwpAQCAtNTkwLDcgKzU5Myw3IEBAIGJvb2wgUmVuZGVySW1hZ2U6OmZvcmVncm91bmRJc0tu b3duVG9CZU9wYXF1ZUluUmVjdChjb25zdCBMYXlvdXRSZWN0JiBsb2NhbFJlY3QsCiAgICAgICAg IHJldHVybiBmYWxzZTsKIAogICAgIC8vIENoZWNrIGZvciBpbWFnZSB3aXRoIGFscGhhLgotICAg IHJldHVybiBpbWFnZVJlc291cmNlKCkuY2FjaGVkSW1hZ2UoKSAmJiBpbWFnZVJlc291cmNlKCku Y2FjaGVkSW1hZ2UoKS0+Y3VycmVudEZyYW1lS25vd25Ub0JlT3BhcXVlKHRoaXMpOworICAgIHJl dHVybiBjYWNoZWRJbWFnZSgpICYmIGNhY2hlZEltYWdlKCktPmN1cnJlbnRGcmFtZUtub3duVG9C ZU9wYXF1ZSh0aGlzKTsKIH0KIAogYm9vbCBSZW5kZXJJbWFnZTo6Y29tcHV0ZUJhY2tncm91bmRJ c0tub3duVG9CZU9ic2N1cmVkKGNvbnN0IExheW91dFBvaW50JiBwYWludE9mZnNldCkKQEAgLTc0 MSw3ICs3NDQsNyBAQCBib29sIFJlbmRlckltYWdlOjpuZWVkc1ByZWZlcnJlZFdpZHRoc1JlY2Fs Y3VsYXRpb24oKSBjb25zdAogCiBSZW5kZXJCb3gqIFJlbmRlckltYWdlOjplbWJlZGRlZENvbnRl bnRCb3goKSBjb25zdAogewotICAgIENhY2hlZEltYWdlKiBjYWNoZWRJbWFnZSA9IGltYWdlUmVz b3VyY2UoKS5jYWNoZWRJbWFnZSgpOworICAgIENhY2hlZEltYWdlKiBjYWNoZWRJbWFnZSA9IHRo aXMtPmNhY2hlZEltYWdlKCk7CiAgICAgaWYgKGNhY2hlZEltYWdlICYmIGlzPFNWR0ltYWdlPihj YWNoZWRJbWFnZS0+aW1hZ2UoKSkpCiAgICAgICAgIHJldHVybiBkb3duY2FzdDxTVkdJbWFnZT4o KmNhY2hlZEltYWdlLT5pbWFnZSgpKS5lbWJlZGRlZENvbnRlbnRCb3goKTsKIApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckltYWdlUmVzb3VyY2UuY3BwIGIvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckltYWdlUmVzb3VyY2UuY3BwCmluZGV4IGI5NGYx NTlhNjNlYzgwZTNkMDdhYWM3OTFkMzUzNDA0N2FjZDIwZGEuLmJkMWU1NWU0MDc1NzkwYjc2MTBm ZDU5Y2JiZDllYjhhNjA1NGI3MGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJJbWFnZVJlc291cmNlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVySW1hZ2VSZXNvdXJjZS5jcHAKQEAgLTkyLDcgKzkyLDcgQEAgdm9pZCBSZW5kZXJJbWFn ZVJlc291cmNlOjpyZXNldEFuaW1hdGlvbigpCiAgICAgICAgIG1fcmVuZGVyZXItPnJlcGFpbnQo KTsKIH0KIAotUmVmUHRyPEltYWdlPiBSZW5kZXJJbWFnZVJlc291cmNlOjppbWFnZShpbnQsIGlu dCkgY29uc3QKK1JlZlB0cjxJbWFnZT4gUmVuZGVySW1hZ2VSZXNvdXJjZTo6aW1hZ2UoY29uc3Qg SW50U2l6ZSYpIGNvbnN0CiB7CiAgICAgcmV0dXJuIG1fY2FjaGVkSW1hZ2UgPyBtX2NhY2hlZElt YWdlLT5pbWFnZUZvclJlbmRlcmVyKG1fcmVuZGVyZXIpIDogSW1hZ2U6Om51bGxJbWFnZSgpOwog fQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckltYWdlUmVzb3Vy Y2UuaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJJbWFnZVJlc291cmNlLmgKaW5k ZXggN2RmZWIxNTcwOTFlZjgyYTViZDhlNmIyZGU5ZDM1MzgwOTZlNzg1ZC4uOGM2ZjgxOTA3NjY4 Njg1ZTc3NGU4OTE4MTM4MjMwNmM4MDM3MzQxMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlckltYWdlUmVzb3VyY2UuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVySW1hZ2VSZXNvdXJjZS5oCkBAIC00OSw3ICs0OSw3IEBAIHB1YmxpYzoKIAog ICAgIHZvaWQgcmVzZXRBbmltYXRpb24oKTsKIAotICAgIHZpcnR1YWwgUmVmUHRyPEltYWdlPiBp bWFnZShpbnQgd2lkdGggPSAwLCBpbnQgaGVpZ2h0ID0gMCkgY29uc3Q7CisgICAgdmlydHVhbCBS ZWZQdHI8SW1hZ2U+IGltYWdlKGNvbnN0IEludFNpemUmIHNpemUgPSB7IH0pIGNvbnN0OwogICAg IHZpcnR1YWwgYm9vbCBlcnJvck9jY3VycmVkKCkgY29uc3Q7CiAKICAgICB2aXJ0dWFsIHZvaWQg c2V0Q29udGFpbmVyU2l6ZUZvclJlbmRlcmVyKGNvbnN0IEludFNpemUmKTsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJJbWFnZVJlc291cmNlU3R5bGVJbWFnZS5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVySW1hZ2VSZXNvdXJjZVN0eWxlSW1h Z2UuY3BwCmluZGV4IDI4ZTM2YjE5OTg1NDdiMGY0MDAyMDEzYzkyOGYwNTY5ZDBjMzg0ZmYuLmFj M2Y0YTA5MmI1MmJhMWI0YWEwYjBlOTY4NjJlZTZhZTk1MjdiOTggMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJJbWFnZVJlc291cmNlU3R5bGVJbWFnZS5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckltYWdlUmVzb3VyY2VTdHlsZUltYWdl LmNwcApAQCAtNjMsMTIgKzYzLDEyIEBAIHZvaWQgUmVuZGVySW1hZ2VSZXNvdXJjZVN0eWxlSW1h Z2U6OnNodXRkb3duKCkKICAgICB9CiB9CiAKLVJlZlB0cjxJbWFnZT4gUmVuZGVySW1hZ2VSZXNv dXJjZVN0eWxlSW1hZ2U6OmltYWdlKGludCB3aWR0aCwgaW50IGhlaWdodCkgY29uc3QKK1JlZlB0 cjxJbWFnZT4gUmVuZGVySW1hZ2VSZXNvdXJjZVN0eWxlSW1hZ2U6OmltYWdlKGNvbnN0IEludFNp emUmIHNpemUpIGNvbnN0CiB7CiAgICAgLy8gR2VuZXJhdGVkIGNvbnRlbnQgbWF5IHRyaWdnZXIg Y2FsbHMgdG8gaW1hZ2UoKSB3aGlsZSB3ZSdyZSBzdGlsbCBwZW5kaW5nLCBkb24ndCBhc3NlcnQg YnV0IGdyYWNlZnVsbHkgZXhpdC4KICAgICBpZiAobV9zdHlsZUltYWdlLT5pc1BlbmRpbmcoKSkK ICAgICAgICAgcmV0dXJuIG51bGxwdHI7Ci0gICAgcmV0dXJuIG1fc3R5bGVJbWFnZS0+aW1hZ2Uo bV9yZW5kZXJlciwgSW50U2l6ZSh3aWR0aCwgaGVpZ2h0KSk7CisgICAgcmV0dXJuIG1fc3R5bGVJ bWFnZS0+aW1hZ2UobV9yZW5kZXJlciwgc2l6ZSk7CiB9CiAKIHZvaWQgUmVuZGVySW1hZ2VSZXNv dXJjZVN0eWxlSW1hZ2U6OnNldENvbnRhaW5lclNpemVGb3JSZW5kZXJlcihjb25zdCBJbnRTaXpl JiBzaXplKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckltYWdl UmVzb3VyY2VTdHlsZUltYWdlLmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVySW1h Z2VSZXNvdXJjZVN0eWxlSW1hZ2UuaAppbmRleCAyYWI4ZWJkOWZjOWQ5YjliMzVjZWE0YThlYTIw YzU4MThmZjAxMDQwLi41ODQwNTVjZTJhZmY4ZWMxYTE5OGVjNWMzMGU2OWViODBlMzQyOThhIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVySW1hZ2VSZXNvdXJjZVN0 eWxlSW1hZ2UuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVySW1hZ2VSZXNv dXJjZVN0eWxlSW1hZ2UuaApAQCAtNDMsNyArNDMsNyBAQCBwcml2YXRlOgogICAgIHZvaWQgc2h1 dGRvd24oKSBvdmVycmlkZTsKIAogICAgIGJvb2wgaGFzSW1hZ2UoKSBjb25zdCBvdmVycmlkZSB7 IHJldHVybiB0cnVlOyB9Ci0gICAgUmVmUHRyPEltYWdlPiBpbWFnZShpbnQgd2lkdGggPSAwLCBp bnQgaGVpZ2h0ID0gMCkgY29uc3Qgb3ZlcnJpZGU7CisgICAgUmVmUHRyPEltYWdlPiBpbWFnZShj b25zdCBJbnRTaXplJiA9IHsgfSkgY29uc3Qgb3ZlcnJpZGU7CiAgICAgYm9vbCBlcnJvck9jY3Vy cmVkKCkgY29uc3Qgb3ZlcnJpZGUgeyByZXR1cm4gbV9zdHlsZUltYWdlLT5lcnJvck9jY3VycmVk KCk7IH0KIAogICAgIHZvaWQgc2V0Q29udGFpbmVyU2l6ZUZvclJlbmRlcmVyKGNvbnN0IEludFNp emUmKSBvdmVycmlkZTsK