29740 2009-09-25 09:44:56 -0700 Gmail: After changing a foreground text color, pressing return doesn't apply background to new line 2009-09-25 12:25:26 -0700 1 1 1 Unclassified WebKit HTML Editing 528+ (Nightly build) PC All RESOLVED FIXED InRadar P2 Normal --- 1 enrica webkit-unassigned adele eric rniwa oldest_to_newest 150038 0 enrica 2009-09-25 09:44:56 -0700 * STEPS TO REPRODUCE 1. Launch TOT or stock Safari 4.0.3 under SL 10A342. 2. Login to your Gmail account and click Compose Mail. 3. On the Gmail toolbar , click the Highlight text color icon. Select a color from this palette. 4. Type in the message and verify the background color is applied. Now click on the Text Color icon and choose a different color. 5. Continue to type and verify new text color is being used when you type. 6. Now , press <return> to create a new line. Type on this new line and notice the background color is missing when you type. <rdar://problem/7168738> 150050 1 40118 enrica 2009-09-25 10:35:50 -0700 Created attachment 40118 Patch Adding the patch. 150056 2 adele 2009-09-25 10:39:27 -0700 I'm going to commit this. 150058 3 40118 darin 2009-09-25 10:40:33 -0700 Comment on attachment 40118 Patch I was about to say r=me, but Adele beat me to it. > +void InsertParagraphSeparatorCommand::ancestorsInsideBlock(const Node* insertionNode, Element* outerBlock, Vector<Element*>& ancestors) Functions with an out argument like this have "get" in their name in the WebKit coding style, so this should be named getAncestorsInsideBlock. But I just realized this is not in the coding style document. We should add that! This also requires an empty vector, because it appends, but does not clear the vector. That's probably OK. I'm not sure. r=me but please add the "get" 150077 4 40125 enrica 2009-09-25 11:06:01 -0700 Created attachment 40125 Patch2 New patch that includes the name change (getAncestorsInsideBlock) and the clear of the vector before appending. 150092 5 adele 2009-09-25 11:58:28 -0700 <rdar://problem/7168738> Committed revision 48764. 40118 2009-09-25 10:35:50 -0700 2009-09-25 11:06:01 -0700 Patch bug7188738.txt text/plain 11272 enrica SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0ODc1NikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMzAgQEAKKzIwMDktMDktMjQgIEVucmljYSBDYXN1Y2NpICA8ZW5yaWNhQGFwcGxl LmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBD aGFuZ2UgdGhlIHdheSBzdHlsZSBpcyBwcmVzZXJ2ZWQgd2hlbiBpbnNlcnRpbmcgYSBuZXcgcGFy YWdyYXBoIDxyZGFyOi8vcHJvYmxlbS83MTY4NzM4Pi4KKyAgICAgICAgVGhlIG9yaWdpbmFsIGNv ZGUgaGFuZGxlZCBpbnNlcnRpb24gYXQgdGhlIGJlZ2lubmluZyBhbmQgYXQgdGhlIGVuZCBvZiBh IHBhcmFncmFwaCBhcyBzcGVjaWFsCisgICAgICAgIGNhc2VzLiBUaGUgbmV3bHkgY3JlYXRlZCBw YXJhZ3JhcGggY29udGFpbmVkIGEgc2V0IG9mIG5vZGVzIGdlbmVyYXRlZCBzdGFydGluZyBmcm9t IHRoZQorICAgICAgICBjb21wdXRlZCBzdHlsZSBvZiB0aGUgaW5zZXJ0aW9uIG5vZGUuIFRoaXMg YXBwcm9hY2ggaGFzIHR3byBwcm9ibGVtczoKKyAgICAgICAgMS4gaWYgdGhlIGluc2VydGlvbiBu b2RlIGhhcyBhIG5vbiBvcGFxdWUgYmFja2dyb3VuZCBjb2xvciBhbmQgb25lIG9mIHRoZSBwYXJl bnQgZWxlbWVudCBkaWQgaGF2ZQorICAgICAgICBhIHNvbGlkIGJhY2tncm91bmQgY29sb3IgdGhl IG5ldyBwYXJhZ3JhcGggZGlkIG5vdCBoYXZlIHRoZSBlbGVtZW50IHdpdGggdGhlIHNvbGlkIGNv bG9yIGluIHRoZSB0cmVlLgorICAgICAgICAyLiBpbiBzb21lIGNpcmN1bXN0YW5jZXMgaXQgZ2Vu ZXJhdGVkIG1vcmUgbWFya3VwIHRoYW4gdGhlIG9yaWdpbmFsIHBhcmFncmFwaCBoYWQgKGEgc3Bh biB3aXRoIGJvbGQsIGl0YWxpYywKKyAgICAgICAgYmFja2dyb3VuZCBjb2xvciBhbmQgc29tZSBm b250IGF0dHJpYnV0ZSB3YXMgYmVpbmcgcmVwcm9kdWNlZCBhcyBzcGFuICsgYm9sZCArIGl0YWxp YyArIGZvbnQgYXMgc2VwYXJhdGUgdGFncy4KKyAgICAgICAgVGhlIG5ldyBhcHByb2FjaCBpcyB0 byByZWNyZWF0ZSBpbiB0aGUgbmV3IHBhcmFncmFwaCB0aGUgc2FtZSBoaWVyYXJjaHkgb2Ygbm9k ZXMgZm91bmQgaW4gdGhlCisgICAgICAgIHBhcmFncmFwaCB3aGVyZSB0aGUgaW5zZXJ0aW9uIHBv aW50IGlzLgorCisgICAgICAgIFRlc3Q6IGVkaXRpbmcvaW5zZXJ0aW5nL2luc2VydC1iZy1mb250 Lmh0bWwKKworICAgICAgICAqIGVkaXRpbmcvSW5zZXJ0UGFyYWdyYXBoU2VwYXJhdG9yQ29tbWFu ZC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJbnNlcnRQYXJhZ3JhcGhTZXBhcmF0b3JDb21tYW5k OjphbmNlc3RvcnNJbnNpZGVCbG9jayk6IHJldHVybnMgdGhlIGxpc3Qgb2YgYWxsIHRoZSBhbmNl c3RvcnMKKyAgICAgICAgYmV0d2VlbiB0aGUgaW5zZXJ0IG5vZGUgYW5kIHRoZSBvdXRlciBibG9j ay4KKyAgICAgICAgKFdlYkNvcmU6Okluc2VydFBhcmFncmFwaFNlcGFyYXRvckNvbW1hbmQ6OmNs b25lSGllcmFyY2h5VW5kZXJOZXdCbG9jayk6IHVzZXMgdGhlIGxpc3Qgb2YgYW5jZXN0b3JzIHRv IHJlY3JlYXRlCisgICAgICAgIGluIHRoZSBuZXcgcGFyYWdyYXBoIHRoZSBzYW1lIGVsZW1lbnQg aGllcmFyY2h5IHByZXNlbnQgaW4gdGhlIHN0YXJ0aW5nIHBhcmFncmFwaC4KKyAgICAgICAgKFdl YkNvcmU6Okluc2VydFBhcmFncmFwaFNlcGFyYXRvckNvbW1hbmQ6OmRvQXBwbHkpOiBjaGFuZ2Vk IHRoZSBjb2RlIHRvIGhhbmRsZSB0aGUgZ2VuZXJhbCBjYXNlIG9mIGluc2VydGlvbgorICAgICAg ICBpbiB0aGUgbWlkZGxlIG9mIHRoZSBwYXJhZ3JhcGggdG8gdXNlIHRoZSBuZXcgbWV0aG9kcy4g Q2hhbmdlZCB0aGUgaGFuZGxpbmcgb2YgdGhlIGluc2VydGlvbiBhdCB0aGUgYmVnaW5uaW5nIGFu ZAorICAgICAgICBhdCB0aGUgZW5kIG9mIHRoZSBwYXJhZ3JhcGggdG8gdXNlIHRoZSBuZXcgbWV0 aG9kcyBpbnN0ZWFkIG9mIGFwcGx5aW5nIHRoZSBjYWxjdWxhdGVkIHN0eWxlLgorICAgICAgICAq IGVkaXRpbmcvSW5zZXJ0UGFyYWdyYXBoU2VwYXJhdG9yQ29tbWFuZC5oOiBhZGRlZCBtZXRob2Rz IGFuY2VzdG9yc0luc2lkZUJsb2NrIGFuZCBjbG9uZUhpZXJhcmNoeVVuZGVyTmV3QmxvY2suCisK IDIwMDktMDktMjUgIEFsZXhhbmRlciBQYXZsb3YgIDxhcGF2bG92QGNocm9taXVtLm9yZz4KIAog ICAgICAgICBSZXZpZXdlZCBieSBEYW4gQmVybnN0ZWluLgpJbmRleDogV2ViQ29yZS9lZGl0aW5n L0luc2VydFBhcmFncmFwaFNlcGFyYXRvckNvbW1hbmQuY3BwCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNv cmUvZWRpdGluZy9JbnNlcnRQYXJhZ3JhcGhTZXBhcmF0b3JDb21tYW5kLmNwcAkocmV2aXNpb24g NDg3NTYpCisrKyBXZWJDb3JlL2VkaXRpbmcvSW5zZXJ0UGFyYWdyYXBoU2VwYXJhdG9yQ29tbWFu ZC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEwMyw2ICsxMDMsMjggQEAgYm9vbCBJbnNlcnRQYXJh Z3JhcGhTZXBhcmF0b3JDb21tYW5kOjpzaAogICAgICAgICAgICBlbmNsb3NpbmdCbG9jay0+aGFz VGFnTmFtZShoNVRhZyk7CiB9CiAKK3ZvaWQgSW5zZXJ0UGFyYWdyYXBoU2VwYXJhdG9yQ29tbWFu ZDo6YW5jZXN0b3JzSW5zaWRlQmxvY2soY29uc3QgTm9kZSogaW5zZXJ0aW9uTm9kZSwgRWxlbWVu dCogb3V0ZXJCbG9jaywgVmVjdG9yPEVsZW1lbnQqPiYgYW5jZXN0b3JzKQoreworICAgIC8vIEJ1 aWxkIHVwIGxpc3Qgb2YgYW5jZXN0b3JzIGVsZW1lbnRzIGJldHdlZW4gdGhlIGluc2VydGlvbiBu b2RlIGFuZCB0aGUgb3V0ZXIgYmxvY2suCisgICAgaWYgKGluc2VydGlvbk5vZGUgIT0gb3V0ZXJC bG9jaykgeworICAgICAgICBmb3IgKEVsZW1lbnQqIG4gPSBpbnNlcnRpb25Ob2RlLT5wYXJlbnRF bGVtZW50KCk7IG4gJiYgbiAhPSBvdXRlckJsb2NrOyBuID0gbi0+cGFyZW50RWxlbWVudCgpKQor ICAgICAgICAgICAgYW5jZXN0b3JzLmFwcGVuZChuKTsKKyAgICB9Cit9CisKK1Bhc3NSZWZQdHI8 RWxlbWVudD4gSW5zZXJ0UGFyYWdyYXBoU2VwYXJhdG9yQ29tbWFuZDo6Y2xvbmVIaWVyYXJjaHlV bmRlck5ld0Jsb2NrKGNvbnN0IFZlY3RvcjxFbGVtZW50Kj4mIGFuY2VzdG9ycywgUGFzc1JlZlB0 cjxFbGVtZW50PiBibG9ja1RvSW5zZXJ0KQoreworICAgIC8vIE1ha2UgY2xvbmVzIG9mIGFuY2Vz dG9ycyBpbiBiZXR3ZWVuIHRoZSBzdGFydCBub2RlIGFuZCB0aGUgc3RhcnQgYmxvY2suCisgICAg UmVmUHRyPEVsZW1lbnQ+IHBhcmVudCA9IGJsb2NrVG9JbnNlcnQ7CisgICAgZm9yIChzaXplX3Qg aSA9IGFuY2VzdG9ycy5zaXplKCk7IGkgIT0gMDsgLS1pKSB7CisgICAgICAgIFJlZlB0cjxFbGVt ZW50PiBjaGlsZCA9IGFuY2VzdG9yc1tpIC0gMV0tPmNsb25lRWxlbWVudFdpdGhvdXRDaGlsZHJl bigpOworICAgICAgICBhcHBlbmROb2RlKGNoaWxkLCBwYXJlbnQpOworICAgICAgICBwYXJlbnQg PSBjaGlsZC5yZWxlYXNlKCk7CisgICAgfQorICAgIAorICAgIHJldHVybiBwYXJlbnQucmVsZWFz ZSgpOworfQorCiB2b2lkIEluc2VydFBhcmFncmFwaFNlcGFyYXRvckNvbW1hbmQ6OmRvQXBwbHko KQogewogICAgIGJvb2wgc3BsaXRUZXh0ID0gZmFsc2U7CkBAIC0xOTMsMTIgKzIxNSwxOCBAQCB2 b2lkIEluc2VydFBhcmFncmFwaFNlcGFyYXRvckNvbW1hbmQ6OmRvCiAgICAgICAgICAgICBpbnNl cnROb2RlQWZ0ZXIoYmxvY2tUb0luc2VydCwgc3RhcnRCbG9jayk7CiAgICAgICAgIH0KIAotICAg ICAgICBhcHBlbmRCbG9ja1BsYWNlaG9sZGVyKGJsb2NrVG9JbnNlcnQpOwotICAgICAgICBzZXRF bmRpbmdTZWxlY3Rpb24oVmlzaWJsZVNlbGVjdGlvbihQb3NpdGlvbihibG9ja1RvSW5zZXJ0Lmdl dCgpLCAwKSwgRE9XTlNUUkVBTSkpOwotICAgICAgICBpZiAoc2hvdWxkQXBwbHlTdHlsZUFmdGVy SW5zZXJ0aW9uKQotICAgICAgICAgICAgYXBwbHlTdHlsZUFmdGVySW5zZXJ0aW9uKHN0YXJ0Qmxv Y2spOworICAgICAgICAvLyBSZWNyZWF0ZSB0aGUgc2FtZSBzdHJ1Y3R1cmUgaW4gdGhlIG5ldyBw YXJhZ3JhcGguCisgICAgICAgIAorICAgICAgICBWZWN0b3I8RWxlbWVudCo+IGFuY2VzdG9yczsK KyAgICAgICAgYW5jZXN0b3JzSW5zaWRlQmxvY2soaW5zZXJ0aW9uUG9zaXRpb24ubm9kZSgpLCBz dGFydEJsb2NrLCBhbmNlc3RvcnMpOyAgICAgIAorICAgICAgICBSZWZQdHI8RWxlbWVudD4gcGFy ZW50ID0gY2xvbmVIaWVyYXJjaHlVbmRlck5ld0Jsb2NrKGFuY2VzdG9ycywgYmxvY2tUb0luc2Vy dCk7CisgICAgICAgIAorICAgICAgICBhcHBlbmRCbG9ja1BsYWNlaG9sZGVyKHBhcmVudCk7CisK KyAgICAgICAgc2V0RW5kaW5nU2VsZWN0aW9uKFZpc2libGVTZWxlY3Rpb24oUG9zaXRpb24ocGFy ZW50LmdldCgpLCAwKSwgRE9XTlNUUkVBTSkpOwogICAgICAgICByZXR1cm47CiAgICAgfQorICAg IAogCiAgICAgLy8tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KICAgICAvLyBIYW5kbGUgY2FzZSB3aGVuIHBvc2l0aW9u IGlzIGluIHRoZSBmaXJzdCB2aXNpYmxlIHBvc2l0aW9uIGluIGl0cyBibG9jaywgYW5kCkBAIC0y MTcsOSArMjQ1LDE1IEBAIHZvaWQgSW5zZXJ0UGFyYWdyYXBoU2VwYXJhdG9yQ29tbWFuZDo6ZG8K ICAgICAgICAgaW5zZXJ0aW9uUG9zaXRpb24gPSBpbnNlcnRpb25Qb3NpdGlvbi5kb3duc3RyZWFt KCk7CiAgICAgICAgIAogICAgICAgICBpbnNlcnROb2RlQmVmb3JlKGJsb2NrVG9JbnNlcnQsIHJl Zk5vZGUpOwotICAgICAgICBhcHBlbmRCbG9ja1BsYWNlaG9sZGVyKGJsb2NrVG9JbnNlcnQuZ2V0 KCkpOwotICAgICAgICBzZXRFbmRpbmdTZWxlY3Rpb24oVmlzaWJsZVNlbGVjdGlvbihQb3NpdGlv bihibG9ja1RvSW5zZXJ0LmdldCgpLCAwKSwgRE9XTlNUUkVBTSkpOwotICAgICAgICBhcHBseVN0 eWxlQWZ0ZXJJbnNlcnRpb24oc3RhcnRCbG9jayk7CisKKyAgICAgICAgLy8gUmVjcmVhdGUgdGhl IHNhbWUgc3RydWN0dXJlIGluIHRoZSBuZXcgcGFyYWdyYXBoLgorCisgICAgICAgIFZlY3RvcjxF bGVtZW50Kj4gYW5jZXN0b3JzOworICAgICAgICBhbmNlc3RvcnNJbnNpZGVCbG9jayhwb3NpdGlv bkF2b2lkaW5nU3BlY2lhbEVsZW1lbnRCb3VuZGFyeShpbnNlcnRpb25Qb3NpdGlvbikubm9kZSgp LCBzdGFydEJsb2NrLCBhbmNlc3RvcnMpOworICAgICAgICAKKyAgICAgICAgYXBwZW5kQmxvY2tQ bGFjZWhvbGRlcihjbG9uZUhpZXJhcmNoeVVuZGVyTmV3QmxvY2soYW5jZXN0b3JzLCBibG9ja1Rv SW5zZXJ0KSk7CisgICAgICAgIAorICAgICAgICAvLyBJbiB0aGlzIGNhc2UsIHdlIG5lZWQgdG8g c2V0IHRoZSBuZXcgZW5kaW5nIHNlbGVjdGlvbi4KICAgICAgICAgc2V0RW5kaW5nU2VsZWN0aW9u KFZpc2libGVTZWxlY3Rpb24oaW5zZXJ0aW9uUG9zaXRpb24sIERPV05TVFJFQU0pKTsKICAgICAg ICAgcmV0dXJuOwogICAgIH0KQEAgLTI0OCwxMCArMjgyLDcgQEAgdm9pZCBJbnNlcnRQYXJhZ3Jh cGhTZXBhcmF0b3JDb21tYW5kOjpkbwogCiAgICAgLy8gQnVpbGQgdXAgbGlzdCBvZiBhbmNlc3Rv cnMgaW4gYmV0d2VlbiB0aGUgc3RhcnQgbm9kZSBhbmQgdGhlIHN0YXJ0IGJsb2NrLgogICAgIFZl Y3RvcjxFbGVtZW50Kj4gYW5jZXN0b3JzOwotICAgIGlmIChpbnNlcnRpb25Qb3NpdGlvbi5ub2Rl KCkgIT0gc3RhcnRCbG9jaykgewotICAgICAgICBmb3IgKEVsZW1lbnQqIG4gPSBpbnNlcnRpb25Q b3NpdGlvbi5ub2RlKCktPnBhcmVudEVsZW1lbnQoKTsgbiAmJiBuICE9IHN0YXJ0QmxvY2s7IG4g PSBuLT5wYXJlbnRFbGVtZW50KCkpCi0gICAgICAgICAgICBhbmNlc3RvcnMuYXBwZW5kKG4pOwot ICAgIH0KKyAgICBhbmNlc3RvcnNJbnNpZGVCbG9jayhpbnNlcnRpb25Qb3NpdGlvbi5ub2RlKCks IHN0YXJ0QmxvY2ssIGFuY2VzdG9ycyk7CiAKICAgICAvLyBNYWtlIHN1cmUgd2UgZG8gbm90IGNh dXNlIGEgcmVuZGVyZWQgc3BhY2UgdG8gYmVjb21lIHVucmVuZGVyZWQuCiAgICAgLy8gRklYTUU6 IFdlIG5lZWQgdGhlIGFmZmluaXR5IGZvciBwb3MsIGJ1dCBwb3MuZG93bnN0cmVhbSgpIGRvZXMg bm90IGdpdmUgaXQKQEAgLTI4NCwxMyArMzE1LDggQEAgdm9pZCBJbnNlcnRQYXJhZ3JhcGhTZXBh cmF0b3JDb21tYW5kOjpkbwogCiAgICAgdXBkYXRlTGF5b3V0KCk7CiAgICAgCi0gICAgLy8gTWFr ZSBjbG9uZXMgb2YgYW5jZXN0b3JzIGluIGJldHdlZW4gdGhlIHN0YXJ0IG5vZGUgYW5kIHRoZSBz dGFydCBibG9jay4KLSAgICBSZWZQdHI8RWxlbWVudD4gcGFyZW50ID0gYmxvY2tUb0luc2VydDsK LSAgICBmb3IgKHNpemVfdCBpID0gYW5jZXN0b3JzLnNpemUoKTsgaSAhPSAwOyAtLWkpIHsKLSAg ICAgICAgUmVmUHRyPEVsZW1lbnQ+IGNoaWxkID0gYW5jZXN0b3JzW2kgLSAxXS0+Y2xvbmVFbGVt ZW50V2l0aG91dENoaWxkcmVuKCk7Ci0gICAgICAgIGFwcGVuZE5vZGUoY2hpbGQsIHBhcmVudCk7 Ci0gICAgICAgIHBhcmVudCA9IGNoaWxkLnJlbGVhc2UoKTsKLSAgICB9CisgICAgLy8gTWFrZSBj bG9uZXMgb2YgYW5jZXN0b3JzIGluIGJldHdlZW4gdGhlIHN0YXJ0IG5vZGUgYW5kIHRoZSBvdXRl ciBibG9jay4KKyAgICBSZWZQdHI8RWxlbWVudD4gcGFyZW50ID0gY2xvbmVIaWVyYXJjaHlVbmRl ck5ld0Jsb2NrKGFuY2VzdG9ycywgYmxvY2tUb0luc2VydCk7CiAKICAgICAvLyBJZiB0aGUgcGFy YWdyYXBoIHNlcGFyYXRvciB3YXMgaW5zZXJ0ZWQgYXQgdGhlIGVuZCBvZiBhIHBhcmFncmFwaCwg YW4gZW1wdHkgbGluZSBtdXN0IGJlCiAgICAgLy8gY3JlYXRlZC4gIEFsbCBvZiB0aGUgbm9kZXMs IHN0YXJ0aW5nIGF0IHZpc2libGVQb3MsIGFyZSBhYm91dCB0byBiZSBhZGRlZCB0byB0aGUgbmV3 IHBhcmFncmFwaCAKSW5kZXg6IFdlYkNvcmUvZWRpdGluZy9JbnNlcnRQYXJhZ3JhcGhTZXBhcmF0 b3JDb21tYW5kLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9lZGl0aW5nL0luc2VydFBhcmFncmFw aFNlcGFyYXRvckNvbW1hbmQuaAkocmV2aXNpb24gNDg3NTYpCisrKyBXZWJDb3JlL2VkaXRpbmcv SW5zZXJ0UGFyYWdyYXBoU2VwYXJhdG9yQ29tbWFuZC5oCSh3b3JraW5nIGNvcHkpCkBAIC00NCw2 ICs0NCw4IEBAIHByaXZhdGU6CiAKICAgICB2b2lkIGNhbGN1bGF0ZVN0eWxlQmVmb3JlSW5zZXJ0 aW9uKGNvbnN0IFBvc2l0aW9uJik7CiAgICAgdm9pZCBhcHBseVN0eWxlQWZ0ZXJJbnNlcnRpb24o Tm9kZSogb3JpZ2luYWxFbmNsb3NpbmdCbG9jayk7CisgICAgdm9pZCBhbmNlc3RvcnNJbnNpZGVC bG9jayhjb25zdCBOb2RlKiBpbnNlcnRpb25Ob2RlLCBFbGVtZW50KiBvdXRlckJsb2NrLCBWZWN0 b3I8RWxlbWVudCo+JiBhbmNlc3RvcnMpOworICAgIFBhc3NSZWZQdHI8RWxlbWVudD4gY2xvbmVI aWVyYXJjaHlVbmRlck5ld0Jsb2NrKGNvbnN0IFZlY3RvcjxFbGVtZW50Kj4mIGFuY2VzdG9ycywg UGFzc1JlZlB0cjxFbGVtZW50PiBibG9ja1RvSW5zZXJ0KTsKICAgICAKICAgICBib29sIHNob3Vs ZFVzZURlZmF1bHRQYXJhZ3JhcGhFbGVtZW50KE5vZGUqKSBjb25zdDsKIApJbmRleDogTGF5b3V0 VGVzdHMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL0NoYW5nZUxvZwkocmV2 aXNpb24gNDg3NTYpCisrKyBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAg LTEsMyArMSwxNCBAQAorMjAwOS0wOS0yNCAgRW5yaWNhIENhc3VjY2kgIDxlbnJpY2FAYXBwbGUu Y29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFVw ZGF0ZWQgdGhlIGV4cGVjdGVkIHJlc3VsdHMgdG8gcmVmbGVjdCB0aGUgY2hhbmdlcyBpbiB0aGUg d2F5IHRoZSBuZXcgcGFyYWdyYXBoCisgICAgICAgIGlzIGNyZWF0ZWQgYW5kIGFkZGVkIHRlc3Qg Y2FzZSBmb3IgYnVnIDxyZGFyOi8vcHJvYmxlbS83MTY4NzM4Pi4KKworICAgICAgICAqIGVkaXRp bmcvaW5zZXJ0aW5nL2luc2VydC1iZy1mb250Lmh0bWw6IEFkZGVkLgorICAgICAgICAqIHBsYXRm b3JtL21hYy9lZGl0aW5nL2luc2VydGluZy9pbnNlcnQtYmctZm9udC1leHBlY3RlZC50eHQ6IEFk ZGVkLgorICAgICAgICAqIHBsYXRmb3JtL21hYy9lZGl0aW5nL3Bhc3RlYm9hcmQvNTQ3ODI1MC1l eHBlY3RlZC50eHQ6CisKIDIwMDktMDktMjQgIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBh cHBsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGFuIEJlcm5zdGVpbi4KSW5kZXg6IExh eW91dFRlc3RzL2VkaXRpbmcvaW5zZXJ0aW5nL2luc2VydC1iZy1mb250Lmh0bWwKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gTGF5b3V0VGVzdHMvZWRpdGluZy9pbnNlcnRpbmcvaW5zZXJ0LWJnLWZvbnQuaHRtbAko cmV2aXNpb24gMCkKKysrIExheW91dFRlc3RzL2VkaXRpbmcvaW5zZXJ0aW5nL2luc2VydC1iZy1m b250Lmh0bWwJKHJldmlzaW9uIDApCkBAIC0wLDAgKzEsMjEgQEAKKzxodG1sPgorICAgIDxoZWFk PgorICAgICAgICA8c2NyaXB0PgorICAgICAgICAgICAgZnVuY3Rpb24gdGVzdCgpCisgICAgICAg ICAgICB7CisgICAgICAgICAgICAgICAgaWYgKHdpbmRvdy5sYXlvdXRUZXN0Q29udHJvbGxlcikK KyAgICAgICAgICAgICAgICAgICAgbGF5b3V0VGVzdENvbnRyb2xsZXIuZHVtcEFzVGV4dCgpOwor CisgICAgICAgICAgICAgICAgd2luZG93LmdldFNlbGVjdGlvbigpLnNldFBvc2l0aW9uKGRvY3Vt ZW50LmdldEVsZW1lbnRCeUlkKCdkdicpLCAxKTsKKyAgICAgICAgICAgICAgICBkb2N1bWVudC5l eGVjQ29tbWFuZCgiSW5zZXJ0UGFyYWdyYXBoIik7CisgICAgICAgICAgICAgICAgZG9jdW1lbnQu ZXhlY0NvbW1hbmQoIkluc2VydFRleHQiLCBmYWxzZSwgInRoaXMgc2hvdWxkIGFsc28gYmUgYmx1 ZSBvdmVyIGxpZ2h0Z3JleSIpOworCisgICAgICAgICAgICAgICAgZG9jdW1lbnQud3JpdGUoIjx4 bXA+IiArIGRvY3VtZW50LmJvZHkuaW5uZXJIVE1MICsgIjwveG1wPiIpOworICAgICAgICAgICAg fQorICAgICAgICA8L3NjcmlwdD4KKyAgICA8L2hlYWQ+CisgICAgPGJvZHkgb25sb2FkPSJ0ZXN0 KCkiPgorICAgICAgICA8ZGl2IGlkPSJkdiIgY29udGVudGVkaXRhYmxlPjxzcGFuIHN0eWxlPSJi YWNrZ3JvdW5kLWNvbG9yOiBsaWdodGdyZXkiPmxpZ2h0Z3JleSBiYWNrZ3JvdW5kPGZvbnQgY29s b3I9ImJsdWUiPmJsdWUgZm9udCBjb2xvciBvdmVyIGxpZ2h0Z3JleSBiYWNrZ3JvdW5kPC9mb250 Pjwvc3Bhbj4gCis8L2Rpdj4KKyAgICA8L2JvZHk+Cis8L2h0bWw+CkluZGV4OiBMYXlvdXRUZXN0 cy9wbGF0Zm9ybS9tYWMvZWRpdGluZy9pbnNlcnRpbmcvaW5zZXJ0LWJnLWZvbnQtZXhwZWN0ZWQu dHh0Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL3BsYXRmb3JtL21hYy9lZGl0aW5nL2luc2Vy dGluZy9pbnNlcnQtYmctZm9udC1leHBlY3RlZC50eHQJKHJldmlzaW9uIDApCisrKyBMYXlvdXRU ZXN0cy9wbGF0Zm9ybS9tYWMvZWRpdGluZy9pbnNlcnRpbmcvaW5zZXJ0LWJnLWZvbnQtZXhwZWN0 ZWQudHh0CShyZXZpc2lvbiAwKQpAQCAtMCwwICsxLDYgQEAKKworICAgICAgICA8ZGl2IGlkPSJk diIgY29udGVudGVkaXRhYmxlPSIiPjxzcGFuIHN0eWxlPSJiYWNrZ3JvdW5kLWNvbG9yOiBsaWdo dGdyZXkiPmxpZ2h0Z3JleSBiYWNrZ3JvdW5kPGZvbnQgY29sb3I9ImJsdWUiPmJsdWUgZm9udCBj b2xvciBvdmVyIGxpZ2h0Z3JleSBiYWNrZ3JvdW5kPC9mb250Pjwvc3Bhbj4gCis8ZGl2PjxzcGFu IHN0eWxlPSJiYWNrZ3JvdW5kLWNvbG9yOiBsaWdodGdyZXkiPjxmb250IGNvbG9yPSJibHVlIj50 aGlzIHNob3VsZCBhbHNvIGJlIGJsdWUgb3ZlciBsaWdodGdyZXk8L2ZvbnQ+PC9zcGFuPjwvZGl2 PjwvZGl2PgorICAgIAorCisKSW5kZXg6IExheW91dFRlc3RzL3BsYXRmb3JtL21hYy9lZGl0aW5n L3Bhc3RlYm9hcmQvNTQ3ODI1MC1leHBlY3RlZC50eHQKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVz dHMvcGxhdGZvcm0vbWFjL2VkaXRpbmcvcGFzdGVib2FyZC81NDc4MjUwLWV4cGVjdGVkLnR4dAko cmV2aXNpb24gNDg3NTYpCisrKyBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvZWRpdGluZy9wYXN0 ZWJvYXJkLzU0NzgyNTAtZXhwZWN0ZWQudHh0CSh3b3JraW5nIGNvcHkpCkBAIC0xNyw3ICsxNyw3 IEBAIGxheWVyIGF0ICgwLDApIHNpemUgODAweDYwMAogICAgICAgICAgICAgUmVuZGVyVGV4dCB7 I3RleHR9IGF0ICgxMDgsMCkgc2l6ZSAzNHgxOAogICAgICAgICAgICAgICB0ZXh0IHJ1biBhdCAo MTA4LDApIHdpZHRoIDM0OiAiYm9sZC4iCiAgICAgICAgIFJlbmRlckJsb2NrIHtESVZ9IGF0ICgw LDE4KSBzaXplIDc4NHgxOAotICAgICAgICAgIFJlbmRlcklubGluZSB7Qn0gYXQgKDAsMCkgc2l6 ZSAzOTN4MTgKKyAgICAgICAgICBSZW5kZXJJbmxpbmUge1NQQU59IGF0ICgwLDApIHNpemUgMzkz eDE4CiAgICAgICAgICAgICBSZW5kZXJUZXh0IHsjdGV4dH0gYXQgKDAsMCkgc2l6ZSAzOTN4MTgK ICAgICAgICAgICAgICAgdGV4dCBydW4gYXQgKDAsMCkgd2lkdGggMzkzOiAiVGhpcyB0ZXh0IHNo b3VsZCBib2xkIGFuZCBsZWZ0IGp1c3RpZmllZCB3aXRoIFwiU29tZSB0ZXh0Li4uXCIuIgotY2Fy ZXQ6IHBvc2l0aW9uIDYxIG9mIGNoaWxkIDAgeyN0ZXh0fSBvZiBjaGlsZCAwIHtCfSBvZiBjaGls ZCAyIHtESVZ9IG9mIGNoaWxkIDQge0RJVn0gb2YgY2hpbGQgMSB7Qk9EWX0gb2YgY2hpbGQgMCB7 SFRNTH0gb2YgZG9jdW1lbnQKK2NhcmV0OiBwb3NpdGlvbiA2MSBvZiBjaGlsZCAwIHsjdGV4dH0g b2YgY2hpbGQgMCB7U1BBTn0gb2YgY2hpbGQgMiB7RElWfSBvZiBjaGlsZCA0IHtESVZ9IG9mIGNo aWxkIDEge0JPRFl9IG9mIGNoaWxkIDAge0hUTUx9IG9mIGRvY3VtZW50Cg== 40125 2009-09-25 11:06:01 -0700 2009-09-25 11:06:01 -0700 Patch2 bug7188738.txt text/plain 11325 enrica SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0ODc1NikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMzAgQEAKKzIwMDktMDktMjQgIEVucmljYSBDYXN1Y2NpICA8ZW5yaWNhQGFwcGxl LmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBD aGFuZ2UgdGhlIHdheSBzdHlsZSBpcyBwcmVzZXJ2ZWQgd2hlbiBpbnNlcnRpbmcgYSBuZXcgcGFy YWdyYXBoIDxyZGFyOi8vcHJvYmxlbS83MTY4NzM4Pi4KKyAgICAgICAgVGhlIG9yaWdpbmFsIGNv ZGUgaGFuZGxlZCBpbnNlcnRpb24gYXQgdGhlIGJlZ2lubmluZyBhbmQgYXQgdGhlIGVuZCBvZiBh IHBhcmFncmFwaCBhcyBzcGVjaWFsCisgICAgICAgIGNhc2VzLiBUaGUgbmV3bHkgY3JlYXRlZCBw YXJhZ3JhcGggY29udGFpbmVkIGEgc2V0IG9mIG5vZGVzIGdlbmVyYXRlZCBzdGFydGluZyBmcm9t IHRoZQorICAgICAgICBjb21wdXRlZCBzdHlsZSBvZiB0aGUgaW5zZXJ0aW9uIG5vZGUuIFRoaXMg YXBwcm9hY2ggaGFzIHR3byBwcm9ibGVtczoKKyAgICAgICAgMS4gaWYgdGhlIGluc2VydGlvbiBu b2RlIGhhcyBhIG5vbiBvcGFxdWUgYmFja2dyb3VuZCBjb2xvciBhbmQgb25lIG9mIHRoZSBwYXJl bnQgZWxlbWVudCBkaWQgaGF2ZQorICAgICAgICBhIHNvbGlkIGJhY2tncm91bmQgY29sb3IgdGhl IG5ldyBwYXJhZ3JhcGggZGlkIG5vdCBoYXZlIHRoZSBlbGVtZW50IHdpdGggdGhlIHNvbGlkIGNv bG9yIGluIHRoZSB0cmVlLgorICAgICAgICAyLiBpbiBzb21lIGNpcmN1bXN0YW5jZXMgaXQgZ2Vu ZXJhdGVkIG1vcmUgbWFya3VwIHRoYW4gdGhlIG9yaWdpbmFsIHBhcmFncmFwaCBoYWQgKGEgc3Bh biB3aXRoIGJvbGQsIGl0YWxpYywKKyAgICAgICAgYmFja2dyb3VuZCBjb2xvciBhbmQgc29tZSBm b250IGF0dHJpYnV0ZSB3YXMgYmVpbmcgcmVwcm9kdWNlZCBhcyBzcGFuICsgYm9sZCArIGl0YWxp YyArIGZvbnQgYXMgc2VwYXJhdGUgdGFncy4KKyAgICAgICAgVGhlIG5ldyBhcHByb2FjaCBpcyB0 byByZWNyZWF0ZSBpbiB0aGUgbmV3IHBhcmFncmFwaCB0aGUgc2FtZSBoaWVyYXJjaHkgb2Ygbm9k ZXMgZm91bmQgaW4gdGhlCisgICAgICAgIHBhcmFncmFwaCB3aGVyZSB0aGUgaW5zZXJ0aW9uIHBv aW50IGlzLgorCisgICAgICAgIFRlc3Q6IGVkaXRpbmcvaW5zZXJ0aW5nL2luc2VydC1iZy1mb250 Lmh0bWwKKworICAgICAgICAqIGVkaXRpbmcvSW5zZXJ0UGFyYWdyYXBoU2VwYXJhdG9yQ29tbWFu ZC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJbnNlcnRQYXJhZ3JhcGhTZXBhcmF0b3JDb21tYW5k OjpnZXRBbmNlc3RvcnNJbnNpZGVCbG9jayk6IHJldHJpZXZlcyB0aGUgbGlzdCBvZiBhbGwgdGhl IGFuY2VzdG9ycworICAgICAgICBiZXR3ZWVuIHRoZSBpbnNlcnQgbm9kZSBhbmQgdGhlIG91dGVy IGJsb2NrLgorICAgICAgICAoV2ViQ29yZTo6SW5zZXJ0UGFyYWdyYXBoU2VwYXJhdG9yQ29tbWFu ZDo6Y2xvbmVIaWVyYXJjaHlVbmRlck5ld0Jsb2NrKTogdXNlcyB0aGUgbGlzdCBvZiBhbmNlc3Rv cnMgdG8gcmVjcmVhdGUKKyAgICAgICAgaW4gdGhlIG5ldyBwYXJhZ3JhcGggdGhlIHNhbWUgZWxl bWVudCBoaWVyYXJjaHkgcHJlc2VudCBpbiB0aGUgc3RhcnRpbmcgcGFyYWdyYXBoLgorICAgICAg ICAoV2ViQ29yZTo6SW5zZXJ0UGFyYWdyYXBoU2VwYXJhdG9yQ29tbWFuZDo6ZG9BcHBseSk6IGNo YW5nZWQgdGhlIGNvZGUgdG8gaGFuZGxlIHRoZSBnZW5lcmFsIGNhc2Ugb2YgaW5zZXJ0aW9uCisg ICAgICAgIGluIHRoZSBtaWRkbGUgb2YgdGhlIHBhcmFncmFwaCB0byB1c2UgdGhlIG5ldyBtZXRo b2RzLiBDaGFuZ2VkIHRoZSBoYW5kbGluZyBvZiB0aGUgaW5zZXJ0aW9uIGF0IHRoZSBiZWdpbm5p bmcgYW5kCisgICAgICAgIGF0IHRoZSBlbmQgb2YgdGhlIHBhcmFncmFwaCB0byB1c2UgdGhlIG5l dyBtZXRob2RzIGluc3RlYWQgb2YgYXBwbHlpbmcgdGhlIGNhbGN1bGF0ZWQgc3R5bGUuCisgICAg ICAgICogZWRpdGluZy9JbnNlcnRQYXJhZ3JhcGhTZXBhcmF0b3JDb21tYW5kLmg6IGFkZGVkIG1l dGhvZHMgZ2V0QW5jZXN0b3JzSW5zaWRlQmxvY2sgYW5kIGNsb25lSGllcmFyY2h5VW5kZXJOZXdC bG9jay4KKwogMjAwOS0wOS0yNSAgQWxleGFuZGVyIFBhdmxvdiAgPGFwYXZsb3ZAY2hyb21pdW0u b3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IERhbiBCZXJuc3RlaW4uCkluZGV4OiBXZWJDb3Jl L2VkaXRpbmcvSW5zZXJ0UGFyYWdyYXBoU2VwYXJhdG9yQ29tbWFuZC5jcHAKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gV2ViQ29yZS9lZGl0aW5nL0luc2VydFBhcmFncmFwaFNlcGFyYXRvckNvbW1hbmQuY3BwCShy ZXZpc2lvbiA0ODc1NikKKysrIFdlYkNvcmUvZWRpdGluZy9JbnNlcnRQYXJhZ3JhcGhTZXBhcmF0 b3JDb21tYW5kLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTAzLDYgKzEwMywzMCBAQCBib29sIElu c2VydFBhcmFncmFwaFNlcGFyYXRvckNvbW1hbmQ6OnNoCiAgICAgICAgICAgIGVuY2xvc2luZ0Js b2NrLT5oYXNUYWdOYW1lKGg1VGFnKTsKIH0KIAordm9pZCBJbnNlcnRQYXJhZ3JhcGhTZXBhcmF0 b3JDb21tYW5kOjpnZXRBbmNlc3RvcnNJbnNpZGVCbG9jayhjb25zdCBOb2RlKiBpbnNlcnRpb25O b2RlLCBFbGVtZW50KiBvdXRlckJsb2NrLCBWZWN0b3I8RWxlbWVudCo+JiBhbmNlc3RvcnMpCit7 CisgICAgYW5jZXN0b3JzLmNsZWFyKCk7CisgICAgCisgICAgLy8gQnVpbGQgdXAgbGlzdCBvZiBh bmNlc3RvcnMgZWxlbWVudHMgYmV0d2VlbiB0aGUgaW5zZXJ0aW9uIG5vZGUgYW5kIHRoZSBvdXRl ciBibG9jay4KKyAgICBpZiAoaW5zZXJ0aW9uTm9kZSAhPSBvdXRlckJsb2NrKSB7CisgICAgICAg IGZvciAoRWxlbWVudCogbiA9IGluc2VydGlvbk5vZGUtPnBhcmVudEVsZW1lbnQoKTsgbiAmJiBu ICE9IG91dGVyQmxvY2s7IG4gPSBuLT5wYXJlbnRFbGVtZW50KCkpCisgICAgICAgICAgICBhbmNl c3RvcnMuYXBwZW5kKG4pOworICAgIH0KK30KKworUGFzc1JlZlB0cjxFbGVtZW50PiBJbnNlcnRQ YXJhZ3JhcGhTZXBhcmF0b3JDb21tYW5kOjpjbG9uZUhpZXJhcmNoeVVuZGVyTmV3QmxvY2soY29u c3QgVmVjdG9yPEVsZW1lbnQqPiYgYW5jZXN0b3JzLCBQYXNzUmVmUHRyPEVsZW1lbnQ+IGJsb2Nr VG9JbnNlcnQpCit7CisgICAgLy8gTWFrZSBjbG9uZXMgb2YgYW5jZXN0b3JzIGluIGJldHdlZW4g dGhlIHN0YXJ0IG5vZGUgYW5kIHRoZSBzdGFydCBibG9jay4KKyAgICBSZWZQdHI8RWxlbWVudD4g cGFyZW50ID0gYmxvY2tUb0luc2VydDsKKyAgICBmb3IgKHNpemVfdCBpID0gYW5jZXN0b3JzLnNp emUoKTsgaSAhPSAwOyAtLWkpIHsKKyAgICAgICAgUmVmUHRyPEVsZW1lbnQ+IGNoaWxkID0gYW5j ZXN0b3JzW2kgLSAxXS0+Y2xvbmVFbGVtZW50V2l0aG91dENoaWxkcmVuKCk7CisgICAgICAgIGFw cGVuZE5vZGUoY2hpbGQsIHBhcmVudCk7CisgICAgICAgIHBhcmVudCA9IGNoaWxkLnJlbGVhc2Uo KTsKKyAgICB9CisgICAgCisgICAgcmV0dXJuIHBhcmVudC5yZWxlYXNlKCk7Cit9CisKIHZvaWQg SW5zZXJ0UGFyYWdyYXBoU2VwYXJhdG9yQ29tbWFuZDo6ZG9BcHBseSgpCiB7CiAgICAgYm9vbCBz cGxpdFRleHQgPSBmYWxzZTsKQEAgLTE5MywxMiArMjE3LDE4IEBAIHZvaWQgSW5zZXJ0UGFyYWdy YXBoU2VwYXJhdG9yQ29tbWFuZDo6ZG8KICAgICAgICAgICAgIGluc2VydE5vZGVBZnRlcihibG9j a1RvSW5zZXJ0LCBzdGFydEJsb2NrKTsKICAgICAgICAgfQogCi0gICAgICAgIGFwcGVuZEJsb2Nr UGxhY2Vob2xkZXIoYmxvY2tUb0luc2VydCk7Ci0gICAgICAgIHNldEVuZGluZ1NlbGVjdGlvbihW aXNpYmxlU2VsZWN0aW9uKFBvc2l0aW9uKGJsb2NrVG9JbnNlcnQuZ2V0KCksIDApLCBET1dOU1RS RUFNKSk7Ci0gICAgICAgIGlmIChzaG91bGRBcHBseVN0eWxlQWZ0ZXJJbnNlcnRpb24pCi0gICAg ICAgICAgICBhcHBseVN0eWxlQWZ0ZXJJbnNlcnRpb24oc3RhcnRCbG9jayk7CisgICAgICAgIC8v IFJlY3JlYXRlIHRoZSBzYW1lIHN0cnVjdHVyZSBpbiB0aGUgbmV3IHBhcmFncmFwaC4KKyAgICAg ICAgCisgICAgICAgIFZlY3RvcjxFbGVtZW50Kj4gYW5jZXN0b3JzOworICAgICAgICBnZXRBbmNl c3RvcnNJbnNpZGVCbG9jayhpbnNlcnRpb25Qb3NpdGlvbi5ub2RlKCksIHN0YXJ0QmxvY2ssIGFu Y2VzdG9ycyk7ICAgICAgCisgICAgICAgIFJlZlB0cjxFbGVtZW50PiBwYXJlbnQgPSBjbG9uZUhp ZXJhcmNoeVVuZGVyTmV3QmxvY2soYW5jZXN0b3JzLCBibG9ja1RvSW5zZXJ0KTsKKyAgICAgICAg CisgICAgICAgIGFwcGVuZEJsb2NrUGxhY2Vob2xkZXIocGFyZW50KTsKKworICAgICAgICBzZXRF bmRpbmdTZWxlY3Rpb24oVmlzaWJsZVNlbGVjdGlvbihQb3NpdGlvbihwYXJlbnQuZ2V0KCksIDAp LCBET1dOU1RSRUFNKSk7CiAgICAgICAgIHJldHVybjsKICAgICB9CisgICAgCiAKICAgICAvLy0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLQogICAgIC8vIEhhbmRsZSBjYXNlIHdoZW4gcG9zaXRpb24gaXMgaW4gdGhlIGZp cnN0IHZpc2libGUgcG9zaXRpb24gaW4gaXRzIGJsb2NrLCBhbmQKQEAgLTIxNyw5ICsyNDcsMTUg QEAgdm9pZCBJbnNlcnRQYXJhZ3JhcGhTZXBhcmF0b3JDb21tYW5kOjpkbwogICAgICAgICBpbnNl cnRpb25Qb3NpdGlvbiA9IGluc2VydGlvblBvc2l0aW9uLmRvd25zdHJlYW0oKTsKICAgICAgICAg CiAgICAgICAgIGluc2VydE5vZGVCZWZvcmUoYmxvY2tUb0luc2VydCwgcmVmTm9kZSk7Ci0gICAg ICAgIGFwcGVuZEJsb2NrUGxhY2Vob2xkZXIoYmxvY2tUb0luc2VydC5nZXQoKSk7Ci0gICAgICAg IHNldEVuZGluZ1NlbGVjdGlvbihWaXNpYmxlU2VsZWN0aW9uKFBvc2l0aW9uKGJsb2NrVG9JbnNl cnQuZ2V0KCksIDApLCBET1dOU1RSRUFNKSk7Ci0gICAgICAgIGFwcGx5U3R5bGVBZnRlckluc2Vy dGlvbihzdGFydEJsb2NrKTsKKworICAgICAgICAvLyBSZWNyZWF0ZSB0aGUgc2FtZSBzdHJ1Y3R1 cmUgaW4gdGhlIG5ldyBwYXJhZ3JhcGguCisKKyAgICAgICAgVmVjdG9yPEVsZW1lbnQqPiBhbmNl c3RvcnM7CisgICAgICAgIGdldEFuY2VzdG9yc0luc2lkZUJsb2NrKHBvc2l0aW9uQXZvaWRpbmdT cGVjaWFsRWxlbWVudEJvdW5kYXJ5KGluc2VydGlvblBvc2l0aW9uKS5ub2RlKCksIHN0YXJ0Qmxv Y2ssIGFuY2VzdG9ycyk7CisgICAgICAgIAorICAgICAgICBhcHBlbmRCbG9ja1BsYWNlaG9sZGVy KGNsb25lSGllcmFyY2h5VW5kZXJOZXdCbG9jayhhbmNlc3RvcnMsIGJsb2NrVG9JbnNlcnQpKTsK KyAgICAgICAgCisgICAgICAgIC8vIEluIHRoaXMgY2FzZSwgd2UgbmVlZCB0byBzZXQgdGhlIG5l dyBlbmRpbmcgc2VsZWN0aW9uLgogICAgICAgICBzZXRFbmRpbmdTZWxlY3Rpb24oVmlzaWJsZVNl bGVjdGlvbihpbnNlcnRpb25Qb3NpdGlvbiwgRE9XTlNUUkVBTSkpOwogICAgICAgICByZXR1cm47 CiAgICAgfQpAQCAtMjQ4LDEwICsyODQsNyBAQCB2b2lkIEluc2VydFBhcmFncmFwaFNlcGFyYXRv ckNvbW1hbmQ6OmRvCiAKICAgICAvLyBCdWlsZCB1cCBsaXN0IG9mIGFuY2VzdG9ycyBpbiBiZXR3 ZWVuIHRoZSBzdGFydCBub2RlIGFuZCB0aGUgc3RhcnQgYmxvY2suCiAgICAgVmVjdG9yPEVsZW1l bnQqPiBhbmNlc3RvcnM7Ci0gICAgaWYgKGluc2VydGlvblBvc2l0aW9uLm5vZGUoKSAhPSBzdGFy dEJsb2NrKSB7Ci0gICAgICAgIGZvciAoRWxlbWVudCogbiA9IGluc2VydGlvblBvc2l0aW9uLm5v ZGUoKS0+cGFyZW50RWxlbWVudCgpOyBuICYmIG4gIT0gc3RhcnRCbG9jazsgbiA9IG4tPnBhcmVu dEVsZW1lbnQoKSkKLSAgICAgICAgICAgIGFuY2VzdG9ycy5hcHBlbmQobik7Ci0gICAgfQorICAg IGdldEFuY2VzdG9yc0luc2lkZUJsb2NrKGluc2VydGlvblBvc2l0aW9uLm5vZGUoKSwgc3RhcnRC bG9jaywgYW5jZXN0b3JzKTsKIAogICAgIC8vIE1ha2Ugc3VyZSB3ZSBkbyBub3QgY2F1c2UgYSBy ZW5kZXJlZCBzcGFjZSB0byBiZWNvbWUgdW5yZW5kZXJlZC4KICAgICAvLyBGSVhNRTogV2UgbmVl ZCB0aGUgYWZmaW5pdHkgZm9yIHBvcywgYnV0IHBvcy5kb3duc3RyZWFtKCkgZG9lcyBub3QgZ2l2 ZSBpdApAQCAtMjg0LDEzICszMTcsOCBAQCB2b2lkIEluc2VydFBhcmFncmFwaFNlcGFyYXRvckNv bW1hbmQ6OmRvCiAKICAgICB1cGRhdGVMYXlvdXQoKTsKICAgICAKLSAgICAvLyBNYWtlIGNsb25l cyBvZiBhbmNlc3RvcnMgaW4gYmV0d2VlbiB0aGUgc3RhcnQgbm9kZSBhbmQgdGhlIHN0YXJ0IGJs b2NrLgotICAgIFJlZlB0cjxFbGVtZW50PiBwYXJlbnQgPSBibG9ja1RvSW5zZXJ0OwotICAgIGZv ciAoc2l6ZV90IGkgPSBhbmNlc3RvcnMuc2l6ZSgpOyBpICE9IDA7IC0taSkgewotICAgICAgICBS ZWZQdHI8RWxlbWVudD4gY2hpbGQgPSBhbmNlc3RvcnNbaSAtIDFdLT5jbG9uZUVsZW1lbnRXaXRo b3V0Q2hpbGRyZW4oKTsKLSAgICAgICAgYXBwZW5kTm9kZShjaGlsZCwgcGFyZW50KTsKLSAgICAg ICAgcGFyZW50ID0gY2hpbGQucmVsZWFzZSgpOwotICAgIH0KKyAgICAvLyBNYWtlIGNsb25lcyBv ZiBhbmNlc3RvcnMgaW4gYmV0d2VlbiB0aGUgc3RhcnQgbm9kZSBhbmQgdGhlIG91dGVyIGJsb2Nr LgorICAgIFJlZlB0cjxFbGVtZW50PiBwYXJlbnQgPSBjbG9uZUhpZXJhcmNoeVVuZGVyTmV3Qmxv Y2soYW5jZXN0b3JzLCBibG9ja1RvSW5zZXJ0KTsKIAogICAgIC8vIElmIHRoZSBwYXJhZ3JhcGgg c2VwYXJhdG9yIHdhcyBpbnNlcnRlZCBhdCB0aGUgZW5kIG9mIGEgcGFyYWdyYXBoLCBhbiBlbXB0 eSBsaW5lIG11c3QgYmUKICAgICAvLyBjcmVhdGVkLiAgQWxsIG9mIHRoZSBub2Rlcywgc3RhcnRp bmcgYXQgdmlzaWJsZVBvcywgYXJlIGFib3V0IHRvIGJlIGFkZGVkIHRvIHRoZSBuZXcgcGFyYWdy YXBoIApJbmRleDogV2ViQ29yZS9lZGl0aW5nL0luc2VydFBhcmFncmFwaFNlcGFyYXRvckNvbW1h bmQuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2VkaXRpbmcvSW5zZXJ0UGFyYWdyYXBoU2VwYXJh dG9yQ29tbWFuZC5oCShyZXZpc2lvbiA0ODc1NikKKysrIFdlYkNvcmUvZWRpdGluZy9JbnNlcnRQ YXJhZ3JhcGhTZXBhcmF0b3JDb21tYW5kLmgJKHdvcmtpbmcgY29weSkKQEAgLTQ0LDYgKzQ0LDgg QEAgcHJpdmF0ZToKIAogICAgIHZvaWQgY2FsY3VsYXRlU3R5bGVCZWZvcmVJbnNlcnRpb24oY29u c3QgUG9zaXRpb24mKTsKICAgICB2b2lkIGFwcGx5U3R5bGVBZnRlckluc2VydGlvbihOb2RlKiBv cmlnaW5hbEVuY2xvc2luZ0Jsb2NrKTsKKyAgICB2b2lkIGdldEFuY2VzdG9yc0luc2lkZUJsb2Nr KGNvbnN0IE5vZGUqIGluc2VydGlvbk5vZGUsIEVsZW1lbnQqIG91dGVyQmxvY2ssIFZlY3RvcjxF bGVtZW50Kj4mIGFuY2VzdG9ycyk7CisgICAgUGFzc1JlZlB0cjxFbGVtZW50PiBjbG9uZUhpZXJh cmNoeVVuZGVyTmV3QmxvY2soY29uc3QgVmVjdG9yPEVsZW1lbnQqPiYgYW5jZXN0b3JzLCBQYXNz UmVmUHRyPEVsZW1lbnQ+IGJsb2NrVG9JbnNlcnQpOwogICAgIAogICAgIGJvb2wgc2hvdWxkVXNl RGVmYXVsdFBhcmFncmFwaEVsZW1lbnQoTm9kZSopIGNvbnN0OwogCkluZGV4OiBMYXlvdXRUZXN0 cy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCShyZXZpc2lv biA0ODc1NikKKysrIExheW91dFRlc3RzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE0IEBACisyMDA5LTA5LTI0ICBFbnJpY2EgQ2FzdWNjaSAgPGVucmljYUBhcHBsZS5jb20+ CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVXBkYXRl ZCB0aGUgZXhwZWN0ZWQgcmVzdWx0cyB0byByZWZsZWN0IHRoZSBjaGFuZ2VzIGluIHRoZSB3YXkg dGhlIG5ldyBwYXJhZ3JhcGgKKyAgICAgICAgaXMgY3JlYXRlZCBhbmQgYWRkZWQgdGVzdCBjYXNl IGZvciBidWcgPHJkYXI6Ly9wcm9ibGVtLzcxNjg3Mzg+LgorCisgICAgICAgICogZWRpdGluZy9p bnNlcnRpbmcvaW5zZXJ0LWJnLWZvbnQuaHRtbDogQWRkZWQuCisgICAgICAgICogcGxhdGZvcm0v bWFjL2VkaXRpbmcvaW5zZXJ0aW5nL2luc2VydC1iZy1mb250LWV4cGVjdGVkLnR4dDogQWRkZWQu CisgICAgICAgICogcGxhdGZvcm0vbWFjL2VkaXRpbmcvcGFzdGVib2FyZC81NDc4MjUwLWV4cGVj dGVkLnR4dDoKKwogMjAwOS0wOS0yNCAgU2ltb24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxl LmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBEYW4gQmVybnN0ZWluLgpJbmRleDogTGF5b3V0 VGVzdHMvZWRpdGluZy9pbnNlcnRpbmcvaW5zZXJ0LWJnLWZvbnQuaHRtbAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBMYXlvdXRUZXN0cy9lZGl0aW5nL2luc2VydGluZy9pbnNlcnQtYmctZm9udC5odG1sCShyZXZp c2lvbiAwKQorKysgTGF5b3V0VGVzdHMvZWRpdGluZy9pbnNlcnRpbmcvaW5zZXJ0LWJnLWZvbnQu aHRtbAkocmV2aXNpb24gMCkKQEAgLTAsMCArMSwyMSBAQAorPGh0bWw+CisgICAgPGhlYWQ+Cisg ICAgICAgIDxzY3JpcHQ+CisgICAgICAgICAgICBmdW5jdGlvbiB0ZXN0KCkKKyAgICAgICAgICAg IHsKKyAgICAgICAgICAgICAgICBpZiAod2luZG93LmxheW91dFRlc3RDb250cm9sbGVyKQorICAg ICAgICAgICAgICAgICAgICBsYXlvdXRUZXN0Q29udHJvbGxlci5kdW1wQXNUZXh0KCk7CisKKyAg ICAgICAgICAgICAgICB3aW5kb3cuZ2V0U2VsZWN0aW9uKCkuc2V0UG9zaXRpb24oZG9jdW1lbnQu Z2V0RWxlbWVudEJ5SWQoJ2R2JyksIDEpOworICAgICAgICAgICAgICAgIGRvY3VtZW50LmV4ZWND b21tYW5kKCJJbnNlcnRQYXJhZ3JhcGgiKTsKKyAgICAgICAgICAgICAgICBkb2N1bWVudC5leGVj Q29tbWFuZCgiSW5zZXJ0VGV4dCIsIGZhbHNlLCAidGhpcyBzaG91bGQgYWxzbyBiZSBibHVlIG92 ZXIgbGlnaHRncmV5Iik7CisKKyAgICAgICAgICAgICAgICBkb2N1bWVudC53cml0ZSgiPHhtcD4i ICsgZG9jdW1lbnQuYm9keS5pbm5lckhUTUwgKyAiPC94bXA+Iik7CisgICAgICAgICAgICB9Cisg ICAgICAgIDwvc2NyaXB0PgorICAgIDwvaGVhZD4KKyAgICA8Ym9keSBvbmxvYWQ9InRlc3QoKSI+ CisgICAgICAgIDxkaXYgaWQ9ImR2IiBjb250ZW50ZWRpdGFibGU+PHNwYW4gc3R5bGU9ImJhY2tn cm91bmQtY29sb3I6IGxpZ2h0Z3JleSI+bGlnaHRncmV5IGJhY2tncm91bmQ8Zm9udCBjb2xvcj0i Ymx1ZSI+Ymx1ZSBmb250IGNvbG9yIG92ZXIgbGlnaHRncmV5IGJhY2tncm91bmQ8L2ZvbnQ+PC9z cGFuPiAKKzwvZGl2PgorICAgIDwvYm9keT4KKzwvaHRtbD4KSW5kZXg6IExheW91dFRlc3RzL3Bs YXRmb3JtL21hYy9lZGl0aW5nL2luc2VydGluZy9pbnNlcnQtYmctZm9udC1leHBlY3RlZC50eHQK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL2VkaXRpbmcvaW5zZXJ0aW5n L2luc2VydC1iZy1mb250LWV4cGVjdGVkLnR4dAkocmV2aXNpb24gMCkKKysrIExheW91dFRlc3Rz L3BsYXRmb3JtL21hYy9lZGl0aW5nL2luc2VydGluZy9pbnNlcnQtYmctZm9udC1leHBlY3RlZC50 eHQJKHJldmlzaW9uIDApCkBAIC0wLDAgKzEsNiBAQAorCisgICAgICAgIDxkaXYgaWQ9ImR2IiBj b250ZW50ZWRpdGFibGU9IiI+PHNwYW4gc3R5bGU9ImJhY2tncm91bmQtY29sb3I6IGxpZ2h0Z3Jl eSI+bGlnaHRncmV5IGJhY2tncm91bmQ8Zm9udCBjb2xvcj0iYmx1ZSI+Ymx1ZSBmb250IGNvbG9y IG92ZXIgbGlnaHRncmV5IGJhY2tncm91bmQ8L2ZvbnQ+PC9zcGFuPiAKKzxkaXY+PHNwYW4gc3R5 bGU9ImJhY2tncm91bmQtY29sb3I6IGxpZ2h0Z3JleSI+PGZvbnQgY29sb3I9ImJsdWUiPnRoaXMg c2hvdWxkIGFsc28gYmUgYmx1ZSBvdmVyIGxpZ2h0Z3JleTwvZm9udD48L3NwYW4+PC9kaXY+PC9k aXY+CisgICAgCisKKwpJbmRleDogTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL2VkaXRpbmcvcGFz dGVib2FyZC81NDc4MjUwLWV4cGVjdGVkLnR4dAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9w bGF0Zm9ybS9tYWMvZWRpdGluZy9wYXN0ZWJvYXJkLzU0NzgyNTAtZXhwZWN0ZWQudHh0CShyZXZp c2lvbiA0ODc1NikKKysrIExheW91dFRlc3RzL3BsYXRmb3JtL21hYy9lZGl0aW5nL3Bhc3RlYm9h cmQvNTQ3ODI1MC1leHBlY3RlZC50eHQJKHdvcmtpbmcgY29weSkKQEAgLTE3LDcgKzE3LDcgQEAg bGF5ZXIgYXQgKDAsMCkgc2l6ZSA4MDB4NjAwCiAgICAgICAgICAgICBSZW5kZXJUZXh0IHsjdGV4 dH0gYXQgKDEwOCwwKSBzaXplIDM0eDE4CiAgICAgICAgICAgICAgIHRleHQgcnVuIGF0ICgxMDgs MCkgd2lkdGggMzQ6ICJib2xkLiIKICAgICAgICAgUmVuZGVyQmxvY2sge0RJVn0gYXQgKDAsMTgp IHNpemUgNzg0eDE4Ci0gICAgICAgICAgUmVuZGVySW5saW5lIHtCfSBhdCAoMCwwKSBzaXplIDM5 M3gxOAorICAgICAgICAgIFJlbmRlcklubGluZSB7U1BBTn0gYXQgKDAsMCkgc2l6ZSAzOTN4MTgK ICAgICAgICAgICAgIFJlbmRlclRleHQgeyN0ZXh0fSBhdCAoMCwwKSBzaXplIDM5M3gxOAogICAg ICAgICAgICAgICB0ZXh0IHJ1biBhdCAoMCwwKSB3aWR0aCAzOTM6ICJUaGlzIHRleHQgc2hvdWxk IGJvbGQgYW5kIGxlZnQganVzdGlmaWVkIHdpdGggXCJTb21lIHRleHQuLi5cIi4iCi1jYXJldDog cG9zaXRpb24gNjEgb2YgY2hpbGQgMCB7I3RleHR9IG9mIGNoaWxkIDAge0J9IG9mIGNoaWxkIDIg e0RJVn0gb2YgY2hpbGQgNCB7RElWfSBvZiBjaGlsZCAxIHtCT0RZfSBvZiBjaGlsZCAwIHtIVE1M fSBvZiBkb2N1bWVudAorY2FyZXQ6IHBvc2l0aW9uIDYxIG9mIGNoaWxkIDAgeyN0ZXh0fSBvZiBj aGlsZCAwIHtTUEFOfSBvZiBjaGlsZCAyIHtESVZ9IG9mIGNoaWxkIDQge0RJVn0gb2YgY2hpbGQg MSB7Qk9EWX0gb2YgY2hpbGQgMCB7SFRNTH0gb2YgZG9jdW1lbnQK