159876 2016-07-18 04:43:05 -0700 Do not store gap and shift parameters on RenderMathMLFraction 2016-07-18 22:38:48 -0700 1 1 1 Unclassified WebKit MathML WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 159624 1 fred.wang fred.wang bfulgham commit-queue dbarton esprehn+autocc glenn kondapallykalyan oldest_to_newest 1211951 0 fred.wang 2016-07-18 04:43:05 -0700 Follow-up of bug 159624. Gap and shift parameters are only used during layoutBlock so we do not need to store them on the renderer class. I'm going to split updateLayoutParameters into three helper functions: one to update thickness and two to retrieve fraction and stack parameters. 1211952 1 283899 fred.wang 2016-07-18 04:53:20 -0700 Created attachment 283899 Patch 1212001 2 283899 darin 2016-07-18 10:04:46 -0700 Comment on attachment 283899 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=283899&action=review > Source/WebCore/rendering/mathml/RenderMathMLFraction.cpp:125 > + topShiftUp = bottomShiftDown = 0; WebKit coding style normally frowns on this style of multiple assignments in a single expression. > Source/WebCore/rendering/mathml/RenderMathMLFraction.h:63 > + void getFractionParameters(LayoutUnit&, LayoutUnit&, LayoutUnit&, LayoutUnit&); > + void getStackParameters(LayoutUnit&, LayoutUnit&, LayoutUnit&); Normally we’d include argument names in a case like this where the order of the arguments doesn’t make clear which is which. in fact, we could consider a version where these functions return structs instead, which eliminates the possibility of getting the order wrong. 1212276 3 fred.wang 2016-07-18 22:38:48 -0700 https://trac.webkit.org/changeset/203395 283899 2016-07-18 04:53:20 -0700 2016-07-18 10:04:46 -0700 Patch bug-159876-20160718135225.patch text/plain 12391 fred.wang U3VidmVyc2lvbiBSZXZpc2lvbjogMjAzMzQyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjkzM2JhY2NiYzQ2NGJi NGI3ODg2ZDA1YWJiZjE3NzYyMzAzMDRhOC4uMjQwODJmNWM3ODU0MzAwNjg5ZDk3ZDA2ZTRkMmE4 NTNiYjkwN2RiNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDE2LTA3LTE4ICBGcmVk ZXJpYyBXYW5nICA8ZndhbmdAaWdhbGlhLmNvbT4KKworICAgICAgICBEbyBub3Qgc3RvcmUgZ2Fw IGFuZCBzaGlmdCBwYXJhbWV0ZXJzIG9uIFJlbmRlck1hdGhNTEZyYWN0aW9uCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTk4NzYKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZnRlciByMjAzMjg1LCB0aGUg c3RhY2sgYW5kIGZyYWN0aW9uIGxheW91dCBwYXJhbWV0ZXJzIGFyZSBvbmx5IHVzZWQgaW4gbGF5 b3V0QmxvY2sgc28gd2UKKyAgICAgICAgZG8gbm90IG5lZWQgdG8gc3RvcmUgdGhlbSBvbiB0aGUg Y2xhc3MuIFdlIHJlbW92ZSB0aGVtIGFuZCBzcGxpdCB1cGRhdGVMYXlvdXRQYXJhbWV0ZXJzIGlu dG8KKyAgICAgICAgdGhyZWUgZnVuY3Rpb25zOiBvbmUgdG8gdXBkYXRlIHRoZSBsaW5ldGhpY2tu ZXNzIGFuZCB0d28gb3RoZXJzIHRvIHJldHJpZXZlIHRoZSBmcmFjdGlvbiBhbmQKKyAgICAgICAg c3RhY2sgcmVzcGVjdGl2ZWx5LgorCisgICAgICAgIE5vIG5ldyB0ZXN0cywgcmVuZGVyaW5nIGlz IHVuY2hhbmdlZC4KKworICAgICAgICAqIHJlbmRlcmluZy9tYXRobWwvUmVuZGVyTWF0aE1MRnJh Y3Rpb24uY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTWF0aE1MRnJhY3Rpb246OnVwZGF0 ZUxpbmVUaGlja25lc3MpOiBNb3ZlIGNvZGUgdG8gdXBkYXRlIHRoaWNrbmVzcyBtZW1iZXJzIGhl cmUuCisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJNYXRoTUxGcmFjdGlvbjo6Z2V0RnJhY3Rpb25Q YXJhbWV0ZXJzKTogTW92ZSBjb2RlIHRvIHJldHJpZXZlIGZyYWN0aW9uIHBhcmFtZXRlcnMgaGVy ZS4KKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlck1hdGhNTEZyYWN0aW9uOjpnZXRTdGFja1BhcmFt ZXRlcnMpOiBNb3ZlIGNvZGUgdG8gcmV0cmlldmUgc3RhY2sgcGFyYW1ldGVycyBoZXJlLgorICAg ICAgICAoV2ViQ29yZTo6UmVuZGVyTWF0aE1MRnJhY3Rpb246OmxheW91dEJsb2NrKTogVXNlIHRo ZSBuZXcgaGVscGVyIGZ1bmN0aW9ucyBhbmQgbG9jYWwgdmFyaWFibGVzCisgICAgICAgIGZvciBm cmFjdGlvbiBhbmQgc3RhY2sgcGFyYW1ldGVycy4KKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlck1h dGhNTEZyYWN0aW9uOjp1cGRhdGVMYXlvdXRQYXJhbWV0ZXJzKTogRGVsZXRlZC4KKyAgICAgICAg KiByZW5kZXJpbmcvbWF0aG1sL1JlbmRlck1hdGhNTEZyYWN0aW9uLmg6IERlY2xhcmUgbmV3IGhl bHBlciBmdW5jdGlvbnMgYW5kIHJlbW92ZSBtZW1iZXJzCisgICAgICAgIGZvciBzdGFjayBhbmQg ZnJhY3Rpb24gcGFyYW1ldGVycy4KKwogMjAxNi0wNy0xOCAgQ2FybG9zIEdhcmNpYSBDYW1wb3Mg IDxjZ2FyY2lhQGlnYWxpYS5jb20+CiAKICAgICAgICAgTWVtb3J5UHJlc3N1cmVIYW5kbGVyIGRv ZXNuJ3Qgd29yayBpZiBjZ3JvdXBzIGFyZW4ndCBwcmVzZW50IGluIExpbnV4CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvbWF0aG1sL1JlbmRlck1hdGhNTEZyYWN0aW9uLmNw cCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9tYXRobWwvUmVuZGVyTWF0aE1MRnJhY3Rpb24u Y3BwCmluZGV4IGY1OWQyMDNhNjVmMTQ4MTk1NDEyMzNmZTZhZWUzMjFlOGE5NTY3N2YuLjdhYzE0 OWU3Mzc0MmMxYTI0ODQ5ODY3MTY5OWU1OGMzMjk2NjA0ODIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9tYXRobWwvUmVuZGVyTWF0aE1MRnJhY3Rpb24uY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9tYXRobWwvUmVuZGVyTWF0aE1MRnJhY3Rpb24uY3BwCkBA IC02NywxMSArNjcsOCBAQCBSZW5kZXJCb3gmIFJlbmRlck1hdGhNTEZyYWN0aW9uOjpkZW5vbWlu YXRvcigpIGNvbnN0CiAgICAgcmV0dXJuICpmaXJzdENoaWxkQm94KCktPm5leHRTaWJsaW5nQm94 KCk7CiB9CiAKLXZvaWQgUmVuZGVyTWF0aE1MRnJhY3Rpb246OnVwZGF0ZUxheW91dFBhcmFtZXRl cnMoKQordm9pZCBSZW5kZXJNYXRoTUxGcmFjdGlvbjo6dXBkYXRlTGluZVRoaWNrbmVzcygpCiB7 Ci0gICAgLy8gV2UgdHJ5IGFuZCByZWFkIGNvbnN0YW50cyB0byBkcmF3IHRoZSBmcmFjdGlvbiBm cm9tIHRoZSBPcGVuVHlwZSBNQVRIIGFuZCB1c2UgZmFsbGJhY2sgdmFsdWVzIG90aGVyd2lzZS4K LSAgICAvLyBXZSBhbHNvIHBhcnNlIHByZXNlbnRhdGlvbiBhdHRyaWJ1dGVzIG9mIHRoZSA8bWZy YWM+IGVsZW1lbnQuCi0KICAgICAvLyBXZSBmaXJzdCBkZXRlcm1pbmUgdGhlIGRlZmF1bHQgbGlu ZSB0aGlja25lc3MuCiAgICAgY29uc3QgYXV0byYgcHJpbWFyeUZvbnQgPSBzdHlsZSgpLmZvbnRD YXNjYWRlKCkucHJpbWFyeUZvbnQoKTsKICAgICBjb25zdCBhdXRvKiBtYXRoRGF0YSA9IHN0eWxl KCkuZm9udENhc2NhZGUoKS5wcmltYXJ5Rm9udCgpLm1hdGhEYXRhKCk7CkBAIC04MCwzOCArNzcs NTIgQEAgdm9pZCBSZW5kZXJNYXRoTUxGcmFjdGlvbjo6dXBkYXRlTGF5b3V0UGFyYW1ldGVycygp CiAgICAgZWxzZQogICAgICAgICBtX2RlZmF1bHRMaW5lVGhpY2tuZXNzID0gcnVsZVRoaWNrbmVz c0ZhbGxiYWNrKCk7CiAKLSAgICAvLyBSZXNvbHZlIHRoZSB0aGlja25lc3MgdXNpbmcgbV9kZWZh dWx0TGluZVRoaWNrbmVzcyBhcyB0aGUgZGVmYXVsdCB2YWx1ZS4KKyAgICAvLyBOZXh0IHdlIHJl c29sdmUgdGhlIHRoaWNrbmVzcyB1c2luZyBtX2RlZmF1bHRMaW5lVGhpY2tuZXNzIGFzIHRoZSBk ZWZhdWx0IHZhbHVlLgogICAgIG1fbGluZVRoaWNrbmVzcyA9IHRvVXNlclVuaXRzKGVsZW1lbnQo KS5saW5lVGhpY2tuZXNzKCksIHN0eWxlKCksIG1fZGVmYXVsdExpbmVUaGlja25lc3MpOwogICAg IGlmIChtX2xpbmVUaGlja25lc3MgPCAwKQogICAgICAgICBtX2xpbmVUaGlja25lc3MgPSAwOwor fQogCi0gICAgLy8gV2Ugbm93IGtub3cgd2hldGhlciB3ZSBzaG91bGQgbGF5b3V0IGFzIGEgbm9y bWFsIGZyYWN0aW9uIG9yIGFzIGEgc3RhY2sgKGZyYWN0aW9uIHdpdGhvdXQgYmFyKSBhbmQgc28g ZGV0ZXJtaW5lIHRoZSByZWxldmFudCBjb25zdGFudHMuCit2b2lkIFJlbmRlck1hdGhNTEZyYWN0 aW9uOjpnZXRGcmFjdGlvblBhcmFtZXRlcnMoTGF5b3V0VW5pdCYgbnVtZXJhdG9yR2FwTWluLCBM YXlvdXRVbml0JiBkZW5vbWluYXRvckdhcE1pbiwgTGF5b3V0VW5pdCYgbnVtZXJhdG9yTWluU2hp ZnRVcCwgTGF5b3V0VW5pdCYgZGVub21pbmF0b3JNaW5TaGlmdERvd24pCit7CisgICAgQVNTRVJU KCFpc1N0YWNrKCkpOworCisgICAgLy8gV2UgdHJ5IGFuZCByZWFkIGNvbnN0YW50cyB0byBkcmF3 IHRoZSBmcmFjdGlvbiBmcm9tIHRoZSBPcGVuVHlwZSBNQVRIIGFuZCB1c2UgZmFsbGJhY2sgdmFs dWVzIG90aGVyd2lzZS4KKyAgICBjb25zdCBhdXRvJiBwcmltYXJ5Rm9udCA9IHN0eWxlKCkuZm9u dENhc2NhZGUoKS5wcmltYXJ5Rm9udCgpOworICAgIGNvbnN0IGF1dG8qIG1hdGhEYXRhID0gc3R5 bGUoKS5mb250Q2FzY2FkZSgpLnByaW1hcnlGb250KCkubWF0aERhdGEoKTsKICAgICBib29sIGRp c3BsYXkgPSBtYXRoTUxTdHlsZSgpLT5kaXNwbGF5U3R5bGUoKTsKLSAgICBpZiAoaXNTdGFjaygp KSB7Ci0gICAgICAgIGlmIChtYXRoRGF0YSkgewotICAgICAgICAgICAgbV9nYXBNaW4gPSBtYXRo RGF0YS0+Z2V0TWF0aENvbnN0YW50KHByaW1hcnlGb250LCBkaXNwbGF5ID8gT3BlblR5cGVNYXRo RGF0YTo6U3RhY2tEaXNwbGF5U3R5bGVHYXBNaW4gOiBPcGVuVHlwZU1hdGhEYXRhOjpTdGFja0dh cE1pbik7Ci0gICAgICAgICAgICBtX3RvcFNoaWZ0VXAgPSBtYXRoRGF0YS0+Z2V0TWF0aENvbnN0 YW50KHByaW1hcnlGb250LCBkaXNwbGF5ID8gT3BlblR5cGVNYXRoRGF0YTo6U3RhY2tUb3BEaXNw bGF5U3R5bGVTaGlmdFVwIDogT3BlblR5cGVNYXRoRGF0YTo6U3RhY2tUb3BTaGlmdFVwKTsKLSAg ICAgICAgICAgIG1fYm90dG9tU2hpZnREb3duID0gbWF0aERhdGEtPmdldE1hdGhDb25zdGFudChw cmltYXJ5Rm9udCwgZGlzcGxheSA/IE9wZW5UeXBlTWF0aERhdGE6OlN0YWNrQm90dG9tRGlzcGxh eVN0eWxlU2hpZnREb3duIDogT3BlblR5cGVNYXRoRGF0YTo6U3RhY2tCb3R0b21TaGlmdERvd24p OwotICAgICAgICB9IGVsc2UgewotICAgICAgICAgICAgLy8gV2UgdXNlIHRoZSB2YWx1ZXMgc3Vn Z2VzdGVkIGluIHRoZSBNQVRIIHRhYmxlIHNwZWNpZmljYXRpb24uCi0gICAgICAgICAgICBtX2dh cE1pbiA9IG1fZGVub21pbmF0b3JHYXBNaW4gPSBkaXNwbGF5ID8gNyAqIHJ1bGVUaGlja25lc3NG YWxsYmFjaygpIDogMyAqIHJ1bGVUaGlja25lc3NGYWxsYmFjaygpOwotCi0gICAgICAgICAgICAv LyBUaGUgTUFUSCB0YWJsZSBzcGVjaWZpY2F0aW9uIGRvZXMgbm90IHN1Z2dlc3QgYW55IHZhbHVl cyBmb3Igc2hpZnRzLCBzbyB3ZSBsZWF2ZSB0aGVtIGF0IHplcm8uCi0gICAgICAgICAgICBtX3Rv cFNoaWZ0VXAgPSBtX2JvdHRvbVNoaWZ0RG93biA9IDA7Ci0gICAgICAgIH0KKyAgICBpZiAobWF0 aERhdGEpIHsKKyAgICAgICAgbnVtZXJhdG9yR2FwTWluID0gbWF0aERhdGEtPmdldE1hdGhDb25z dGFudChwcmltYXJ5Rm9udCwgZGlzcGxheSA/IE9wZW5UeXBlTWF0aERhdGE6OkZyYWN0aW9uTnVt RGlzcGxheVN0eWxlR2FwTWluIDogT3BlblR5cGVNYXRoRGF0YTo6RnJhY3Rpb25OdW1lcmF0b3JH YXBNaW4pOworICAgICAgICBkZW5vbWluYXRvckdhcE1pbiA9IG1hdGhEYXRhLT5nZXRNYXRoQ29u c3RhbnQocHJpbWFyeUZvbnQsIGRpc3BsYXkgPyBPcGVuVHlwZU1hdGhEYXRhOjpGcmFjdGlvbkRl bm9tRGlzcGxheVN0eWxlR2FwTWluIDogT3BlblR5cGVNYXRoRGF0YTo6RnJhY3Rpb25EZW5vbWlu YXRvckdhcE1pbik7CisgICAgICAgIG51bWVyYXRvck1pblNoaWZ0VXAgPSBtYXRoRGF0YS0+Z2V0 TWF0aENvbnN0YW50KHByaW1hcnlGb250LCBkaXNwbGF5ID8gT3BlblR5cGVNYXRoRGF0YTo6RnJh Y3Rpb25OdW1lcmF0b3JEaXNwbGF5U3R5bGVTaGlmdFVwIDogT3BlblR5cGVNYXRoRGF0YTo6RnJh Y3Rpb25OdW1lcmF0b3JTaGlmdFVwKTsKKyAgICAgICAgZGVub21pbmF0b3JNaW5TaGlmdERvd24g PSBtYXRoRGF0YS0+Z2V0TWF0aENvbnN0YW50KHByaW1hcnlGb250LCBkaXNwbGF5ID8gT3BlblR5 cGVNYXRoRGF0YTo6RnJhY3Rpb25EZW5vbWluYXRvckRpc3BsYXlTdHlsZVNoaWZ0RG93biA6IE9w ZW5UeXBlTWF0aERhdGE6OkZyYWN0aW9uRGVub21pbmF0b3JTaGlmdERvd24pOwogICAgIH0gZWxz ZSB7Ci0gICAgICAgIGlmIChtYXRoRGF0YSkgewotICAgICAgICAgICAgbV9udW1lcmF0b3JHYXBN aW4gPSBtYXRoRGF0YS0+Z2V0TWF0aENvbnN0YW50KHByaW1hcnlGb250LCBkaXNwbGF5ID8gT3Bl blR5cGVNYXRoRGF0YTo6RnJhY3Rpb25OdW1EaXNwbGF5U3R5bGVHYXBNaW4gOiBPcGVuVHlwZU1h dGhEYXRhOjpGcmFjdGlvbk51bWVyYXRvckdhcE1pbik7Ci0gICAgICAgICAgICBtX2Rlbm9taW5h dG9yR2FwTWluID0gbWF0aERhdGEtPmdldE1hdGhDb25zdGFudChwcmltYXJ5Rm9udCwgZGlzcGxh eSA/IE9wZW5UeXBlTWF0aERhdGE6OkZyYWN0aW9uRGVub21EaXNwbGF5U3R5bGVHYXBNaW4gOiBP cGVuVHlwZU1hdGhEYXRhOjpGcmFjdGlvbkRlbm9taW5hdG9yR2FwTWluKTsKLSAgICAgICAgICAg IG1fbnVtZXJhdG9yTWluU2hpZnRVcCA9IG1hdGhEYXRhLT5nZXRNYXRoQ29uc3RhbnQocHJpbWFy eUZvbnQsIGRpc3BsYXkgPyBPcGVuVHlwZU1hdGhEYXRhOjpGcmFjdGlvbk51bWVyYXRvckRpc3Bs YXlTdHlsZVNoaWZ0VXAgOiBPcGVuVHlwZU1hdGhEYXRhOjpGcmFjdGlvbk51bWVyYXRvclNoaWZ0 VXApOwotICAgICAgICAgICAgbV9kZW5vbWluYXRvck1pblNoaWZ0RG93biA9IG1hdGhEYXRhLT5n ZXRNYXRoQ29uc3RhbnQocHJpbWFyeUZvbnQsIGRpc3BsYXkgPyBPcGVuVHlwZU1hdGhEYXRhOjpG cmFjdGlvbkRlbm9taW5hdG9yRGlzcGxheVN0eWxlU2hpZnREb3duIDogT3BlblR5cGVNYXRoRGF0 YTo6RnJhY3Rpb25EZW5vbWluYXRvclNoaWZ0RG93bik7Ci0gICAgICAgIH0gZWxzZSB7Ci0gICAg ICAgICAgICAvLyBUaGUgTUFUSCB0YWJsZSBzcGVjaWZpY2F0aW9uIHN1Z2dlc3RzIGRlZmF1bHQg cnVsZSB0aGlja25lc3Mgb3IgKGluIGRpc3BsYXlzdHlsZSkgMyB0aW1lcyBkZWZhdWx0IHJ1bGUg dGhpY2tuZXNzIGZvciB0aGUgZ2Fwcy4KLSAgICAgICAgICAgIG1fbnVtZXJhdG9yR2FwTWluID0g bV9kZW5vbWluYXRvckdhcE1pbiA9IGRpc3BsYXkgPyAzICogcnVsZVRoaWNrbmVzc0ZhbGxiYWNr KCkgOiBydWxlVGhpY2tuZXNzRmFsbGJhY2soKTsKLQotICAgICAgICAgICAgLy8gVGhlIE1BVEgg dGFibGUgc3BlY2lmaWNhdGlvbiBkb2VzIG5vdCBzdWdnZXN0IGFueSB2YWx1ZXMgZm9yIHNoaWZ0 cywgc28gd2UgbGVhdmUgdGhlbSBhdCB6ZXJvLgotICAgICAgICAgICAgbV9udW1lcmF0b3JNaW5T aGlmdFVwID0gbV9kZW5vbWluYXRvck1pblNoaWZ0RG93biA9IDA7Ci0gICAgICAgIH0KKyAgICAg ICAgLy8gVGhlIE1BVEggdGFibGUgc3BlY2lmaWNhdGlvbiBzdWdnZXN0cyBkZWZhdWx0IHJ1bGUg dGhpY2tuZXNzIG9yIChpbiBkaXNwbGF5c3R5bGUpIDMgdGltZXMgZGVmYXVsdCBydWxlIHRoaWNr bmVzcyBmb3IgdGhlIGdhcHMuCisgICAgICAgIG51bWVyYXRvckdhcE1pbiA9IGRlbm9taW5hdG9y R2FwTWluID0gZGlzcGxheSA/IDMgKiBydWxlVGhpY2tuZXNzRmFsbGJhY2soKSA6IHJ1bGVUaGlj a25lc3NGYWxsYmFjaygpOworCisgICAgICAgIC8vIFRoZSBNQVRIIHRhYmxlIHNwZWNpZmljYXRp b24gZG9lcyBub3Qgc3VnZ2VzdCBhbnkgdmFsdWVzIGZvciBzaGlmdHMsIHNvIHdlIGxlYXZlIHRo ZW0gYXQgemVyby4KKyAgICAgICAgbnVtZXJhdG9yTWluU2hpZnRVcCA9IGRlbm9taW5hdG9yTWlu U2hpZnREb3duID0gMDsKKyAgICB9Cit9CisKK3ZvaWQgUmVuZGVyTWF0aE1MRnJhY3Rpb246Omdl dFN0YWNrUGFyYW1ldGVycyhMYXlvdXRVbml0JiBnYXBNaW4sIExheW91dFVuaXQmIHRvcFNoaWZ0 VXAsIExheW91dFVuaXQmIGJvdHRvbVNoaWZ0RG93bikKK3sKKyAgICBBU1NFUlQoaXNTdGFjaygp KTsKKworICAgIC8vIFdlIHRyeSBhbmQgcmVhZCBjb25zdGFudHMgdG8gZHJhdyB0aGUgc3RhY2sg ZnJvbSB0aGUgT3BlblR5cGUgTUFUSCBhbmQgdXNlIGZhbGxiYWNrIHZhbHVlcyBvdGhlcndpc2Uu CisgICAgY29uc3QgYXV0byYgcHJpbWFyeUZvbnQgPSBzdHlsZSgpLmZvbnRDYXNjYWRlKCkucHJp bWFyeUZvbnQoKTsKKyAgICBjb25zdCBhdXRvKiBtYXRoRGF0YSA9IHN0eWxlKCkuZm9udENhc2Nh ZGUoKS5wcmltYXJ5Rm9udCgpLm1hdGhEYXRhKCk7CisgICAgYm9vbCBkaXNwbGF5ID0gbWF0aE1M U3R5bGUoKS0+ZGlzcGxheVN0eWxlKCk7CisgICAgaWYgKG1hdGhEYXRhKSB7CisgICAgICAgIGdh cE1pbiA9IG1hdGhEYXRhLT5nZXRNYXRoQ29uc3RhbnQocHJpbWFyeUZvbnQsIGRpc3BsYXkgPyBP cGVuVHlwZU1hdGhEYXRhOjpTdGFja0Rpc3BsYXlTdHlsZUdhcE1pbiA6IE9wZW5UeXBlTWF0aERh dGE6OlN0YWNrR2FwTWluKTsKKyAgICAgICAgdG9wU2hpZnRVcCA9IG1hdGhEYXRhLT5nZXRNYXRo Q29uc3RhbnQocHJpbWFyeUZvbnQsIGRpc3BsYXkgPyBPcGVuVHlwZU1hdGhEYXRhOjpTdGFja1Rv cERpc3BsYXlTdHlsZVNoaWZ0VXAgOiBPcGVuVHlwZU1hdGhEYXRhOjpTdGFja1RvcFNoaWZ0VXAp OworICAgICAgICBib3R0b21TaGlmdERvd24gPSBtYXRoRGF0YS0+Z2V0TWF0aENvbnN0YW50KHBy aW1hcnlGb250LCBkaXNwbGF5ID8gT3BlblR5cGVNYXRoRGF0YTo6U3RhY2tCb3R0b21EaXNwbGF5 U3R5bGVTaGlmdERvd24gOiBPcGVuVHlwZU1hdGhEYXRhOjpTdGFja0JvdHRvbVNoaWZ0RG93bik7 CisgICAgfSBlbHNlIHsKKyAgICAgICAgLy8gV2UgdXNlIHRoZSB2YWx1ZXMgc3VnZ2VzdGVkIGlu IHRoZSBNQVRIIHRhYmxlIHNwZWNpZmljYXRpb24uCisgICAgICAgIGdhcE1pbiA9IGRpc3BsYXkg PyA3ICogcnVsZVRoaWNrbmVzc0ZhbGxiYWNrKCkgOiAzICogcnVsZVRoaWNrbmVzc0ZhbGxiYWNr KCk7CisKKyAgICAgICAgLy8gVGhlIE1BVEggdGFibGUgc3BlY2lmaWNhdGlvbiBkb2VzIG5vdCBz dWdnZXN0IGFueSB2YWx1ZXMgZm9yIHNoaWZ0cywgc28gd2UgbGVhdmUgdGhlbSBhdCB6ZXJvLgor ICAgICAgICB0b3BTaGlmdFVwID0gYm90dG9tU2hpZnREb3duID0gMDsKICAgICB9CiB9CiAKQEAg LTE3Miw3ICsxODMsNyBAQCB2b2lkIFJlbmRlck1hdGhNTEZyYWN0aW9uOjpsYXlvdXRCbG9jayhi b29sIHJlbGF5b3V0Q2hpbGRyZW4sIExheW91dFVuaXQpCiAKICAgICBzZXRMb2dpY2FsV2lkdGgo c3RkOjptYXgobnVtZXJhdG9yKCkubG9naWNhbFdpZHRoKCksIGRlbm9taW5hdG9yKCkubG9naWNh bFdpZHRoKCkpKTsKIAotICAgIHVwZGF0ZUxheW91dFBhcmFtZXRlcnMoKTsKKyAgICB1cGRhdGVM aW5lVGhpY2tuZXNzKCk7CiAgICAgTGF5b3V0VW5pdCB2ZXJ0aWNhbE9mZnNldCA9IDA7IC8vIFRo aXMgaXMgdGhlIHRvcCBvZiB0aGUgcmVuZGVyZXIuCiAgICAgTGF5b3V0UG9pbnQgbnVtZXJhdG9y TG9jYXRpb24oaG9yaXpvbnRhbE9mZnNldChudW1lcmF0b3IoKSwgZWxlbWVudCgpLm51bWVyYXRv ckFsaWdubWVudCgpKSwgdmVydGljYWxPZmZzZXQpOwogICAgIG51bWVyYXRvcigpLnNldExvY2F0 aW9uKG51bWVyYXRvckxvY2F0aW9uKTsKQEAgLTE4MiwxMiArMTkzLDEyIEBAIHZvaWQgUmVuZGVy TWF0aE1MRnJhY3Rpb246OmxheW91dEJsb2NrKGJvb2wgcmVsYXlvdXRDaGlsZHJlbiwgTGF5b3V0 VW5pdCkKICAgICBMYXlvdXRVbml0IGRlbm9taW5hdG9yQXNjZW50ID0gYXNjZW50Rm9yQ2hpbGQo ZGVub21pbmF0b3IoKSk7CiAgICAgTGF5b3V0VW5pdCBkZW5vbWluYXRvckRlc2NlbnQgPSBkZW5v bWluYXRvcigpLmxvZ2ljYWxIZWlnaHQoKSAtIGRlbm9taW5hdG9yQXNjZW50OwogICAgIGlmIChp c1N0YWNrKCkpIHsKLSAgICAgICAgTGF5b3V0VW5pdCB0b3BTaGlmdFVwID0gbV90b3BTaGlmdFVw OwotICAgICAgICBMYXlvdXRVbml0IGJvdHRvbVNoaWZ0RG93biA9IG1fYm90dG9tU2hpZnREb3du OworICAgICAgICBMYXlvdXRVbml0IGdhcE1pbiwgdG9wU2hpZnRVcCwgYm90dG9tU2hpZnREb3du OworICAgICAgICBnZXRTdGFja1BhcmFtZXRlcnMoZ2FwTWluLCB0b3BTaGlmdFVwLCBib3R0b21T aGlmdERvd24pOwogICAgICAgICBMYXlvdXRVbml0IGdhcCA9IHRvcFNoaWZ0VXAgLSBudW1lcmF0 b3JEZXNjZW50ICsgYm90dG9tU2hpZnREb3duIC0gZGVub21pbmF0b3JBc2NlbnQ7Ci0gICAgICAg IGlmIChnYXAgPCBtX2dhcE1pbikgeworICAgICAgICBpZiAoZ2FwIDwgZ2FwTWluKSB7CiAgICAg ICAgICAgICAvLyBJZiB0aGUgZ2FwIGlzIG5vdCBsYXJnZSBlbm91Z2gsIHdlIGluY3JlYXNlIHRo ZSBzaGlmdHMgYnkgdGhlIHNhbWUgdmFsdWUuCi0gICAgICAgICAgICBMYXlvdXRVbml0IGRlbHRh ID0gKG1fZ2FwTWluIC0gZ2FwKSAvIDI7CisgICAgICAgICAgICBMYXlvdXRVbml0IGRlbHRhID0g KGdhcE1pbiAtIGdhcCkgLyAyOwogICAgICAgICAgICAgdG9wU2hpZnRVcCArPSBkZWx0YTsKICAg ICAgICAgICAgIGJvdHRvbVNoaWZ0RG93biArPSBkZWx0YTsKICAgICAgICAgfQpAQCAtMTk1LDkg KzIwNiwxMSBAQCB2b2lkIFJlbmRlck1hdGhNTEZyYWN0aW9uOjpsYXlvdXRCbG9jayhib29sIHJl bGF5b3V0Q2hpbGRyZW4sIExheW91dFVuaXQpCiAgICAgICAgIG1fYXNjZW50ID0gdmVydGljYWxP ZmZzZXQgKyBtYXRoQXhpc0hlaWdodCgpOwogICAgICAgICB2ZXJ0aWNhbE9mZnNldCArPSBib3R0 b21TaGlmdERvd24gLSBkZW5vbWluYXRvckFzY2VudDsKICAgICB9IGVsc2UgewotICAgICAgICB2 ZXJ0aWNhbE9mZnNldCArPSBzdGQ6Om1heChudW1lcmF0b3IoKS5sb2dpY2FsSGVpZ2h0KCkgKyBt X251bWVyYXRvckdhcE1pbiArIG1fbGluZVRoaWNrbmVzcyAvIDIsIG51bWVyYXRvckFzY2VudCAr IG1fbnVtZXJhdG9yTWluU2hpZnRVcCk7IC8vIFRoaXMgaXMgdGhlIG1pZGRsZSBvZiB0aGUgZnJh Y3Rpb24gYmFyLgorICAgICAgICBMYXlvdXRVbml0IG51bWVyYXRvckdhcE1pbiwgZGVub21pbmF0 b3JHYXBNaW4sIG51bWVyYXRvck1pblNoaWZ0VXAsIGRlbm9taW5hdG9yTWluU2hpZnREb3duOwor ICAgICAgICBnZXRGcmFjdGlvblBhcmFtZXRlcnMobnVtZXJhdG9yR2FwTWluLCBkZW5vbWluYXRv ckdhcE1pbiwgbnVtZXJhdG9yTWluU2hpZnRVcCwgZGVub21pbmF0b3JNaW5TaGlmdERvd24pOwor ICAgICAgICB2ZXJ0aWNhbE9mZnNldCArPSBzdGQ6Om1heChudW1lcmF0b3IoKS5sb2dpY2FsSGVp Z2h0KCkgKyBudW1lcmF0b3JHYXBNaW4gKyBtX2xpbmVUaGlja25lc3MgLyAyLCBudW1lcmF0b3JB c2NlbnQgKyBudW1lcmF0b3JNaW5TaGlmdFVwKTsgLy8gVGhpcyBpcyB0aGUgbWlkZGxlIG9mIHRo ZSBmcmFjdGlvbiBiYXIuCiAgICAgICAgIG1fYXNjZW50ID0gdmVydGljYWxPZmZzZXQgKyBtYXRo QXhpc0hlaWdodCgpOwotICAgICAgICB2ZXJ0aWNhbE9mZnNldCArPSBzdGQ6Om1heChtX2xpbmVU aGlja25lc3MgLyAyICsgbV9kZW5vbWluYXRvckdhcE1pbiwgbV9kZW5vbWluYXRvck1pblNoaWZ0 RG93biAtIGRlbm9taW5hdG9yQXNjZW50KTsKKyAgICAgICAgdmVydGljYWxPZmZzZXQgKz0gc3Rk OjptYXgobV9saW5lVGhpY2tuZXNzIC8gMiArIGRlbm9taW5hdG9yR2FwTWluLCBkZW5vbWluYXRv ck1pblNoaWZ0RG93biAtIGRlbm9taW5hdG9yQXNjZW50KTsKICAgICB9CiAKICAgICBMYXlvdXRQ b2ludCBkZW5vbWluYXRvckxvY2F0aW9uKGhvcml6b250YWxPZmZzZXQoZGVub21pbmF0b3IoKSwg ZWxlbWVudCgpLmRlbm9taW5hdG9yQWxpZ25tZW50KCkpLCB2ZXJ0aWNhbE9mZnNldCk7CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvbWF0aG1sL1JlbmRlck1hdGhNTEZyYWN0 aW9uLmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvbWF0aG1sL1JlbmRlck1hdGhNTEZyYWN0 aW9uLmgKaW5kZXggOGY0ZjVkOGIyNzgzOGIwZDdlMDdhOWJmY2U5ZDRmOTkwNThiNDRhMi4uMjFj MDg0NDUzNWIxOTAzNmI4MGU4MWJlN2JiNjczN2Y3N2E5YmFlYSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL21hdGhtbC9SZW5kZXJNYXRoTUxGcmFjdGlvbi5oCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9tYXRobWwvUmVuZGVyTWF0aE1MRnJhY3Rpb24uaApAQCAt NTgsMjQgKzU4LDEzIEBAIHByaXZhdGU6CiAgICAgUmVuZGVyQm94JiBudW1lcmF0b3IoKSBjb25z dDsKICAgICBSZW5kZXJCb3gmIGRlbm9taW5hdG9yKCkgY29uc3Q7CiAgICAgTGF5b3V0VW5pdCBo b3Jpem9udGFsT2Zmc2V0KFJlbmRlckJveCYsIE1hdGhNTEZyYWN0aW9uRWxlbWVudDo6RnJhY3Rp b25BbGlnbm1lbnQpOwotICAgIHZvaWQgdXBkYXRlTGF5b3V0UGFyYW1ldGVycygpOworICAgIHZv aWQgdXBkYXRlTGluZVRoaWNrbmVzcygpOworICAgIHZvaWQgZ2V0RnJhY3Rpb25QYXJhbWV0ZXJz KExheW91dFVuaXQmLCBMYXlvdXRVbml0JiwgTGF5b3V0VW5pdCYsIExheW91dFVuaXQmKTsKKyAg ICB2b2lkIGdldFN0YWNrUGFyYW1ldGVycyhMYXlvdXRVbml0JiwgTGF5b3V0VW5pdCYsIExheW91 dFVuaXQmKTsKIAogICAgIExheW91dFVuaXQgbV9hc2NlbnQ7CiAgICAgTGF5b3V0VW5pdCBtX2Rl ZmF1bHRMaW5lVGhpY2tuZXNzIHsgMSB9OwogICAgIExheW91dFVuaXQgbV9saW5lVGhpY2tuZXNz OwotICAgIHVuaW9uIHsKLSAgICAgICAgTGF5b3V0VW5pdCBtX251bWVyYXRvckdhcE1pbjsKLSAg ICAgICAgTGF5b3V0VW5pdCBtX2dhcE1pbjsKLSAgICB9OwotICAgIExheW91dFVuaXQgbV9kZW5v bWluYXRvckdhcE1pbjsKLSAgICB1bmlvbiB7Ci0gICAgICAgIExheW91dFVuaXQgbV9udW1lcmF0 b3JNaW5TaGlmdFVwOwotICAgICAgICBMYXlvdXRVbml0IG1fdG9wU2hpZnRVcDsKLSAgICB9Owot ICAgIHVuaW9uIHsKLSAgICAgICAgTGF5b3V0VW5pdCBtX2Rlbm9taW5hdG9yTWluU2hpZnREb3du OwotICAgICAgICBMYXlvdXRVbml0IG1fYm90dG9tU2hpZnREb3duOwotICAgIH07CiB9OwogCiB9 IC8vIG5hbWVzcGFjZSBXZWJDb3JlCg==