44184 2010-08-18 10:04:20 -0700 CanvasStyle method naming cleanup 2010-08-18 10:56:48 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) All All RESOLVED FIXED P3 Normal --- 1 kling webkit-unassigned abarth darin eric webkit.review.bot oldest_to_newest 266183 0 kling 2010-08-18 10:04:20 -0700 As suggested by Darin on bug 43718, the CanvasStyle::create() overloads should be renamed to reflect what they're constructing the CanvasStyle objects from. The same goes for isEquivalentColor() overloads. 266188 1 64722 kling 2010-08-18 10:08:42 -0700 Created attachment 64722 Proposed patch 266205 2 64722 darin 2010-08-18 10:21:34 -0700 Comment on attachment 64722 Proposed patch > + static PassRefPtr<CanvasStyle> createFromGradient(PassRefPtr<CanvasGradient> gradient); > + static PassRefPtr<CanvasStyle> createFromPattern(PassRefPtr<CanvasPattern> pattern); No need for argument names in these two functions, since the type already expresses the name of the argument. 266210 3 kling 2010-08-18 10:28:44 -0700 Committed r65613: <http://trac.webkit.org/changeset/65613> 266249 4 webkit.review.bot 2010-08-18 10:56:48 -0700 http://trac.webkit.org/changeset/65613 might have broken SnowLeopard Intel Release (Tests) 64722 2010-08-18 10:08:42 -0700 2010-08-18 10:21:34 -0700 Proposed patch bug-44184.diff text/plain 14874 kling ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg ZjlkOTQ3NC4uMTZlZmMyNyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwzOSBAQAorMjAxMC0wOC0xOCAgQW5kcmVhcyBLbGlu ZyAgPGFuZHJlYXMua2xpbmdAbm9raWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIENhbnZhc1N0eWxlIG1ldGhvZCBuYW1pbmcgY2xlYW51cAor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDQxODQKKwor ICAgICAgICBSZW5hbWVkIHRoZSB2YXJpb3VzIGNyZWF0ZSgpIG92ZXJsb2FkcyB0byByZWZsZWN0 IHdoYXQgdGhleSdyZQorICAgICAgICBjb25zdHJ1Y3RpbmcgdGhlIENhbnZhc1N0eWxlIGZyb20u CisKKyAgICAgICAgVGhlIHVudXNlZCBDYW52YXNTdHlsZTo6Y3JlYXRlKGdyYXlMZXZlbCkgYW5k IGFjY29tcGFueWluZyBjb25zdHJ1Y3RvcgorICAgICAgICB3ZXJlIHJlbW92ZWQuCisKKyAgICAg ICAgQWxzbyByZW5hbWVkIHRoZSBpc0VxdWl2YWxlbnRDb2xvciBvdmVybG9hZHMgdG8gaXNFcXVp dmFsZW50e1JHQkEsQ01ZS0F9CisKKyAgICAgICAgKiBiaW5kaW5ncy9qcy9KU0NhbnZhc1JlbmRl cmluZ0NvbnRleHQyREN1c3RvbS5jcHA6CisgICAgICAgIChXZWJDb3JlOjp0b0hUTUxDYW52YXNT dHlsZSk6CisgICAgICAgICogYmluZGluZ3MvdjgvY3VzdG9tL1Y4Q2FudmFzUmVuZGVyaW5nQ29u dGV4dDJEQ3VzdG9tLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OnRvQ2FudmFzU3R5bGUpOgorICAg ICAgICAqIGh0bWwvY2FudmFzL0NhbnZhc1JlbmRlcmluZ0NvbnRleHQyRC5jcHA6CisgICAgICAg IChXZWJDb3JlOjpDYW52YXNSZW5kZXJpbmdDb250ZXh0MkQ6OlN0YXRlOjpTdGF0ZSk6CisgICAg ICAgIChXZWJDb3JlOjpDYW52YXNSZW5kZXJpbmdDb250ZXh0MkQ6OnNldFN0cm9rZUNvbG9yKToK KyAgICAgICAgKFdlYkNvcmU6OkNhbnZhc1JlbmRlcmluZ0NvbnRleHQyRDo6c2V0RmlsbENvbG9y KToKKyAgICAgICAgKiBodG1sL2NhbnZhcy9DYW52YXNTdHlsZS5jcHA6CisgICAgICAgIChXZWJD b3JlOjpDYW52YXNTdHlsZTo6Y3JlYXRlRnJvbVN0cmluZyk6CisgICAgICAgIChXZWJDb3JlOjpD YW52YXNTdHlsZTo6Y3JlYXRlRnJvbVN0cmluZ1dpdGhPdmVycmlkZUFscGhhKToKKyAgICAgICAg KFdlYkNvcmU6OkNhbnZhc1N0eWxlOjpjcmVhdGVGcm9tR3JhZGllbnQpOgorICAgICAgICAoV2Vi Q29yZTo6Q2FudmFzU3R5bGU6OmNyZWF0ZUZyb21QYXR0ZXJuKToKKyAgICAgICAgKFdlYkNvcmU6 OkNhbnZhc1N0eWxlOjppc0VxdWl2YWxlbnRSR0JBKToKKyAgICAgICAgKFdlYkNvcmU6OkNhbnZh c1N0eWxlOjppc0VxdWl2YWxlbnRDTVlLQSk6CisgICAgICAgICogaHRtbC9jYW52YXMvQ2FudmFz U3R5bGUuaDoKKyAgICAgICAgKFdlYkNvcmU6OkNhbnZhc1N0eWxlOjpjcmVhdGVGcm9tUkdCQSk6 CisgICAgICAgIChXZWJDb3JlOjpDYW52YXNTdHlsZTo6Y3JlYXRlRnJvbUdyYXlMZXZlbFdpdGhB bHBoYSk6CisgICAgICAgIChXZWJDb3JlOjpDYW52YXNTdHlsZTo6Y3JlYXRlRnJvbVJHQkFDaGFu bmVscyk6CisgICAgICAgIChXZWJDb3JlOjpDYW52YXNTdHlsZTo6Y3JlYXRlRnJvbUNNWUtBQ2hh bm5lbHMpOgorCiAyMDEwLTA4LTE4ICBTaGVyaWZmIEJvdCAgPHdlYmtpdC5yZXZpZXcuYm90QGdt YWlsLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkLCByb2xsaW5nIG91dCByNjU2MDMuCmRpZmYg LS1naXQgYS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTQ2FudmFzUmVuZGVyaW5nQ29udGV4dDJEQ3Vz dG9tLmNwcCBiL1dlYkNvcmUvYmluZGluZ3MvanMvSlNDYW52YXNSZW5kZXJpbmdDb250ZXh0MkRD dXN0b20uY3BwCmluZGV4IDgyMjFmZWQuLjUzMmIzOGIgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvYmlu ZGluZ3MvanMvSlNDYW52YXNSZW5kZXJpbmdDb250ZXh0MkRDdXN0b20uY3BwCisrKyBiL1dlYkNv cmUvYmluZGluZ3MvanMvSlNDYW52YXNSZW5kZXJpbmdDb250ZXh0MkRDdXN0b20uY3BwCkBAIC01 Nyw5ICs1Nyw5IEBAIHN0YXRpYyBQYXNzUmVmUHRyPENhbnZhc1N0eWxlPiB0b0hUTUxDYW52YXNT dHlsZShFeGVjU3RhdGUqLCBKU1ZhbHVlIHZhbHVlKQogICAgICAgICByZXR1cm4gMDsKICAgICBK U09iamVjdCogb2JqZWN0ID0gYXNPYmplY3QodmFsdWUpOwogICAgIGlmIChvYmplY3QtPmluaGVy aXRzKCZKU0NhbnZhc0dyYWRpZW50OjpzX2luZm8pKQotICAgICAgICByZXR1cm4gQ2FudmFzU3R5 bGU6OmNyZWF0ZShzdGF0aWNfY2FzdDxKU0NhbnZhc0dyYWRpZW50Kj4ob2JqZWN0KS0+aW1wbCgp KTsKKyAgICAgICAgcmV0dXJuIENhbnZhc1N0eWxlOjpjcmVhdGVGcm9tR3JhZGllbnQoc3RhdGlj X2Nhc3Q8SlNDYW52YXNHcmFkaWVudCo+KG9iamVjdCktPmltcGwoKSk7CiAgICAgaWYgKG9iamVj dC0+aW5oZXJpdHMoJkpTQ2FudmFzUGF0dGVybjo6c19pbmZvKSkKLSAgICAgICAgcmV0dXJuIENh bnZhc1N0eWxlOjpjcmVhdGUoc3RhdGljX2Nhc3Q8SlNDYW52YXNQYXR0ZXJuKj4ob2JqZWN0KS0+ aW1wbCgpKTsKKyAgICAgICAgcmV0dXJuIENhbnZhc1N0eWxlOjpjcmVhdGVGcm9tUGF0dGVybihz dGF0aWNfY2FzdDxKU0NhbnZhc1BhdHRlcm4qPihvYmplY3QpLT5pbXBsKCkpOwogICAgIHJldHVy biAwOwogfQogCmRpZmYgLS1naXQgYS9XZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOENhbnZh c1JlbmRlcmluZ0NvbnRleHQyREN1c3RvbS5jcHAgYi9XZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3Rv bS9WOENhbnZhc1JlbmRlcmluZ0NvbnRleHQyREN1c3RvbS5jcHAKaW5kZXggMjZmYzYyNi4uMzQ5 MTE3MCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhDYW52YXNSZW5k ZXJpbmdDb250ZXh0MkRDdXN0b20uY3BwCisrKyBiL1dlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9t L1Y4Q2FudmFzUmVuZGVyaW5nQ29udGV4dDJEQ3VzdG9tLmNwcApAQCAtNjMsMTMgKzYzLDEzIEBA IHN0YXRpYyB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4gdG9WOE9iamVjdChDYW52YXNTdHlsZSogc3R5 bGUpCiBzdGF0aWMgUGFzc1JlZlB0cjxDYW52YXNTdHlsZT4gdG9DYW52YXNTdHlsZSh2ODo6SGFu ZGxlPHY4OjpWYWx1ZT4gdmFsdWUpCiB7CiAgICAgaWYgKHZhbHVlLT5Jc1N0cmluZygpKQotICAg ICAgICByZXR1cm4gQ2FudmFzU3R5bGU6OmNyZWF0ZSh0b1dlYkNvcmVTdHJpbmcodmFsdWUpKTsK KyAgICAgICAgcmV0dXJuIENhbnZhc1N0eWxlOjpjcmVhdGVGcm9tU3RyaW5nKHRvV2ViQ29yZVN0 cmluZyh2YWx1ZSkpOwogCiAgICAgaWYgKFY4Q2FudmFzR3JhZGllbnQ6Okhhc0luc3RhbmNlKHZh bHVlKSkKLSAgICAgICAgcmV0dXJuIENhbnZhc1N0eWxlOjpjcmVhdGUoVjhDYW52YXNHcmFkaWVu dDo6dG9OYXRpdmUodjg6OkhhbmRsZTx2ODo6T2JqZWN0Pjo6Q2FzdCh2YWx1ZSkpKTsKKyAgICAg ICAgcmV0dXJuIENhbnZhc1N0eWxlOjpjcmVhdGVGcm9tR3JhZGllbnQoVjhDYW52YXNHcmFkaWVu dDo6dG9OYXRpdmUodjg6OkhhbmRsZTx2ODo6T2JqZWN0Pjo6Q2FzdCh2YWx1ZSkpKTsKIAogICAg IGlmIChWOENhbnZhc1BhdHRlcm46Okhhc0luc3RhbmNlKHZhbHVlKSkKLSAgICAgICAgcmV0dXJu IENhbnZhc1N0eWxlOjpjcmVhdGUoVjhDYW52YXNQYXR0ZXJuOjp0b05hdGl2ZSh2ODo6SGFuZGxl PHY4OjpPYmplY3Q+OjpDYXN0KHZhbHVlKSkpOworICAgICAgICByZXR1cm4gQ2FudmFzU3R5bGU6 OmNyZWF0ZUZyb21QYXR0ZXJuKFY4Q2FudmFzUGF0dGVybjo6dG9OYXRpdmUodjg6OkhhbmRsZTx2 ODo6T2JqZWN0Pjo6Q2FzdCh2YWx1ZSkpKTsKIAogICAgIHJldHVybiAwOwogfQpkaWZmIC0tZ2l0 IGEvV2ViQ29yZS9odG1sL2NhbnZhcy9DYW52YXNSZW5kZXJpbmdDb250ZXh0MkQuY3BwIGIvV2Vi Q29yZS9odG1sL2NhbnZhcy9DYW52YXNSZW5kZXJpbmdDb250ZXh0MkQuY3BwCmluZGV4IDVmZjlh NzIuLjU4ZWMxZDAgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaHRtbC9jYW52YXMvQ2FudmFzUmVuZGVy aW5nQ29udGV4dDJELmNwcAorKysgYi9XZWJDb3JlL2h0bWwvY2FudmFzL0NhbnZhc1JlbmRlcmlu Z0NvbnRleHQyRC5jcHAKQEAgLTE2Nyw4ICsxNjcsOCBAQCB2b2lkIENhbnZhc1JlbmRlcmluZ0Nv bnRleHQyRDo6cmVzZXQoKQogfQogCiBDYW52YXNSZW5kZXJpbmdDb250ZXh0MkQ6OlN0YXRlOjpT dGF0ZSgpCi0gICAgOiBtX3N0cm9rZVN0eWxlKENhbnZhc1N0eWxlOjpjcmVhdGUoQ29sb3I6OmJs YWNrKSkKLSAgICAsIG1fZmlsbFN0eWxlKENhbnZhc1N0eWxlOjpjcmVhdGUoQ29sb3I6OmJsYWNr KSkKKyAgICA6IG1fc3Ryb2tlU3R5bGUoQ2FudmFzU3R5bGU6OmNyZWF0ZUZyb21SR0JBKENvbG9y OjpibGFjaykpCisgICAgLCBtX2ZpbGxTdHlsZShDYW52YXNTdHlsZTo6Y3JlYXRlRnJvbVJHQkEo Q29sb3I6OmJsYWNrKSkKICAgICAsIG1fbGluZVdpZHRoKDEpCiAgICAgLCBtX2xpbmVDYXAoQnV0 dENhcCkKICAgICAsIG1fbGluZUpvaW4oTWl0ZXJKb2luKQpAQCAtNTUwLDgyICs1NTAsODIgQEAg dm9pZCBDYW52YXNSZW5kZXJpbmdDb250ZXh0MkQ6OnNldFN0cm9rZUNvbG9yKGNvbnN0IFN0cmlu ZyYgY29sb3IpCiB7CiAgICAgaWYgKGNvbG9yID09IHN0YXRlKCkubV91bnBhcnNlZFN0cm9rZUNv bG9yKQogICAgICAgICByZXR1cm47Ci0gICAgc2V0U3Ryb2tlU3R5bGUoQ2FudmFzU3R5bGU6OmNy ZWF0ZShjb2xvcikpOworICAgIHNldFN0cm9rZVN0eWxlKENhbnZhc1N0eWxlOjpjcmVhdGVGcm9t U3RyaW5nKGNvbG9yKSk7CiAgICAgc3RhdGUoKS5tX3VucGFyc2VkU3Ryb2tlQ29sb3IgPSBjb2xv cjsKIH0KIAogdm9pZCBDYW52YXNSZW5kZXJpbmdDb250ZXh0MkQ6OnNldFN0cm9rZUNvbG9yKGZs b2F0IGdyYXlMZXZlbCkKIHsKLSAgICBpZiAoc3RhdGUoKS5tX3N0cm9rZVN0eWxlICYmIHN0YXRl KCkubV9zdHJva2VTdHlsZS0+aXNFcXVpdmFsZW50Q29sb3IoZ3JheUxldmVsLCBncmF5TGV2ZWws IGdyYXlMZXZlbCwgMS4wZikpCisgICAgaWYgKHN0YXRlKCkubV9zdHJva2VTdHlsZSAmJiBzdGF0 ZSgpLm1fc3Ryb2tlU3R5bGUtPmlzRXF1aXZhbGVudFJHQkEoZ3JheUxldmVsLCBncmF5TGV2ZWws IGdyYXlMZXZlbCwgMS4wZikpCiAgICAgICAgIHJldHVybjsKLSAgICBzZXRTdHJva2VTdHlsZShD YW52YXNTdHlsZTo6Y3JlYXRlKGdyYXlMZXZlbCwgMSkpOworICAgIHNldFN0cm9rZVN0eWxlKENh bnZhc1N0eWxlOjpjcmVhdGVGcm9tR3JheUxldmVsV2l0aEFscGhhKGdyYXlMZXZlbCwgMS4wZikp OwogfQogCiB2b2lkIENhbnZhc1JlbmRlcmluZ0NvbnRleHQyRDo6c2V0U3Ryb2tlQ29sb3IoY29u c3QgU3RyaW5nJiBjb2xvciwgZmxvYXQgYWxwaGEpCiB7Ci0gICAgc2V0U3Ryb2tlU3R5bGUoQ2Fu dmFzU3R5bGU6OmNyZWF0ZShjb2xvciwgYWxwaGEpKTsKKyAgICBzZXRTdHJva2VTdHlsZShDYW52 YXNTdHlsZTo6Y3JlYXRlRnJvbVN0cmluZ1dpdGhPdmVycmlkZUFscGhhKGNvbG9yLCBhbHBoYSkp OwogfQogCiB2b2lkIENhbnZhc1JlbmRlcmluZ0NvbnRleHQyRDo6c2V0U3Ryb2tlQ29sb3IoZmxv YXQgZ3JheUxldmVsLCBmbG9hdCBhbHBoYSkKIHsKLSAgICBpZiAoc3RhdGUoKS5tX3N0cm9rZVN0 eWxlICYmIHN0YXRlKCkubV9zdHJva2VTdHlsZS0+aXNFcXVpdmFsZW50Q29sb3IoZ3JheUxldmVs LCBncmF5TGV2ZWwsIGdyYXlMZXZlbCwgYWxwaGEpKQorICAgIGlmIChzdGF0ZSgpLm1fc3Ryb2tl U3R5bGUgJiYgc3RhdGUoKS5tX3N0cm9rZVN0eWxlLT5pc0VxdWl2YWxlbnRSR0JBKGdyYXlMZXZl bCwgZ3JheUxldmVsLCBncmF5TGV2ZWwsIGFscGhhKSkKICAgICAgICAgcmV0dXJuOwotICAgIHNl dFN0cm9rZVN0eWxlKENhbnZhc1N0eWxlOjpjcmVhdGUoZ3JheUxldmVsLCBhbHBoYSkpOworICAg IHNldFN0cm9rZVN0eWxlKENhbnZhc1N0eWxlOjpjcmVhdGVGcm9tR3JheUxldmVsV2l0aEFscGhh KGdyYXlMZXZlbCwgYWxwaGEpKTsKIH0KIAogdm9pZCBDYW52YXNSZW5kZXJpbmdDb250ZXh0MkQ6 OnNldFN0cm9rZUNvbG9yKGZsb2F0IHIsIGZsb2F0IGcsIGZsb2F0IGIsIGZsb2F0IGEpCiB7Ci0g ICAgaWYgKHN0YXRlKCkubV9zdHJva2VTdHlsZSAmJiBzdGF0ZSgpLm1fc3Ryb2tlU3R5bGUtPmlz RXF1aXZhbGVudENvbG9yKHIsIGcsIGIsIGEpKQorICAgIGlmIChzdGF0ZSgpLm1fc3Ryb2tlU3R5 bGUgJiYgc3RhdGUoKS5tX3N0cm9rZVN0eWxlLT5pc0VxdWl2YWxlbnRSR0JBKHIsIGcsIGIsIGEp KQogICAgICAgICByZXR1cm47Ci0gICAgc2V0U3Ryb2tlU3R5bGUoQ2FudmFzU3R5bGU6OmNyZWF0 ZShyLCBnLCBiLCBhKSk7CisgICAgc2V0U3Ryb2tlU3R5bGUoQ2FudmFzU3R5bGU6OmNyZWF0ZUZy b21SR0JBQ2hhbm5lbHMociwgZywgYiwgYSkpOwogfQogCiB2b2lkIENhbnZhc1JlbmRlcmluZ0Nv bnRleHQyRDo6c2V0U3Ryb2tlQ29sb3IoZmxvYXQgYywgZmxvYXQgbSwgZmxvYXQgeSwgZmxvYXQg aywgZmxvYXQgYSkKIHsKLSAgICBpZiAoc3RhdGUoKS5tX3N0cm9rZVN0eWxlICYmIHN0YXRlKCku bV9zdHJva2VTdHlsZS0+aXNFcXVpdmFsZW50Q29sb3IoYywgbSwgeSwgaywgYSkpCisgICAgaWYg KHN0YXRlKCkubV9zdHJva2VTdHlsZSAmJiBzdGF0ZSgpLm1fc3Ryb2tlU3R5bGUtPmlzRXF1aXZh bGVudENNWUtBKGMsIG0sIHksIGssIGEpKQogICAgICAgICByZXR1cm47Ci0gICAgc2V0U3Ryb2tl U3R5bGUoQ2FudmFzU3R5bGU6OmNyZWF0ZShjLCBtLCB5LCBrLCBhKSk7CisgICAgc2V0U3Ryb2tl U3R5bGUoQ2FudmFzU3R5bGU6OmNyZWF0ZUZyb21DTVlLQUNoYW5uZWxzKGMsIG0sIHksIGssIGEp KTsKIH0KIAogdm9pZCBDYW52YXNSZW5kZXJpbmdDb250ZXh0MkQ6OnNldEZpbGxDb2xvcihjb25z dCBTdHJpbmcmIGNvbG9yKQogewogICAgIGlmIChjb2xvciA9PSBzdGF0ZSgpLm1fdW5wYXJzZWRG aWxsQ29sb3IpCiAgICAgICAgIHJldHVybjsKLSAgICBzZXRGaWxsU3R5bGUoQ2FudmFzU3R5bGU6 OmNyZWF0ZShjb2xvcikpOworICAgIHNldEZpbGxTdHlsZShDYW52YXNTdHlsZTo6Y3JlYXRlRnJv bVN0cmluZyhjb2xvcikpOwogICAgIHN0YXRlKCkubV91bnBhcnNlZEZpbGxDb2xvciA9IGNvbG9y OwogfQogCiB2b2lkIENhbnZhc1JlbmRlcmluZ0NvbnRleHQyRDo6c2V0RmlsbENvbG9yKGZsb2F0 IGdyYXlMZXZlbCkKIHsKLSAgICBpZiAoc3RhdGUoKS5tX2ZpbGxTdHlsZSAmJiBzdGF0ZSgpLm1f ZmlsbFN0eWxlLT5pc0VxdWl2YWxlbnRDb2xvcihncmF5TGV2ZWwsIGdyYXlMZXZlbCwgZ3JheUxl dmVsLCAxLjBmKSkKKyAgICBpZiAoc3RhdGUoKS5tX2ZpbGxTdHlsZSAmJiBzdGF0ZSgpLm1fZmls bFN0eWxlLT5pc0VxdWl2YWxlbnRSR0JBKGdyYXlMZXZlbCwgZ3JheUxldmVsLCBncmF5TGV2ZWws IDEuMGYpKQogICAgICAgICByZXR1cm47Ci0gICAgc2V0RmlsbFN0eWxlKENhbnZhc1N0eWxlOjpj cmVhdGUoZ3JheUxldmVsLCAxKSk7CisgICAgc2V0RmlsbFN0eWxlKENhbnZhc1N0eWxlOjpjcmVh dGVGcm9tR3JheUxldmVsV2l0aEFscGhhKGdyYXlMZXZlbCwgMS4wZikpOwogfQogCiB2b2lkIENh bnZhc1JlbmRlcmluZ0NvbnRleHQyRDo6c2V0RmlsbENvbG9yKGNvbnN0IFN0cmluZyYgY29sb3Is IGZsb2F0IGFscGhhKQogewotICAgIHNldEZpbGxTdHlsZShDYW52YXNTdHlsZTo6Y3JlYXRlKGNv bG9yLCBhbHBoYSkpOworICAgIHNldEZpbGxTdHlsZShDYW52YXNTdHlsZTo6Y3JlYXRlRnJvbVN0 cmluZ1dpdGhPdmVycmlkZUFscGhhKGNvbG9yLCBhbHBoYSkpOwogfQogCiB2b2lkIENhbnZhc1Jl bmRlcmluZ0NvbnRleHQyRDo6c2V0RmlsbENvbG9yKGZsb2F0IGdyYXlMZXZlbCwgZmxvYXQgYWxw aGEpCiB7Ci0gICAgaWYgKHN0YXRlKCkubV9maWxsU3R5bGUgJiYgc3RhdGUoKS5tX2ZpbGxTdHls ZS0+aXNFcXVpdmFsZW50Q29sb3IoZ3JheUxldmVsLCBncmF5TGV2ZWwsIGdyYXlMZXZlbCwgYWxw aGEpKQorICAgIGlmIChzdGF0ZSgpLm1fZmlsbFN0eWxlICYmIHN0YXRlKCkubV9maWxsU3R5bGUt PmlzRXF1aXZhbGVudFJHQkEoZ3JheUxldmVsLCBncmF5TGV2ZWwsIGdyYXlMZXZlbCwgYWxwaGEp KQogICAgICAgICByZXR1cm47Ci0gICAgc2V0RmlsbFN0eWxlKENhbnZhc1N0eWxlOjpjcmVhdGUo Z3JheUxldmVsLCBhbHBoYSkpOworICAgIHNldEZpbGxTdHlsZShDYW52YXNTdHlsZTo6Y3JlYXRl RnJvbUdyYXlMZXZlbFdpdGhBbHBoYShncmF5TGV2ZWwsIGFscGhhKSk7CiB9CiAKIHZvaWQgQ2Fu dmFzUmVuZGVyaW5nQ29udGV4dDJEOjpzZXRGaWxsQ29sb3IoZmxvYXQgciwgZmxvYXQgZywgZmxv YXQgYiwgZmxvYXQgYSkKIHsKLSAgICBpZiAoc3RhdGUoKS5tX2ZpbGxTdHlsZSAmJiBzdGF0ZSgp Lm1fZmlsbFN0eWxlLT5pc0VxdWl2YWxlbnRDb2xvcihyLCBnLCBiLCBhKSkKKyAgICBpZiAoc3Rh dGUoKS5tX2ZpbGxTdHlsZSAmJiBzdGF0ZSgpLm1fZmlsbFN0eWxlLT5pc0VxdWl2YWxlbnRSR0JB KHIsIGcsIGIsIGEpKQogICAgICAgICByZXR1cm47Ci0gICAgc2V0RmlsbFN0eWxlKENhbnZhc1N0 eWxlOjpjcmVhdGUociwgZywgYiwgYSkpOworICAgIHNldEZpbGxTdHlsZShDYW52YXNTdHlsZTo6 Y3JlYXRlRnJvbVJHQkFDaGFubmVscyhyLCBnLCBiLCBhKSk7CiB9CiAKIHZvaWQgQ2FudmFzUmVu ZGVyaW5nQ29udGV4dDJEOjpzZXRGaWxsQ29sb3IoZmxvYXQgYywgZmxvYXQgbSwgZmxvYXQgeSwg ZmxvYXQgaywgZmxvYXQgYSkKIHsKLSAgICBpZiAoc3RhdGUoKS5tX2ZpbGxTdHlsZSAmJiBzdGF0 ZSgpLm1fZmlsbFN0eWxlLT5pc0VxdWl2YWxlbnRDb2xvcihjLCBtLCB5LCBrLCBhKSkKKyAgICBp ZiAoc3RhdGUoKS5tX2ZpbGxTdHlsZSAmJiBzdGF0ZSgpLm1fZmlsbFN0eWxlLT5pc0VxdWl2YWxl bnRDTVlLQShjLCBtLCB5LCBrLCBhKSkKICAgICAgICAgcmV0dXJuOwotICAgIHNldEZpbGxTdHls ZShDYW52YXNTdHlsZTo6Y3JlYXRlKGMsIG0sIHksIGssIGEpKTsKKyAgICBzZXRGaWxsU3R5bGUo Q2FudmFzU3R5bGU6OmNyZWF0ZUZyb21DTVlLQUNoYW5uZWxzKGMsIG0sIHksIGssIGEpKTsKIH0K IAogdm9pZCBDYW52YXNSZW5kZXJpbmdDb250ZXh0MkQ6OmJlZ2luUGF0aCgpCmRpZmYgLS1naXQg YS9XZWJDb3JlL2h0bWwvY2FudmFzL0NhbnZhc1N0eWxlLmNwcCBiL1dlYkNvcmUvaHRtbC9jYW52 YXMvQ2FudmFzU3R5bGUuY3BwCmluZGV4IDUyYjMxYzguLmZkM2M2ZTUgMTAwNjQ0Ci0tLSBhL1dl YkNvcmUvaHRtbC9jYW52YXMvQ2FudmFzU3R5bGUuY3BwCisrKyBiL1dlYkNvcmUvaHRtbC9jYW52 YXMvQ2FudmFzU3R5bGUuY3BwCkBAIC01NSwxMiArNTUsNiBAQCBDYW52YXNTdHlsZTo6Q2FudmFz U3R5bGUoUkdCQTMyIHJnYmEpCiB7CiB9CiAKLUNhbnZhc1N0eWxlOjpDYW52YXNTdHlsZShmbG9h dCBncmF5TGV2ZWwpCi0gICAgOiBtX3R5cGUoUkdCQSkKLSAgICAsIG1fcmdiYShtYWtlUkdCQTMy RnJvbUZsb2F0cyhncmF5TGV2ZWwsIGdyYXlMZXZlbCwgZ3JheUxldmVsLCAxLjBmKSkKLXsKLX0K LQogQ2FudmFzU3R5bGU6OkNhbnZhc1N0eWxlKGZsb2F0IGdyYXlMZXZlbCwgZmxvYXQgYWxwaGEp CiAgICAgOiBtX3R5cGUoUkdCQSkKICAgICAsIG1fcmdiYShtYWtlUkdCQTMyRnJvbUZsb2F0cyhn cmF5TGV2ZWwsIGdyYXlMZXZlbCwgZ3JheUxldmVsLCBhbHBoYSkpCkBAIC05Miw3ICs4Niw3IEBA IENhbnZhc1N0eWxlOjpDYW52YXNTdHlsZShQYXNzUmVmUHRyPENhbnZhc1BhdHRlcm4+IHBhdHRl cm4pCiB7CiB9CiAKLVBhc3NSZWZQdHI8Q2FudmFzU3R5bGU+IENhbnZhc1N0eWxlOjpjcmVhdGUo Y29uc3QgU3RyaW5nJiBjb2xvcikKK1Bhc3NSZWZQdHI8Q2FudmFzU3R5bGU+IENhbnZhc1N0eWxl OjpjcmVhdGVGcm9tU3RyaW5nKGNvbnN0IFN0cmluZyYgY29sb3IpCiB7CiAgICAgUkdCQTMyIHJn YmE7CiAgICAgaWYgKCFDU1NQYXJzZXI6OnBhcnNlQ29sb3IocmdiYSwgY29sb3IpKQpAQCAtMTAw LDcgKzk0LDcgQEAgUGFzc1JlZlB0cjxDYW52YXNTdHlsZT4gQ2FudmFzU3R5bGU6OmNyZWF0ZShj b25zdCBTdHJpbmcmIGNvbG9yKQogICAgIHJldHVybiBhZG9wdFJlZihuZXcgQ2FudmFzU3R5bGUo cmdiYSkpOwogfQogCi1QYXNzUmVmUHRyPENhbnZhc1N0eWxlPiBDYW52YXNTdHlsZTo6Y3JlYXRl KGNvbnN0IFN0cmluZyYgY29sb3IsIGZsb2F0IGFscGhhKQorUGFzc1JlZlB0cjxDYW52YXNTdHls ZT4gQ2FudmFzU3R5bGU6OmNyZWF0ZUZyb21TdHJpbmdXaXRoT3ZlcnJpZGVBbHBoYShjb25zdCBT dHJpbmcmIGNvbG9yLCBmbG9hdCBhbHBoYSkKIHsKICAgICBSR0JBMzIgcmdiYTsKICAgICBpZiAo IUNTU1BhcnNlcjo6cGFyc2VDb2xvcihyZ2JhLCBjb2xvcikpCkBAIC0xMDgsMTMgKzEwMiwxMyBA QCBQYXNzUmVmUHRyPENhbnZhc1N0eWxlPiBDYW52YXNTdHlsZTo6Y3JlYXRlKGNvbnN0IFN0cmlu ZyYgY29sb3IsIGZsb2F0IGFscGhhKQogICAgIHJldHVybiBhZG9wdFJlZihuZXcgQ2FudmFzU3R5 bGUoY29sb3JXaXRoT3ZlcnJpZGVBbHBoYShyZ2JhLCBhbHBoYSkpKTsKIH0KIAotUGFzc1JlZlB0 cjxDYW52YXNTdHlsZT4gQ2FudmFzU3R5bGU6OmNyZWF0ZShQYXNzUmVmUHRyPENhbnZhc0dyYWRp ZW50PiBncmFkaWVudCkKK1Bhc3NSZWZQdHI8Q2FudmFzU3R5bGU+IENhbnZhc1N0eWxlOjpjcmVh dGVGcm9tR3JhZGllbnQoUGFzc1JlZlB0cjxDYW52YXNHcmFkaWVudD4gZ3JhZGllbnQpCiB7CiAg ICAgaWYgKCFncmFkaWVudCkKICAgICAgICAgcmV0dXJuIDA7CiAgICAgcmV0dXJuIGFkb3B0UmVm KG5ldyBDYW52YXNTdHlsZShncmFkaWVudCkpOwogfQotUGFzc1JlZlB0cjxDYW52YXNTdHlsZT4g Q2FudmFzU3R5bGU6OmNyZWF0ZShQYXNzUmVmUHRyPENhbnZhc1BhdHRlcm4+IHBhdHRlcm4pCitQ YXNzUmVmUHRyPENhbnZhc1N0eWxlPiBDYW52YXNTdHlsZTo6Y3JlYXRlRnJvbVBhdHRlcm4oUGFz c1JlZlB0cjxDYW52YXNQYXR0ZXJuPiBwYXR0ZXJuKQogewogICAgIGlmICghcGF0dGVybikKICAg ICAgICAgcmV0dXJuIDA7CkBAIC0xNDQsNyArMTM4LDcgQEAgYm9vbCBDYW52YXNTdHlsZTo6aXNF cXVpdmFsZW50Q29sb3IoY29uc3QgQ2FudmFzU3R5bGUmIG90aGVyKSBjb25zdAogICAgIHJldHVy biBmYWxzZTsKIH0KIAotYm9vbCBDYW52YXNTdHlsZTo6aXNFcXVpdmFsZW50Q29sb3IoZmxvYXQg ciwgZmxvYXQgZywgZmxvYXQgYiwgZmxvYXQgYSkgY29uc3QKK2Jvb2wgQ2FudmFzU3R5bGU6Omlz RXF1aXZhbGVudFJHQkEoZmxvYXQgciwgZmxvYXQgZywgZmxvYXQgYiwgZmxvYXQgYSkgY29uc3QK IHsKICAgICBpZiAobV90eXBlICE9IFJHQkEpCiAgICAgICAgIHJldHVybiBmYWxzZTsKQEAgLTE1 Miw3ICsxNDYsNyBAQCBib29sIENhbnZhc1N0eWxlOjppc0VxdWl2YWxlbnRDb2xvcihmbG9hdCBy LCBmbG9hdCBnLCBmbG9hdCBiLCBmbG9hdCBhKSBjb25zdAogICAgIHJldHVybiBtX3JnYmEgPT0g bWFrZVJHQkEzMkZyb21GbG9hdHMociwgZywgYiwgYSk7CiB9CiAKLWJvb2wgQ2FudmFzU3R5bGU6 OmlzRXF1aXZhbGVudENvbG9yKGZsb2F0IGMsIGZsb2F0IG0sIGZsb2F0IHksIGZsb2F0IGssIGZs b2F0IGEpIGNvbnN0Citib29sIENhbnZhc1N0eWxlOjppc0VxdWl2YWxlbnRDTVlLQShmbG9hdCBj LCBmbG9hdCBtLCBmbG9hdCB5LCBmbG9hdCBrLCBmbG9hdCBhKSBjb25zdAogewogICAgIGlmICht X3R5cGUgIT0gQ01ZS0EpCiAgICAgICAgIHJldHVybiBmYWxzZTsKZGlmZiAtLWdpdCBhL1dlYkNv cmUvaHRtbC9jYW52YXMvQ2FudmFzU3R5bGUuaCBiL1dlYkNvcmUvaHRtbC9jYW52YXMvQ2FudmFz U3R5bGUuaAppbmRleCA4ZTQ3ZTYzLi5mYWQ5YmJkIDEwMDY0NAotLS0gYS9XZWJDb3JlL2h0bWwv Y2FudmFzL0NhbnZhc1N0eWxlLmgKKysrIGIvV2ViQ29yZS9odG1sL2NhbnZhcy9DYW52YXNTdHls ZS5oCkBAIC0zOCwxNSArMzgsMTQgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogCiAgICAgY2xhc3Mg Q2FudmFzU3R5bGUgOiBwdWJsaWMgUmVmQ291bnRlZDxDYW52YXNTdHlsZT4gewogICAgIHB1Ymxp YzoKLSAgICAgICAgc3RhdGljIFBhc3NSZWZQdHI8Q2FudmFzU3R5bGU+IGNyZWF0ZShSR0JBMzIg cmdiYSkgeyByZXR1cm4gYWRvcHRSZWYobmV3IENhbnZhc1N0eWxlKHJnYmEpKTsgfQotICAgICAg ICBzdGF0aWMgUGFzc1JlZlB0cjxDYW52YXNTdHlsZT4gY3JlYXRlKGNvbnN0IFN0cmluZyYgY29s b3IpOwotICAgICAgICBzdGF0aWMgUGFzc1JlZlB0cjxDYW52YXNTdHlsZT4gY3JlYXRlKGNvbnN0 IFN0cmluZyYgY29sb3IsIGZsb2F0IGFscGhhKTsKLSAgICAgICAgc3RhdGljIFBhc3NSZWZQdHI8 Q2FudmFzU3R5bGU+IGNyZWF0ZShmbG9hdCBncmF5TGV2ZWwpIHsgcmV0dXJuIGFkb3B0UmVmKG5l dyBDYW52YXNTdHlsZShncmF5TGV2ZWwpKTsgfQotICAgICAgICBzdGF0aWMgUGFzc1JlZlB0cjxD YW52YXNTdHlsZT4gY3JlYXRlKGZsb2F0IGdyYXlMZXZlbCwgZmxvYXQgYWxwaGEpIHsgcmV0dXJu IGFkb3B0UmVmKG5ldyBDYW52YXNTdHlsZShncmF5TGV2ZWwsIGFscGhhKSk7IH0KLSAgICAgICAg c3RhdGljIFBhc3NSZWZQdHI8Q2FudmFzU3R5bGU+IGNyZWF0ZShmbG9hdCByLCBmbG9hdCBnLCBm bG9hdCBiLCBmbG9hdCBhKSB7IHJldHVybiBhZG9wdFJlZihuZXcgQ2FudmFzU3R5bGUociwgZywg YiwgYSkpOyB9Ci0gICAgICAgIHN0YXRpYyBQYXNzUmVmUHRyPENhbnZhc1N0eWxlPiBjcmVhdGUo ZmxvYXQgYywgZmxvYXQgbSwgZmxvYXQgeSwgZmxvYXQgaywgZmxvYXQgYSkgeyByZXR1cm4gYWRv cHRSZWYobmV3IENhbnZhc1N0eWxlKGMsIG0sIHksIGssIGEpKTsgfQotICAgICAgICBzdGF0aWMg UGFzc1JlZlB0cjxDYW52YXNTdHlsZT4gY3JlYXRlKFBhc3NSZWZQdHI8Q2FudmFzR3JhZGllbnQ+ IGdyYWRpZW50KTsKLSAgICAgICAgc3RhdGljIFBhc3NSZWZQdHI8Q2FudmFzU3R5bGU+IGNyZWF0 ZShQYXNzUmVmUHRyPENhbnZhc1BhdHRlcm4+IHBhdHRlcm4pOworICAgICAgICBzdGF0aWMgUGFz c1JlZlB0cjxDYW52YXNTdHlsZT4gY3JlYXRlRnJvbVJHQkEoUkdCQTMyIHJnYmEpIHsgcmV0dXJu IGFkb3B0UmVmKG5ldyBDYW52YXNTdHlsZShyZ2JhKSk7IH0KKyAgICAgICAgc3RhdGljIFBhc3NS ZWZQdHI8Q2FudmFzU3R5bGU+IGNyZWF0ZUZyb21TdHJpbmcoY29uc3QgU3RyaW5nJiBjb2xvcik7 CisgICAgICAgIHN0YXRpYyBQYXNzUmVmUHRyPENhbnZhc1N0eWxlPiBjcmVhdGVGcm9tU3RyaW5n V2l0aE92ZXJyaWRlQWxwaGEoY29uc3QgU3RyaW5nJiBjb2xvciwgZmxvYXQgYWxwaGEpOworICAg ICAgICBzdGF0aWMgUGFzc1JlZlB0cjxDYW52YXNTdHlsZT4gY3JlYXRlRnJvbUdyYXlMZXZlbFdp dGhBbHBoYShmbG9hdCBncmF5TGV2ZWwsIGZsb2F0IGFscGhhKSB7IHJldHVybiBhZG9wdFJlZihu ZXcgQ2FudmFzU3R5bGUoZ3JheUxldmVsLCBhbHBoYSkpOyB9CisgICAgICAgIHN0YXRpYyBQYXNz UmVmUHRyPENhbnZhc1N0eWxlPiBjcmVhdGVGcm9tUkdCQUNoYW5uZWxzKGZsb2F0IHIsIGZsb2F0 IGcsIGZsb2F0IGIsIGZsb2F0IGEpIHsgcmV0dXJuIGFkb3B0UmVmKG5ldyBDYW52YXNTdHlsZShy LCBnLCBiLCBhKSk7IH0KKyAgICAgICAgc3RhdGljIFBhc3NSZWZQdHI8Q2FudmFzU3R5bGU+IGNy ZWF0ZUZyb21DTVlLQUNoYW5uZWxzKGZsb2F0IGMsIGZsb2F0IG0sIGZsb2F0IHksIGZsb2F0IGss IGZsb2F0IGEpIHsgcmV0dXJuIGFkb3B0UmVmKG5ldyBDYW52YXNTdHlsZShjLCBtLCB5LCBrLCBh KSk7IH0KKyAgICAgICAgc3RhdGljIFBhc3NSZWZQdHI8Q2FudmFzU3R5bGU+IGNyZWF0ZUZyb21H cmFkaWVudChQYXNzUmVmUHRyPENhbnZhc0dyYWRpZW50PiBncmFkaWVudCk7CisgICAgICAgIHN0 YXRpYyBQYXNzUmVmUHRyPENhbnZhc1N0eWxlPiBjcmVhdGVGcm9tUGF0dGVybihQYXNzUmVmUHRy PENhbnZhc1BhdHRlcm4+IHBhdHRlcm4pOwogCiAgICAgICAgIFN0cmluZyBjb2xvcigpIGNvbnN0 IHsgcmV0dXJuIENvbG9yKG1fcmdiYSkuc2VyaWFsaXplZCgpOyB9CiAgICAgICAgIENhbnZhc0dy YWRpZW50KiBjYW52YXNHcmFkaWVudCgpIGNvbnN0IHsgcmV0dXJuIG1fZ3JhZGllbnQuZ2V0KCk7 IH0KQEAgLTU2LDEyICs1NSwxMSBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgIHZvaWQg YXBwbHlTdHJva2VDb2xvcihHcmFwaGljc0NvbnRleHQqKTsKIAogICAgICAgICBib29sIGlzRXF1 aXZhbGVudENvbG9yKGNvbnN0IENhbnZhc1N0eWxlJikgY29uc3Q7Ci0gICAgICAgIGJvb2wgaXNF cXVpdmFsZW50Q29sb3IoZmxvYXQgciwgZmxvYXQgZywgZmxvYXQgYiwgZmxvYXQgYSkgY29uc3Q7 Ci0gICAgICAgIGJvb2wgaXNFcXVpdmFsZW50Q29sb3IoZmxvYXQgYywgZmxvYXQgbSwgZmxvYXQg eSwgZmxvYXQgaywgZmxvYXQgYSkgY29uc3Q7CisgICAgICAgIGJvb2wgaXNFcXVpdmFsZW50UkdC QShmbG9hdCByLCBmbG9hdCBnLCBmbG9hdCBiLCBmbG9hdCBhKSBjb25zdDsKKyAgICAgICAgYm9v bCBpc0VxdWl2YWxlbnRDTVlLQShmbG9hdCBjLCBmbG9hdCBtLCBmbG9hdCB5LCBmbG9hdCBrLCBm bG9hdCBhKSBjb25zdDsKIAogICAgIHByaXZhdGU6CiAgICAgICAgIENhbnZhc1N0eWxlKFJHQkEz MiByZ2JhKTsKLSAgICAgICAgQ2FudmFzU3R5bGUoZmxvYXQgZ3JheUxldmVsKTsKICAgICAgICAg Q2FudmFzU3R5bGUoZmxvYXQgZ3JheUxldmVsLCBmbG9hdCBhbHBoYSk7CiAgICAgICAgIENhbnZh c1N0eWxlKGZsb2F0IHIsIGZsb2F0IGcsIGZsb2F0IGIsIGZsb2F0IGEpOwogICAgICAgICBDYW52 YXNTdHlsZShmbG9hdCBjLCBmbG9hdCBtLCBmbG9hdCB5LCBmbG9hdCBrLCBmbG9hdCBhKTsK