36282 2010-03-17 20:33:17 -0700 CSS3 "Property is declared twice in rule" test fails 2011-01-31 19:45:25 -0800 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) All OS X 10.5 RESOLVED FIXED http://samples.msdn.microsoft.com/ietestcenter/domstyle/duplicateRule.htm P2 Normal --- 53470 1 simon.fraser webkit-unassigned abarth dglazkov eric hyatt jamesr kling rwlbuis webkit.review.bot oldest_to_newest 201168 0 simon.fraser 2010-03-17 20:33:17 -0700 This test fails: http://samples.msdn.microsoft.com/ietestcenter/domstyle/duplicateRule.htm 234723 1 57994 rwlbuis 2010-06-06 23:36:21 -0700 Created attachment 57994 Patch 234724 2 webkit.review.bot 2010-06-06 23:37:44 -0700 Attachment 57994 did not pass style-queue: Failed to run "['WebKitTools/Scripts/check-webkit-style', '--no-squash']" exit_code: 1 WebCore/css/CSSMutableStyleDeclaration.cpp:90: Missing space before ( in if( [whitespace/parens] [5] Total errors found: 1 in 5 files If any of these errors are false positives, please file a bug against check-webkit-style. 234726 3 rwlbuis 2010-06-06 23:43:16 -0700 (In reply to comment #1) > Created an attachment (id=57994) [details] > Patch This is just a first stab and at least has one style problem. I uploaded it anyway to get some early feedback. If I understand it correctly, earlier !important properties should not be removed, hence the check. However additionaly there seems a problem with how to treat padding. One of the failing cases was padding: 5em; padding: -1em. Before my patch -1em was discarded so 5em "won" hence the test passing. With my patch 5em is removed and later on -1em is discarded. When I inspect this rule in Opera, it doesn't even mention the -1em, so I am guessing there it is stripped out in the css parsing phase. Since I would not like special casing CSSPaddingProperty (and there may be even more exceptions) I am not sure how to fix that. Should we try to discard negative padding earlier? Will that cause problems with other testcases? Cheers, Rob. 239500 4 59022 rwlbuis 2010-06-17 11:31:52 -0700 Created attachment 59022 Patch 239504 5 rwlbuis 2010-06-17 11:40:17 -0700 (In reply to comment #4) > Created an attachment (id=59022) [details] > Patch Some clarification, I had to change the padding handling to discard negative padding earlier, i.e. when parsing instead of only at style selection time. The reason is that the duplicate property filtering should not have the knowledge to discard negative padding. The filtering could maybe be put in a private method that can be reused, I'll have to look in the similar FIXME spot and another place in CSSMutableStyleDeclration.cpp that seems to do filtering. I didnt try to make the filtering as fast as possible yet, it seems to me it will always be a bit slower than the current code, otoh I assume duplicate properties are rare. What I assume may need to be done is adding tests, I have some ideas for that but suggestions are welcome. The patch does not cause new regressions. Cheers, Rob. 239518 6 59022 hyatt 2010-06-17 12:02:32 -0700 Comment on attachment 59022 Patch This looks good. You did the right thing letting variable-dependent values have duplicates too. :) 239549 7 jamesr 2010-06-17 13:17:52 -0700 Looks like the patch broke these tests: editing/pasteboard/5478250.html editing/selection/extend-by-word-002.html editing/style/smoosh-styles-003.html on the OS X, Qt, and chromium layout test bots. 239554 8 dglazkov 2010-06-17 13:28:11 -0700 Reverted r61340 for reason: Broke several editing tests. Committed r61345: <http://trac.webkit.org/changeset/61345> 239563 9 jamesr 2010-06-17 14:03:14 -0700 We chatted on IRC, looks like the problem is that this patch discards negative text indents as well as negative padding, which is wrong. Rob said he'd fix it tomorrow and put the patch back up (it looks pretty straightforward). 239564 10 webkit.review.bot 2010-06-17 14:13:07 -0700 http://trac.webkit.org/changeset/61345 might have broken GTK Linux 32-bit Release The following changes are on the blame list: http://trac.webkit.org/changeset/61344 http://trac.webkit.org/changeset/61345 http://trac.webkit.org/changeset/61340 239565 11 webkit.review.bot 2010-06-17 14:13:14 -0700 http://trac.webkit.org/changeset/61340 might have broken Tiger Intel Release, Leopard Intel Release (Tests), and Leopard Intel Debug (Tests) The following changes are on the blame list: http://trac.webkit.org/changeset/61344 http://trac.webkit.org/changeset/61345 http://trac.webkit.org/changeset/61340 267794 12 rwlbuis 2010-08-23 01:31:52 -0700 This was ultimately fixed with this change: http://trac.webkit.org/changeset/61383 Sorry for keeping this unresolved for so long! Cheers, Rob. 57994 2010-06-06 23:36:21 -0700 2010-06-17 11:31:45 -0700 Patch bug-36282-20100607083852.patch text/plain 4125 rwlbuis ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA2ODcxYmEzZTlhMWJmOThhNTZlZjQwY2VlYTZjY2JiNDQ0YTJiNDE0Li40MzM2OTBl Nzk1ZGRlZDA4ZGFhYjQ2YTkwN2RlMDI2ZWQ4MGY3ZjdiIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAK KzIwMTAtMDYtMDYgIFJvYiBCdWlzICA8cndsYnVpc0BnbWFpbC5jb20+CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGVzdCBmb3IKKyAgICAgICAgQ1NT MyAiUHJvcGVydHkgaXMgZGVjbGFyZWQgdHdpY2UgaW4gcnVsZSIgdGVzdCBmYWlscworICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzYyODIKKworICAgICAg ICAqIGZhc3QvY3NzL2R1cGxpY2F0ZS1wcm9wZXJ0eS1pbi1ydWxlLWV4cGVjdGVkLnR4dDogQWRk ZWQuCisgICAgICAgICogZmFzdC9jc3MvZHVwbGljYXRlLXByb3BlcnR5LWluLXJ1bGUuaHRtbDog QWRkZWQuCisKIDIwMTAtMDYtMDUgIEpvbmF0aGFuIEtsaWVnbWFuICA8a2xpZWdzQGNocm9taXVt Lm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBEaXJrIFNjaHVsemUuCmRpZmYgLS1naXQgYS9M YXlvdXRUZXN0cy9mYXN0L2Nzcy9kdXBsaWNhdGUtcHJvcGVydHktaW4tcnVsZS1leHBlY3RlZC50 eHQgYi9MYXlvdXRUZXN0cy9mYXN0L2Nzcy9kdXBsaWNhdGUtcHJvcGVydHktaW4tcnVsZS1leHBl Y3RlZC50eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMC4uYmU4MjkzN2FiZDk0ZjFlMTc3NWI3ZjFkNWZmMDUwNjRjNzQ1 NWUyYQotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvY3NzL2R1cGxpY2F0ZS1w cm9wZXJ0eS1pbi1ydWxlLWV4cGVjdGVkLnR4dApAQCAtMCwwICsxLDIgQEAKK1RoaXMgdGV4dCBz aG91bGQgYmUgZ3JlZW4gYW5kIHRoZSBwYWdlIHNob3VsZCBoYXZlIG5vIG90aGVyIHN0eWxlLgor UGFzcwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9jc3MvZHVwbGljYXRlLXByb3BlcnR5 LWluLXJ1bGUuaHRtbCBiL0xheW91dFRlc3RzL2Zhc3QvY3NzL2R1cGxpY2F0ZS1wcm9wZXJ0eS1p bi1ydWxlLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uNjg5YmJlMzJkNWU1YmNjYmEzMTY4ODZhMDViNWRmMzVm MmI1M2QwNAotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvY3NzL2R1cGxpY2F0 ZS1wcm9wZXJ0eS1pbi1ydWxlLmh0bWwKQEAgLTAsMCArMSwyNiBAQAorPGh0bWw+CisgICAgPGhl YWQ+CisgICAgICAgIDx0aXRsZT5Qcm9wZXJ0eSBpcyBkZWNsYXJlZCB0d2ljZSBpbiBydWxlPC90 aXRsZT4KKyAgICAgICAgPHN0eWxlIHR5cGU9InRleHQvY3NzIj4KKyAgICAgICAgICAgIGRpdgor ICAgICAgICAgICAgeworICAgICAgICAgICAgICAgIGNvbG9yOiByZWQ7CisgICAgICAgICAgICAg ICAgY29sb3I6IGdyZWVuOworICAgICAgICAgICAgfQorICAgICAgICA8L3N0eWxlPgorICAgIDxz Y3JpcHQ+CisgICAgaWYgKHdpbmRvdy5sYXlvdXRUZXN0Q29udHJvbGxlcikKKyAgICAgICAgd2lu ZG93LmxheW91dFRlc3RDb250cm9sbGVyLmR1bXBBc1RleHQoKTsKKyAgICA8L3NjcmlwdD4KKyAg ICA8L2hlYWQ+CisgICAgPGJvZHk+CisgICAgICAgIDxkaXY+VGhpcyB0ZXh0IHNob3VsZCBiZSBn cmVlbiBhbmQgdGhlIHBhZ2Ugc2hvdWxkIGhhdmUgbm8gb3RoZXIgc3R5bGUuPC9kaXY+CisgICAg ICAgIDxkaXYgaWQ9InRlc3RyZXN1bHQiPkZhaWw8L2Rpdj4KKyAgICAgICAgPHNjcmlwdCB0eXBl PSJ0ZXh0L2phdmFzY3JpcHQiPgorICAgICAgICAgICAgaWYoZG9jdW1lbnQuc3R5bGVTaGVldHNb MF0uY3NzUnVsZXNbMF0uc3R5bGUubGVuZ3RoID09IDEpCisgICAgICAgICAgICB7CisgICAgICAg ICAgICAgICAgZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoInRlc3RyZXN1bHQiKS5pbm5lckhUTUwg PSAiUGFzcyI7CisgICAgICAgICAgICB9CisgICAgICAgIDwvc2NyaXB0PgorICAgIDwvYm9keT4K KzwvaHRtbD4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VM b2cKaW5kZXggNTUzMDZmZDU3MWY0MjQ4ZjBlZjIxOTM5ZDY1YzU3ZGVhYzgwMDU1Ny4uZjEwZTg1 OTQ5YjRhMmQwNTFmYjJkMWQwMGQ3NTMxNjQ0Y2U3YjhlZiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9D aGFuZ2VMb2cKKysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAxMC0w Ni0wNiAgUm9iIEJ1aXMgIDxyd2xidWlzQGdtYWlsLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBDU1MzICJQcm9wZXJ0eSBpcyBkZWNsYXJlZCB0 d2ljZSBpbiBydWxlIiB0ZXN0IGZhaWxzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0zNjI4MgorCisgICAgICAgIEZpbHRlciBvdXQgZHVwbGljYXRlIHBy b3BlcnRpZXMgaW4gc3R5bGUgZGVjbGFyYXRpb24uCisKKyAgICAgICAgVGVzdDogZmFzdC9jc3Mv ZHVwbGljYXRlLXByb3BlcnR5LWluLXJ1bGUuaHRtbAorCisgICAgICAgICogY3NzL0NTU011dGFi bGVTdHlsZURlY2xhcmF0aW9uLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNTU011dGFibGVTdHls ZURlY2xhcmF0aW9uOjpDU1NNdXRhYmxlU3R5bGVEZWNsYXJhdGlvbik6CisKIDIwMTAtMDUtMzAg IEFudG9uaW8gR29tZXMgIDx0b25pa2l0b29Ad2Via2l0Lm9yZz4KIAogICAgICAgICBSZXZpZXdl ZCBieSBEYXJpbiBBZGxlci4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvY3NzL0NTU011dGFibGVTdHls ZURlY2xhcmF0aW9uLmNwcCBiL1dlYkNvcmUvY3NzL0NTU011dGFibGVTdHlsZURlY2xhcmF0aW9u LmNwcAppbmRleCA0NGUwYjE3MWI1OGZmZGViZWYzMTgzODYxM2VmMGVlYWI0ZDZjYWI5Li42NWUx ZTI5NjFmMGUxNDc4NDM3MDUwMDAwMWE4ZDU0ZjQ5ODBiMWMyIDEwMDY0NAotLS0gYS9XZWJDb3Jl L2Nzcy9DU1NNdXRhYmxlU3R5bGVEZWNsYXJhdGlvbi5jcHAKKysrIGIvV2ViQ29yZS9jc3MvQ1NT TXV0YWJsZVN0eWxlRGVjbGFyYXRpb24uY3BwCkBAIC04MiwxMyArODIsMTcgQEAgQ1NTTXV0YWJs ZVN0eWxlRGVjbGFyYXRpb246OkNTU011dGFibGVTdHlsZURlY2xhcmF0aW9uKENTU1J1bGUqIHBh cmVudCwgY29uc3QgQ1MKICNlbmRpZgogewogICAgIG1fcHJvcGVydGllcy5yZXNlcnZlSW5pdGlh bENhcGFjaXR5KG51bVByb3BlcnRpZXMpOworICAgIEhhc2hTZXQ8aW50PiBjYW5kaWRhdGVzOwog ICAgIGZvciAoaW50IGkgPSAwOyBpIDwgbnVtUHJvcGVydGllczsgKytpKSB7CiAgICAgICAgIEFT U0VSVChwcm9wZXJ0aWVzW2ldKTsKLSAgICAgICAgbV9wcm9wZXJ0aWVzLmFwcGVuZCgqcHJvcGVy dGllc1tpXSk7CiAgICAgICAgIGlmIChwcm9wZXJ0aWVzW2ldLT52YWx1ZSgpLT5pc1ZhcmlhYmxl RGVwZW5kZW50VmFsdWUoKSkKICAgICAgICAgICAgIG1fdmFyaWFibGVEZXBlbmRlbnRWYWx1ZUNv dW50Kys7CisgICAgICAgIGVsc2UgaWYoY2FuZGlkYXRlcy5jb250YWlucyhwcm9wZXJ0aWVzW2ld LT5pZCgpKSkKKyAgICAgICAgICAgIHJlbW92ZVByb3BlcnR5KHByb3BlcnRpZXNbaV0tPmlkKCks IGZhbHNlKTsKKyAgICAgICAgbV9wcm9wZXJ0aWVzLmFwcGVuZCgqcHJvcGVydGllc1tpXSk7Cisg ICAgICAgIGlmICghZ2V0UHJvcGVydHlQcmlvcml0eShwcm9wZXJ0aWVzW2ldLT5pZCgpKSAmJiAh cHJvcGVydGllc1tpXS0+aXNJbXBvcnRhbnQoKSkKKyAgICAgICAgICAgIGNhbmRpZGF0ZXMuYWRk KHByb3BlcnRpZXNbaV0tPmlkKCkpOwogICAgIH0KLSAgICAvLyBGSVhNRTogVGhpcyBhbGxvd3Mg ZHVwbGljYXRlIHByb3BlcnRpZXMuCiB9CiAKIENTU011dGFibGVTdHlsZURlY2xhcmF0aW9uJiBD U1NNdXRhYmxlU3R5bGVEZWNsYXJhdGlvbjo6b3BlcmF0b3I9KGNvbnN0IENTU011dGFibGVTdHls ZURlY2xhcmF0aW9uJiBvdGhlcikK 59022 2010-06-17 11:31:52 -0700 2010-06-17 12:02:32 -0700 Patch bug-36282-20100617203431.patch text/plain 6075 rwlbuis ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCAyNzZlOWQyZGJhOGIyOWIxMWEzMDEzYzAwMmVkMGU4N2QxYjAyNGI4Li4xZjdmYTcx MDJiZmU5ZmFhYzdlMmQ2NGI3YTJhNWIxMjE0ZTM5NmQ0IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAK KzIwMTAtMDYtMTcgIFJvYiBCdWlzICA8cndsYnVpc0BnbWFpbC5jb20+CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGVzdCBmb3IKKyAgICAgICAgQ1NT MyAiUHJvcGVydHkgaXMgZGVjbGFyZWQgdHdpY2UgaW4gcnVsZSIgdGVzdCBmYWlscworICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzYyODIKKworICAgICAg ICAqIGZhc3QvY3NzL2R1cGxpY2F0ZS1wcm9wZXJ0eS1pbi1ydWxlLWV4cGVjdGVkLnR4dDogQWRk ZWQuCisgICAgICAgICogZmFzdC9jc3MvZHVwbGljYXRlLXByb3BlcnR5LWluLXJ1bGUuaHRtbDog QWRkZWQuCisKIDIwMTAtMDYtMTYgIEVyaWMgU2VpZGVsICA8ZXJpY0B3ZWJraXQub3JnPgogCiAg ICAgICAgIFVucmV2aWV3ZWQuICBEaXNhYmxpbmcgYSB0ZXN0IHdoaWNoIGZhaWxzIG9uIFRpZ2Vy IGZvciBwbGF0Zm9ybS1zcGVjaWZpYyBkZWNvZGluZyByZWFzb25zLgpkaWZmIC0tZ2l0IGEvTGF5 b3V0VGVzdHMvZmFzdC9jc3MvZHVwbGljYXRlLXByb3BlcnR5LWluLXJ1bGUtZXhwZWN0ZWQudHh0 IGIvTGF5b3V0VGVzdHMvZmFzdC9jc3MvZHVwbGljYXRlLXByb3BlcnR5LWluLXJ1bGUtZXhwZWN0 ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAuLmJlODI5MzdhYmQ5NGYxZTE3NzViN2YxZDVmZjA1MDY0Yzc0NTVl MmEKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L2Nzcy9kdXBsaWNhdGUtcHJv cGVydHktaW4tcnVsZS1leHBlY3RlZC50eHQKQEAgLTAsMCArMSwyIEBACitUaGlzIHRleHQgc2hv dWxkIGJlIGdyZWVuIGFuZCB0aGUgcGFnZSBzaG91bGQgaGF2ZSBubyBvdGhlciBzdHlsZS4KK1Bh c3MKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvY3NzL2R1cGxpY2F0ZS1wcm9wZXJ0eS1p bi1ydWxlLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L2Nzcy9kdXBsaWNhdGUtcHJvcGVydHktaW4t cnVsZS5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAuLjY4OWJiZTMyZDVlNWJjY2JhMzE2ODg2YTA1YjVkZjM1ZjJi NTNkMDQKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L2Nzcy9kdXBsaWNhdGUt cHJvcGVydHktaW4tcnVsZS5odG1sCkBAIC0wLDAgKzEsMjYgQEAKKzxodG1sPgorICAgIDxoZWFk PgorICAgICAgICA8dGl0bGU+UHJvcGVydHkgaXMgZGVjbGFyZWQgdHdpY2UgaW4gcnVsZTwvdGl0 bGU+CisgICAgICAgIDxzdHlsZSB0eXBlPSJ0ZXh0L2NzcyI+CisgICAgICAgICAgICBkaXYKKyAg ICAgICAgICAgIHsKKyAgICAgICAgICAgICAgICBjb2xvcjogcmVkOworICAgICAgICAgICAgICAg IGNvbG9yOiBncmVlbjsKKyAgICAgICAgICAgIH0KKyAgICAgICAgPC9zdHlsZT4KKyAgICA8c2Ny aXB0PgorICAgIGlmICh3aW5kb3cubGF5b3V0VGVzdENvbnRyb2xsZXIpCisgICAgICAgIHdpbmRv dy5sYXlvdXRUZXN0Q29udHJvbGxlci5kdW1wQXNUZXh0KCk7CisgICAgPC9zY3JpcHQ+CisgICAg PC9oZWFkPgorICAgIDxib2R5PgorICAgICAgICA8ZGl2PlRoaXMgdGV4dCBzaG91bGQgYmUgZ3Jl ZW4gYW5kIHRoZSBwYWdlIHNob3VsZCBoYXZlIG5vIG90aGVyIHN0eWxlLjwvZGl2PgorICAgICAg ICA8ZGl2IGlkPSJ0ZXN0cmVzdWx0Ij5GYWlsPC9kaXY+CisgICAgICAgIDxzY3JpcHQgdHlwZT0i dGV4dC9qYXZhc2NyaXB0Ij4KKyAgICAgICAgICAgIGlmKGRvY3VtZW50LnN0eWxlU2hlZXRzWzBd LmNzc1J1bGVzWzBdLnN0eWxlLmxlbmd0aCA9PSAxKQorICAgICAgICAgICAgeworICAgICAgICAg ICAgICAgIGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJ0ZXN0cmVzdWx0IikuaW5uZXJIVE1MID0g IlBhc3MiOworICAgICAgICAgICAgfQorICAgICAgICA8L3NjcmlwdD4KKyAgICA8L2JvZHk+Cis8 L2h0bWw+CmRpZmYgLS1naXQgYS9XZWJDb3JlL0NoYW5nZUxvZyBiL1dlYkNvcmUvQ2hhbmdlTG9n CmluZGV4IGJkMWQxMjhkZDFlMjVmYTU4YjcwODczZWNkM2EwY2VjYTUxZDdmMjQuLmE0YTFjNTA2 MTYyNzhiNjIxMGFmNTAwOTAyODAyZjEyYzQ5N2RhZjMgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvQ2hh bmdlTG9nCisrKyBiL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEgQEAKKzIwMTAtMDYt MTcgIFJvYiBCdWlzICA8cndsYnVpc0BnbWFpbC5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQ1NTMyAiUHJvcGVydHkgaXMgZGVjbGFyZWQgdHdp Y2UgaW4gcnVsZSIgdGVzdCBmYWlscworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MzYyODIKKworICAgICAgICBGaWx0ZXIgb3V0IGR1cGxpY2F0ZSBwcm9w ZXJ0aWVzIGluIHN0eWxlIGRlY2xhcmF0aW9uLgorCisgICAgICAgIFRlc3Q6IGZhc3QvY3NzL2R1 cGxpY2F0ZS1wcm9wZXJ0eS1pbi1ydWxlLmh0bWwKKworICAgICAgICAqIGNzcy9DU1NNdXRhYmxl U3R5bGVEZWNsYXJhdGlvbi5jcHA6IEZpbHRlciBvdXQgZHVwbGljYXRlIHByb3BlcnRpZXMKKyAg ICAgICAgKFdlYkNvcmU6OkNTU011dGFibGVTdHlsZURlY2xhcmF0aW9uOjpDU1NNdXRhYmxlU3R5 bGVEZWNsYXJhdGlvbik6CisgICAgICAgICogY3NzL0NTU1BhcnNlci5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpDU1NQYXJzZXI6OnBhcnNlVmFsdWUpOiBEaXNjYXJkIG5lZ2F0aXZlIHBhZGRpbmcg dmFsdWVzCisgICAgICAgICogY3NzL0NTU1N0eWxlU2VsZWN0b3IuY3BwOiBSZW1vdmUgbmVnYXRp dmUgcGFkZGluZyBjaGVjaworICAgICAgICAoV2ViQ29yZTo6Q1NTU3R5bGVTZWxlY3Rvcjo6YXBw bHlQcm9wZXJ0eSk6CisKIDIwMTAtMDYtMTYgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUu Y29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoQnVpbGQgZml4IGZvciBNYWMpCmRp ZmYgLS1naXQgYS9XZWJDb3JlL2Nzcy9DU1NNdXRhYmxlU3R5bGVEZWNsYXJhdGlvbi5jcHAgYi9X ZWJDb3JlL2Nzcy9DU1NNdXRhYmxlU3R5bGVEZWNsYXJhdGlvbi5jcHAKaW5kZXggNDRlMGIxNzFi NThmZmRlYmVmMzE4Mzg2MTNlZjBlZWFiNGQ2Y2FiOS4uNDZlYmNhOTRmNTU0NzdkMDlmNmZiYzEz OGI3N2FmOGE0YzYyOTlmZSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9jc3MvQ1NTTXV0YWJsZVN0eWxl RGVjbGFyYXRpb24uY3BwCisrKyBiL1dlYkNvcmUvY3NzL0NTU011dGFibGVTdHlsZURlY2xhcmF0 aW9uLmNwcApAQCAtODIsMTMgKzgyLDE3IEBAIENTU011dGFibGVTdHlsZURlY2xhcmF0aW9uOjpD U1NNdXRhYmxlU3R5bGVEZWNsYXJhdGlvbihDU1NSdWxlKiBwYXJlbnQsIGNvbnN0IENTCiAjZW5k aWYKIHsKICAgICBtX3Byb3BlcnRpZXMucmVzZXJ2ZUluaXRpYWxDYXBhY2l0eShudW1Qcm9wZXJ0 aWVzKTsKKyAgICBIYXNoU2V0PGludD4gY2FuZGlkYXRlczsKICAgICBmb3IgKGludCBpID0gMDsg aSA8IG51bVByb3BlcnRpZXM7ICsraSkgewogICAgICAgICBBU1NFUlQocHJvcGVydGllc1tpXSk7 Ci0gICAgICAgIG1fcHJvcGVydGllcy5hcHBlbmQoKnByb3BlcnRpZXNbaV0pOwogICAgICAgICBp ZiAocHJvcGVydGllc1tpXS0+dmFsdWUoKS0+aXNWYXJpYWJsZURlcGVuZGVudFZhbHVlKCkpCiAg ICAgICAgICAgICBtX3ZhcmlhYmxlRGVwZW5kZW50VmFsdWVDb3VudCsrOworICAgICAgICBlbHNl IGlmIChjYW5kaWRhdGVzLmNvbnRhaW5zKHByb3BlcnRpZXNbaV0tPmlkKCkpKQorICAgICAgICAg ICAgcmVtb3ZlUHJvcGVydHkocHJvcGVydGllc1tpXS0+aWQoKSwgZmFsc2UpOworICAgICAgICBt X3Byb3BlcnRpZXMuYXBwZW5kKCpwcm9wZXJ0aWVzW2ldKTsKKyAgICAgICAgaWYgKCFnZXRQcm9w ZXJ0eVByaW9yaXR5KHByb3BlcnRpZXNbaV0tPmlkKCkpICYmICFwcm9wZXJ0aWVzW2ldLT5pc0lt cG9ydGFudCgpKQorICAgICAgICAgICAgY2FuZGlkYXRlcy5hZGQocHJvcGVydGllc1tpXS0+aWQo KSk7CiAgICAgfQotICAgIC8vIEZJWE1FOiBUaGlzIGFsbG93cyBkdXBsaWNhdGUgcHJvcGVydGll cy4KIH0KIAogQ1NTTXV0YWJsZVN0eWxlRGVjbGFyYXRpb24mIENTU011dGFibGVTdHlsZURlY2xh cmF0aW9uOjpvcGVyYXRvcj0oY29uc3QgQ1NTTXV0YWJsZVN0eWxlRGVjbGFyYXRpb24mIG90aGVy KQpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9jc3MvQ1NTUGFyc2VyLmNwcCBiL1dlYkNvcmUvY3NzL0NT U1BhcnNlci5jcHAKaW5kZXggZjUyOTU2MTBiZjJjNDcwMmE5MTRlZTA4ZDI3MDMwYWI3ZDJjYjli ZS4uZmI1ZTYwZTg2MzI5NzgwZGMxNGQ1NDY1MDdjNzg3ZjNjMWJjZjkzMSAxMDA2NDQKLS0tIGEv V2ViQ29yZS9jc3MvQ1NTUGFyc2VyLmNwcAorKysgYi9XZWJDb3JlL2Nzcy9DU1NQYXJzZXIuY3Bw CkBAIC05ODMsNyArOTgzLDcgQEAgYm9vbCBDU1NQYXJzZXI6OnBhcnNlVmFsdWUoaW50IHByb3BJ ZCwgYm9vbCBpbXBvcnRhbnQpCiAgICAgY2FzZSBDU1NQcm9wZXJ0eVBhZGRpbmdCb3R0b206ICAg ICAgIC8vICAgPGxlbmd0aD4gfCA8cGVyY2VudGFnZT4KICAgICBjYXNlIENTU1Byb3BlcnR5UGFk ZGluZ0xlZnQ6ICAgICAgICAgLy8vLwogICAgIGNhc2UgQ1NTUHJvcGVydHlXZWJraXRQYWRkaW5n U3RhcnQ6Ci0gICAgICAgIHZhbGlkUHJpbWl0aXZlID0gKCFpZCAmJiB2YWxpZFVuaXQodmFsdWUs IEZMZW5ndGggfCBGUGVyY2VudCwgbV9zdHJpY3QpKTsKKyAgICAgICAgdmFsaWRQcmltaXRpdmUg PSAoIWlkICYmIHZhbGlkVW5pdCh2YWx1ZSwgRkxlbmd0aCB8IEZQZXJjZW50IHwgRk5vbk5lZywg bV9zdHJpY3QpKTsKICAgICAgICAgYnJlYWs7CiAKICAgICBjYXNlIENTU1Byb3BlcnR5TWF4SGVp Z2h0OiAgICAgICAgICAgLy8gPGxlbmd0aD4gfCA8cGVyY2VudGFnZT4gfCBub25lIHwgaW5oZXJp dApkaWZmIC0tZ2l0IGEvV2ViQ29yZS9jc3MvQ1NTU3R5bGVTZWxlY3Rvci5jcHAgYi9XZWJDb3Jl L2Nzcy9DU1NTdHlsZVNlbGVjdG9yLmNwcAppbmRleCBiZmYwN2JhOWVjZmM1YzlhMTdkMjcyYTNj OGYzMjBmMjFkZjhlYTE3Li43NTM1MTYzZDM5MDc2NTE2ZmJiNWE4YWI2NjQzZGRkMjY5OGU1Yzg2 IDEwMDY0NAotLS0gYS9XZWJDb3JlL2Nzcy9DU1NTdHlsZVNlbGVjdG9yLmNwcAorKysgYi9XZWJD b3JlL2Nzcy9DU1NTdHlsZVNlbGVjdG9yLmNwcApAQCAtMzg1OCwxMiArMzg1OCw3IEBAIHZvaWQg Q1NTU3R5bGVTZWxlY3Rvcjo6YXBwbHlQcm9wZXJ0eShpbnQgaWQsIENTU1ZhbHVlICp2YWx1ZSkK ICAgICAgICAgICAgICAgICBsID0gTGVuZ3RoKHByaW1pdGl2ZVZhbHVlLT5nZXREb3VibGVWYWx1 ZSgpLCBQZXJjZW50KTsKICAgICAgICAgICAgIGVsc2UKICAgICAgICAgICAgICAgICByZXR1cm47 Ci0gICAgICAgICAgICBpZiAoaWQgPT0gQ1NTUHJvcGVydHlQYWRkaW5nTGVmdCB8fCBpZCA9PSBD U1NQcm9wZXJ0eVBhZGRpbmdSaWdodCB8fAotICAgICAgICAgICAgICAgIGlkID09IENTU1Byb3Bl cnR5UGFkZGluZ1RvcCB8fCBpZCA9PSBDU1NQcm9wZXJ0eVBhZGRpbmdCb3R0b20pCi0gICAgICAg ICAgICAgICAgLy8gUGFkZGluZyBjYW4ndCBiZSBuZWdhdGl2ZQotICAgICAgICAgICAgICAgIGFw cGx5ID0gISgobC5pc0ZpeGVkKCkgfHwgbC5pc1BlcmNlbnQoKSkgJiYgbC5jYWxjVmFsdWUoMTAw KSA8IDApOwotICAgICAgICAgICAgZWxzZQotICAgICAgICAgICAgICAgIGFwcGx5ID0gdHJ1ZTsK KyAgICAgICAgICAgIGFwcGx5ID0gdHJ1ZTsKICAgICAgICAgfQogICAgICAgICBpZiAoIWFwcGx5 KSByZXR1cm47CiAgICAgICAgIHN3aXRjaCAoaWQpIHsK