137854 2014-10-18 11:39:44 -0700 Use SPECIALIZE_TYPE_TRAITS_*() macro for RenderScrollbar 2014-10-19 20:25:08 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 cdumez cdumez benjamin commit-queue darin d-r esprehn+autocc fmalita glenn gyuyoung.kim kangil.han kling kondapallykalyan mmaxfield pdr rniwa schenney sergio oldest_to_newest 1042622 0 cdumez 2014-10-18 11:39:44 -0700 RenderScrollbar / RenderedDocumentMarker are using custom toXXX() functions instead of the SPECIALIZE_TYPE_TRAITS_*() macro. Fix this for consistency. 1042625 1 240068 cdumez 2014-10-18 11:57:29 -0700 Created attachment 240068 Patch 1042637 2 240072 cdumez 2014-10-18 14:45:31 -0700 Created attachment 240072 Patch 1042722 3 240072 commit-queue 2014-10-19 20:25:01 -0700 Comment on attachment 240072 Patch Clearing flags on attachment: 240072 Committed r174874: <http://trac.webkit.org/changeset/174874> 1042723 4 commit-queue 2014-10-19 20:25:08 -0700 All reviewed patches have been landed. Closing bug. 240068 2014-10-18 11:57:29 -0700 2014-10-18 14:45:23 -0700 Patch bug-137854-20141018115734.patch text/plain 13710 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMTc0ODYzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjcxMzE1ZDk5ZDE3ZWIx YjZmMTVlZjFiY2ZlMjQ2ZGNkN2JlNzc2Zi4uYjBiNjFmY2RmNTllMTAxMWNmNjA1NzlhMWQ5NWVh M2ZmOTViYzJmZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDUwIEBACiAyMDE0LTEwLTE4ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CiAKKyAgICAgICAgVXNlIFNQRUNJQUxJWkVfVFlQ RV9UUkFJVFNfKigpIG1hY3JvIGZvciBSZW5kZXJTY3JvbGxiYXIgLyBSZW5kZXJlZERvY3VtZW50 TWFya2VyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x Mzc4NTQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBV c2UgU1BFQ0lBTElaRV9UWVBFX1RSQUlUU18qKCkgbWFjcm8gZm9yIFJlbmRlclNjcm9sbGJhciAv CisgICAgICAgIFJlbmRlcmVkRG9jdW1lbnRNYXJrZXIgaW5zdGVhZCBvZiBjdXN0b20gdG9YWFgo KSBmdW5jdGlvbnMsIGZvcgorICAgICAgICBjb25zaXN0ZW5jeS4KKworICAgICAgICBObyBuZXcg dGVzdHMsIG5vIGJlaGF2aW9yIGNoYW5nZS4KKworICAgICAgICAqIGRvbS9Eb2N1bWVudE1hcmtl ci5oOgorICAgICAgICAoV2ViQ29yZTo6RG9jdW1lbnRNYXJrZXI6OmlzUmVuZGVyZWREb2N1bWVu dE1hcmtlcik6CisgICAgICAgIChXZWJDb3JlOjpEb2N1bWVudE1hcmtlcjo6fkRvY3VtZW50TWFy a2VyKToKKyAgICAgICAgKiBkb20vRG9jdW1lbnRNYXJrZXJDb250cm9sbGVyLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OkRvY3VtZW50TWFya2VyQ29udHJvbGxlcjo6YWRkVGV4dE1hdGNoTWFya2Vy KToKKyAgICAgICAgKiBkb20vUmVuZGVyZWREb2N1bWVudE1hcmtlci5oOgorICAgICAgICAoV2Vi Q29yZTo6UmVuZGVyZWREb2N1bWVudE1hcmtlcjo6aXNSZW5kZXJlZERvY3VtZW50TWFya2VyKToK KyAgICAgICAgKGlzVHlwZSk6CisgICAgICAgIChXZWJDb3JlOjp0b1JlbmRlcmVkRG9jdW1lbnRN YXJrZXIpOiBEZWxldGVkLgorICAgICAgICAqIHJlbmRlcmluZy9JbmxpbmVUZXh0Qm94LmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OklubGluZVRleHRCb3g6OnBhaW50RG9jdW1lbnRNYXJrZXIpOgor ICAgICAgICAoV2ViQ29yZTo6SW5saW5lVGV4dEJveDo6cGFpbnRUZXh0TWF0Y2hNYXJrZXIpOgor ICAgICAgICAoV2ViQ29yZTo6SW5saW5lVGV4dEJveDo6Y29tcHV0ZVJlY3RGb3JSZXBsYWNlbWVu dE1hcmtlcik6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlclNjcm9sbGJhci5oOgorICAgICAg ICAoaXNUeXBlKToKKyAgICAgICAgKFdlYkNvcmU6OnRvUmVuZGVyU2Nyb2xsYmFyKTogRGVsZXRl ZC4KKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyU2Nyb2xsYmFyVGhlbWUuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6UmVuZGVyU2Nyb2xsYmFyVGhlbWU6Om1pbmltdW1UaHVtYkxlbmd0aCk6Cisg ICAgICAgIChXZWJDb3JlOjpSZW5kZXJTY3JvbGxiYXJUaGVtZTo6YmFja0J1dHRvblJlY3QpOgor ICAgICAgICAoV2ViQ29yZTo6UmVuZGVyU2Nyb2xsYmFyVGhlbWU6OmZvcndhcmRCdXR0b25SZWN0 KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclNjcm9sbGJhclRoZW1lOjp0cmFja1JlY3QpOgor ICAgICAgICAoV2ViQ29yZTo6UmVuZGVyU2Nyb2xsYmFyVGhlbWU6OmNvbnN0cmFpblRyYWNrUmVj dFRvVHJhY2tQaWVjZXMpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyU2Nyb2xsYmFyVGhlbWU6 OndpbGxQYWludFNjcm9sbGJhcik6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJTY3JvbGxiYXJU aGVtZTo6ZGlkUGFpbnRTY3JvbGxiYXIpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyU2Nyb2xs YmFyVGhlbWU6OnBhaW50U2Nyb2xsYmFyQmFja2dyb3VuZCk6CisgICAgICAgIChXZWJDb3JlOjpS ZW5kZXJTY3JvbGxiYXJUaGVtZTo6cGFpbnRUcmFja0JhY2tncm91bmQpOgorICAgICAgICAoV2Vi Q29yZTo6UmVuZGVyU2Nyb2xsYmFyVGhlbWU6OnBhaW50VHJhY2tQaWVjZSk6CisgICAgICAgIChX ZWJDb3JlOjpSZW5kZXJTY3JvbGxiYXJUaGVtZTo6cGFpbnRCdXR0b24pOgorICAgICAgICAoV2Vi Q29yZTo6UmVuZGVyU2Nyb2xsYmFyVGhlbWU6OnBhaW50VGh1bWIpOgorICAgICAgICAqIHJlbmRl cmluZy9zdmcvU1ZHSW5saW5lRmxvd0JveC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTVkdJbmxp bmVGbG93Qm94Ojpjb21wdXRlVGV4dE1hdGNoTWFya2VyUmVjdEZvclJlbmRlcmVyKToKKworMjAx NC0xMC0xOCAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgorCiAgICAgICAgIFtNYWNd IFVzZSBGYXN0IGVudW1lcmF0aW9uIGNvbnNpc3RlbnRseSBpbiBXZWJGb250Q2FjaGUubW0KICAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzNzc5MQogCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnRNYXJrZXIuaCBiL1NvdXJjZS9X ZWJDb3JlL2RvbS9Eb2N1bWVudE1hcmtlci5oCmluZGV4IDQ3OTQ5ZmU4MGJkZDliMTFlNjhkYWU2 MjU2ZWEyYjMzMDZmYmI0NjMuLjhlN2Y5NGI0OTA4OTZlMzYyZDhhYTUxZmVhZTJiMzdjM2MxMzFk ZDcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudE1hcmtlci5oCisrKyBi L1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudE1hcmtlci5oCkBAIC0xNTYsNiArMTU2LDExIEBA IHB1YmxpYzoKICAgICAgICAgcmV0dXJuICEoKnRoaXMgPT0gbyk7CiAgICAgfQogCisjaWZuZGVm IE5ERUJVRworICAgIHZpcnR1YWwgYm9vbCBpc1JlbmRlcmVkRG9jdW1lbnRNYXJrZXIoKSBjb25z dCB7IHJldHVybiBmYWxzZTsgfQorICAgIHZpcnR1YWwgfkRvY3VtZW50TWFya2VyKCkgeyB9Cisj ZW5kaWYKKwogcHJpdmF0ZToKICAgICBNYXJrZXJUeXBlIG1fdHlwZTsKICAgICB1bnNpZ25lZCBt X3N0YXJ0T2Zmc2V0OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50TWFy a2VyQ29udHJvbGxlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnRNYXJrZXJDb250 cm9sbGVyLmNwcAppbmRleCA5Y2I4YWU2NTdkNmVhZDZmY2FlZjNiMTkxY2Y2YWUwYWVhYjcwZmQw Li40MTFlMDQwMzQxMjVlOTRlMGIyOGUxOWZmYTBmMWEzMDI3ZTZhNjBmIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnRNYXJrZXJDb250cm9sbGVyLmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9kb20vRG9jdW1lbnRNYXJrZXJDb250cm9sbGVyLmNwcApAQCAtMTAyLDcgKzEw Miw3IEBAIHZvaWQgRG9jdW1lbnRNYXJrZXJDb250cm9sbGVyOjphZGRUZXh0TWF0Y2hNYXJrZXIo Y29uc3QgUmFuZ2UqIHJhbmdlLCBib29sIGFjdGl2CiAgICAgICAgICAgICAvLyBtYXRjaGVzIG9m Zi1zY3JlZW4gYXJlICh0aGF0IGhhdmVuJ3QgYmVlbiBwYWludGVkIHlldCkuCiAgICAgICAgICAg ICBOb2RlKiBub2RlID0gdGV4dFBpZWNlLT5zdGFydENvbnRhaW5lcigpOwogICAgICAgICAgICAg VmVjdG9yPERvY3VtZW50TWFya2VyKj4gbWFya2VycyA9IG1hcmtlcnNGb3Iobm9kZSk7Ci0gICAg ICAgICAgICBzdGF0aWNfY2FzdDxSZW5kZXJlZERvY3VtZW50TWFya2VyKj4obWFya2Vyc1ttYXJr ZXJzLnNpemUoKSAtIDFdKS0+c2V0UmVuZGVyZWRSZWN0KHJhbmdlLT5ib3VuZGluZ0JveCgpKTsK KyAgICAgICAgICAgIGRvd25jYXN0PFJlbmRlcmVkRG9jdW1lbnRNYXJrZXI+KCptYXJrZXJzW21h cmtlcnMuc2l6ZSgpIC0gMV0pLnNldFJlbmRlcmVkUmVjdChyYW5nZS0+Ym91bmRpbmdCb3goKSk7 CiAgICAgICAgIH0KICAgICB9CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vUmVu ZGVyZWREb2N1bWVudE1hcmtlci5oIGIvU291cmNlL1dlYkNvcmUvZG9tL1JlbmRlcmVkRG9jdW1l bnRNYXJrZXIuaAppbmRleCA3ZThmZTJiNTUyZDRhNWYwYjMzZmRhZWU3NjVlODkxYTQ3OTk4MzQ4 Li40MDM0ZGYxMmY1ZTVhZmRkYzlhMjA2MzM5OTY5MDZiNGY0NDczZDBjIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9kb20vUmVuZGVyZWREb2N1bWVudE1hcmtlci5oCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2RvbS9SZW5kZXJlZERvY3VtZW50TWFya2VyLmgKQEAgLTI4LDYgKzI4LDcgQEAKICNk ZWZpbmUgUmVuZGVyZWREb2N1bWVudE1hcmtlcl9oCiAKICNpbmNsdWRlICJEb2N1bWVudE1hcmtl ci5oIgorI2luY2x1ZGUgPHd0Zi9UeXBlQ2FzdHMuaD4KIAogbmFtZXNwYWNlIFdlYkNvcmUgewog CkBAIC01Myw2ICs1NCwxMCBAQCBwcml2YXRlOgogICAgICAgICByZXR1cm4gcmVjdDsKICAgICB9 CiAKKyNpZm5kZWYgTkRFQlVHCisgICAgdmlydHVhbCBib29sIGlzUmVuZGVyZWREb2N1bWVudE1h cmtlcigpIGNvbnN0IHsgcmV0dXJuIHRydWU7IH0KKyNlbmRpZgorCiAgICAgTGF5b3V0UmVjdCBt X3JlbmRlcmVkUmVjdDsKIH07CiAKQEAgLTYyLDExICs2NywxMCBAQCBpbmxpbmUgdm9pZCBSZW5k ZXJlZERvY3VtZW50TWFya2VyOjppbnZhbGlkYXRlKGNvbnN0IExheW91dFJlY3QmIHIpCiAgICAg ICAgIGludmFsaWRhdGUoKTsKIH0KIAotaW5saW5lIFJlbmRlcmVkRG9jdW1lbnRNYXJrZXIqIHRv UmVuZGVyZWREb2N1bWVudE1hcmtlcihEb2N1bWVudE1hcmtlciogbWFya2VyKQotewotICAgIHJl dHVybiBzdGF0aWNfY2FzdDxSZW5kZXJlZERvY3VtZW50TWFya2VyKj4obWFya2VyKTsKLX0KK30g Ly8gbmFtZXNwYWNlIFdlYkNvcmUKIAotfSAvLyBuYW1lc3BhY2UKK1NQRUNJQUxJWkVfVFlQRV9U UkFJVFNfQkVHSU4oV2ViQ29yZTo6UmVuZGVyZWREb2N1bWVudE1hcmtlcikKKyAgICBzdGF0aWMg Ym9vbCBpc1R5cGUoY29uc3QgV2ViQ29yZTo6RG9jdW1lbnRNYXJrZXImIG1hcmtlcikgeyByZXR1 cm4gbWFya2VyLmlzUmVuZGVyZWREb2N1bWVudE1hcmtlcigpOyB9CitTUEVDSUFMSVpFX1RZUEVf VFJBSVRTX0VORCgpCiAKLSNlbmRpZgorI2VuZGlmIC8vIFJlbmRlcmVkRG9jdW1lbnRNYXJrZXJf aApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0lubGluZVRleHRCb3guY3Bw IGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0lubGluZVRleHRCb3guY3BwCmluZGV4IDM1NDc5 MGNmMzkyYTE4MzdlYWI3NDViMDg2YjgwMjBmZDdjYmVlY2QuLjdiOWQxYzFhZmUyNmQyYjU0ZTU1 ZGM2Y2MxMDdkYmYzZTc2NWM3YTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9JbmxpbmVUZXh0Qm94LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvSW5saW5l VGV4dEJveC5jcHAKQEAgLTExMDcsNyArMTEwNyw3IEBAIHZvaWQgSW5saW5lVGV4dEJveDo6cGFp bnREb2N1bWVudE1hcmtlcihHcmFwaGljc0NvbnRleHQqIHB0LCBjb25zdCBGbG9hdFBvaW50JiBi CiAgICAgICAgIGlmIChncmFtbWFyIHx8IGlzRGljdGF0aW9uTWFya2VyKSB7CiAgICAgICAgICAg ICBtYXJrZXJSZWN0Lm1vdmUoLWJveE9yaWdpbi54KCksIC1ib3hPcmlnaW4ueSgpKTsKICAgICAg ICAgICAgIG1hcmtlclJlY3QgPSByZW5kZXJlcigpLmxvY2FsVG9BYnNvbHV0ZVF1YWQoRmxvYXRS ZWN0KG1hcmtlclJlY3QpKS5lbmNsb3NpbmdCb3VuZGluZ0JveCgpOwotICAgICAgICAgICAgdG9S ZW5kZXJlZERvY3VtZW50TWFya2VyKG1hcmtlciktPnNldFJlbmRlcmVkUmVjdChtYXJrZXJSZWN0 KTsKKyAgICAgICAgICAgIGRvd25jYXN0PFJlbmRlcmVkRG9jdW1lbnRNYXJrZXI+KCptYXJrZXIp LnNldFJlbmRlcmVkUmVjdChtYXJrZXJSZWN0KTsKICAgICAgICAgfQogICAgIH0KICAgICAKQEAg LTExNDUsNyArMTE0NSw3IEBAIHZvaWQgSW5saW5lVGV4dEJveDo6cGFpbnRUZXh0TWF0Y2hNYXJr ZXIoR3JhcGhpY3NDb250ZXh0KiBjb250ZXh0LCBjb25zdCBGbG9hdFBvCiAgICAgZm9udC5hZGp1 c3RTZWxlY3Rpb25SZWN0Rm9yVGV4dChydW4sIHJlbmRlcmVkUmVjdCwgc1BvcywgZVBvcyk7CiAg ICAgSW50UmVjdCBtYXJrZXJSZWN0ID0gZW5jbG9zaW5nSW50UmVjdChyZW5kZXJlZFJlY3QpOwog ICAgIG1hcmtlclJlY3QgPSByZW5kZXJlcigpLmxvY2FsVG9BYnNvbHV0ZVF1YWQoRmxvYXRRdWFk KG1hcmtlclJlY3QpKS5lbmNsb3NpbmdCb3VuZGluZ0JveCgpOwotICAgIHRvUmVuZGVyZWREb2N1 bWVudE1hcmtlcihtYXJrZXIpLT5zZXRSZW5kZXJlZFJlY3QobWFya2VyUmVjdCk7CisgICAgZG93 bmNhc3Q8UmVuZGVyZWREb2N1bWVudE1hcmtlcj4oKm1hcmtlcikuc2V0UmVuZGVyZWRSZWN0KG1h cmtlclJlY3QpOwogICAgIAogICAgIC8vIE9wdGlvbmFsbHkgaGlnaGxpZ2h0IHRoZSB0ZXh0CiAg ICAgaWYgKHJlbmRlcmVyKCkuZnJhbWUoKS5lZGl0b3IoKS5tYXJrZWRUZXh0TWF0Y2hlc0FyZUhp Z2hsaWdodGVkKCkpIHsKQEAgLTExNzcsNyArMTE3Nyw3IEBAIHZvaWQgSW5saW5lVGV4dEJveDo6 Y29tcHV0ZVJlY3RGb3JSZXBsYWNlbWVudE1hcmtlcihEb2N1bWVudE1hcmtlciogbWFya2VyLCBj b25zCiAgICAgZm9udC5hZGp1c3RTZWxlY3Rpb25SZWN0Rm9yVGV4dChydW4sIHNlbGVjdGlvblJl Y3QsIHNQb3MsIGVQb3MpOwogICAgIEludFJlY3QgbWFya2VyUmVjdCA9IGVuY2xvc2luZ0ludFJl Y3Qoc2VsZWN0aW9uUmVjdCk7CiAgICAgbWFya2VyUmVjdCA9IHJlbmRlcmVyKCkubG9jYWxUb0Fi c29sdXRlUXVhZChGbG9hdFJlY3QobWFya2VyUmVjdCkpLmVuY2xvc2luZ0JvdW5kaW5nQm94KCk7 Ci0gICAgdG9SZW5kZXJlZERvY3VtZW50TWFya2VyKG1hcmtlciktPnNldFJlbmRlcmVkUmVjdCht YXJrZXJSZWN0KTsKKyAgICBkb3duY2FzdDxSZW5kZXJlZERvY3VtZW50TWFya2VyPigqbWFya2Vy KS5zZXRSZW5kZXJlZFJlY3QobWFya2VyUmVjdCk7CiB9CiAgICAgCiB2b2lkIElubGluZVRleHRC b3g6OnBhaW50RG9jdW1lbnRNYXJrZXJzKEdyYXBoaWNzQ29udGV4dCogcHQsIGNvbnN0IEZsb2F0 UG9pbnQmIGJveE9yaWdpbiwgY29uc3QgUmVuZGVyU3R5bGUmIHN0eWxlLCBjb25zdCBGb250JiBm b250LCBib29sIGJhY2tncm91bmQpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyU2Nyb2xsYmFyLmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyU2Ny b2xsYmFyLmgKaW5kZXggMmNjZDIwMWVmYmZiNWMwODdiMzgwYmRhZDBlYzE2YmY1ZTExY2Q5Ni4u ZGYxMGI3NTJmMWFhZTUzZDUxMDg1YzI0ZjY5NzQ0MDNiZDY2YzkxNiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclNjcm9sbGJhci5oCisrKyBiL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJTY3JvbGxiYXIuaApAQCAtODgsMTUgKzg4LDEwIEBAIHByaXZh dGU6CiAgICAgSGFzaE1hcDx1bnNpZ25lZCwgUmVuZGVyUHRyPFJlbmRlclNjcm9sbGJhclBhcnQ+ PiBtX3BhcnRzOwogfTsKIAotaW5saW5lIFJlbmRlclNjcm9sbGJhciogdG9SZW5kZXJTY3JvbGxi YXIoU2Nyb2xsYmFyVGhlbWVDbGllbnQqIHNjcm9sbGJhcikKLXsKLSAgICBBU1NFUlRfV0lUSF9T RUNVUklUWV9JTVBMSUNBVElPTighc2Nyb2xsYmFyIHx8IHNjcm9sbGJhci0+aXNDdXN0b21TY3Jv bGxiYXIoKSk7Ci0gICAgcmV0dXJuIHN0YXRpY19jYXN0PFJlbmRlclNjcm9sbGJhcio+KHNjcm9s bGJhcik7Ci19Ci0KLS8vIFRoaXMgd2lsbCBjYXRjaCBhbnlvbmUgZG9pbmcgYW4gdW5uZWNlc3Nh cnkgY2FzdC4KLXZvaWQgdG9SZW5kZXJTY3JvbGxiYXIoY29uc3QgUmVuZGVyU2Nyb2xsYmFyKik7 Ci0KIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKIAorU1BFQ0lBTElaRV9UWVBFX1RSQUlUU19CRUdJ TihXZWJDb3JlOjpSZW5kZXJTY3JvbGxiYXIpCisgICAgc3RhdGljIGJvb2wgaXNUeXBlKGNvbnN0 IFdlYkNvcmU6OlNjcm9sbGJhclRoZW1lQ2xpZW50JiBzY3JvbGxiYXIpIHsgcmV0dXJuIHNjcm9s bGJhci5pc0N1c3RvbVNjcm9sbGJhcigpOyB9CitTUEVDSUFMSVpFX1RZUEVfVFJBSVRTX0VORCgp CisKICNlbmRpZiAvLyBSZW5kZXJTY3JvbGxiYXJfaApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlclNjcm9sbGJhclRoZW1lLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJTY3JvbGxiYXJUaGVtZS5jcHAKaW5kZXggNzliNWQ4MjBmNjFkZDZmNGRm YTI4MjlhZTllYTRhYjUyZmU1NGE2OC4uYjY3YjE4YjI4ZTlmYjgzZDNkYmVjNDgxZjg3YzhjNzk1 MjJkZDcxMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclNjcm9s bGJhclRoZW1lLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyU2Nyb2xs YmFyVGhlbWUuY3BwCkBAIC02NywxNyArNjcsMTcgQEAgYm9vbCBSZW5kZXJTY3JvbGxiYXJUaGVt ZTo6aGFzVGh1bWIoU2Nyb2xsYmFyVGhlbWVDbGllbnQqIHNjcm9sbGJhcikKIAogaW50IFJlbmRl clNjcm9sbGJhclRoZW1lOjptaW5pbXVtVGh1bWJMZW5ndGgoU2Nyb2xsYmFyVGhlbWVDbGllbnQq IHNjcm9sbGJhcikKIHsKLSAgICByZXR1cm4gdG9SZW5kZXJTY3JvbGxiYXIoc2Nyb2xsYmFyKS0+ bWluaW11bVRodW1iTGVuZ3RoKCk7CisgICAgcmV0dXJuIGRvd25jYXN0PFJlbmRlclNjcm9sbGJh cj4oKnNjcm9sbGJhcikubWluaW11bVRodW1iTGVuZ3RoKCk7CiB9CiAKIEludFJlY3QgUmVuZGVy U2Nyb2xsYmFyVGhlbWU6OmJhY2tCdXR0b25SZWN0KFNjcm9sbGJhclRoZW1lQ2xpZW50KiBzY3Jv bGxiYXIsIFNjcm9sbGJhclBhcnQgcGFydFR5cGUsIGJvb2wpCiB7Ci0gICAgcmV0dXJuIHRvUmVu ZGVyU2Nyb2xsYmFyKHNjcm9sbGJhciktPmJ1dHRvblJlY3QocGFydFR5cGUpOworICAgIHJldHVy biBkb3duY2FzdDxSZW5kZXJTY3JvbGxiYXI+KCpzY3JvbGxiYXIpLmJ1dHRvblJlY3QocGFydFR5 cGUpOwogfQogCiBJbnRSZWN0IFJlbmRlclNjcm9sbGJhclRoZW1lOjpmb3J3YXJkQnV0dG9uUmVj dChTY3JvbGxiYXJUaGVtZUNsaWVudCogc2Nyb2xsYmFyLCBTY3JvbGxiYXJQYXJ0IHBhcnRUeXBl LCBib29sKQogewotICAgIHJldHVybiB0b1JlbmRlclNjcm9sbGJhcihzY3JvbGxiYXIpLT5idXR0 b25SZWN0KHBhcnRUeXBlKTsKKyAgICByZXR1cm4gZG93bmNhc3Q8UmVuZGVyU2Nyb2xsYmFyPigq c2Nyb2xsYmFyKS5idXR0b25SZWN0KHBhcnRUeXBlKTsKIH0KIAogSW50UmVjdCBSZW5kZXJTY3Jv bGxiYXJUaGVtZTo6dHJhY2tSZWN0KFNjcm9sbGJhclRoZW1lQ2xpZW50KiBzY3JvbGxiYXIsIGJv b2wpCkBAIC04OSwxMyArODksMTMgQEAgSW50UmVjdCBSZW5kZXJTY3JvbGxiYXJUaGVtZTo6dHJh Y2tSZWN0KFNjcm9sbGJhclRoZW1lQ2xpZW50KiBzY3JvbGxiYXIsIGJvb2wpCiAgICAgaW50IGVu ZExlbmd0aDsKICAgICBidXR0b25TaXplc0Fsb25nVHJhY2tBeGlzKHNjcm9sbGJhciwgc3RhcnRM ZW5ndGgsIGVuZExlbmd0aCk7CiAgICAgCi0gICAgcmV0dXJuIHRvUmVuZGVyU2Nyb2xsYmFyKHNj cm9sbGJhciktPnRyYWNrUmVjdChzdGFydExlbmd0aCwgZW5kTGVuZ3RoKTsKKyAgICByZXR1cm4g ZG93bmNhc3Q8UmVuZGVyU2Nyb2xsYmFyPigqc2Nyb2xsYmFyKS50cmFja1JlY3Qoc3RhcnRMZW5n dGgsIGVuZExlbmd0aCk7CiB9CiAKIEludFJlY3QgUmVuZGVyU2Nyb2xsYmFyVGhlbWU6OmNvbnN0 cmFpblRyYWNrUmVjdFRvVHJhY2tQaWVjZXMoU2Nyb2xsYmFyVGhlbWVDbGllbnQqIHNjcm9sbGJh ciwgY29uc3QgSW50UmVjdCYgcmVjdCkKIHsgCi0gICAgSW50UmVjdCBiYWNrUmVjdCA9IHRvUmVu ZGVyU2Nyb2xsYmFyKHNjcm9sbGJhciktPnRyYWNrUGllY2VSZWN0V2l0aE1hcmdpbnMoQmFja1Ry YWNrUGFydCwgcmVjdCk7Ci0gICAgSW50UmVjdCBmb3J3YXJkUmVjdCA9IHRvUmVuZGVyU2Nyb2xs YmFyKHNjcm9sbGJhciktPnRyYWNrUGllY2VSZWN0V2l0aE1hcmdpbnMoRm9yd2FyZFRyYWNrUGFy dCwgcmVjdCk7CisgICAgSW50UmVjdCBiYWNrUmVjdCA9IGRvd25jYXN0PFJlbmRlclNjcm9sbGJh cj4oKnNjcm9sbGJhcikudHJhY2tQaWVjZVJlY3RXaXRoTWFyZ2lucyhCYWNrVHJhY2tQYXJ0LCBy ZWN0KTsKKyAgICBJbnRSZWN0IGZvcndhcmRSZWN0ID0gZG93bmNhc3Q8UmVuZGVyU2Nyb2xsYmFy Pigqc2Nyb2xsYmFyKS50cmFja1BpZWNlUmVjdFdpdGhNYXJnaW5zKEZvcndhcmRUcmFja1BhcnQs IHJlY3QpOwogICAgIEludFJlY3QgcmVzdWx0ID0gcmVjdDsKICAgICBpZiAoc2Nyb2xsYmFyLT5v cmllbnRhdGlvbigpID09IEhvcml6b250YWxTY3JvbGxiYXIpIHsKICAgICAgICAgcmVzdWx0LnNl dFgoYmFja1JlY3QueCgpKTsKQEAgLTEwOSw3ICsxMDksNyBAQCBJbnRSZWN0IFJlbmRlclNjcm9s bGJhclRoZW1lOjpjb25zdHJhaW5UcmFja1JlY3RUb1RyYWNrUGllY2VzKFNjcm9sbGJhclRoZW1l Q2xpZQogCiB2b2lkIFJlbmRlclNjcm9sbGJhclRoZW1lOjp3aWxsUGFpbnRTY3JvbGxiYXIoR3Jh cGhpY3NDb250ZXh0KiBjb250ZXh0LCBTY3JvbGxiYXJUaGVtZUNsaWVudCogc2Nyb2xsYmFyKQog ewotICAgIGZsb2F0IG9wYWNpdHkgPSB0b1JlbmRlclNjcm9sbGJhcihzY3JvbGxiYXIpLT5vcGFj aXR5KCk7CisgICAgZmxvYXQgb3BhY2l0eSA9IGRvd25jYXN0PFJlbmRlclNjcm9sbGJhcj4oKnNj cm9sbGJhcikub3BhY2l0eSgpOwogICAgIGlmIChvcGFjaXR5ICE9IDEpIHsKICAgICAgICAgY29u dGV4dC0+c2F2ZSgpOwogICAgICAgICBjb250ZXh0LT5jbGlwKHNjcm9sbGJhci0+ZnJhbWVSZWN0 KCkpOwpAQCAtMTE5LDcgKzExOSw3IEBAIHZvaWQgUmVuZGVyU2Nyb2xsYmFyVGhlbWU6OndpbGxQ YWludFNjcm9sbGJhcihHcmFwaGljc0NvbnRleHQqIGNvbnRleHQsIFNjcm9sbGJhCiAKIHZvaWQg UmVuZGVyU2Nyb2xsYmFyVGhlbWU6OmRpZFBhaW50U2Nyb2xsYmFyKEdyYXBoaWNzQ29udGV4dCog Y29udGV4dCwgU2Nyb2xsYmFyVGhlbWVDbGllbnQqIHNjcm9sbGJhcikKIHsKLSAgICBmbG9hdCBv cGFjaXR5ID0gdG9SZW5kZXJTY3JvbGxiYXIoc2Nyb2xsYmFyKS0+b3BhY2l0eSgpOworICAgIGZs b2F0IG9wYWNpdHkgPSBkb3duY2FzdDxSZW5kZXJTY3JvbGxiYXI+KCpzY3JvbGxiYXIpLm9wYWNp dHkoKTsKICAgICBpZiAob3BhY2l0eSAhPSAxKSB7CiAgICAgICAgIGNvbnRleHQtPmVuZFRyYW5z cGFyZW5jeUxheWVyKCk7CiAgICAgICAgIGNvbnRleHQtPnJlc3RvcmUoKTsKQEAgLTEzNCwyNyAr MTM0LDI3IEBAIHZvaWQgUmVuZGVyU2Nyb2xsYmFyVGhlbWU6OnBhaW50U2Nyb2xsQ29ybmVyKFNj cm9sbFZpZXcqLCBHcmFwaGljc0NvbnRleHQqIGNvbnRlCiAKIHZvaWQgUmVuZGVyU2Nyb2xsYmFy VGhlbWU6OnBhaW50U2Nyb2xsYmFyQmFja2dyb3VuZChHcmFwaGljc0NvbnRleHQqIGNvbnRleHQs IFNjcm9sbGJhclRoZW1lQ2xpZW50KiBzY3JvbGxiYXIpCiB7Ci0gICAgdG9SZW5kZXJTY3JvbGxi YXIoc2Nyb2xsYmFyKS0+cGFpbnRQYXJ0KGNvbnRleHQsIFNjcm9sbGJhckJHUGFydCwgc2Nyb2xs YmFyLT5mcmFtZVJlY3QoKSk7CisgICAgZG93bmNhc3Q8UmVuZGVyU2Nyb2xsYmFyPigqc2Nyb2xs YmFyKS5wYWludFBhcnQoY29udGV4dCwgU2Nyb2xsYmFyQkdQYXJ0LCBzY3JvbGxiYXItPmZyYW1l UmVjdCgpKTsKIH0KIAogdm9pZCBSZW5kZXJTY3JvbGxiYXJUaGVtZTo6cGFpbnRUcmFja0JhY2tn cm91bmQoR3JhcGhpY3NDb250ZXh0KiBjb250ZXh0LCBTY3JvbGxiYXJUaGVtZUNsaWVudCogc2Ny b2xsYmFyLCBjb25zdCBJbnRSZWN0JiByZWN0KQogewotICAgIHRvUmVuZGVyU2Nyb2xsYmFyKHNj cm9sbGJhciktPnBhaW50UGFydChjb250ZXh0LCBUcmFja0JHUGFydCwgcmVjdCk7CisgICAgZG93 bmNhc3Q8UmVuZGVyU2Nyb2xsYmFyPigqc2Nyb2xsYmFyKS5wYWludFBhcnQoY29udGV4dCwgVHJh Y2tCR1BhcnQsIHJlY3QpOwogfQogCiB2b2lkIFJlbmRlclNjcm9sbGJhclRoZW1lOjpwYWludFRy YWNrUGllY2UoR3JhcGhpY3NDb250ZXh0KiBjb250ZXh0LCBTY3JvbGxiYXJUaGVtZUNsaWVudCog c2Nyb2xsYmFyLCBjb25zdCBJbnRSZWN0JiByZWN0LCBTY3JvbGxiYXJQYXJ0IHBhcnQpCiB7Ci0g ICAgdG9SZW5kZXJTY3JvbGxiYXIoc2Nyb2xsYmFyKS0+cGFpbnRQYXJ0KGNvbnRleHQsIHBhcnQs IHJlY3QpOworICAgIGRvd25jYXN0PFJlbmRlclNjcm9sbGJhcj4oKnNjcm9sbGJhcikucGFpbnRQ YXJ0KGNvbnRleHQsIHBhcnQsIHJlY3QpOwogfQogCiB2b2lkIFJlbmRlclNjcm9sbGJhclRoZW1l OjpwYWludEJ1dHRvbihHcmFwaGljc0NvbnRleHQqIGNvbnRleHQsIFNjcm9sbGJhclRoZW1lQ2xp ZW50KiBzY3JvbGxiYXIsIGNvbnN0IEludFJlY3QmIHJlY3QsIFNjcm9sbGJhclBhcnQgcGFydCkK IHsKLSAgICB0b1JlbmRlclNjcm9sbGJhcihzY3JvbGxiYXIpLT5wYWludFBhcnQoY29udGV4dCwg cGFydCwgcmVjdCk7CisgICAgZG93bmNhc3Q8UmVuZGVyU2Nyb2xsYmFyPigqc2Nyb2xsYmFyKS5w YWludFBhcnQoY29udGV4dCwgcGFydCwgcmVjdCk7CiB9CiAKIHZvaWQgUmVuZGVyU2Nyb2xsYmFy VGhlbWU6OnBhaW50VGh1bWIoR3JhcGhpY3NDb250ZXh0KiBjb250ZXh0LCBTY3JvbGxiYXJUaGVt ZUNsaWVudCogc2Nyb2xsYmFyLCBjb25zdCBJbnRSZWN0JiByZWN0KQogewotICAgIHRvUmVuZGVy U2Nyb2xsYmFyKHNjcm9sbGJhciktPnBhaW50UGFydChjb250ZXh0LCBUaHVtYlBhcnQsIHJlY3Qp OworICAgIGRvd25jYXN0PFJlbmRlclNjcm9sbGJhcj4oKnNjcm9sbGJhcikucGFpbnRQYXJ0KGNv bnRleHQsIFRodW1iUGFydCwgcmVjdCk7CiB9CiAKIHZvaWQgUmVuZGVyU2Nyb2xsYmFyVGhlbWU6 OnBhaW50VGlja21hcmtzKEdyYXBoaWNzQ29udGV4dCogY29udGV4dCwgU2Nyb2xsYmFyVGhlbWVD bGllbnQqIHNjcm9sbGJhciwgY29uc3QgSW50UmVjdCYgcmVjdCkKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9zdmcvU1ZHSW5saW5lRmxvd0JveC5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvc3ZnL1NWR0lubGluZUZsb3dCb3guY3BwCmluZGV4IGYyYzk4ODhhMWEz YjQ4MDQwNmVhMTc4YTRjOTc3OTFlNjg1ZTNmM2UuLmE4YmMwMzdmYzcyNzNmMmY5N2FhMmU4NzRh YjVlNGYxODc3NzJjYTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdmcv U1ZHSW5saW5lRmxvd0JveC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9T VkdJbmxpbmVGbG93Qm94LmNwcApAQCAtMTI4LDcgKzEyOCw3IEBAIHZvaWQgU1ZHSW5saW5lRmxv d0JveDo6Y29tcHV0ZVRleHRNYXRjaE1hcmtlclJlY3RGb3JSZW5kZXJlcihSZW5kZXJTVkdJbmxp bmVUZXh0CiAgICAgICAgICAgICB9CiAgICAgICAgIH0KIAotICAgICAgICB0b1JlbmRlcmVkRG9j dW1lbnRNYXJrZXIobWFya2VyKS0+c2V0UmVuZGVyZWRSZWN0KHRleHRSZW5kZXJlci0+bG9jYWxU b0Fic29sdXRlUXVhZChtYXJrZXJSZWN0KS5lbmNsb3NpbmdCb3VuZGluZ0JveCgpKTsKKyAgICAg ICAgZG93bmNhc3Q8UmVuZGVyZWREb2N1bWVudE1hcmtlcj4oKm1hcmtlcikuc2V0UmVuZGVyZWRS ZWN0KHRleHRSZW5kZXJlci0+bG9jYWxUb0Fic29sdXRlUXVhZChtYXJrZXJSZWN0KS5lbmNsb3Np bmdCb3VuZGluZ0JveCgpKTsKICAgICB9CiB9CiAK 240072 2014-10-18 14:45:31 -0700 2014-10-19 20:25:01 -0700 Patch bug-137854-20141018144536.patch text/plain 7559 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMTc0ODYzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjcxMzE1ZDk5ZDE3ZWIx YjZmMTVlZjFiY2ZlMjQ2ZGNkN2JlNzc2Zi4uZmNkMjkxZTQ3MWM1YThmZTNmMWNjNjM0OWE4YzZh NjNhYjk5YTc1ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDM0IEBACiAyMDE0LTEwLTE4ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CiAKKyAgICAgICAgVXNlIFNQRUNJQUxJWkVfVFlQ RV9UUkFJVFNfKigpIG1hY3JvIGZvciBSZW5kZXJTY3JvbGxiYXIKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzNzg1NAorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFVzZSBTUEVDSUFMSVpFX1RZUEVfVFJBSVRT XyooKSBtYWNybyBmb3IgUmVuZGVyU2Nyb2xsYmFyIGluc3RlYWQgb2YgYQorICAgICAgICBjdXN0 b20gdG9SZW5kZXJTY3JvbGxiYXIoKSBmdW5jdGlvbiwgZm9yIGNvbnNpc3RlbmN5LgorCisgICAg ICAgIE5vIG5ldyB0ZXN0cywgbm8gYmVoYXZpb3IgY2hhbmdlLgorCisgICAgICAgICogcmVuZGVy aW5nL1JlbmRlclNjcm9sbGJhci5oOgorICAgICAgICAoaXNUeXBlKToKKyAgICAgICAgKFdlYkNv cmU6OnRvUmVuZGVyU2Nyb2xsYmFyKTogRGVsZXRlZC4KKyAgICAgICAgKiByZW5kZXJpbmcvUmVu ZGVyU2Nyb2xsYmFyVGhlbWUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyU2Nyb2xsYmFy VGhlbWU6Om1pbmltdW1UaHVtYkxlbmd0aCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJTY3Jv bGxiYXJUaGVtZTo6YmFja0J1dHRvblJlY3QpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyU2Ny b2xsYmFyVGhlbWU6OmZvcndhcmRCdXR0b25SZWN0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRl clNjcm9sbGJhclRoZW1lOjp0cmFja1JlY3QpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyU2Ny b2xsYmFyVGhlbWU6OmNvbnN0cmFpblRyYWNrUmVjdFRvVHJhY2tQaWVjZXMpOgorICAgICAgICAo V2ViQ29yZTo6UmVuZGVyU2Nyb2xsYmFyVGhlbWU6OndpbGxQYWludFNjcm9sbGJhcik6CisgICAg ICAgIChXZWJDb3JlOjpSZW5kZXJTY3JvbGxiYXJUaGVtZTo6ZGlkUGFpbnRTY3JvbGxiYXIpOgor ICAgICAgICAoV2ViQ29yZTo6UmVuZGVyU2Nyb2xsYmFyVGhlbWU6OnBhaW50U2Nyb2xsYmFyQmFj a2dyb3VuZCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJTY3JvbGxiYXJUaGVtZTo6cGFpbnRU cmFja0JhY2tncm91bmQpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyU2Nyb2xsYmFyVGhlbWU6 OnBhaW50VHJhY2tQaWVjZSk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJTY3JvbGxiYXJUaGVt ZTo6cGFpbnRCdXR0b24pOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyU2Nyb2xsYmFyVGhlbWU6 OnBhaW50VGh1bWIpOgorCisyMDE0LTEwLTE4ICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5j b20+CisKICAgICAgICAgW01hY10gVXNlIEZhc3QgZW51bWVyYXRpb24gY29uc2lzdGVudGx5IGlu IFdlYkZvbnRDYWNoZS5tbQogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTM3NzkxCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJTY3JvbGxiYXIuaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJTY3JvbGxi YXIuaAppbmRleCAyY2NkMjAxZWZiZmI1YzA4N2IzODBiZGFkMGVjMTZiZjVlMTFjZDk2Li5kZjEw Yjc1MmYxYWFlNTNkNTEwODVjMjRmNjk3NDQwM2JkNjZjOTE2IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyU2Nyb2xsYmFyLmgKKysrIGIvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlclNjcm9sbGJhci5oCkBAIC04OCwxNSArODgsMTAgQEAgcHJpdmF0ZToK ICAgICBIYXNoTWFwPHVuc2lnbmVkLCBSZW5kZXJQdHI8UmVuZGVyU2Nyb2xsYmFyUGFydD4+IG1f cGFydHM7CiB9OwogCi1pbmxpbmUgUmVuZGVyU2Nyb2xsYmFyKiB0b1JlbmRlclNjcm9sbGJhcihT Y3JvbGxiYXJUaGVtZUNsaWVudCogc2Nyb2xsYmFyKQotewotICAgIEFTU0VSVF9XSVRIX1NFQ1VS SVRZX0lNUExJQ0FUSU9OKCFzY3JvbGxiYXIgfHwgc2Nyb2xsYmFyLT5pc0N1c3RvbVNjcm9sbGJh cigpKTsKLSAgICByZXR1cm4gc3RhdGljX2Nhc3Q8UmVuZGVyU2Nyb2xsYmFyKj4oc2Nyb2xsYmFy KTsKLX0KLQotLy8gVGhpcyB3aWxsIGNhdGNoIGFueW9uZSBkb2luZyBhbiB1bm5lY2Vzc2FyeSBj YXN0Lgotdm9pZCB0b1JlbmRlclNjcm9sbGJhcihjb25zdCBSZW5kZXJTY3JvbGxiYXIqKTsKLQog fSAvLyBuYW1lc3BhY2UgV2ViQ29yZQogCitTUEVDSUFMSVpFX1RZUEVfVFJBSVRTX0JFR0lOKFdl YkNvcmU6OlJlbmRlclNjcm9sbGJhcikKKyAgICBzdGF0aWMgYm9vbCBpc1R5cGUoY29uc3QgV2Vi Q29yZTo6U2Nyb2xsYmFyVGhlbWVDbGllbnQmIHNjcm9sbGJhcikgeyByZXR1cm4gc2Nyb2xsYmFy LmlzQ3VzdG9tU2Nyb2xsYmFyKCk7IH0KK1NQRUNJQUxJWkVfVFlQRV9UUkFJVFNfRU5EKCkKKwog I2VuZGlmIC8vIFJlbmRlclNjcm9sbGJhcl9oCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyU2Nyb2xsYmFyVGhlbWUuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlclNjcm9sbGJhclRoZW1lLmNwcAppbmRleCA3OWI1ZDgyMGY2MWRkNmY0ZGZhMjgy OWFlOWVhNGFiNTJmZTU0YTY4Li5iNjdiMThiMjhlOWZiODNkM2RiZWM0ODFmODdjOGM3OTUyMmRk NzEzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyU2Nyb2xsYmFy VGhlbWUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJTY3JvbGxiYXJU aGVtZS5jcHAKQEAgLTY3LDE3ICs2NywxNyBAQCBib29sIFJlbmRlclNjcm9sbGJhclRoZW1lOjpo YXNUaHVtYihTY3JvbGxiYXJUaGVtZUNsaWVudCogc2Nyb2xsYmFyKQogCiBpbnQgUmVuZGVyU2Ny b2xsYmFyVGhlbWU6Om1pbmltdW1UaHVtYkxlbmd0aChTY3JvbGxiYXJUaGVtZUNsaWVudCogc2Ny b2xsYmFyKQogewotICAgIHJldHVybiB0b1JlbmRlclNjcm9sbGJhcihzY3JvbGxiYXIpLT5taW5p bXVtVGh1bWJMZW5ndGgoKTsKKyAgICByZXR1cm4gZG93bmNhc3Q8UmVuZGVyU2Nyb2xsYmFyPigq c2Nyb2xsYmFyKS5taW5pbXVtVGh1bWJMZW5ndGgoKTsKIH0KIAogSW50UmVjdCBSZW5kZXJTY3Jv bGxiYXJUaGVtZTo6YmFja0J1dHRvblJlY3QoU2Nyb2xsYmFyVGhlbWVDbGllbnQqIHNjcm9sbGJh ciwgU2Nyb2xsYmFyUGFydCBwYXJ0VHlwZSwgYm9vbCkKIHsKLSAgICByZXR1cm4gdG9SZW5kZXJT Y3JvbGxiYXIoc2Nyb2xsYmFyKS0+YnV0dG9uUmVjdChwYXJ0VHlwZSk7CisgICAgcmV0dXJuIGRv d25jYXN0PFJlbmRlclNjcm9sbGJhcj4oKnNjcm9sbGJhcikuYnV0dG9uUmVjdChwYXJ0VHlwZSk7 CiB9CiAKIEludFJlY3QgUmVuZGVyU2Nyb2xsYmFyVGhlbWU6OmZvcndhcmRCdXR0b25SZWN0KFNj cm9sbGJhclRoZW1lQ2xpZW50KiBzY3JvbGxiYXIsIFNjcm9sbGJhclBhcnQgcGFydFR5cGUsIGJv b2wpCiB7Ci0gICAgcmV0dXJuIHRvUmVuZGVyU2Nyb2xsYmFyKHNjcm9sbGJhciktPmJ1dHRvblJl Y3QocGFydFR5cGUpOworICAgIHJldHVybiBkb3duY2FzdDxSZW5kZXJTY3JvbGxiYXI+KCpzY3Jv bGxiYXIpLmJ1dHRvblJlY3QocGFydFR5cGUpOwogfQogCiBJbnRSZWN0IFJlbmRlclNjcm9sbGJh clRoZW1lOjp0cmFja1JlY3QoU2Nyb2xsYmFyVGhlbWVDbGllbnQqIHNjcm9sbGJhciwgYm9vbCkK QEAgLTg5LDEzICs4OSwxMyBAQCBJbnRSZWN0IFJlbmRlclNjcm9sbGJhclRoZW1lOjp0cmFja1Jl Y3QoU2Nyb2xsYmFyVGhlbWVDbGllbnQqIHNjcm9sbGJhciwgYm9vbCkKICAgICBpbnQgZW5kTGVu Z3RoOwogICAgIGJ1dHRvblNpemVzQWxvbmdUcmFja0F4aXMoc2Nyb2xsYmFyLCBzdGFydExlbmd0 aCwgZW5kTGVuZ3RoKTsKICAgICAKLSAgICByZXR1cm4gdG9SZW5kZXJTY3JvbGxiYXIoc2Nyb2xs YmFyKS0+dHJhY2tSZWN0KHN0YXJ0TGVuZ3RoLCBlbmRMZW5ndGgpOworICAgIHJldHVybiBkb3du Y2FzdDxSZW5kZXJTY3JvbGxiYXI+KCpzY3JvbGxiYXIpLnRyYWNrUmVjdChzdGFydExlbmd0aCwg ZW5kTGVuZ3RoKTsKIH0KIAogSW50UmVjdCBSZW5kZXJTY3JvbGxiYXJUaGVtZTo6Y29uc3RyYWlu VHJhY2tSZWN0VG9UcmFja1BpZWNlcyhTY3JvbGxiYXJUaGVtZUNsaWVudCogc2Nyb2xsYmFyLCBj b25zdCBJbnRSZWN0JiByZWN0KQogeyAKLSAgICBJbnRSZWN0IGJhY2tSZWN0ID0gdG9SZW5kZXJT Y3JvbGxiYXIoc2Nyb2xsYmFyKS0+dHJhY2tQaWVjZVJlY3RXaXRoTWFyZ2lucyhCYWNrVHJhY2tQ YXJ0LCByZWN0KTsKLSAgICBJbnRSZWN0IGZvcndhcmRSZWN0ID0gdG9SZW5kZXJTY3JvbGxiYXIo c2Nyb2xsYmFyKS0+dHJhY2tQaWVjZVJlY3RXaXRoTWFyZ2lucyhGb3J3YXJkVHJhY2tQYXJ0LCBy ZWN0KTsKKyAgICBJbnRSZWN0IGJhY2tSZWN0ID0gZG93bmNhc3Q8UmVuZGVyU2Nyb2xsYmFyPigq c2Nyb2xsYmFyKS50cmFja1BpZWNlUmVjdFdpdGhNYXJnaW5zKEJhY2tUcmFja1BhcnQsIHJlY3Qp OworICAgIEludFJlY3QgZm9yd2FyZFJlY3QgPSBkb3duY2FzdDxSZW5kZXJTY3JvbGxiYXI+KCpz Y3JvbGxiYXIpLnRyYWNrUGllY2VSZWN0V2l0aE1hcmdpbnMoRm9yd2FyZFRyYWNrUGFydCwgcmVj dCk7CiAgICAgSW50UmVjdCByZXN1bHQgPSByZWN0OwogICAgIGlmIChzY3JvbGxiYXItPm9yaWVu dGF0aW9uKCkgPT0gSG9yaXpvbnRhbFNjcm9sbGJhcikgewogICAgICAgICByZXN1bHQuc2V0WChi YWNrUmVjdC54KCkpOwpAQCAtMTA5LDcgKzEwOSw3IEBAIEludFJlY3QgUmVuZGVyU2Nyb2xsYmFy VGhlbWU6OmNvbnN0cmFpblRyYWNrUmVjdFRvVHJhY2tQaWVjZXMoU2Nyb2xsYmFyVGhlbWVDbGll CiAKIHZvaWQgUmVuZGVyU2Nyb2xsYmFyVGhlbWU6OndpbGxQYWludFNjcm9sbGJhcihHcmFwaGlj c0NvbnRleHQqIGNvbnRleHQsIFNjcm9sbGJhclRoZW1lQ2xpZW50KiBzY3JvbGxiYXIpCiB7Ci0g ICAgZmxvYXQgb3BhY2l0eSA9IHRvUmVuZGVyU2Nyb2xsYmFyKHNjcm9sbGJhciktPm9wYWNpdHko KTsKKyAgICBmbG9hdCBvcGFjaXR5ID0gZG93bmNhc3Q8UmVuZGVyU2Nyb2xsYmFyPigqc2Nyb2xs YmFyKS5vcGFjaXR5KCk7CiAgICAgaWYgKG9wYWNpdHkgIT0gMSkgewogICAgICAgICBjb250ZXh0 LT5zYXZlKCk7CiAgICAgICAgIGNvbnRleHQtPmNsaXAoc2Nyb2xsYmFyLT5mcmFtZVJlY3QoKSk7 CkBAIC0xMTksNyArMTE5LDcgQEAgdm9pZCBSZW5kZXJTY3JvbGxiYXJUaGVtZTo6d2lsbFBhaW50 U2Nyb2xsYmFyKEdyYXBoaWNzQ29udGV4dCogY29udGV4dCwgU2Nyb2xsYmEKIAogdm9pZCBSZW5k ZXJTY3JvbGxiYXJUaGVtZTo6ZGlkUGFpbnRTY3JvbGxiYXIoR3JhcGhpY3NDb250ZXh0KiBjb250 ZXh0LCBTY3JvbGxiYXJUaGVtZUNsaWVudCogc2Nyb2xsYmFyKQogewotICAgIGZsb2F0IG9wYWNp dHkgPSB0b1JlbmRlclNjcm9sbGJhcihzY3JvbGxiYXIpLT5vcGFjaXR5KCk7CisgICAgZmxvYXQg b3BhY2l0eSA9IGRvd25jYXN0PFJlbmRlclNjcm9sbGJhcj4oKnNjcm9sbGJhcikub3BhY2l0eSgp OwogICAgIGlmIChvcGFjaXR5ICE9IDEpIHsKICAgICAgICAgY29udGV4dC0+ZW5kVHJhbnNwYXJl bmN5TGF5ZXIoKTsKICAgICAgICAgY29udGV4dC0+cmVzdG9yZSgpOwpAQCAtMTM0LDI3ICsxMzQs MjcgQEAgdm9pZCBSZW5kZXJTY3JvbGxiYXJUaGVtZTo6cGFpbnRTY3JvbGxDb3JuZXIoU2Nyb2xs VmlldyosIEdyYXBoaWNzQ29udGV4dCogY29udGUKIAogdm9pZCBSZW5kZXJTY3JvbGxiYXJUaGVt ZTo6cGFpbnRTY3JvbGxiYXJCYWNrZ3JvdW5kKEdyYXBoaWNzQ29udGV4dCogY29udGV4dCwgU2Ny b2xsYmFyVGhlbWVDbGllbnQqIHNjcm9sbGJhcikKIHsKLSAgICB0b1JlbmRlclNjcm9sbGJhcihz Y3JvbGxiYXIpLT5wYWludFBhcnQoY29udGV4dCwgU2Nyb2xsYmFyQkdQYXJ0LCBzY3JvbGxiYXIt PmZyYW1lUmVjdCgpKTsKKyAgICBkb3duY2FzdDxSZW5kZXJTY3JvbGxiYXI+KCpzY3JvbGxiYXIp LnBhaW50UGFydChjb250ZXh0LCBTY3JvbGxiYXJCR1BhcnQsIHNjcm9sbGJhci0+ZnJhbWVSZWN0 KCkpOwogfQogCiB2b2lkIFJlbmRlclNjcm9sbGJhclRoZW1lOjpwYWludFRyYWNrQmFja2dyb3Vu ZChHcmFwaGljc0NvbnRleHQqIGNvbnRleHQsIFNjcm9sbGJhclRoZW1lQ2xpZW50KiBzY3JvbGxi YXIsIGNvbnN0IEludFJlY3QmIHJlY3QpCiB7Ci0gICAgdG9SZW5kZXJTY3JvbGxiYXIoc2Nyb2xs YmFyKS0+cGFpbnRQYXJ0KGNvbnRleHQsIFRyYWNrQkdQYXJ0LCByZWN0KTsKKyAgICBkb3duY2Fz dDxSZW5kZXJTY3JvbGxiYXI+KCpzY3JvbGxiYXIpLnBhaW50UGFydChjb250ZXh0LCBUcmFja0JH UGFydCwgcmVjdCk7CiB9CiAKIHZvaWQgUmVuZGVyU2Nyb2xsYmFyVGhlbWU6OnBhaW50VHJhY2tQ aWVjZShHcmFwaGljc0NvbnRleHQqIGNvbnRleHQsIFNjcm9sbGJhclRoZW1lQ2xpZW50KiBzY3Jv bGxiYXIsIGNvbnN0IEludFJlY3QmIHJlY3QsIFNjcm9sbGJhclBhcnQgcGFydCkKIHsKLSAgICB0 b1JlbmRlclNjcm9sbGJhcihzY3JvbGxiYXIpLT5wYWludFBhcnQoY29udGV4dCwgcGFydCwgcmVj dCk7CisgICAgZG93bmNhc3Q8UmVuZGVyU2Nyb2xsYmFyPigqc2Nyb2xsYmFyKS5wYWludFBhcnQo Y29udGV4dCwgcGFydCwgcmVjdCk7CiB9CiAKIHZvaWQgUmVuZGVyU2Nyb2xsYmFyVGhlbWU6OnBh aW50QnV0dG9uKEdyYXBoaWNzQ29udGV4dCogY29udGV4dCwgU2Nyb2xsYmFyVGhlbWVDbGllbnQq IHNjcm9sbGJhciwgY29uc3QgSW50UmVjdCYgcmVjdCwgU2Nyb2xsYmFyUGFydCBwYXJ0KQogewot ICAgIHRvUmVuZGVyU2Nyb2xsYmFyKHNjcm9sbGJhciktPnBhaW50UGFydChjb250ZXh0LCBwYXJ0 LCByZWN0KTsKKyAgICBkb3duY2FzdDxSZW5kZXJTY3JvbGxiYXI+KCpzY3JvbGxiYXIpLnBhaW50 UGFydChjb250ZXh0LCBwYXJ0LCByZWN0KTsKIH0KIAogdm9pZCBSZW5kZXJTY3JvbGxiYXJUaGVt ZTo6cGFpbnRUaHVtYihHcmFwaGljc0NvbnRleHQqIGNvbnRleHQsIFNjcm9sbGJhclRoZW1lQ2xp ZW50KiBzY3JvbGxiYXIsIGNvbnN0IEludFJlY3QmIHJlY3QpCiB7Ci0gICAgdG9SZW5kZXJTY3Jv bGxiYXIoc2Nyb2xsYmFyKS0+cGFpbnRQYXJ0KGNvbnRleHQsIFRodW1iUGFydCwgcmVjdCk7Cisg ICAgZG93bmNhc3Q8UmVuZGVyU2Nyb2xsYmFyPigqc2Nyb2xsYmFyKS5wYWludFBhcnQoY29udGV4 dCwgVGh1bWJQYXJ0LCByZWN0KTsKIH0KIAogdm9pZCBSZW5kZXJTY3JvbGxiYXJUaGVtZTo6cGFp bnRUaWNrbWFya3MoR3JhcGhpY3NDb250ZXh0KiBjb250ZXh0LCBTY3JvbGxiYXJUaGVtZUNsaWVu dCogc2Nyb2xsYmFyLCBjb25zdCBJbnRSZWN0JiByZWN0KQo=