142093 2015-02-27 11:39:44 -0800 [Subpixel] Subpixelize RenderListMarker 2015-02-27 16:23:39 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 mmaxfield mmaxfield commit-queue dino esprehn+autocc glenn jonlee kondapallykalyan simon.fraser thorton zalan oldest_to_newest 1072761 0 mmaxfield 2015-02-27 11:39:44 -0800 [Subpixel] Subpixelize RenderListMarker 1072763 1 247528 mmaxfield 2015-02-27 11:40:53 -0800 Created attachment 247528 Patch 1072820 2 247549 mmaxfield 2015-02-27 13:51:42 -0800 Created attachment 247549 Patch 1072914 3 247549 commit-queue 2015-02-27 16:23:35 -0800 Comment on attachment 247549 Patch Clearing flags on attachment: 247549 Committed r180795: <http://trac.webkit.org/changeset/180795> 1072915 4 commit-queue 2015-02-27 16:23:39 -0800 All reviewed patches have been landed. Closing bug. 247528 2015-02-27 11:40:53 -0800 2015-02-27 13:51:39 -0800 Patch bug-142093-20150227114039.patch text/plain 10051 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMTgwNzY4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2U4MTAxMDA4OGQ2ODBj MDQwOTgxNDgyYjBkN2QzY2JiMDU3NTU4Yy4uYTdkZTE0OTE5NGMwNjQ5NWMyNTY0ZDZiMTRkOWE1 YWNiOGI1NTgwNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDE1LTAyLTI3ICBNeWxl cyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CisKKyAgICAgICAgW1N1YnBpeGVs XSBTdWJwaXhlbGl6ZSBSZW5kZXJMaXN0TWFya2VyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDIwOTMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBVc2UgZmxvYXRzIGluc3RlYWQgb2YgaW50cy4KKworICAg ICAgICBUZXN0OiBmYXN0L2xpc3RzL3J0bC1tYXJrZXIuaHRtbAorCisgICAgICAgICogcmVuZGVy aW5nL1JlbmRlckxpc3RNYXJrZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGlzdE1h cmtlcjo6cGFpbnQpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGlzdE1hcmtlcjo6dXBkYXRl Q29udGVudCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMaXN0TWFya2VyOjpnZXRSZWxhdGl2 ZU1hcmtlclJlY3QpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJMaXN0TWFya2VyLmg6CisK IDIwMTUtMDItMjcgIFphbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBV c2UgYWZ0ZXIgZnJlZSBpbiBXZWJDb3JlOjpSZW5kZXJOYW1lZEZsb3dGcmFnbWVudDo6cmVzdG9y ZVJlZ2lvbk9iamVjdHNPcmlnaW5hbFN0eWxlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyTGlzdE1hcmtlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyTGlzdE1hcmtlci5jcHAKaW5kZXggZjc0NmY0NWIwMmM2YWNjODI3MzZmMGQyN2IxYWU3 Y2JjYzA5NWM0Ni4uN2M0ZmI1MzEwNTdkMTU1MGQ4MjMwNDVmNjk4MWEyZjhhZjcxNDQxNSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxpc3RNYXJrZXIuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMaXN0TWFya2VyLmNwcApAQCAtMTE4 NiwxMyArMTE4NiwxMyBAQCB2b2lkIFJlbmRlckxpc3RNYXJrZXI6OnBhaW50KFBhaW50SW5mbyYg cGFpbnRJbmZvLCBjb25zdCBMYXlvdXRQb2ludCYgcGFpbnRPZmZzZQogICAgIG92ZXJmbG93UmVj dC5tb3ZlQnkoYm94T3JpZ2luKTsKICAgICBvdmVyZmxvd1JlY3QuaW5mbGF0ZShtYXhpbWFsT3V0 bGluZVNpemUocGFpbnRJbmZvLnBoYXNlKSk7CiAKLSAgICBpZiAoIXBhaW50SW5mby5yZWN0Lmlu dGVyc2VjdHMoc25hcHBlZEludFJlY3Qob3ZlcmZsb3dSZWN0KSkpCisgICAgaWYgKCFwYWludElu Zm8ucmVjdC5pbnRlcnNlY3RzKG92ZXJmbG93UmVjdCkpCiAgICAgICAgIHJldHVybjsKIAogICAg IExheW91dFJlY3QgYm94KGJveE9yaWdpbiwgc2l6ZSgpKTsKICAgICAKLSAgICBJbnRSZWN0IG1h cmtlciA9IGdldFJlbGF0aXZlTWFya2VyUmVjdCgpOwotICAgIG1hcmtlci5tb3ZlQnkocm91bmRl ZEludFBvaW50KGJveE9yaWdpbikpOworICAgIEZsb2F0UmVjdCBtYXJrZXIgPSBnZXRSZWxhdGl2 ZU1hcmtlclJlY3QoKTsKKyAgICBtYXJrZXIubW92ZUJ5KGJveE9yaWdpbik7CiAKICAgICBHcmFw aGljc0NvbnRleHQqIGNvbnRleHQgPSBwYWludEluZm8uY29udGV4dDsKIApAQCAtMTMxOSwxNiAr MTMxOSwxNiBAQCB2b2lkIFJlbmRlckxpc3RNYXJrZXI6OnBhaW50KFBhaW50SW5mbyYgcGFpbnRJ bmZvLCBjb25zdCBMYXlvdXRQb2ludCYgcGFpbnRPZmZzZQogCiAgICAgR3JhcGhpY3NDb250ZXh0 U3RhdGVTYXZlciBzdGF0ZVNhdmVyKCpjb250ZXh0LCBmYWxzZSk7CiAgICAgaWYgKCFzdHlsZSgp LmlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKCkpIHsKLSAgICAgICAgbWFya2VyLm1vdmVCeShyb3Vu ZGVkSW50UG9pbnQoLWJveE9yaWdpbikpOworICAgICAgICBtYXJrZXIubW92ZUJ5KC1ib3hPcmln aW4pOwogICAgICAgICBtYXJrZXIgPSBtYXJrZXIudHJhbnNwb3NlZFJlY3QoKTsKLSAgICAgICAg bWFya2VyLm1vdmVCeShJbnRQb2ludChyb3VuZFRvSW50KGJveC54KCkpLCByb3VuZFRvSW50KGJv eC55KCkgLSBsb2dpY2FsSGVpZ2h0KCkpKSk7CisgICAgICAgIG1hcmtlci5tb3ZlQnkoRmxvYXRQ b2ludChib3gueCgpLCBib3gueSgpIC0gbG9naWNhbEhlaWdodCgpKSk7CiAgICAgICAgIHN0YXRl U2F2ZXIuc2F2ZSgpOwogICAgICAgICBjb250ZXh0LT50cmFuc2xhdGUobWFya2VyLngoKSwgbWFy a2VyLm1heFkoKSk7CiAgICAgICAgIGNvbnRleHQtPnJvdGF0ZShzdGF0aWNfY2FzdDxmbG9hdD4o ZGVnMnJhZCg5MC4pKSk7CiAgICAgICAgIGNvbnRleHQtPnRyYW5zbGF0ZSgtbWFya2VyLngoKSwg LW1hcmtlci5tYXhZKCkpOwogICAgIH0KIAotICAgIEludFBvaW50IHRleHRPcmlnaW4gPSBJbnRQ b2ludChtYXJrZXIueCgpLCBtYXJrZXIueSgpICsgc3R5bGUoKS5mb250TWV0cmljcygpLmFzY2Vu dCgpKTsKKyAgICBGbG9hdFBvaW50IHRleHRPcmlnaW4gPSBGbG9hdFBvaW50KG1hcmtlci54KCks IG1hcmtlci55KCkgKyBzdHlsZSgpLmZvbnRNZXRyaWNzKCkuYXNjZW50KCkpOwogCiAgICAgaWYg KHR5cGUgPT0gQXN0ZXJpc2tzIHx8IHR5cGUgPT0gRm9vdG5vdGVzKQogICAgICAgICBjb250ZXh0 LT5kcmF3VGV4dChmb250LCB0ZXh0UnVuLCB0ZXh0T3JpZ2luKTsKQEAgLTEzNDksMTYgKzEzNDks MTYgQEAgdm9pZCBSZW5kZXJMaXN0TWFya2VyOjpwYWludChQYWludEluZm8mIHBhaW50SW5mbywg Y29uc3QgTGF5b3V0UG9pbnQmIHBhaW50T2Zmc2UKIAogICAgICAgICBjb25zdCBVQ2hhciBzdWZm aXggPSBsaXN0TWFya2VyU3VmZml4KHR5cGUsIG1fbGlzdEl0ZW0udmFsdWUoKSk7CiAgICAgICAg IGlmIChzdHlsZSgpLmlzTGVmdFRvUmlnaHREaXJlY3Rpb24oKSkgewotICAgICAgICAgICAgaW50 IHdpZHRoID0gZm9udC53aWR0aCh0ZXh0UnVuKTsKKyAgICAgICAgICAgIGZsb2F0IHdpZHRoID0g Zm9udC53aWR0aCh0ZXh0UnVuKTsKICAgICAgICAgICAgIGNvbnRleHQtPmRyYXdUZXh0KGZvbnQs IHRleHRSdW4sIHRleHRPcmlnaW4pOwogICAgICAgICAgICAgVUNoYXIgc3VmZml4U3BhY2VbMl0g PSB7IHN1ZmZpeCwgJyAnIH07Ci0gICAgICAgICAgICBjb250ZXh0LT5kcmF3VGV4dChmb250LCBS ZW5kZXJCbG9jazo6Y29uc3RydWN0VGV4dFJ1bih0aGlzLCBmb250LCBzdWZmaXhTcGFjZSwgMiwg c3R5bGUoKSksIHRleHRPcmlnaW4gKyBJbnRTaXplKHdpZHRoLCAwKSk7CisgICAgICAgICAgICBj b250ZXh0LT5kcmF3VGV4dChmb250LCBSZW5kZXJCbG9jazo6Y29uc3RydWN0VGV4dFJ1bih0aGlz LCBmb250LCBzdWZmaXhTcGFjZSwgMiwgc3R5bGUoKSksIHRleHRPcmlnaW4gKyBGbG9hdFNpemUo d2lkdGgsIDApKTsKICAgICAgICAgfSBlbHNlIHsKICAgICAgICAgICAgIFVDaGFyIHNwYWNlU3Vm Zml4WzJdID0geyAnICcsIHN1ZmZpeCB9OwogICAgICAgICAgICAgVGV4dFJ1biBzcGFjZVN1ZmZp eFJ1biA9IFJlbmRlckJsb2NrOjpjb25zdHJ1Y3RUZXh0UnVuKHRoaXMsIGZvbnQsIHNwYWNlU3Vm Zml4LCAyLCBzdHlsZSgpKTsKLSAgICAgICAgICAgIGludCB3aWR0aCA9IGZvbnQud2lkdGgoc3Bh Y2VTdWZmaXhSdW4pOworICAgICAgICAgICAgZmxvYXQgd2lkdGggPSBmb250LndpZHRoKHNwYWNl U3VmZml4UnVuKTsKICAgICAgICAgICAgIGNvbnRleHQtPmRyYXdUZXh0KGZvbnQsIHNwYWNlU3Vm Zml4UnVuLCB0ZXh0T3JpZ2luKTsKLSAgICAgICAgICAgIGNvbnRleHQtPmRyYXdUZXh0KGZvbnQs IHRleHRSdW4sIHRleHRPcmlnaW4gKyBJbnRTaXplKHdpZHRoLCAwKSk7CisgICAgICAgICAgICBj b250ZXh0LT5kcmF3VGV4dChmb250LCB0ZXh0UnVuLCB0ZXh0T3JpZ2luICsgRmxvYXRTaXplKHdp ZHRoLCAwKSk7CiAgICAgICAgIH0KICAgICB9CiB9CkBAIC0xNDIxLDcgKzE0MjEsNyBAQCB2b2lk IFJlbmRlckxpc3RNYXJrZXI6OnVwZGF0ZUNvbnRlbnQoKQogICAgICAgICAvLyBGSVhNRTogVGhp cyBpcyBhIHNvbWV3aGF0IGFyYml0cmFyeSB3aWR0aC4gIEdlbmVyYXRlZCBpbWFnZXMgZm9yIG1h cmtlcnMgcmVhbGx5IHdvbid0IGJlY29tZSBwYXJ0aWN1bGFybHkgdXNlZnVsCiAgICAgICAgIC8v IHVudGlsIHdlIHN1cHBvcnQgdGhlIENTUzMgbWFya2VyIHBzZXVkb2NsYXNzIHRvIGFsbG93IGNv bnRyb2wgb3ZlciB0aGUgd2lkdGggYW5kIGhlaWdodCBvZiB0aGUgbWFya2VyIGJveC4KICAgICAg ICAgaW50IGJ1bGxldFdpZHRoID0gc3R5bGUoKS5mb250TWV0cmljcygpLmFzY2VudCgpIC8gMjsK LSAgICAgICAgbV9pbWFnZS0+c2V0Q29udGFpbmVyU2l6ZUZvclJlbmRlcmVyKHRoaXMsIEludFNp emUoYnVsbGV0V2lkdGgsIGJ1bGxldFdpZHRoKSwgc3R5bGUoKS5lZmZlY3RpdmVab29tKCkpOwor ICAgICAgICBtX2ltYWdlLT5zZXRDb250YWluZXJTaXplRm9yUmVuZGVyZXIodGhpcywgRmxvYXRT aXplKGJ1bGxldFdpZHRoLCBidWxsZXRXaWR0aCksIHN0eWxlKCkuZWZmZWN0aXZlWm9vbSgpKTsK ICAgICAgICAgcmV0dXJuOwogICAgIH0KIApAQCAtMTc0NywxOSArMTc0NywxOSBAQCBib29sIFJl bmRlckxpc3RNYXJrZXI6OmlzSW5zaWRlKCkgY29uc3QKICAgICByZXR1cm4gbV9saXN0SXRlbS5u b3RJbkxpc3QoKSB8fCBzdHlsZSgpLmxpc3RTdHlsZVBvc2l0aW9uKCkgPT0gSU5TSURFOwogfQog Ci1JbnRSZWN0IFJlbmRlckxpc3RNYXJrZXI6OmdldFJlbGF0aXZlTWFya2VyUmVjdCgpCitGbG9h dFJlY3QgUmVuZGVyTGlzdE1hcmtlcjo6Z2V0UmVsYXRpdmVNYXJrZXJSZWN0KCkKIHsKICAgICBp ZiAoaXNJbWFnZSgpKQotICAgICAgICByZXR1cm4gSW50UmVjdCgwLCAwLCBtX2ltYWdlLT5pbWFn ZVNpemUodGhpcywgc3R5bGUoKS5lZmZlY3RpdmVab29tKCkpLndpZHRoKCksIG1faW1hZ2UtPmlt YWdlU2l6ZSh0aGlzLCBzdHlsZSgpLmVmZmVjdGl2ZVpvb20oKSkuaGVpZ2h0KCkpOworICAgICAg ICByZXR1cm4gRmxvYXRSZWN0KDAsIDAsIG1faW1hZ2UtPmltYWdlU2l6ZSh0aGlzLCBzdHlsZSgp LmVmZmVjdGl2ZVpvb20oKSkud2lkdGgoKSwgbV9pbWFnZS0+aW1hZ2VTaXplKHRoaXMsIHN0eWxl KCkuZWZmZWN0aXZlWm9vbSgpKS5oZWlnaHQoKSk7CiAgICAgCi0gICAgSW50UmVjdCByZWxhdGl2 ZVJlY3Q7CisgICAgRmxvYXRSZWN0IHJlbGF0aXZlUmVjdDsKICAgICBFTGlzdFN0eWxlVHlwZSB0 eXBlID0gc3R5bGUoKS5saXN0U3R5bGVUeXBlKCk7CiAgICAgc3dpdGNoICh0eXBlKSB7CiAgICAg ICAgIGNhc2UgQXN0ZXJpc2tzOgogICAgICAgICBjYXNlIEZvb3Rub3RlczogewogICAgICAgICAg ICAgY29uc3QgRm9udENhc2NhZGUmIGZvbnQgPSBzdHlsZSgpLmZvbnRDYXNjYWRlKCk7CiAgICAg ICAgICAgICBUZXh0UnVuIHJ1biA9IFJlbmRlckJsb2NrOjpjb25zdHJ1Y3RUZXh0UnVuKHRoaXMs IGZvbnQsIG1fdGV4dCwgc3R5bGUoKSwgVGV4dFJ1bjo6QWxsb3dUcmFpbGluZ0V4cGFuc2lvbiB8 IFRleHRSdW46OkZvcmJpZExlYWRpbmdFeHBhbnNpb24sIERlZmF1bHRUZXh0UnVuRmxhZ3MpOwot ICAgICAgICAgICAgcmVsYXRpdmVSZWN0ID0gSW50UmVjdCgwLCAwLCBmb250LndpZHRoKHJ1biks IGZvbnQuZm9udE1ldHJpY3MoKS5oZWlnaHQoKSk7CisgICAgICAgICAgICByZWxhdGl2ZVJlY3Qg PSBGbG9hdFJlY3QoMCwgMCwgZm9udC53aWR0aChydW4pLCBmb250LmZvbnRNZXRyaWNzKCkuaGVp Z2h0KCkpOwogICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIH0KICAgICAgICAgY2FzZSBEaXNj OgpAQCAtMTc2OSwxMSArMTc2OSwxMSBAQCBJbnRSZWN0IFJlbmRlckxpc3RNYXJrZXI6OmdldFJl bGF0aXZlTWFya2VyUmVjdCgpCiAgICAgICAgICAgICBjb25zdCBGb250TWV0cmljcyYgZm9udE1l dHJpY3MgPSBzdHlsZSgpLmZvbnRNZXRyaWNzKCk7CiAgICAgICAgICAgICBpbnQgYXNjZW50ID0g Zm9udE1ldHJpY3MuYXNjZW50KCk7CiAgICAgICAgICAgICBpbnQgYnVsbGV0V2lkdGggPSAoYXNj ZW50ICogMiAvIDMgKyAxKSAvIDI7Ci0gICAgICAgICAgICByZWxhdGl2ZVJlY3QgPSBJbnRSZWN0 KDEsIDMgKiAoYXNjZW50IC0gYXNjZW50ICogMiAvIDMpIC8gMiwgYnVsbGV0V2lkdGgsIGJ1bGxl dFdpZHRoKTsKKyAgICAgICAgICAgIHJlbGF0aXZlUmVjdCA9IEZsb2F0UmVjdCgxLCAzICogKGFz Y2VudCAtIGFzY2VudCAqIDIgLyAzKSAvIDIsIGJ1bGxldFdpZHRoLCBidWxsZXRXaWR0aCk7CiAg ICAgICAgICAgICBicmVhazsKICAgICAgICAgfQogICAgICAgICBjYXNlIE5vbmVMaXN0U3R5bGU6 Ci0gICAgICAgICAgICByZXR1cm4gSW50UmVjdCgpOworICAgICAgICAgICAgcmV0dXJuIEZsb2F0 UmVjdCgpOwogICAgICAgICBjYXNlIEFmYXI6CiAgICAgICAgIGNhc2UgQW1oYXJpYzoKICAgICAg ICAgY2FzZSBBbWhhcmljQWJlZ2VkZToKQEAgLTE4NTAsMTMgKzE4NTAsMTMgQEAgSW50UmVjdCBS ZW5kZXJMaXN0TWFya2VyOjpnZXRSZWxhdGl2ZU1hcmtlclJlY3QoKQogICAgICAgICBjYXNlIFVw cGVyUm9tYW46CiAgICAgICAgIGNhc2UgVXJkdToKICAgICAgICAgICAgIGlmIChtX3RleHQuaXNF bXB0eSgpKQotICAgICAgICAgICAgICAgIHJldHVybiBJbnRSZWN0KCk7CisgICAgICAgICAgICAg ICAgcmV0dXJuIEZsb2F0UmVjdCgpOwogICAgICAgICAgICAgY29uc3QgRm9udENhc2NhZGUmIGZv bnQgPSBzdHlsZSgpLmZvbnRDYXNjYWRlKCk7CiAgICAgICAgICAgICBUZXh0UnVuIHJ1biA9IFJl bmRlckJsb2NrOjpjb25zdHJ1Y3RUZXh0UnVuKHRoaXMsIGZvbnQsIG1fdGV4dCwgc3R5bGUoKSwg VGV4dFJ1bjo6QWxsb3dUcmFpbGluZ0V4cGFuc2lvbiB8IFRleHRSdW46OkZvcmJpZExlYWRpbmdF eHBhbnNpb24sIERlZmF1bHRUZXh0UnVuRmxhZ3MpOwotICAgICAgICAgICAgaW50IGl0ZW1XaWR0 aCA9IGZvbnQud2lkdGgocnVuKTsKKyAgICAgICAgICAgIGZsb2F0IGl0ZW1XaWR0aCA9IGZvbnQu d2lkdGgocnVuKTsKICAgICAgICAgICAgIFVDaGFyIHN1ZmZpeFNwYWNlWzJdID0geyBsaXN0TWFy a2VyU3VmZml4KHR5cGUsIG1fbGlzdEl0ZW0udmFsdWUoKSksICcgJyB9OwotICAgICAgICAgICAg aW50IHN1ZmZpeFNwYWNlV2lkdGggPSBmb250LndpZHRoKFJlbmRlckJsb2NrOjpjb25zdHJ1Y3RU ZXh0UnVuKHRoaXMsIGZvbnQsIHN1ZmZpeFNwYWNlLCAyLCBzdHlsZSgpKSk7Ci0gICAgICAgICAg ICByZWxhdGl2ZVJlY3QgPSBJbnRSZWN0KDAsIDAsIGl0ZW1XaWR0aCArIHN1ZmZpeFNwYWNlV2lk dGgsIGZvbnQuZm9udE1ldHJpY3MoKS5oZWlnaHQoKSk7CisgICAgICAgICAgICBmbG9hdCBzdWZm aXhTcGFjZVdpZHRoID0gZm9udC53aWR0aChSZW5kZXJCbG9jazo6Y29uc3RydWN0VGV4dFJ1bih0 aGlzLCBmb250LCBzdWZmaXhTcGFjZSwgMiwgc3R5bGUoKSkpOworICAgICAgICAgICAgcmVsYXRp dmVSZWN0ID0gRmxvYXRSZWN0KDAsIDAsIGl0ZW1XaWR0aCArIHN1ZmZpeFNwYWNlV2lkdGgsIGZv bnQuZm9udE1ldHJpY3MoKS5oZWlnaHQoKSk7CiAgICAgfQogCiAgICAgaWYgKCFzdHlsZSgpLmlz SG9yaXpvbnRhbFdyaXRpbmdNb2RlKCkpIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJMaXN0TWFya2VyLmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyTGlzdE1hcmtlci5oCmluZGV4IGMzNGM1ZjI1NGJmMDU3NzgzMmEwMDAyNTk2OTFhNWM2ZTQ2 ZDk3OWYuLjk5M2ZlNzEwMWEwYmJhYmU1ZDE4YThmZjkyNzIzOGI2MDQ3NmQ1ODQgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMaXN0TWFya2VyLmgKKysrIGIvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxpc3RNYXJrZXIuaApAQCAtNzcsNyArNzcsNyBA QCBwcml2YXRlOgogCiAgICAgdmlydHVhbCB2b2lkIHN0eWxlRGlkQ2hhbmdlKFN0eWxlRGlmZmVy ZW5jZSwgY29uc3QgUmVuZGVyU3R5bGUqIG9sZFN0eWxlKSBvdmVycmlkZTsKIAotICAgIEludFJl Y3QgZ2V0UmVsYXRpdmVNYXJrZXJSZWN0KCk7CisgICAgRmxvYXRSZWN0IGdldFJlbGF0aXZlTWFy a2VyUmVjdCgpOwogICAgIExheW91dFJlY3QgbG9jYWxTZWxlY3Rpb25SZWN0KCk7CiAKICAgICBT dHJpbmcgbV90ZXh0OwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0 VGVzdHMvQ2hhbmdlTG9nCmluZGV4IGM5YTEwYWU0YTc3N2E1NjFjNmZmOTkxMTliZTc4NjM3NGFi MGQ4ZTYuLmRmZmNjZWY4NDRjOWUwMmQ0NDM1MmFjOTJiNDc4MjdiMTVlMWRjOGYgMTAwNjQ0Ci0t LSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAg LTEsMyArMSwxMiBAQAorMjAxNS0wMi0yNyAgTXlsZXMgQy4gTWF4ZmllbGQgIDxtbWF4ZmllbGRA YXBwbGUuY29tPgorCisgICAgICAgIFtTdWJwaXhlbF0gU3VicGl4ZWxpemUgUmVuZGVyTGlzdE1h cmtlcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQy MDkzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBw bGF0Zm9ybS9tYWMvVGVzdEV4cGVjdGF0aW9uczogVW5za2lwIGZhc3QvbGlzdHMvcnRsLW1hcmtl ci5odG1sCisKIDIwMTUtMDItMjcgIFphbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAog ICAgICAgICBVc2UgYWZ0ZXIgZnJlZSBpbiBXZWJDb3JlOjpSZW5kZXJOYW1lZEZsb3dGcmFnbWVu dDo6cmVzdG9yZVJlZ2lvbk9iamVjdHNPcmlnaW5hbFN0eWxlCmRpZmYgLS1naXQgYS9MYXlvdXRU ZXN0cy9wbGF0Zm9ybS9tYWMvVGVzdEV4cGVjdGF0aW9ucyBiL0xheW91dFRlc3RzL3BsYXRmb3Jt L21hYy9UZXN0RXhwZWN0YXRpb25zCmluZGV4IDk4ZGIwMTNlNTA1YWIyYjQ0ZDkzZjQyMDA0MmM1 OTUxMDQ2MWUwN2MuLmRkMTk2YTNjMDUwOTEyZDRkMjcyYmZlNDMxYTAyMWI2MWIwMTgxODAgMTAw NjQ0Ci0tLSBhL0xheW91dFRlc3RzL3BsYXRmb3JtL21hYy9UZXN0RXhwZWN0YXRpb25zCisrKyBi L0xheW91dFRlc3RzL3BsYXRmb3JtL21hYy9UZXN0RXhwZWN0YXRpb25zCkBAIC0xMjIxLDcgKzEy MjEsNiBAQCB3ZWJraXQub3JnL2IvMTM5OTY4IGZhc3QvY3NzMy10ZXh0L2NzczMtdGV4dC1kZWNv cmF0aW9uL25vLWdhcC1iZXR3ZWVuLXR3by1yb3VuZAogd2Via2l0Lm9yZy9iLzEzOTk2OCBmYXN0 L2NzczMtdGV4dC9jc3MzLXRleHQtZGVjb3JhdGlvbi90ZXh0LWRlY29yYXRpb24tc2tpcC90ZXh0 LWRlY29yYXRpb24tc2tpcC1pbmstaW5oZXJpdC5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3 ZWJraXQub3JnL2IvMTM5OTY4IGZhc3QvaW5saW5lL2hpZHBpLXBpeGVsLWdhcC1iZXR3ZWVuLWFk amFjZW50LXNlbGVjdGlvbi1pbmxpbmVzLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtp dC5vcmcvYi8xMzk5NjggZmFzdC9pbmxpbmUvaGlkcGktc2VsZWN0LWlubGluZS1vbi1zdWJwaXhl bC1wb3NpdGlvbi5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMTM5OTY4 IGZhc3QvbGlzdHMvcnRsLW1hcmtlci5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQu b3JnL2IvMTM5OTY4IGZhc3QvbXVsdGljb2wvY2VsbC1zaHJpbmtiYWNrLmh0bWwgWyBJbWFnZU9u bHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8xMzk5NjggZmFzdC9tdWx0aWNvbC9uZXdtdWx0aWNv bC9icmVha3MtMy1jb2x1bW5zLTMuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9y Zy9iLzEzOTk2OCBmYXN0L3JlZ2lvbnMvbGFzdC1yZWdpb24tYm9yZGVyLXJhZGl1cy5odG1sIFsg SW1hZ2VPbmx5RmFpbHVyZSBdCg== 247549 2015-02-27 13:51:42 -0800 2015-02-27 16:23:35 -0800 Patch bug-142093-20150227135128.patch text/plain 11243 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMTgwNzY4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2U4MTAxMDA4OGQ2ODBj MDQwOTgxNDgyYjBkN2QzY2JiMDU3NTU4Yy4uYTdkZTE0OTE5NGMwNjQ5NWMyNTY0ZDZiMTRkOWE1 YWNiOGI1NTgwNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDE1LTAyLTI3ICBNeWxl cyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CisKKyAgICAgICAgW1N1YnBpeGVs XSBTdWJwaXhlbGl6ZSBSZW5kZXJMaXN0TWFya2VyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDIwOTMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBVc2UgZmxvYXRzIGluc3RlYWQgb2YgaW50cy4KKworICAg ICAgICBUZXN0OiBmYXN0L2xpc3RzL3J0bC1tYXJrZXIuaHRtbAorCisgICAgICAgICogcmVuZGVy aW5nL1JlbmRlckxpc3RNYXJrZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGlzdE1h cmtlcjo6cGFpbnQpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGlzdE1hcmtlcjo6dXBkYXRl Q29udGVudCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMaXN0TWFya2VyOjpnZXRSZWxhdGl2 ZU1hcmtlclJlY3QpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJMaXN0TWFya2VyLmg6CisK IDIwMTUtMDItMjcgIFphbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBV c2UgYWZ0ZXIgZnJlZSBpbiBXZWJDb3JlOjpSZW5kZXJOYW1lZEZsb3dGcmFnbWVudDo6cmVzdG9y ZVJlZ2lvbk9iamVjdHNPcmlnaW5hbFN0eWxlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyTGlzdE1hcmtlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyTGlzdE1hcmtlci5jcHAKaW5kZXggZjc0NmY0NWIwMmM2YWNjODI3MzZmMGQyN2IxYWU3 Y2JjYzA5NWM0Ni4uYWQ0MmU4MjU3OTgwNDU2MzVmMjM2YTYwZDQxMDE5YTIyOWNhYjE2MSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxpc3RNYXJrZXIuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMaXN0TWFya2VyLmNwcApAQCAtMTE4 NiwxMyArMTE4NiwxMyBAQCB2b2lkIFJlbmRlckxpc3RNYXJrZXI6OnBhaW50KFBhaW50SW5mbyYg cGFpbnRJbmZvLCBjb25zdCBMYXlvdXRQb2ludCYgcGFpbnRPZmZzZQogICAgIG92ZXJmbG93UmVj dC5tb3ZlQnkoYm94T3JpZ2luKTsKICAgICBvdmVyZmxvd1JlY3QuaW5mbGF0ZShtYXhpbWFsT3V0 bGluZVNpemUocGFpbnRJbmZvLnBoYXNlKSk7CiAKLSAgICBpZiAoIXBhaW50SW5mby5yZWN0Lmlu dGVyc2VjdHMoc25hcHBlZEludFJlY3Qob3ZlcmZsb3dSZWN0KSkpCisgICAgaWYgKCFwYWludElu Zm8ucmVjdC5pbnRlcnNlY3RzKG92ZXJmbG93UmVjdCkpCiAgICAgICAgIHJldHVybjsKIAogICAg IExheW91dFJlY3QgYm94KGJveE9yaWdpbiwgc2l6ZSgpKTsKICAgICAKLSAgICBJbnRSZWN0IG1h cmtlciA9IGdldFJlbGF0aXZlTWFya2VyUmVjdCgpOwotICAgIG1hcmtlci5tb3ZlQnkocm91bmRl ZEludFBvaW50KGJveE9yaWdpbikpOworICAgIEZsb2F0UmVjdCBtYXJrZXIgPSBnZXRSZWxhdGl2 ZU1hcmtlclJlY3QoKTsKKyAgICBtYXJrZXIubW92ZUJ5KGJveE9yaWdpbik7CiAKICAgICBHcmFw aGljc0NvbnRleHQqIGNvbnRleHQgPSBwYWludEluZm8uY29udGV4dDsKIApAQCAtMTMxOSw0NyAr MTMxOSw1MSBAQCB2b2lkIFJlbmRlckxpc3RNYXJrZXI6OnBhaW50KFBhaW50SW5mbyYgcGFpbnRJ bmZvLCBjb25zdCBMYXlvdXRQb2ludCYgcGFpbnRPZmZzZQogCiAgICAgR3JhcGhpY3NDb250ZXh0 U3RhdGVTYXZlciBzdGF0ZVNhdmVyKCpjb250ZXh0LCBmYWxzZSk7CiAgICAgaWYgKCFzdHlsZSgp LmlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKCkpIHsKLSAgICAgICAgbWFya2VyLm1vdmVCeShyb3Vu ZGVkSW50UG9pbnQoLWJveE9yaWdpbikpOworICAgICAgICBtYXJrZXIubW92ZUJ5KC1ib3hPcmln aW4pOwogICAgICAgICBtYXJrZXIgPSBtYXJrZXIudHJhbnNwb3NlZFJlY3QoKTsKLSAgICAgICAg bWFya2VyLm1vdmVCeShJbnRQb2ludChyb3VuZFRvSW50KGJveC54KCkpLCByb3VuZFRvSW50KGJv eC55KCkgLSBsb2dpY2FsSGVpZ2h0KCkpKSk7CisgICAgICAgIG1hcmtlci5tb3ZlQnkoRmxvYXRQ b2ludChib3gueCgpLCBib3gueSgpIC0gbG9naWNhbEhlaWdodCgpKSk7CiAgICAgICAgIHN0YXRl U2F2ZXIuc2F2ZSgpOwogICAgICAgICBjb250ZXh0LT50cmFuc2xhdGUobWFya2VyLngoKSwgbWFy a2VyLm1heFkoKSk7CiAgICAgICAgIGNvbnRleHQtPnJvdGF0ZShzdGF0aWNfY2FzdDxmbG9hdD4o ZGVnMnJhZCg5MC4pKSk7CiAgICAgICAgIGNvbnRleHQtPnRyYW5zbGF0ZSgtbWFya2VyLngoKSwg LW1hcmtlci5tYXhZKCkpOwogICAgIH0KIAotICAgIEludFBvaW50IHRleHRPcmlnaW4gPSBJbnRQ b2ludChtYXJrZXIueCgpLCBtYXJrZXIueSgpICsgc3R5bGUoKS5mb250TWV0cmljcygpLmFzY2Vu dCgpKTsKKyAgICBGbG9hdFBvaW50IHRleHRPcmlnaW4gPSBGbG9hdFBvaW50KG1hcmtlci54KCks IG1hcmtlci55KCkgKyBzdHlsZSgpLmZvbnRNZXRyaWNzKCkuYXNjZW50KCkpOworICAgIHRleHRP cmlnaW4gPSByb3VuZFBvaW50VG9EZXZpY2VQaXhlbHMoTGF5b3V0UG9pbnQodGV4dE9yaWdpbiks IGRvY3VtZW50KCkuZGV2aWNlU2NhbGVGYWN0b3IoKSwgc3R5bGUoKS5pc0xlZnRUb1JpZ2h0RGly ZWN0aW9uKCkpOwogCiAgICAgaWYgKHR5cGUgPT0gQXN0ZXJpc2tzIHx8IHR5cGUgPT0gRm9vdG5v dGVzKQogICAgICAgICBjb250ZXh0LT5kcmF3VGV4dChmb250LCB0ZXh0UnVuLCB0ZXh0T3JpZ2lu KTsKICAgICBlbHNlIHsKKyAgICAgICAgY29uc3QgVUNoYXIgc3VmZml4ID0gbGlzdE1hcmtlclN1 ZmZpeCh0eXBlLCBtX2xpc3RJdGVtLnZhbHVlKCkpOworCiAgICAgICAgIC8vIFRleHQgaXMgbm90 IGFyYml0cmFyeS4gV2UgY2FuIGp1ZGdlIHdoZXRoZXIgaXQncyBSVEwgZnJvbSB0aGUgZmlyc3Qg Y2hhcmFjdGVyLAogICAgICAgICAvLyBhbmQgd2Ugb25seSBuZWVkIHRvIGhhbmRsZSB0aGUgZGly ZWN0aW9uIFVfUklHSFRfVE9fTEVGVCBmb3Igbm93LgogICAgICAgICBib29sIHRleHROZWVkc1Jl dmVyc2luZyA9IHVfY2hhckRpcmVjdGlvbihtX3RleHRbMF0pID09IFVfUklHSFRfVE9fTEVGVDsK LSAgICAgICAgU3RyaW5nIHJldmVyc2VkVGV4dDsKKyAgICAgICAgU3RyaW5nIHRvRHJhdzsKICAg ICAgICAgaWYgKHRleHROZWVkc1JldmVyc2luZykgewogICAgICAgICAgICAgdW5zaWduZWQgbGVu Z3RoID0gbV90ZXh0Lmxlbmd0aCgpOwogICAgICAgICAgICAgU3RyaW5nQnVpbGRlciBidWZmZXI7 Ci0gICAgICAgICAgICBidWZmZXIucmVzZXJ2ZUNhcGFjaXR5KGxlbmd0aCk7CisgICAgICAgICAg ICBidWZmZXIucmVzZXJ2ZUNhcGFjaXR5KGxlbmd0aCArIDIpOworICAgICAgICAgICAgaWYgKCFz dHlsZSgpLmlzTGVmdFRvUmlnaHREaXJlY3Rpb24oKSkgeworICAgICAgICAgICAgICAgIGJ1ZmZl ci5hcHBlbmQoc3BhY2UpOworICAgICAgICAgICAgICAgIGJ1ZmZlci5hcHBlbmQoc3VmZml4KTsK KyAgICAgICAgICAgIH0KICAgICAgICAgICAgIGZvciAodW5zaWduZWQgaSA9IDA7IGkgPCBsZW5n dGg7ICsraSkKICAgICAgICAgICAgICAgICBidWZmZXIuYXBwZW5kKG1fdGV4dFtsZW5ndGggLSBp IC0gMV0pOwotICAgICAgICAgICAgcmV2ZXJzZWRUZXh0ID0gYnVmZmVyLnRvU3RyaW5nKCk7Ci0g ICAgICAgICAgICB0ZXh0UnVuLnNldFRleHQoU3RyaW5nVmlldyhyZXZlcnNlZFRleHQpKTsKLSAg ICAgICAgfQotCi0gICAgICAgIGNvbnN0IFVDaGFyIHN1ZmZpeCA9IGxpc3RNYXJrZXJTdWZmaXgo dHlwZSwgbV9saXN0SXRlbS52YWx1ZSgpKTsKLSAgICAgICAgaWYgKHN0eWxlKCkuaXNMZWZ0VG9S aWdodERpcmVjdGlvbigpKSB7Ci0gICAgICAgICAgICBpbnQgd2lkdGggPSBmb250LndpZHRoKHRl eHRSdW4pOwotICAgICAgICAgICAgY29udGV4dC0+ZHJhd1RleHQoZm9udCwgdGV4dFJ1biwgdGV4 dE9yaWdpbik7Ci0gICAgICAgICAgICBVQ2hhciBzdWZmaXhTcGFjZVsyXSA9IHsgc3VmZml4LCAn ICcgfTsKLSAgICAgICAgICAgIGNvbnRleHQtPmRyYXdUZXh0KGZvbnQsIFJlbmRlckJsb2NrOjpj b25zdHJ1Y3RUZXh0UnVuKHRoaXMsIGZvbnQsIHN1ZmZpeFNwYWNlLCAyLCBzdHlsZSgpKSwgdGV4 dE9yaWdpbiArIEludFNpemUod2lkdGgsIDApKTsKKyAgICAgICAgICAgIGlmIChzdHlsZSgpLmlz TGVmdFRvUmlnaHREaXJlY3Rpb24oKSkgeworICAgICAgICAgICAgICAgIGJ1ZmZlci5hcHBlbmQo c3VmZml4KTsKKyAgICAgICAgICAgICAgICBidWZmZXIuYXBwZW5kKHNwYWNlKTsKKyAgICAgICAg ICAgIH0KKyAgICAgICAgICAgIHRvRHJhdyA9IGJ1ZmZlci50b1N0cmluZygpOwogICAgICAgICB9 IGVsc2UgewotICAgICAgICAgICAgVUNoYXIgc3BhY2VTdWZmaXhbMl0gPSB7ICcgJywgc3VmZml4 IH07Ci0gICAgICAgICAgICBUZXh0UnVuIHNwYWNlU3VmZml4UnVuID0gUmVuZGVyQmxvY2s6OmNv bnN0cnVjdFRleHRSdW4odGhpcywgZm9udCwgc3BhY2VTdWZmaXgsIDIsIHN0eWxlKCkpOwotICAg ICAgICAgICAgaW50IHdpZHRoID0gZm9udC53aWR0aChzcGFjZVN1ZmZpeFJ1bik7Ci0gICAgICAg ICAgICBjb250ZXh0LT5kcmF3VGV4dChmb250LCBzcGFjZVN1ZmZpeFJ1biwgdGV4dE9yaWdpbik7 Ci0gICAgICAgICAgICBjb250ZXh0LT5kcmF3VGV4dChmb250LCB0ZXh0UnVuLCB0ZXh0T3JpZ2lu ICsgSW50U2l6ZSh3aWR0aCwgMCkpOworICAgICAgICAgICAgaWYgKHN0eWxlKCkuaXNMZWZ0VG9S aWdodERpcmVjdGlvbigpKQorICAgICAgICAgICAgICAgIHRvRHJhdyA9IG1fdGV4dCArIFN0cmlu Zygmc3VmZml4LCAxKSArIFN0cmluZygmc3BhY2UsIDEpOworICAgICAgICAgICAgZWxzZQorICAg ICAgICAgICAgICAgIHRvRHJhdyA9IFN0cmluZygmc3BhY2UsIDEpICsgU3RyaW5nKCZzdWZmaXgs IDEpICsgbV90ZXh0OwogICAgICAgICB9CisgICAgICAgIHRleHRSdW4uc2V0VGV4dChTdHJpbmdW aWV3KHRvRHJhdykpOworCisgICAgICAgIGNvbnRleHQtPmRyYXdUZXh0KGZvbnQsIHRleHRSdW4s IHRleHRPcmlnaW4pOwogICAgIH0KIH0KIApAQCAtMTQyMSw3ICsxNDI1LDcgQEAgdm9pZCBSZW5k ZXJMaXN0TWFya2VyOjp1cGRhdGVDb250ZW50KCkKICAgICAgICAgLy8gRklYTUU6IFRoaXMgaXMg YSBzb21ld2hhdCBhcmJpdHJhcnkgd2lkdGguICBHZW5lcmF0ZWQgaW1hZ2VzIGZvciBtYXJrZXJz IHJlYWxseSB3b24ndCBiZWNvbWUgcGFydGljdWxhcmx5IHVzZWZ1bAogICAgICAgICAvLyB1bnRp bCB3ZSBzdXBwb3J0IHRoZSBDU1MzIG1hcmtlciBwc2V1ZG9jbGFzcyB0byBhbGxvdyBjb250cm9s IG92ZXIgdGhlIHdpZHRoIGFuZCBoZWlnaHQgb2YgdGhlIG1hcmtlciBib3guCiAgICAgICAgIGlu dCBidWxsZXRXaWR0aCA9IHN0eWxlKCkuZm9udE1ldHJpY3MoKS5hc2NlbnQoKSAvIDI7Ci0gICAg ICAgIG1faW1hZ2UtPnNldENvbnRhaW5lclNpemVGb3JSZW5kZXJlcih0aGlzLCBJbnRTaXplKGJ1 bGxldFdpZHRoLCBidWxsZXRXaWR0aCksIHN0eWxlKCkuZWZmZWN0aXZlWm9vbSgpKTsKKyAgICAg ICAgbV9pbWFnZS0+c2V0Q29udGFpbmVyU2l6ZUZvclJlbmRlcmVyKHRoaXMsIEZsb2F0U2l6ZShi dWxsZXRXaWR0aCwgYnVsbGV0V2lkdGgpLCBzdHlsZSgpLmVmZmVjdGl2ZVpvb20oKSk7CiAgICAg ICAgIHJldHVybjsKICAgICB9CiAKQEAgLTE3NDcsMTkgKzE3NTEsMTkgQEAgYm9vbCBSZW5kZXJM aXN0TWFya2VyOjppc0luc2lkZSgpIGNvbnN0CiAgICAgcmV0dXJuIG1fbGlzdEl0ZW0ubm90SW5M aXN0KCkgfHwgc3R5bGUoKS5saXN0U3R5bGVQb3NpdGlvbigpID09IElOU0lERTsKIH0KIAotSW50 UmVjdCBSZW5kZXJMaXN0TWFya2VyOjpnZXRSZWxhdGl2ZU1hcmtlclJlY3QoKQorRmxvYXRSZWN0 IFJlbmRlckxpc3RNYXJrZXI6OmdldFJlbGF0aXZlTWFya2VyUmVjdCgpCiB7CiAgICAgaWYgKGlz SW1hZ2UoKSkKLSAgICAgICAgcmV0dXJuIEludFJlY3QoMCwgMCwgbV9pbWFnZS0+aW1hZ2VTaXpl KHRoaXMsIHN0eWxlKCkuZWZmZWN0aXZlWm9vbSgpKS53aWR0aCgpLCBtX2ltYWdlLT5pbWFnZVNp emUodGhpcywgc3R5bGUoKS5lZmZlY3RpdmVab29tKCkpLmhlaWdodCgpKTsKKyAgICAgICAgcmV0 dXJuIEZsb2F0UmVjdCgwLCAwLCBtX2ltYWdlLT5pbWFnZVNpemUodGhpcywgc3R5bGUoKS5lZmZl Y3RpdmVab29tKCkpLndpZHRoKCksIG1faW1hZ2UtPmltYWdlU2l6ZSh0aGlzLCBzdHlsZSgpLmVm ZmVjdGl2ZVpvb20oKSkuaGVpZ2h0KCkpOwogICAgIAotICAgIEludFJlY3QgcmVsYXRpdmVSZWN0 OworICAgIEZsb2F0UmVjdCByZWxhdGl2ZVJlY3Q7CiAgICAgRUxpc3RTdHlsZVR5cGUgdHlwZSA9 IHN0eWxlKCkubGlzdFN0eWxlVHlwZSgpOwogICAgIHN3aXRjaCAodHlwZSkgewogICAgICAgICBj YXNlIEFzdGVyaXNrczoKICAgICAgICAgY2FzZSBGb290bm90ZXM6IHsKICAgICAgICAgICAgIGNv bnN0IEZvbnRDYXNjYWRlJiBmb250ID0gc3R5bGUoKS5mb250Q2FzY2FkZSgpOwogICAgICAgICAg ICAgVGV4dFJ1biBydW4gPSBSZW5kZXJCbG9jazo6Y29uc3RydWN0VGV4dFJ1bih0aGlzLCBmb250 LCBtX3RleHQsIHN0eWxlKCksIFRleHRSdW46OkFsbG93VHJhaWxpbmdFeHBhbnNpb24gfCBUZXh0 UnVuOjpGb3JiaWRMZWFkaW5nRXhwYW5zaW9uLCBEZWZhdWx0VGV4dFJ1bkZsYWdzKTsKLSAgICAg ICAgICAgIHJlbGF0aXZlUmVjdCA9IEludFJlY3QoMCwgMCwgZm9udC53aWR0aChydW4pLCBmb250 LmZvbnRNZXRyaWNzKCkuaGVpZ2h0KCkpOworICAgICAgICAgICAgcmVsYXRpdmVSZWN0ID0gRmxv YXRSZWN0KDAsIDAsIGZvbnQud2lkdGgocnVuKSwgZm9udC5mb250TWV0cmljcygpLmhlaWdodCgp KTsKICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICB9CiAgICAgICAgIGNhc2UgRGlzYzoKQEAg LTE3NjksMTEgKzE3NzMsMTEgQEAgSW50UmVjdCBSZW5kZXJMaXN0TWFya2VyOjpnZXRSZWxhdGl2 ZU1hcmtlclJlY3QoKQogICAgICAgICAgICAgY29uc3QgRm9udE1ldHJpY3MmIGZvbnRNZXRyaWNz ID0gc3R5bGUoKS5mb250TWV0cmljcygpOwogICAgICAgICAgICAgaW50IGFzY2VudCA9IGZvbnRN ZXRyaWNzLmFzY2VudCgpOwogICAgICAgICAgICAgaW50IGJ1bGxldFdpZHRoID0gKGFzY2VudCAq IDIgLyAzICsgMSkgLyAyOwotICAgICAgICAgICAgcmVsYXRpdmVSZWN0ID0gSW50UmVjdCgxLCAz ICogKGFzY2VudCAtIGFzY2VudCAqIDIgLyAzKSAvIDIsIGJ1bGxldFdpZHRoLCBidWxsZXRXaWR0 aCk7CisgICAgICAgICAgICByZWxhdGl2ZVJlY3QgPSBGbG9hdFJlY3QoMSwgMyAqIChhc2NlbnQg LSBhc2NlbnQgKiAyIC8gMykgLyAyLCBidWxsZXRXaWR0aCwgYnVsbGV0V2lkdGgpOwogICAgICAg ICAgICAgYnJlYWs7CiAgICAgICAgIH0KICAgICAgICAgY2FzZSBOb25lTGlzdFN0eWxlOgotICAg ICAgICAgICAgcmV0dXJuIEludFJlY3QoKTsKKyAgICAgICAgICAgIHJldHVybiBGbG9hdFJlY3Qo KTsKICAgICAgICAgY2FzZSBBZmFyOgogICAgICAgICBjYXNlIEFtaGFyaWM6CiAgICAgICAgIGNh c2UgQW1oYXJpY0FiZWdlZGU6CkBAIC0xODUwLDEzICsxODU0LDEzIEBAIEludFJlY3QgUmVuZGVy TGlzdE1hcmtlcjo6Z2V0UmVsYXRpdmVNYXJrZXJSZWN0KCkKICAgICAgICAgY2FzZSBVcHBlclJv bWFuOgogICAgICAgICBjYXNlIFVyZHU6CiAgICAgICAgICAgICBpZiAobV90ZXh0LmlzRW1wdHko KSkKLSAgICAgICAgICAgICAgICByZXR1cm4gSW50UmVjdCgpOworICAgICAgICAgICAgICAgIHJl dHVybiBGbG9hdFJlY3QoKTsKICAgICAgICAgICAgIGNvbnN0IEZvbnRDYXNjYWRlJiBmb250ID0g c3R5bGUoKS5mb250Q2FzY2FkZSgpOwogICAgICAgICAgICAgVGV4dFJ1biBydW4gPSBSZW5kZXJC bG9jazo6Y29uc3RydWN0VGV4dFJ1bih0aGlzLCBmb250LCBtX3RleHQsIHN0eWxlKCksIFRleHRS dW46OkFsbG93VHJhaWxpbmdFeHBhbnNpb24gfCBUZXh0UnVuOjpGb3JiaWRMZWFkaW5nRXhwYW5z aW9uLCBEZWZhdWx0VGV4dFJ1bkZsYWdzKTsKLSAgICAgICAgICAgIGludCBpdGVtV2lkdGggPSBm b250LndpZHRoKHJ1bik7CisgICAgICAgICAgICBmbG9hdCBpdGVtV2lkdGggPSBmb250LndpZHRo KHJ1bik7CiAgICAgICAgICAgICBVQ2hhciBzdWZmaXhTcGFjZVsyXSA9IHsgbGlzdE1hcmtlclN1 ZmZpeCh0eXBlLCBtX2xpc3RJdGVtLnZhbHVlKCkpLCAnICcgfTsKLSAgICAgICAgICAgIGludCBz dWZmaXhTcGFjZVdpZHRoID0gZm9udC53aWR0aChSZW5kZXJCbG9jazo6Y29uc3RydWN0VGV4dFJ1 bih0aGlzLCBmb250LCBzdWZmaXhTcGFjZSwgMiwgc3R5bGUoKSkpOwotICAgICAgICAgICAgcmVs YXRpdmVSZWN0ID0gSW50UmVjdCgwLCAwLCBpdGVtV2lkdGggKyBzdWZmaXhTcGFjZVdpZHRoLCBm b250LmZvbnRNZXRyaWNzKCkuaGVpZ2h0KCkpOworICAgICAgICAgICAgZmxvYXQgc3VmZml4U3Bh Y2VXaWR0aCA9IGZvbnQud2lkdGgoUmVuZGVyQmxvY2s6OmNvbnN0cnVjdFRleHRSdW4odGhpcywg Zm9udCwgc3VmZml4U3BhY2UsIDIsIHN0eWxlKCkpKTsKKyAgICAgICAgICAgIHJlbGF0aXZlUmVj dCA9IEZsb2F0UmVjdCgwLCAwLCBpdGVtV2lkdGggKyBzdWZmaXhTcGFjZVdpZHRoLCBmb250LmZv bnRNZXRyaWNzKCkuaGVpZ2h0KCkpOwogICAgIH0KIAogICAgIGlmICghc3R5bGUoKS5pc0hvcml6 b250YWxXcml0aW5nTW9kZSgpKSB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyTGlzdE1hcmtlci5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxp c3RNYXJrZXIuaAppbmRleCBjMzRjNWYyNTRiZjA1Nzc4MzJhMDAwMjU5NjkxYTVjNmU0NmQ5Nzlm Li45OTNmZTcxMDFhMGJiYWJlNWQxOGE4ZmY5MjcyMzhiNjA0NzZkNTg0IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGlzdE1hcmtlci5oCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMaXN0TWFya2VyLmgKQEAgLTc3LDcgKzc3LDcgQEAgcHJp dmF0ZToKIAogICAgIHZpcnR1YWwgdm9pZCBzdHlsZURpZENoYW5nZShTdHlsZURpZmZlcmVuY2Us IGNvbnN0IFJlbmRlclN0eWxlKiBvbGRTdHlsZSkgb3ZlcnJpZGU7CiAKLSAgICBJbnRSZWN0IGdl dFJlbGF0aXZlTWFya2VyUmVjdCgpOworICAgIEZsb2F0UmVjdCBnZXRSZWxhdGl2ZU1hcmtlclJl Y3QoKTsKICAgICBMYXlvdXRSZWN0IGxvY2FsU2VsZWN0aW9uUmVjdCgpOwogCiAgICAgU3RyaW5n IG1fdGV4dDsKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3Rz L0NoYW5nZUxvZwppbmRleCBjOWExMGFlNGE3NzdhNTYxYzZmZjk5MTE5YmU3ODYzNzRhYjBkOGU2 Li5kZmZjY2VmODQ0YzllMDJkNDQzNTJhYzkyYjQ3ODI3YjE1ZTFkYzhmIDEwMDY0NAotLS0gYS9M YXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMg KzEsMTIgQEAKKzIwMTUtMDItMjcgIE15bGVzIEMuIE1heGZpZWxkICA8bW1heGZpZWxkQGFwcGxl LmNvbT4KKworICAgICAgICBbU3VicGl4ZWxdIFN1YnBpeGVsaXplIFJlbmRlckxpc3RNYXJrZXIK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0MjA5Mwor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogcGxhdGZv cm0vbWFjL1Rlc3RFeHBlY3RhdGlvbnM6IFVuc2tpcCBmYXN0L2xpc3RzL3J0bC1tYXJrZXIuaHRt bAorCiAyMDE1LTAyLTI3ICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAKICAgICAg ICAgVXNlIGFmdGVyIGZyZWUgaW4gV2ViQ29yZTo6UmVuZGVyTmFtZWRGbG93RnJhZ21lbnQ6OnJl c3RvcmVSZWdpb25PYmplY3RzT3JpZ2luYWxTdHlsZQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMv cGxhdGZvcm0vbWFjL1Rlc3RFeHBlY3RhdGlvbnMgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMv VGVzdEV4cGVjdGF0aW9ucwppbmRleCA5OGRiMDEzZTUwNWFiMmI0NGQ5M2Y0MjAwNDJjNTk1MTA0 NjFlMDdjLi5kZDE5NmEzYzA1MDkxMmQ0ZDI3MmJmZTQzMWEwMjFiNjFiMDE4MTgwIDEwMDY0NAot LS0gYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvVGVzdEV4cGVjdGF0aW9ucworKysgYi9MYXlv dXRUZXN0cy9wbGF0Zm9ybS9tYWMvVGVzdEV4cGVjdGF0aW9ucwpAQCAtMTIyMSw3ICsxMjIxLDYg QEAgd2Via2l0Lm9yZy9iLzEzOTk2OCBmYXN0L2NzczMtdGV4dC9jc3MzLXRleHQtZGVjb3JhdGlv bi9uby1nYXAtYmV0d2Vlbi10d28tcm91bmQKIHdlYmtpdC5vcmcvYi8xMzk5NjggZmFzdC9jc3Mz LXRleHQvY3NzMy10ZXh0LWRlY29yYXRpb24vdGV4dC1kZWNvcmF0aW9uLXNraXAvdGV4dC1kZWNv cmF0aW9uLXNraXAtaW5rLWluaGVyaXQuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0 Lm9yZy9iLzEzOTk2OCBmYXN0L2lubGluZS9oaWRwaS1waXhlbC1nYXAtYmV0d2Vlbi1hZGphY2Vu dC1zZWxlY3Rpb24taW5saW5lcy5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3Jn L2IvMTM5OTY4IGZhc3QvaW5saW5lL2hpZHBpLXNlbGVjdC1pbmxpbmUtb24tc3VicGl4ZWwtcG9z aXRpb24uaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzEzOTk2OCBmYXN0 L2xpc3RzL3J0bC1tYXJrZXIuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9i LzEzOTk2OCBmYXN0L211bHRpY29sL2NlbGwtc2hyaW5rYmFjay5odG1sIFsgSW1hZ2VPbmx5RmFp bHVyZSBdCiB3ZWJraXQub3JnL2IvMTM5OTY4IGZhc3QvbXVsdGljb2wvbmV3bXVsdGljb2wvYnJl YWtzLTMtY29sdW1ucy0zLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8x Mzk5NjggZmFzdC9yZWdpb25zL2xhc3QtcmVnaW9uLWJvcmRlci1yYWRpdXMuaHRtbCBbIEltYWdl T25seUZhaWx1cmUgXQo=