48845 2010-11-02 09:58:38 -0700 [Qt] Canvas: strokeText() and fillText() produce same shadow 2010-11-22 17:47:25 -0800 1 1 1 Unclassified WebKit Canvas 528+ (Nightly build) All All RESOLVED FIXED HTML5, Qt, QtTriaged P2 Normal --- 1 kling webkit-qt-unassigned mdelaney7 oldest_to_newest 303438 0 kling 2010-11-02 09:58:38 -0700 Patch coming. 303441 1 72690 kling 2010-11-02 10:00:54 -0700 Created attachment 72690 Proposed patch 303444 2 72692 kling 2010-11-02 10:02:43 -0700 Created attachment 72692 Proposed patch Oops, forgot the expected file. 312399 3 72692 ariya.hidayat 2010-11-22 10:27:24 -0800 Comment on attachment 72692 Proposed patch LGTM. r=me. 312625 4 72692 kling 2010-11-22 17:47:14 -0800 Comment on attachment 72692 Proposed patch Clearing flags on attachment: 72692 Committed r72577: <http://trac.webkit.org/changeset/72577> 312626 5 kling 2010-11-22 17:47:25 -0800 All reviewed patches have been landed. Closing bug. 72690 2010-11-02 10:00:54 -0700 2010-11-02 10:02:43 -0700 Proposed patch bug-48845.diff text/plain 7069 kling ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBjN2IwNzJiLi5mNDMyNjM3IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTAtMTEt MDIgIEFuZHJlYXMgS2xpbmcgIDxrbGluZ0B3ZWJraXQub3JnPgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtRdF0gQ2FudmFzOiBzdHJva2VUZXh0KCkg YW5kIGZpbGxUZXh0KCkgcHJvZHVjZSBzYW1lIHNoYWRvdworICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDg4NDUKKworICAgICAgICBBZGQgdGVzdCB0byB2 ZXJpZnkgdGhhdCBzdHJva2VUZXh0KCkgZG9lc24ndCBwcm9kdWNlIGEgZmlsbFRleHQoKSBzaGFk b3cuCisKKyAgICAgICAgKiBmYXN0L2NhbnZhcy9jYW52YXMtc3Ryb2tlVGV4dC1zdHJva2VzLXNo YWRvdy5odG1sOiBBZGRlZC4KKyAgICAgICAgKiBmYXN0L2NhbnZhcy9zY3JpcHQtdGVzdHMvY2Fu dmFzLXN0cm9rZVRleHQtc3Ryb2tlcy1zaGFkb3cuanM6IEFkZGVkLgorCiAyMDEwLTExLTAxICBE YXZpZCBIeWF0dCAgPGh5YXR0QGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBEYW4g QmVybnN0ZWluLgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9jYW52YXMvY2FudmFzLXN0 cm9rZVRleHQtc3Ryb2tlcy1zaGFkb3cuaHRtbCBiL0xheW91dFRlc3RzL2Zhc3QvY2FudmFzL2Nh bnZhcy1zdHJva2VUZXh0LXN0cm9rZXMtc2hhZG93Lmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQK aW5kZXggMDAwMDAwMC4uM2NiYWI4YwotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zh c3QvY2FudmFzL2NhbnZhcy1zdHJva2VUZXh0LXN0cm9rZXMtc2hhZG93Lmh0bWwKQEAgLTAsMCAr MSwxMyBAQAorPCFET0NUWVBFIEhUTUwgUFVCTElDICItLy9JRVRGLy9EVEQgSFRNTC8vRU4iPgor PGh0bWw+Cis8aGVhZD4KKzxsaW5rIHJlbD0ic3R5bGVzaGVldCIgaHJlZj0iLi4vanMvcmVzb3Vy Y2VzL2pzLXRlc3Qtc3R5bGUuY3NzIj4KKzxzY3JpcHQgc3JjPSIuLi9qcy9yZXNvdXJjZXMvanMt dGVzdC1wcmUuanMiPjwvc2NyaXB0PgorPC9oZWFkPgorPGJvZHk+Cis8cCBpZD0iZGVzY3JpcHRp b24iPjwvcD4KKzxkaXYgaWQ9ImNvbnNvbGUiPjwvZGl2PgorPHNjcmlwdCBzcmM9InNjcmlwdC10 ZXN0cy9jYW52YXMtc3Ryb2tlVGV4dC1zdHJva2VzLXNoYWRvdy5qcyI+PC9zY3JpcHQ+Cis8c2Ny aXB0IHNyYz0iLi4vanMvcmVzb3VyY2VzL2pzLXRlc3QtcG9zdC5qcyI+PC9zY3JpcHQ+Cis8L2Jv ZHk+Cis8L2h0bWw+CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2NhbnZhcy9zY3JpcHQt dGVzdHMvY2FudmFzLXN0cm9rZVRleHQtc3Ryb2tlcy1zaGFkb3cuanMgYi9MYXlvdXRUZXN0cy9m YXN0L2NhbnZhcy9zY3JpcHQtdGVzdHMvY2FudmFzLXN0cm9rZVRleHQtc3Ryb2tlcy1zaGFkb3cu anMKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uOTdiOGU4MAotLS0gL2Rldi9u dWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvY2FudmFzL3NjcmlwdC10ZXN0cy9jYW52YXMtc3Ry b2tlVGV4dC1zdHJva2VzLXNoYWRvdy5qcwpAQCAtMCwwICsxLDIzIEBACitkZXNjcmlwdGlvbigi VGVzdCB0aGF0IHN0cm9rZVRleHQoKSBkb2Vzbid0IHByb2R1Y2UgYSBmaWxsZWQgc2hhZG93LiIp OwordmFyIGN0eCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoJ2NhbnZhcycpLmdldENvbnRleHQo JzJkJyk7CisKK2N0eC5maWxsU3R5bGUgPSAnZ3JlZW4nOworY3R4LmZpbGxSZWN0KDAsIDAsIGN0 eC5jYW52YXMud2lkdGgsIGN0eC5jYW52YXMuaGVpZ2h0KTsKKworLy8gU3Ryb2tlIGFuICdJJyB3 aXRoIGl0cyBzaGFkb3cgaW4gdGhlIHVwcGVyIGxlZnQgY29ybmVyLgorY3R4LnN0cm9rZVN0eWxl ID0gJ3doaXRlJzsKK2N0eC5saW5lV2lkdGggPSAyOworY3R4LnNoYWRvd0NvbG9yID0gJ3JlZCc7 CitjdHguc2hhZG93T2Zmc2V0WCA9IC0xNTsKK2N0eC5zaGFkb3dPZmZzZXRZID0gMDsKK2N0eC5m b250ID0gJzEyOHB4IHNhbnMtc2VyaWYnOworY3R4LnN0cm9rZVRleHQoIkkiLCAwLCA1MCk7CisK K2ltYWdlRGF0YSA9IGN0eC5nZXRJbWFnZURhdGEoMCwgMCwgMSwgMSk7CitpbWdkYXRhID0gaW1h Z2VEYXRhLmRhdGE7CitzaG91bGRCZSgiaW1nZGF0YVswXSIsICIwIik7CitzaG91bGRCZSgiaW1n ZGF0YVsxXSIsICIxMjgiKTsKK3Nob3VsZEJlKCJpbWdkYXRhWzJdIiwgIjAiKTsKK3Nob3VsZEJl KCJpbWdkYXRhWzNdIiwgIjI1NSIpOworCit2YXIgc3VjY2Vzc2Z1bGx5UGFyc2VkID0gdHJ1ZTsK ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg OTIwNDA4OC4uZTgyYmI0OCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBAQAorMjAxMC0xMS0wMiAgQW5kcmVhcyBLbGlu ZyAgPGtsaW5nQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgW1F0XSBDYW52YXM6IHN0cm9rZVRleHQoKSBhbmQgZmlsbFRleHQoKSBw cm9kdWNlIHNhbWUgc2hhZG93CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD00ODg0NQorCisgICAgICAgIFRlc3Q6IGZhc3QvY2FudmFzL2NhbnZhcy1zdHJv a2VUZXh0LXN0cm9rZXMtc2hhZG93Lmh0bWwKKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNz L3F0L0ZvbnRRdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpkcmF3VGV4dENvbW1vbik6IFN0cm9r ZSB0aGUgc2hhZG93IHJhdGhlciB0aGFuIGZpbGxpbmcgaXQgaW4gdGhlIGNUZXh0U3Ryb2tlIGNh c2UuCisKIDIwMTAtMTEtMDEgIERhdmlkIEh5YXR0ICA8aHlhdHRAYXBwbGUuY29tPgogCiAgICAg ICAgIFJldmlld2VkIGJ5IERhbiBCZXJuc3RlaW4uCmRpZmYgLS1naXQgYS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL3F0L0ZvbnRRdC5jcHAgYi9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3F0 L0ZvbnRRdC5jcHAKaW5kZXggYjA0OTE4MS4uYzBhY2M3YyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9xdC9Gb250UXQuY3BwCisrKyBiL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvcXQvRm9udFF0LmNwcApAQCAtMTgyLDMyICsxODIsNTQgQEAgc3RhdGljIHZvaWQgZHJh d1RleHRDb21tb24oR3JhcGhpY3NDb250ZXh0KiBjdHgsIGNvbnN0IFRleHRSdW4mIHJ1biwgY29u c3QgRmxvYXQKICAgICBpZiAoIWlzQ29tcGxleFRleHQgJiYgIShjdHgtPnRleHREcmF3aW5nTW9k ZSgpICYgY1RleHRTdHJva2UpKQogICAgICAgICBmbGFncyB8PSBRdDo6VGV4dEJ5cGFzc1NoYXBp bmc7CiAjZW5kaWYKLSAgICBpZiAoY3R4LT5jb250ZXh0U2hhZG93KCktPm1fdHlwZSAhPSBDb250 ZXh0U2hhZG93OjpOb1NoYWRvdykgewotICAgICAgICBDb250ZXh0U2hhZG93KiBjdHhTaGFkb3cg PSBjdHgtPmNvbnRleHRTaGFkb3coKTsKLSAgICAgICAgaWYgKGN0eFNoYWRvdy0+bV90eXBlICE9 IENvbnRleHRTaGFkb3c6OkJsdXJTaGFkb3cpIHsKLSAgICAgICAgICAgIHAtPnNhdmUoKTsKLSAg ICAgICAgICAgIHAtPnNldFBlbihjdHhTaGFkb3ctPm1fY29sb3IpOwotICAgICAgICAgICAgcC0+ dHJhbnNsYXRlKGN0eFNoYWRvdy0+b2Zmc2V0KCkpOwotICAgICAgICAgICAgcC0+ZHJhd1RleHQo cHQsIHN0cmluZywgZmxhZ3MsIHJ1bi5wYWRkaW5nKCkpOwotICAgICAgICAgICAgcC0+cmVzdG9y ZSgpOwotICAgICAgICB9IGVsc2UgewotICAgICAgICAgICAgUUZvbnRNZXRyaWNzIGZtKGZvbnQp OwotICAgICAgICAgICAgUVJlY3RGIGJvdW5kaW5nUmVjdChwb2ludC54KCksIHBvaW50LnkoKSAt IGZtLmFzY2VudCgpLCBmbS53aWR0aChzdHJpbmcpLCBmbS5oZWlnaHQoKSk7Ci0gICAgICAgICAg ICBRUGFpbnRlciogc2hhZG93UGFpbnRlciA9IGN0eFNoYWRvdy0+YmVnaW5TaGFkb3dMYXllcihw LCBib3VuZGluZ1JlY3QpOwotICAgICAgICAgICAgaWYgKHNoYWRvd1BhaW50ZXIpIHsKLSAgICAg ICAgICAgICAgICAvLyBTaW5jZSBpdCB3aWxsIGJlIGJsdXJyZWQgYW55d2F5LCB3ZSBkb24ndCBj YXJlIGFib3V0IHJlbmRlciBoaW50cy4KLSAgICAgICAgICAgICAgICBzaGFkb3dQYWludGVyLT5z ZXRGb250KHAtPmZvbnQoKSk7Ci0gICAgICAgICAgICAgICAgc2hhZG93UGFpbnRlci0+c2V0UGVu KGN0eFNoYWRvdy0+bV9jb2xvcik7Ci0gICAgICAgICAgICAgICAgc2hhZG93UGFpbnRlci0+ZHJh d1RleHQocHQsIHN0cmluZywgZmxhZ3MsIHJ1bi5wYWRkaW5nKCkpOwotICAgICAgICAgICAgICAg IGN0eFNoYWRvdy0+ZW5kU2hhZG93TGF5ZXIocCk7CisKKyAgICBRUGFpbnRlclBhdGggdGV4dFN0 cm9rZVBhdGg7CisgICAgaWYgKGN0eC0+dGV4dERyYXdpbmdNb2RlKCkgJiBjVGV4dFN0cm9rZSkK KyAgICAgICAgdGV4dFN0cm9rZVBhdGguYWRkVGV4dChwdCwgZm9udCwgc3RyaW5nKTsKKworICAg IENvbnRleHRTaGFkb3cqIGN0eFNoYWRvdyA9IGN0eC0+Y29udGV4dFNoYWRvdygpOworICAgIGlm IChjdHhTaGFkb3ctPm1fdHlwZSAhPSBDb250ZXh0U2hhZG93OjpOb1NoYWRvdykgeworICAgICAg ICBpZiAoY3R4LT50ZXh0RHJhd2luZ01vZGUoKSAmIGNUZXh0RmlsbCkgeworICAgICAgICAgICAg aWYgKGN0eFNoYWRvdy0+bV90eXBlICE9IENvbnRleHRTaGFkb3c6OkJsdXJTaGFkb3cpIHsKKyAg ICAgICAgICAgICAgICBwLT5zYXZlKCk7CisgICAgICAgICAgICAgICAgcC0+c2V0UGVuKGN0eFNo YWRvdy0+bV9jb2xvcik7CisgICAgICAgICAgICAgICAgcC0+dHJhbnNsYXRlKGN0eFNoYWRvdy0+ b2Zmc2V0KCkpOworICAgICAgICAgICAgICAgIHAtPmRyYXdUZXh0KHB0LCBzdHJpbmcsIGZsYWdz LCBydW4ucGFkZGluZygpKTsKKyAgICAgICAgICAgICAgICBwLT5yZXN0b3JlKCk7CisgICAgICAg ICAgICB9IGVsc2UgeworICAgICAgICAgICAgICAgIFFGb250TWV0cmljcyBmbShmb250KTsKKyAg ICAgICAgICAgICAgICBRUmVjdEYgYm91bmRpbmdSZWN0KHBvaW50LngoKSwgcG9pbnQueSgpIC0g Zm0uYXNjZW50KCksIGZtLndpZHRoKHN0cmluZyksIGZtLmhlaWdodCgpKTsKKyAgICAgICAgICAg ICAgICBRUGFpbnRlciogc2hhZG93UGFpbnRlciA9IGN0eFNoYWRvdy0+YmVnaW5TaGFkb3dMYXll cihwLCBib3VuZGluZ1JlY3QpOworICAgICAgICAgICAgICAgIGlmIChzaGFkb3dQYWludGVyKSB7 CisgICAgICAgICAgICAgICAgICAgIC8vIFNpbmNlIGl0IHdpbGwgYmUgYmx1cnJlZCBhbnl3YXks IHdlIGRvbid0IGNhcmUgYWJvdXQgcmVuZGVyIGhpbnRzLgorICAgICAgICAgICAgICAgICAgICBz aGFkb3dQYWludGVyLT5zZXRGb250KHAtPmZvbnQoKSk7CisgICAgICAgICAgICAgICAgICAgIHNo YWRvd1BhaW50ZXItPnNldFBlbihjdHhTaGFkb3ctPm1fY29sb3IpOworICAgICAgICAgICAgICAg ICAgICBzaGFkb3dQYWludGVyLT5kcmF3VGV4dChwdCwgc3RyaW5nLCBmbGFncywgcnVuLnBhZGRp bmcoKSk7CisgICAgICAgICAgICAgICAgICAgIGN0eFNoYWRvdy0+ZW5kU2hhZG93TGF5ZXIocCk7 CisgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgfQorICAgICAgICB9IGVsc2UgaWYgKGN0 eC0+dGV4dERyYXdpbmdNb2RlKCkgJiBjVGV4dFN0cm9rZSkgeworICAgICAgICAgICAgaWYgKGN0 eFNoYWRvdy0+bV90eXBlICE9IENvbnRleHRTaGFkb3c6OkJsdXJTaGFkb3cpIHsKKyAgICAgICAg ICAgICAgICBwLT50cmFuc2xhdGUoY3R4U2hhZG93LT5vZmZzZXQoKSk7CisgICAgICAgICAgICAg ICAgcC0+c3Ryb2tlUGF0aCh0ZXh0U3Ryb2tlUGF0aCwgUVBlbihjdHhTaGFkb3ctPm1fY29sb3Ip KTsKKyAgICAgICAgICAgICAgICBwLT50cmFuc2xhdGUoLWN0eFNoYWRvdy0+b2Zmc2V0KCkpOwor ICAgICAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICAgICAgICBRRm9udE1ldHJpY3MgZm0oZm9u dCk7CisgICAgICAgICAgICAgICAgUVJlY3RGIGJvdW5kaW5nUmVjdChwb2ludC54KCksIHBvaW50 LnkoKSAtIGZtLmFzY2VudCgpLCBmbS53aWR0aChzdHJpbmcpLCBmbS5oZWlnaHQoKSk7CisgICAg ICAgICAgICAgICAgUVBhaW50ZXIqIHNoYWRvd1BhaW50ZXIgPSBjdHhTaGFkb3ctPmJlZ2luU2hh ZG93TGF5ZXIocCwgYm91bmRpbmdSZWN0KTsKKyAgICAgICAgICAgICAgICBpZiAoc2hhZG93UGFp bnRlcikgeworICAgICAgICAgICAgICAgICAgICAvLyBTaW5jZSBpdCB3aWxsIGJlIGJsdXJyZWQg YW55d2F5LCB3ZSBkb24ndCBjYXJlIGFib3V0IHJlbmRlciBoaW50cy4KKyAgICAgICAgICAgICAg ICAgICAgc2hhZG93UGFpbnRlci0+c2V0Rm9udChwLT5mb250KCkpOworICAgICAgICAgICAgICAg ICAgICBzaGFkb3dQYWludGVyLT5zdHJva2VQYXRoKHRleHRTdHJva2VQYXRoLCBRUGVuKGN0eFNo YWRvdy0+bV9jb2xvcikpOworICAgICAgICAgICAgICAgICAgICBjdHhTaGFkb3ctPmVuZFNoYWRv d0xheWVyKHApOworICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgIH0KICAgICAgICAgfQog ICAgIH0KLSAgICBpZiAoY3R4LT50ZXh0RHJhd2luZ01vZGUoKSAmIGNUZXh0U3Ryb2tlKSB7Ci0g ICAgICAgIFFQYWludGVyUGF0aCBwYXRoOwotICAgICAgICBwYXRoLmFkZFRleHQocHQsIGZvbnQs IHN0cmluZyk7Ci0gICAgICAgIHAtPnN0cm9rZVBhdGgocGF0aCwgdGV4dFN0cm9rZVBlbik7Ci0g ICAgfQorCisgICAgaWYgKGN0eC0+dGV4dERyYXdpbmdNb2RlKCkgJiBjVGV4dFN0cm9rZSkKKyAg ICAgICAgcC0+c3Ryb2tlUGF0aCh0ZXh0U3Ryb2tlUGF0aCwgdGV4dFN0cm9rZVBlbik7CisKICAg ICBpZiAoY3R4LT50ZXh0RHJhd2luZ01vZGUoKSAmIGNUZXh0RmlsbCkgewogICAgICAgICBRUGVu IHByZXZpb3VzUGVuID0gcC0+cGVuKCk7CiAgICAgICAgIHAtPnNldFBlbih0ZXh0RmlsbFBlbik7 Cg== 72692 2010-11-02 10:02:43 -0700 2010-11-22 17:47:14 -0800 Proposed patch bug-48845-v2.diff text/plain 7743 kling ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBjN2IwNzJiLi43YTNlODk0IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTAtMTEt MDIgIEFuZHJlYXMgS2xpbmcgIDxrbGluZ0B3ZWJraXQub3JnPgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtRdF0gQ2FudmFzOiBzdHJva2VUZXh0KCkg YW5kIGZpbGxUZXh0KCkgcHJvZHVjZSBzYW1lIHNoYWRvdworICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDg4NDUKKworICAgICAgICBBZGQgdGVzdCB0byB2 ZXJpZnkgdGhhdCBzdHJva2VUZXh0KCkgZG9lc24ndCBwcm9kdWNlIGEgZmlsbFRleHQoKSBzaGFk b3cuCisKKyAgICAgICAgKiBmYXN0L2NhbnZhcy9jYW52YXMtc3Ryb2tlVGV4dC1zdHJva2VzLXNo YWRvdy5odG1sOiBBZGRlZC4KKyAgICAgICAgKiBmYXN0L2NhbnZhcy9jYW52YXMtc3Ryb2tlVGV4 dC1zdHJva2VzLXNoYWRvdy1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGZhc3QvY2Fu dmFzL3NjcmlwdC10ZXN0cy9jYW52YXMtc3Ryb2tlVGV4dC1zdHJva2VzLXNoYWRvdy5qczogQWRk ZWQuCisKIDIwMTAtMTEtMDEgIERhdmlkIEh5YXR0ICA8aHlhdHRAYXBwbGUuY29tPgogCiAgICAg ICAgIFJldmlld2VkIGJ5IERhbiBCZXJuc3RlaW4uCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9m YXN0L2NhbnZhcy9jYW52YXMtc3Ryb2tlVGV4dC1zdHJva2VzLXNoYWRvdy1leHBlY3RlZC50eHQg Yi9MYXlvdXRUZXN0cy9mYXN0L2NhbnZhcy9jYW52YXMtc3Ryb2tlVGV4dC1zdHJva2VzLXNoYWRv dy1leHBlY3RlZC50eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uNDYyODU5 MAotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvY2FudmFzL2NhbnZhcy1zdHJv a2VUZXh0LXN0cm9rZXMtc2hhZG93LWV4cGVjdGVkLnR4dApAQCAtMCwwICsxLDEzIEBACitUZXN0 IHRoYXQgc3Ryb2tlVGV4dCgpIGRvZXNuJ3QgcHJvZHVjZSBhIGZpbGxlZCBzaGFkb3cuCisKK09u IHN1Y2Nlc3MsIHlvdSB3aWxsIHNlZSBhIHNlcmllcyBvZiAiUEFTUyIgbWVzc2FnZXMsIGZvbGxv d2VkIGJ5ICJURVNUIENPTVBMRVRFIi4KKworCitQQVNTIGltZ2RhdGFbMF0gaXMgMAorUEFTUyBp bWdkYXRhWzFdIGlzIDEyOAorUEFTUyBpbWdkYXRhWzJdIGlzIDAKK1BBU1MgaW1nZGF0YVszXSBp cyAyNTUKK1BBU1Mgc3VjY2Vzc2Z1bGx5UGFyc2VkIGlzIHRydWUKKworVEVTVCBDT01QTEVURQor CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2NhbnZhcy9jYW52YXMtc3Ryb2tlVGV4dC1z dHJva2VzLXNoYWRvdy5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9jYW52YXMvY2FudmFzLXN0cm9r ZVRleHQtc3Ryb2tlcy1zaGFkb3cuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAw MDAwLi4zY2JhYjhjCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9jYW52YXMv Y2FudmFzLXN0cm9rZVRleHQtc3Ryb2tlcy1zaGFkb3cuaHRtbApAQCAtMCwwICsxLDEzIEBACis8 IURPQ1RZUEUgSFRNTCBQVUJMSUMgIi0vL0lFVEYvL0RURCBIVE1MLy9FTiI+Cis8aHRtbD4KKzxo ZWFkPgorPGxpbmsgcmVsPSJzdHlsZXNoZWV0IiBocmVmPSIuLi9qcy9yZXNvdXJjZXMvanMtdGVz dC1zdHlsZS5jc3MiPgorPHNjcmlwdCBzcmM9Ii4uL2pzL3Jlc291cmNlcy9qcy10ZXN0LXByZS5q cyI+PC9zY3JpcHQ+Cis8L2hlYWQ+Cis8Ym9keT4KKzxwIGlkPSJkZXNjcmlwdGlvbiI+PC9wPgor PGRpdiBpZD0iY29uc29sZSI+PC9kaXY+Cis8c2NyaXB0IHNyYz0ic2NyaXB0LXRlc3RzL2NhbnZh cy1zdHJva2VUZXh0LXN0cm9rZXMtc2hhZG93LmpzIj48L3NjcmlwdD4KKzxzY3JpcHQgc3JjPSIu Li9qcy9yZXNvdXJjZXMvanMtdGVzdC1wb3N0LmpzIj48L3NjcmlwdD4KKzwvYm9keT4KKzwvaHRt bD4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvY2FudmFzL3NjcmlwdC10ZXN0cy9jYW52 YXMtc3Ryb2tlVGV4dC1zdHJva2VzLXNoYWRvdy5qcyBiL0xheW91dFRlc3RzL2Zhc3QvY2FudmFz L3NjcmlwdC10ZXN0cy9jYW52YXMtc3Ryb2tlVGV4dC1zdHJva2VzLXNoYWRvdy5qcwpuZXcgZmls ZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi45N2I4ZTgwCi0tLSAvZGV2L251bGwKKysrIGIv TGF5b3V0VGVzdHMvZmFzdC9jYW52YXMvc2NyaXB0LXRlc3RzL2NhbnZhcy1zdHJva2VUZXh0LXN0 cm9rZXMtc2hhZG93LmpzCkBAIC0wLDAgKzEsMjMgQEAKK2Rlc2NyaXB0aW9uKCJUZXN0IHRoYXQg c3Ryb2tlVGV4dCgpIGRvZXNuJ3QgcHJvZHVjZSBhIGZpbGxlZCBzaGFkb3cuIik7Cit2YXIgY3R4 ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgnY2FudmFzJykuZ2V0Q29udGV4dCgnMmQnKTsKKwor Y3R4LmZpbGxTdHlsZSA9ICdncmVlbic7CitjdHguZmlsbFJlY3QoMCwgMCwgY3R4LmNhbnZhcy53 aWR0aCwgY3R4LmNhbnZhcy5oZWlnaHQpOworCisvLyBTdHJva2UgYW4gJ0knIHdpdGggaXRzIHNo YWRvdyBpbiB0aGUgdXBwZXIgbGVmdCBjb3JuZXIuCitjdHguc3Ryb2tlU3R5bGUgPSAnd2hpdGUn OworY3R4LmxpbmVXaWR0aCA9IDI7CitjdHguc2hhZG93Q29sb3IgPSAncmVkJzsKK2N0eC5zaGFk b3dPZmZzZXRYID0gLTE1OworY3R4LnNoYWRvd09mZnNldFkgPSAwOworY3R4LmZvbnQgPSAnMTI4 cHggc2Fucy1zZXJpZic7CitjdHguc3Ryb2tlVGV4dCgiSSIsIDAsIDUwKTsKKworaW1hZ2VEYXRh ID0gY3R4LmdldEltYWdlRGF0YSgwLCAwLCAxLCAxKTsKK2ltZ2RhdGEgPSBpbWFnZURhdGEuZGF0 YTsKK3Nob3VsZEJlKCJpbWdkYXRhWzBdIiwgIjAiKTsKK3Nob3VsZEJlKCJpbWdkYXRhWzFdIiwg IjEyOCIpOworc2hvdWxkQmUoImltZ2RhdGFbMl0iLCAiMCIpOworc2hvdWxkQmUoImltZ2RhdGFb M10iLCAiMjU1Iik7CisKK3ZhciBzdWNjZXNzZnVsbHlQYXJzZWQgPSB0cnVlOwpkaWZmIC0tZ2l0 IGEvV2ViQ29yZS9DaGFuZ2VMb2cgYi9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA5MjA0MDg4Li5l ODJiYjQ4IDEwMDY0NAotLS0gYS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9XZWJDb3JlL0NoYW5n ZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDEwLTExLTAyICBBbmRyZWFzIEtsaW5nICA8a2xpbmdA d2Via2l0Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBbUXRdIENhbnZhczogc3Ryb2tlVGV4dCgpIGFuZCBmaWxsVGV4dCgpIHByb2R1Y2Ugc2Ft ZSBzaGFkb3cKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTQ4ODQ1CisKKyAgICAgICAgVGVzdDogZmFzdC9jYW52YXMvY2FudmFzLXN0cm9rZVRleHQtc3Ry b2tlcy1zaGFkb3cuaHRtbAorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvcXQvRm9udFF0 LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmRyYXdUZXh0Q29tbW9uKTogU3Ryb2tlIHRoZSBzaGFk b3cgcmF0aGVyIHRoYW4gZmlsbGluZyBpdCBpbiB0aGUgY1RleHRTdHJva2UgY2FzZS4KKwogMjAx MC0xMS0wMSAgRGF2aWQgSHlhdHQgIDxoeWF0dEBhcHBsZS5jb20+CiAKICAgICAgICAgUmV2aWV3 ZWQgYnkgRGFuIEJlcm5zdGVpbi4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvcXQvRm9udFF0LmNwcCBiL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvcXQvRm9udFF0LmNw cAppbmRleCBiMDQ5MTgxLi5jMGFjYzdjIDEwMDY0NAotLS0gYS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL3F0L0ZvbnRRdC5jcHAKKysrIGIvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9G b250UXQuY3BwCkBAIC0xODIsMzIgKzE4Miw1NCBAQCBzdGF0aWMgdm9pZCBkcmF3VGV4dENvbW1v bihHcmFwaGljc0NvbnRleHQqIGN0eCwgY29uc3QgVGV4dFJ1biYgcnVuLCBjb25zdCBGbG9hdAog ICAgIGlmICghaXNDb21wbGV4VGV4dCAmJiAhKGN0eC0+dGV4dERyYXdpbmdNb2RlKCkgJiBjVGV4 dFN0cm9rZSkpCiAgICAgICAgIGZsYWdzIHw9IFF0OjpUZXh0QnlwYXNzU2hhcGluZzsKICNlbmRp ZgotICAgIGlmIChjdHgtPmNvbnRleHRTaGFkb3coKS0+bV90eXBlICE9IENvbnRleHRTaGFkb3c6 Ok5vU2hhZG93KSB7Ci0gICAgICAgIENvbnRleHRTaGFkb3cqIGN0eFNoYWRvdyA9IGN0eC0+Y29u dGV4dFNoYWRvdygpOwotICAgICAgICBpZiAoY3R4U2hhZG93LT5tX3R5cGUgIT0gQ29udGV4dFNo YWRvdzo6Qmx1clNoYWRvdykgewotICAgICAgICAgICAgcC0+c2F2ZSgpOwotICAgICAgICAgICAg cC0+c2V0UGVuKGN0eFNoYWRvdy0+bV9jb2xvcik7Ci0gICAgICAgICAgICBwLT50cmFuc2xhdGUo Y3R4U2hhZG93LT5vZmZzZXQoKSk7Ci0gICAgICAgICAgICBwLT5kcmF3VGV4dChwdCwgc3RyaW5n LCBmbGFncywgcnVuLnBhZGRpbmcoKSk7Ci0gICAgICAgICAgICBwLT5yZXN0b3JlKCk7Ci0gICAg ICAgIH0gZWxzZSB7Ci0gICAgICAgICAgICBRRm9udE1ldHJpY3MgZm0oZm9udCk7Ci0gICAgICAg ICAgICBRUmVjdEYgYm91bmRpbmdSZWN0KHBvaW50LngoKSwgcG9pbnQueSgpIC0gZm0uYXNjZW50 KCksIGZtLndpZHRoKHN0cmluZyksIGZtLmhlaWdodCgpKTsKLSAgICAgICAgICAgIFFQYWludGVy KiBzaGFkb3dQYWludGVyID0gY3R4U2hhZG93LT5iZWdpblNoYWRvd0xheWVyKHAsIGJvdW5kaW5n UmVjdCk7Ci0gICAgICAgICAgICBpZiAoc2hhZG93UGFpbnRlcikgewotICAgICAgICAgICAgICAg IC8vIFNpbmNlIGl0IHdpbGwgYmUgYmx1cnJlZCBhbnl3YXksIHdlIGRvbid0IGNhcmUgYWJvdXQg cmVuZGVyIGhpbnRzLgotICAgICAgICAgICAgICAgIHNoYWRvd1BhaW50ZXItPnNldEZvbnQocC0+ Zm9udCgpKTsKLSAgICAgICAgICAgICAgICBzaGFkb3dQYWludGVyLT5zZXRQZW4oY3R4U2hhZG93 LT5tX2NvbG9yKTsKLSAgICAgICAgICAgICAgICBzaGFkb3dQYWludGVyLT5kcmF3VGV4dChwdCwg c3RyaW5nLCBmbGFncywgcnVuLnBhZGRpbmcoKSk7Ci0gICAgICAgICAgICAgICAgY3R4U2hhZG93 LT5lbmRTaGFkb3dMYXllcihwKTsKKworICAgIFFQYWludGVyUGF0aCB0ZXh0U3Ryb2tlUGF0aDsK KyAgICBpZiAoY3R4LT50ZXh0RHJhd2luZ01vZGUoKSAmIGNUZXh0U3Ryb2tlKQorICAgICAgICB0 ZXh0U3Ryb2tlUGF0aC5hZGRUZXh0KHB0LCBmb250LCBzdHJpbmcpOworCisgICAgQ29udGV4dFNo YWRvdyogY3R4U2hhZG93ID0gY3R4LT5jb250ZXh0U2hhZG93KCk7CisgICAgaWYgKGN0eFNoYWRv dy0+bV90eXBlICE9IENvbnRleHRTaGFkb3c6Ok5vU2hhZG93KSB7CisgICAgICAgIGlmIChjdHgt PnRleHREcmF3aW5nTW9kZSgpICYgY1RleHRGaWxsKSB7CisgICAgICAgICAgICBpZiAoY3R4U2hh ZG93LT5tX3R5cGUgIT0gQ29udGV4dFNoYWRvdzo6Qmx1clNoYWRvdykgeworICAgICAgICAgICAg ICAgIHAtPnNhdmUoKTsKKyAgICAgICAgICAgICAgICBwLT5zZXRQZW4oY3R4U2hhZG93LT5tX2Nv bG9yKTsKKyAgICAgICAgICAgICAgICBwLT50cmFuc2xhdGUoY3R4U2hhZG93LT5vZmZzZXQoKSk7 CisgICAgICAgICAgICAgICAgcC0+ZHJhd1RleHQocHQsIHN0cmluZywgZmxhZ3MsIHJ1bi5wYWRk aW5nKCkpOworICAgICAgICAgICAgICAgIHAtPnJlc3RvcmUoKTsKKyAgICAgICAgICAgIH0gZWxz ZSB7CisgICAgICAgICAgICAgICAgUUZvbnRNZXRyaWNzIGZtKGZvbnQpOworICAgICAgICAgICAg ICAgIFFSZWN0RiBib3VuZGluZ1JlY3QocG9pbnQueCgpLCBwb2ludC55KCkgLSBmbS5hc2NlbnQo KSwgZm0ud2lkdGgoc3RyaW5nKSwgZm0uaGVpZ2h0KCkpOworICAgICAgICAgICAgICAgIFFQYWlu dGVyKiBzaGFkb3dQYWludGVyID0gY3R4U2hhZG93LT5iZWdpblNoYWRvd0xheWVyKHAsIGJvdW5k aW5nUmVjdCk7CisgICAgICAgICAgICAgICAgaWYgKHNoYWRvd1BhaW50ZXIpIHsKKyAgICAgICAg ICAgICAgICAgICAgLy8gU2luY2UgaXQgd2lsbCBiZSBibHVycmVkIGFueXdheSwgd2UgZG9uJ3Qg Y2FyZSBhYm91dCByZW5kZXIgaGludHMuCisgICAgICAgICAgICAgICAgICAgIHNoYWRvd1BhaW50 ZXItPnNldEZvbnQocC0+Zm9udCgpKTsKKyAgICAgICAgICAgICAgICAgICAgc2hhZG93UGFpbnRl ci0+c2V0UGVuKGN0eFNoYWRvdy0+bV9jb2xvcik7CisgICAgICAgICAgICAgICAgICAgIHNoYWRv d1BhaW50ZXItPmRyYXdUZXh0KHB0LCBzdHJpbmcsIGZsYWdzLCBydW4ucGFkZGluZygpKTsKKyAg ICAgICAgICAgICAgICAgICAgY3R4U2hhZG93LT5lbmRTaGFkb3dMYXllcihwKTsKKyAgICAgICAg ICAgICAgICB9CisgICAgICAgICAgICB9CisgICAgICAgIH0gZWxzZSBpZiAoY3R4LT50ZXh0RHJh d2luZ01vZGUoKSAmIGNUZXh0U3Ryb2tlKSB7CisgICAgICAgICAgICBpZiAoY3R4U2hhZG93LT5t X3R5cGUgIT0gQ29udGV4dFNoYWRvdzo6Qmx1clNoYWRvdykgeworICAgICAgICAgICAgICAgIHAt PnRyYW5zbGF0ZShjdHhTaGFkb3ctPm9mZnNldCgpKTsKKyAgICAgICAgICAgICAgICBwLT5zdHJv a2VQYXRoKHRleHRTdHJva2VQYXRoLCBRUGVuKGN0eFNoYWRvdy0+bV9jb2xvcikpOworICAgICAg ICAgICAgICAgIHAtPnRyYW5zbGF0ZSgtY3R4U2hhZG93LT5vZmZzZXQoKSk7CisgICAgICAgICAg ICB9IGVsc2UgeworICAgICAgICAgICAgICAgIFFGb250TWV0cmljcyBmbShmb250KTsKKyAgICAg ICAgICAgICAgICBRUmVjdEYgYm91bmRpbmdSZWN0KHBvaW50LngoKSwgcG9pbnQueSgpIC0gZm0u YXNjZW50KCksIGZtLndpZHRoKHN0cmluZyksIGZtLmhlaWdodCgpKTsKKyAgICAgICAgICAgICAg ICBRUGFpbnRlciogc2hhZG93UGFpbnRlciA9IGN0eFNoYWRvdy0+YmVnaW5TaGFkb3dMYXllcihw LCBib3VuZGluZ1JlY3QpOworICAgICAgICAgICAgICAgIGlmIChzaGFkb3dQYWludGVyKSB7Cisg ICAgICAgICAgICAgICAgICAgIC8vIFNpbmNlIGl0IHdpbGwgYmUgYmx1cnJlZCBhbnl3YXksIHdl IGRvbid0IGNhcmUgYWJvdXQgcmVuZGVyIGhpbnRzLgorICAgICAgICAgICAgICAgICAgICBzaGFk b3dQYWludGVyLT5zZXRGb250KHAtPmZvbnQoKSk7CisgICAgICAgICAgICAgICAgICAgIHNoYWRv d1BhaW50ZXItPnN0cm9rZVBhdGgodGV4dFN0cm9rZVBhdGgsIFFQZW4oY3R4U2hhZG93LT5tX2Nv bG9yKSk7CisgICAgICAgICAgICAgICAgICAgIGN0eFNoYWRvdy0+ZW5kU2hhZG93TGF5ZXIocCk7 CisgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgfQogICAgICAgICB9CiAgICAgfQotICAg IGlmIChjdHgtPnRleHREcmF3aW5nTW9kZSgpICYgY1RleHRTdHJva2UpIHsKLSAgICAgICAgUVBh aW50ZXJQYXRoIHBhdGg7Ci0gICAgICAgIHBhdGguYWRkVGV4dChwdCwgZm9udCwgc3RyaW5nKTsK LSAgICAgICAgcC0+c3Ryb2tlUGF0aChwYXRoLCB0ZXh0U3Ryb2tlUGVuKTsKLSAgICB9CisKKyAg ICBpZiAoY3R4LT50ZXh0RHJhd2luZ01vZGUoKSAmIGNUZXh0U3Ryb2tlKQorICAgICAgICBwLT5z dHJva2VQYXRoKHRleHRTdHJva2VQYXRoLCB0ZXh0U3Ryb2tlUGVuKTsKKwogICAgIGlmIChjdHgt PnRleHREcmF3aW5nTW9kZSgpICYgY1RleHRGaWxsKSB7CiAgICAgICAgIFFQZW4gcHJldmlvdXNQ ZW4gPSBwLT5wZW4oKTsKICAgICAgICAgcC0+c2V0UGVuKHRleHRGaWxsUGVuKTsK