52321 2011-01-12 14:11:55 -0800 Frame::pageScale causes the content of compositing layers to look fuzzy 2011-01-12 14:32:44 -0800 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Mac All RESOLVED FIXED P2 Normal --- 1 cmarrin cmarrin oldest_to_newest 333283 0 cmarrin 2011-01-12 14:11:55 -0800 Calling Frame::pageScale to zoom in renders the root contents at the new size so the text looks crisp. But the contents of accelerated compositing layers does not scale, so the contents image is scaled up and looks fuzzy. We need to tell each layer with contents to scale up their contents. 333294 1 78730 cmarrin 2011-01-12 14:20:37 -0800 Created attachment 78730 Patch This was previously reviewed by Simon Fraser and Kevin Decker. 333309 2 cmarrin 2011-01-12 14:32:44 -0800 Landed in changeset http://trac.webkit.org/changeset/75639 78730 2011-01-12 14:20:37 -0800 2011-01-12 14:20:37 -0800 Patch radr8824974-1.patch text/plain 15297 cmarrin SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDc1NjEyKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsNDcgQEAKKzIwMTEtMDEtMTIgIENocmlzIE1h cnJpbiAgPGNtYXJyaW5AYXBwbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorICAgICAgICAKKyAgICAgICAgUGFnZXMgd2l0aCBhY2NlbGVyYXRlZCBsYXllcnMg bG9zZSBzdWJwaXhlbC1BQSBhbmQgYmVjb21lIGJsdXJyeSB3aGVuIGEgc2NhbGUgZmFjdG9yIGlz IGFwcGxpZWQKKyAgICAgICAgcmRhcjovL3Byb2JsZW0vODgyNDk3NAorCisgICAgICAgIFdoZW4g c2NhbGVkLCBXZWJLaXQgcmVuZGVycyB0aGUgcGFnZSBjb250ZW50IGF0IHRoZSBzY2FsZWQgdXAg c2l6ZSwgc28gdGhlcmUgYXJlIG5vCisgICAgICAgIHNjYWxpbmcgYXJ0aWZhY3RzLiBCdXQgY29u dGVudCBkcmF3biBpbnRvIGEgbGF5ZXIncyBiYWNraW5nIHN0b3JlIGRvZXMgbm90IHNjYWxlIHVw LgorICAgICAgICBUaGlzIGlzIG1hZGUgd29yc2UgYnkgdGhlIGZhY3QgdGhhdCB0aGUgcm9vdCBw YWdlIGNvbnRlbnRzIGJlY29tZSBsYXllcmVkIHdoZW4gdGhlcmUKKyAgICAgICAgYXJlIG90aGVy IGFjY2VsZXJhdGVkIGNvbXBvc2l0aW5nIGxheWVycyBwcmVzZW50ICh2aWRlbywgcGx1Z2lucywg ZXRjLikuCisgICAgICAgIAorICAgICAgICBQbHVtYiBzY2FsaW5nIGZhY3RvciBmcm9tIEZyYW1l OjpzY2FsZVBhZ2UoKSBkb3duIGludG8gYWxsIGxheWVycyB3aXRoIGNvbnRlbnQuIEl0CisgICAg ICAgIGV2ZW50dWFsbHkgY2FsbHMgQ0FMYXllcjo6c2V0Q29udGVudHNTY2FsZSB3aGljaCByZW5k ZXJzIHRvIGEgYmFja2luZyBzdG9yZSB3aG9zZSBkaW1lbnNpb25zCisgICAgICAgIGFyZSBzY2Fs ZWQsIGNhdXNpbmcgdGhlbSB0byByZW5kZXIgbGFyZ2VyIGFuZCBhcHBlYXIgcGl4ZWwgcGVyZmVj dCBhdCB0aGUgc2NhbGVkCisgICAgICAgIHBhZ2Ugc2l6ZS4KKyAKKyAgICAgICAgICogcGFnZS9G cmFtZS5jcHA6CisgICAgICAgICAoV2ViQ29yZTo6RnJhbWU6OnVwZGF0ZUNvbnRlbnRzU2NhbGUp OgorICAgICAgICAgKFdlYkNvcmU6OkZyYW1lOjpzY2FsZVBhZ2UpOgorICAgICAgICAgKiBwYWdl L0ZyYW1lLmg6CisgICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzTGF5ZXIuaDoK KyAgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2EvR3JhcGhpY3NMYXllckNBLmNwcDoKKyAg ICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0xheWVyQ0E6OnNldENvbnRlbnRzU2NhbGUpOgorICAg ICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzTGF5ZXJDQTo6Y2xhbXBlZENvbnRlbnRzU2NhbGVGb3JT Y2FsZSk6CisgICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2NhL0dyYXBoaWNzTGF5ZXJDQS5o OgorICAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzTGF5ZXJDQTo6Y29udGVudHNTY2FsZSk6Cisg ICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2NhL1BsYXRmb3JtQ0FMYXllci5oOgorICAgICAg ICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jYS9tYWMvUGxhdGZvcm1DQUxheWVyTWFjLm1tOgorICAg ICAgICAgKFBsYXRmb3JtQ0FMYXllcjo6Y29udGVudHNTY2FsZSk6CisgICAgICAgICAoUGxhdGZv cm1DQUxheWVyOjpzZXRDb250ZW50c1NjYWxlKToKKyAgICAgICAgICogcmVuZGVyaW5nL1JlbmRl ckxheWVyLmNwcDoKKyAgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllcjo6dXBkYXRlQ29udGVu dHNTY2FsZSk6CisgICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJMYXllci5oOgorICAgICAgICAg KiByZW5kZXJpbmcvUmVuZGVyTGF5ZXJCYWNraW5nLmNwcDoKKyAgICAgICAgIChXZWJDb3JlOjpS ZW5kZXJMYXllckJhY2tpbmc6OmNyZWF0ZUdyYXBoaWNzTGF5ZXIpOgorICAgICAgICAgKFdlYkNv cmU6OlJlbmRlckxheWVyQmFja2luZzo6dXBkYXRlRm9yZWdyb3VuZExheWVyKToKKyAgICAgICAg IChXZWJDb3JlOjpSZW5kZXJMYXllckJhY2tpbmc6OnVwZGF0ZU1hc2tMYXllcik6CisgICAgICAg ICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXJCYWNraW5nOjp1cGRhdGVDb250ZW50c1NjYWxlKToKKyAg ICAgICAgICogcmVuZGVyaW5nL1JlbmRlckxheWVyQmFja2luZy5oOgorICAgICAgICAgKiByZW5k ZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmNwcDoKKyAgICAgICAgIChXZWJDb3JlOjpSZW5k ZXJMYXllckNvbXBvc2l0b3I6OnVwZGF0ZUNvbnRlbnRzU2NhbGUpOgorICAgICAgICAgKiByZW5k ZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmg6CisgCiAyMDExLTAxLTEyICBZdXJ5IFNlbWlr aGF0c2t5ICA8eXVyeXNAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFVucmV2aWV3ZWQuIEZpeCBX TUwgY29tcGlsYXRpb24gb24gTWFjLgpJbmRleDogU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZS5j cHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZS5jcHAJKHJldmlzaW9u IDc1NjEyKQorKysgU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZS5jcHAJKHdvcmtpbmcgY29weSkK QEAgLTk3NSw2ICs5NzUsMTYgQEAKICAgICB9CiB9CiAKK3ZvaWQgRnJhbWU6OnVwZGF0ZUNvbnRl bnRzU2NhbGUoZmxvYXQgc2NhbGUpCit7CisgICAgZm9yIChGcmFtZSogY2hpbGQgPSB0cmVlKCkt PmZpcnN0Q2hpbGQoKTsgY2hpbGQ7IGNoaWxkID0gY2hpbGQtPnRyZWUoKS0+bmV4dFNpYmxpbmco KSkKKyAgICAgICAgY2hpbGQtPnVwZGF0ZUNvbnRlbnRzU2NhbGUoc2NhbGUpOworCisgICAgUmVu ZGVyVmlldyogcm9vdCA9IGNvbnRlbnRSZW5kZXJlcigpOworICAgIGlmIChyb290ICYmIHJvb3Qt PmNvbXBvc2l0b3IoKSkKKyAgICAgICAgcm9vdC0+Y29tcG9zaXRvcigpLT51cGRhdGVDb250ZW50 c1NjYWxlKHNjYWxlKTsKK30KKwogdm9pZCBGcmFtZTo6c2NhbGVQYWdlKGZsb2F0IHNjYWxlLCBj b25zdCBJbnRQb2ludCYgb3JpZ2luKQogewogICAgIERvY3VtZW50KiBkb2N1bWVudCA9IHRoaXMt PmRvY3VtZW50KCk7CkBAIC05ODgsNiArOTk4LDggQEAKIAogICAgIGRvY3VtZW50LT5yZWNhbGNT dHlsZShOb2RlOjpGb3JjZSk7CiAKKyAgICB1cGRhdGVDb250ZW50c1NjYWxlKHNjYWxlKTsKKwog ICAgIGlmIChGcmFtZVZpZXcqIHZpZXcgPSB0aGlzLT52aWV3KCkpIHsKICAgICAgICAgaWYgKGRv Y3VtZW50LT5yZW5kZXJlcigpICYmIGRvY3VtZW50LT5yZW5kZXJlcigpLT5uZWVkc0xheW91dCgp ICYmIHZpZXctPmRpZEZpcnN0TGF5b3V0KCkpCiAgICAgICAgICAgICB2aWV3LT5sYXlvdXQoKTsK SW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWUuaAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViQ29yZS9wYWdlL0ZyYW1lLmgJKHJldmlzaW9uIDc1NjEyKQorKysgU291cmNlL1dlYkNvcmUv cGFnZS9GcmFtZS5oCSh3b3JraW5nIGNvcHkpCkBAIC0yMDgsNiArMjA4LDggQEAKICAgICAgICAg dm9pZCBpbmplY3RVc2VyU2NyaXB0c0ZvcldvcmxkKERPTVdyYXBwZXJXb3JsZCosIGNvbnN0IFVz ZXJTY3JpcHRWZWN0b3ImLCBVc2VyU2NyaXB0SW5qZWN0aW9uVGltZSk7CiAgICAgICAgIHZvaWQg bGlmZVN1cHBvcnRUaW1lckZpcmVkKFRpbWVyPEZyYW1lPiopOwogCisgICAgICAgIHZvaWQgdXBk YXRlQ29udGVudHNTY2FsZShmbG9hdCk7CisKICAgICAgICAgSGFzaFNldDxGcmFtZURlc3RydWN0 aW9uT2JzZXJ2ZXIqPiBtX2Rlc3RydWN0aW9uT2JzZXJ2ZXJzOwogCiAgICAgICAgIFBhZ2UqIG1f cGFnZTsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhL21hYy9QbGF0 Zm9ybUNBTGF5ZXJNYWMubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvY2EvbWFjL1BsYXRmb3JtQ0FMYXllck1hYy5tbQkocmV2aXNpb24gNzU2MTIpCisr KyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYS9tYWMvUGxhdGZvcm1DQUxheWVy TWFjLm1tCSh3b3JraW5nIGNvcHkpCkBAIC03MjMsNCArNzIzLDIyIEBACiAgICAgRU5EX0JMT0NL X09CSkNfRVhDRVBUSU9OUwogfQogCitmbG9hdCBQbGF0Zm9ybUNBTGF5ZXI6OmNvbnRlbnRzU2Nh bGUoKSBjb25zdAoreworI2lmICFkZWZpbmVkKEJVSUxESU5HX09OX0xFT1BBUkQpICYmICFkZWZp bmVkKEJVSUxESU5HX09OX1NOT1dfTEVPUEFSRCkKKyAgICByZXR1cm4gW21fbGF5ZXIuZ2V0KCkg Y29udGVudHNTY2FsZV07CisjZWxzZQorICAgIHJldHVybiAxOworI2VuZGlmCit9CisKK3ZvaWQg UGxhdGZvcm1DQUxheWVyOjpzZXRDb250ZW50c1NjYWxlKGZsb2F0IHZhbHVlKQoreworI2lmICFk ZWZpbmVkKEJVSUxESU5HX09OX0xFT1BBUkQpICYmICFkZWZpbmVkKEJVSUxESU5HX09OX1NOT1df TEVPUEFSRCkKKyAgICBCRUdJTl9CTE9DS19PQkpDX0VYQ0VQVElPTlMKKyAgICBbbV9sYXllci5n ZXQoKSBzZXRDb250ZW50c1NjYWxlOnZhbHVlXTsKKyAgICBFTkRfQkxPQ0tfT0JKQ19FWENFUFRJ T05TCisjZW5kaWYKK30KKwogI2VuZGlmIC8vIFVTRShBQ0NFTEVSQVRFRF9DT01QT1NJVElORykK SW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhL0dyYXBoaWNzTGF5ZXJD QS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2Ev R3JhcGhpY3NMYXllckNBLmNwcAkocmV2aXNpb24gNzU2MTIpCisrKyBTb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9jYS9HcmFwaGljc0xheWVyQ0EuY3BwCSh3b3JraW5nIGNvcHkpCkBA IC0xODk3LDYgKzE5MDAsNDMgQEAKICAgICByZXR1cm4gKHByb3BlcnR5ID09IEFuaW1hdGVkUHJv cGVydHlCYWNrZ3JvdW5kQ29sb3IpID8gbV9jb250ZW50c0xheWVyQ2xvbmVzLmdldCgpIDogcHJp bWFyeUxheWVyQ2xvbmVzKCk7CiB9CiAKK3ZvaWQgR3JhcGhpY3NMYXllckNBOjpzZXRDb250ZW50 c1NjYWxlKGZsb2F0IHNjYWxlKQoreworICAgIGZsb2F0IG5ld1NjYWxlID0gY2xhbXBlZENvbnRl bnRzU2NhbGVGb3JTY2FsZShzY2FsZSk7CisgICAgaWYgKG5ld1NjYWxlID09IG1fY29udGVudHNT Y2FsZSkKKyAgICAgICAgcmV0dXJuOworCisgICAgbV9jb250ZW50c1NjYWxlID0gbmV3U2NhbGU7 CisgICAgbm90ZUxheWVyUHJvcGVydHlDaGFuZ2VkKENvbnRlbnRzU2NhbGVDaGFuZ2VkKTsKK30K KworZmxvYXQgR3JhcGhpY3NMYXllckNBOjpjbGFtcGVkQ29udGVudHNTY2FsZUZvclNjYWxlKGZs b2F0IHNjYWxlKSBjb25zdAoreworICAgIC8vIERlZmluZSBzb21lIGxpbWl0cyBhcyBhIHNhbml0 eSBjaGVjayBmb3IgdGhlIGluY29taW5nIHNjYWxlIHZhbHVlCisgICAgLy8gdGhvc2UgdG9vIHNt YWxsIHRvIHNlZS4KKyAgICBjb25zdCBmbG9hdCBtYXhTY2FsZSA9IDUuMGY7CisgICAgY29uc3Qg ZmxvYXQgbWluU2NhbGUgPSAwLjAxZjsKKyAgICAKKyAgICAvLyBBdm9pZCB2ZXJ5IHNsaWdodCBz Y2FsZSBjaGFuZ2VzIHRoYXQgd291bGQgYmUgZG9pbmcgZXh0cmEgd29yayBmb3Igbm8gYmVuZWZp dAorICAgIGNvbnN0IGZsb2F0IG1heEFsbG93YWJsZURlbHRhID0gMC4wNTsKKworICAgIC8vIENs YW1wCisgICAgZmxvYXQgcmVzdWx0ID0gbWF4KG1pblNjYWxlLCBtaW4oc2NhbGUsIG1heFNjYWxl KSk7CisKKyAgICAvLyBJZiBpdCBoYXNuJ3QgY2hhbmdlZCBtdWNoLCBkb24ndCBkbyBhbnkgd29y aworICAgIHJldHVybiAoKGZhYnMocmVzdWx0IC0gbV9jb250ZW50c1NjYWxlKSAvIG1fY29udGVu dHNTY2FsZSkgPCBtYXhBbGxvd2FibGVEZWx0YSkgPyBtX2NvbnRlbnRzU2NhbGUgOiByZXN1bHQ7 Cit9CisKK3ZvaWQgR3JhcGhpY3NMYXllckNBOjp1cGRhdGVDb250ZW50c1NjYWxlKCkKK3sKKyAg ICBib29sIG5lZWRUaWxlZExheWVyID0gcmVxdWlyZXNUaWxlZExheWVyKG1fc2l6ZSk7CisgICAg aWYgKG5lZWRUaWxlZExheWVyICE9IG1fdXNpbmdUaWxlZExheWVyKQorICAgICAgICBzd2FwRnJv bU9yVG9UaWxlZExheWVyKG5lZWRUaWxlZExheWVyKTsKKworICAgIG1fbGF5ZXItPnNldENvbnRl bnRzU2NhbGUobV9jb250ZW50c1NjYWxlKTsKKyAgICBtX2xheWVyLT5zZXROZWVkc0Rpc3BsYXko KTsKK30KKwogdm9pZCBHcmFwaGljc0xheWVyQ0E6OnNldERlYnVnQmFja2dyb3VuZENvbG9yKGNv bnN0IENvbG9yJiBjb2xvcikKIHsgICAgCiAgICAgaWYgKGNvbG9yLmlzVmFsaWQoKSkKQEAgLTE5 NTAsOSArMTk5MSw3IEBACiAKIHZvaWQgR3JhcGhpY3NMYXllckNBOjpzd2FwRnJvbU9yVG9UaWxl ZExheWVyKGJvb2wgdXNlVGlsZWRMYXllcikKIHsKLSAgICBpZiAodXNlVGlsZWRMYXllciA9PSBt X3VzaW5nVGlsZWRMYXllcikKLSAgICAgICAgcmV0dXJuOwotCisgICAgQVNTRVJUKHVzZVRpbGVk TGF5ZXIgIT0gbV91c2luZ1RpbGVkTGF5ZXIpOwogICAgIFJlZlB0cjxQbGF0Zm9ybUNBTGF5ZXI+ IG9sZExheWVyID0gbV9sYXllcjsKICAgICAKICAgICBtX2xheWVyID0gUGxhdGZvcm1DQUxheWVy OjpjcmVhdGUodXNlVGlsZWRMYXllciA/IFBsYXRmb3JtQ0FMYXllcjo6TGF5ZXJUeXBlV2ViVGls ZWRMYXllciA6IFBsYXRmb3JtQ0FMYXllcjo6TGF5ZXJUeXBlV2ViTGF5ZXIsIHRoaXMpOwpJbmRl eDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2EvR3JhcGhpY3NMYXllckNBLmgK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2EvR3JhcGhp Y3NMYXllckNBLmgJKHJldmlzaW9uIDc1NjEyKQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvY2EvR3JhcGhpY3NMYXllckNBLmgJKHdvcmtpbmcgY29weSkKQEAgLTU2LDYgKzU2 LDkgQEAKICAgICB2aXJ0dWFsIFBsYXRmb3JtTGF5ZXIqIHBsYXRmb3JtTGF5ZXIoKSBjb25zdDsK ICAgICB2aXJ0dWFsIFBsYXRmb3JtQ0FMYXllciogcGxhdGZvcm1DQUxheWVyKCkgY29uc3QgeyBy ZXR1cm4gcHJpbWFyeUxheWVyKCk7IH0KIAorICAgIHZpcnR1YWwgZmxvYXQgY29udGVudHNTY2Fs ZSgpIGNvbnN0IHsgcmV0dXJuIG1fY29udGVudHNTY2FsZTsgfQorICAgIHZpcnR1YWwgdm9pZCBz ZXRDb250ZW50c1NjYWxlKGZsb2F0KTsKKwogICAgIHZpcnR1YWwgYm9vbCBzZXRDaGlsZHJlbihj b25zdCBWZWN0b3I8R3JhcGhpY3NMYXllcio+Jik7CiAgICAgdmlydHVhbCB2b2lkIGFkZENoaWxk KEdyYXBoaWNzTGF5ZXIqKTsKICAgICB2aXJ0dWFsIHZvaWQgYWRkQ2hpbGRBdEluZGV4KEdyYXBo aWNzTGF5ZXIqLCBpbnQgaW5kZXgpOwpAQCAtMjc4LDYgKzI4MSw3IEBACiAgICAgdm9pZCB1cGRh dGVMYXllckFuaW1hdGlvbnMoKTsKICAgICB2b2lkIHVwZGF0ZUNvbnRlbnRzTmVlZHNEaXNwbGF5 KCk7CiAgICAgdm9pZCB1cGRhdGVBY2NlbGVyYXRlc0RyYXdpbmcoKTsKKyAgICB2b2lkIHVwZGF0 ZUNvbnRlbnRzU2NhbGUoKTsKICAgICAKICAgICBlbnVtIFN0cnVjdHVyYWxMYXllclB1cnBvc2Ug ewogICAgICAgICBOb1N0cnVjdHVyYWxMYXllciA9IDAsCkBAIC0zMjAsNyArMzI0LDggQEAKICAg ICAgICAgTWFza0xheWVyQ2hhbmdlZCA9IDEgPDwgMjEsCiAgICAgICAgIFJlcGxpY2F0ZWRMYXll ckNoYW5nZWQgPSAxIDw8IDIyLAogICAgICAgICBDb250ZW50c05lZWRzRGlzcGxheSA9IDEgPDwg MjMsCi0gICAgICAgIEFjY2VsZXJhdGVzRHJhd2luZ0NoYW5nZWQgPSAxIDw8IDI0CisgICAgICAg IEFjY2VsZXJhdGVzRHJhd2luZ0NoYW5nZWQgPSAxIDw8IDI0LAorICAgICAgICBDb250ZW50c1Nj YWxlQ2hhbmdlZCA9IDEgPDwgMjUKICAgICB9OwogICAgIHR5cGVkZWYgdW5zaWduZWQgTGF5ZXJD aGFuZ2VGbGFnczsKICAgICB2b2lkIG5vdGVMYXllclByb3BlcnR5Q2hhbmdlZChMYXllckNoYW5n ZUZsYWdzIGZsYWdzKTsKQEAgLTM5MSw2ICszOTYsOSBAQAogICAgIFZlY3RvcjxGbG9hdFJlY3Q+ IG1fZGlydHlSZWN0czsKICAgICAKICAgICBMYXllckNoYW5nZUZsYWdzIG1fdW5jb21taXR0ZWRD aGFuZ2VzOworCisgICAgZmxvYXQgY2xhbXBlZENvbnRlbnRzU2NhbGVGb3JTY2FsZShmbG9hdCkg Y29uc3Q7CisgICAgZmxvYXQgbV9jb250ZW50c1NjYWxlOwogfTsKIAogfSAvLyBuYW1lc3BhY2Ug V2ViQ29yZQpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2EvUGxhdGZv cm1DQUxheWVyLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvY2EvUGxhdGZvcm1DQUxheWVyLmgJKHJldmlzaW9uIDc1NjEyKQorKysgU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2EvUGxhdGZvcm1DQUxheWVyLmgJKHdvcmtpbmcgY29weSkK QEAgLTE4Miw2ICsxODIsOSBAQAogCiAgICAgQ0ZUaW1lSW50ZXJ2YWwgdGltZU9mZnNldCgpIGNv bnN0OwogICAgIHZvaWQgc2V0VGltZU9mZnNldChDRlRpbWVJbnRlcnZhbCk7CisgICAgCisgICAg ZmxvYXQgY29udGVudHNTY2FsZSgpIGNvbnN0OworICAgIHZvaWQgc2V0Q29udGVudHNTY2FsZShm bG9hdCk7CiAKICNpZiBQTEFURk9STShXSU4pICYmICFkZWZpbmVkKE5ERUJVRykKICAgICB2b2lk IHByaW50VHJlZSgpIGNvbnN0OwpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvR3JhcGhpY3NMYXllci5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL0dyYXBoaWNzTGF5ZXIuaAkocmV2aXNpb24gNzU2MTIpCisrKyBTb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0xheWVyLmgJKHdvcmtpbmcgY29weSkKQEAg LTMxNiw2ICszMTYsMTEgQEAKICAgICAvLyBGb3IgaG9zdGluZyB0aGlzIEdyYXBoaWNzTGF5ZXIg aW4gYSBuYXRpdmUgbGF5ZXIgaGllcmFyY2h5LgogICAgIHZpcnR1YWwgUGxhdGZvcm1MYXllciog cGxhdGZvcm1MYXllcigpIGNvbnN0IHsgcmV0dXJuIDA7IH0KICAgICAKKyAgICAvLyBDaGFuZ2Ug dGhlIHNjYWxlIGF0IHdoaWNoIHRoZSBjb250ZW50cyBhcmUgcmVuZGVyZWQuIE5vdGUgdGhhdCBj b250ZW50c1NjYWxlIG1heSBub3QgcmV0dXJuCisgICAgLy8gdGhlIHNhbWUgdmFsdWUgcGFzc2Vk IHRvIHNldENvbnRlbnRzU2NhbGUoKSwgYmVjYXVzZSBvZiBjbGFtcGluZyBhbmQgaHlzdGVyZXNp cy4KKyAgICB2aXJ0dWFsIGZsb2F0IGNvbnRlbnRzU2NhbGUoKSBjb25zdCA9IDA7CisgICAgdmly dHVhbCB2b2lkIHNldENvbnRlbnRzU2NhbGUoZmxvYXQpID0gMDsKKwogICAgIHZvaWQgZHVtcExh eWVyKFRleHRTdHJlYW0mLCBpbnQgaW5kZW50ID0gMCwgTGF5ZXJUcmVlQXNUZXh0QmVoYXZpb3Ig PSBMYXllclRyZWVBc1RleHRCZWhhdmlvck5vcm1hbCkgY29uc3Q7CiAKICAgICBpbnQgcmVwYWlu dENvdW50KCkgY29uc3QgeyByZXR1cm4gbV9yZXBhaW50Q291bnQ7IH0KSW5kZXg6IFNvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcAkocmV2aXNpb24gNzU2MTIpCisrKyBTb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0z OTM2LDYgKzM5NDYsMTQgQEAKICAgICBtX3JlZmxlY3Rpb24tPnNldFN0eWxlKG5ld1N0eWxlLnJl bGVhc2UoKSk7CiB9CiAKK3ZvaWQgUmVuZGVyTGF5ZXI6OnVwZGF0ZUNvbnRlbnRzU2NhbGUoZmxv YXQgc2NhbGUpCit7CisjaWYgVVNFKEFDQ0VMRVJBVEVEX0NPTVBPU0lUSU5HKQorICAgIGlmICht X2JhY2tpbmcpCisgICAgICAgIG1fYmFja2luZy0+dXBkYXRlQ29udGVudHNTY2FsZShzY2FsZSk7 CisjZW5kaWYKK30KKwogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQogCiAjaWZuZGVmIE5ERUJVRwpJ bmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQmFja2luZy5oCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckJhY2tpbmcuaAko cmV2aXNpb24gNzU2MTIpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJC YWNraW5nLmgJKHdvcmtpbmcgY29weSkKQEAgLTEzOSw2ICsxMzksOCBAQAogICAgIC8vIEZvciBp bmZvcm1hdGl2ZSBwdXJwb3NlcyBvbmx5LgogICAgIENvbXBvc2l0aW5nTGF5ZXJUeXBlIGNvbXBv c2l0aW5nTGF5ZXJUeXBlKCkgY29uc3Q7CiAgICAgCisgICAgdm9pZCB1cGRhdGVDb250ZW50c1Nj YWxlKGZsb2F0KTsKKwogcHJpdmF0ZToKICAgICB2b2lkIGNyZWF0ZUdyYXBoaWNzTGF5ZXIoKTsK ICAgICB2b2lkIGRlc3Ryb3lHcmFwaGljc0xheWVyKCk7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyTGF5ZXJCYWNraW5nLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJCYWNraW5nLmNwcAkocmV2aXNpb24gNzU2MTIpCisr KyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJCYWNraW5nLmNwcAkod29ya2lu ZyBjb3B5KQpAQCAtMTA1LDYgKzEwNSwxMiBAQAogICAgIG1fZ3JhcGhpY3NMYXllci0+c2V0TmFt ZShuYW1lRm9yTGF5ZXIoKSk7CiAjZW5kaWYgIC8vIE5ERUJVRwogCisjaWYgVVNFKEFDQ0VMRVJB VEVEX0NPTVBPU0lUSU5HKQorICAgIEFTU0VSVChyZW5kZXJlcigpICYmIHJlbmRlcmVyKCktPmRv Y3VtZW50KCkgJiYgcmVuZGVyZXIoKS0+ZG9jdW1lbnQoKS0+ZnJhbWUoKSk7CisgICAgaWYgKEZy YW1lKiBmcmFtZSA9IHJlbmRlcmVyKCktPmRvY3VtZW50KCktPmZyYW1lKCkpCisgICAgICAgIG1f Z3JhcGhpY3NMYXllci0+c2V0Q29udGVudHNTY2FsZShmcmFtZS0+cGFnZVNjYWxlRmFjdG9yKCkp OworI2VuZGlmCisKICAgICB1cGRhdGVMYXllck9wYWNpdHkocmVuZGVyZXIoKS0+c3R5bGUoKSk7 CiAgICAgdXBkYXRlTGF5ZXJUcmFuc2Zvcm0ocmVuZGVyZXIoKS0+c3R5bGUoKSk7CiB9CkBAIC01 NDMsNiArNTQ5LDggQEAKICNlbmRpZgogICAgICAgICAgICAgbV9mb3JlZ3JvdW5kTGF5ZXItPnNl dERyYXdzQ29udGVudCh0cnVlKTsKICAgICAgICAgICAgIG1fZm9yZWdyb3VuZExheWVyLT5zZXRQ YWludGluZ1BoYXNlKEdyYXBoaWNzTGF5ZXJQYWludEZvcmVncm91bmQpOworICAgICAgICAgICAg aWYgKEZyYW1lKiBmcmFtZSA9IHJlbmRlcmVyKCktPmRvY3VtZW50KCktPmZyYW1lKCkpCisgICAg ICAgICAgICAgICAgbV9mb3JlZ3JvdW5kTGF5ZXItPnNldENvbnRlbnRzU2NhbGUoZnJhbWUtPnBh Z2VTY2FsZUZhY3RvcigpKTsKICAgICAgICAgICAgIGxheWVyQ2hhbmdlZCA9IHRydWU7CiAgICAg ICAgIH0KICAgICB9IGVsc2UgaWYgKG1fZm9yZWdyb3VuZExheWVyKSB7CkBAIC01NjgsNiArNTc2 LDggQEAKICNlbmRpZgogICAgICAgICAgICAgbV9tYXNrTGF5ZXItPnNldERyYXdzQ29udGVudCh0 cnVlKTsKICAgICAgICAgICAgIG1fbWFza0xheWVyLT5zZXRQYWludGluZ1BoYXNlKEdyYXBoaWNz TGF5ZXJQYWludE1hc2spOworICAgICAgICAgICAgaWYgKEZyYW1lKiBmcmFtZSA9IHJlbmRlcmVy KCktPmRvY3VtZW50KCktPmZyYW1lKCkpCisgICAgICAgICAgICAgICAgbV9mb3JlZ3JvdW5kTGF5 ZXItPnNldENvbnRlbnRzU2NhbGUoZnJhbWUtPnBhZ2VTY2FsZUZhY3RvcigpKTsKICAgICAgICAg ICAgIGxheWVyQ2hhbmdlZCA9IHRydWU7CiAgICAgICAgIH0KICAgICB9IGVsc2UgaWYgKG1fbWFz a0xheWVyKSB7CkBAIC0xMzQwLDYgKzEzNTAsMTggQEAKICAgICByZXR1cm4gQ29udGFpbmVyQ29t cG9zaXRpbmdMYXllcjsKIH0KIAordm9pZCBSZW5kZXJMYXllckJhY2tpbmc6OnVwZGF0ZUNvbnRl bnRzU2NhbGUoZmxvYXQgc2NhbGUpCit7CisgICAgaWYgKG1fZ3JhcGhpY3NMYXllcikKKyAgICAg ICAgbV9ncmFwaGljc0xheWVyLT5zZXRDb250ZW50c1NjYWxlKHNjYWxlKTsKKworICAgIGlmICht X2ZvcmVncm91bmRMYXllcikKKyAgICAgICAgbV9mb3JlZ3JvdW5kTGF5ZXItPnNldENvbnRlbnRz U2NhbGUoc2NhbGUpOworCisgICAgaWYgKG1fbWFza0xheWVyKQorICAgICAgICBtX21hc2tMYXll ci0+c2V0Q29udGVudHNTY2FsZShzY2FsZSk7Cit9CisKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUK IAogI2VuZGlmIC8vIFVTRShBQ0NFTEVSQVRFRF9DT01QT1NJVElORykKSW5kZXg6IFNvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5oCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5oCShyZXZpc2lvbiA3NTYxMikKKysrIFNvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5oCSh3b3JraW5nIGNvcHkpCkBAIC01NzQsNiAr NTcxLDggQEAKICAgICB2b2lkIHNldE11c3RPdmVybGFwQ29tcG9zaXRlZExheWVycyhib29sIGIp IHsgbV9tdXN0T3ZlcmxhcENvbXBvc2l0ZWRMYXllcnMgPSBiOyB9CiAjZW5kaWYKIAorICAgIHZv aWQgdXBkYXRlQ29udGVudHNTY2FsZShmbG9hdCk7CisKIHByaXZhdGU6CiAgICAgZnJpZW5kIGNs YXNzIFJlbmRlckxheWVyQmFja2luZzsKICAgICBmcmllbmQgY2xhc3MgUmVuZGVyTGF5ZXJDb21w b3NpdG9yOwpJbmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9z aXRvci5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXll ckNvbXBvc2l0b3IuaAkocmV2aXNpb24gNzU2MTIpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmgJKHdvcmtpbmcgY29weSkKQEAgLTE3NCw2ICsxNzQs OCBAQAogICAgIGJvb2wgY29tcG9zaXRvclNob3dEZWJ1Z0JvcmRlcnMoKSBjb25zdCB7IHJldHVy biBtX3Nob3dEZWJ1Z0JvcmRlcnM7IH0KICAgICBib29sIGNvbXBvc2l0b3JTaG93UmVwYWludENv dW50ZXIoKSBjb25zdCB7IHJldHVybiBtX3Nob3dSZXBhaW50Q291bnRlcjsgfQogCisgICAgdm9p ZCB1cGRhdGVDb250ZW50c1NjYWxlKGZsb2F0LCBSZW5kZXJMYXllciogPSAwKTsKKwogcHJpdmF0 ZToKICAgICAvLyBHcmFwaGljc0xheWVyQ2xpZW50IEltcGxlbWVudGF0aW9uCiAgICAgdmlydHVh bCB2b2lkIG5vdGlmeUFuaW1hdGlvblN0YXJ0ZWQoY29uc3QgR3JhcGhpY3NMYXllciosIGRvdWJs ZSkgeyB9CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3Np dG9yLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5 ZXJDb21wb3NpdG9yLmNwcAkocmV2aXNpb24gNzU2MTIpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTU3NCw2 ICsxNTc0LDM0IEBACiAgICAgcmV0dXJuIGZhbHNlOwogfQogCit2b2lkIFJlbmRlckxheWVyQ29t cG9zaXRvcjo6dXBkYXRlQ29udGVudHNTY2FsZShmbG9hdCBzY2FsZSwgUmVuZGVyTGF5ZXIqIGxh eWVyKQoreworICAgIGlmICghbGF5ZXIpCisgICAgICAgIGxheWVyID0gcm9vdFJlbmRlckxheWVy KCk7CisKKyAgICBsYXllci0+dXBkYXRlQ29udGVudHNTY2FsZShzY2FsZSk7CisKKyAgICBpZiAo bGF5ZXItPmlzU3RhY2tpbmdDb250ZXh0KCkpIHsKKyAgICAgICAgaWYgKFZlY3RvcjxSZW5kZXJM YXllcio+KiBuZWdaT3JkZXJMaXN0ID0gbGF5ZXItPm5lZ1pPcmRlckxpc3QoKSkgeworICAgICAg ICAgICAgc2l6ZV90IGxpc3RTaXplID0gbmVnWk9yZGVyTGlzdC0+c2l6ZSgpOworICAgICAgICAg ICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBsaXN0U2l6ZTsgKytpKQorICAgICAgICAgICAgICAg IHVwZGF0ZUNvbnRlbnRzU2NhbGUoc2NhbGUsIG5lZ1pPcmRlckxpc3QtPmF0KGkpKTsKKyAgICAg ICAgfQorCisgICAgICAgIGlmIChWZWN0b3I8UmVuZGVyTGF5ZXIqPiogcG9zWk9yZGVyTGlzdCA9 IGxheWVyLT5wb3NaT3JkZXJMaXN0KCkpIHsKKyAgICAgICAgICAgIHNpemVfdCBsaXN0U2l6ZSA9 IHBvc1pPcmRlckxpc3QtPnNpemUoKTsKKyAgICAgICAgICAgIGZvciAoc2l6ZV90IGkgPSAwOyBp IDwgbGlzdFNpemU7ICsraSkKKyAgICAgICAgICAgICAgICB1cGRhdGVDb250ZW50c1NjYWxlKHNj YWxlLCBwb3NaT3JkZXJMaXN0LT5hdChpKSk7CisgICAgICAgIH0KKyAgICB9CisKKyAgICBpZiAo VmVjdG9yPFJlbmRlckxheWVyKj4qIG5vcm1hbEZsb3dMaXN0ID0gbGF5ZXItPm5vcm1hbEZsb3dM aXN0KCkpIHsKKyAgICAgICAgc2l6ZV90IGxpc3RTaXplID0gbm9ybWFsRmxvd0xpc3QtPnNpemUo KTsKKyAgICAgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBsaXN0U2l6ZTsgKytpKQorICAgICAg ICAgICAgdXBkYXRlQ29udGVudHNTY2FsZShzY2FsZSwgbm9ybWFsRmxvd0xpc3QtPmF0KGkpKTsK KyAgICB9Cit9CisKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKIAogI2VuZGlmIC8vIFVTRShBQ0NF TEVSQVRFRF9DT01QT1NJVElORykK