128099 2014-02-03 00:36:04 -0800 CTTE: Grab bag of SVGRenderTreeAsText cleanups. 2014-02-03 10:47:29 -0800 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 kling kling commit-queue d-r esprehn+autocc fmalita glenn gyuyoung.kim kondapallykalyan pdr schenney oldest_to_newest 974953 0 kling 2014-02-03 00:36:04 -0800 CTTE: Grab bag of SVGRenderTreeAsText cleanups. 974954 1 222966 kling 2014-02-03 00:36:43 -0800 Created attachment 222966 Patch 975893 2 222992 kling 2014-02-03 09:47:08 -0800 Created attachment 222992 Patch 975928 3 222992 commit-queue 2014-02-03 10:47:26 -0800 Comment on attachment 222992 Patch Clearing flags on attachment: 222992 Committed r163316: <http://trac.webkit.org/changeset/163316> 975929 4 commit-queue 2014-02-03 10:47:29 -0800 All reviewed patches have been landed. Closing bug. 222966 2014-02-03 00:36:43 -0800 2014-02-03 09:47:08 -0800 Patch bug-128099.diff text/plain 10789 kling ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBkYWJlNGU3Li4wOWUzOTE2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzYg QEAKKzIwMTQtMDItMDMgIEFuZHJlYXMgS2xpbmcgIDxha2xpbmdAYXBwbGUuY29tPgorCisgICAg ICAgIENUVEU6IEdyYWIgYmFnIG9mIFNWR1JlbmRlclRyZWVBc1RleHQgY2xlYW51cHMuCisgICAg ICAgIDxodHRwczovL3dlYmtpdC5vcmcvYi8xMjgwOTk+CisKKyAgICAgICAgTWFkZSBzb21lIG9m IHRoZSBEUlQgU1ZHIGZ1bmN0aW9ucyB0YWtlIG1vcmUgc3BlY2lmaWMgdHlwZXMgdGhhbgorICAg ICAgICBSZW5kZXJPYmplY3QuIFJlbW92ZWQgc29tZSByZWR1bmRhbnQgY2FzdHMuCisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVu ZGVyVHJlZUFzVGV4dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjp3cml0ZSk6CisgICAgICAgICog cmVuZGVyaW5nL3N2Zy9TVkdSZW5kZXJUcmVlQXNUZXh0Lmg6CisgICAgICAgICogcmVuZGVyaW5n L3N2Zy9TVkdSZW5kZXJUcmVlQXNUZXh0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OndyaXRlU1ZH UmVzb3VyY2VDb250YWluZXIpOgorICAgICAgICAoV2ViQ29yZTo6d3JpdGVTVkdDb250YWluZXIp OgorCisgICAgICAgICAgICBNYWtlIHdyaXRlU1ZHUmVzb3VyY2VDb250YWluZXIoKSBhbmQgd3Jp dGVTVkdDb250YWluZXIoKSB0YWtlIHRoZQorICAgICAgICAgICAgZmluYWwgdHlwZSBpbnN0ZWFk IG9mIFJlbmRlck9iamVjdC4KKworICAgICAgICAoV2ViQ29yZTo6d3JpdGVTdHlsZSk6CisgICAg ICAgIChXZWJDb3JlOjp3cml0ZVBvc2l0aW9uQW5kU3R5bGUpOgorCisgICAgICAgICAgICBNYWtl IHRoZXNlIHRha2UgUmVuZGVyRWxlbWVudCBpbnN0ZWFkIG9mIFJlbmRlck9iamVjdC4KKworICAg ICAgICAoV2ViQ29yZTo6d3JpdGVDaGlsZHJlbik6CisKKyAgICAgICAgICAgIFVzZSBjaGlsZCBy ZW5kZXJlciBpdGVyYXRvci4KKworICAgICAgICAoV2ViQ29yZTo6d3JpdGVSZXNvdXJjZXMpOgor CisgICAgICAgICAgICBSZW1vdmUgdW5uZWNlc3NhcnkgY2FzdC4KKwogMjAxNC0wMi0wMiAgQW5k cmVhcyBLbGluZyAgPGFrbGluZ0BhcHBsZS5jb20+CiAKICAgICAgICAgUmVuZGVyU1ZHUmVzb3Vy Y2U6OnJlbW92ZUNsaWVudEZyb21DYWNoZSgpIHNob3VsZCB0YWtlIFJlbmRlckVsZW1lbnQmLgpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRyZWVBc1RleHQuY3Bw IGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRyZWVBc1RleHQuY3BwCmluZGV4IDhl Y2NmNDUuLmRhY2QwNjMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJUcmVlQXNUZXh0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVHJl ZUFzVGV4dC5jcHAKQEAgLTY2LDYgKzY2LDcgQEAKICNpbmNsdWRlICJSZW5kZXJTVkdJbWFnZS5o IgogI2luY2x1ZGUgIlJlbmRlclNWR0lubGluZVRleHQuaCIKICNpbmNsdWRlICJSZW5kZXJTVkdQ YXRoLmgiCisjaW5jbHVkZSAiUmVuZGVyU1ZHUmVzb3VyY2VDb250YWluZXIuaCIKICNpbmNsdWRl ICJSZW5kZXJTVkdSb290LmgiCiAjaW5jbHVkZSAiUmVuZGVyU1ZHVGV4dC5oIgogI2luY2x1ZGUg IlNWR1JlbmRlclRyZWVBc1RleHQuaCIKQEAgLTUxOCwxMSArNTE5LDExIEBAIHZvaWQgd3JpdGUo VGV4dFN0cmVhbSYgdHMsIGNvbnN0IFJlbmRlck9iamVjdCYgbywgaW50IGluZGVudCwgUmVuZGVy QXNUZXh0QmVoYXZpCiAgICAgICAgIHJldHVybjsKICAgICB9CiAgICAgaWYgKG8uaXNTVkdSZXNv dXJjZUNvbnRhaW5lcigpKSB7Ci0gICAgICAgIHdyaXRlU1ZHUmVzb3VyY2VDb250YWluZXIodHMs IG8sIGluZGVudCk7CisgICAgICAgIHdyaXRlU1ZHUmVzb3VyY2VDb250YWluZXIodHMsIHRvUmVu ZGVyU1ZHUmVzb3VyY2VDb250YWluZXIobyksIGluZGVudCk7CiAgICAgICAgIHJldHVybjsKICAg ICB9CiAgICAgaWYgKG8uaXNTVkdDb250YWluZXIoKSkgewotICAgICAgICB3cml0ZVNWR0NvbnRh aW5lcih0cywgbywgaW5kZW50KTsKKyAgICAgICAgd3JpdGVTVkdDb250YWluZXIodHMsIHRvUmVu ZGVyU1ZHQ29udGFpbmVyKG8pLCBpbmRlbnQpOwogICAgICAgICByZXR1cm47CiAgICAgfQogICAg IGlmIChvLmlzU1ZHUm9vdCgpKSB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvc3ZnL1NWR1JlbmRlclRyZWVBc1RleHQuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L3N2Zy9TVkdSZW5kZXJUcmVlQXNUZXh0LmNwcAppbmRleCAwYTgyZjkyLi5iZWJlMDVjIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3ZnL1NWR1JlbmRlclRyZWVBc1RleHQu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdmcvU1ZHUmVuZGVyVHJlZUFzVGV4 dC5jcHAKQEAgLTI1MCwxNyArMjUwLDE3IEBAIHN0YXRpYyB2b2lkIHdyaXRlU1ZHUGFpbnRpbmdS ZXNvdXJjZShUZXh0U3RyZWFtJiB0cywgUmVuZGVyU1ZHUmVzb3VyY2UqIHJlc291cmNlCiAgICAg dHMgPDwgIiBbaWQ9XCIiIDw8IGVsZW1lbnQuZ2V0SWRBdHRyaWJ1dGUoKSA8PCAiXCJdIjsKIH0K IAotc3RhdGljIHZvaWQgd3JpdGVTdHlsZShUZXh0U3RyZWFtJiB0cywgY29uc3QgUmVuZGVyT2Jq ZWN0JiBvYmplY3QpCitzdGF0aWMgdm9pZCB3cml0ZVN0eWxlKFRleHRTdHJlYW0mIHRzLCBjb25z dCBSZW5kZXJFbGVtZW50JiByZW5kZXJlcikKIHsKLSAgICBjb25zdCBSZW5kZXJTdHlsZSYgc3R5 bGUgPSBvYmplY3Quc3R5bGUoKTsKKyAgICBjb25zdCBSZW5kZXJTdHlsZSYgc3R5bGUgPSByZW5k ZXJlci5zdHlsZSgpOwogICAgIGNvbnN0IFNWR1JlbmRlclN0eWxlJiBzdmdTdHlsZSA9IHN0eWxl LnN2Z1N0eWxlKCk7CiAKLSAgICBpZiAoIW9iamVjdC5sb2NhbFRyYW5zZm9ybSgpLmlzSWRlbnRp dHkoKSkKLSAgICAgICAgd3JpdGVOYW1lVmFsdWVQYWlyKHRzLCAidHJhbnNmb3JtIiwgb2JqZWN0 LmxvY2FsVHJhbnNmb3JtKCkpOworICAgIGlmICghcmVuZGVyZXIubG9jYWxUcmFuc2Zvcm0oKS5p c0lkZW50aXR5KCkpCisgICAgICAgIHdyaXRlTmFtZVZhbHVlUGFpcih0cywgInRyYW5zZm9ybSIs IHJlbmRlcmVyLmxvY2FsVHJhbnNmb3JtKCkpOwogICAgIHdyaXRlSWZOb3REZWZhdWx0KHRzLCAi aW1hZ2UgcmVuZGVyaW5nIiwgc3R5bGUuaW1hZ2VSZW5kZXJpbmcoKSwgUmVuZGVyU3R5bGU6Omlu aXRpYWxJbWFnZVJlbmRlcmluZygpKTsKICAgICB3cml0ZUlmTm90RGVmYXVsdCh0cywgIm9wYWNp dHkiLCBzdHlsZS5vcGFjaXR5KCksIFJlbmRlclN0eWxlOjppbml0aWFsT3BhY2l0eSgpKTsKLSAg ICBpZiAob2JqZWN0LmlzU1ZHU2hhcGUoKSkgewotICAgICAgICBjb25zdCBSZW5kZXJTVkdTaGFw ZSYgc2hhcGUgPSBzdGF0aWNfY2FzdDxjb25zdCBSZW5kZXJTVkdTaGFwZSY+KG9iamVjdCk7Cisg ICAgaWYgKHJlbmRlcmVyLmlzU1ZHU2hhcGUoKSkgeworICAgICAgICBjb25zdCBhdXRvJiBzaGFw ZSA9IHRvUmVuZGVyU1ZHU2hhcGUocmVuZGVyZXIpOwogCiAgICAgICAgIENvbG9yIGZhbGxiYWNr Q29sb3I7CiAgICAgICAgIGlmIChSZW5kZXJTVkdSZXNvdXJjZSogc3Ryb2tlUGFpbnRpbmdSZXNv dXJjZSA9IFJlbmRlclNWR1Jlc291cmNlOjpzdHJva2VQYWludGluZ1Jlc291cmNlKGNvbnN0X2Nh c3Q8UmVuZGVyU1ZHU2hhcGUmPihzaGFwZSksIHNoYXBlLnN0eWxlKCksIGZhbGxiYWNrQ29sb3Ip KSB7CkBAIC0zMDcsMTAgKzMwNywxMCBAQCBzdGF0aWMgdm9pZCB3cml0ZVN0eWxlKFRleHRTdHJl YW0mIHRzLCBjb25zdCBSZW5kZXJPYmplY3QmIG9iamVjdCkKICAgICB3cml0ZUlmTm90RW1wdHko dHMsICJlbmQgbWFya2VyIiwgc3ZnU3R5bGUubWFya2VyRW5kUmVzb3VyY2UoKSk7CiB9CiAKLXN0 YXRpYyBUZXh0U3RyZWFtJiB3cml0ZVBvc2l0aW9uQW5kU3R5bGUoVGV4dFN0cmVhbSYgdHMsIGNv bnN0IFJlbmRlck9iamVjdCYgb2JqZWN0KQorc3RhdGljIFRleHRTdHJlYW0mIHdyaXRlUG9zaXRp b25BbmRTdHlsZShUZXh0U3RyZWFtJiB0cywgY29uc3QgUmVuZGVyRWxlbWVudCYgcmVuZGVyZXIp CiB7Ci0gICAgdHMgPDwgIiAiIDw8IGVuY2xvc2luZ0ludFJlY3QoY29uc3RfY2FzdDxSZW5kZXJP YmplY3QmPihvYmplY3QpLmFic29sdXRlQ2xpcHBlZE92ZXJmbG93UmVjdCgpKTsKLSAgICB3cml0 ZVN0eWxlKHRzLCBvYmplY3QpOworICAgIHRzIDw8ICIgIiA8PCBlbmNsb3NpbmdJbnRSZWN0KHJl bmRlcmVyLmFic29sdXRlQ2xpcHBlZE92ZXJmbG93UmVjdCgpKTsKKyAgICB3cml0ZVN0eWxlKHRz LCByZW5kZXJlcik7CiAgICAgcmV0dXJuIHRzOwogfQogCkBAIC00NTEsMTAgKzQ1MSwxMCBAQCBz dGF0aWMgdm9pZCB3cml0ZVN0YW5kYXJkUHJlZml4KFRleHRTdHJlYW0mIHRzLCBjb25zdCBSZW5k ZXJPYmplY3QmIG9iamVjdCwgaW50CiAgICAgICAgIHRzIDw8ICIgeyIgPDwgb2JqZWN0Lm5vZGUo KS0+bm9kZU5hbWUoKSA8PCAifSI7CiB9CiAKLXN0YXRpYyB2b2lkIHdyaXRlQ2hpbGRyZW4oVGV4 dFN0cmVhbSYgdHMsIGNvbnN0IFJlbmRlck9iamVjdCYgb2JqZWN0LCBpbnQgaW5kZW50KQorc3Rh dGljIHZvaWQgd3JpdGVDaGlsZHJlbihUZXh0U3RyZWFtJiB0cywgY29uc3QgUmVuZGVyRWxlbWVu dCYgcGFyZW50LCBpbnQgaW5kZW50KQogewotICAgIGZvciAoUmVuZGVyT2JqZWN0KiBjaGlsZCA9 IG9iamVjdC5maXJzdENoaWxkU2xvdygpOyBjaGlsZDsgY2hpbGQgPSBjaGlsZC0+bmV4dFNpYmxp bmcoKSkKLSAgICAgICAgd3JpdGUodHMsICpjaGlsZCwgaW5kZW50ICsgMSk7CisgICAgZm9yIChj b25zdCBhdXRvJiBjaGlsZCA6IGNoaWxkcmVuT2ZUeXBlPFJlbmRlck9iamVjdD4ocGFyZW50KSkK KyAgICAgICAgd3JpdGUodHMsIGNoaWxkLCBpbmRlbnQgKyAxKTsKIH0KIAogc3RhdGljIGlubGlu ZSB2b2lkIHdyaXRlQ29tbW9uR3JhZGllbnRQcm9wZXJ0aWVzKFRleHRTdHJlYW0mIHRzLCBTVkdT cHJlYWRNZXRob2RUeXBlIHNwcmVhZE1ldGhvZCwgY29uc3QgQWZmaW5lVHJhbnNmb3JtJiBncmFk aWVudFRyYW5zZm9ybSwgU1ZHVW5pdFR5cGVzOjpTVkdVbml0VHlwZSBncmFkaWVudFVuaXRzKQpA QCAtNDY4LDE2ICs0NjgsMTMgQEAgc3RhdGljIGlubGluZSB2b2lkIHdyaXRlQ29tbW9uR3JhZGll bnRQcm9wZXJ0aWVzKFRleHRTdHJlYW0mIHRzLCBTVkdTcHJlYWRNZXRob2QKICAgICAgICAgdHMg PDwgIiBbZ3JhZGllbnRUcmFuc2Zvcm09IiA8PCBncmFkaWVudFRyYW5zZm9ybSA8PCAiXSI7CiB9 CiAKLXZvaWQgd3JpdGVTVkdSZXNvdXJjZUNvbnRhaW5lcihUZXh0U3RyZWFtJiB0cywgY29uc3Qg UmVuZGVyT2JqZWN0JiBvYmplY3QsIGludCBpbmRlbnQpCit2b2lkIHdyaXRlU1ZHUmVzb3VyY2VD b250YWluZXIoVGV4dFN0cmVhbSYgdHMsIGNvbnN0IFJlbmRlclNWR1Jlc291cmNlQ29udGFpbmVy JiByZXNvdXJjZSwgaW50IGluZGVudCkKIHsKLSAgICB3cml0ZVN0YW5kYXJkUHJlZml4KHRzLCBv YmplY3QsIGluZGVudCk7CisgICAgd3JpdGVTdGFuZGFyZFByZWZpeCh0cywgcmVzb3VyY2UsIGlu ZGVudCk7CiAKLSAgICBFbGVtZW50KiBlbGVtZW50ID0gdG9FbGVtZW50KG9iamVjdC5ub2RlKCkp OwotICAgIGNvbnN0IEF0b21pY1N0cmluZyYgaWQgPSBlbGVtZW50LT5nZXRJZEF0dHJpYnV0ZSgp OworICAgIGNvbnN0IEF0b21pY1N0cmluZyYgaWQgPSByZXNvdXJjZS5lbGVtZW50KCkuZ2V0SWRB dHRyaWJ1dGUoKTsKICAgICB3cml0ZU5hbWVBbmRRdW90ZWRWYWx1ZSh0cywgImlkIiwgaWQpOyAg ICAKIAotICAgIGNvbnN0IGF1dG8mIHJlc291cmNlID0gdG9SZW5kZXJTVkdSZXNvdXJjZUNvbnRh aW5lcihvYmplY3QpOwotCiAgICAgaWYgKHJlc291cmNlLnJlc291cmNlVHlwZSgpID09IE1hc2tl clJlc291cmNlVHlwZSkgewogICAgICAgICBjb25zdCBhdXRvJiBtYXNrZXIgPSBzdGF0aWNfY2Fz dDxjb25zdCBSZW5kZXJTVkdSZXNvdXJjZU1hc2tlciY+KHJlc291cmNlKTsKICAgICAgICAgd3Jp dGVOYW1lVmFsdWVQYWlyKHRzLCAibWFza1VuaXRzIiwgbWFza2VyLm1hc2tVbml0cygpKTsKQEAg LTU1MiwxMCArNTQ5LDEwIEBAIHZvaWQgd3JpdGVTVkdSZXNvdXJjZUNvbnRhaW5lcihUZXh0U3Ry ZWFtJiB0cywgY29uc3QgUmVuZGVyT2JqZWN0JiBvYmplY3QsIGludCBpCiAgICAgICAgIHRzIDw8 ICIgW2NlbnRlcj0iIDw8IGNlbnRlclBvaW50IDw8ICJdIFtmb2NhbD0iIDw8IGZvY2FsUG9pbnQg PDwgIl0gW3JhZGl1cz0iIDw8IHJhZGl1cyA8PCAiXSBbZm9jYWxSYWRpdXM9IiA8PCBmb2NhbFJh ZGl1cyA8PCAiXVxuIjsKICAgICB9IGVsc2UKICAgICAgICAgdHMgPDwgIlxuIjsKLSAgICB3cml0 ZUNoaWxkcmVuKHRzLCBvYmplY3QsIGluZGVudCk7CisgICAgd3JpdGVDaGlsZHJlbih0cywgcmVz b3VyY2UsIGluZGVudCk7CiB9CiAKLXZvaWQgd3JpdGVTVkdDb250YWluZXIoVGV4dFN0cmVhbSYg dHMsIGNvbnN0IFJlbmRlck9iamVjdCYgY29udGFpbmVyLCBpbnQgaW5kZW50KQordm9pZCB3cml0 ZVNWR0NvbnRhaW5lcihUZXh0U3RyZWFtJiB0cywgY29uc3QgUmVuZGVyU1ZHQ29udGFpbmVyJiBj b250YWluZXIsIGludCBpbmRlbnQpCiB7CiAgICAgLy8gQ3VycmVudGx5IFJlbmRlclNWR1Jlc291 cmNlRmlsdGVyUHJpbWl0aXZlIGhhcyBubyBtZWFuaW5nZnVsIG91dHB1dC4KICAgICBpZiAoY29u dGFpbmVyLmlzU1ZHUmVzb3VyY2VGaWx0ZXJQcmltaXRpdmUoKSkKQEAgLTYxNiwxNiArNjEzLDE1 IEBAIHZvaWQgd3JpdGVTVkdHcmFkaWVudFN0b3AoVGV4dFN0cmVhbSYgdHMsIGNvbnN0IFJlbmRl clNWR0dyYWRpZW50U3RvcCYgc3RvcCwgaW50CiAgICAgdHMgPDwgIiBbb2Zmc2V0PSIgPDwgc3Rv cEVsZW1lbnQtPm9mZnNldCgpIDw8ICJdIFtjb2xvcj0iIDw8IHN0b3BFbGVtZW50LT5zdG9wQ29s b3JJbmNsdWRpbmdPcGFjaXR5KCkgPDwgIl1cbiI7CiB9CiAKLXZvaWQgd3JpdGVSZXNvdXJjZXMo VGV4dFN0cmVhbSYgdHMsIGNvbnN0IFJlbmRlck9iamVjdCYgb2JqZWN0LCBpbnQgaW5kZW50KQor dm9pZCB3cml0ZVJlc291cmNlcyhUZXh0U3RyZWFtJiB0cywgY29uc3QgUmVuZGVyT2JqZWN0JiBy ZW5kZXJlciwgaW50IGluZGVudCkKIHsKLSAgICBjb25zdCBSZW5kZXJTdHlsZSYgc3R5bGUgPSBv YmplY3Quc3R5bGUoKTsKKyAgICBjb25zdCBSZW5kZXJTdHlsZSYgc3R5bGUgPSByZW5kZXJlci5z dHlsZSgpOwogICAgIGNvbnN0IFNWR1JlbmRlclN0eWxlJiBzdmdTdHlsZSA9IHN0eWxlLnN2Z1N0 eWxlKCk7CiAKICAgICAvLyBGSVhNRTogV2Ugd2FudCB0byB1c2UgU1ZHUmVzb3VyY2VzQ2FjaGUg dG8gZGV0ZXJtaW5lIHdoaWNoIHJlc291cmNlcyBhcmUgcHJlc2VudCwgaW5zdGVhZCBvZiBxdWVy aW5nIHRoZSByZXNvdXJjZSA8LT4gaWQgY2FjaGUuCiAgICAgLy8gRm9yIG5vdyBsZWF2ZSB0aGUg RFJUIG91dHB1dCBhcyBpcywgYnV0IGxhdGVyIG9uIHdlIHNob3VsZCBjaGFuZ2UgdGhpcyBzbyBj eWNsZXMgYXJlIHByb3Blcmx5IGlnbm9yZWQgaW4gdGhlIERSVCBvdXRwdXQuCi0gICAgUmVuZGVy T2JqZWN0JiByZW5kZXJlciA9IGNvbnN0X2Nhc3Q8UmVuZGVyT2JqZWN0Jj4ob2JqZWN0KTsKICAg ICBpZiAoIXN2Z1N0eWxlLm1hc2tlclJlc291cmNlKCkuaXNFbXB0eSgpKSB7Ci0gICAgICAgIGlm IChSZW5kZXJTVkdSZXNvdXJjZU1hc2tlciogbWFza2VyID0gZ2V0UmVuZGVyU1ZHUmVzb3VyY2VC eUlkPFJlbmRlclNWR1Jlc291cmNlTWFza2VyPihvYmplY3QuZG9jdW1lbnQoKSwgc3ZnU3R5bGUu bWFza2VyUmVzb3VyY2UoKSkpIHsKKyAgICAgICAgaWYgKFJlbmRlclNWR1Jlc291cmNlTWFza2Vy KiBtYXNrZXIgPSBnZXRSZW5kZXJTVkdSZXNvdXJjZUJ5SWQ8UmVuZGVyU1ZHUmVzb3VyY2VNYXNr ZXI+KHJlbmRlcmVyLmRvY3VtZW50KCksIHN2Z1N0eWxlLm1hc2tlclJlc291cmNlKCkpKSB7CiAg ICAgICAgICAgICB3cml0ZUluZGVudCh0cywgaW5kZW50KTsKICAgICAgICAgICAgIHRzIDw8ICIg IjsKICAgICAgICAgICAgIHdyaXRlTmFtZUFuZFF1b3RlZFZhbHVlKHRzLCAibWFza2VyIiwgc3Zn U3R5bGUubWFza2VyUmVzb3VyY2UoKSk7CkBAIC02MzUsNyArNjMxLDcgQEAgdm9pZCB3cml0ZVJl c291cmNlcyhUZXh0U3RyZWFtJiB0cywgY29uc3QgUmVuZGVyT2JqZWN0JiBvYmplY3QsIGludCBp bmRlbnQpCiAgICAgICAgIH0KICAgICB9CiAgICAgaWYgKCFzdmdTdHlsZS5jbGlwcGVyUmVzb3Vy Y2UoKS5pc0VtcHR5KCkpIHsKLSAgICAgICAgaWYgKFJlbmRlclNWR1Jlc291cmNlQ2xpcHBlciog Y2xpcHBlciA9IGdldFJlbmRlclNWR1Jlc291cmNlQnlJZDxSZW5kZXJTVkdSZXNvdXJjZUNsaXBw ZXI+KG9iamVjdC5kb2N1bWVudCgpLCBzdmdTdHlsZS5jbGlwcGVyUmVzb3VyY2UoKSkpIHsKKyAg ICAgICAgaWYgKFJlbmRlclNWR1Jlc291cmNlQ2xpcHBlciogY2xpcHBlciA9IGdldFJlbmRlclNW R1Jlc291cmNlQnlJZDxSZW5kZXJTVkdSZXNvdXJjZUNsaXBwZXI+KHJlbmRlcmVyLmRvY3VtZW50 KCksIHN2Z1N0eWxlLmNsaXBwZXJSZXNvdXJjZSgpKSkgewogICAgICAgICAgICAgd3JpdGVJbmRl bnQodHMsIGluZGVudCk7CiAgICAgICAgICAgICB0cyA8PCAiICI7CiAgICAgICAgICAgICB3cml0 ZU5hbWVBbmRRdW90ZWRWYWx1ZSh0cywgImNsaXBQYXRoIiwgc3ZnU3R5bGUuY2xpcHBlclJlc291 cmNlKCkpOwpAQCAtNjQ2LDcgKzY0Miw3IEBAIHZvaWQgd3JpdGVSZXNvdXJjZXMoVGV4dFN0cmVh bSYgdHMsIGNvbnN0IFJlbmRlck9iamVjdCYgb2JqZWN0LCBpbnQgaW5kZW50KQogICAgIH0KICNp ZiBFTkFCTEUoRklMVEVSUykKICAgICBpZiAoIXN2Z1N0eWxlLmZpbHRlclJlc291cmNlKCkuaXNF bXB0eSgpKSB7Ci0gICAgICAgIGlmIChSZW5kZXJTVkdSZXNvdXJjZUZpbHRlciogZmlsdGVyID0g Z2V0UmVuZGVyU1ZHUmVzb3VyY2VCeUlkPFJlbmRlclNWR1Jlc291cmNlRmlsdGVyPihvYmplY3Qu ZG9jdW1lbnQoKSwgc3ZnU3R5bGUuZmlsdGVyUmVzb3VyY2UoKSkpIHsKKyAgICAgICAgaWYgKFJl bmRlclNWR1Jlc291cmNlRmlsdGVyKiBmaWx0ZXIgPSBnZXRSZW5kZXJTVkdSZXNvdXJjZUJ5SWQ8 UmVuZGVyU1ZHUmVzb3VyY2VGaWx0ZXI+KHJlbmRlcmVyLmRvY3VtZW50KCksIHN2Z1N0eWxlLmZp bHRlclJlc291cmNlKCkpKSB7CiAgICAgICAgICAgICB3cml0ZUluZGVudCh0cywgaW5kZW50KTsK ICAgICAgICAgICAgIHRzIDw8ICIgIjsKICAgICAgICAgICAgIHdyaXRlTmFtZUFuZFF1b3RlZFZh bHVlKHRzLCAiZmlsdGVyIiwgc3ZnU3R5bGUuZmlsdGVyUmVzb3VyY2UoKSk7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3ZnL1NWR1JlbmRlclRyZWVBc1RleHQuaCBiL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdmcvU1ZHUmVuZGVyVHJlZUFzVGV4dC5oCmluZGV4IDU0 NThjMGQuLjY1N2FkNmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdmcv U1ZHUmVuZGVyVHJlZUFzVGV4dC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdmcv U1ZHUmVuZGVyVHJlZUFzVGV4dC5oCkBAIC0zOCw5ICszOCwxMSBAQCBjbGFzcyBGbG9hdFNpemU7 CiBjbGFzcyBOb2RlOwogY2xhc3MgUmVuZGVySW1hZ2U7CiBjbGFzcyBSZW5kZXJPYmplY3Q7Citj bGFzcyBSZW5kZXJTVkdDb250YWluZXI7CiBjbGFzcyBSZW5kZXJTVkdHcmFkaWVudFN0b3A7CiBj bGFzcyBSZW5kZXJTVkdJbWFnZTsKIGNsYXNzIFJlbmRlclNWR0lubGluZVRleHQ7CitjbGFzcyBS ZW5kZXJTVkdSZXNvdXJjZUNvbnRhaW5lcjsKIGNsYXNzIFJlbmRlclNWR1NoYXBlOwogY2xhc3Mg UmVuZGVyU1ZHUm9vdDsKIGNsYXNzIFJlbmRlclNWR1RleHQ7CkBAIC01MSw4ICs1Myw4IEBAIGNs YXNzIFNWR1VuaXRUeXBlczsKIHZvaWQgd3JpdGUoVGV4dFN0cmVhbSYsIGNvbnN0IFJlbmRlclNW R1NoYXBlJiwgaW50IGluZGVudCk7CiB2b2lkIHdyaXRlKFRleHRTdHJlYW0mLCBjb25zdCBSZW5k ZXJTVkdSb290JiwgaW50IGluZGVudCk7CiB2b2lkIHdyaXRlU1ZHR3JhZGllbnRTdG9wKFRleHRT dHJlYW0mLCBjb25zdCBSZW5kZXJTVkdHcmFkaWVudFN0b3AmLCBpbnQgaW5kZW50KTsKLXZvaWQg d3JpdGVTVkdSZXNvdXJjZUNvbnRhaW5lcihUZXh0U3RyZWFtJiwgY29uc3QgUmVuZGVyT2JqZWN0 JiwgaW50IGluZGVudCk7Ci12b2lkIHdyaXRlU1ZHQ29udGFpbmVyKFRleHRTdHJlYW0mLCBjb25z dCBSZW5kZXJPYmplY3QmLCBpbnQgaW5kZW50KTsKK3ZvaWQgd3JpdGVTVkdSZXNvdXJjZUNvbnRh aW5lcihUZXh0U3RyZWFtJiwgY29uc3QgUmVuZGVyU1ZHUmVzb3VyY2VDb250YWluZXImLCBpbnQg aW5kZW50KTsKK3ZvaWQgd3JpdGVTVkdDb250YWluZXIoVGV4dFN0cmVhbSYsIGNvbnN0IFJlbmRl clNWR0NvbnRhaW5lciYsIGludCBpbmRlbnQpOwogdm9pZCB3cml0ZVNWR0ltYWdlKFRleHRTdHJl YW0mLCBjb25zdCBSZW5kZXJTVkdJbWFnZSYsIGludCBpbmRlbnQpOwogdm9pZCB3cml0ZVNWR0lu bGluZVRleHQoVGV4dFN0cmVhbSYsIGNvbnN0IFJlbmRlclNWR0lubGluZVRleHQmLCBpbnQgaW5k ZW50KTsKIHZvaWQgd3JpdGVTVkdUZXh0KFRleHRTdHJlYW0mLCBjb25zdCBSZW5kZXJTVkdUZXh0 JiwgaW50IGluZGVudCk7Cg== 222992 2014-02-03 09:47:08 -0800 2014-02-03 10:47:26 -0800 Patch bug-128099-2.diff text/plain 10956 kling ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA0MTIwY2M2Li5hYWZjMWFlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzYg QEAKKzIwMTQtMDItMDMgIEFuZHJlYXMgS2xpbmcgIDxha2xpbmdAYXBwbGUuY29tPgorCisgICAg ICAgIENUVEU6IEdyYWIgYmFnIG9mIFNWR1JlbmRlclRyZWVBc1RleHQgY2xlYW51cHMuCisgICAg ICAgIDxodHRwczovL3dlYmtpdC5vcmcvYi8xMjgwOTk+CisKKyAgICAgICAgTWFkZSBzb21lIG9m IHRoZSBEUlQgU1ZHIGZ1bmN0aW9ucyB0YWtlIG1vcmUgc3BlY2lmaWMgdHlwZXMgdGhhbgorICAg ICAgICBSZW5kZXJPYmplY3QuIFJlbW92ZWQgc29tZSByZWR1bmRhbnQgY2FzdHMuCisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVu ZGVyVHJlZUFzVGV4dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjp3cml0ZSk6CisgICAgICAgICog cmVuZGVyaW5nL3N2Zy9TVkdSZW5kZXJUcmVlQXNUZXh0Lmg6CisgICAgICAgICogcmVuZGVyaW5n L3N2Zy9TVkdSZW5kZXJUcmVlQXNUZXh0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OndyaXRlU1ZH UmVzb3VyY2VDb250YWluZXIpOgorICAgICAgICAoV2ViQ29yZTo6d3JpdGVTVkdDb250YWluZXIp OgorCisgICAgICAgICAgICBNYWtlIHdyaXRlU1ZHUmVzb3VyY2VDb250YWluZXIoKSBhbmQgd3Jp dGVTVkdDb250YWluZXIoKSB0YWtlIHRoZQorICAgICAgICAgICAgZmluYWwgdHlwZSBpbnN0ZWFk IG9mIFJlbmRlck9iamVjdC4KKworICAgICAgICAoV2ViQ29yZTo6d3JpdGVTdHlsZSk6CisgICAg ICAgIChXZWJDb3JlOjp3cml0ZVBvc2l0aW9uQW5kU3R5bGUpOgorCisgICAgICAgICAgICBNYWtl IHRoZXNlIHRha2UgUmVuZGVyRWxlbWVudCBpbnN0ZWFkIG9mIFJlbmRlck9iamVjdC4KKworICAg ICAgICAoV2ViQ29yZTo6d3JpdGVDaGlsZHJlbik6CisKKyAgICAgICAgICAgIFVzZSBjaGlsZCBy ZW5kZXJlciBpdGVyYXRvci4KKworICAgICAgICAoV2ViQ29yZTo6d3JpdGVSZXNvdXJjZXMpOgor CisgICAgICAgICAgICBSZW1vdmUgdW5uZWNlc3NhcnkgY2FzdC4KKwogMjAxNC0wMS0yNSAgRGFy aW4gQWRsZXIgIDxkYXJpbkBhcHBsZS5jb20+CiAKICAgICAgICAgU3RvcCB1c2luZyBVbmljb2Rl LmgKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUcmVlQXNUZXh0 LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUcmVlQXNUZXh0LmNwcAppbmRl eCA4ZWNjZjQ1Li5kYWNkMDYzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyVHJlZUFzVGV4dC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl clRyZWVBc1RleHQuY3BwCkBAIC02Niw2ICs2Niw3IEBACiAjaW5jbHVkZSAiUmVuZGVyU1ZHSW1h Z2UuaCIKICNpbmNsdWRlICJSZW5kZXJTVkdJbmxpbmVUZXh0LmgiCiAjaW5jbHVkZSAiUmVuZGVy U1ZHUGF0aC5oIgorI2luY2x1ZGUgIlJlbmRlclNWR1Jlc291cmNlQ29udGFpbmVyLmgiCiAjaW5j bHVkZSAiUmVuZGVyU1ZHUm9vdC5oIgogI2luY2x1ZGUgIlJlbmRlclNWR1RleHQuaCIKICNpbmNs dWRlICJTVkdSZW5kZXJUcmVlQXNUZXh0LmgiCkBAIC01MTgsMTEgKzUxOSwxMSBAQCB2b2lkIHdy aXRlKFRleHRTdHJlYW0mIHRzLCBjb25zdCBSZW5kZXJPYmplY3QmIG8sIGludCBpbmRlbnQsIFJl bmRlckFzVGV4dEJlaGF2aQogICAgICAgICByZXR1cm47CiAgICAgfQogICAgIGlmIChvLmlzU1ZH UmVzb3VyY2VDb250YWluZXIoKSkgewotICAgICAgICB3cml0ZVNWR1Jlc291cmNlQ29udGFpbmVy KHRzLCBvLCBpbmRlbnQpOworICAgICAgICB3cml0ZVNWR1Jlc291cmNlQ29udGFpbmVyKHRzLCB0 b1JlbmRlclNWR1Jlc291cmNlQ29udGFpbmVyKG8pLCBpbmRlbnQpOwogICAgICAgICByZXR1cm47 CiAgICAgfQogICAgIGlmIChvLmlzU1ZHQ29udGFpbmVyKCkpIHsKLSAgICAgICAgd3JpdGVTVkdD b250YWluZXIodHMsIG8sIGluZGVudCk7CisgICAgICAgIHdyaXRlU1ZHQ29udGFpbmVyKHRzLCB0 b1JlbmRlclNWR0NvbnRhaW5lcihvKSwgaW5kZW50KTsKICAgICAgICAgcmV0dXJuOwogICAgIH0K ICAgICBpZiAoby5pc1NWR1Jvb3QoKSkgewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL3N2Zy9TVkdSZW5kZXJUcmVlQXNUZXh0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9zdmcvU1ZHUmVuZGVyVHJlZUFzVGV4dC5jcHAKaW5kZXggMGE4MmY5Mi4uN2M4NmQ3OSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9TVkdSZW5kZXJUcmVlQXNU ZXh0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3ZnL1NWR1JlbmRlclRyZWVB c1RleHQuY3BwCkBAIC0zNSw2ICszNSw3IEBACiAjaW5jbHVkZSAiSFRNTE5hbWVzLmgiCiAjaW5j bHVkZSAiTm9kZVJlbmRlclN0eWxlLmgiCiAjaW5jbHVkZSAiUmVuZGVySW1hZ2UuaCIKKyNpbmNs dWRlICJSZW5kZXJJdGVyYXRvci5oIgogI2luY2x1ZGUgIlJlbmRlclNWR0dyYWRpZW50U3RvcC5o IgogI2luY2x1ZGUgIlJlbmRlclNWR0ltYWdlLmgiCiAjaW5jbHVkZSAiUmVuZGVyU1ZHUGF0aC5o IgpAQCAtMjUwLDE3ICsyNTEsMTcgQEAgc3RhdGljIHZvaWQgd3JpdGVTVkdQYWludGluZ1Jlc291 cmNlKFRleHRTdHJlYW0mIHRzLCBSZW5kZXJTVkdSZXNvdXJjZSogcmVzb3VyY2UKICAgICB0cyA8 PCAiIFtpZD1cIiIgPDwgZWxlbWVudC5nZXRJZEF0dHJpYnV0ZSgpIDw8ICJcIl0iOwogfQogCi1z dGF0aWMgdm9pZCB3cml0ZVN0eWxlKFRleHRTdHJlYW0mIHRzLCBjb25zdCBSZW5kZXJPYmplY3Qm IG9iamVjdCkKK3N0YXRpYyB2b2lkIHdyaXRlU3R5bGUoVGV4dFN0cmVhbSYgdHMsIGNvbnN0IFJl bmRlckVsZW1lbnQmIHJlbmRlcmVyKQogewotICAgIGNvbnN0IFJlbmRlclN0eWxlJiBzdHlsZSA9 IG9iamVjdC5zdHlsZSgpOworICAgIGNvbnN0IFJlbmRlclN0eWxlJiBzdHlsZSA9IHJlbmRlcmVy LnN0eWxlKCk7CiAgICAgY29uc3QgU1ZHUmVuZGVyU3R5bGUmIHN2Z1N0eWxlID0gc3R5bGUuc3Zn U3R5bGUoKTsKIAotICAgIGlmICghb2JqZWN0LmxvY2FsVHJhbnNmb3JtKCkuaXNJZGVudGl0eSgp KQotICAgICAgICB3cml0ZU5hbWVWYWx1ZVBhaXIodHMsICJ0cmFuc2Zvcm0iLCBvYmplY3QubG9j YWxUcmFuc2Zvcm0oKSk7CisgICAgaWYgKCFyZW5kZXJlci5sb2NhbFRyYW5zZm9ybSgpLmlzSWRl bnRpdHkoKSkKKyAgICAgICAgd3JpdGVOYW1lVmFsdWVQYWlyKHRzLCAidHJhbnNmb3JtIiwgcmVu ZGVyZXIubG9jYWxUcmFuc2Zvcm0oKSk7CiAgICAgd3JpdGVJZk5vdERlZmF1bHQodHMsICJpbWFn ZSByZW5kZXJpbmciLCBzdHlsZS5pbWFnZVJlbmRlcmluZygpLCBSZW5kZXJTdHlsZTo6aW5pdGlh bEltYWdlUmVuZGVyaW5nKCkpOwogICAgIHdyaXRlSWZOb3REZWZhdWx0KHRzLCAib3BhY2l0eSIs IHN0eWxlLm9wYWNpdHkoKSwgUmVuZGVyU3R5bGU6OmluaXRpYWxPcGFjaXR5KCkpOwotICAgIGlm IChvYmplY3QuaXNTVkdTaGFwZSgpKSB7Ci0gICAgICAgIGNvbnN0IFJlbmRlclNWR1NoYXBlJiBz aGFwZSA9IHN0YXRpY19jYXN0PGNvbnN0IFJlbmRlclNWR1NoYXBlJj4ob2JqZWN0KTsKKyAgICBp ZiAocmVuZGVyZXIuaXNTVkdTaGFwZSgpKSB7CisgICAgICAgIGNvbnN0IGF1dG8mIHNoYXBlID0g dG9SZW5kZXJTVkdTaGFwZShyZW5kZXJlcik7CiAKICAgICAgICAgQ29sb3IgZmFsbGJhY2tDb2xv cjsKICAgICAgICAgaWYgKFJlbmRlclNWR1Jlc291cmNlKiBzdHJva2VQYWludGluZ1Jlc291cmNl ID0gUmVuZGVyU1ZHUmVzb3VyY2U6OnN0cm9rZVBhaW50aW5nUmVzb3VyY2UoY29uc3RfY2FzdDxS ZW5kZXJTVkdTaGFwZSY+KHNoYXBlKSwgc2hhcGUuc3R5bGUoKSwgZmFsbGJhY2tDb2xvcikpIHsK QEAgLTMwNywxMCArMzA4LDEwIEBAIHN0YXRpYyB2b2lkIHdyaXRlU3R5bGUoVGV4dFN0cmVhbSYg dHMsIGNvbnN0IFJlbmRlck9iamVjdCYgb2JqZWN0KQogICAgIHdyaXRlSWZOb3RFbXB0eSh0cywg ImVuZCBtYXJrZXIiLCBzdmdTdHlsZS5tYXJrZXJFbmRSZXNvdXJjZSgpKTsKIH0KIAotc3RhdGlj IFRleHRTdHJlYW0mIHdyaXRlUG9zaXRpb25BbmRTdHlsZShUZXh0U3RyZWFtJiB0cywgY29uc3Qg UmVuZGVyT2JqZWN0JiBvYmplY3QpCitzdGF0aWMgVGV4dFN0cmVhbSYgd3JpdGVQb3NpdGlvbkFu ZFN0eWxlKFRleHRTdHJlYW0mIHRzLCBjb25zdCBSZW5kZXJFbGVtZW50JiByZW5kZXJlcikKIHsK LSAgICB0cyA8PCAiICIgPDwgZW5jbG9zaW5nSW50UmVjdChjb25zdF9jYXN0PFJlbmRlck9iamVj dCY+KG9iamVjdCkuYWJzb2x1dGVDbGlwcGVkT3ZlcmZsb3dSZWN0KCkpOwotICAgIHdyaXRlU3R5 bGUodHMsIG9iamVjdCk7CisgICAgdHMgPDwgIiAiIDw8IGVuY2xvc2luZ0ludFJlY3QocmVuZGVy ZXIuYWJzb2x1dGVDbGlwcGVkT3ZlcmZsb3dSZWN0KCkpOworICAgIHdyaXRlU3R5bGUodHMsIHJl bmRlcmVyKTsKICAgICByZXR1cm4gdHM7CiB9CiAKQEAgLTQ1MSwxMCArNDUyLDEwIEBAIHN0YXRp YyB2b2lkIHdyaXRlU3RhbmRhcmRQcmVmaXgoVGV4dFN0cmVhbSYgdHMsIGNvbnN0IFJlbmRlck9i amVjdCYgb2JqZWN0LCBpbnQKICAgICAgICAgdHMgPDwgIiB7IiA8PCBvYmplY3Qubm9kZSgpLT5u b2RlTmFtZSgpIDw8ICJ9IjsKIH0KIAotc3RhdGljIHZvaWQgd3JpdGVDaGlsZHJlbihUZXh0U3Ry ZWFtJiB0cywgY29uc3QgUmVuZGVyT2JqZWN0JiBvYmplY3QsIGludCBpbmRlbnQpCitzdGF0aWMg dm9pZCB3cml0ZUNoaWxkcmVuKFRleHRTdHJlYW0mIHRzLCBjb25zdCBSZW5kZXJFbGVtZW50JiBw YXJlbnQsIGludCBpbmRlbnQpCiB7Ci0gICAgZm9yIChSZW5kZXJPYmplY3QqIGNoaWxkID0gb2Jq ZWN0LmZpcnN0Q2hpbGRTbG93KCk7IGNoaWxkOyBjaGlsZCA9IGNoaWxkLT5uZXh0U2libGluZygp KQotICAgICAgICB3cml0ZSh0cywgKmNoaWxkLCBpbmRlbnQgKyAxKTsKKyAgICBmb3IgKGNvbnN0 IGF1dG8mIGNoaWxkIDogY2hpbGRyZW5PZlR5cGU8UmVuZGVyT2JqZWN0PihwYXJlbnQpKQorICAg ICAgICB3cml0ZSh0cywgY2hpbGQsIGluZGVudCArIDEpOwogfQogCiBzdGF0aWMgaW5saW5lIHZv aWQgd3JpdGVDb21tb25HcmFkaWVudFByb3BlcnRpZXMoVGV4dFN0cmVhbSYgdHMsIFNWR1NwcmVh ZE1ldGhvZFR5cGUgc3ByZWFkTWV0aG9kLCBjb25zdCBBZmZpbmVUcmFuc2Zvcm0mIGdyYWRpZW50 VHJhbnNmb3JtLCBTVkdVbml0VHlwZXM6OlNWR1VuaXRUeXBlIGdyYWRpZW50VW5pdHMpCkBAIC00 NjgsMTYgKzQ2OSwxMyBAQCBzdGF0aWMgaW5saW5lIHZvaWQgd3JpdGVDb21tb25HcmFkaWVudFBy b3BlcnRpZXMoVGV4dFN0cmVhbSYgdHMsIFNWR1NwcmVhZE1ldGhvZAogICAgICAgICB0cyA8PCAi IFtncmFkaWVudFRyYW5zZm9ybT0iIDw8IGdyYWRpZW50VHJhbnNmb3JtIDw8ICJdIjsKIH0KIAot dm9pZCB3cml0ZVNWR1Jlc291cmNlQ29udGFpbmVyKFRleHRTdHJlYW0mIHRzLCBjb25zdCBSZW5k ZXJPYmplY3QmIG9iamVjdCwgaW50IGluZGVudCkKK3ZvaWQgd3JpdGVTVkdSZXNvdXJjZUNvbnRh aW5lcihUZXh0U3RyZWFtJiB0cywgY29uc3QgUmVuZGVyU1ZHUmVzb3VyY2VDb250YWluZXImIHJl c291cmNlLCBpbnQgaW5kZW50KQogewotICAgIHdyaXRlU3RhbmRhcmRQcmVmaXgodHMsIG9iamVj dCwgaW5kZW50KTsKKyAgICB3cml0ZVN0YW5kYXJkUHJlZml4KHRzLCByZXNvdXJjZSwgaW5kZW50 KTsKIAotICAgIEVsZW1lbnQqIGVsZW1lbnQgPSB0b0VsZW1lbnQob2JqZWN0Lm5vZGUoKSk7Ci0g ICAgY29uc3QgQXRvbWljU3RyaW5nJiBpZCA9IGVsZW1lbnQtPmdldElkQXR0cmlidXRlKCk7Cisg ICAgY29uc3QgQXRvbWljU3RyaW5nJiBpZCA9IHJlc291cmNlLmVsZW1lbnQoKS5nZXRJZEF0dHJp YnV0ZSgpOwogICAgIHdyaXRlTmFtZUFuZFF1b3RlZFZhbHVlKHRzLCAiaWQiLCBpZCk7ICAgIAog Ci0gICAgY29uc3QgYXV0byYgcmVzb3VyY2UgPSB0b1JlbmRlclNWR1Jlc291cmNlQ29udGFpbmVy KG9iamVjdCk7Ci0KICAgICBpZiAocmVzb3VyY2UucmVzb3VyY2VUeXBlKCkgPT0gTWFza2VyUmVz b3VyY2VUeXBlKSB7CiAgICAgICAgIGNvbnN0IGF1dG8mIG1hc2tlciA9IHN0YXRpY19jYXN0PGNv bnN0IFJlbmRlclNWR1Jlc291cmNlTWFza2VyJj4ocmVzb3VyY2UpOwogICAgICAgICB3cml0ZU5h bWVWYWx1ZVBhaXIodHMsICJtYXNrVW5pdHMiLCBtYXNrZXIubWFza1VuaXRzKCkpOwpAQCAtNTUy LDEwICs1NTAsMTAgQEAgdm9pZCB3cml0ZVNWR1Jlc291cmNlQ29udGFpbmVyKFRleHRTdHJlYW0m IHRzLCBjb25zdCBSZW5kZXJPYmplY3QmIG9iamVjdCwgaW50IGkKICAgICAgICAgdHMgPDwgIiBb Y2VudGVyPSIgPDwgY2VudGVyUG9pbnQgPDwgIl0gW2ZvY2FsPSIgPDwgZm9jYWxQb2ludCA8PCAi XSBbcmFkaXVzPSIgPDwgcmFkaXVzIDw8ICJdIFtmb2NhbFJhZGl1cz0iIDw8IGZvY2FsUmFkaXVz IDw8ICJdXG4iOwogICAgIH0gZWxzZQogICAgICAgICB0cyA8PCAiXG4iOwotICAgIHdyaXRlQ2hp bGRyZW4odHMsIG9iamVjdCwgaW5kZW50KTsKKyAgICB3cml0ZUNoaWxkcmVuKHRzLCByZXNvdXJj ZSwgaW5kZW50KTsKIH0KIAotdm9pZCB3cml0ZVNWR0NvbnRhaW5lcihUZXh0U3RyZWFtJiB0cywg Y29uc3QgUmVuZGVyT2JqZWN0JiBjb250YWluZXIsIGludCBpbmRlbnQpCit2b2lkIHdyaXRlU1ZH Q29udGFpbmVyKFRleHRTdHJlYW0mIHRzLCBjb25zdCBSZW5kZXJTVkdDb250YWluZXImIGNvbnRh aW5lciwgaW50IGluZGVudCkKIHsKICAgICAvLyBDdXJyZW50bHkgUmVuZGVyU1ZHUmVzb3VyY2VG aWx0ZXJQcmltaXRpdmUgaGFzIG5vIG1lYW5pbmdmdWwgb3V0cHV0LgogICAgIGlmIChjb250YWlu ZXIuaXNTVkdSZXNvdXJjZUZpbHRlclByaW1pdGl2ZSgpKQpAQCAtNjE2LDE2ICs2MTQsMTUgQEAg dm9pZCB3cml0ZVNWR0dyYWRpZW50U3RvcChUZXh0U3RyZWFtJiB0cywgY29uc3QgUmVuZGVyU1ZH R3JhZGllbnRTdG9wJiBzdG9wLCBpbnQKICAgICB0cyA8PCAiIFtvZmZzZXQ9IiA8PCBzdG9wRWxl bWVudC0+b2Zmc2V0KCkgPDwgIl0gW2NvbG9yPSIgPDwgc3RvcEVsZW1lbnQtPnN0b3BDb2xvcklu Y2x1ZGluZ09wYWNpdHkoKSA8PCAiXVxuIjsKIH0KIAotdm9pZCB3cml0ZVJlc291cmNlcyhUZXh0 U3RyZWFtJiB0cywgY29uc3QgUmVuZGVyT2JqZWN0JiBvYmplY3QsIGludCBpbmRlbnQpCit2b2lk IHdyaXRlUmVzb3VyY2VzKFRleHRTdHJlYW0mIHRzLCBjb25zdCBSZW5kZXJPYmplY3QmIHJlbmRl cmVyLCBpbnQgaW5kZW50KQogewotICAgIGNvbnN0IFJlbmRlclN0eWxlJiBzdHlsZSA9IG9iamVj dC5zdHlsZSgpOworICAgIGNvbnN0IFJlbmRlclN0eWxlJiBzdHlsZSA9IHJlbmRlcmVyLnN0eWxl KCk7CiAgICAgY29uc3QgU1ZHUmVuZGVyU3R5bGUmIHN2Z1N0eWxlID0gc3R5bGUuc3ZnU3R5bGUo KTsKIAogICAgIC8vIEZJWE1FOiBXZSB3YW50IHRvIHVzZSBTVkdSZXNvdXJjZXNDYWNoZSB0byBk ZXRlcm1pbmUgd2hpY2ggcmVzb3VyY2VzIGFyZSBwcmVzZW50LCBpbnN0ZWFkIG9mIHF1ZXJpbmcg dGhlIHJlc291cmNlIDwtPiBpZCBjYWNoZS4KICAgICAvLyBGb3Igbm93IGxlYXZlIHRoZSBEUlQg b3V0cHV0IGFzIGlzLCBidXQgbGF0ZXIgb24gd2Ugc2hvdWxkIGNoYW5nZSB0aGlzIHNvIGN5Y2xl cyBhcmUgcHJvcGVybHkgaWdub3JlZCBpbiB0aGUgRFJUIG91dHB1dC4KLSAgICBSZW5kZXJPYmpl Y3QmIHJlbmRlcmVyID0gY29uc3RfY2FzdDxSZW5kZXJPYmplY3QmPihvYmplY3QpOwogICAgIGlm ICghc3ZnU3R5bGUubWFza2VyUmVzb3VyY2UoKS5pc0VtcHR5KCkpIHsKLSAgICAgICAgaWYgKFJl bmRlclNWR1Jlc291cmNlTWFza2VyKiBtYXNrZXIgPSBnZXRSZW5kZXJTVkdSZXNvdXJjZUJ5SWQ8 UmVuZGVyU1ZHUmVzb3VyY2VNYXNrZXI+KG9iamVjdC5kb2N1bWVudCgpLCBzdmdTdHlsZS5tYXNr ZXJSZXNvdXJjZSgpKSkgeworICAgICAgICBpZiAoUmVuZGVyU1ZHUmVzb3VyY2VNYXNrZXIqIG1h c2tlciA9IGdldFJlbmRlclNWR1Jlc291cmNlQnlJZDxSZW5kZXJTVkdSZXNvdXJjZU1hc2tlcj4o cmVuZGVyZXIuZG9jdW1lbnQoKSwgc3ZnU3R5bGUubWFza2VyUmVzb3VyY2UoKSkpIHsKICAgICAg ICAgICAgIHdyaXRlSW5kZW50KHRzLCBpbmRlbnQpOwogICAgICAgICAgICAgdHMgPDwgIiAiOwog ICAgICAgICAgICAgd3JpdGVOYW1lQW5kUXVvdGVkVmFsdWUodHMsICJtYXNrZXIiLCBzdmdTdHls ZS5tYXNrZXJSZXNvdXJjZSgpKTsKQEAgLTYzNSw3ICs2MzIsNyBAQCB2b2lkIHdyaXRlUmVzb3Vy Y2VzKFRleHRTdHJlYW0mIHRzLCBjb25zdCBSZW5kZXJPYmplY3QmIG9iamVjdCwgaW50IGluZGVu dCkKICAgICAgICAgfQogICAgIH0KICAgICBpZiAoIXN2Z1N0eWxlLmNsaXBwZXJSZXNvdXJjZSgp LmlzRW1wdHkoKSkgewotICAgICAgICBpZiAoUmVuZGVyU1ZHUmVzb3VyY2VDbGlwcGVyKiBjbGlw cGVyID0gZ2V0UmVuZGVyU1ZHUmVzb3VyY2VCeUlkPFJlbmRlclNWR1Jlc291cmNlQ2xpcHBlcj4o b2JqZWN0LmRvY3VtZW50KCksIHN2Z1N0eWxlLmNsaXBwZXJSZXNvdXJjZSgpKSkgeworICAgICAg ICBpZiAoUmVuZGVyU1ZHUmVzb3VyY2VDbGlwcGVyKiBjbGlwcGVyID0gZ2V0UmVuZGVyU1ZHUmVz b3VyY2VCeUlkPFJlbmRlclNWR1Jlc291cmNlQ2xpcHBlcj4ocmVuZGVyZXIuZG9jdW1lbnQoKSwg c3ZnU3R5bGUuY2xpcHBlclJlc291cmNlKCkpKSB7CiAgICAgICAgICAgICB3cml0ZUluZGVudCh0 cywgaW5kZW50KTsKICAgICAgICAgICAgIHRzIDw8ICIgIjsKICAgICAgICAgICAgIHdyaXRlTmFt ZUFuZFF1b3RlZFZhbHVlKHRzLCAiY2xpcFBhdGgiLCBzdmdTdHlsZS5jbGlwcGVyUmVzb3VyY2Uo KSk7CkBAIC02NDYsNyArNjQzLDcgQEAgdm9pZCB3cml0ZVJlc291cmNlcyhUZXh0U3RyZWFtJiB0 cywgY29uc3QgUmVuZGVyT2JqZWN0JiBvYmplY3QsIGludCBpbmRlbnQpCiAgICAgfQogI2lmIEVO QUJMRShGSUxURVJTKQogICAgIGlmICghc3ZnU3R5bGUuZmlsdGVyUmVzb3VyY2UoKS5pc0VtcHR5 KCkpIHsKLSAgICAgICAgaWYgKFJlbmRlclNWR1Jlc291cmNlRmlsdGVyKiBmaWx0ZXIgPSBnZXRS ZW5kZXJTVkdSZXNvdXJjZUJ5SWQ8UmVuZGVyU1ZHUmVzb3VyY2VGaWx0ZXI+KG9iamVjdC5kb2N1 bWVudCgpLCBzdmdTdHlsZS5maWx0ZXJSZXNvdXJjZSgpKSkgeworICAgICAgICBpZiAoUmVuZGVy U1ZHUmVzb3VyY2VGaWx0ZXIqIGZpbHRlciA9IGdldFJlbmRlclNWR1Jlc291cmNlQnlJZDxSZW5k ZXJTVkdSZXNvdXJjZUZpbHRlcj4ocmVuZGVyZXIuZG9jdW1lbnQoKSwgc3ZnU3R5bGUuZmlsdGVy UmVzb3VyY2UoKSkpIHsKICAgICAgICAgICAgIHdyaXRlSW5kZW50KHRzLCBpbmRlbnQpOwogICAg ICAgICAgICAgdHMgPDwgIiAiOwogICAgICAgICAgICAgd3JpdGVOYW1lQW5kUXVvdGVkVmFsdWUo dHMsICJmaWx0ZXIiLCBzdmdTdHlsZS5maWx0ZXJSZXNvdXJjZSgpKTsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdmcvU1ZHUmVuZGVyVHJlZUFzVGV4dC5oIGIvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9TVkdSZW5kZXJUcmVlQXNUZXh0LmgKaW5kZXggNTQ1OGMw ZC4uNjU3YWQ2ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9TVkdS ZW5kZXJUcmVlQXNUZXh0LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9TVkdS ZW5kZXJUcmVlQXNUZXh0LmgKQEAgLTM4LDkgKzM4LDExIEBAIGNsYXNzIEZsb2F0U2l6ZTsKIGNs YXNzIE5vZGU7CiBjbGFzcyBSZW5kZXJJbWFnZTsKIGNsYXNzIFJlbmRlck9iamVjdDsKK2NsYXNz IFJlbmRlclNWR0NvbnRhaW5lcjsKIGNsYXNzIFJlbmRlclNWR0dyYWRpZW50U3RvcDsKIGNsYXNz IFJlbmRlclNWR0ltYWdlOwogY2xhc3MgUmVuZGVyU1ZHSW5saW5lVGV4dDsKK2NsYXNzIFJlbmRl clNWR1Jlc291cmNlQ29udGFpbmVyOwogY2xhc3MgUmVuZGVyU1ZHU2hhcGU7CiBjbGFzcyBSZW5k ZXJTVkdSb290OwogY2xhc3MgUmVuZGVyU1ZHVGV4dDsKQEAgLTUxLDggKzUzLDggQEAgY2xhc3Mg U1ZHVW5pdFR5cGVzOwogdm9pZCB3cml0ZShUZXh0U3RyZWFtJiwgY29uc3QgUmVuZGVyU1ZHU2hh cGUmLCBpbnQgaW5kZW50KTsKIHZvaWQgd3JpdGUoVGV4dFN0cmVhbSYsIGNvbnN0IFJlbmRlclNW R1Jvb3QmLCBpbnQgaW5kZW50KTsKIHZvaWQgd3JpdGVTVkdHcmFkaWVudFN0b3AoVGV4dFN0cmVh bSYsIGNvbnN0IFJlbmRlclNWR0dyYWRpZW50U3RvcCYsIGludCBpbmRlbnQpOwotdm9pZCB3cml0 ZVNWR1Jlc291cmNlQ29udGFpbmVyKFRleHRTdHJlYW0mLCBjb25zdCBSZW5kZXJPYmplY3QmLCBp bnQgaW5kZW50KTsKLXZvaWQgd3JpdGVTVkdDb250YWluZXIoVGV4dFN0cmVhbSYsIGNvbnN0IFJl bmRlck9iamVjdCYsIGludCBpbmRlbnQpOwordm9pZCB3cml0ZVNWR1Jlc291cmNlQ29udGFpbmVy KFRleHRTdHJlYW0mLCBjb25zdCBSZW5kZXJTVkdSZXNvdXJjZUNvbnRhaW5lciYsIGludCBpbmRl bnQpOwordm9pZCB3cml0ZVNWR0NvbnRhaW5lcihUZXh0U3RyZWFtJiwgY29uc3QgUmVuZGVyU1ZH Q29udGFpbmVyJiwgaW50IGluZGVudCk7CiB2b2lkIHdyaXRlU1ZHSW1hZ2UoVGV4dFN0cmVhbSYs IGNvbnN0IFJlbmRlclNWR0ltYWdlJiwgaW50IGluZGVudCk7CiB2b2lkIHdyaXRlU1ZHSW5saW5l VGV4dChUZXh0U3RyZWFtJiwgY29uc3QgUmVuZGVyU1ZHSW5saW5lVGV4dCYsIGludCBpbmRlbnQp Owogdm9pZCB3cml0ZVNWR1RleHQoVGV4dFN0cmVhbSYsIGNvbnN0IFJlbmRlclNWR1RleHQmLCBp bnQgaW5kZW50KTsK