34237 2010-01-27 19:34:04 -0800 Huge plain text pastes are slow 2010-01-28 18:16:39 -0800 1 1 1 Unclassified WebKit HTML Editing 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 1 enrica webkit-unassigned mitz mjs webkit.review.bot oldest_to_newest 185315 0 enrica 2010-01-27 19:34:04 -0800 The performance of plain text pastes is highly non-linear. 185317 1 mitz 2010-01-27 20:03:15 -0800 <rdar://problem/5195056> 185318 2 47586 enrica 2010-01-27 20:04:54 -0800 Created attachment 47586 Patch 185321 3 webkit.review.bot 2010-01-27 20:12:21 -0800 Attachment 47586 did not pass style-queue: Failed to run "WebKitTools/Scripts/check-webkit-style" exit_code: 1 WebCore/ChangeLog:8: Line contains tab character. [whitespace/tab] [5] WebCore/ChangeLog:10: Line contains tab character. [whitespace/tab] [5] WebKit/mac/ChangeLog:12: Line contains tab character. [whitespace/tab] [5] Total errors found: 3 If any of these errors are false positives, please file a bug against check-webkit-style. 185332 4 47589 enrica 2010-01-27 21:07:24 -0800 Created attachment 47589 Patch2 Stripping unwanted tabs from ChangeLog files. 185411 5 47589 mjs 2010-01-28 03:38:41 -0800 Comment on attachment 47589 Patch2 I'm concerned about the Mail-specific workaround. Is that something Mail needs to keep doing? Can we get them to change? If so, that special case should probably have a version check.The WebCore part of the speedup looks good to me (and is an awesome idea). 185520 6 enrica 2010-01-28 09:02:33 -0800 (In reply to comment #5) > (From update of attachment 47589 [details]) > I'm concerned about the Mail-specific workaround. Is that something Mail needs > to keep doing? Can we get them to change? If so, that special case should > probably have a version check.The WebCore part of the speedup looks good to me > (and is an awesome idea). I agree with you. I've been talking to mail about this and they seem ok with fixing it for the next version. I should probably change the code to do the workaround only up to the current version. Any thoughts? 185592 7 mjs 2010-01-28 13:20:03 -0800 (In reply to comment #6) > (In reply to comment #5) > > (From update of attachment 47589 [details] [details]) > > I'm concerned about the Mail-specific workaround. Is that something Mail needs > > to keep doing? Can we get them to change? If so, that special case should > > probably have a version check.The WebCore part of the speedup looks good to me > > (and is an awesome idea). > > I agree with you. I've been talking to mail about this and they seem ok with > fixing it for the next version. > I should probably change the code to do the workaround only up to the current > version. > Any thoughts? I think that's a good idea. We usually use a linked on-or-after check for things like that. 185609 8 47648 enrica 2010-01-28 14:30:34 -0800 Created attachment 47648 Patch3 Limiting the OS versions for the workaround. 185665 9 47648 mjs 2010-01-28 17:30:10 -0800 Comment on attachment 47648 Patch3 r=me 185678 10 enrica 2010-01-28 18:16:39 -0800 Committed revision 54036. 47586 2010-01-27 20:04:54 -0800 2010-01-27 21:07:24 -0800 Patch bug5195056.txt text/plain 7289 enrica SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1Mzk2OCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjUgQEAKKzIwMTAtMDEtMjcgIEVucmljYSBDYXN1Y2NpICA8ZW5yaWNhQGFwcGxl LmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBI dWdlIHBsYWluIHRleHQgcGFzdGVzIGFyZSBzbG93CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS81 MTk1MDU2PgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MzQyMzcKKwkJCisgICAgICAgIE5vIG5ldyB0ZXN0cy4gSXQgaXMgYSBwZXJmb3JtYW5jZSBpbXBy b3ZlbWVudC4KKwkJCisgICAgICAgIFRoZSBwZXJmb3JtYW5jZSBvZiB0aGUgcGxhaW4gdGV4dCBw YXN0ZSBpcyBub3cgbGluZWFyLgorICAgICAgICBXZSB0cmVhdCBhcyBhIHNwZWNpYWwgY2FzZSwg YSBmcmFnbWVudCB0aGF0IGhhcyBiZWVuCisgICAgICAgIGNyZWF0ZWQgZnJvbSBwbGFpbiB0ZXh0 LiBGaW5kaW5nIFZpc2libGVQb3NpdGlvbnMgYW5kCisgICAgICAgIGFwcGx5aW5nIHN0eWxlIGlz IGdyZWF0bHkgc2ltcGxpZmllZCwgZ2l2ZW4gdGhlIG5hdHVyZSBvZgorICAgICAgICB0aGUgZnJh Z21lbnQuCisKKyAgICAgICAgKiBlZGl0aW5nL1JlcGxhY2VTZWxlY3Rpb25Db21tYW5kLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OlJlcGxhY2VTZWxlY3Rpb25Db21tYW5kOjpkb0FwcGx5KToKKyAg ICAgICAgKiBlZGl0aW5nL21hcmt1cC5jcHA6CisgICAgICAgIChXZWJDb3JlOjppc1BsYWluVGV4 dE1hcmt1cCk6CisgICAgICAgICogZWRpdGluZy9tYXJrdXAuaDoKKwogMjAxMC0wMS0yNyAgTmlj aG9sYXMgWW91bmcgIDxuaWNob2xhcy55b3VuZ0Bub2tpYS5jb20+CiAKICAgICAgICAgUmV2aWV3 ZWQgYnkgRXJpYyBDYXJsc29uLgpJbmRleDogV2ViQ29yZS9lZGl0aW5nL1JlcGxhY2VTZWxlY3Rp b25Db21tYW5kLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2VkaXRpbmcvUmVwbGFjZVNlbGVj dGlvbkNvbW1hbmQuY3BwCShyZXZpc2lvbiA1Mzk2NCkKKysrIFdlYkNvcmUvZWRpdGluZy9SZXBs YWNlU2VsZWN0aW9uQ29tbWFuZC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTg3Nyw2ICs4NzcsOCBA QCB2b2lkIFJlcGxhY2VTZWxlY3Rpb25Db21tYW5kOjpkb0FwcGx5KCkKICAgICBpZiAoIXJlZk5v ZGUtPmluRG9jdW1lbnQoKSkKICAgICAgICAgcmV0dXJuOwogCisgICAgYm9vbCBwbGFpblRleHRG cmFnbWVudCA9IGlzUGxhaW5UZXh0TWFya3VwKHJlZk5vZGUuZ2V0KCkpOworCiAgICAgd2hpbGUg KG5vZGUpIHsKICAgICAgICAgTm9kZSogbmV4dCA9IG5vZGUtPm5leHRTaWJsaW5nKCk7CiAgICAg ICAgIGZyYWdtZW50LnJlbW92ZU5vZGUobm9kZSk7CkBAIC04ODcsNiArODg5LDggQEAgdm9pZCBS ZXBsYWNlU2VsZWN0aW9uQ29tbWFuZDo6ZG9BcHBseSgpCiAgICAgICAgICAgICByZXR1cm47CiAK ICAgICAgICAgcmVmTm9kZSA9IG5vZGU7CisgICAgICAgIGlmIChub2RlICYmIHBsYWluVGV4dEZy YWdtZW50KQorICAgICAgICAgICAgcGxhaW5UZXh0RnJhZ21lbnQgPSBpc1BsYWluVGV4dE1hcmt1 cChub2RlLmdldCgpKTsKICAgICAgICAgbm9kZSA9IG5leHQ7CiAgICAgfQogICAgIApAQCAtOTEz LDcgKzkxNyw3IEBAIHZvaWQgUmVwbGFjZVNlbGVjdGlvbkNvbW1hbmQ6OmRvQXBwbHkoKQogICAg IAogICAgIGJvb2wgaW50ZXJjaGFuZ2VOZXdsaW5lQXRFbmQgPSBmcmFnbWVudC5oYXNJbnRlcmNo YW5nZU5ld2xpbmVBdEVuZCgpOwogCi0gICAgaWYgKHNob3VsZFJlbW92ZUVuZEJSKGVuZEJSLCBv cmlnaW5hbFZpc1Bvc0JlZm9yZUVuZEJSKSkKKyAgICBpZiAoZW5kQlIgJiYgKHBsYWluVGV4dEZy YWdtZW50IHx8IHNob3VsZFJlbW92ZUVuZEJSKGVuZEJSLCBvcmlnaW5hbFZpc1Bvc0JlZm9yZUVu ZEJSKSkpCiAgICAgICAgIHJlbW92ZU5vZGVBbmRQcnVuZUFuY2VzdG9ycyhlbmRCUik7CiAgICAg CiAgICAgLy8gRGV0ZXJtaW5lIHdoZXRoZXIgb3Igbm90IHdlIHNob3VsZCBtZXJnZSB0aGUgZW5k IG9mIGluc2VydGVkIGNvbnRlbnQgd2l0aCB3aGF0J3MgYWZ0ZXIgaXQgYmVmb3JlIHdlIGRvCkBA IC0xMDIwLDYgKzEwMjQsMTEgQEAgdm9pZCBSZXBsYWNlU2VsZWN0aW9uQ29tbWFuZDo6ZG9BcHBs eSgpCiAgICAgICAgIH0KICAgICB9CiAgICAgCisgICAgLy8gSWYgd2UgYXJlIGRlYWxpbmcgd2l0 aCBhIGZyYWdtZW50IGNyZWF0ZWQgZnJvbSBwbGFpbiB0ZXh0CisgICAgLy8gbm8gc3R5bGUgbWF0 Y2hpbmcgaXMgbmVjZXNzYXJ5LgorICAgIGlmIChwbGFpblRleHRGcmFnbWVudCkKKyAgICAgICAg bV9tYXRjaFN0eWxlID0gZmFsc2U7CisgICAgICAgIAogICAgIGNvbXBsZXRlSFRNTFJlcGxhY2Vt ZW50KGxhc3RQb3NpdGlvblRvU2VsZWN0KTsKIH0KIApJbmRleDogV2ViQ29yZS9lZGl0aW5nL21h cmt1cC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9lZGl0aW5nL21hcmt1cC5jcHAJKHJldmlz aW9uIDUzOTY0KQorKysgV2ViQ29yZS9lZGl0aW5nL21hcmt1cC5jcHAJKHdvcmtpbmcgY29weSkK QEAgLTExMzMsNiArMTEzMywxNyBAQCBzdGF0aWMgdm9pZCBmaWxsQ29udGFpbmVyRnJvbVN0cmlu ZyhDb250CiAgICAgfQogfQogCitib29sIGlzUGxhaW5UZXh0TWFya3VwKE5vZGUgKm5vZGUpCit7 CisgICAgaWYgKCFub2RlLT5pc0VsZW1lbnROb2RlKCkgfHwgIW5vZGUtPmhhc1RhZ05hbWUoZGl2 VGFnKSB8fCBzdGF0aWNfY2FzdDxFbGVtZW50Kj4obm9kZSktPmF0dHJpYnV0ZXMoKS0+bGVuZ3Ro KCkpCisgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICAKKyAgICBpZiAobm9kZS0+Y2hpbGROb2Rl Q291bnQoKSA9PSAxICYmIChub2RlLT5maXJzdENoaWxkKCktPmlzVGV4dE5vZGUoKSB8fCAobm9k ZS0+Zmlyc3RDaGlsZCgpLT5maXJzdENoaWxkKCkpKSkKKyAgICAgICAgcmV0dXJuIHRydWU7Cisg ICAgCisgICAgcmV0dXJuIChub2RlLT5jaGlsZE5vZGVDb3VudCgpID09IDIgJiYgaXNUYWJTcGFu VGV4dE5vZGUobm9kZS0+Zmlyc3RDaGlsZCgpLT5maXJzdENoaWxkKCkpICYmIG5vZGUtPmZpcnN0 Q2hpbGQoKS0+bmV4dFNpYmxpbmcoKS0+aXNUZXh0Tm9kZSgpKTsKK30KKwogUGFzc1JlZlB0cjxE b2N1bWVudEZyYWdtZW50PiBjcmVhdGVGcmFnbWVudEZyb21UZXh0KFJhbmdlKiBjb250ZXh0LCBj b25zdCBTdHJpbmcmIHRleHQpCiB7CiAgICAgaWYgKCFjb250ZXh0KQpJbmRleDogV2ViQ29yZS9l ZGl0aW5nL21hcmt1cC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvZWRpdGluZy9tYXJrdXAuaAko cmV2aXNpb24gNTM5NjQpCisrKyBXZWJDb3JlL2VkaXRpbmcvbWFya3VwLmgJKHdvcmtpbmcgY29w eSkKQEAgLTQ1LDYgKzQ1LDggQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgIFBhc3NSZWZQdHI8 RG9jdW1lbnRGcmFnbWVudD4gY3JlYXRlRnJhZ21lbnRGcm9tTWFya3VwKERvY3VtZW50KiwgY29u c3QgU3RyaW5nJiBtYXJrdXAsIGNvbnN0IFN0cmluZyYgYmFzZVVSTCwgRnJhZ21lbnRTY3JpcHRp bmdQZXJtaXNzaW9uID0gRnJhZ21lbnRTY3JpcHRpbmdBbGxvd2VkKTsKICAgICBQYXNzUmVmUHRy PERvY3VtZW50RnJhZ21lbnQ+IGNyZWF0ZUZyYWdtZW50RnJvbU5vZGVzKERvY3VtZW50KiwgY29u c3QgVmVjdG9yPE5vZGUqPiYpOwogCisgICAgYm9vbCBpc1BsYWluVGV4dE1hcmt1cChOb2RlICpu b2RlKTsKKwogICAgIFN0cmluZyBjcmVhdGVNYXJrdXAoY29uc3QgUmFuZ2UqLAogICAgICAgICBW ZWN0b3I8Tm9kZSo+KiA9IDAsIEVBbm5vdGF0ZUZvckludGVyY2hhbmdlID0gRG9Ob3RBbm5vdGF0 ZUZvckludGVyY2hhbmdlLCBib29sIGNvbnZlcnRCbG9ja3NUb0lubGluZXMgPSBmYWxzZSk7CiAg ICAgU3RyaW5nIGNyZWF0ZU1hcmt1cChjb25zdCBOb2RlKiwgRUNoaWxkcmVuT25seSA9IEluY2x1 ZGVOb2RlLCBWZWN0b3I8Tm9kZSo+KiA9IDApOwpJbmRleDogV2ViS2l0L21hYy9DaGFuZ2VMb2cK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gV2ViS2l0L21hYy9DaGFuZ2VMb2cJKHJldmlzaW9uIDUzOTY4KQorKysg V2ViS2l0L21hYy9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxOCBAQAorMjAx MC0wMS0yNyAgRW5yaWNhIENhc3VjY2kgIDxlbnJpY2FAYXBwbGUuY29tPgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEh1Z2UgcGxhaW4gdGV4dCBwYXN0 ZXMgYXJlIHNsb3cKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzUxOTUwNTY+CisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zNDIzNworCisgICAgICAgIE1h aWwgaXMgaWdub3JpbmcgdGhlIGZyYWdtZW50IGNyZWF0ZWQgZnJvbSBwbGFpbiB0ZXh0IHRoYXQg aXMKKyAgICAgICAgcGFzc2VkIHRvIHRoZSBkZWxlZ2F0ZSBmdW5jdGlvbiwgdGhhdCBjcmVhdGVz IGEgbmV3IG9uZS4KKyAgICAgICAgVGhpcyBmaXggYXZvaWRzIGNyZWF0aW5nIHRoZSBmcmFnbWVu dCB0d2ljZS4KKwkJCisgICAgICAgICogV2ViVmlldy9XZWJIVE1MVmlldy5tbToKKyAgICAgICAg KC1bV2ViSFRNTFZpZXcgX3Bhc3RlV2l0aFBhc3RlYm9hcmQ6YWxsb3dQbGFpblRleHQ6XSk6CisK IDIwMTAtMDEtMjUgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KIAogICAg ICAgICBGZWF0dXJlbGVzcyBidWlsZCBmaXhlcy4KSW5kZXg6IFdlYktpdC9tYWMvV2ViVmlldy9X ZWJIVE1MVmlldy5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvbWFjL1dlYlZpZXcvV2ViSFRNTFZp ZXcubW0JKHJldmlzaW9uIDUzOTY0KQorKysgV2ViS2l0L21hYy9XZWJWaWV3L1dlYkhUTUxWaWV3 Lm1tCSh3b3JraW5nIGNvcHkpCkBAIC0xMDMsNiArMTAzLDcgQEAKICNpbXBvcnQgPFdlYkNvcmUv UGFnZS5oPgogI2ltcG9ydCA8V2ViQ29yZS9QbGF0Zm9ybUtleWJvYXJkRXZlbnQuaD4KICNpbXBv cnQgPFdlYkNvcmUvUmFuZ2UuaD4KKyNpbXBvcnQgPFdlYkNvcmUvUnVudGltZUFwcGxpY2F0aW9u Q2hlY2tzLmg+CiAjaW1wb3J0IDxXZWJDb3JlL1NlbGVjdGlvbkNvbnRyb2xsZXIuaD4KICNpbXBv cnQgPFdlYkNvcmUvU2hhcmVkQnVmZmVyLmg+CiAjaW1wb3J0IDxXZWJDb3JlL1NpbXBsZUZvbnRE YXRhLmg+CkBAIC03OTYsMTAgKzc5NywyMCBAQCBzdGF0aWMgTlNVUkwqIHVuaXF1ZVVSTFdpdGhS ZWxhdGl2ZVBhcnQoCiAgICAgW3dlYlZpZXcgX3NldEluc2VydGlvblBhc3RlYm9hcmQ6cGFzdGVi b2FyZF07CiAKICAgICBET01SYW5nZSAqcmFuZ2UgPSBbc2VsZiBfc2VsZWN0ZWRSYW5nZV07Ci0g ICAgRE9NRG9jdW1lbnRGcmFnbWVudCAqZnJhZ21lbnQgPSBbc2VsZiBfZG9jdW1lbnRGcmFnbWVu dEZyb21QYXN0ZWJvYXJkOnBhc3RlYm9hcmQgaW5Db250ZXh0OnJhbmdlIGFsbG93UGxhaW5UZXh0 OmFsbG93UGxhaW5UZXh0XTsKLSAgICBpZiAoZnJhZ21lbnQgJiYgW3NlbGYgX3Nob3VsZEluc2Vy dEZyYWdtZW50OmZyYWdtZW50IHJlcGxhY2luZ0RPTVJhbmdlOnJhbmdlIGdpdmVuQWN0aW9uOldl YlZpZXdJbnNlcnRBY3Rpb25QYXN0ZWRdKQotICAgICAgICBbW3NlbGYgX2ZyYW1lXSBfcmVwbGFj ZVNlbGVjdGlvbldpdGhGcmFnbWVudDpmcmFnbWVudCBzZWxlY3RSZXBsYWNlbWVudDpOTyBzbWFy dFJlcGxhY2U6W3NlbGYgX2NhblNtYXJ0UmVwbGFjZVdpdGhQYXN0ZWJvYXJkOnBhc3RlYm9hcmRd IG1hdGNoU3R5bGU6Tk9dOwotCisgICAgCisgICAgLy8gTWFpbCBpcyBpZ25vcmluZyB0aGUgZnJh bWVudCBwYXNzZWQgdG8gdGhlIGRlbGVnYXRlIGFuZCBjcmVhdGVzIGEgbmV3IG9uZS4KKyAgICAv LyBXZSB3YW50IHRvIGF2b2lkIGNyZWF0aW5nIHRoZSBmcmFnbWVudCB0d2ljZS4KKyAgICBpZiAo YXBwbGljYXRpb25Jc0FwcGxlTWFpbCgpKSB7CisgICAgICAgIGlmIChbc2VsZiBfc2hvdWxkSW5z ZXJ0RnJhZ21lbnQ6bmlsIHJlcGxhY2luZ0RPTVJhbmdlOnJhbmdlIGdpdmVuQWN0aW9uOldlYlZp ZXdJbnNlcnRBY3Rpb25QYXN0ZWRdKSB7CisgICAgICAgICAgICBET01Eb2N1bWVudEZyYWdtZW50 ICpmcmFnbWVudCA9IFtzZWxmIF9kb2N1bWVudEZyYWdtZW50RnJvbVBhc3RlYm9hcmQ6cGFzdGVi b2FyZCBpbkNvbnRleHQ6cmFuZ2UgYWxsb3dQbGFpblRleHQ6YWxsb3dQbGFpblRleHRdOworICAg ICAgICAgICAgaWYgKGZyYWdtZW50KQorICAgICAgICAgICAgICAgIFtbc2VsZiBfZnJhbWVdIF9y ZXBsYWNlU2VsZWN0aW9uV2l0aEZyYWdtZW50OmZyYWdtZW50IHNlbGVjdFJlcGxhY2VtZW50Ok5P IHNtYXJ0UmVwbGFjZTpbc2VsZiBfY2FuU21hcnRSZXBsYWNlV2l0aFBhc3RlYm9hcmQ6cGFzdGVi b2FyZF0gbWF0Y2hTdHlsZTpOT107CisgICAgICAgIH0gICAgICAgIAorICAgIH0gZWxzZSB7Cisg ICAgICAgIERPTURvY3VtZW50RnJhZ21lbnQgKmZyYWdtZW50ID0gW3NlbGYgX2RvY3VtZW50RnJh Z21lbnRGcm9tUGFzdGVib2FyZDpwYXN0ZWJvYXJkIGluQ29udGV4dDpyYW5nZSBhbGxvd1BsYWlu VGV4dDphbGxvd1BsYWluVGV4dF07CisgICAgICAgIGlmIChmcmFnbWVudCAmJiBbc2VsZiBfc2hv dWxkSW5zZXJ0RnJhZ21lbnQ6ZnJhZ21lbnQgcmVwbGFjaW5nRE9NUmFuZ2U6cmFuZ2UgZ2l2ZW5B Y3Rpb246V2ViVmlld0luc2VydEFjdGlvblBhc3RlZF0pCisgICAgICAgICAgICBbW3NlbGYgX2Zy YW1lXSBfcmVwbGFjZVNlbGVjdGlvbldpdGhGcmFnbWVudDpmcmFnbWVudCBzZWxlY3RSZXBsYWNl bWVudDpOTyBzbWFydFJlcGxhY2U6W3NlbGYgX2NhblNtYXJ0UmVwbGFjZVdpdGhQYXN0ZWJvYXJk OnBhc3RlYm9hcmRdIG1hdGNoU3R5bGU6Tk9dOworICAgIH0KICAgICBbd2ViVmlldyBfc2V0SW5z ZXJ0aW9uUGFzdGVib2FyZDpuaWxdOwogICAgIFt3ZWJWaWV3IHJlbGVhc2VdOwogfQo= 47589 2010-01-27 21:07:24 -0800 2010-01-28 14:30:34 -0800 Patch2 bug5195056.txt text/plain 7283 enrica SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1Mzk2OCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjUgQEAKKzIwMTAtMDEtMjcgIEVucmljYSBDYXN1Y2NpICA8ZW5yaWNhQGFwcGxl LmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBI dWdlIHBsYWluIHRleHQgcGFzdGVzIGFyZSBzbG93CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS81 MTk1MDU2PgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MzQyMzcKKworICAgICAgICBObyBuZXcgdGVzdHMuIEl0IGlzIGEgcGVyZm9ybWFuY2UgaW1wcm92 ZW1lbnQuCisKKyAgICAgICAgVGhlIHBlcmZvcm1hbmNlIG9mIHRoZSBwbGFpbiB0ZXh0IHBhc3Rl IGlzIG5vdyBsaW5lYXIuCisgICAgICAgIFdlIHRyZWF0IGFzIGEgc3BlY2lhbCBjYXNlLCBhIGZy YWdtZW50IHRoYXQgaGFzIGJlZW4KKyAgICAgICAgY3JlYXRlZCBmcm9tIHBsYWluIHRleHQuIEZp bmRpbmcgVmlzaWJsZVBvc2l0aW9ucyBhbmQKKyAgICAgICAgYXBwbHlpbmcgc3R5bGUgaXMgZ3Jl YXRseSBzaW1wbGlmaWVkLCBnaXZlbiB0aGUgbmF0dXJlIG9mCisgICAgICAgIHRoZSBmcmFnbWVu dC4KKworICAgICAgICAqIGVkaXRpbmcvUmVwbGFjZVNlbGVjdGlvbkNvbW1hbmQuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6UmVwbGFjZVNlbGVjdGlvbkNvbW1hbmQ6OmRvQXBwbHkpOgorICAgICAg ICAqIGVkaXRpbmcvbWFya3VwLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmlzUGxhaW5UZXh0TWFy a3VwKToKKyAgICAgICAgKiBlZGl0aW5nL21hcmt1cC5oOgorCiAyMDEwLTAxLTI3ICBOaWNob2xh cyBZb3VuZyAgPG5pY2hvbGFzLnlvdW5nQG5va2lhLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBi eSBFcmljIENhcmxzb24uCkluZGV4OiBXZWJDb3JlL2VkaXRpbmcvUmVwbGFjZVNlbGVjdGlvbkNv bW1hbmQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvZWRpdGluZy9SZXBsYWNlU2VsZWN0aW9u Q29tbWFuZC5jcHAJKHJldmlzaW9uIDUzOTY0KQorKysgV2ViQ29yZS9lZGl0aW5nL1JlcGxhY2VT ZWxlY3Rpb25Db21tYW5kLmNwcAkod29ya2luZyBjb3B5KQpAQCAtODc3LDYgKzg3Nyw4IEBAIHZv aWQgUmVwbGFjZVNlbGVjdGlvbkNvbW1hbmQ6OmRvQXBwbHkoKQogICAgIGlmICghcmVmTm9kZS0+ aW5Eb2N1bWVudCgpKQogICAgICAgICByZXR1cm47CiAKKyAgICBib29sIHBsYWluVGV4dEZyYWdt ZW50ID0gaXNQbGFpblRleHRNYXJrdXAocmVmTm9kZS5nZXQoKSk7CisKICAgICB3aGlsZSAobm9k ZSkgewogICAgICAgICBOb2RlKiBuZXh0ID0gbm9kZS0+bmV4dFNpYmxpbmcoKTsKICAgICAgICAg ZnJhZ21lbnQucmVtb3ZlTm9kZShub2RlKTsKQEAgLTg4Nyw2ICs4ODksOCBAQCB2b2lkIFJlcGxh Y2VTZWxlY3Rpb25Db21tYW5kOjpkb0FwcGx5KCkKICAgICAgICAgICAgIHJldHVybjsKIAogICAg ICAgICByZWZOb2RlID0gbm9kZTsKKyAgICAgICAgaWYgKG5vZGUgJiYgcGxhaW5UZXh0RnJhZ21l bnQpCisgICAgICAgICAgICBwbGFpblRleHRGcmFnbWVudCA9IGlzUGxhaW5UZXh0TWFya3VwKG5v ZGUuZ2V0KCkpOwogICAgICAgICBub2RlID0gbmV4dDsKICAgICB9CiAgICAgCkBAIC05MTMsNyAr OTE3LDcgQEAgdm9pZCBSZXBsYWNlU2VsZWN0aW9uQ29tbWFuZDo6ZG9BcHBseSgpCiAgICAgCiAg ICAgYm9vbCBpbnRlcmNoYW5nZU5ld2xpbmVBdEVuZCA9IGZyYWdtZW50Lmhhc0ludGVyY2hhbmdl TmV3bGluZUF0RW5kKCk7CiAKLSAgICBpZiAoc2hvdWxkUmVtb3ZlRW5kQlIoZW5kQlIsIG9yaWdp bmFsVmlzUG9zQmVmb3JlRW5kQlIpKQorICAgIGlmIChlbmRCUiAmJiAocGxhaW5UZXh0RnJhZ21l bnQgfHwgc2hvdWxkUmVtb3ZlRW5kQlIoZW5kQlIsIG9yaWdpbmFsVmlzUG9zQmVmb3JlRW5kQlIp KSkKICAgICAgICAgcmVtb3ZlTm9kZUFuZFBydW5lQW5jZXN0b3JzKGVuZEJSKTsKICAgICAKICAg ICAvLyBEZXRlcm1pbmUgd2hldGhlciBvciBub3Qgd2Ugc2hvdWxkIG1lcmdlIHRoZSBlbmQgb2Yg aW5zZXJ0ZWQgY29udGVudCB3aXRoIHdoYXQncyBhZnRlciBpdCBiZWZvcmUgd2UgZG8KQEAgLTEw MjAsNiArMTAyNCwxMSBAQCB2b2lkIFJlcGxhY2VTZWxlY3Rpb25Db21tYW5kOjpkb0FwcGx5KCkK ICAgICAgICAgfQogICAgIH0KICAgICAKKyAgICAvLyBJZiB3ZSBhcmUgZGVhbGluZyB3aXRoIGEg ZnJhZ21lbnQgY3JlYXRlZCBmcm9tIHBsYWluIHRleHQKKyAgICAvLyBubyBzdHlsZSBtYXRjaGlu ZyBpcyBuZWNlc3NhcnkuCisgICAgaWYgKHBsYWluVGV4dEZyYWdtZW50KQorICAgICAgICBtX21h dGNoU3R5bGUgPSBmYWxzZTsKKyAgICAgICAgCiAgICAgY29tcGxldGVIVE1MUmVwbGFjZW1lbnQo bGFzdFBvc2l0aW9uVG9TZWxlY3QpOwogfQogCkluZGV4OiBXZWJDb3JlL2VkaXRpbmcvbWFya3Vw LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2VkaXRpbmcvbWFya3VwLmNwcAkocmV2aXNpb24g NTM5NjQpCisrKyBXZWJDb3JlL2VkaXRpbmcvbWFya3VwLmNwcAkod29ya2luZyBjb3B5KQpAQCAt MTEzMyw2ICsxMTMzLDE3IEBAIHN0YXRpYyB2b2lkIGZpbGxDb250YWluZXJGcm9tU3RyaW5nKENv bnQKICAgICB9CiB9CiAKK2Jvb2wgaXNQbGFpblRleHRNYXJrdXAoTm9kZSAqbm9kZSkKK3sKKyAg ICBpZiAoIW5vZGUtPmlzRWxlbWVudE5vZGUoKSB8fCAhbm9kZS0+aGFzVGFnTmFtZShkaXZUYWcp IHx8IHN0YXRpY19jYXN0PEVsZW1lbnQqPihub2RlKS0+YXR0cmlidXRlcygpLT5sZW5ndGgoKSkK KyAgICAgICAgcmV0dXJuIGZhbHNlOworICAgIAorICAgIGlmIChub2RlLT5jaGlsZE5vZGVDb3Vu dCgpID09IDEgJiYgKG5vZGUtPmZpcnN0Q2hpbGQoKS0+aXNUZXh0Tm9kZSgpIHx8IChub2RlLT5m aXJzdENoaWxkKCktPmZpcnN0Q2hpbGQoKSkpKQorICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICAK KyAgICByZXR1cm4gKG5vZGUtPmNoaWxkTm9kZUNvdW50KCkgPT0gMiAmJiBpc1RhYlNwYW5UZXh0 Tm9kZShub2RlLT5maXJzdENoaWxkKCktPmZpcnN0Q2hpbGQoKSkgJiYgbm9kZS0+Zmlyc3RDaGls ZCgpLT5uZXh0U2libGluZygpLT5pc1RleHROb2RlKCkpOworfQorCiBQYXNzUmVmUHRyPERvY3Vt ZW50RnJhZ21lbnQ+IGNyZWF0ZUZyYWdtZW50RnJvbVRleHQoUmFuZ2UqIGNvbnRleHQsIGNvbnN0 IFN0cmluZyYgdGV4dCkKIHsKICAgICBpZiAoIWNvbnRleHQpCkluZGV4OiBXZWJDb3JlL2VkaXRp bmcvbWFya3VwLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9lZGl0aW5nL21hcmt1cC5oCShyZXZp c2lvbiA1Mzk2NCkKKysrIFdlYkNvcmUvZWRpdGluZy9tYXJrdXAuaAkod29ya2luZyBjb3B5KQpA QCAtNDUsNiArNDUsOCBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgUGFzc1JlZlB0cjxEb2N1 bWVudEZyYWdtZW50PiBjcmVhdGVGcmFnbWVudEZyb21NYXJrdXAoRG9jdW1lbnQqLCBjb25zdCBT dHJpbmcmIG1hcmt1cCwgY29uc3QgU3RyaW5nJiBiYXNlVVJMLCBGcmFnbWVudFNjcmlwdGluZ1Bl cm1pc3Npb24gPSBGcmFnbWVudFNjcmlwdGluZ0FsbG93ZWQpOwogICAgIFBhc3NSZWZQdHI8RG9j dW1lbnRGcmFnbWVudD4gY3JlYXRlRnJhZ21lbnRGcm9tTm9kZXMoRG9jdW1lbnQqLCBjb25zdCBW ZWN0b3I8Tm9kZSo+Jik7CiAKKyAgICBib29sIGlzUGxhaW5UZXh0TWFya3VwKE5vZGUgKm5vZGUp OworCiAgICAgU3RyaW5nIGNyZWF0ZU1hcmt1cChjb25zdCBSYW5nZSosCiAgICAgICAgIFZlY3Rv cjxOb2RlKj4qID0gMCwgRUFubm90YXRlRm9ySW50ZXJjaGFuZ2UgPSBEb05vdEFubm90YXRlRm9y SW50ZXJjaGFuZ2UsIGJvb2wgY29udmVydEJsb2Nrc1RvSW5saW5lcyA9IGZhbHNlKTsKICAgICBT dHJpbmcgY3JlYXRlTWFya3VwKGNvbnN0IE5vZGUqLCBFQ2hpbGRyZW5Pbmx5ID0gSW5jbHVkZU5v ZGUsIFZlY3RvcjxOb2RlKj4qID0gMCk7CkluZGV4OiBXZWJLaXQvbWFjL0NoYW5nZUxvZwo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBXZWJLaXQvbWFjL0NoYW5nZUxvZwkocmV2aXNpb24gNTM5NjgpCisrKyBXZWJL aXQvbWFjL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE4IEBACisyMDEwLTAx LTI3ICBFbnJpY2EgQ2FzdWNjaSAgPGVucmljYUBhcHBsZS5jb20+CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSHVnZSBwbGFpbiB0ZXh0IHBhc3RlcyBh cmUgc2xvdworICAgICAgICA8cmRhcjovL3Byb2JsZW0vNTE5NTA1Nj4KKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM0MjM3CisKKyAgICAgICAgTWFpbCBp cyBpZ25vcmluZyB0aGUgZnJhZ21lbnQgY3JlYXRlZCBmcm9tIHBsYWluIHRleHQgdGhhdCBpcwor ICAgICAgICBwYXNzZWQgdG8gdGhlIGRlbGVnYXRlIGZ1bmN0aW9uLCB0aGF0IGNyZWF0ZXMgYSBu ZXcgb25lLgorICAgICAgICBUaGlzIGZpeCBhdm9pZHMgY3JlYXRpbmcgdGhlIGZyYWdtZW50IHR3 aWNlLgorCisgICAgICAgICogV2ViVmlldy9XZWJIVE1MVmlldy5tbToKKyAgICAgICAgKC1bV2Vi SFRNTFZpZXcgX3Bhc3RlV2l0aFBhc3RlYm9hcmQ6YWxsb3dQbGFpblRleHQ6XSk6CisKIDIwMTAt MDEtMjUgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KIAogICAgICAgICBG ZWF0dXJlbGVzcyBidWlsZCBmaXhlcy4KSW5kZXg6IFdlYktpdC9tYWMvV2ViVmlldy9XZWJIVE1M Vmlldy5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvbWFjL1dlYlZpZXcvV2ViSFRNTFZpZXcubW0J KHJldmlzaW9uIDUzOTY0KQorKysgV2ViS2l0L21hYy9XZWJWaWV3L1dlYkhUTUxWaWV3Lm1tCSh3 b3JraW5nIGNvcHkpCkBAIC0xMDMsNiArMTAzLDcgQEAKICNpbXBvcnQgPFdlYkNvcmUvUGFnZS5o PgogI2ltcG9ydCA8V2ViQ29yZS9QbGF0Zm9ybUtleWJvYXJkRXZlbnQuaD4KICNpbXBvcnQgPFdl YkNvcmUvUmFuZ2UuaD4KKyNpbXBvcnQgPFdlYkNvcmUvUnVudGltZUFwcGxpY2F0aW9uQ2hlY2tz Lmg+CiAjaW1wb3J0IDxXZWJDb3JlL1NlbGVjdGlvbkNvbnRyb2xsZXIuaD4KICNpbXBvcnQgPFdl YkNvcmUvU2hhcmVkQnVmZmVyLmg+CiAjaW1wb3J0IDxXZWJDb3JlL1NpbXBsZUZvbnREYXRhLmg+ CkBAIC03OTYsMTAgKzc5NywyMCBAQCBzdGF0aWMgTlNVUkwqIHVuaXF1ZVVSTFdpdGhSZWxhdGl2 ZVBhcnQoCiAgICAgW3dlYlZpZXcgX3NldEluc2VydGlvblBhc3RlYm9hcmQ6cGFzdGVib2FyZF07 CiAKICAgICBET01SYW5nZSAqcmFuZ2UgPSBbc2VsZiBfc2VsZWN0ZWRSYW5nZV07Ci0gICAgRE9N RG9jdW1lbnRGcmFnbWVudCAqZnJhZ21lbnQgPSBbc2VsZiBfZG9jdW1lbnRGcmFnbWVudEZyb21Q YXN0ZWJvYXJkOnBhc3RlYm9hcmQgaW5Db250ZXh0OnJhbmdlIGFsbG93UGxhaW5UZXh0OmFsbG93 UGxhaW5UZXh0XTsKLSAgICBpZiAoZnJhZ21lbnQgJiYgW3NlbGYgX3Nob3VsZEluc2VydEZyYWdt ZW50OmZyYWdtZW50IHJlcGxhY2luZ0RPTVJhbmdlOnJhbmdlIGdpdmVuQWN0aW9uOldlYlZpZXdJ bnNlcnRBY3Rpb25QYXN0ZWRdKQotICAgICAgICBbW3NlbGYgX2ZyYW1lXSBfcmVwbGFjZVNlbGVj dGlvbldpdGhGcmFnbWVudDpmcmFnbWVudCBzZWxlY3RSZXBsYWNlbWVudDpOTyBzbWFydFJlcGxh Y2U6W3NlbGYgX2NhblNtYXJ0UmVwbGFjZVdpdGhQYXN0ZWJvYXJkOnBhc3RlYm9hcmRdIG1hdGNo U3R5bGU6Tk9dOwotCisgICAgCisgICAgLy8gTWFpbCBpcyBpZ25vcmluZyB0aGUgZnJhbWVudCBw YXNzZWQgdG8gdGhlIGRlbGVnYXRlIGFuZCBjcmVhdGVzIGEgbmV3IG9uZS4KKyAgICAvLyBXZSB3 YW50IHRvIGF2b2lkIGNyZWF0aW5nIHRoZSBmcmFnbWVudCB0d2ljZS4KKyAgICBpZiAoYXBwbGlj YXRpb25Jc0FwcGxlTWFpbCgpKSB7CisgICAgICAgIGlmIChbc2VsZiBfc2hvdWxkSW5zZXJ0RnJh Z21lbnQ6bmlsIHJlcGxhY2luZ0RPTVJhbmdlOnJhbmdlIGdpdmVuQWN0aW9uOldlYlZpZXdJbnNl cnRBY3Rpb25QYXN0ZWRdKSB7CisgICAgICAgICAgICBET01Eb2N1bWVudEZyYWdtZW50ICpmcmFn bWVudCA9IFtzZWxmIF9kb2N1bWVudEZyYWdtZW50RnJvbVBhc3RlYm9hcmQ6cGFzdGVib2FyZCBp bkNvbnRleHQ6cmFuZ2UgYWxsb3dQbGFpblRleHQ6YWxsb3dQbGFpblRleHRdOworICAgICAgICAg ICAgaWYgKGZyYWdtZW50KQorICAgICAgICAgICAgICAgIFtbc2VsZiBfZnJhbWVdIF9yZXBsYWNl U2VsZWN0aW9uV2l0aEZyYWdtZW50OmZyYWdtZW50IHNlbGVjdFJlcGxhY2VtZW50Ok5PIHNtYXJ0 UmVwbGFjZTpbc2VsZiBfY2FuU21hcnRSZXBsYWNlV2l0aFBhc3RlYm9hcmQ6cGFzdGVib2FyZF0g bWF0Y2hTdHlsZTpOT107CisgICAgICAgIH0gICAgICAgIAorICAgIH0gZWxzZSB7CisgICAgICAg IERPTURvY3VtZW50RnJhZ21lbnQgKmZyYWdtZW50ID0gW3NlbGYgX2RvY3VtZW50RnJhZ21lbnRG cm9tUGFzdGVib2FyZDpwYXN0ZWJvYXJkIGluQ29udGV4dDpyYW5nZSBhbGxvd1BsYWluVGV4dDph bGxvd1BsYWluVGV4dF07CisgICAgICAgIGlmIChmcmFnbWVudCAmJiBbc2VsZiBfc2hvdWxkSW5z ZXJ0RnJhZ21lbnQ6ZnJhZ21lbnQgcmVwbGFjaW5nRE9NUmFuZ2U6cmFuZ2UgZ2l2ZW5BY3Rpb246 V2ViVmlld0luc2VydEFjdGlvblBhc3RlZF0pCisgICAgICAgICAgICBbW3NlbGYgX2ZyYW1lXSBf cmVwbGFjZVNlbGVjdGlvbldpdGhGcmFnbWVudDpmcmFnbWVudCBzZWxlY3RSZXBsYWNlbWVudDpO TyBzbWFydFJlcGxhY2U6W3NlbGYgX2NhblNtYXJ0UmVwbGFjZVdpdGhQYXN0ZWJvYXJkOnBhc3Rl Ym9hcmRdIG1hdGNoU3R5bGU6Tk9dOworICAgIH0KICAgICBbd2ViVmlldyBfc2V0SW5zZXJ0aW9u UGFzdGVib2FyZDpuaWxdOwogICAgIFt3ZWJWaWV3IHJlbGVhc2VdOwogfQo= 47648 2010-01-28 14:30:34 -0800 2010-01-28 17:30:09 -0800 Patch3 bug5195056.txt text/plain 7404 enrica SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1NDAxMikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjUgQEAKKzIwMTAtMDEtMjggIEVucmljYSBDYXN1Y2NpICA8ZW5yaWNhQGFwcGxl LmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBI dWdlIHBsYWluIHRleHQgcGFzdGVzIGFyZSBzbG93CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS81 MTk1MDU2PgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MzQyMzcKKworICAgICAgICBObyBuZXcgdGVzdHMuIEl0IGlzIGEgcGVyZm9ybWFuY2UgaW1wcm92 ZW1lbnQuCisKKyAgICAgICAgVGhlIHBlcmZvcm1hbmNlIG9mIHRoZSBwbGFpbiB0ZXh0IHBhc3Rl IGlzIG5vdyBsaW5lYXIuCisgICAgICAgIFdlIHRyZWF0IGFzIGEgc3BlY2lhbCBjYXNlLCBhIGZy YWdtZW50IHRoYXQgaGFzIGJlZW4KKyAgICAgICAgY3JlYXRlZCBmcm9tIHBsYWluIHRleHQuIEZp bmRpbmcgVmlzaWJsZVBvc2l0aW9ucyBhbmQKKyAgICAgICAgYXBwbHlpbmcgc3R5bGUgaXMgZ3Jl YXRseSBzaW1wbGlmaWVkLCBnaXZlbiB0aGUgbmF0dXJlIG9mCisgICAgICAgIHRoZSBmcmFnbWVu dC4KKworICAgICAgICAqIGVkaXRpbmcvUmVwbGFjZVNlbGVjdGlvbkNvbW1hbmQuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6UmVwbGFjZVNlbGVjdGlvbkNvbW1hbmQ6OmRvQXBwbHkpOgorICAgICAg ICAqIGVkaXRpbmcvbWFya3VwLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmlzUGxhaW5UZXh0TWFy a3VwKToKKyAgICAgICAgKiBlZGl0aW5nL21hcmt1cC5oOgorCiAyMDEwLTAxLTI4ICBZdXJ5IFNl bWlraGF0c2t5ICA8eXVyeXNAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEFk YW0gQmFydGguCkluZGV4OiBXZWJDb3JlL2VkaXRpbmcvUmVwbGFjZVNlbGVjdGlvbkNvbW1hbmQu Y3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvZWRpdGluZy9SZXBsYWNlU2VsZWN0aW9uQ29tbWFu ZC5jcHAJKHJldmlzaW9uIDU0MDEyKQorKysgV2ViQ29yZS9lZGl0aW5nL1JlcGxhY2VTZWxlY3Rp b25Db21tYW5kLmNwcAkod29ya2luZyBjb3B5KQpAQCAtODc3LDYgKzg3Nyw4IEBAIHZvaWQgUmVw bGFjZVNlbGVjdGlvbkNvbW1hbmQ6OmRvQXBwbHkoKQogICAgIGlmICghcmVmTm9kZS0+aW5Eb2N1 bWVudCgpKQogICAgICAgICByZXR1cm47CiAKKyAgICBib29sIHBsYWluVGV4dEZyYWdtZW50ID0g aXNQbGFpblRleHRNYXJrdXAocmVmTm9kZS5nZXQoKSk7CisKICAgICB3aGlsZSAobm9kZSkgewog ICAgICAgICBOb2RlKiBuZXh0ID0gbm9kZS0+bmV4dFNpYmxpbmcoKTsKICAgICAgICAgZnJhZ21l bnQucmVtb3ZlTm9kZShub2RlKTsKQEAgLTg4Nyw2ICs4ODksOCBAQCB2b2lkIFJlcGxhY2VTZWxl Y3Rpb25Db21tYW5kOjpkb0FwcGx5KCkKICAgICAgICAgICAgIHJldHVybjsKIAogICAgICAgICBy ZWZOb2RlID0gbm9kZTsKKyAgICAgICAgaWYgKG5vZGUgJiYgcGxhaW5UZXh0RnJhZ21lbnQpCisg ICAgICAgICAgICBwbGFpblRleHRGcmFnbWVudCA9IGlzUGxhaW5UZXh0TWFya3VwKG5vZGUuZ2V0 KCkpOwogICAgICAgICBub2RlID0gbmV4dDsKICAgICB9CiAgICAgCkBAIC05MTMsNyArOTE3LDcg QEAgdm9pZCBSZXBsYWNlU2VsZWN0aW9uQ29tbWFuZDo6ZG9BcHBseSgpCiAgICAgCiAgICAgYm9v bCBpbnRlcmNoYW5nZU5ld2xpbmVBdEVuZCA9IGZyYWdtZW50Lmhhc0ludGVyY2hhbmdlTmV3bGlu ZUF0RW5kKCk7CiAKLSAgICBpZiAoc2hvdWxkUmVtb3ZlRW5kQlIoZW5kQlIsIG9yaWdpbmFsVmlz UG9zQmVmb3JlRW5kQlIpKQorICAgIGlmIChlbmRCUiAmJiAocGxhaW5UZXh0RnJhZ21lbnQgfHwg c2hvdWxkUmVtb3ZlRW5kQlIoZW5kQlIsIG9yaWdpbmFsVmlzUG9zQmVmb3JlRW5kQlIpKSkKICAg ICAgICAgcmVtb3ZlTm9kZUFuZFBydW5lQW5jZXN0b3JzKGVuZEJSKTsKICAgICAKICAgICAvLyBE ZXRlcm1pbmUgd2hldGhlciBvciBub3Qgd2Ugc2hvdWxkIG1lcmdlIHRoZSBlbmQgb2YgaW5zZXJ0 ZWQgY29udGVudCB3aXRoIHdoYXQncyBhZnRlciBpdCBiZWZvcmUgd2UgZG8KQEAgLTEwMjAsNiAr MTAyNCwxMSBAQCB2b2lkIFJlcGxhY2VTZWxlY3Rpb25Db21tYW5kOjpkb0FwcGx5KCkKICAgICAg ICAgfQogICAgIH0KICAgICAKKyAgICAvLyBJZiB3ZSBhcmUgZGVhbGluZyB3aXRoIGEgZnJhZ21l bnQgY3JlYXRlZCBmcm9tIHBsYWluIHRleHQKKyAgICAvLyBubyBzdHlsZSBtYXRjaGluZyBpcyBu ZWNlc3NhcnkuCisgICAgaWYgKHBsYWluVGV4dEZyYWdtZW50KQorICAgICAgICBtX21hdGNoU3R5 bGUgPSBmYWxzZTsKKyAgICAgICAgCiAgICAgY29tcGxldGVIVE1MUmVwbGFjZW1lbnQobGFzdFBv c2l0aW9uVG9TZWxlY3QpOwogfQogCkluZGV4OiBXZWJDb3JlL2VkaXRpbmcvbWFya3VwLmNwcAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBXZWJDb3JlL2VkaXRpbmcvbWFya3VwLmNwcAkocmV2aXNpb24gNTQwMTIp CisrKyBXZWJDb3JlL2VkaXRpbmcvbWFya3VwLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTEzMyw2 ICsxMTMzLDE3IEBAIHN0YXRpYyB2b2lkIGZpbGxDb250YWluZXJGcm9tU3RyaW5nKENvbnQKICAg ICB9CiB9CiAKK2Jvb2wgaXNQbGFpblRleHRNYXJrdXAoTm9kZSAqbm9kZSkKK3sKKyAgICBpZiAo IW5vZGUtPmlzRWxlbWVudE5vZGUoKSB8fCAhbm9kZS0+aGFzVGFnTmFtZShkaXZUYWcpIHx8IHN0 YXRpY19jYXN0PEVsZW1lbnQqPihub2RlKS0+YXR0cmlidXRlcygpLT5sZW5ndGgoKSkKKyAgICAg ICAgcmV0dXJuIGZhbHNlOworICAgIAorICAgIGlmIChub2RlLT5jaGlsZE5vZGVDb3VudCgpID09 IDEgJiYgKG5vZGUtPmZpcnN0Q2hpbGQoKS0+aXNUZXh0Tm9kZSgpIHx8IChub2RlLT5maXJzdENo aWxkKCktPmZpcnN0Q2hpbGQoKSkpKQorICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICAKKyAgICBy ZXR1cm4gKG5vZGUtPmNoaWxkTm9kZUNvdW50KCkgPT0gMiAmJiBpc1RhYlNwYW5UZXh0Tm9kZShu b2RlLT5maXJzdENoaWxkKCktPmZpcnN0Q2hpbGQoKSkgJiYgbm9kZS0+Zmlyc3RDaGlsZCgpLT5u ZXh0U2libGluZygpLT5pc1RleHROb2RlKCkpOworfQorCiBQYXNzUmVmUHRyPERvY3VtZW50RnJh Z21lbnQ+IGNyZWF0ZUZyYWdtZW50RnJvbVRleHQoUmFuZ2UqIGNvbnRleHQsIGNvbnN0IFN0cmlu ZyYgdGV4dCkKIHsKICAgICBpZiAoIWNvbnRleHQpCkluZGV4OiBXZWJDb3JlL2VkaXRpbmcvbWFy a3VwLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9lZGl0aW5nL21hcmt1cC5oCShyZXZpc2lvbiA1 NDAxMikKKysrIFdlYkNvcmUvZWRpdGluZy9tYXJrdXAuaAkod29ya2luZyBjb3B5KQpAQCAtNDUs NiArNDUsOCBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgUGFzc1JlZlB0cjxEb2N1bWVudEZy YWdtZW50PiBjcmVhdGVGcmFnbWVudEZyb21NYXJrdXAoRG9jdW1lbnQqLCBjb25zdCBTdHJpbmcm IG1hcmt1cCwgY29uc3QgU3RyaW5nJiBiYXNlVVJMLCBGcmFnbWVudFNjcmlwdGluZ1Blcm1pc3Np b24gPSBGcmFnbWVudFNjcmlwdGluZ0FsbG93ZWQpOwogICAgIFBhc3NSZWZQdHI8RG9jdW1lbnRG cmFnbWVudD4gY3JlYXRlRnJhZ21lbnRGcm9tTm9kZXMoRG9jdW1lbnQqLCBjb25zdCBWZWN0b3I8 Tm9kZSo+Jik7CiAKKyAgICBib29sIGlzUGxhaW5UZXh0TWFya3VwKE5vZGUgKm5vZGUpOworCiAg ICAgU3RyaW5nIGNyZWF0ZU1hcmt1cChjb25zdCBSYW5nZSosCiAgICAgICAgIFZlY3RvcjxOb2Rl Kj4qID0gMCwgRUFubm90YXRlRm9ySW50ZXJjaGFuZ2UgPSBEb05vdEFubm90YXRlRm9ySW50ZXJj aGFuZ2UsIGJvb2wgY29udmVydEJsb2Nrc1RvSW5saW5lcyA9IGZhbHNlKTsKICAgICBTdHJpbmcg Y3JlYXRlTWFya3VwKGNvbnN0IE5vZGUqLCBFQ2hpbGRyZW5Pbmx5ID0gSW5jbHVkZU5vZGUsIFZl Y3RvcjxOb2RlKj4qID0gMCk7CkluZGV4OiBXZWJLaXQvbWFjL0NoYW5nZUxvZwo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBXZWJLaXQvbWFjL0NoYW5nZUxvZwkocmV2aXNpb24gNTQwMTIpCisrKyBXZWJLaXQvbWFj L0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE4IEBACisyMDEwLTAxLTI4ICBF bnJpY2EgQ2FzdWNjaSAgPGVucmljYUBhcHBsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSHVnZSBwbGFpbiB0ZXh0IHBhc3RlcyBhcmUgc2xv dworICAgICAgICA8cmRhcjovL3Byb2JsZW0vNTE5NTA1Nj4KKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM0MjM3CisKKyAgICAgICAgTWFpbCBpcyBpZ25v cmluZyB0aGUgZnJhZ21lbnQgY3JlYXRlZCBmcm9tIHBsYWluIHRleHQgb3IgSFRNTCB0aGF0IGlz CisgICAgICAgIHBhc3NlZCB0byB0aGUgZGVsZWdhdGUgZnVuY3Rpb24sIHRoYXQgY3JlYXRlcyBh IG5ldyBvbmUuCisgICAgICAgIFRoaXMgZml4IGF2b2lkcyBjcmVhdGluZyB0aGUgZnJhZ21lbnQg dHdpY2UuCisKKyAgICAgICAgKiBXZWJWaWV3L1dlYkhUTUxWaWV3Lm1tOgorICAgICAgICAoLVtX ZWJIVE1MVmlldyBfcGFzdGVXaXRoUGFzdGVib2FyZDphbGxvd1BsYWluVGV4dDpdKToKKwogMjAx MC0wMS0yNSAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgogCiAgICAgICAg IEZlYXR1cmVsZXNzIGJ1aWxkIGZpeGVzLgpJbmRleDogV2ViS2l0L21hYy9XZWJWaWV3L1dlYkhU TUxWaWV3Lm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9tYWMvV2ViVmlldy9XZWJIVE1MVmlldy5t bQkocmV2aXNpb24gNTQwMTIpCisrKyBXZWJLaXQvbWFjL1dlYlZpZXcvV2ViSFRNTFZpZXcubW0J KHdvcmtpbmcgY29weSkKQEAgLTEwMyw2ICsxMDMsNyBAQAogI2ltcG9ydCA8V2ViQ29yZS9QYWdl Lmg+CiAjaW1wb3J0IDxXZWJDb3JlL1BsYXRmb3JtS2V5Ym9hcmRFdmVudC5oPgogI2ltcG9ydCA8 V2ViQ29yZS9SYW5nZS5oPgorI2ltcG9ydCA8V2ViQ29yZS9SdW50aW1lQXBwbGljYXRpb25DaGVj a3MuaD4KICNpbXBvcnQgPFdlYkNvcmUvU2VsZWN0aW9uQ29udHJvbGxlci5oPgogI2ltcG9ydCA8 V2ViQ29yZS9TaGFyZWRCdWZmZXIuaD4KICNpbXBvcnQgPFdlYkNvcmUvU2ltcGxlRm9udERhdGEu aD4KQEAgLTc5NiwxMCArNzk3LDI2IEBAIHN0YXRpYyBOU1VSTCogdW5pcXVlVVJMV2l0aFJlbGF0 aXZlUGFydCgKICAgICBbd2ViVmlldyBfc2V0SW5zZXJ0aW9uUGFzdGVib2FyZDpwYXN0ZWJvYXJk XTsKIAogICAgIERPTVJhbmdlICpyYW5nZSA9IFtzZWxmIF9zZWxlY3RlZFJhbmdlXTsKKyAgICAK KyNpZiAhZGVmaW5lZChCVUlMRElOR19PTl9USUdFUikgJiYgIWRlZmluZWQoQlVJTERJTkdfT05f TEVPUEFSRCkgJiYgIWRlZmluZWQoQlVJTERJTkdfT05fU05PV19MRU9QQVJEKQogICAgIERPTURv Y3VtZW50RnJhZ21lbnQgKmZyYWdtZW50ID0gW3NlbGYgX2RvY3VtZW50RnJhZ21lbnRGcm9tUGFz dGVib2FyZDpwYXN0ZWJvYXJkIGluQ29udGV4dDpyYW5nZSBhbGxvd1BsYWluVGV4dDphbGxvd1Bs YWluVGV4dF07CiAgICAgaWYgKGZyYWdtZW50ICYmIFtzZWxmIF9zaG91bGRJbnNlcnRGcmFnbWVu dDpmcmFnbWVudCByZXBsYWNpbmdET01SYW5nZTpyYW5nZSBnaXZlbkFjdGlvbjpXZWJWaWV3SW5z ZXJ0QWN0aW9uUGFzdGVkXSkKICAgICAgICAgW1tzZWxmIF9mcmFtZV0gX3JlcGxhY2VTZWxlY3Rp b25XaXRoRnJhZ21lbnQ6ZnJhZ21lbnQgc2VsZWN0UmVwbGFjZW1lbnQ6Tk8gc21hcnRSZXBsYWNl OltzZWxmIF9jYW5TbWFydFJlcGxhY2VXaXRoUGFzdGVib2FyZDpwYXN0ZWJvYXJkXSBtYXRjaFN0 eWxlOk5PXTsKLQorI2Vsc2UKKyAgICAvLyBNYWlsIGlzIGlnbm9yaW5nIHRoZSBmcmFtZW50IHBh c3NlZCB0byB0aGUgZGVsZWdhdGUgYW5kIGNyZWF0ZXMgYSBuZXcgb25lLgorICAgIC8vIFdlIHdh bnQgdG8gYXZvaWQgY3JlYXRpbmcgdGhlIGZyYWdtZW50IHR3aWNlLgorICAgIGlmIChhcHBsaWNh dGlvbklzQXBwbGVNYWlsKCkpIHsKKyAgICAgICAgaWYgKFtzZWxmIF9zaG91bGRJbnNlcnRGcmFn bWVudDpuaWwgcmVwbGFjaW5nRE9NUmFuZ2U6cmFuZ2UgZ2l2ZW5BY3Rpb246V2ViVmlld0luc2Vy dEFjdGlvblBhc3RlZF0pIHsKKyAgICAgICAgICAgIERPTURvY3VtZW50RnJhZ21lbnQgKmZyYWdt ZW50ID0gW3NlbGYgX2RvY3VtZW50RnJhZ21lbnRGcm9tUGFzdGVib2FyZDpwYXN0ZWJvYXJkIGlu Q29udGV4dDpyYW5nZSBhbGxvd1BsYWluVGV4dDphbGxvd1BsYWluVGV4dF07CisgICAgICAgICAg ICBpZiAoZnJhZ21lbnQpCisgICAgICAgICAgICAgICAgW1tzZWxmIF9mcmFtZV0gX3JlcGxhY2VT ZWxlY3Rpb25XaXRoRnJhZ21lbnQ6ZnJhZ21lbnQgc2VsZWN0UmVwbGFjZW1lbnQ6Tk8gc21hcnRS ZXBsYWNlOltzZWxmIF9jYW5TbWFydFJlcGxhY2VXaXRoUGFzdGVib2FyZDpwYXN0ZWJvYXJkXSBt YXRjaFN0eWxlOk5PXTsKKyAgICAgICAgfSAgICAgICAgCisgICAgfSBlbHNlIHsKKyAgICAgICAg RE9NRG9jdW1lbnRGcmFnbWVudCAqZnJhZ21lbnQgPSBbc2VsZiBfZG9jdW1lbnRGcmFnbWVudEZy b21QYXN0ZWJvYXJkOnBhc3RlYm9hcmQgaW5Db250ZXh0OnJhbmdlIGFsbG93UGxhaW5UZXh0OmFs bG93UGxhaW5UZXh0XTsKKyAgICAgICAgaWYgKGZyYWdtZW50ICYmIFtzZWxmIF9zaG91bGRJbnNl cnRGcmFnbWVudDpmcmFnbWVudCByZXBsYWNpbmdET01SYW5nZTpyYW5nZSBnaXZlbkFjdGlvbjpX ZWJWaWV3SW5zZXJ0QWN0aW9uUGFzdGVkXSkKKyAgICAgICAgICAgIFtbc2VsZiBfZnJhbWVdIF9y ZXBsYWNlU2VsZWN0aW9uV2l0aEZyYWdtZW50OmZyYWdtZW50IHNlbGVjdFJlcGxhY2VtZW50Ok5P IHNtYXJ0UmVwbGFjZTpbc2VsZiBfY2FuU21hcnRSZXBsYWNlV2l0aFBhc3RlYm9hcmQ6cGFzdGVi b2FyZF0gbWF0Y2hTdHlsZTpOT107CisgICAgfQorI2VuZGlmCiAgICAgW3dlYlZpZXcgX3NldElu c2VydGlvblBhc3RlYm9hcmQ6bmlsXTsKICAgICBbd2ViVmlldyByZWxlYXNlXTsKIH0K