156906 2016-04-22 04:59:28 -0700 Minor refactoring in RenderMathMLOperator 2016-04-25 00:04:28 -0700 1 1 1 Unclassified WebKit MathML WebKit Nightly Build All All RESOLVED FIXED P2 Normal --- 152244 156913 156921 156950 1 fred.wang fred.wang alex commit-queue dbarton esprehn+autocc glenn kondapallykalyan mrobinson rego oldest_to_newest 1186215 0 fred.wang 2016-04-22 04:59:28 -0700 I'm extracting more changes from bug 152244 that were suggested by Manuel Rego 1186216 1 277045 fred.wang 2016-04-22 05:06:25 -0700 Created attachment 277045 Patch 1186234 2 277045 rego 2016-04-22 06:10:13 -0700 Comment on attachment 277045 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=277045&action=review LGTM, just a minor suggestion. > Source/WebCore/rendering/mathml/RenderMathMLOperator.cpp:441 > - if (state == 1) { > + if (expected == Start) { > // We ignore left/bottom piece and multiple successive extenders. > - state = 2; > - } else if (state == 3) { > + expected = ExtenderBetweenStartAndMiddle; > + } else if (expected == Middle) { > // We ignore middle piece and multiple successive extenders. > - state = 4; > - } else if (state >= 5) > + expected = ExtenderBetweenMiddleAndEnd; > + } else if (expected >= End) Maybe you can rewrite this with a switch. > Source/WebCore/rendering/mathml/RenderMathMLOperator.cpp:464 > - if (state == 1) { > + if (expected == Start) { > // We copy the left/bottom part. > bottom.glyph = part.glyph; > - state = 2; > + expected = ExtenderBetweenStartAndMiddle; > continue; > } > > - if (state == 2 || state == 3) { > + if (expected == ExtenderBetweenStartAndMiddle || expected == Middle) { > // We copy the middle part. > middle.glyph = part.glyph; > - state = 4; > + expected = ExtenderBetweenMiddleAndEnd; > continue; > } > > - if (state == 4 || state == 5) { > + if (expected == ExtenderBetweenMiddleAndEnd || expected == End) { > // We copy the right/top part. > top.glyph = part.glyph; > - state = 6; > + expected = None; > } Ditto. 1186243 3 277059 fred.wang 2016-04-22 06:48:25 -0700 Created attachment 277059 Patch 1186646 4 277059 mrobinson 2016-04-23 12:33:06 -0700 Comment on attachment 277059 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=277059&action=review This is a *really good* change that makes the code a lot more readable. I have a couple small nits, so maybe you can take care of them before landing this. > Source/WebCore/ChangeLog:8 > + No new tests, this is only minor refactoring that does not change the code. It might be more accurate to say "behavior" here instead of "code." The code is, in fact, changing. :) > Source/WebCore/rendering/mathml/RenderMathMLOperator.cpp:418 > + PartType expected = Start; I have a preference for expectedPartType just for the sake of clarity. 1186875 5 fred.wang 2016-04-25 00:04:28 -0700 Committed r199978: <http://trac.webkit.org/changeset/199978> 277045 2016-04-22 05:06:25 -0700 2016-04-22 06:48:17 -0700 Patch bug-156906-20160422140647.patch text/plain 6981 fred.wang U3VidmVyc2lvbiBSZXZpc2lvbjogMTk5ODY5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDY3MjUwNGJiODVjMmY1 YTBmZjRmMzQ5YjFhZTRkNGU2ZGQ0MDI1Ny4uNjMyMWEzZjU1MTg2NGU0NTFjNDJhNzMwZGQ1M2Zm ZDhlOTEwZjIzYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDE2LTA0LTIyICBGcmVk ZXJpYyBXYW5nICA8ZndhbmdAaWdhbGlhLmNvbT4KKworICAgICAgICBNaW5vciByZWZhY3Rvcmlu ZyBpbiBSZW5kZXJNYXRoTUxPcGVyYXRvcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTU2OTA2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLCB0aGlzIGlzIG9ubHkgbWlub3IgcmVmYWN0 b3JpbmcgdGhhdCBkb2VzIG5vdCBjaGFuZ2UgdGhlIGNvZGUuCisKKyAgICAgICAgKiByZW5kZXJp bmcvbWF0aG1sL1JlbmRlck1hdGhNTE9wZXJhdG9yLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJl bmRlck1hdGhNTE9wZXJhdG9yOjpnZXRHbHlwaEFzc2VtYmx5RmFsbEJhY2spOgorICAgICAgICBX ZSByZW5hbWUgdGhlICJzdGF0ZSIgaW50ZWdlciB0byBhbiAiZXhwZWN0ZWQiIGVudW0gaW5kaWNh dGluZyB0aGUgbmV4dCBleHBlY3RlZCBwYXJ0LgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTWF0 aE1MT3BlcmF0b3I6OnBhaW50R2x5cGgpOiBXZSBhZGQgYSBtaXNzaW5nIGRvdCBhdCB0aGUgZW5k IG9mIGEgc2VxdWVuY2UuCisgICAgICAgIFdlIGFsc28gcmVwbGFjZSBjZWlsKHgrMSkgd2l0aCBj ZWlsKHgpKzEgdG8gZ2V0IHJpZCBvZiB0aGUgdGVtcG9yYXJ5IHZhcmlhYmxlLgorCiAyMDE2LTA0 LTIxICBGcmVkZXJpYyBXYW5nICA8ZndhbmdAaWdhbGlhLmNvbT4KIAogICAgICAgICBNb3JlIGlt cHJvdmVtZW50cyBhbmQgZXhwbGFuYXRpb25zIHJlZ2FyZGluZyByZXNldHRpbmcgQ1NTIHByb3Bl cnRpZXMgb24gdGhlIDxtYXRoPiBlbGVtZW50CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvbWF0aG1sL1JlbmRlck1hdGhNTE9wZXJhdG9yLmNwcCBiL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9tYXRobWwvUmVuZGVyTWF0aE1MT3BlcmF0b3IuY3BwCmluZGV4IDgzZGIzNTIz Mjg4NjFjNzQwOGZkMzhmMDUxMDYyNjVlOTY1MzI5YmUuLjlmMWIxNzA4YzU2NmYwYjQwNDQxMzQ5 NTMyMjBlZDI2M2YxMTA0ZTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9t YXRobWwvUmVuZGVyTWF0aE1MT3BlcmF0b3IuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9tYXRobWwvUmVuZGVyTWF0aE1MT3BlcmF0b3IuY3BwCkBAIC00MDYsMjEgKzQwNiwyNSBA QCBib29sIFJlbmRlck1hdGhNTE9wZXJhdG9yOjpnZXRHbHlwaEFzc2VtYmx5RmFsbEJhY2soVmVj dG9yPE9wZW5UeXBlTWF0aERhdGE6OkFzcwogICAgIGlmIChub25FeHRlbmRlckNvdW50ID4gMykK ICAgICAgICAgcmV0dXJuIGZhbHNlOyAvLyBUaGlzIGlzIG5vdCBzdXBwb3J0ZWQ6IHRoZXJlIGFy ZSB0b28gbWFueSBwaWVjZXMuCiAKLSAgICAvLyBXZSBub3cgYnJvd3NlIHRoZSBsaXN0IG9mIHBp ZWNlcy4KLSAgICAvLyAxID0gbG9vayBmb3IgYSBsZWZ0L2JvdHRvbSBnbHlwaAotICAgIC8vIDIg PSBsb29rIGZvciBhbiBleHRlbmRlciBiZXR3ZWVuIGxlZnQvYm90dG9tIGFuZCBtaWQKLSAgICAv LyA0ID0gbG9vayBmb3IgYSBtaWRkbGUgZ2x5cGgKLSAgICAvLyA1ID0gbG9vayBmb3IgYW4gZXh0 ZW5kZXIgYmV0d2VlbiBtaWRkbGUgYW5kIHJpZ2h0L3RvcAotICAgIC8vIDUgPSBsb29rIGZvciBh IHJpZ2h0L3RvcCBnbHlwaAotICAgIC8vIDYgPSBubyBtb3JlIHBpZWNlIGV4cGVjdGVkCi0gICAg dW5zaWduZWQgc3RhdGUgPSAxOwotCisgICAgLy8gV2Ugbm93IGJyb3dzZSB0aGUgbGlzdCBvZiBw aWVjZXMgZnJvbSBsZWZ0IHRvIHJpZ2h0IGZvciBob3Jpem9udGFsIG9wZXJhdG9ycyBhbmQgZnJv bSBib3R0b20gdG8gdG9wIGZvciB2ZXJ0aWNhbCBvcGVyYXRvcnMuCisgICAgZW51bSBQYXJ0VHlw ZSB7CisgICAgICAgIFN0YXJ0LAorICAgICAgICBFeHRlbmRlckJldHdlZW5TdGFydEFuZE1pZGRs ZSwKKyAgICAgICAgTWlkZGxlLAorICAgICAgICBFeHRlbmRlckJldHdlZW5NaWRkbGVBbmRFbmQs CisgICAgICAgIEVuZCwKKyAgICAgICAgTm9uZQorICAgIH07CisgICAgUGFydFR5cGUgZXhwZWN0 ZWQgPSBTdGFydDsKICAgICBleHRlbnNpb24uZ2x5cGggPSAwOwogICAgIG1pZGRsZS5nbHlwaCA9 IDA7CiAgICAgZm9yIChhdXRvJiBwYXJ0IDogYXNzZW1ibHlQYXJ0cykgewotICAgICAgICBpZiAo KHN0YXRlID09IDIgfHwgc3RhdGUgPT0gMykgJiYgbm9uRXh0ZW5kZXJDb3VudCA8IDMpIHsKLSAg ICAgICAgICAgIC8vIFdlIGRvIG5vdCB0cnkgdG8gZmluZCBhIG1pZGRsZSBnbHlwaC4KLSAgICAg ICAgICAgIHN0YXRlICs9IDI7CisgICAgICAgIGlmIChub25FeHRlbmRlckNvdW50IDwgMykgewor ICAgICAgICAgICAgLy8gSWYgd2Ugb25seSBoYXZlIGF0IG1vc3QgdHdvIG5vbi1leHRlbmRlcnMg dGhlbiB3ZSBza2lwIHRoZSBtaWRkbGUgZ2x5cGguCisgICAgICAgICAgICBpZiAoZXhwZWN0ZWQg PT0gRXh0ZW5kZXJCZXR3ZWVuU3RhcnRBbmRNaWRkbGUpCisgICAgICAgICAgICAgICAgZXhwZWN0 ZWQgPSBFeHRlbmRlckJldHdlZW5NaWRkbGVBbmRFbmQ7CisgICAgICAgICAgICBlbHNlIGlmIChl eHBlY3RlZCA9PSBNaWRkbGUpCisgICAgICAgICAgICAgICAgZXhwZWN0ZWQgPSBFbmQ7CiAgICAg ICAgIH0KICAgICAgICAgaWYgKHBhcnQuaXNFeHRlbmRlcikgewogICAgICAgICAgICAgaWYgKCFl eHRlbnNpb24uZ2x5cGgpCkBAIC00MjgsMzUgKzQzMiwzNSBAQCBib29sIFJlbmRlck1hdGhNTE9w ZXJhdG9yOjpnZXRHbHlwaEFzc2VtYmx5RmFsbEJhY2soVmVjdG9yPE9wZW5UeXBlTWF0aERhdGE6 OkFzcwogICAgICAgICAgICAgZWxzZSBpZiAoZXh0ZW5zaW9uLmdseXBoICE9IHBhcnQuZ2x5cGgp CiAgICAgICAgICAgICAgICAgcmV0dXJuIGZhbHNlOyAvLyBUaGlzIGlzIG5vdCBzdXBwb3J0ZWQ6 IHRoZSBhc3NlbWJseSBoYXMgZGlmZmVyZW50IGV4dGVuZGVycy4KIAotICAgICAgICAgICAgaWYg KHN0YXRlID09IDEpIHsKKyAgICAgICAgICAgIGlmIChleHBlY3RlZCA9PSBTdGFydCkgewogICAg ICAgICAgICAgICAgIC8vIFdlIGlnbm9yZSBsZWZ0L2JvdHRvbSBwaWVjZSBhbmQgbXVsdGlwbGUg c3VjY2Vzc2l2ZSBleHRlbmRlcnMuCi0gICAgICAgICAgICAgICAgc3RhdGUgPSAyOwotICAgICAg ICAgICAgfSBlbHNlIGlmIChzdGF0ZSA9PSAzKSB7CisgICAgICAgICAgICAgICAgZXhwZWN0ZWQg PSBFeHRlbmRlckJldHdlZW5TdGFydEFuZE1pZGRsZTsKKyAgICAgICAgICAgIH0gZWxzZSBpZiAo ZXhwZWN0ZWQgPT0gTWlkZGxlKSB7CiAgICAgICAgICAgICAgICAgLy8gV2UgaWdub3JlIG1pZGRs ZSBwaWVjZSBhbmQgbXVsdGlwbGUgc3VjY2Vzc2l2ZSBleHRlbmRlcnMuCi0gICAgICAgICAgICAg ICAgc3RhdGUgPSA0OwotICAgICAgICAgICAgfSBlbHNlIGlmIChzdGF0ZSA+PSA1KQorICAgICAg ICAgICAgICAgIGV4cGVjdGVkID0gRXh0ZW5kZXJCZXR3ZWVuTWlkZGxlQW5kRW5kOworICAgICAg ICAgICAgfSBlbHNlIGlmIChleHBlY3RlZCA+PSBFbmQpCiAgICAgICAgICAgICAgICAgcmV0dXJu IGZhbHNlOyAvLyBUaGlzIGlzIG5vdCBzdXBwb3J0ZWQ6IHdlIGdvdCBhbiB1bmV4cGVjdGVkIGV4 dGVuZGVyLgogICAgICAgICAgICAgY29udGludWU7CiAgICAgICAgIH0KIAotICAgICAgICBpZiAo c3RhdGUgPT0gMSkgeworICAgICAgICBpZiAoZXhwZWN0ZWQgPT0gU3RhcnQpIHsKICAgICAgICAg ICAgIC8vIFdlIGNvcHkgdGhlIGxlZnQvYm90dG9tIHBhcnQuCiAgICAgICAgICAgICBib3R0b20u Z2x5cGggPSBwYXJ0LmdseXBoOwotICAgICAgICAgICAgc3RhdGUgPSAyOworICAgICAgICAgICAg ZXhwZWN0ZWQgPSBFeHRlbmRlckJldHdlZW5TdGFydEFuZE1pZGRsZTsKICAgICAgICAgICAgIGNv bnRpbnVlOwogICAgICAgICB9CiAKLSAgICAgICAgaWYgKHN0YXRlID09IDIgfHwgc3RhdGUgPT0g MykgeworICAgICAgICBpZiAoZXhwZWN0ZWQgPT0gRXh0ZW5kZXJCZXR3ZWVuU3RhcnRBbmRNaWRk bGUgfHwgZXhwZWN0ZWQgPT0gTWlkZGxlKSB7CiAgICAgICAgICAgICAvLyBXZSBjb3B5IHRoZSBt aWRkbGUgcGFydC4KICAgICAgICAgICAgIG1pZGRsZS5nbHlwaCA9IHBhcnQuZ2x5cGg7Ci0gICAg ICAgICAgICBzdGF0ZSA9IDQ7CisgICAgICAgICAgICBleHBlY3RlZCA9IEV4dGVuZGVyQmV0d2Vl bk1pZGRsZUFuZEVuZDsKICAgICAgICAgICAgIGNvbnRpbnVlOwogICAgICAgICB9CiAKLSAgICAg ICAgaWYgKHN0YXRlID09IDQgfHwgc3RhdGUgPT0gNSkgeworICAgICAgICBpZiAoZXhwZWN0ZWQg PT0gRXh0ZW5kZXJCZXR3ZWVuTWlkZGxlQW5kRW5kIHx8IGV4cGVjdGVkID09IEVuZCkgewogICAg ICAgICAgICAgLy8gV2UgY29weSB0aGUgcmlnaHQvdG9wIHBhcnQuCiAgICAgICAgICAgICB0b3Au Z2x5cGggPSBwYXJ0LmdseXBoOwotICAgICAgICAgICAgc3RhdGUgPSA2OworICAgICAgICAgICAg ZXhwZWN0ZWQgPSBOb25lOwogICAgICAgICB9CiAgICAgfQogCkBAIC03MDgsNyArNzEyLDcgQEAg TGF5b3V0UmVjdCBSZW5kZXJNYXRoTUxPcGVyYXRvcjo6cGFpbnRHbHlwaChQYWludEluZm8mIGlu Zm8sIGNvbnN0IEdseXBoRGF0YSYgZGEKIAogICAgIC8vIEluIG9yZGVyIHRvIGhhdmUgZ2x5cGhz IGZpdCBzbnVnbHkgd2l0aCBvbmUgYW5vdGhlciB3ZSBzbmFwIHRoZSBjb25uZWN0aW5nIGVkZ2Vz IHRvIHBpeGVsIGJvdW5kYXJpZXMKICAgICAvLyBhbmQgdHJpbSBvZmYgb25lIHBpeGVsLiBUaGUg cGl4ZWwgdHJpbSBpcyB0byBhY2NvdW50IGZvciBmb250cyB0aGF0IGhhdmUgZWRnZSBwaXhlbHMg dGhhdCBoYXZlIGxlc3MKLSAgICAvLyB0aGFuIGZ1bGwgY292ZXJhZ2UuIFRoZXNlIGVkZ2UgcGl4 ZWxzIGNhbiBpbnRyb2R1Y2Ugc21hbGwgc2VhbXMgYmV0d2VlbiBjb25uZWN0ZWQgZ2x5cGhzCisg ICAgLy8gdGhhbiBmdWxsIGNvdmVyYWdlLiBUaGVzZSBlZGdlIHBpeGVscyBjYW4gaW50cm9kdWNl IHNtYWxsIHNlYW1zIGJldHdlZW4gY29ubmVjdGVkIGdseXBocy4KICAgICBGbG9hdFJlY3QgY2xp cEJvdW5kcyA9IGluZm8ucmVjdDsKICAgICBzd2l0Y2ggKHRyaW0pIHsKICAgICBjYXNlIFRyaW1U b3A6CkBAIC03MTksMTMgKzcyMywxMSBAQCBMYXlvdXRSZWN0IFJlbmRlck1hdGhNTE9wZXJhdG9y OjpwYWludEdseXBoKFBhaW50SW5mbyYgaW5mbywgY29uc3QgR2x5cGhEYXRhJiBkYQogICAgICAg ICBnbHlwaFBhaW50UmVjdC5zaGlmdE1heFlFZGdlVG8oZ2x5cGhQYWludFJlY3QubWF4WSgpLmZs b29yKCkgLSAxKTsKICAgICAgICAgY2xpcEJvdW5kcy5zaGlmdE1heFlFZGdlVG8oZ2x5cGhQYWlu dFJlY3QubWF4WSgpKTsKICAgICAgICAgYnJlYWs7Ci0gICAgY2FzZSBUcmltVG9wQW5kQm90dG9t OiB7Ci0gICAgICAgIExheW91dFVuaXQgdGVtcCA9IGdseXBoUGFpbnRSZWN0LnkoKSArIDE7Ci0g ICAgICAgIGdseXBoUGFpbnRSZWN0LnNoaWZ0WUVkZ2VUbyh0ZW1wLmNlaWwoKSk7CisgICAgY2Fz ZSBUcmltVG9wQW5kQm90dG9tOgorICAgICAgICBnbHlwaFBhaW50UmVjdC5zaGlmdFlFZGdlVG8o Z2x5cGhQYWludFJlY3QueSgpLmNlaWwoKSArIDEpOwogICAgICAgICBnbHlwaFBhaW50UmVjdC5z aGlmdE1heFlFZGdlVG8oZ2x5cGhQYWludFJlY3QubWF4WSgpLmZsb29yKCkgLSAxKTsKICAgICAg ICAgY2xpcEJvdW5kcy5zaGlmdFlFZGdlVG8oZ2x5cGhQYWludFJlY3QueSgpKTsKICAgICAgICAg Y2xpcEJvdW5kcy5zaGlmdE1heFlFZGdlVG8oZ2x5cGhQYWludFJlY3QubWF4WSgpKTsKLSAgICB9 CiAgICAgICAgIGJyZWFrOwogICAgIGNhc2UgVHJpbUxlZnQ6CiAgICAgICAgIGdseXBoUGFpbnRS ZWN0LnNoaWZ0WEVkZ2VUbyhnbHlwaFBhaW50UmVjdC54KCkuY2VpbCgpICsgMSk7CkBAIC03MzUs MTQgKzczNywxMiBAQCBMYXlvdXRSZWN0IFJlbmRlck1hdGhNTE9wZXJhdG9yOjpwYWludEdseXBo KFBhaW50SW5mbyYgaW5mbywgY29uc3QgR2x5cGhEYXRhJiBkYQogICAgICAgICBnbHlwaFBhaW50 UmVjdC5zaGlmdE1heFhFZGdlVG8oZ2x5cGhQYWludFJlY3QubWF4WCgpLmZsb29yKCkgLSAxKTsK ICAgICAgICAgY2xpcEJvdW5kcy5zaGlmdE1heFhFZGdlVG8oZ2x5cGhQYWludFJlY3QubWF4WCgp KTsKICAgICAgICAgYnJlYWs7Ci0gICAgY2FzZSBUcmltTGVmdEFuZFJpZ2h0OiB7Ci0gICAgICAg IExheW91dFVuaXQgdGVtcCA9IGdseXBoUGFpbnRSZWN0LngoKSArIDE7Ci0gICAgICAgIGdseXBo UGFpbnRSZWN0LnNoaWZ0WEVkZ2VUbyh0ZW1wLmNlaWwoKSk7CisgICAgY2FzZSBUcmltTGVmdEFu ZFJpZ2h0OgorICAgICAgICBnbHlwaFBhaW50UmVjdC5zaGlmdFhFZGdlVG8oZ2x5cGhQYWludFJl Y3QueCgpLmNlaWwoKSArIDEpOwogICAgICAgICBnbHlwaFBhaW50UmVjdC5zaGlmdE1heFhFZGdl VG8oZ2x5cGhQYWludFJlY3QubWF4WCgpLmZsb29yKCkgLSAxKTsKICAgICAgICAgY2xpcEJvdW5k cy5zaGlmdFhFZGdlVG8oZ2x5cGhQYWludFJlY3QueCgpKTsKICAgICAgICAgY2xpcEJvdW5kcy5z aGlmdE1heFhFZGdlVG8oZ2x5cGhQYWludFJlY3QubWF4WCgpKTsKICAgICB9Ci0gICAgfQogCiAg ICAgLy8gQ2xpcHBpbmcgdGhlIGVuY2xvc2luZyBJbnRSZWN0IGF2b2lkcyBhbnkgcG90ZW50aWFs IGlzc3VlcyBhdCBqb2luZWQgZWRnZXMuCiAgICAgR3JhcGhpY3NDb250ZXh0U3RhdGVTYXZlciBz dGF0ZVNhdmVyKGluZm8uY29udGV4dCgpKTsK 277059 2016-04-22 06:48:25 -0700 2016-04-23 12:33:06 -0700 Patch bug-156906-20160422154847.patch text/plain 7605 fred.wang U3VidmVyc2lvbiBSZXZpc2lvbjogMTk5ODY5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDY3MjUwNGJiODVjMmY1 YTBmZjRmMzQ5YjFhZTRkNGU2ZGQ0MDI1Ny4uNjMyMWEzZjU1MTg2NGU0NTFjNDJhNzMwZGQ1M2Zm ZDhlOTEwZjIzYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDE2LTA0LTIyICBGcmVk ZXJpYyBXYW5nICA8ZndhbmdAaWdhbGlhLmNvbT4KKworICAgICAgICBNaW5vciByZWZhY3Rvcmlu ZyBpbiBSZW5kZXJNYXRoTUxPcGVyYXRvcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTU2OTA2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLCB0aGlzIGlzIG9ubHkgbWlub3IgcmVmYWN0 b3JpbmcgdGhhdCBkb2VzIG5vdCBjaGFuZ2UgdGhlIGNvZGUuCisKKyAgICAgICAgKiByZW5kZXJp bmcvbWF0aG1sL1JlbmRlck1hdGhNTE9wZXJhdG9yLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJl bmRlck1hdGhNTE9wZXJhdG9yOjpnZXRHbHlwaEFzc2VtYmx5RmFsbEJhY2spOgorICAgICAgICBX ZSByZW5hbWUgdGhlICJzdGF0ZSIgaW50ZWdlciB0byBhbiAiZXhwZWN0ZWQiIGVudW0gaW5kaWNh dGluZyB0aGUgbmV4dCBleHBlY3RlZCBwYXJ0LgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTWF0 aE1MT3BlcmF0b3I6OnBhaW50R2x5cGgpOiBXZSBhZGQgYSBtaXNzaW5nIGRvdCBhdCB0aGUgZW5k IG9mIGEgc2VxdWVuY2UuCisgICAgICAgIFdlIGFsc28gcmVwbGFjZSBjZWlsKHgrMSkgd2l0aCBj ZWlsKHgpKzEgdG8gZ2V0IHJpZCBvZiB0aGUgdGVtcG9yYXJ5IHZhcmlhYmxlLgorCiAyMDE2LTA0 LTIxICBGcmVkZXJpYyBXYW5nICA8ZndhbmdAaWdhbGlhLmNvbT4KIAogICAgICAgICBNb3JlIGlt cHJvdmVtZW50cyBhbmQgZXhwbGFuYXRpb25zIHJlZ2FyZGluZyByZXNldHRpbmcgQ1NTIHByb3Bl cnRpZXMgb24gdGhlIDxtYXRoPiBlbGVtZW50CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvbWF0aG1sL1JlbmRlck1hdGhNTE9wZXJhdG9yLmNwcCBiL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9tYXRobWwvUmVuZGVyTWF0aE1MT3BlcmF0b3IuY3BwCmluZGV4IDgzZGIzNTIz Mjg4NjFjNzQwOGZkMzhmMDUxMDYyNjVlOTY1MzI5YmUuLjU0ZWYwMDRhY2YxOTdlNDkyYTdhOTVh ZDBkZWJiNzYwZTQxMDM1NGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9t YXRobWwvUmVuZGVyTWF0aE1MT3BlcmF0b3IuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9tYXRobWwvUmVuZGVyTWF0aE1MT3BlcmF0b3IuY3BwCkBAIC00MDYsNTcgKzQwNiw3MyBA QCBib29sIFJlbmRlck1hdGhNTE9wZXJhdG9yOjpnZXRHbHlwaEFzc2VtYmx5RmFsbEJhY2soVmVj dG9yPE9wZW5UeXBlTWF0aERhdGE6OkFzcwogICAgIGlmIChub25FeHRlbmRlckNvdW50ID4gMykK ICAgICAgICAgcmV0dXJuIGZhbHNlOyAvLyBUaGlzIGlzIG5vdCBzdXBwb3J0ZWQ6IHRoZXJlIGFy ZSB0b28gbWFueSBwaWVjZXMuCiAKLSAgICAvLyBXZSBub3cgYnJvd3NlIHRoZSBsaXN0IG9mIHBp ZWNlcy4KLSAgICAvLyAxID0gbG9vayBmb3IgYSBsZWZ0L2JvdHRvbSBnbHlwaAotICAgIC8vIDIg PSBsb29rIGZvciBhbiBleHRlbmRlciBiZXR3ZWVuIGxlZnQvYm90dG9tIGFuZCBtaWQKLSAgICAv LyA0ID0gbG9vayBmb3IgYSBtaWRkbGUgZ2x5cGgKLSAgICAvLyA1ID0gbG9vayBmb3IgYW4gZXh0 ZW5kZXIgYmV0d2VlbiBtaWRkbGUgYW5kIHJpZ2h0L3RvcAotICAgIC8vIDUgPSBsb29rIGZvciBh IHJpZ2h0L3RvcCBnbHlwaAotICAgIC8vIDYgPSBubyBtb3JlIHBpZWNlIGV4cGVjdGVkCi0gICAg dW5zaWduZWQgc3RhdGUgPSAxOwotCisgICAgLy8gV2Ugbm93IGJyb3dzZSB0aGUgbGlzdCBvZiBw aWVjZXMgZnJvbSBsZWZ0IHRvIHJpZ2h0IGZvciBob3Jpem9udGFsIG9wZXJhdG9ycyBhbmQgZnJv bSBib3R0b20gdG8gdG9wIGZvciB2ZXJ0aWNhbCBvcGVyYXRvcnMuCisgICAgZW51bSBQYXJ0VHlw ZSB7CisgICAgICAgIFN0YXJ0LAorICAgICAgICBFeHRlbmRlckJldHdlZW5TdGFydEFuZE1pZGRs ZSwKKyAgICAgICAgTWlkZGxlLAorICAgICAgICBFeHRlbmRlckJldHdlZW5NaWRkbGVBbmRFbmQs CisgICAgICAgIEVuZCwKKyAgICAgICAgTm9uZQorICAgIH07CisgICAgUGFydFR5cGUgZXhwZWN0 ZWQgPSBTdGFydDsKICAgICBleHRlbnNpb24uZ2x5cGggPSAwOwogICAgIG1pZGRsZS5nbHlwaCA9 IDA7CiAgICAgZm9yIChhdXRvJiBwYXJ0IDogYXNzZW1ibHlQYXJ0cykgewotICAgICAgICBpZiAo KHN0YXRlID09IDIgfHwgc3RhdGUgPT0gMykgJiYgbm9uRXh0ZW5kZXJDb3VudCA8IDMpIHsKLSAg ICAgICAgICAgIC8vIFdlIGRvIG5vdCB0cnkgdG8gZmluZCBhIG1pZGRsZSBnbHlwaC4KLSAgICAg ICAgICAgIHN0YXRlICs9IDI7CisgICAgICAgIGlmIChub25FeHRlbmRlckNvdW50IDwgMykgewor ICAgICAgICAgICAgLy8gSWYgd2Ugb25seSBoYXZlIGF0IG1vc3QgdHdvIG5vbi1leHRlbmRlcnMg dGhlbiB3ZSBza2lwIHRoZSBtaWRkbGUgZ2x5cGguCisgICAgICAgICAgICBpZiAoZXhwZWN0ZWQg PT0gRXh0ZW5kZXJCZXR3ZWVuU3RhcnRBbmRNaWRkbGUpCisgICAgICAgICAgICAgICAgZXhwZWN0 ZWQgPSBFeHRlbmRlckJldHdlZW5NaWRkbGVBbmRFbmQ7CisgICAgICAgICAgICBlbHNlIGlmIChl eHBlY3RlZCA9PSBNaWRkbGUpCisgICAgICAgICAgICAgICAgZXhwZWN0ZWQgPSBFbmQ7CiAgICAg ICAgIH0KICAgICAgICAgaWYgKHBhcnQuaXNFeHRlbmRlcikgewogICAgICAgICAgICAgaWYgKCFl eHRlbnNpb24uZ2x5cGgpCi0gICAgICAgICAgICAgICAgZXh0ZW5zaW9uLmdseXBoID0gcGFydC5n bHlwaDsKKyAgICAgICAgICAgICAgICBleHRlbnNpb24uZ2x5cGggPSBwYXJ0LmdseXBoOyAvLyBX ZSBjb3B5IHRoZSBleHRlbmRlciBwYXJ0LgogICAgICAgICAgICAgZWxzZSBpZiAoZXh0ZW5zaW9u LmdseXBoICE9IHBhcnQuZ2x5cGgpCiAgICAgICAgICAgICAgICAgcmV0dXJuIGZhbHNlOyAvLyBU aGlzIGlzIG5vdCBzdXBwb3J0ZWQ6IHRoZSBhc3NlbWJseSBoYXMgZGlmZmVyZW50IGV4dGVuZGVy cy4KIAotICAgICAgICAgICAgaWYgKHN0YXRlID09IDEpIHsKLSAgICAgICAgICAgICAgICAvLyBX ZSBpZ25vcmUgbGVmdC9ib3R0b20gcGllY2UgYW5kIG11bHRpcGxlIHN1Y2Nlc3NpdmUgZXh0ZW5k ZXJzLgotICAgICAgICAgICAgICAgIHN0YXRlID0gMjsKLSAgICAgICAgICAgIH0gZWxzZSBpZiAo c3RhdGUgPT0gMykgewotICAgICAgICAgICAgICAgIC8vIFdlIGlnbm9yZSBtaWRkbGUgcGllY2Ug YW5kIG11bHRpcGxlIHN1Y2Nlc3NpdmUgZXh0ZW5kZXJzLgotICAgICAgICAgICAgICAgIHN0YXRl ID0gNDsKLSAgICAgICAgICAgIH0gZWxzZSBpZiAoc3RhdGUgPj0gNSkKLSAgICAgICAgICAgICAg ICByZXR1cm4gZmFsc2U7IC8vIFRoaXMgaXMgbm90IHN1cHBvcnRlZDogd2UgZ290IGFuIHVuZXhw ZWN0ZWQgZXh0ZW5kZXIuCi0gICAgICAgICAgICBjb250aW51ZTsKKyAgICAgICAgICAgIHN3aXRj aCAoZXhwZWN0ZWQpIHsKKyAgICAgICAgICAgIGNhc2UgU3RhcnQ6CisgICAgICAgICAgICAgICAg Ly8gV2UgaWdub3JlIHRoZSBsZWZ0L2JvdHRvbSBwYXJ0LgorICAgICAgICAgICAgICAgIGV4cGVj dGVkID0gRXh0ZW5kZXJCZXR3ZWVuU3RhcnRBbmRNaWRkbGU7CisgICAgICAgICAgICAgICAgY29u dGludWU7CisgICAgICAgICAgICBjYXNlIE1pZGRsZToKKyAgICAgICAgICAgICAgICAvLyBXZSBp Z25vcmUgdGhlIG1pZGRsZSBwYXJ0LgorICAgICAgICAgICAgICAgIGV4cGVjdGVkID0gRXh0ZW5k ZXJCZXR3ZWVuTWlkZGxlQW5kRW5kOworICAgICAgICAgICAgICAgIGNvbnRpbnVlOworICAgICAg ICAgICAgY2FzZSBFbmQ6CisgICAgICAgICAgICBjYXNlIE5vbmU6CisgICAgICAgICAgICAgICAg Ly8gVGhpcyBpcyBub3Qgc3VwcG9ydGVkOiB3ZSBnb3QgYW4gdW5leHBlY3RlZCBleHRlbmRlci4K KyAgICAgICAgICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgICAgICAgICBjYXNlIEV4dGVuZGVy QmV0d2VlblN0YXJ0QW5kTWlkZGxlOgorICAgICAgICAgICAgY2FzZSBFeHRlbmRlckJldHdlZW5N aWRkbGVBbmRFbmQ6CisgICAgICAgICAgICAgICAgLy8gV2UgaWdub3JlIG11bHRpcGxlIGNvbnNl Y3V0aXZlIGV4dGVuZGVycy4KKyAgICAgICAgICAgICAgICBjb250aW51ZTsKKyAgICAgICAgICAg IH0KICAgICAgICAgfQogCi0gICAgICAgIGlmIChzdGF0ZSA9PSAxKSB7CisgICAgICAgIHN3aXRj aCAoZXhwZWN0ZWQpIHsKKyAgICAgICAgY2FzZSBTdGFydDoKICAgICAgICAgICAgIC8vIFdlIGNv cHkgdGhlIGxlZnQvYm90dG9tIHBhcnQuCiAgICAgICAgICAgICBib3R0b20uZ2x5cGggPSBwYXJ0 LmdseXBoOwotICAgICAgICAgICAgc3RhdGUgPSAyOworICAgICAgICAgICAgZXhwZWN0ZWQgPSBF eHRlbmRlckJldHdlZW5TdGFydEFuZE1pZGRsZTsKICAgICAgICAgICAgIGNvbnRpbnVlOwotICAg ICAgICB9Ci0KLSAgICAgICAgaWYgKHN0YXRlID09IDIgfHwgc3RhdGUgPT0gMykgeworICAgICAg ICBjYXNlIEV4dGVuZGVyQmV0d2VlblN0YXJ0QW5kTWlkZGxlOgorICAgICAgICBjYXNlIE1pZGRs ZToKICAgICAgICAgICAgIC8vIFdlIGNvcHkgdGhlIG1pZGRsZSBwYXJ0LgogICAgICAgICAgICAg bWlkZGxlLmdseXBoID0gcGFydC5nbHlwaDsKLSAgICAgICAgICAgIHN0YXRlID0gNDsKKyAgICAg ICAgICAgIGV4cGVjdGVkID0gRXh0ZW5kZXJCZXR3ZWVuTWlkZGxlQW5kRW5kOwogICAgICAgICAg ICAgY29udGludWU7Ci0gICAgICAgIH0KLQotICAgICAgICBpZiAoc3RhdGUgPT0gNCB8fCBzdGF0 ZSA9PSA1KSB7CisgICAgICAgIGNhc2UgRXh0ZW5kZXJCZXR3ZWVuTWlkZGxlQW5kRW5kOgorICAg ICAgICBjYXNlIEVuZDoKICAgICAgICAgICAgIC8vIFdlIGNvcHkgdGhlIHJpZ2h0L3RvcCBwYXJ0 LgogICAgICAgICAgICAgdG9wLmdseXBoID0gcGFydC5nbHlwaDsKLSAgICAgICAgICAgIHN0YXRl ID0gNjsKKyAgICAgICAgICAgIGV4cGVjdGVkID0gTm9uZTsKKyAgICAgICAgICAgIGNvbnRpbnVl OworICAgICAgICBjYXNlIE5vbmU6CisgICAgICAgICAgICAvLyBUaGlzIGlzIG5vdCBzdXBwb3J0 ZWQ6IHdlIGdvdCBhbiB1bmV4cGVjdGVkIG5vbi1leHRlbmRlciBwYXJ0LgorICAgICAgICAgICAg cmV0dXJuIGZhbHNlOwogICAgICAgICB9CiAgICAgfQogCkBAIC03MDgsNyArNzI0LDcgQEAgTGF5 b3V0UmVjdCBSZW5kZXJNYXRoTUxPcGVyYXRvcjo6cGFpbnRHbHlwaChQYWludEluZm8mIGluZm8s IGNvbnN0IEdseXBoRGF0YSYgZGEKIAogICAgIC8vIEluIG9yZGVyIHRvIGhhdmUgZ2x5cGhzIGZp dCBzbnVnbHkgd2l0aCBvbmUgYW5vdGhlciB3ZSBzbmFwIHRoZSBjb25uZWN0aW5nIGVkZ2VzIHRv IHBpeGVsIGJvdW5kYXJpZXMKICAgICAvLyBhbmQgdHJpbSBvZmYgb25lIHBpeGVsLiBUaGUgcGl4 ZWwgdHJpbSBpcyB0byBhY2NvdW50IGZvciBmb250cyB0aGF0IGhhdmUgZWRnZSBwaXhlbHMgdGhh dCBoYXZlIGxlc3MKLSAgICAvLyB0aGFuIGZ1bGwgY292ZXJhZ2UuIFRoZXNlIGVkZ2UgcGl4ZWxz IGNhbiBpbnRyb2R1Y2Ugc21hbGwgc2VhbXMgYmV0d2VlbiBjb25uZWN0ZWQgZ2x5cGhzCisgICAg Ly8gdGhhbiBmdWxsIGNvdmVyYWdlLiBUaGVzZSBlZGdlIHBpeGVscyBjYW4gaW50cm9kdWNlIHNt YWxsIHNlYW1zIGJldHdlZW4gY29ubmVjdGVkIGdseXBocy4KICAgICBGbG9hdFJlY3QgY2xpcEJv dW5kcyA9IGluZm8ucmVjdDsKICAgICBzd2l0Y2ggKHRyaW0pIHsKICAgICBjYXNlIFRyaW1Ub3A6 CkBAIC03MTksMTMgKzczNSwxMSBAQCBMYXlvdXRSZWN0IFJlbmRlck1hdGhNTE9wZXJhdG9yOjpw YWludEdseXBoKFBhaW50SW5mbyYgaW5mbywgY29uc3QgR2x5cGhEYXRhJiBkYQogICAgICAgICBn bHlwaFBhaW50UmVjdC5zaGlmdE1heFlFZGdlVG8oZ2x5cGhQYWludFJlY3QubWF4WSgpLmZsb29y KCkgLSAxKTsKICAgICAgICAgY2xpcEJvdW5kcy5zaGlmdE1heFlFZGdlVG8oZ2x5cGhQYWludFJl Y3QubWF4WSgpKTsKICAgICAgICAgYnJlYWs7Ci0gICAgY2FzZSBUcmltVG9wQW5kQm90dG9tOiB7 Ci0gICAgICAgIExheW91dFVuaXQgdGVtcCA9IGdseXBoUGFpbnRSZWN0LnkoKSArIDE7Ci0gICAg ICAgIGdseXBoUGFpbnRSZWN0LnNoaWZ0WUVkZ2VUbyh0ZW1wLmNlaWwoKSk7CisgICAgY2FzZSBU cmltVG9wQW5kQm90dG9tOgorICAgICAgICBnbHlwaFBhaW50UmVjdC5zaGlmdFlFZGdlVG8oZ2x5 cGhQYWludFJlY3QueSgpLmNlaWwoKSArIDEpOwogICAgICAgICBnbHlwaFBhaW50UmVjdC5zaGlm dE1heFlFZGdlVG8oZ2x5cGhQYWludFJlY3QubWF4WSgpLmZsb29yKCkgLSAxKTsKICAgICAgICAg Y2xpcEJvdW5kcy5zaGlmdFlFZGdlVG8oZ2x5cGhQYWludFJlY3QueSgpKTsKICAgICAgICAgY2xp cEJvdW5kcy5zaGlmdE1heFlFZGdlVG8oZ2x5cGhQYWludFJlY3QubWF4WSgpKTsKLSAgICB9CiAg ICAgICAgIGJyZWFrOwogICAgIGNhc2UgVHJpbUxlZnQ6CiAgICAgICAgIGdseXBoUGFpbnRSZWN0 LnNoaWZ0WEVkZ2VUbyhnbHlwaFBhaW50UmVjdC54KCkuY2VpbCgpICsgMSk7CkBAIC03MzUsMTQg Kzc0OSwxMiBAQCBMYXlvdXRSZWN0IFJlbmRlck1hdGhNTE9wZXJhdG9yOjpwYWludEdseXBoKFBh aW50SW5mbyYgaW5mbywgY29uc3QgR2x5cGhEYXRhJiBkYQogICAgICAgICBnbHlwaFBhaW50UmVj dC5zaGlmdE1heFhFZGdlVG8oZ2x5cGhQYWludFJlY3QubWF4WCgpLmZsb29yKCkgLSAxKTsKICAg ICAgICAgY2xpcEJvdW5kcy5zaGlmdE1heFhFZGdlVG8oZ2x5cGhQYWludFJlY3QubWF4WCgpKTsK ICAgICAgICAgYnJlYWs7Ci0gICAgY2FzZSBUcmltTGVmdEFuZFJpZ2h0OiB7Ci0gICAgICAgIExh eW91dFVuaXQgdGVtcCA9IGdseXBoUGFpbnRSZWN0LngoKSArIDE7Ci0gICAgICAgIGdseXBoUGFp bnRSZWN0LnNoaWZ0WEVkZ2VUbyh0ZW1wLmNlaWwoKSk7CisgICAgY2FzZSBUcmltTGVmdEFuZFJp Z2h0OgorICAgICAgICBnbHlwaFBhaW50UmVjdC5zaGlmdFhFZGdlVG8oZ2x5cGhQYWludFJlY3Qu eCgpLmNlaWwoKSArIDEpOwogICAgICAgICBnbHlwaFBhaW50UmVjdC5zaGlmdE1heFhFZGdlVG8o Z2x5cGhQYWludFJlY3QubWF4WCgpLmZsb29yKCkgLSAxKTsKICAgICAgICAgY2xpcEJvdW5kcy5z aGlmdFhFZGdlVG8oZ2x5cGhQYWludFJlY3QueCgpKTsKICAgICAgICAgY2xpcEJvdW5kcy5zaGlm dE1heFhFZGdlVG8oZ2x5cGhQYWludFJlY3QubWF4WCgpKTsKICAgICB9Ci0gICAgfQogCiAgICAg Ly8gQ2xpcHBpbmcgdGhlIGVuY2xvc2luZyBJbnRSZWN0IGF2b2lkcyBhbnkgcG90ZW50aWFsIGlz c3VlcyBhdCBqb2luZWQgZWRnZXMuCiAgICAgR3JhcGhpY3NDb250ZXh0U3RhdGVTYXZlciBzdGF0 ZVNhdmVyKGluZm8uY29udGV4dCgpKTsK