133350 2014-05-28 11:00:58 -0700 Perserve caption selection in fullscreen. 2014-05-29 09:42:02 -0700 1 1 1 Unclassified WebKit Media 528+ (Nightly build) iPhone / iPad Unspecified RESOLVED FIXED P2 Normal --- 1 jeremyj-wk jeremyj-wk calvaris commit-queue eric.carlson esprehn+autocc glenn gyuyoung.kim jer.noble philipj sergio oldest_to_newest 1012247 0 jeremyj-wk 2014-05-28 11:00:58 -0700 Perserve caption selection in fullscreen. 1012248 1 jeremyj-wk 2014-05-28 11:01:53 -0700 radar://17046725 1012251 2 232206 jeremyj-wk 2014-05-28 11:10:00 -0700 Created attachment 232206 Patch 1012254 3 232206 eric.carlson 2014-05-28 11:22:58 -0700 Comment on attachment 232206 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=232206&action=review > Source/WebCore/ChangeLog:8 > + Use the logic from the line player to calculate the selected caption index. Nit: "from the line player" -> "from the inline player" > Source/WebCore/platform/ios/WebVideoFullscreenModelMediaElement.mm:297 > + if (trackList && m_mediaElement->document().page() && m_mediaElement->mediaControlsHost()) { This should be an early return. > Source/WebCore/platform/ios/WebVideoFullscreenModelMediaElement.mm:303 > + Vector<String> legibleOptions; Nit: I had to read through the code to figure out what "legibleOptions" meant, so something like "trackDisplayNames" might be better. > Source/WebCore/platform/ios/WebVideoFullscreenModelMediaElement.mm:326 > + if (offIndex && displayMode == MediaControlsHost::forcedOnlyKeyword() && !trackMenuItemSelected) { Nit: "!trackMenuItemSelected" is cheaper than "displayMode == MediaControlsHost::forcedOnlyKeyword()" so it should be first. 1012319 4 232222 jeremyj-wk 2014-05-28 17:04:32 -0700 Created attachment 232222 Patch 1012447 5 232222 commit-queue 2014-05-29 09:41:58 -0700 Comment on attachment 232222 Patch Clearing flags on attachment: 232222 Committed r169450: <http://trac.webkit.org/changeset/169450> 1012448 6 commit-queue 2014-05-29 09:42:02 -0700 All reviewed patches have been landed. Closing bug. 232206 2014-05-28 11:10:00 -0700 2014-05-28 17:04:27 -0700 Patch bug-133350-20140528110936.patch text/plain 4907 jeremyj-wk U3VidmVyc2lvbiBSZXZpc2lvbjogMTY5MjM5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjcwNGU1M2YzMGZhMjZm Mzc5ZGRjN2Y2ZDNmYjQxNTczMjUxNjhiNi4uNWY1NjA1MGRjMTA5NDY3ZDdkNDVlMGJmNWU3MWQ5 ODM3YmY1MmNhMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDE0LTA1LTI4ICBKZXJl bXkgSm9uZXMgIDxqZXJlbXlqQGFwcGxlLmNvbT4KKworICAgICAgICBQZXJzZXJ2ZSBjYXB0aW9u IHNlbGVjdGlvbiBpbiBmdWxsc2NyZWVuLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTMzMzUwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgVXNlIHRoZSBsb2dpYyBmcm9tIHRoZSBsaW5lIHBsYXllciB0byBj YWxjdWxhdGUgdGhlIHNlbGVjdGVkIGNhcHRpb24gaW5kZXguCisKKyAgICAgICAgKiBodG1sL0hU TUxNZWRpYUVsZW1lbnQuaDoKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxNZWRpYUVsZW1lbnQ6Om1l ZGlhQ29udHJvbHNIb3N0KToKKyAgICAgICAgRXhwb3NlIG1lZGlhQ29udHJvbHNIb3N0KCkgZm9y IHVzZSBieSBXZWJWaWRlb0Z1bGxzY3JlZW5Nb2RlbE1lZGlhRWxlbWVudC4KKworICAgICAgICAq IHBsYXRmb3JtL2lvcy9XZWJWaWRlb0Z1bGxzY3JlZW5Nb2RlbE1lZGlhRWxlbWVudC5tbToKKyAg ICAgICAgKFdlYlZpZGVvRnVsbHNjcmVlbk1vZGVsTWVkaWFFbGVtZW50Ojp1cGRhdGVMZWdpYmxl T3B0aW9ucyk6CisgICAgICAgIFVzZSBsb2dpYyBmcm9tIGJ1aWxkQ2FwdGlvbnNNZW51IGZyb20g bWVkaWFDb250cm9sc0FwcGxlLmpzLgorCiAyMDE0LTA1LTIyICBBbmRyZWFzIEtsaW5nICA8YWts aW5nQGFwcGxlLmNvbT4KIAogICAgICAgICBbaU9TIFdlYktpdDJdIFdlYiBwcm9jZXNzIHNob3Vs ZCB0cnkgdG8gc2hyaW5rIGl0cyBtZW1vcnkgZm9vdHByaW50IHdoZW4gZ29pbmcgaW50byBiYWNr Z3JvdW5kLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50 LmggYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuaAppbmRleCAyODU2Zjk5 NmVhODcxMzU4OGMyZmRiMWMxN2IzNDE3NmNmYjhmNDc4Li5lNjQ1ZGMzMzEyZjY0ZjAwMjY3ZDU0 ZTAyN2Q5YWRlODVmM2U1N2MwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxN ZWRpYUVsZW1lbnQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQu aApAQCAtNDM1LDYgKzQzNSw4IEBAIHB1YmxpYzoKICAgICB2b2lkIHBhZ2VTY2FsZUZhY3RvckNo YW5nZWQoKTsKICNlbmRpZgogCisgICAgTWVkaWFDb250cm9sc0hvc3QqIG1lZGlhQ29udHJvbHNI b3N0KCkgeyByZXR1cm4gbV9tZWRpYUNvbnRyb2xzSG9zdC5nZXQoKTsgfQorCiBwcm90ZWN0ZWQ6 CiAgICAgSFRNTE1lZGlhRWxlbWVudChjb25zdCBRdWFsaWZpZWROYW1lJiwgRG9jdW1lbnQmLCBi b29sKTsKICAgICB2aXJ0dWFsIH5IVE1MTWVkaWFFbGVtZW50KCk7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9pb3MvV2ViVmlkZW9GdWxsc2NyZWVuTW9kZWxNZWRpYUVsZW1l bnQubW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pb3MvV2ViVmlkZW9GdWxsc2NyZWVuTW9k ZWxNZWRpYUVsZW1lbnQubW0KaW5kZXggNDlkMTIwNGZhNTMzNmI4NTg5NzUwOGNjODZhYjMzZTEz MjE4NjUxMC4uMjcyMzQzMmRkZmNkNjFjNDg5NmM1Y2NiMWIxMTlmZDUyNmI2ZmJhZSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9zL1dlYlZpZGVvRnVsbHNjcmVlbk1vZGVs TWVkaWFFbGVtZW50Lm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy9XZWJWaWRl b0Z1bGxzY3JlZW5Nb2RlbE1lZGlhRWxlbWVudC5tbQpAQCAtMzEsNiArMzEsNyBAQAogCiAjaW1w b3J0ICJET01FdmVudEludGVybmFsLmgiCiAjaW1wb3J0ICJMb2dnaW5nLmgiCisjaW1wb3J0ICJN ZWRpYUNvbnRyb2xzSG9zdC5oIgogI2ltcG9ydCAiV2ViVmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNl LmgiCiAjaW1wb3J0IDxXZWJDb3JlL0RPTUV2ZW50TGlzdGVuZXIuaD4KICNpbXBvcnQgPFdlYkNv cmUvRXZlbnQuaD4KQEAgLTI5MywxNyArMjk0LDQyIEBAIHZvaWQgV2ViVmlkZW9GdWxsc2NyZWVu TW9kZWxNZWRpYUVsZW1lbnQ6OnNlbGVjdExlZ2libGVNZWRpYU9wdGlvbih1aW50NjRfdCBpbmRl CiB2b2lkIFdlYlZpZGVvRnVsbHNjcmVlbk1vZGVsTWVkaWFFbGVtZW50Ojp1cGRhdGVMZWdpYmxl T3B0aW9ucygpCiB7CiAgICAgVGV4dFRyYWNrTGlzdCogdHJhY2tMaXN0ID0gbV9tZWRpYUVsZW1l bnQtPnRleHRUcmFja3MoKTsKLSAgICBpZiAoIXRyYWNrTGlzdCB8fCAhdHJhY2tMaXN0LT5sZW5n dGgoKSB8fCAhbV9tZWRpYUVsZW1lbnQtPmRvY3VtZW50KCkucGFnZSgpKQotICAgICAgICByZXR1 cm47Ci0KLSAgICBDYXB0aW9uVXNlclByZWZlcmVuY2VzJiBjYXB0aW9uUHJlZmVyZW5jZXMgPSAq bV9tZWRpYUVsZW1lbnQtPmRvY3VtZW50KCkucGFnZSgpLT5ncm91cCgpLmNhcHRpb25QcmVmZXJl bmNlcygpOwotICAgIG1fbGVnaWJsZVRyYWNrc0Zvck1lbnUgPSBjYXB0aW9uUHJlZmVyZW5jZXMu c29ydGVkVHJhY2tMaXN0Rm9yTWVudSh0cmFja0xpc3QpOwotCi0gICAgVmVjdG9yPFN0cmluZz4g bGVnaWJsZU9wdGlvbnM7Ci0gICAgZm9yIChhdXRvJiB0cmFjayA6IG1fbGVnaWJsZVRyYWNrc0Zv ck1lbnUpCi0gICAgICAgIGxlZ2libGVPcHRpb25zLmFwcGVuZChjYXB0aW9uUHJlZmVyZW5jZXMu ZGlzcGxheU5hbWVGb3JUcmFjayh0cmFjay5nZXQoKSkpOwotCi0gICAgbV92aWRlb0Z1bGxzY3Jl ZW5JbnRlcmZhY2UtPnNldExlZ2libGVNZWRpYVNlbGVjdGlvbk9wdGlvbnMobGVnaWJsZU9wdGlv bnMsIDApOworICAgIGlmICh0cmFja0xpc3QgJiYgbV9tZWRpYUVsZW1lbnQtPmRvY3VtZW50KCku cGFnZSgpICYmIG1fbWVkaWFFbGVtZW50LT5tZWRpYUNvbnRyb2xzSG9zdCgpKSB7CisgICAgICAg IFdURjo6QXRvbWljU3RyaW5nIGRpc3BsYXlNb2RlID0gbV9tZWRpYUVsZW1lbnQtPm1lZGlhQ29u dHJvbHNIb3N0KCktPmNhcHRpb25EaXNwbGF5TW9kZSgpOworICAgICAgICBUZXh0VHJhY2sqIG9m Zkl0ZW0gPSBtX21lZGlhRWxlbWVudC0+bWVkaWFDb250cm9sc0hvc3QoKS0+Y2FwdGlvbk1lbnVP ZmZJdGVtKCk7CisgICAgICAgIFRleHRUcmFjayogYXV0b21hdGljSXRlbSA9IG1fbWVkaWFFbGVt ZW50LT5tZWRpYUNvbnRyb2xzSG9zdCgpLT5jYXB0aW9uTWVudUF1dG9tYXRpY0l0ZW0oKTsKKyAg ICAgICAgQ2FwdGlvblVzZXJQcmVmZXJlbmNlcyYgY2FwdGlvblByZWZlcmVuY2VzID0gKm1fbWVk aWFFbGVtZW50LT5kb2N1bWVudCgpLnBhZ2UoKS0+Z3JvdXAoKS5jYXB0aW9uUHJlZmVyZW5jZXMo KTsKKyAgICAgICAgbV9sZWdpYmxlVHJhY2tzRm9yTWVudSA9IGNhcHRpb25QcmVmZXJlbmNlcy5z b3J0ZWRUcmFja0xpc3RGb3JNZW51KHRyYWNrTGlzdCk7CisgICAgICAgIFZlY3RvcjxTdHJpbmc+ IGxlZ2libGVPcHRpb25zOworICAgICAgICB1aW50NjRfdCBzZWxlY3RlZEluZGV4ID0gMDsKKyAg ICAgICAgdWludDY0X3Qgb2ZmSW5kZXggPSAwOworICAgICAgICBib29sIHRyYWNrTWVudUl0ZW1T ZWxlY3RlZCA9IGZhbHNlOworICAgICAgICAKKyAgICAgICAgZm9yIChzaXplX3QgaW5kZXggPSAw OyBpbmRleCA8IG1fbGVnaWJsZVRyYWNrc0Zvck1lbnUuc2l6ZSgpOyBpbmRleCsrKSB7CisgICAg ICAgICAgICBhdXRvJiB0cmFjayA9IG1fbGVnaWJsZVRyYWNrc0Zvck1lbnVbaW5kZXhdOworICAg ICAgICAgICAgbGVnaWJsZU9wdGlvbnMuYXBwZW5kKGNhcHRpb25QcmVmZXJlbmNlcy5kaXNwbGF5 TmFtZUZvclRyYWNrKHRyYWNrLmdldCgpKSk7CisgICAgICAgICAgICAKKyAgICAgICAgICAgIGlm ICh0cmFjayA9PSBvZmZJdGVtKQorICAgICAgICAgICAgICAgIG9mZkluZGV4ID0gaW5kZXg7Cisg ICAgICAgICAgICAKKyAgICAgICAgICAgIGlmICh0cmFjayA9PSBhdXRvbWF0aWNJdGVtICYmIGRp c3BsYXlNb2RlID09IE1lZGlhQ29udHJvbHNIb3N0OjphdXRvbWF0aWNLZXl3b3JkKCkpIHsKKyAg ICAgICAgICAgICAgICBzZWxlY3RlZEluZGV4ID0gaW5kZXg7CisgICAgICAgICAgICAgICAgdHJh Y2tNZW51SXRlbVNlbGVjdGVkID0gdHJ1ZTsKKyAgICAgICAgICAgIH0KKyAgICAgICAgICAgIAor ICAgICAgICAgICAgaWYgKGRpc3BsYXlNb2RlICE9IE1lZGlhQ29udHJvbHNIb3N0OjphdXRvbWF0 aWNLZXl3b3JkKCkgJiYgdHJhY2stPm1vZGUoKSA9PSBUZXh0VHJhY2s6OnNob3dpbmdLZXl3b3Jk KCkpIHsKKyAgICAgICAgICAgICAgICBzZWxlY3RlZEluZGV4ID0gaW5kZXg7CisgICAgICAgICAg ICAgICAgdHJhY2tNZW51SXRlbVNlbGVjdGVkID0gdHJ1ZTsKKyAgICAgICAgICAgIH0KKyAgICAg ICAgfQorICAgICAgICAKKyAgICAgICAgaWYgKG9mZkluZGV4ICYmIGRpc3BsYXlNb2RlID09IE1l ZGlhQ29udHJvbHNIb3N0Ojpmb3JjZWRPbmx5S2V5d29yZCgpICYmICF0cmFja01lbnVJdGVtU2Vs ZWN0ZWQpIHsKKyAgICAgICAgICAgIHNlbGVjdGVkSW5kZXggPSBvZmZJbmRleDsKKyAgICAgICAg ICAgIHRyYWNrTWVudUl0ZW1TZWxlY3RlZCA9IHRydWU7CisgICAgICAgIH0KKyAgICAgICAgCisg ICAgICAgIG1fdmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlLT5zZXRMZWdpYmxlTWVkaWFTZWxlY3Rp b25PcHRpb25zKGxlZ2libGVPcHRpb25zLCBzZWxlY3RlZEluZGV4KTsKKyAgICB9CiB9CiAKICNl bmRpZgo= 232222 2014-05-28 17:04:32 -0700 2014-05-29 09:41:58 -0700 Patch bug-133350-20140528170408.patch text/plain 4582 jeremyj-wk U3VidmVyc2lvbiBSZXZpc2lvbjogMTY5MjM5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjcwNGU1M2YzMGZhMjZm Mzc5ZGRjN2Y2ZDNmYjQxNTczMjUxNjhiNi4uYjMxMjgwYWU5MzNmZmRmMTMzOGUyNjczZWU5YTI1 MTQ4ZTU3YTJiZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDE0LTA1LTI4ICBKZXJl bXkgSm9uZXMgIDxqZXJlbXlqQGFwcGxlLmNvbT4KKworICAgICAgICBQZXJzZXJ2ZSBjYXB0aW9u IHNlbGVjdGlvbiBpbiBmdWxsc2NyZWVuLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTMzMzUwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgVXNlIHRoZSBsb2dpYyBmcm9tIHRoZSBpbmxpbmUgcGxheWVyIHRv IGNhbGN1bGF0ZSB0aGUgc2VsZWN0ZWQgY2FwdGlvbiBpbmRleC4KKworICAgICAgICAqIGh0bWwv SFRNTE1lZGlhRWxlbWVudC5oOgorICAgICAgICAoV2ViQ29yZTo6SFRNTE1lZGlhRWxlbWVudDo6 bWVkaWFDb250cm9sc0hvc3QpOgorICAgICAgICBFeHBvc2UgbWVkaWFDb250cm9sc0hvc3QoKSBm b3IgdXNlIGJ5IFdlYlZpZGVvRnVsbHNjcmVlbk1vZGVsTWVkaWFFbGVtZW50LgorCisgICAgICAg ICogcGxhdGZvcm0vaW9zL1dlYlZpZGVvRnVsbHNjcmVlbk1vZGVsTWVkaWFFbGVtZW50Lm1tOgor ICAgICAgICAoV2ViVmlkZW9GdWxsc2NyZWVuTW9kZWxNZWRpYUVsZW1lbnQ6OnVwZGF0ZUxlZ2li bGVPcHRpb25zKToKKyAgICAgICAgVXNlIGxvZ2ljIGZyb20gYnVpbGRDYXB0aW9uc01lbnUgZnJv bSBtZWRpYUNvbnRyb2xzQXBwbGUuanMuCisKIDIwMTQtMDUtMjIgIEFuZHJlYXMgS2xpbmcgIDxh a2xpbmdAYXBwbGUuY29tPgogCiAgICAgICAgIFtpT1MgV2ViS2l0Ml0gV2ViIHByb2Nlc3Mgc2hv dWxkIHRyeSB0byBzaHJpbmsgaXRzIG1lbW9yeSBmb290cHJpbnQgd2hlbiBnb2luZyBpbnRvIGJh Y2tncm91bmQuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1l bnQuaCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5oCmluZGV4IDI4NTZm OTk2ZWE4NzEzNTg4YzJmZGIxYzE3YjM0MTc2Y2ZiOGY0NzguLmU2NDVkYzMzMTJmNjRmMDAyNjdk NTRlMDI3ZDlhZGU4NWYzZTU3YzAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRN TE1lZGlhRWxlbWVudC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVu dC5oCkBAIC00MzUsNiArNDM1LDggQEAgcHVibGljOgogICAgIHZvaWQgcGFnZVNjYWxlRmFjdG9y Q2hhbmdlZCgpOwogI2VuZGlmCiAKKyAgICBNZWRpYUNvbnRyb2xzSG9zdCogbWVkaWFDb250cm9s c0hvc3QoKSB7IHJldHVybiBtX21lZGlhQ29udHJvbHNIb3N0LmdldCgpOyB9CisKIHByb3RlY3Rl ZDoKICAgICBIVE1MTWVkaWFFbGVtZW50KGNvbnN0IFF1YWxpZmllZE5hbWUmLCBEb2N1bWVudCYs IGJvb2wpOwogICAgIHZpcnR1YWwgfkhUTUxNZWRpYUVsZW1lbnQoKTsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy9XZWJWaWRlb0Z1bGxzY3JlZW5Nb2RlbE1lZGlhRWxl bWVudC5tbSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy9XZWJWaWRlb0Z1bGxzY3JlZW5N b2RlbE1lZGlhRWxlbWVudC5tbQppbmRleCA0OWQxMjA0ZmE1MzM2Yjg1ODk3NTA4Y2M4NmFiMzNl MTMyMTg2NTEwLi4zZGUyOWVjYjYyNDI1MTY1ZGVlOTJlMTIxOTNlNGMxN2ZiOWQ1NzcwIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pb3MvV2ViVmlkZW9GdWxsc2NyZWVuTW9k ZWxNZWRpYUVsZW1lbnQubW0KKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9zL1dlYlZp ZGVvRnVsbHNjcmVlbk1vZGVsTWVkaWFFbGVtZW50Lm1tCkBAIC0zMSw2ICszMSw3IEBACiAKICNp bXBvcnQgIkRPTUV2ZW50SW50ZXJuYWwuaCIKICNpbXBvcnQgIkxvZ2dpbmcuaCIKKyNpbXBvcnQg Ik1lZGlhQ29udHJvbHNIb3N0LmgiCiAjaW1wb3J0ICJXZWJWaWRlb0Z1bGxzY3JlZW5JbnRlcmZh Y2UuaCIKICNpbXBvcnQgPFdlYkNvcmUvRE9NRXZlbnRMaXN0ZW5lci5oPgogI2ltcG9ydCA8V2Vi Q29yZS9FdmVudC5oPgpAQCAtMjkzLDE3ICsyOTQsNDMgQEAgdm9pZCBXZWJWaWRlb0Z1bGxzY3Jl ZW5Nb2RlbE1lZGlhRWxlbWVudDo6c2VsZWN0TGVnaWJsZU1lZGlhT3B0aW9uKHVpbnQ2NF90IGlu ZGUKIHZvaWQgV2ViVmlkZW9GdWxsc2NyZWVuTW9kZWxNZWRpYUVsZW1lbnQ6OnVwZGF0ZUxlZ2li bGVPcHRpb25zKCkKIHsKICAgICBUZXh0VHJhY2tMaXN0KiB0cmFja0xpc3QgPSBtX21lZGlhRWxl bWVudC0+dGV4dFRyYWNrcygpOwotICAgIGlmICghdHJhY2tMaXN0IHx8ICF0cmFja0xpc3QtPmxl bmd0aCgpIHx8ICFtX21lZGlhRWxlbWVudC0+ZG9jdW1lbnQoKS5wYWdlKCkpCisgICAgaWYgKCF0 cmFja0xpc3QgfHwgIW1fbWVkaWFFbGVtZW50LT5kb2N1bWVudCgpLnBhZ2UoKSB8fCAhbV9tZWRp YUVsZW1lbnQtPm1lZGlhQ29udHJvbHNIb3N0KCkpCiAgICAgICAgIHJldHVybjsKLQorICAgIAor ICAgIFdURjo6QXRvbWljU3RyaW5nIGRpc3BsYXlNb2RlID0gbV9tZWRpYUVsZW1lbnQtPm1lZGlh Q29udHJvbHNIb3N0KCktPmNhcHRpb25EaXNwbGF5TW9kZSgpOworICAgIFRleHRUcmFjayogb2Zm SXRlbSA9IG1fbWVkaWFFbGVtZW50LT5tZWRpYUNvbnRyb2xzSG9zdCgpLT5jYXB0aW9uTWVudU9m Zkl0ZW0oKTsKKyAgICBUZXh0VHJhY2sqIGF1dG9tYXRpY0l0ZW0gPSBtX21lZGlhRWxlbWVudC0+ bWVkaWFDb250cm9sc0hvc3QoKS0+Y2FwdGlvbk1lbnVBdXRvbWF0aWNJdGVtKCk7CiAgICAgQ2Fw dGlvblVzZXJQcmVmZXJlbmNlcyYgY2FwdGlvblByZWZlcmVuY2VzID0gKm1fbWVkaWFFbGVtZW50 LT5kb2N1bWVudCgpLnBhZ2UoKS0+Z3JvdXAoKS5jYXB0aW9uUHJlZmVyZW5jZXMoKTsKICAgICBt X2xlZ2libGVUcmFja3NGb3JNZW51ID0gY2FwdGlvblByZWZlcmVuY2VzLnNvcnRlZFRyYWNrTGlz dEZvck1lbnUodHJhY2tMaXN0KTsKLQotICAgIFZlY3RvcjxTdHJpbmc+IGxlZ2libGVPcHRpb25z OwotICAgIGZvciAoYXV0byYgdHJhY2sgOiBtX2xlZ2libGVUcmFja3NGb3JNZW51KQotICAgICAg ICBsZWdpYmxlT3B0aW9ucy5hcHBlbmQoY2FwdGlvblByZWZlcmVuY2VzLmRpc3BsYXlOYW1lRm9y VHJhY2sodHJhY2suZ2V0KCkpKTsKLQotICAgIG1fdmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlLT5z ZXRMZWdpYmxlTWVkaWFTZWxlY3Rpb25PcHRpb25zKGxlZ2libGVPcHRpb25zLCAwKTsKKyAgICBW ZWN0b3I8U3RyaW5nPiB0cmFja0Rpc3BsYXlOYW1lczsKKyAgICB1aW50NjRfdCBzZWxlY3RlZElu ZGV4ID0gMDsKKyAgICB1aW50NjRfdCBvZmZJbmRleCA9IDA7CisgICAgYm9vbCB0cmFja01lbnVJ dGVtU2VsZWN0ZWQgPSBmYWxzZTsKKyAgICAKKyAgICBmb3IgKHNpemVfdCBpbmRleCA9IDA7IGlu ZGV4IDwgbV9sZWdpYmxlVHJhY2tzRm9yTWVudS5zaXplKCk7IGluZGV4KyspIHsKKyAgICAgICAg YXV0byYgdHJhY2sgPSBtX2xlZ2libGVUcmFja3NGb3JNZW51W2luZGV4XTsKKyAgICAgICAgdHJh Y2tEaXNwbGF5TmFtZXMuYXBwZW5kKGNhcHRpb25QcmVmZXJlbmNlcy5kaXNwbGF5TmFtZUZvclRy YWNrKHRyYWNrLmdldCgpKSk7CisgICAgICAgIAorICAgICAgICBpZiAodHJhY2sgPT0gb2ZmSXRl bSkKKyAgICAgICAgICAgIG9mZkluZGV4ID0gaW5kZXg7CisgICAgICAgIAorICAgICAgICBpZiAo dHJhY2sgPT0gYXV0b21hdGljSXRlbSAmJiBkaXNwbGF5TW9kZSA9PSBNZWRpYUNvbnRyb2xzSG9z dDo6YXV0b21hdGljS2V5d29yZCgpKSB7CisgICAgICAgICAgICBzZWxlY3RlZEluZGV4ID0gaW5k ZXg7CisgICAgICAgICAgICB0cmFja01lbnVJdGVtU2VsZWN0ZWQgPSB0cnVlOworICAgICAgICB9 CisgICAgICAgIAorICAgICAgICBpZiAoZGlzcGxheU1vZGUgIT0gTWVkaWFDb250cm9sc0hvc3Q6 OmF1dG9tYXRpY0tleXdvcmQoKSAmJiB0cmFjay0+bW9kZSgpID09IFRleHRUcmFjazo6c2hvd2lu Z0tleXdvcmQoKSkgeworICAgICAgICAgICAgc2VsZWN0ZWRJbmRleCA9IGluZGV4OworICAgICAg ICAgICAgdHJhY2tNZW51SXRlbVNlbGVjdGVkID0gdHJ1ZTsKKyAgICAgICAgfQorICAgIH0KKyAg ICAKKyAgICBpZiAob2ZmSW5kZXggJiYgIXRyYWNrTWVudUl0ZW1TZWxlY3RlZCAmJiBkaXNwbGF5 TW9kZSA9PSBNZWRpYUNvbnRyb2xzSG9zdDo6Zm9yY2VkT25seUtleXdvcmQoKSkgeworICAgICAg ICBzZWxlY3RlZEluZGV4ID0gb2ZmSW5kZXg7CisgICAgICAgIHRyYWNrTWVudUl0ZW1TZWxlY3Rl ZCA9IHRydWU7CisgICAgfQorICAgIAorICAgIG1fdmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlLT5z ZXRMZWdpYmxlTWVkaWFTZWxlY3Rpb25PcHRpb25zKHRyYWNrRGlzcGxheU5hbWVzLCBzZWxlY3Rl ZEluZGV4KTsKIH0KIAogI2VuZGlmCg==