81678 2012-03-20 10:18:04 -0700 Make distributeExtraLogicalHeightToRows return the consumed logical height 2012-03-20 14:02:51 -0700 1 1 1 Unclassified WebKit Tables 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 jchaffraix jchaffraix dglazkov webkit.review.bot oldest_to_newest 583188 0 jchaffraix 2012-03-20 10:18:04 -0700 Currently this function returns the remaining logical height. This is painful as the distribution algorithm is interested in consumed logical height to decrease the available logical height. This also means that there will be a need for some unneeded house-keeping. Let's change that. 583196 1 132847 jchaffraix 2012-03-20 10:29:10 -0700 Created attachment 132847 Proposed fix 1. 583263 2 132847 tony 2012-03-20 11:19:11 -0700 Comment on attachment 132847 Proposed fix 1. View in context: https://bugs.webkit.org/attachment.cgi?id=132847&action=review > Source/WebCore/rendering/RenderTableSection.cpp:427 > -int RenderTableSection::distributeExtraLogicalHeightToPercentRows(int extraLogicalHeight, int totalPercent) > +void RenderTableSection::distributeExtraLogicalHeightToPercentRows(int& extraLogicalHeight, int totalPercent) Nit: Maybe we should reverse the parameter order. I think in/out params normally come last. > Source/WebCore/rendering/RenderTableSection.cpp:454 > -int RenderTableSection::distributeExtraLogicalHeightToAutoRows(int extraLogicalHeight, unsigned autoRowsCount) > +void RenderTableSection::distributeExtraLogicalHeightToAutoRows(int& extraLogicalHeight, unsigned autoRowsCount) Ditto. 583284 3 132847 webkit.review.bot 2012-03-20 11:30:21 -0700 Comment on attachment 132847 Proposed fix 1. Attachment 132847 did not pass chromium-ews (chromium-xvfb): Output: http://queues.webkit.org/results/12009301 New failing tests: fast/dom/error-to-string-stack-overflow.html 583372 4 132847 jchaffraix 2012-03-20 12:55:37 -0700 Comment on attachment 132847 Proposed fix 1. View in context: https://bugs.webkit.org/attachment.cgi?id=132847&action=review The test failing is unrelated to my change (I am hitting it locally without the patch). >> Source/WebCore/rendering/RenderTableSection.cpp:427 >> +void RenderTableSection::distributeExtraLogicalHeightToPercentRows(int& extraLogicalHeight, int totalPercent) > > Nit: Maybe we should reverse the parameter order. I think in/out params normally come last. I prefer it this way as it looks like |totalPercent| is an added parameter compared to distributeExtraLogicalHeightToRows. 583425 5 jchaffraix 2012-03-20 14:02:51 -0700 Committed r111435: <http://trac.webkit.org/changeset/111435> 132847 2012-03-20 10:29:10 -0700 2012-03-20 12:55:37 -0700 Proposed fix 1. bug-81678-20120320102909.patch text/plain 9004 jchaffraix U3VidmVyc2lvbiBSZXZpc2lvbjogMTExNDAwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNWM3NjY4NGUzMmIyNTYy NjFhZGVkNTQ3ZjI2OWY5NjdlMjM3NDBhYS4uOTIyNTY1ZjEzZTZiMzI0Yjc3ZmJkYjk1ZjJmOWM3 OTI0NGU4Nzk0NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDEyLTAzLTIwICBKdWxp ZW4gQ2hhZmZyYWl4ICA8amNoYWZmcmFpeEB3ZWJraXQub3JnPgorCisgICAgICAgIE1ha2UgZGlz dHJpYnV0ZUV4dHJhTG9naWNhbEhlaWdodFRvUm93cyByZXR1cm4gdGhlIGNvbnN1bWVkIGxvZ2lj YWwgaGVpZ2h0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD04MTY3OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IFNtYWxsIHJlZmFjdG9yaW5nLCBubyBjaGFuZ2UgaW4gYmVoYXZpb3IuCisKKyAgICAgICAgKiBy ZW5kZXJpbmcvUmVuZGVyVGFibGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGFibGU6 OmRpc3RyaWJ1dGVFeHRyYUxvZ2ljYWxIZWlnaHQpOgorICAgICAgICBSZW1vdmUgdGhlIGNvbnN1 bWVkIGxvZ2ljYWwgaGVpZ2h0IGZyb20gdGhlIGF2YWlsYWJsZSBoZWlnaHQuCisKKyAgICAgICAg KiByZW5kZXJpbmcvUmVuZGVyVGFibGVTZWN0aW9uLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJl bmRlclRhYmxlU2VjdGlvbjo6ZGlzdHJpYnV0ZUV4dHJhTG9naWNhbEhlaWdodFRvUGVyY2VudFJv d3MpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGFibGVTZWN0aW9uOjpkaXN0cmlidXRlRXh0 cmFMb2dpY2FsSGVpZ2h0VG9BdXRvUm93cyk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUYWJs ZVNlY3Rpb246OmRpc3RyaWJ1dGVSZW1haW5pbmdFeHRyYUxvZ2ljYWxIZWlnaHQpOgorICAgICAg ICBDaGFuZ2VkIHRob3NlIG1ldGhvZCB0byBub3QgcmV0dXJuIGFueXRoaW5nIGJ1dCByZW1vdmUg ZnJvbSB0aGUgYXZhaWxhYmxlIHdpZHRoLgorCisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUYWJs ZVNlY3Rpb246OmRpc3RyaWJ1dGVFeHRyYUxvZ2ljYWxIZWlnaHRUb1Jvd3MpOgorICAgICAgICBS ZXR1cm4gdGhlIGNvbnN1bWVkIGxvZ2ljYWwgaGVpZ2h0LgorCisgICAgICAgICogcmVuZGVyaW5n L1JlbmRlclRhYmxlU2VjdGlvbi5oOgorICAgICAgICBVcGRhdGVkIHRoZSBwcmV2aW91cyBkaXN0 cmlidXRlIGZ1bmN0aW9ucyBzaWduYXR1cmUgYW5kIHRoZSBjb21tZW50IGFib3V0CisgICAgICAg IHRoZSByZXR1cm5lZCB2YWx1ZSBmcm9tIGRpc3RyaWJ1dGVFeHRyYUxvZ2ljYWxIZWlnaHRUb1Jv d3MuCisKIDIwMTItMDMtMjAgIEtvbnJhZCBQaWFzY2lrICA8a3BpYXNjaWtAcmltLmNvbT4KIAog ICAgICAgICAocjExMDA2MykgbV9tb3VzZURvd25NYXlTdGFydERyYWcgaXMgdXNlZCB3aXRob3V0 IGJlaW5nIGJlaGluZCB0aGUgRU5BQkxFKERSQUdfU1VQUE9SVCkgbWFjcm8KZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUYWJsZS5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyVGFibGUuY3BwCmluZGV4IDJjYTVjYzg1OWExODRiYWVjMzZiM2Vl YTI2N2I2ZTNiYWJiYjdlNDkuLjcxMzY0ZWMzOWIyMGFhNjc3ZmVmODMwM2MwZWM2MmQ0MTEyZjNj MGMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUYWJsZS5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRhYmxlLmNwcApAQCAtMzA2LDcg KzMwNiw3IEBAIHZvaWQgUmVuZGVyVGFibGU6OmRpc3RyaWJ1dGVFeHRyYUxvZ2ljYWxIZWlnaHQo aW50IGV4dHJhTG9naWNhbEhlaWdodCkKIAogICAgIC8vIEZJWE1FOiBEaXN0cmlidXRlIHRoZSBl eHRyYSBsb2dpY2FsIGhlaWdodCBiZXR3ZWVuIGFsbCB0YWJsZSBzZWN0aW9ucyBpbnN0ZWFkIG9m IGdpdmluZyBpdCBhbGwgdG8gdGhlIGZpcnN0IG9uZS4KICAgICBpZiAoUmVuZGVyVGFibGVTZWN0 aW9uKiBzZWN0aW9uID0gdG9wU2VjdGlvbigpKQotICAgICAgICBleHRyYUxvZ2ljYWxIZWlnaHQg PSBzZWN0aW9uLT5kaXN0cmlidXRlRXh0cmFMb2dpY2FsSGVpZ2h0VG9Sb3dzKGV4dHJhTG9naWNh bEhlaWdodCk7CisgICAgICAgIGV4dHJhTG9naWNhbEhlaWdodCAtPSBzZWN0aW9uLT5kaXN0cmli dXRlRXh0cmFMb2dpY2FsSGVpZ2h0VG9Sb3dzKGV4dHJhTG9naWNhbEhlaWdodCk7CiAKICAgICAv LyBGSVhNRTogV2UgcmVhbGx5IHdvdWxkIGxpa2UgdG8gZW5hYmxlIHRoaXMgQVNTRVJUIHRvIGVu c3VyZSB0aGF0IGFsbCB0aGUgZXh0cmEgc3BhY2UgaGFzIGJlZW4gZGlzdHJpYnV0ZWQuCiAgICAg Ly8gSG93ZXZlciBvdXIgY3VycmVudCBkaXN0cmlidXRpb24gYWxnb3JpdGhtIGRvZXMgbm90IHJv dW5kIHByb3Blcmx5IGFuZCB0aHVzIHdlIGNhbiBoYXZlIHNvbWUgcmVtYWluaW5nIGhlaWdodC4K ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUYWJsZVNlY3Rpb24u Y3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRhYmxlU2VjdGlvbi5jcHAKaW5k ZXggMGQ3OTljYmQ2M2ZiMDczY2RlMTQyZTMxMDI5NGMwMzhjMzE4NzliMi4uZTg1ZTgwYjVhNmEy ZGQ4MWUyNjcxMmE2MWRhNWE5MzU1NzZiZmYzMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlclRhYmxlU2VjdGlvbi5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlclRhYmxlU2VjdGlvbi5jcHAKQEAgLTQyNCwxNCArNDI0LDE0IEBAIHZvaWQg UmVuZGVyVGFibGVTZWN0aW9uOjpsYXlvdXQoKQogICAgIHNldE5lZWRzTGF5b3V0KGZhbHNlKTsK IH0KIAotaW50IFJlbmRlclRhYmxlU2VjdGlvbjo6ZGlzdHJpYnV0ZUV4dHJhTG9naWNhbEhlaWdo dFRvUGVyY2VudFJvd3MoaW50IGV4dHJhTG9naWNhbEhlaWdodCwgaW50IHRvdGFsUGVyY2VudCkK K3ZvaWQgUmVuZGVyVGFibGVTZWN0aW9uOjpkaXN0cmlidXRlRXh0cmFMb2dpY2FsSGVpZ2h0VG9Q ZXJjZW50Um93cyhpbnQmIGV4dHJhTG9naWNhbEhlaWdodCwgaW50IHRvdGFsUGVyY2VudCkKIHsK ICAgICBpZiAoIXRvdGFsUGVyY2VudCkKLSAgICAgICAgcmV0dXJuIGV4dHJhTG9naWNhbEhlaWdo dDsKKyAgICAgICAgcmV0dXJuOwogCiAgICAgdW5zaWduZWQgdG90YWxSb3dzID0gbV9ncmlkLnNp emUoKTsKICAgICBpbnQgdG90YWxIZWlnaHQgPSBtX3Jvd1Bvc1t0b3RhbFJvd3NdICsgZXh0cmFM b2dpY2FsSGVpZ2h0OwotICAgIGludCBhZGQgPSAwOworICAgIGludCB0b3RhbExvZ2ljYWxIZWln aHRBZGRlZCA9IDA7CiAgICAgdG90YWxQZXJjZW50ID0gbWluKHRvdGFsUGVyY2VudCwgMTAwKTsK ICAgICBpbnQgcm93SGVpZ2h0ID0gbV9yb3dQb3NbMV0gLSBtX3Jvd1Bvc1swXTsKICAgICBmb3Ig KHVuc2lnbmVkIHIgPSAwOyByIDwgdG90YWxSb3dzOyArK3IpIHsKQEAgLTQ0MCw1NiArNDQwLDU0 IEBAIGludCBSZW5kZXJUYWJsZVNlY3Rpb246OmRpc3RyaWJ1dGVFeHRyYUxvZ2ljYWxIZWlnaHRU b1BlcmNlbnRSb3dzKGludCBleHRyYUxvZ2ljCiAgICAgICAgICAgICAvLyBJZiB0b0FkZCBpcyBu ZWdhdGl2ZSwgdGhlbiB3ZSBkb24ndCB3YW50IHRvIHNocmluayB0aGUgcm93ICh0aGlzIGJ1Zwog ICAgICAgICAgICAgLy8gYWZmZWN0ZWQgT3V0bG9vayBXZWIgQWNjZXNzKS4KICAgICAgICAgICAg IHRvQWRkID0gbWF4KDAsIHRvQWRkKTsKLSAgICAgICAgICAgIGFkZCArPSB0b0FkZDsKKyAgICAg ICAgICAgIHRvdGFsTG9naWNhbEhlaWdodEFkZGVkICs9IHRvQWRkOwogICAgICAgICAgICAgZXh0 cmFMb2dpY2FsSGVpZ2h0IC09IHRvQWRkOwogICAgICAgICAgICAgdG90YWxQZXJjZW50IC09IG1f Z3JpZFtyXS5sb2dpY2FsSGVpZ2h0LnBlcmNlbnQoKTsKICAgICAgICAgfQogICAgICAgICBBU1NF UlQodG90YWxSb3dzID49IDEpOwogICAgICAgICBpZiAociA8IHRvdGFsUm93cyAtIDEpCiAgICAg ICAgICAgICByb3dIZWlnaHQgPSBtX3Jvd1Bvc1tyICsgMl0gLSBtX3Jvd1Bvc1tyICsgMV07Ci0g ICAgICAgIG1fcm93UG9zW3IgKyAxXSArPSBhZGQ7CisgICAgICAgIG1fcm93UG9zW3IgKyAxXSAr PSB0b3RhbExvZ2ljYWxIZWlnaHRBZGRlZDsKICAgICB9Ci0gICAgcmV0dXJuIGV4dHJhTG9naWNh bEhlaWdodDsKIH0KIAotaW50IFJlbmRlclRhYmxlU2VjdGlvbjo6ZGlzdHJpYnV0ZUV4dHJhTG9n aWNhbEhlaWdodFRvQXV0b1Jvd3MoaW50IGV4dHJhTG9naWNhbEhlaWdodCwgdW5zaWduZWQgYXV0 b1Jvd3NDb3VudCkKK3ZvaWQgUmVuZGVyVGFibGVTZWN0aW9uOjpkaXN0cmlidXRlRXh0cmFMb2dp Y2FsSGVpZ2h0VG9BdXRvUm93cyhpbnQmIGV4dHJhTG9naWNhbEhlaWdodCwgdW5zaWduZWQgYXV0 b1Jvd3NDb3VudCkKIHsKICAgICBpZiAoIWF1dG9Sb3dzQ291bnQpCi0gICAgICAgIHJldHVybiBl eHRyYUxvZ2ljYWxIZWlnaHQ7CisgICAgICAgIHJldHVybjsKIAotICAgIGludCBhZGQgPSAwOwor ICAgIGludCB0b3RhbExvZ2ljYWxIZWlnaHRBZGRlZCA9IDA7CiAgICAgZm9yICh1bnNpZ25lZCBy ID0gMDsgciA8IG1fZ3JpZC5zaXplKCk7ICsrcikgewogICAgICAgICBpZiAoYXV0b1Jvd3NDb3Vu dCA+IDAgJiYgbV9ncmlkW3JdLmxvZ2ljYWxIZWlnaHQuaXNBdXRvKCkpIHsKICAgICAgICAgICAg IC8vIFJlY29tcHV0aW5nIHxleHRyYUxvZ2ljYWxIZWlnaHRGb3JSb3d8IGd1YXJhbnRlZXMgdGhh dCB3ZSBwcm9wZXJseSBkaXRyaWJ1dGUgcm91bmQgfGV4dHJhTG9naWNhbEhlaWdodHwuCiAgICAg ICAgICAgICBpbnQgZXh0cmFMb2dpY2FsSGVpZ2h0Rm9yUm93ID0gZXh0cmFMb2dpY2FsSGVpZ2h0 IC8gYXV0b1Jvd3NDb3VudDsKLSAgICAgICAgICAgIGFkZCArPSBleHRyYUxvZ2ljYWxIZWlnaHRG b3JSb3c7CisgICAgICAgICAgICB0b3RhbExvZ2ljYWxIZWlnaHRBZGRlZCArPSBleHRyYUxvZ2lj YWxIZWlnaHRGb3JSb3c7CiAgICAgICAgICAgICBleHRyYUxvZ2ljYWxIZWlnaHQgLT0gZXh0cmFM b2dpY2FsSGVpZ2h0Rm9yUm93OwogICAgICAgICAgICAgLS1hdXRvUm93c0NvdW50OwogICAgICAg ICB9Ci0gICAgICAgIG1fcm93UG9zW3IgKyAxXSArPSBhZGQ7CisgICAgICAgIG1fcm93UG9zW3Ig KyAxXSArPSB0b3RhbExvZ2ljYWxIZWlnaHRBZGRlZDsKICAgICB9Ci0gICAgcmV0dXJuIGV4dHJh TG9naWNhbEhlaWdodDsKIH0KIAotaW50IFJlbmRlclRhYmxlU2VjdGlvbjo6ZGlzdHJpYnV0ZVJl bWFpbmluZ0V4dHJhTG9naWNhbEhlaWdodChpbnQgZXh0cmFMb2dpY2FsSGVpZ2h0KQordm9pZCBS ZW5kZXJUYWJsZVNlY3Rpb246OmRpc3RyaWJ1dGVSZW1haW5pbmdFeHRyYUxvZ2ljYWxIZWlnaHQo aW50JiBleHRyYUxvZ2ljYWxIZWlnaHQpCiB7CiAgICAgdW5zaWduZWQgdG90YWxSb3dzID0gbV9n cmlkLnNpemUoKTsKIAogICAgIGlmIChleHRyYUxvZ2ljYWxIZWlnaHQgPD0gMCB8fCAhbV9yb3dQ b3NbdG90YWxSb3dzXSkKLSAgICAgICAgcmV0dXJuIGV4dHJhTG9naWNhbEhlaWdodDsKKyAgICAg ICAgcmV0dXJuOwogCiAgICAgLy8gRklYTUU6IG1fcm93UG9zW3RvdGFsUm93c10gLSBtX3Jvd1Bv c1swXSBpcyB0aGUgdG90YWwgcm93cycgc2l6ZS4KICAgICBpbnQgdG90YWxSb3dTaXplID0gbV9y b3dQb3NbdG90YWxSb3dzXTsKLSAgICBpbnQgYWRkID0gMDsKKyAgICBpbnQgdG90YWxMb2dpY2Fs SGVpZ2h0QWRkZWQgPSAwOwogICAgIGludCBwcmV2aW91c1Jvd1Bvc2l0aW9uID0gbV9yb3dQb3Nb MF07CiAgICAgZm9yICh1bnNpZ25lZCByID0gMDsgciA8IHRvdGFsUm93czsgcisrKSB7CiAgICAg ICAgIC8vIHdlaWdodCB3aXRoIHRoZSBvcmlnaW5hbCBoZWlnaHQKLSAgICAgICAgYWRkICs9IGV4 dHJhTG9naWNhbEhlaWdodCAqIChtX3Jvd1Bvc1tyICsgMV0gLSBwcmV2aW91c1Jvd1Bvc2l0aW9u KSAvIHRvdGFsUm93U2l6ZTsKKyAgICAgICAgdG90YWxMb2dpY2FsSGVpZ2h0QWRkZWQgKz0gZXh0 cmFMb2dpY2FsSGVpZ2h0ICogKG1fcm93UG9zW3IgKyAxXSAtIHByZXZpb3VzUm93UG9zaXRpb24p IC8gdG90YWxSb3dTaXplOwogICAgICAgICBwcmV2aW91c1Jvd1Bvc2l0aW9uID0gbV9yb3dQb3Nb ciArIDFdOwotICAgICAgICBtX3Jvd1Bvc1tyICsgMV0gKz0gYWRkOworICAgICAgICBtX3Jvd1Bv c1tyICsgMV0gKz0gdG90YWxMb2dpY2FsSGVpZ2h0QWRkZWQ7CiAgICAgfQogCi0gICAgcmV0dXJu IGV4dHJhTG9naWNhbEhlaWdodDsKKyAgICBleHRyYUxvZ2ljYWxIZWlnaHQgLT0gdG90YWxMb2dp Y2FsSGVpZ2h0QWRkZWQ7CiB9CiAKIGludCBSZW5kZXJUYWJsZVNlY3Rpb246OmRpc3RyaWJ1dGVF eHRyYUxvZ2ljYWxIZWlnaHRUb1Jvd3MoaW50IGV4dHJhTG9naWNhbEhlaWdodCkKQEAgLTUxNCwx MCArNTEyLDEwIEBAIGludCBSZW5kZXJUYWJsZVNlY3Rpb246OmRpc3RyaWJ1dGVFeHRyYUxvZ2lj YWxIZWlnaHRUb1Jvd3MoaW50IGV4dHJhTG9naWNhbEhlaWdoCiAgICAgfQogCiAgICAgaW50IHJl bWFpbmluZ0V4dHJhTG9naWNhbEhlaWdodCA9IGV4dHJhTG9naWNhbEhlaWdodDsKLSAgICByZW1h aW5pbmdFeHRyYUxvZ2ljYWxIZWlnaHQgPSBkaXN0cmlidXRlRXh0cmFMb2dpY2FsSGVpZ2h0VG9Q ZXJjZW50Um93cyhyZW1haW5pbmdFeHRyYUxvZ2ljYWxIZWlnaHQsIHRvdGFsUGVyY2VudCk7Ci0g ICAgcmVtYWluaW5nRXh0cmFMb2dpY2FsSGVpZ2h0ID0gZGlzdHJpYnV0ZUV4dHJhTG9naWNhbEhl aWdodFRvQXV0b1Jvd3MocmVtYWluaW5nRXh0cmFMb2dpY2FsSGVpZ2h0LCBhdXRvUm93c0NvdW50 KTsKLSAgICByZW1haW5pbmdFeHRyYUxvZ2ljYWxIZWlnaHQgPSBkaXN0cmlidXRlUmVtYWluaW5n RXh0cmFMb2dpY2FsSGVpZ2h0KHJlbWFpbmluZ0V4dHJhTG9naWNhbEhlaWdodCk7Ci0gICAgcmV0 dXJuIHJlbWFpbmluZ0V4dHJhTG9naWNhbEhlaWdodDsKKyAgICBkaXN0cmlidXRlRXh0cmFMb2dp Y2FsSGVpZ2h0VG9QZXJjZW50Um93cyhyZW1haW5pbmdFeHRyYUxvZ2ljYWxIZWlnaHQsIHRvdGFs UGVyY2VudCk7CisgICAgZGlzdHJpYnV0ZUV4dHJhTG9naWNhbEhlaWdodFRvQXV0b1Jvd3MocmVt YWluaW5nRXh0cmFMb2dpY2FsSGVpZ2h0LCBhdXRvUm93c0NvdW50KTsKKyAgICBkaXN0cmlidXRl UmVtYWluaW5nRXh0cmFMb2dpY2FsSGVpZ2h0KHJlbWFpbmluZ0V4dHJhTG9naWNhbEhlaWdodCk7 CisgICAgcmV0dXJuIGV4dHJhTG9naWNhbEhlaWdodCAtIHJlbWFpbmluZ0V4dHJhTG9naWNhbEhl aWdodDsKIH0KIAogdm9pZCBSZW5kZXJUYWJsZVNlY3Rpb246OmxheW91dFJvd3MoKQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRhYmxlU2VjdGlvbi5oIGIvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRhYmxlU2VjdGlvbi5oCmluZGV4IGVhOWVhYTcz NTZiZDNkYWM0ZmIxYjM1NjIxM2I2YzJlYWM3MDkwYjEuLjljNjg2OWQ0ZDYzMTJkYzhlODFmODkx MzBhZDk1ZWUzZWVhMDQzMjMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJUYWJsZVNlY3Rpb24uaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy VGFibGVTZWN0aW9uLmgKQEAgLTE1OCw3ICsxNTgsNyBAQCBwdWJsaWM6CiAgICAgdm9pZCBzZXRD YWNoZWRDb2xsYXBzZWRCb3JkZXIoY29uc3QgUmVuZGVyVGFibGVDZWxsKiwgQ29sbGFwc2VkQm9y ZGVyU2lkZSwgQ29sbGFwc2VkQm9yZGVyVmFsdWUpOwogICAgIENvbGxhcHNlZEJvcmRlclZhbHVl JiBjYWNoZWRDb2xsYXBzZWRCb3JkZXIoY29uc3QgUmVuZGVyVGFibGVDZWxsKiwgQ29sbGFwc2Vk Qm9yZGVyU2lkZSk7CiAKLSAgICAvLyBkaXN0cmlidXRlRXh0cmFMb2dpY2FsSGVpZ2h0KiBtZXRo b2RzIHJldHVybiB0aGUgcmVtYWluaW5nIGV4dHJhIGxvZ2ljYWwgaGVpZ2h0LgorICAgIC8vIGRp c3RyaWJ1dGVFeHRyYUxvZ2ljYWxIZWlnaHRUb1Jvd3MgbWV0aG9kcyByZXR1cm4gdGhlICpjb25z dW1lZCogZXh0cmEgbG9naWNhbCBoZWlnaHQuCiAgICAgLy8gRklYTUU6IFdlIG1heSB3YW50IHRv IGludHJvZHVjZSBhIHN0cnVjdHVyZSBob2xkaW5nIHRoZSBpbi1mbHV4IGxheW91dCBpbmZvcm1h dGlvbi4KICAgICBpbnQgZGlzdHJpYnV0ZUV4dHJhTG9naWNhbEhlaWdodFRvUm93cyhpbnQgZXh0 cmFMb2dpY2FsSGVpZ2h0KTsKIApAQCAtMTg5LDkgKzE4OSw5IEBAIHByaXZhdGU6CiAKICAgICB2 b2lkIGVuc3VyZVJvd3ModW5zaWduZWQpOwogCi0gICAgaW50IGRpc3RyaWJ1dGVFeHRyYUxvZ2lj YWxIZWlnaHRUb1BlcmNlbnRSb3dzKGludCBleHRyYUxvZ2ljYWxIZWlnaHQsIGludCB0b3RhbFBl cmNlbnQpOwotICAgIGludCBkaXN0cmlidXRlRXh0cmFMb2dpY2FsSGVpZ2h0VG9BdXRvUm93cyhp bnQgZXh0cmFMb2dpY2FsSGVpZ2h0LCB1bnNpZ25lZCBhdXRvUm93c0NvdW50KTsKLSAgICBpbnQg ZGlzdHJpYnV0ZVJlbWFpbmluZ0V4dHJhTG9naWNhbEhlaWdodChpbnQgZXh0cmFMb2dpY2FsSGVp Z2h0KTsKKyAgICB2b2lkIGRpc3RyaWJ1dGVFeHRyYUxvZ2ljYWxIZWlnaHRUb1BlcmNlbnRSb3dz KGludCYgZXh0cmFMb2dpY2FsSGVpZ2h0LCBpbnQgdG90YWxQZXJjZW50KTsKKyAgICB2b2lkIGRp c3RyaWJ1dGVFeHRyYUxvZ2ljYWxIZWlnaHRUb0F1dG9Sb3dzKGludCYgZXh0cmFMb2dpY2FsSGVp Z2h0LCB1bnNpZ25lZCBhdXRvUm93c0NvdW50KTsKKyAgICB2b2lkIGRpc3RyaWJ1dGVSZW1haW5p bmdFeHRyYUxvZ2ljYWxIZWlnaHQoaW50JiBleHRyYUxvZ2ljYWxIZWlnaHQpOwogCiAgICAgYm9v bCBoYXNPdmVyZmxvd2luZ0NlbGwoKSBjb25zdCB7IHJldHVybiBtX292ZXJmbG93aW5nQ2VsbHMu c2l6ZSgpIHx8IG1fZm9yY2VTbG93UGFpbnRQYXRoV2l0aE92ZXJmbG93aW5nQ2VsbDsgfQogCg==