128086 2014-02-02 16:12:19 -0800 RenderSVGInlineText::computeNewScaledFontForStyle() should take references. 2014-02-02 16:59:05 -0800 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 kling kling commit-queue dino d-r esprehn+autocc fmalita glenn gyuyoung.kim kling kondapallykalyan pdr schenney oldest_to_newest 974847 0 kling 2014-02-02 16:12:19 -0800 RenderSVGInlineText::computeNewScaledFontForStyle() should take references. 974848 1 222943 kling 2014-02-02 16:12:46 -0800 Created attachment 222943 Patch 974852 2 222943 darin 2014-02-02 16:16:15 -0800 Comment on attachment 222943 Patch Great changes. I made some of these same changes in my tree today. Can we use a type more specific than RenderObject for any of this? 974856 3 kling 2014-02-02 16:23:13 -0800 (In reply to comment #2) > Can we use a type more specific than RenderObject for any of this? Alas, this codepath is used by both text and element renderers at the moment. 974864 4 222943 commit-queue 2014-02-02 16:59:02 -0800 Comment on attachment 222943 Patch Clearing flags on attachment: 222943 Committed r163276: <http://trac.webkit.org/changeset/163276> 974865 5 commit-queue 2014-02-02 16:59:05 -0800 All reviewed patches have been landed. Closing bug. 222943 2014-02-02 16:12:46 -0800 2014-02-02 16:59:02 -0800 Patch bug-128086.diff text/plain 15109 kling ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBlMWY1NWZiLi5mYWY0ODkxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzcg QEAKKzIwMTQtMDItMDIgIEFuZHJlYXMgS2xpbmcgIDxha2xpbmdAYXBwbGUuY29tPgorCisgICAg ICAgIFJlbmRlclNWR0lubGluZVRleHQ6OmNvbXB1dGVOZXdTY2FsZWRGb250Rm9yU3R5bGUoKSBz aG91bGQgdGFrZSByZWZlcmVuY2VzLgorICAgICAgICA8aHR0cHM6Ly93ZWJraXQub3JnL2IvMTI4 MDg2PgorCisgICAgICAgIE1ha2UgY29tcHV0ZU5ld1NjYWxlZEZvbnRGb3JTdHlsZSgpIHRha2Ug cmVuZGVyZXIgYW5kIHN0eWxlIGJ5IHJlZmVyZW5jZQorICAgICAgICBpbnN0ZWFkIG9mIHRha2lu ZyBhIHBvaW50ZXIgYW5kIGFzc2VydGluZyB0aGF0IGl0J3Mgbm9uLW51bGwuCisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiByZW5kZXJpbmcvc3ZnL1Jl bmRlclNWR0lubGluZVRleHQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyU1ZHSW5saW5l VGV4dDo6dXBkYXRlU2NhbGVkRm9udCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJTVkdJbmxp bmVUZXh0Ojpjb21wdXRlTmV3U2NhbGVkRm9udEZvclN0eWxlKToKKyAgICAgICAgKiByZW5kZXJp bmcvc3ZnL1JlbmRlclNWR0lubGluZVRleHQuaDoKKyAgICAgICAgKiByZW5kZXJpbmcvc3ZnL1Jl bmRlclNWR1Jlc291cmNlQ2xpcHBlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJTVkdS ZXNvdXJjZUNsaXBwZXI6OmFwcGx5Q2xpcHBpbmdUb0NvbnRleHQpOgorICAgICAgICAqIHJlbmRl cmluZy9zdmcvUmVuZGVyU1ZHUmVzb3VyY2VDb250YWluZXIuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6UmVuZGVyU1ZHUmVzb3VyY2VDb250YWluZXI6OnNob3VsZFRyYW5zZm9ybU9uVGV4dFBhaW50 aW5nKToKKyAgICAgICAgKiByZW5kZXJpbmcvc3ZnL1JlbmRlclNWR1Jlc291cmNlRmlsdGVyLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclNWR1Jlc291cmNlRmlsdGVyOjphcHBseVJlc291 cmNlKToKKyAgICAgICAgKiByZW5kZXJpbmcvc3ZnL1JlbmRlclNWR1Jlc291cmNlR3JhZGllbnQu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6Y3JlYXRlTWFza0FuZFN3YXBDb250ZXh0Rm9yVGV4dEdy YWRpZW50KToKKyAgICAgICAgKFdlYkNvcmU6OmNsaXBUb1RleHRNYXNrKToKKyAgICAgICAgKiBy ZW5kZXJpbmcvc3ZnL1JlbmRlclNWR1Jlc291cmNlTWFza2VyLmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OlJlbmRlclNWR1Jlc291cmNlTWFza2VyOjphcHBseVJlc291cmNlKToKKyAgICAgICAgKiBy ZW5kZXJpbmcvc3ZnL1JlbmRlclNWR1Jlc291cmNlUGF0dGVybi5jcHA6CisgICAgICAgIChXZWJD b3JlOjpSZW5kZXJTVkdSZXNvdXJjZVBhdHRlcm46OmJ1aWxkUGF0dGVybik6CisgICAgICAgICog cmVuZGVyaW5nL3N2Zy9TVkdJbmxpbmVUZXh0Qm94LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNW R0lubGluZVRleHRCb3g6OnBhaW50RGVjb3JhdGlvbldpdGhTdHlsZSk6CisgICAgICAgICogcmVu ZGVyaW5nL3N2Zy9TVkdSZW5kZXJpbmdDb250ZXh0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNW R1JlbmRlcmluZ0NvbnRleHQ6OmNhbGN1bGF0ZVNjcmVlbkZvbnRTaXplU2NhbGluZ0ZhY3Rvcik6 CisgICAgICAgIChXZWJDb3JlOjpTVkdSZW5kZXJpbmdDb250ZXh0OjpjYWxjdWxhdGVUcmFuc2Zv cm1hdGlvblRvT3V0ZXJtb3N0Q29vcmRpbmF0ZVN5c3RlbSk6CisgICAgICAgICogcmVuZGVyaW5n L3N2Zy9TVkdSZW5kZXJpbmdDb250ZXh0Lmg6CisKIDIwMTQtMDItMDIgIFphbGFuIEJ1anRhcyAg PHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBTdWJwaXhlbCByZW5kZXJpbmc6IEVuYWJsZSBz dWJwaXhlbCBwb3NpdGlvbmluZy9zaXppbmcvaGFpcmxpbmUgYm9yZGVyIHBhaW50aW5nLgpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9SZW5kZXJTVkdJbmxpbmVUZXh0 LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdmcvUmVuZGVyU1ZHSW5saW5lVGV4dC5j cHAKaW5kZXggMDY2N2U4NC4uYWZhMThhYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL3N2Zy9SZW5kZXJTVkdJbmxpbmVUZXh0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvc3ZnL1JlbmRlclNWR0lubGluZVRleHQuY3BwCkBAIC0yMjQsMjkgKzIyNCwyNiBA QCBWaXNpYmxlUG9zaXRpb24gUmVuZGVyU1ZHSW5saW5lVGV4dDo6cG9zaXRpb25Gb3JQb2ludChj b25zdCBMYXlvdXRQb2ludCYgcG9pbnQpCiAKIHZvaWQgUmVuZGVyU1ZHSW5saW5lVGV4dDo6dXBk YXRlU2NhbGVkRm9udCgpCiB7Ci0gICAgY29tcHV0ZU5ld1NjYWxlZEZvbnRGb3JTdHlsZSh0aGlz LCAmc3R5bGUoKSwgbV9zY2FsaW5nRmFjdG9yLCBtX3NjYWxlZEZvbnQpOworICAgIGNvbXB1dGVO ZXdTY2FsZWRGb250Rm9yU3R5bGUoKnRoaXMsIHN0eWxlKCksIG1fc2NhbGluZ0ZhY3RvciwgbV9z Y2FsZWRGb250KTsKIH0KIAotdm9pZCBSZW5kZXJTVkdJbmxpbmVUZXh0Ojpjb21wdXRlTmV3U2Nh bGVkRm9udEZvclN0eWxlKFJlbmRlck9iamVjdCogcmVuZGVyZXIsIGNvbnN0IFJlbmRlclN0eWxl KiBzdHlsZSwgZmxvYXQmIHNjYWxpbmdGYWN0b3IsIEZvbnQmIHNjYWxlZEZvbnQpCit2b2lkIFJl bmRlclNWR0lubGluZVRleHQ6OmNvbXB1dGVOZXdTY2FsZWRGb250Rm9yU3R5bGUoY29uc3QgUmVu ZGVyT2JqZWN0JiByZW5kZXJlciwgY29uc3QgUmVuZGVyU3R5bGUmIHN0eWxlLCBmbG9hdCYgc2Nh bGluZ0ZhY3RvciwgRm9udCYgc2NhbGVkRm9udCkKIHsKLSAgICBBU1NFUlQoc3R5bGUpOwotICAg IEFTU0VSVChyZW5kZXJlcik7Ci0KICAgICAvLyBBbHRlciBmb250LXNpemUgdG8gdGhlIHJpZ2h0 IG9uLXNjcmVlbiB2YWx1ZSB0byBhdm9pZCBzY2FsaW5nIHRoZSBnbHlwaHMgdGhlbXNlbHZlcywg ZXhjZXB0IHdoZW4gR2VvbWV0cmljUHJlY2lzaW9uIGlzIHNwZWNpZmllZAogICAgIHNjYWxpbmdG YWN0b3IgPSBTVkdSZW5kZXJpbmdDb250ZXh0OjpjYWxjdWxhdGVTY3JlZW5Gb250U2l6ZVNjYWxp bmdGYWN0b3IocmVuZGVyZXIpOwotICAgIGlmIChzY2FsaW5nRmFjdG9yID09IDEgfHwgIXNjYWxp bmdGYWN0b3IgfHwgc3R5bGUtPmZvbnREZXNjcmlwdGlvbigpLnRleHRSZW5kZXJpbmdNb2RlKCkg PT0gR2VvbWV0cmljUHJlY2lzaW9uKSB7CisgICAgaWYgKHNjYWxpbmdGYWN0b3IgPT0gMSB8fCAh c2NhbGluZ0ZhY3RvciB8fCBzdHlsZS5mb250RGVzY3JpcHRpb24oKS50ZXh0UmVuZGVyaW5nTW9k ZSgpID09IEdlb21ldHJpY1ByZWNpc2lvbikgewogICAgICAgICBzY2FsaW5nRmFjdG9yID0gMTsK LSAgICAgICAgc2NhbGVkRm9udCA9IHN0eWxlLT5mb250KCk7CisgICAgICAgIHNjYWxlZEZvbnQg PSBzdHlsZS5mb250KCk7CiAgICAgICAgIHJldHVybjsKICAgICB9CiAKLSAgICBGb250RGVzY3Jp cHRpb24gZm9udERlc2NyaXB0aW9uKHN0eWxlLT5mb250RGVzY3JpcHRpb24oKSk7CisgICAgRm9u dERlc2NyaXB0aW9uIGZvbnREZXNjcmlwdGlvbihzdHlsZS5mb250RGVzY3JpcHRpb24oKSk7CiAK ICAgICAvLyBGSVhNRTogV2UgbmVlZCB0byBiZXR0ZXIgaGFuZGxlIHRoZSBjYXNlIHdoZW4gd2Ug Y29tcHV0ZSB2ZXJ5IHNtYWxsIGZvbnRzIGJlbG93IChiZWxvdyAxcHQpLgotICAgIGZvbnREZXNj cmlwdGlvbi5zZXRDb21wdXRlZFNpemUoU3R5bGU6OmNvbXB1dGVkRm9udFNpemVGcm9tU3BlY2lm aWVkU2l6ZUZvclNWR0lubGluZVRleHQoZm9udERlc2NyaXB0aW9uLmNvbXB1dGVkU2l6ZSgpLCBm b250RGVzY3JpcHRpb24uaXNBYnNvbHV0ZVNpemUoKSwgc2NhbGluZ0ZhY3RvciwgcmVuZGVyZXIt PmRvY3VtZW50KCkpKTsKKyAgICBmb250RGVzY3JpcHRpb24uc2V0Q29tcHV0ZWRTaXplKFN0eWxl Ojpjb21wdXRlZEZvbnRTaXplRnJvbVNwZWNpZmllZFNpemVGb3JTVkdJbmxpbmVUZXh0KGZvbnRE ZXNjcmlwdGlvbi5jb21wdXRlZFNpemUoKSwgZm9udERlc2NyaXB0aW9uLmlzQWJzb2x1dGVTaXpl KCksIHNjYWxpbmdGYWN0b3IsIHJlbmRlcmVyLmRvY3VtZW50KCkpKTsKIAogICAgIHNjYWxlZEZv bnQgPSBGb250KGZvbnREZXNjcmlwdGlvbiwgMCwgMCk7Ci0gICAgc2NhbGVkRm9udC51cGRhdGUo cmVuZGVyZXItPmRvY3VtZW50KCkuZW5zdXJlU3R5bGVSZXNvbHZlcigpLmZvbnRTZWxlY3Rvcigp KTsKKyAgICBzY2FsZWRGb250LnVwZGF0ZShyZW5kZXJlci5kb2N1bWVudCgpLmVuc3VyZVN0eWxl UmVzb2x2ZXIoKS5mb250U2VsZWN0b3IoKSk7CiB9CiAKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9zdmcvUmVuZGVyU1ZHSW5saW5lVGV4dC5oIGIvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL3N2Zy9SZW5kZXJTVkdJbmxpbmVUZXh0LmgKaW5kZXggYzA3MjI4ZS4uZTc0 Y2ExNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9SZW5kZXJTVkdJ bmxpbmVUZXh0LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9SZW5kZXJTVkdJ bmxpbmVUZXh0LmgKQEAgLTQ0LDcgKzQ0LDcgQEAgcHVibGljOgogICAgIGZsb2F0IHNjYWxpbmdG YWN0b3IoKSBjb25zdCB7IHJldHVybiBtX3NjYWxpbmdGYWN0b3I7IH0KICAgICBjb25zdCBGb250 JiBzY2FsZWRGb250KCkgY29uc3QgeyByZXR1cm4gbV9zY2FsZWRGb250OyB9CiAgICAgdm9pZCB1 cGRhdGVTY2FsZWRGb250KCk7Ci0gICAgc3RhdGljIHZvaWQgY29tcHV0ZU5ld1NjYWxlZEZvbnRG b3JTdHlsZShSZW5kZXJPYmplY3QqLCBjb25zdCBSZW5kZXJTdHlsZSosIGZsb2F0JiBzY2FsaW5n RmFjdG9yLCBGb250JiBzY2FsZWRGb250KTsKKyAgICBzdGF0aWMgdm9pZCBjb21wdXRlTmV3U2Nh bGVkRm9udEZvclN0eWxlKGNvbnN0IFJlbmRlck9iamVjdCYsIGNvbnN0IFJlbmRlclN0eWxlJiwg ZmxvYXQmIHNjYWxpbmdGYWN0b3IsIEZvbnQmIHNjYWxlZEZvbnQpOwogCiAgICAgLy8gUHJlc2Vy dmVzIGZsb2F0aW5nIHBvaW50IHByZWNpc2lvbiBmb3IgdGhlIHVzZSBpbiBEUlQuIEl0IGtub3dz IGhvdyB0byByb3VuZCBhbmQgZG9lcyBhIGJldHRlciBqb2IgdGhhbiBlbmNsb3NpbmdJbnRSZWN0 LgogICAgIEZsb2F0UmVjdCBmbG9hdExpbmVzQm91bmRpbmdCb3goKSBjb25zdDsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdmcvUmVuZGVyU1ZHUmVzb3VyY2VDbGlwcGVy LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdmcvUmVuZGVyU1ZHUmVzb3VyY2VDbGlw cGVyLmNwcAppbmRleCA1YTZhZjIwLi5lNDlkMGMzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvc3ZnL1JlbmRlclNWR1Jlc291cmNlQ2xpcHBlci5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9SZW5kZXJTVkdSZXNvdXJjZUNsaXBwZXIuY3BwCkBAIC0x NDgsNyArMTQ4LDcgQEAgYm9vbCBSZW5kZXJTVkdSZXNvdXJjZUNsaXBwZXI6OmFwcGx5Q2xpcHBp bmdUb0NvbnRleHQoUmVuZGVyRWxlbWVudCYgcmVuZGVyZXIsIGMKICAgICB9CiAKICAgICBBZmZp bmVUcmFuc2Zvcm0gYWJzb2x1dGVUcmFuc2Zvcm07Ci0gICAgU1ZHUmVuZGVyaW5nQ29udGV4dDo6 Y2FsY3VsYXRlVHJhbnNmb3JtYXRpb25Ub091dGVybW9zdENvb3JkaW5hdGVTeXN0ZW0oJnJlbmRl cmVyLCBhYnNvbHV0ZVRyYW5zZm9ybSk7CisgICAgU1ZHUmVuZGVyaW5nQ29udGV4dDo6Y2FsY3Vs YXRlVHJhbnNmb3JtYXRpb25Ub091dGVybW9zdENvb3JkaW5hdGVTeXN0ZW0ocmVuZGVyZXIsIGFi c29sdXRlVHJhbnNmb3JtKTsKIAogICAgIGlmIChzaG91bGRDcmVhdGVDbGlwRGF0YSAmJiAhcmVw YWludFJlY3QuaXNFbXB0eSgpKSB7CiAgICAgICAgIGlmICghU1ZHUmVuZGVyaW5nQ29udGV4dDo6 Y3JlYXRlSW1hZ2VCdWZmZXIocmVwYWludFJlY3QsIGFic29sdXRlVHJhbnNmb3JtLCBjbGlwcGVy RGF0YS0+Y2xpcE1hc2tJbWFnZSwgQ29sb3JTcGFjZURldmljZVJHQiwgVW5hY2NlbGVyYXRlZCkp CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3ZnL1JlbmRlclNWR1Jlc291 cmNlQ29udGFpbmVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdmcvUmVuZGVyU1ZH UmVzb3VyY2VDb250YWluZXIuY3BwCmluZGV4IDJkOGE3MzEuLjE5OWYyODkgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdmcvUmVuZGVyU1ZHUmVzb3VyY2VDb250YWluZXIu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdmcvUmVuZGVyU1ZHUmVzb3VyY2VD b250YWluZXIuY3BwCkBAIC0yMDUsNyArMjA1LDcgQEAgYm9vbCBSZW5kZXJTVkdSZXNvdXJjZUNv bnRhaW5lcjo6c2hvdWxkVHJhbnNmb3JtT25UZXh0UGFpbnRpbmcoUmVuZGVyT2JqZWN0KiBvYmoK ICAgICAvLyBJbiB0ZXh0IGRyYXdpbmcsIHRoZSBzY2FsaW5nIHBhcnQgb2YgdGhlIGdyYXBoaWNz IGNvbnRleHQgQ1RNIGlzIHJlbW92ZWQsIGNvbXBhcmUgU1ZHSW5saW5lVGV4dEJveDo6cGFpbnRU ZXh0V2l0aFNoYWRvd3MuCiAgICAgLy8gU28sIHdlIHVzZSB0aGF0IHNjYWxpbmcgZmFjdG9yIGhl cmUsIHRvbywgYW5kIHRoZW4gcHVzaCBpdCBkb3duIHRvIHBhdHRlcm4gb3IgZ3JhZGllbnQgc3Bh Y2UKICAgICAvLyBpbiBvcmRlciB0byBrZWVwIHRoZSBwYXR0ZXJuIG9yIGdyYWRpZW50IGNvcnJl Y3RseSBzY2FsZWQuCi0gICAgZmxvYXQgc2NhbGluZ0ZhY3RvciA9IFNWR1JlbmRlcmluZ0NvbnRl eHQ6OmNhbGN1bGF0ZVNjcmVlbkZvbnRTaXplU2NhbGluZ0ZhY3RvcihvYmplY3QpOworICAgIGZs b2F0IHNjYWxpbmdGYWN0b3IgPSBTVkdSZW5kZXJpbmdDb250ZXh0OjpjYWxjdWxhdGVTY3JlZW5G b250U2l6ZVNjYWxpbmdGYWN0b3IoKm9iamVjdCk7CiAgICAgaWYgKHNjYWxpbmdGYWN0b3IgPT0g MSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIHJlc291cmNlVHJhbnNmb3JtLnNjYWxlKHNj YWxpbmdGYWN0b3IpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9S ZW5kZXJTVkdSZXNvdXJjZUZpbHRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3Zn L1JlbmRlclNWR1Jlc291cmNlRmlsdGVyLmNwcAppbmRleCBkMjVjNzcwLi5hOTZiZTcyIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3ZnL1JlbmRlclNWR1Jlc291cmNlRmls dGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3ZnL1JlbmRlclNWR1Jlc291 cmNlRmlsdGVyLmNwcApAQCAtMTMzLDcgKzEzMyw3IEBAIGJvb2wgUmVuZGVyU1ZHUmVzb3VyY2VG aWx0ZXI6OmFwcGx5UmVzb3VyY2UoUmVuZGVyRWxlbWVudCYgcmVuZGVyZXIsIGNvbnN0IFJlbmRl CiAKICAgICAvLyBEZXRlcm1pbmUgYWJzb2x1dGUgdHJhbnNmb3JtYXRpb24gbWF0cml4IGZvciBm aWx0ZXIuIAogICAgIEFmZmluZVRyYW5zZm9ybSBhYnNvbHV0ZVRyYW5zZm9ybTsKLSAgICBTVkdS ZW5kZXJpbmdDb250ZXh0OjpjYWxjdWxhdGVUcmFuc2Zvcm1hdGlvblRvT3V0ZXJtb3N0Q29vcmRp bmF0ZVN5c3RlbSgmcmVuZGVyZXIsIGFic29sdXRlVHJhbnNmb3JtKTsKKyAgICBTVkdSZW5kZXJp bmdDb250ZXh0OjpjYWxjdWxhdGVUcmFuc2Zvcm1hdGlvblRvT3V0ZXJtb3N0Q29vcmRpbmF0ZVN5 c3RlbShyZW5kZXJlciwgYWJzb2x1dGVUcmFuc2Zvcm0pOwogICAgIGlmICghYWJzb2x1dGVUcmFu c2Zvcm0uaXNJbnZlcnRpYmxlKCkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9SZW5kZXJTVkdSZXNvdXJjZUdyYWRpZW50 LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdmcvUmVuZGVyU1ZHUmVzb3VyY2VHcmFk aWVudC5jcHAKaW5kZXggNDk2YTdiZS4uNjYzOWRmZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL3N2Zy9SZW5kZXJTVkdSZXNvdXJjZUdyYWRpZW50LmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvc3ZnL1JlbmRlclNWR1Jlc291cmNlR3JhZGllbnQuY3BwCkBA IC02MSw3ICs2MSw3IEBAIHN0YXRpYyBpbmxpbmUgYm9vbCBjcmVhdGVNYXNrQW5kU3dhcENvbnRl eHRGb3JUZXh0R3JhZGllbnQoR3JhcGhpY3NDb250ZXh0KiYgY29uCiAgICAgQVNTRVJUKHRleHRS b290QmxvY2spOwogCiAgICAgQWZmaW5lVHJhbnNmb3JtIGFic29sdXRlVHJhbnNmb3JtOwotICAg IFNWR1JlbmRlcmluZ0NvbnRleHQ6OmNhbGN1bGF0ZVRyYW5zZm9ybWF0aW9uVG9PdXRlcm1vc3RD b29yZGluYXRlU3lzdGVtKHRleHRSb290QmxvY2ssIGFic29sdXRlVHJhbnNmb3JtKTsKKyAgICBT VkdSZW5kZXJpbmdDb250ZXh0OjpjYWxjdWxhdGVUcmFuc2Zvcm1hdGlvblRvT3V0ZXJtb3N0Q29v cmRpbmF0ZVN5c3RlbSgqdGV4dFJvb3RCbG9jaywgYWJzb2x1dGVUcmFuc2Zvcm0pOwogCiAgICAg RmxvYXRSZWN0IHJlcGFpbnRSZWN0ID0gdGV4dFJvb3RCbG9jay0+cmVwYWludFJlY3RJbkxvY2Fs Q29vcmRpbmF0ZXMoKTsKICAgICBzdGQ6OnVuaXF1ZV9wdHI8SW1hZ2VCdWZmZXI+IG1hc2tJbWFn ZTsKQEAgLTgzLDcgKzgzLDcgQEAgc3RhdGljIGlubGluZSBBZmZpbmVUcmFuc2Zvcm0gY2xpcFRv VGV4dE1hc2soR3JhcGhpY3NDb250ZXh0KiBjb250ZXh0LCBzdGQ6OnVuaXEKICAgICBBU1NFUlQo dGV4dFJvb3RCbG9jayk7CiAKICAgICBBZmZpbmVUcmFuc2Zvcm0gYWJzb2x1dGVUcmFuc2Zvcm07 Ci0gICAgU1ZHUmVuZGVyaW5nQ29udGV4dDo6Y2FsY3VsYXRlVHJhbnNmb3JtYXRpb25Ub091dGVy bW9zdENvb3JkaW5hdGVTeXN0ZW0odGV4dFJvb3RCbG9jaywgYWJzb2x1dGVUcmFuc2Zvcm0pOwor ICAgIFNWR1JlbmRlcmluZ0NvbnRleHQ6OmNhbGN1bGF0ZVRyYW5zZm9ybWF0aW9uVG9PdXRlcm1v c3RDb29yZGluYXRlU3lzdGVtKCp0ZXh0Um9vdEJsb2NrLCBhYnNvbHV0ZVRyYW5zZm9ybSk7CiAK ICAgICB0YXJnZXRSZWN0ID0gdGV4dFJvb3RCbG9jay0+cmVwYWludFJlY3RJbkxvY2FsQ29vcmRp bmF0ZXMoKTsKICAgICBTVkdSZW5kZXJpbmdDb250ZXh0OjpjbGlwVG9JbWFnZUJ1ZmZlcihjb250 ZXh0LCBhYnNvbHV0ZVRyYW5zZm9ybSwgdGFyZ2V0UmVjdCwgaW1hZ2VCdWZmZXIsIGZhbHNlKTsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdmcvUmVuZGVyU1ZHUmVzb3Vy Y2VNYXNrZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9SZW5kZXJTVkdSZXNv dXJjZU1hc2tlci5jcHAKaW5kZXggZTAyZmFiNC4uZGEyOGIyYyAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9SZW5kZXJTVkdSZXNvdXJjZU1hc2tlci5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9SZW5kZXJTVkdSZXNvdXJjZU1hc2tlci5jcHAK QEAgLTY5LDcgKzY5LDcgQEAgYm9vbCBSZW5kZXJTVkdSZXNvdXJjZU1hc2tlcjo6YXBwbHlSZXNv dXJjZShSZW5kZXJFbGVtZW50JiByZW5kZXJlciwgY29uc3QgUmVuZGUKICAgICBNYXNrZXJEYXRh KiBtYXNrZXJEYXRhID0gbV9tYXNrZXIuZ2V0KCZyZW5kZXJlcik7CiAKICAgICBBZmZpbmVUcmFu c2Zvcm0gYWJzb2x1dGVUcmFuc2Zvcm07Ci0gICAgU1ZHUmVuZGVyaW5nQ29udGV4dDo6Y2FsY3Vs YXRlVHJhbnNmb3JtYXRpb25Ub091dGVybW9zdENvb3JkaW5hdGVTeXN0ZW0oJnJlbmRlcmVyLCBh YnNvbHV0ZVRyYW5zZm9ybSk7CisgICAgU1ZHUmVuZGVyaW5nQ29udGV4dDo6Y2FsY3VsYXRlVHJh bnNmb3JtYXRpb25Ub091dGVybW9zdENvb3JkaW5hdGVTeXN0ZW0ocmVuZGVyZXIsIGFic29sdXRl VHJhbnNmb3JtKTsKIAogICAgIEZsb2F0UmVjdCByZXBhaW50UmVjdCA9IHJlbmRlcmVyLnJlcGFp bnRSZWN0SW5Mb2NhbENvb3JkaW5hdGVzKCk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9zdmcvUmVuZGVyU1ZHUmVzb3VyY2VQYXR0ZXJuLmNwcCBiL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9zdmcvUmVuZGVyU1ZHUmVzb3VyY2VQYXR0ZXJuLmNwcAppbmRleCA0ZWQ4 ZTZhLi40NmU3MzYxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3ZnL1Jl bmRlclNWR1Jlc291cmNlUGF0dGVybi5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L3N2Zy9SZW5kZXJTVkdSZXNvdXJjZVBhdHRlcm4uY3BwCkBAIC04Nyw3ICs4Nyw3IEBAIFBhdHRl cm5EYXRhKiBSZW5kZXJTVkdSZXNvdXJjZVBhdHRlcm46OmJ1aWxkUGF0dGVybihSZW5kZXJPYmpl Y3QqIG9iamVjdCwgdW5zaWduCiAgICAgICAgIHJldHVybiAwOwogCiAgICAgQWZmaW5lVHJhbnNm b3JtIGFic29sdXRlVHJhbnNmb3JtSWdub3JpbmdSb3RhdGlvbjsKLSAgICBTVkdSZW5kZXJpbmdD b250ZXh0OjpjYWxjdWxhdGVUcmFuc2Zvcm1hdGlvblRvT3V0ZXJtb3N0Q29vcmRpbmF0ZVN5c3Rl bShvYmplY3QsIGFic29sdXRlVHJhbnNmb3JtSWdub3JpbmdSb3RhdGlvbik7CisgICAgU1ZHUmVu ZGVyaW5nQ29udGV4dDo6Y2FsY3VsYXRlVHJhbnNmb3JtYXRpb25Ub091dGVybW9zdENvb3JkaW5h dGVTeXN0ZW0oKm9iamVjdCwgYWJzb2x1dGVUcmFuc2Zvcm1JZ25vcmluZ1JvdGF0aW9uKTsKIAog ICAgIC8vIElnbm9yZSAyRCByb3RhdGlvbiwgYXMgaXQgZG9lc24ndCBhZmZlY3QgdGhlIHNpemUg b2YgdGhlIHRpbGUuCiAgICAgU1ZHUmVuZGVyaW5nQ29udGV4dDo6Y2xlYXIyRFJvdGF0aW9uKGFi c29sdXRlVHJhbnNmb3JtSWdub3JpbmdSb3RhdGlvbik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvc3ZnL1NWR0lubGluZVRleHRCb3guY3BwIGIvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL3N2Zy9TVkdJbmxpbmVUZXh0Qm94LmNwcAppbmRleCBmYjdmMjY5Li44OGEzYTNm IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3ZnL1NWR0lubGluZVRleHRC b3guY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdmcvU1ZHSW5saW5lVGV4dEJv eC5jcHAKQEAgLTUxOSw3ICs1MTksNyBAQCB2b2lkIFNWR0lubGluZVRleHRCb3g6OnBhaW50RGVj b3JhdGlvbldpdGhTdHlsZShHcmFwaGljc0NvbnRleHQqIGNvbnRleHQsIFRleHREZQogCiAgICAg ZmxvYXQgc2NhbGluZ0ZhY3RvciA9IDE7CiAgICAgRm9udCBzY2FsZWRGb250OwotICAgIFJlbmRl clNWR0lubGluZVRleHQ6OmNvbXB1dGVOZXdTY2FsZWRGb250Rm9yU3R5bGUoJmRlY29yYXRpb25S ZW5kZXJlciwgJmRlY29yYXRpb25TdHlsZSwgc2NhbGluZ0ZhY3Rvciwgc2NhbGVkRm9udCk7Cisg ICAgUmVuZGVyU1ZHSW5saW5lVGV4dDo6Y29tcHV0ZU5ld1NjYWxlZEZvbnRGb3JTdHlsZShkZWNv cmF0aW9uUmVuZGVyZXIsIGRlY29yYXRpb25TdHlsZSwgc2NhbGluZ0ZhY3Rvciwgc2NhbGVkRm9u dCk7CiAgICAgQVNTRVJUKHNjYWxpbmdGYWN0b3IpOwogCiAgICAgLy8gVGhlIGluaXRpYWwgeSB2 YWx1ZSByZWZlcnMgdG8gb3ZlcmxpbmUgcG9zaXRpb24uCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvc3ZnL1NWR1JlbmRlcmluZ0NvbnRleHQuY3BwIGIvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL3N2Zy9TVkdSZW5kZXJpbmdDb250ZXh0LmNwcAppbmRleCBhMGFkMzMwLi44 MjcxMWFiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3ZnL1NWR1JlbmRl cmluZ0NvbnRleHQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdmcvU1ZHUmVu ZGVyaW5nQ29udGV4dC5jcHAKQEAgLTE4MCwzNCArMTgwLDMyIEBAIHN0YXRpYyBBZmZpbmVUcmFu c2Zvcm0mIGN1cnJlbnRDb250ZW50VHJhbnNmb3JtYXRpb24oKQogICAgIHJldHVybiBzX2N1cnJl bnRDb250ZW50VHJhbnNmb3JtYXRpb247CiB9CiAKLWZsb2F0IFNWR1JlbmRlcmluZ0NvbnRleHQ6 OmNhbGN1bGF0ZVNjcmVlbkZvbnRTaXplU2NhbGluZ0ZhY3Rvcihjb25zdCBSZW5kZXJPYmplY3Qq IHJlbmRlcmVyKQorZmxvYXQgU1ZHUmVuZGVyaW5nQ29udGV4dDo6Y2FsY3VsYXRlU2NyZWVuRm9u dFNpemVTY2FsaW5nRmFjdG9yKGNvbnN0IFJlbmRlck9iamVjdCYgcmVuZGVyZXIpCiB7Ci0gICAg QVNTRVJUKHJlbmRlcmVyKTsKLQogICAgIEFmZmluZVRyYW5zZm9ybSBjdG07CiAgICAgY2FsY3Vs YXRlVHJhbnNmb3JtYXRpb25Ub091dGVybW9zdENvb3JkaW5hdGVTeXN0ZW0ocmVuZGVyZXIsIGN0 bSk7CiAgICAgcmV0dXJuIG5hcnJvd1ByZWNpc2lvblRvRmxvYXQoc3FydCgocG93KGN0bS54U2Nh bGUoKSwgMikgKyBwb3coY3RtLnlTY2FsZSgpLCAyKSkgLyAyKSk7CiB9CiAKLXZvaWQgU1ZHUmVu ZGVyaW5nQ29udGV4dDo6Y2FsY3VsYXRlVHJhbnNmb3JtYXRpb25Ub091dGVybW9zdENvb3JkaW5h dGVTeXN0ZW0oY29uc3QgUmVuZGVyT2JqZWN0KiByZW5kZXJlciwgQWZmaW5lVHJhbnNmb3JtJiBh YnNvbHV0ZVRyYW5zZm9ybSkKK3ZvaWQgU1ZHUmVuZGVyaW5nQ29udGV4dDo6Y2FsY3VsYXRlVHJh bnNmb3JtYXRpb25Ub091dGVybW9zdENvb3JkaW5hdGVTeXN0ZW0oY29uc3QgUmVuZGVyT2JqZWN0 JiByZW5kZXJlciwgQWZmaW5lVHJhbnNmb3JtJiBhYnNvbHV0ZVRyYW5zZm9ybSkKIHsKLSAgICBB U1NFUlQocmVuZGVyZXIpOwogICAgIGFic29sdXRlVHJhbnNmb3JtID0gY3VycmVudENvbnRlbnRU cmFuc2Zvcm1hdGlvbigpOwogCiAgICAgZmxvYXQgZGV2aWNlU2NhbGVGYWN0b3IgPSAxOwotICAg IGlmIChQYWdlKiBwYWdlID0gcmVuZGVyZXItPmRvY3VtZW50KCkucGFnZSgpKQorICAgIGlmIChQ YWdlKiBwYWdlID0gcmVuZGVyZXIuZG9jdW1lbnQoKS5wYWdlKCkpCiAgICAgICAgIGRldmljZVNj YWxlRmFjdG9yID0gcGFnZS0+ZGV2aWNlU2NhbGVGYWN0b3IoKTsKIAogICAgIC8vIFdhbGsgdXAg dGhlIHJlbmRlciB0cmVlLCBhY2N1bXVsYXRpbmcgU1ZHIHRyYW5zZm9ybXMuCi0gICAgd2hpbGUg KHJlbmRlcmVyKSB7Ci0gICAgICAgIGFic29sdXRlVHJhbnNmb3JtID0gcmVuZGVyZXItPmxvY2Fs VG9QYXJlbnRUcmFuc2Zvcm0oKSAqIGFic29sdXRlVHJhbnNmb3JtOwotICAgICAgICBpZiAocmVu ZGVyZXItPmlzU1ZHUm9vdCgpKQorICAgIGNvbnN0IFJlbmRlck9iamVjdCogYW5jZXN0b3IgPSAm cmVuZGVyZXI7CisgICAgd2hpbGUgKGFuY2VzdG9yKSB7CisgICAgICAgIGFic29sdXRlVHJhbnNm b3JtID0gYW5jZXN0b3ItPmxvY2FsVG9QYXJlbnRUcmFuc2Zvcm0oKSAqIGFic29sdXRlVHJhbnNm b3JtOworICAgICAgICBpZiAoYW5jZXN0b3ItPmlzU1ZHUm9vdCgpKQogICAgICAgICAgICAgYnJl YWs7Ci0gICAgICAgIHJlbmRlcmVyID0gcmVuZGVyZXItPnBhcmVudCgpOworICAgICAgICBhbmNl c3RvciA9IGFuY2VzdG9yLT5wYXJlbnQoKTsKICAgICB9CiAKICAgICAvLyBDb250aW51ZSB3YWxr aW5nIHVwIHRoZSBsYXllciB0cmVlLCBhY2N1bXVsYXRpbmcgQ1NTIHRyYW5zZm9ybXMuCi0gICAg UmVuZGVyTGF5ZXIqIGxheWVyID0gcmVuZGVyZXIgPyByZW5kZXJlci0+ZW5jbG9zaW5nTGF5ZXIo KSA6IDA7CisgICAgUmVuZGVyTGF5ZXIqIGxheWVyID0gYW5jZXN0b3IgPyBhbmNlc3Rvci0+ZW5j bG9zaW5nTGF5ZXIoKSA6IG51bGxwdHI7CiAgICAgd2hpbGUgKGxheWVyKSB7CiAgICAgICAgIGlm IChUcmFuc2Zvcm1hdGlvbk1hdHJpeCogbGF5ZXJUcmFuc2Zvcm0gPSBsYXllci0+dHJhbnNmb3Jt KCkpCiAgICAgICAgICAgICBhYnNvbHV0ZVRyYW5zZm9ybSA9IGxheWVyVHJhbnNmb3JtLT50b0Fm ZmluZVRyYW5zZm9ybSgpICogYWJzb2x1dGVUcmFuc2Zvcm07CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvc3ZnL1NWR1JlbmRlcmluZ0NvbnRleHQuaCBiL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9zdmcvU1ZHUmVuZGVyaW5nQ29udGV4dC5oCmluZGV4IDNiZjYwNGNjLi42 ZDZhOWJiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3ZnL1NWR1JlbmRl cmluZ0NvbnRleHQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3ZnL1NWR1JlbmRl cmluZ0NvbnRleHQuaApAQCAtODMsOCArODMsOCBAQCBwdWJsaWM6CiAgICAgc3RhdGljIHZvaWQg cmVuZGVyU3VidHJlZVRvSW1hZ2VCdWZmZXIoSW1hZ2VCdWZmZXIqLCBSZW5kZXJFbGVtZW50Jiwg Y29uc3QgQWZmaW5lVHJhbnNmb3JtJik7CiAgICAgc3RhdGljIHZvaWQgY2xpcFRvSW1hZ2VCdWZm ZXIoR3JhcGhpY3NDb250ZXh0KiwgY29uc3QgQWZmaW5lVHJhbnNmb3JtJiBhYnNvbHV0ZVRyYW5z Zm9ybSwgY29uc3QgRmxvYXRSZWN0JiB0YXJnZXRSZWN0LCBzdGQ6OnVuaXF1ZV9wdHI8SW1hZ2VC dWZmZXI+JiwgYm9vbCBzYWZlVG9DbGVhcik7CiAKLSAgICBzdGF0aWMgZmxvYXQgY2FsY3VsYXRl U2NyZWVuRm9udFNpemVTY2FsaW5nRmFjdG9yKGNvbnN0IFJlbmRlck9iamVjdCopOwotICAgIHN0 YXRpYyB2b2lkIGNhbGN1bGF0ZVRyYW5zZm9ybWF0aW9uVG9PdXRlcm1vc3RDb29yZGluYXRlU3lz dGVtKGNvbnN0IFJlbmRlck9iamVjdCosIEFmZmluZVRyYW5zZm9ybSYgYWJzb2x1dGVUcmFuc2Zv cm0pOworICAgIHN0YXRpYyBmbG9hdCBjYWxjdWxhdGVTY3JlZW5Gb250U2l6ZVNjYWxpbmdGYWN0 b3IoY29uc3QgUmVuZGVyT2JqZWN0Jik7CisgICAgc3RhdGljIHZvaWQgY2FsY3VsYXRlVHJhbnNm b3JtYXRpb25Ub091dGVybW9zdENvb3JkaW5hdGVTeXN0ZW0oY29uc3QgUmVuZGVyT2JqZWN0Jiwg QWZmaW5lVHJhbnNmb3JtJiBhYnNvbHV0ZVRyYW5zZm9ybSk7CiAgICAgc3RhdGljIEludFNpemUg Y2xhbXBlZEFic29sdXRlU2l6ZShjb25zdCBJbnRTaXplJik7CiAgICAgc3RhdGljIEZsb2F0UmVj dCBjbGFtcGVkQWJzb2x1dGVUYXJnZXRSZWN0KGNvbnN0IEZsb2F0UmVjdCYgYWJzb2x1dGVUYXJn ZXRSZWN0KTsKICAgICBzdGF0aWMgdm9pZCBjbGVhcjJEUm90YXRpb24oQWZmaW5lVHJhbnNmb3Jt Jik7Cg==