99880 2012-10-19 15:27:37 -0700 Always parse pasted fragments as HTML even on XHTML pages 2012-10-23 06:06:48 -0700 1 1 1 Unclassified WebKit HTML Editing 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 99607 1 adamk adamk ap enrica esprehn jochen mifenton ojan rniwa webkit.review.bot oldest_to_newest 746701 0 adamk 2012-10-19 15:27:37 -0700 Always parse pasted fragments as HTML even on XHTML pages 746710 1 169713 adamk 2012-10-19 15:36:29 -0700 Created attachment 169713 Patch 746716 2 169713 esprehn 2012-10-19 15:43:07 -0700 Comment on attachment 169713 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=169713&action=review > Source/WebCore/editing/markup.cpp:670 > + element->removeChild(child.get()); Is there a reason to unwrap the RefPtr here but pass it below? > Source/WebCore/editing/markup.cpp:681 > + if (node->hasTagName(htmlTag) || node->hasTagName(headTag) || node->hasTagName(bodyTag)) { What's the purpose of this method? I can just put <head><head></head></head> into the pasteboard and you'd leave the inner one behind. 746727 3 169713 adamk 2012-10-19 16:07:18 -0700 Comment on attachment 169713 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=169713&action=review >> Source/WebCore/editing/markup.cpp:670 >> + element->removeChild(child.get()); > > Is there a reason to unwrap the RefPtr here but pass it below? removeChild() takes a raw pointer, insertBefore() takes a PassRefPtr. So I'm using .get() as minimally as I can. >> Source/WebCore/editing/markup.cpp:681 >> + if (node->hasTagName(htmlTag) || node->hasTagName(headTag) || node->hasTagName(bodyTag)) { > > What's the purpose of this method? I can just put <head><head></head></head> into the pasteboard and you'd leave the inner one behind. Added a short comment, see if that helps. 746729 4 169715 adamk 2012-10-19 16:09:33 -0700 Created attachment 169715 Patch 746747 5 169715 ojan 2012-10-19 16:25:38 -0700 Comment on attachment 169715 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=169715&action=review > LayoutTests/ChangeLog:17 > + * platform/mac/editing/pasteboard/paste-xml-expected.txt: Now that we > + use the HTML parser, parsing the paste succeeds and so we insert DOM > + instead of plain text. Similar rebaselines may be needed on other > + platforms. maybe point to the pretty-diff bug to explain this diff? 746775 6 169727 adamk 2012-10-19 16:53:13 -0700 Created attachment 169727 Patch for landing 746778 7 adamk 2012-10-19 16:56:47 -0700 Patch for landing is greatly simplified, since it turns out the special code to handle <html>, <body>, and <head> is not needed at all (because we use the HTML5 fragment parsing algorithm with <body> as the context element, which means we ignore all three of those tags. 746782 8 169727 adamk 2012-10-19 16:59:05 -0700 Comment on attachment 169727 Patch for landing Waiting to cq+ so I can watch the waterfalls in case rebaselining is needed. 746788 9 ap 2012-10-19 17:08:09 -0700 + The Mac port previously worked around this problem by falling back to plain text + when parsing failed, but switching to HTML seems like a clear improvement. Are you aware of any way to reproduce this in Safari on Mac in practice? I briefly tried, but couldn't get in this code path. 746789 10 adamk 2012-10-19 17:13:28 -0700 (In reply to comment #9) > + The Mac port previously worked around this problem by falling back to plain text > + when parsing failed, but switching to HTML seems like a clear improvement. > > Are you aware of any way to reproduce this in Safari on Mac in practice? I briefly tried, but couldn't get in this code path. All you should need is an xhtml page with a contentEditable element in it. Try to copy some html and paste it into that element. Fwiw, The relevant code is in EditorMac.mm, Editor::documentFragment(). Under DRT, editing/pasteboard/paste-xml.xhtml walks through this "try to parse as XML, fail, fall back to text" case. 746796 11 ap 2012-10-19 17:20:30 -0700 I tried that, and got styled text pasted. Possibly because there were additional flavors on the pasteboard, but this is why I'm asking for steps to reproduce. 746840 12 169742 adamk 2012-10-19 18:54:58 -0700 Created attachment 169742 Test case Note that the ".xhtml" suffix is necessary for Safari to treat this as an XHTML document. When I select the first line and paste it onto the second line, the bolding disappears. 746893 13 ap 2012-10-19 22:04:07 -0700 Thank you, I can reproduce now. I experimented with a data:application/xhtml+xml URL, and looks like these do not make XHTML documents in Safari. 748537 14 169727 webkit.review.bot 2012-10-23 05:37:11 -0700 Comment on attachment 169727 Patch for landing Rejecting attachment 169727 from commit-queue. Failed to run "['/mnt/git/webkit-commit-queue/Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '-..." exit_code: 2 Last 500 characters of output: ent): Merge conflict in Source/WebKit2/ChangeLog Failed to merge in the changes. Patch failed at 0001 [EFL] Make plugin process debugging easier (PLUGIN_PROCESS_COMMAND_PREFIX) When you have resolved this problem run "git rebase --continue". If you would prefer to skip this patch, instead run "git rebase --skip". To restore the original branch and stop rebasing run "git rebase --abort". rebase refs/remotes/origin/master: command returned error: 1 Died at Tools/Scripts/update-webkit line 164. Full output: http://queues.webkit.org/results/14518146 748555 15 169727 webkit.review.bot 2012-10-23 06:06:43 -0700 Comment on attachment 169727 Patch for landing Clearing flags on attachment: 169727 Committed r132211: <http://trac.webkit.org/changeset/132211> 748556 16 webkit.review.bot 2012-10-23 06:06:48 -0700 All reviewed patches have been landed. Closing bug. 169713 2012-10-19 15:36:29 -0700 2012-10-19 16:09:31 -0700 Patch bug-99880-20121019153512.patch text/plain 10547 adamk U3VidmVyc2lvbiBSZXZpc2lvbjogMTMxNzgxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzdiN2E1NTJhNjg5YzYz Mzc4ZDBhMDVhMzI1Y2MyMDQ4MzNlYzlmZC4uMDQ0OGIyOWYwM2M0MmE5OWJhNmU4YWQxYTZkZDQz MjdmZjZkZGEyMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM0IEBACisyMDEyLTEwLTE5ICBBZGFt IEtsZWluICA8YWRhbWtAY2hyb21pdW0ub3JnPgorCisgICAgICAgIEFsd2F5cyBwYXJzZSBwYXN0 ZWQgZnJhZ21lbnRzIGFzIEhUTUwgZXZlbiBvbiBYSFRNTCBwYWdlcworICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTk4ODAKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXaGVuIHBhc3RpbmcgSFRNTCBpbnRvIGEg cGFnZSwgdXNpbmcgdGhlIFhNTCBwYXJzZXIgaXMgdW5saWtlbHkKKyAgICAgICAgdG8gd29yayBj b3JyZWN0bHksIGFzIHRoZSBjb250ZW50cyBvZiB0aGUgY2xpcGJvYXJkIGFyZSB1bmxpa2VseQor ICAgICAgICB0byBiZSBwcm9wZXJseS1mb3JtZWQgWEhUTUwuIFRodXMsIGZvciB0aGUgcGFzdGlu ZyBjYXNlLCBpdCdzIGFsd2F5cworICAgICAgICBiZXR0ZXIgdG8gdXNlIEhUTUwgcGFyc2luZywg d2hpY2ggd2lsbCBwcm9wZXJseSBwYXJzZSBlaXRoZXIgSFRNTAorICAgICAgICAod2hpY2ggaXMg d2hhdCdzIHVzdWFsbHkgaW4gdGhlIGNsaXBib2FyZCkgb3IgWEhUTUwgKHdoaWNoIGlzCisgICAg ICAgIHNvbWV0aW1lcyB0aGVyZSBhcyB3ZWxsKS4KKworICAgICAgICBUaGUgTWFjIHBvcnQgcHJl dmlvdXNseSB3b3JrZWQgYXJvdW5kIHRoaXMgcHJvYmxlbSBieSBmYWxsaW5nIGJhY2sgdG8gcGxh aW4gdGV4dAorICAgICAgICB3aGVuIHBhcnNpbmcgZmFpbGVkLCBidXQgc3dpdGNoaW5nIHRvIEhU TUwgc2VlbXMgbGlrZSBhIGNsZWFyIGltcHJvdmVtZW50LgorCisgICAgICAgIFRoaXMgYWxzbyBm aXhlcyBhIGNyYXNoIGluIENocm9taXVtIChzZWUgaHR0cDovL3dlYmtpdC5vcmcvYi85OTYwNwor ICAgICAgICBhbmQgaHR0cDovL2NyYnVnLmNvbS8xMzYyMTgpOyBpdCBlcnJvbmVvdXNseSBhc3N1 bWVkIHRoYXQgY3JlYXRlRnJhZ21lbnRGcm9tTWFya3VwKCkKKyAgICAgICAgd291bGQgbmV2ZXIg cmV0dXJuIG51bGwuIFRoaXMgcGF0Y2ggbWFrZXMgdGhhdCB0cnVlLgorCisgICAgICAgICogZWRp dGluZy9tYXJrdXAuY3BwOgorICAgICAgICAoV2ViQ29yZTo6cmVtb3ZlRWxlbWVudFByZXNlcnZp bmdDaGlsZHJlbik6IFJlbW92ZWQgcmVkdW5kYW50IGFzc2VydHMuCisgICAgICAgIChXZWJDb3Jl OjpyZW1vdmVEb2N1bWVudFN0cnVjdHVyZUVsZW1lbnRzUHJlc2VydmluZ0NoaWxkcmVuKTogRmFj dG9yZWQKKyAgICAgICAgb3V0IGxvZ2ljIHVzZWQgaW4gYm90aCBjcmVhdGVDb250ZXh0dWFsRnJh Z21lbnQgYW5kIGNyZWF0ZUZyYWdtZW50RnJvbU1hcmt1cC4KKyAgICAgICAgKFdlYkNvcmU6OmNy ZWF0ZUZyYWdtZW50RnJvbU1hcmt1cCk6IERvbid0IGRlbGVnYXRlIHRvCisgICAgICAgIGNyZWF0 ZUNvbnRleHR1YWxGcmFnbWVudDogd2UgYWxyZWFkeSBrbm93IG91ciBjb250ZXh0IGVsZW1lbnQg aXMgc2FmZSwKKyAgICAgICAgYW5kIHdlIHdhbnQgdG8gZm9yY2UgSFRNTCAobm90IFhNTCkgcGFy c2luZy4KKyAgICAgICAgKFdlYkNvcmU6OmNyZWF0ZUNvbnRleHR1YWxGcmFnbWVudCk6IEZhY3Rv ciBvdXQgaHRtbC9oZWFkL2JvZHkgcmVtb3ZhbCBsb2dpYyBpbnRvCisgICAgICAgIHJlbW92ZURv Y3VtZW50U3RydWN0dXJlRWxlbWVudHNQcmVzZXJ2aW5nQ2hpbGRyZW4oKS4KKwogMjAxMi0xMC0x OCAgSmVyIE5vYmxlICA8amVyLm5vYmxlQGFwcGxlLmNvbT4KIAogICAgICAgICBGdWxsc2NyZWVu IG1vdmllIGNvbnRyb2xzIGJlaGF2ZSBpbmNvcnJlY3RseSB3aGVuIGNsaWNrZWQgKGFuZCBkcmFn Z2VkKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZWRpdGluZy9tYXJrdXAuY3BwIGIvU291 cmNlL1dlYkNvcmUvZWRpdGluZy9tYXJrdXAuY3BwCmluZGV4IGJhNDcyZWU2OTdjNTNlYmMwY2Fl ZTM1Y2UxNGIwMjdjZjNmZDE0NTQuLmY1MWVhYjFhNWVmYjI2Mjc1NTI5M2QwNmQyZjU3MTQ4Zjc4 OGU2ZmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvbWFya3VwLmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL21hcmt1cC5jcHAKQEAgLTY2MiwxNSArNjYyLDQzIEBA IFN0cmluZyBjcmVhdGVNYXJrdXAoY29uc3QgUmFuZ2UqIHJhbmdlLCBWZWN0b3I8Tm9kZSo+KiBu b2RlcywgRUFubm90YXRlRm9ySW50ZXJjCiAgICAgcmV0dXJuIGFjY3VtdWxhdG9yLnRha2VSZXN1 bHRzKCk7CiB9CiAKK3N0YXRpYyBpbmxpbmUgdm9pZCByZW1vdmVFbGVtZW50UHJlc2VydmluZ0No aWxkcmVuKERvY3VtZW50RnJhZ21lbnQqIGZyYWdtZW50LCBIVE1MRWxlbWVudCogZWxlbWVudCkK K3sKKyAgICBSZWZQdHI8Tm9kZT4gbmV4dENoaWxkOworICAgIGZvciAoUmVmUHRyPE5vZGU+IGNo aWxkID0gZWxlbWVudC0+Zmlyc3RDaGlsZCgpOyBjaGlsZDsgY2hpbGQgPSBuZXh0Q2hpbGQpIHsK KyAgICAgICAgbmV4dENoaWxkID0gY2hpbGQtPm5leHRTaWJsaW5nKCk7CisgICAgICAgIGVsZW1l bnQtPnJlbW92ZUNoaWxkKGNoaWxkLmdldCgpKTsKKyAgICAgICAgZnJhZ21lbnQtPmluc2VydEJl Zm9yZShjaGlsZCwgZWxlbWVudCk7CisgICAgfQorICAgIGZyYWdtZW50LT5yZW1vdmVDaGlsZChl bGVtZW50KTsKK30KKworc3RhdGljIGlubGluZSB2b2lkIHJlbW92ZURvY3VtZW50U3RydWN0dXJl RWxlbWVudHNQcmVzZXJ2aW5nQ2hpbGRyZW4oRG9jdW1lbnRGcmFnbWVudCogZnJhZ21lbnQpCit7 CisgICAgUmVmUHRyPE5vZGU+IG5leHROb2RlOworICAgIGZvciAoUmVmUHRyPE5vZGU+IG5vZGUg PSBmcmFnbWVudC0+Zmlyc3RDaGlsZCgpOyBub2RlOyBub2RlID0gbmV4dE5vZGUpIHsKKyAgICAg ICAgbmV4dE5vZGUgPSBub2RlLT5uZXh0U2libGluZygpOworICAgICAgICBpZiAobm9kZS0+aGFz VGFnTmFtZShodG1sVGFnKSB8fCBub2RlLT5oYXNUYWdOYW1lKGhlYWRUYWcpIHx8IG5vZGUtPmhh c1RhZ05hbWUoYm9keVRhZykpIHsKKyAgICAgICAgICAgIEhUTUxFbGVtZW50KiBlbGVtZW50ID0g dG9IVE1MRWxlbWVudChub2RlLmdldCgpKTsKKyAgICAgICAgICAgIGlmIChOb2RlKiBmaXJzdENo aWxkID0gZWxlbWVudC0+Zmlyc3RDaGlsZCgpKQorICAgICAgICAgICAgICAgIG5leHROb2RlID0g Zmlyc3RDaGlsZDsKKyAgICAgICAgICAgIHJlbW92ZUVsZW1lbnRQcmVzZXJ2aW5nQ2hpbGRyZW4o ZnJhZ21lbnQsIGVsZW1lbnQpOworICAgICAgICB9CisgICAgfQorCit9CisKIFBhc3NSZWZQdHI8 RG9jdW1lbnRGcmFnbWVudD4gY3JlYXRlRnJhZ21lbnRGcm9tTWFya3VwKERvY3VtZW50KiBkb2N1 bWVudCwgY29uc3QgU3RyaW5nJiBtYXJrdXAsIGNvbnN0IFN0cmluZyYgYmFzZVVSTCwgRnJhZ21l bnRTY3JpcHRpbmdQZXJtaXNzaW9uIHNjcmlwdGluZ1Blcm1pc3Npb24pCiB7CiAgICAgLy8gV2Ug dXNlIGEgZmFrZSBib2R5IGVsZW1lbnQgaGVyZSB0byB0cmljayB0aGUgSFRNTCBwYXJzZXIgdG8g dXNpbmcgdGhlIEluQm9keSBpbnNlcnRpb24gbW9kZS4KICAgICBSZWZQdHI8SFRNTEJvZHlFbGVt ZW50PiBmYWtlQm9keSA9IEhUTUxCb2R5RWxlbWVudDo6Y3JlYXRlKGRvY3VtZW50KTsKLSAgICAv LyBJZ25vcmUgZXhjZXB0aW9ucyBoZXJlIHNpbmNlIHRoaXMgZnVuY3Rpb24gaXMgdXNlZCB0byBw YXJzZSBtYXJrdXAgZm9yIHBhc3Rpbmcgb3IgZm9yIG90aGVyIGVkaXRpbmcgcHVycG9zZXMuCi0g ICAgRXhjZXB0aW9uQ29kZSBpZ25vcmVkRUM7Ci0gICAgUmVmUHRyPERvY3VtZW50RnJhZ21lbnQ+ IGZyYWdtZW50ID0gY3JlYXRlQ29udGV4dHVhbEZyYWdtZW50KG1hcmt1cCwgZmFrZUJvZHkuZ2V0 KCksIHNjcmlwdGluZ1Blcm1pc3Npb24sIGlnbm9yZWRFQyk7CiAKLSAgICBpZiAoZnJhZ21lbnQg JiYgIWJhc2VVUkwuaXNFbXB0eSgpICYmIGJhc2VVUkwgIT0gYmxhbmtVUkwoKSAmJiBiYXNlVVJM ICE9IGRvY3VtZW50LT5iYXNlVVJMKCkpCisgICAgUmVmUHRyPERvY3VtZW50RnJhZ21lbnQ+IGZy YWdtZW50ID0gRG9jdW1lbnRGcmFnbWVudDo6Y3JlYXRlKGRvY3VtZW50KTsKKyAgICBmcmFnbWVu dC0+cGFyc2VIVE1MKG1hcmt1cCwgZmFrZUJvZHkuZ2V0KCksIHNjcmlwdGluZ1Blcm1pc3Npb24p OworCisgICAgcmVtb3ZlRG9jdW1lbnRTdHJ1Y3R1cmVFbGVtZW50c1ByZXNlcnZpbmdDaGlsZHJl bihmcmFnbWVudC5nZXQoKSk7CisKKyAgICBpZiAoIWJhc2VVUkwuaXNFbXB0eSgpICYmIGJhc2VV UkwgIT0gYmxhbmtVUkwoKSAmJiBiYXNlVVJMICE9IGRvY3VtZW50LT5iYXNlVVJMKCkpCiAgICAg ICAgIGNvbXBsZXRlVVJMcyhmcmFnbWVudC5nZXQoKSwgYmFzZVVSTCk7CiAKICAgICByZXR1cm4g ZnJhZ21lbnQucmVsZWFzZSgpOwpAQCAtMTAzOCwyMiArMTA2Niw2IEBAIFBhc3NSZWZQdHI8RG9j dW1lbnRGcmFnbWVudD4gY3JlYXRlRnJhZ21lbnRGb3JUcmFuc2Zvcm1Ub0ZyYWdtZW50KGNvbnN0 IFN0cmluZyYKICAgICByZXR1cm4gZnJhZ21lbnQucmVsZWFzZSgpOwogfQogCi1zdGF0aWMgaW5s aW5lIHZvaWQgcmVtb3ZlRWxlbWVudFByZXNlcnZpbmdDaGlsZHJlbihQYXNzUmVmUHRyPERvY3Vt ZW50RnJhZ21lbnQ+IGZyYWdtZW50LCBIVE1MRWxlbWVudCogZWxlbWVudCkKLXsKLSAgICBFeGNl cHRpb25Db2RlIGlnbm9yZWRFeGNlcHRpb25Db2RlOwotCi0gICAgUmVmUHRyPE5vZGU+IG5leHRD aGlsZDsKLSAgICBmb3IgKFJlZlB0cjxOb2RlPiBjaGlsZCA9IGVsZW1lbnQtPmZpcnN0Q2hpbGQo KTsgY2hpbGQ7IGNoaWxkID0gbmV4dENoaWxkKSB7Ci0gICAgICAgIG5leHRDaGlsZCA9IGNoaWxk LT5uZXh0U2libGluZygpOwotICAgICAgICBlbGVtZW50LT5yZW1vdmVDaGlsZChjaGlsZC5nZXQo KSwgaWdub3JlZEV4Y2VwdGlvbkNvZGUpOwotICAgICAgICBBU1NFUlQoIWlnbm9yZWRFeGNlcHRp b25Db2RlKTsKLSAgICAgICAgZnJhZ21lbnQtPmluc2VydEJlZm9yZShjaGlsZCwgZWxlbWVudCwg aWdub3JlZEV4Y2VwdGlvbkNvZGUpOwotICAgICAgICBBU1NFUlQoIWlnbm9yZWRFeGNlcHRpb25D b2RlKTsKLSAgICB9Ci0gICAgZnJhZ21lbnQtPnJlbW92ZUNoaWxkKGVsZW1lbnQsIGlnbm9yZWRF eGNlcHRpb25Db2RlKTsKLSAgICBBU1NFUlQoIWlnbm9yZWRFeGNlcHRpb25Db2RlKTsKLX0KLQog UGFzc1JlZlB0cjxEb2N1bWVudEZyYWdtZW50PiBjcmVhdGVDb250ZXh0dWFsRnJhZ21lbnQoY29u c3QgU3RyaW5nJiBtYXJrdXAsIEhUTUxFbGVtZW50KiBlbGVtZW50LCBGcmFnbWVudFNjcmlwdGlu Z1Blcm1pc3Npb24gc2NyaXB0aW5nUGVybWlzc2lvbiwgRXhjZXB0aW9uQ29kZSYgZWMpCiB7CiAg ICAgQVNTRVJUKGVsZW1lbnQpOwpAQCAtMTA3MiwyMCArMTA4NCw3IEBAIFBhc3NSZWZQdHI8RG9j dW1lbnRGcmFnbWVudD4gY3JlYXRlQ29udGV4dHVhbEZyYWdtZW50KGNvbnN0IFN0cmluZyYgbWFy a3VwLCBIVE1MCiAgICAgaWYgKCFmcmFnbWVudCkKICAgICAgICAgcmV0dXJuIDA7CiAKLSAgICAv LyBXZSBuZWVkIHRvIHBvcCA8aHRtbD4gYW5kIDxib2R5PiBlbGVtZW50cyBhbmQgcmVtb3ZlIDxo ZWFkPiB0bwotICAgIC8vIGFjY29tbW9kYXRlIGZvbGtzIHBhc3NpbmcgY29tcGxldGUgSFRNTCBk b2N1bWVudHMgdG8gbWFrZSB0aGUKLSAgICAvLyBjaGlsZCBvZiBhbiBlbGVtZW50LgotCi0gICAg UmVmUHRyPE5vZGU+IG5leHROb2RlOwotICAgIGZvciAoUmVmUHRyPE5vZGU+IG5vZGUgPSBmcmFn bWVudC0+Zmlyc3RDaGlsZCgpOyBub2RlOyBub2RlID0gbmV4dE5vZGUpIHsKLSAgICAgICAgbmV4 dE5vZGUgPSBub2RlLT5uZXh0U2libGluZygpOwotICAgICAgICBpZiAobm9kZS0+aGFzVGFnTmFt ZShodG1sVGFnKSB8fCBub2RlLT5oYXNUYWdOYW1lKGhlYWRUYWcpIHx8IG5vZGUtPmhhc1RhZ05h bWUoYm9keVRhZykpIHsKLSAgICAgICAgICAgIEhUTUxFbGVtZW50KiBlbGVtZW50ID0gdG9IVE1M RWxlbWVudChub2RlLmdldCgpKTsKLSAgICAgICAgICAgIGlmIChOb2RlKiBmaXJzdENoaWxkID0g ZWxlbWVudC0+Zmlyc3RDaGlsZCgpKQotICAgICAgICAgICAgICAgIG5leHROb2RlID0gZmlyc3RD aGlsZDsKLSAgICAgICAgICAgIHJlbW92ZUVsZW1lbnRQcmVzZXJ2aW5nQ2hpbGRyZW4oZnJhZ21l bnQsIGVsZW1lbnQpOwotICAgICAgICB9Ci0gICAgfQorICAgIHJlbW92ZURvY3VtZW50U3RydWN0 dXJlRWxlbWVudHNQcmVzZXJ2aW5nQ2hpbGRyZW4oZnJhZ21lbnQuZ2V0KCkpOwogICAgIHJldHVy biBmcmFnbWVudC5yZWxlYXNlKCk7CiB9CiAKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCA2MTVmMjNhNWU1ZGUxMWZkNGZlZmEz N2ZmZmY4ODNkM2VkMmQ1NDA2Li40NmRhOWQ0NWI3Y2FhNjhhZjM2MGI3YTVmMDg3OTJhYjBjZmVj M2YxIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEgQEAKKzIwMTItMTAtMTkgIEFkYW0gS2xlaW4gIDxhZGFt a0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgQWx3YXlzIHBhcnNlIHBhc3RlZCBmcmFnbWVudHMg YXMgSFRNTCBldmVuIG9uIFhIVE1MIHBhZ2VzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD05OTg4MAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIFVwZGF0ZWQgZXhpc3RpbmcgdGVzdHMgdG8gbWF0Y2ggbmV3IGV4 cGVjdGVkIGJlaGF2aW9yLgorCisgICAgICAgICogZWRpdGluZy9wYXN0ZWJvYXJkL3Bhc3RlLW5v c2NyaXB0LXhodG1sLWV4cGVjdGVkLnR4dDogVGhlIEhUTUwKKyAgICAgICAgcGFyc2VyIGxlYXZl cyA8c2NyaXB0PiB0YWdzIGluIHRoZSBET00gd2hlbiBwYXN0aW5nLCBidXQgcmVtb3ZlcyB0aGVp cgorICAgICAgICBhdHRyaWJ1dGVzIGFuZCBjaGlsZHJlbiwgc28gdGhpcyBpcyBqdXN0IGFzIHNh ZmUgYXMgdGhlIHByZXZpb3VzCisgICAgICAgIGJlaGF2aW9yLgorICAgICAgICAqIHBsYXRmb3Jt L21hYy9lZGl0aW5nL3Bhc3RlYm9hcmQvcGFzdGUteG1sLWV4cGVjdGVkLnR4dDogTm93IHRoYXQg d2UKKyAgICAgICAgdXNlIHRoZSBIVE1MIHBhcnNlciwgcGFyc2luZyB0aGUgcGFzdGUgc3VjY2Vl ZHMgYW5kIHNvIHdlIGluc2VydCBET00KKyAgICAgICAgaW5zdGVhZCBvZiBwbGFpbiB0ZXh0LiBT aW1pbGFyIHJlYmFzZWxpbmVzIG1heSBiZSBuZWVkZWQgb24gb3RoZXIKKyAgICAgICAgcGxhdGZv cm1zLgorCiAyMDEyLTEwLTE4ICBKZXIgTm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgogCiAg ICAgICAgIEZ1bGxzY3JlZW4gbW92aWUgY29udHJvbHMgYmVoYXZlIGluY29ycmVjdGx5IHdoZW4g Y2xpY2tlZCAoYW5kIGRyYWdnZWQpCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9lZGl0aW5nL3Bh c3RlYm9hcmQvcGFzdGUtbm9zY3JpcHQteGh0bWwtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMv ZWRpdGluZy9wYXN0ZWJvYXJkL3Bhc3RlLW5vc2NyaXB0LXhodG1sLWV4cGVjdGVkLnR4dAppbmRl eCBiYjhkZTc0MzVmZTMxYjM4YmU3ODFlYzRhY2U5YjI5ZjdhYmMyMjg1Li5iYjQyM2Y4MGMxOWMy ZDQwZDgzY2QyNTQ5NWI1NTBmNDk0ZGEyZjNkIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9lZGl0 aW5nL3Bhc3RlYm9hcmQvcGFzdGUtbm9zY3JpcHQteGh0bWwtZXhwZWN0ZWQudHh0CisrKyBiL0xh eW91dFRlc3RzL2VkaXRpbmcvcGFzdGVib2FyZC9wYXN0ZS1ub3NjcmlwdC14aHRtbC1leHBlY3Rl ZC50eHQKQEAgLTY3LDYgKzY3LDggQEAgUGFzdGVkIGNvbnRlbnQ6CiB8ICAgaHJlZj0iIgogfCAg IGlkPSJhbmNob3IyIgogfCAgICJIZWxsbyIKK3wgPHNjcmlwdD4KK3wgPHNjcmlwdD4KIHwgPGlm cmFtZT4KIHwgICBpZD0iaWZyYW1lMSIKIHwgICBzcmM9IiIKZGlmZiAtLWdpdCBhL0xheW91dFRl c3RzL3BsYXRmb3JtL21hYy9lZGl0aW5nL3Bhc3RlYm9hcmQvcGFzdGUteG1sLWV4cGVjdGVkLnR4 dCBiL0xheW91dFRlc3RzL3BsYXRmb3JtL21hYy9lZGl0aW5nL3Bhc3RlYm9hcmQvcGFzdGUteG1s LWV4cGVjdGVkLnR4dAppbmRleCAwNWM3ZDE4ZjgyMGMwN2FhZGVmNmQ4OWM0Mjg0OGNiNTNmZTFm YWNiLi5lYmJhZjg3YjlkMmQzN2U4N2RhOTUyNzM5NDcyZGUyYzQ0Yjc5MWFmIDEwMDY0NAotLS0g YS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvZWRpdGluZy9wYXN0ZWJvYXJkL3Bhc3RlLXhtbC1l eHBlY3RlZC50eHQKKysrIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL2VkaXRpbmcvcGFzdGVi b2FyZC9wYXN0ZS14bWwtZXhwZWN0ZWQudHh0CkBAIC05LDEwICs5LDExIEBAIEVESVRJTkcgREVM RUdBVEU6IHdlYlZpZXdEaWRDaGFuZ2VTZWxlY3Rpb246V2ViVmlld0RpZENoYW5nZVNlbGVjdGlv bk5vdGlmaWNhdGlvCiBFRElUSU5HIERFTEVHQVRFOiB3ZWJWaWV3RGlkQ2hhbmdlU2VsZWN0aW9u OldlYlZpZXdEaWRDaGFuZ2VTZWxlY3Rpb25Ob3RpZmljYXRpb24KIEVESVRJTkcgREVMRUdBVEU6 IHdlYlZpZXdEaWRDaGFuZ2VTZWxlY3Rpb246V2ViVmlld0RpZENoYW5nZVNlbGVjdGlvbk5vdGlm aWNhdGlvbgogRURJVElORyBERUxFR0FURTogd2ViVmlld0RpZENoYW5nZVNlbGVjdGlvbjpXZWJW aWV3RGlkQ2hhbmdlU2VsZWN0aW9uTm90aWZpY2F0aW9uCi1FRElUSU5HIERFTEVHQVRFOiBzaG91 bGRJbnNlcnRUZXh0OmJhciByZXBsYWNpbmdET01SYW5nZTpyYW5nZSBmcm9tIDcgb2YgI3RleHQg PiBzcGFuID4gZGl2ID4gYm9keSA+IGh0bWwgPiAjZG9jdW1lbnQgdG8gNyBvZiAjdGV4dCA+IHNw YW4gPiBkaXYgPiBib2R5ID4gaHRtbCA+ICNkb2N1bWVudCBnaXZlbkFjdGlvbjpXZWJWaWV3SW5z ZXJ0QWN0aW9uUGFzdGVkCi1FRElUSU5HIERFTEVHQVRFOiBzaG91bGRDaGFuZ2VTZWxlY3RlZERP TVJhbmdlOnJhbmdlIGZyb20gNyBvZiAjdGV4dCA+IHNwYW4gPiBkaXYgPiBib2R5ID4gaHRtbCA+ ICNkb2N1bWVudCB0byA3IG9mICN0ZXh0ID4gc3BhbiA+IGRpdiA+IGJvZHkgPiBodG1sID4gI2Rv Y3VtZW50IHRvRE9NUmFuZ2U6cmFuZ2UgZnJvbSAxMCBvZiAjdGV4dCA+IHNwYW4gPiBkaXYgPiBi b2R5ID4gaHRtbCA+ICNkb2N1bWVudCB0byAxMCBvZiAjdGV4dCA+IHNwYW4gPiBkaXYgPiBib2R5 ID4gaHRtbCA+ICNkb2N1bWVudCBhZmZpbml0eTpOU1NlbGVjdGlvbkFmZmluaXR5RG93bnN0cmVh bSBzdGlsbFNlbGVjdGluZzpGQUxTRQorRURJVElORyBERUxFR0FURTogc2hvdWxkSW5zZXJ0Tm9k ZTojZG9jdW1lbnQtZnJhZ21lbnQgcmVwbGFjaW5nRE9NUmFuZ2U6cmFuZ2UgZnJvbSA3IG9mICN0 ZXh0ID4gc3BhbiA+IGRpdiA+IGJvZHkgPiBodG1sID4gI2RvY3VtZW50IHRvIDcgb2YgI3RleHQg PiBzcGFuID4gZGl2ID4gYm9keSA+IGh0bWwgPiAjZG9jdW1lbnQgZ2l2ZW5BY3Rpb246V2ViVmll d0luc2VydEFjdGlvblBhc3RlZAorRURJVElORyBERUxFR0FURTogd2ViVmlld0RpZENoYW5nZVNl bGVjdGlvbjpXZWJWaWV3RGlkQ2hhbmdlU2VsZWN0aW9uTm90aWZpY2F0aW9uCitFRElUSU5HIERF TEVHQVRFOiBzaG91bGRDaGFuZ2VTZWxlY3RlZERPTVJhbmdlOnJhbmdlIGZyb20gMTAgb2YgI3Rl eHQgPiBzcGFuID4gZGl2ID4gYm9keSA+IGh0bWwgPiAjZG9jdW1lbnQgdG8gMTAgb2YgI3RleHQg PiBzcGFuID4gZGl2ID4gYm9keSA+IGh0bWwgPiAjZG9jdW1lbnQgdG9ET01SYW5nZTpyYW5nZSBm cm9tIDEwIG9mICN0ZXh0ID4gc3BhbiA+IGRpdiA+IGJvZHkgPiBodG1sID4gI2RvY3VtZW50IHRv IDEwIG9mICN0ZXh0ID4gc3BhbiA+IGRpdiA+IGJvZHkgPiBodG1sID4gI2RvY3VtZW50IGFmZmlu aXR5Ok5TU2VsZWN0aW9uQWZmaW5pdHlEb3duc3RyZWFtIHN0aWxsU2VsZWN0aW5nOkZBTFNFCiBF RElUSU5HIERFTEVHQVRFOiB3ZWJWaWV3RGlkQ2hhbmdlU2VsZWN0aW9uOldlYlZpZXdEaWRDaGFu Z2VTZWxlY3Rpb25Ob3RpZmljYXRpb24KIEVESVRJTkcgREVMRUdBVEU6IHdlYlZpZXdEaWRDaGFu Z2U6V2ViVmlld0RpZENoYW5nZU5vdGlmaWNhdGlvbgotZm9vIGJhcmJhciBiYXoKK2ZvbyBiYXJi YXLCoGJhegogZXhlY0NvcHlDb21tYW5kOiA8c3BhbiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv MTk5OS94aHRtbCIgaWQ9InRlc3QiPmZvbyBiYXIgYmF6PC9zcGFuPgotZXhlY1Bhc3RlQ29tbWFu ZDogPHNwYW4geG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGh0bWwiIGlkPSJ0ZXN0Ij5m b28gYmFyYmFyIGJhejwvc3Bhbj4KK2V4ZWNQYXN0ZUNvbW1hbmQ6IDxzcGFuIHhtbG5zPSJodHRw Oi8vd3d3LnczLm9yZy8xOTk5L3hodG1sIiBpZD0idGVzdCI+Zm9vIGJhcmJhcsKgYmF6PC9zcGFu Pgo= 169715 2012-10-19 16:09:33 -0700 2012-10-19 16:53:10 -0700 Patch bug-99880-20121019160816.patch text/plain 10667 adamk U3VidmVyc2lvbiBSZXZpc2lvbjogMTMxNzgxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzdiN2E1NTJhNjg5YzYz Mzc4ZDBhMDVhMzI1Y2MyMDQ4MzNlYzlmZC4uMDQ0OGIyOWYwM2M0MmE5OWJhNmU4YWQxYTZkZDQz MjdmZjZkZGEyMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM0IEBACisyMDEyLTEwLTE5ICBBZGFt IEtsZWluICA8YWRhbWtAY2hyb21pdW0ub3JnPgorCisgICAgICAgIEFsd2F5cyBwYXJzZSBwYXN0 ZWQgZnJhZ21lbnRzIGFzIEhUTUwgZXZlbiBvbiBYSFRNTCBwYWdlcworICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTk4ODAKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXaGVuIHBhc3RpbmcgSFRNTCBpbnRvIGEg cGFnZSwgdXNpbmcgdGhlIFhNTCBwYXJzZXIgaXMgdW5saWtlbHkKKyAgICAgICAgdG8gd29yayBj b3JyZWN0bHksIGFzIHRoZSBjb250ZW50cyBvZiB0aGUgY2xpcGJvYXJkIGFyZSB1bmxpa2VseQor ICAgICAgICB0byBiZSBwcm9wZXJseS1mb3JtZWQgWEhUTUwuIFRodXMsIGZvciB0aGUgcGFzdGlu ZyBjYXNlLCBpdCdzIGFsd2F5cworICAgICAgICBiZXR0ZXIgdG8gdXNlIEhUTUwgcGFyc2luZywg d2hpY2ggd2lsbCBwcm9wZXJseSBwYXJzZSBlaXRoZXIgSFRNTAorICAgICAgICAod2hpY2ggaXMg d2hhdCdzIHVzdWFsbHkgaW4gdGhlIGNsaXBib2FyZCkgb3IgWEhUTUwgKHdoaWNoIGlzCisgICAg ICAgIHNvbWV0aW1lcyB0aGVyZSBhcyB3ZWxsKS4KKworICAgICAgICBUaGUgTWFjIHBvcnQgcHJl dmlvdXNseSB3b3JrZWQgYXJvdW5kIHRoaXMgcHJvYmxlbSBieSBmYWxsaW5nIGJhY2sgdG8gcGxh aW4gdGV4dAorICAgICAgICB3aGVuIHBhcnNpbmcgZmFpbGVkLCBidXQgc3dpdGNoaW5nIHRvIEhU TUwgc2VlbXMgbGlrZSBhIGNsZWFyIGltcHJvdmVtZW50LgorCisgICAgICAgIFRoaXMgYWxzbyBm aXhlcyBhIGNyYXNoIGluIENocm9taXVtIChzZWUgaHR0cDovL3dlYmtpdC5vcmcvYi85OTYwNwor ICAgICAgICBhbmQgaHR0cDovL2NyYnVnLmNvbS8xMzYyMTgpOyBpdCBlcnJvbmVvdXNseSBhc3N1 bWVkIHRoYXQgY3JlYXRlRnJhZ21lbnRGcm9tTWFya3VwKCkKKyAgICAgICAgd291bGQgbmV2ZXIg cmV0dXJuIG51bGwuIFRoaXMgcGF0Y2ggbWFrZXMgdGhhdCB0cnVlLgorCisgICAgICAgICogZWRp dGluZy9tYXJrdXAuY3BwOgorICAgICAgICAoV2ViQ29yZTo6cmVtb3ZlRWxlbWVudFByZXNlcnZp bmdDaGlsZHJlbik6IFJlbW92ZWQgcmVkdW5kYW50IGFzc2VydHMuCisgICAgICAgIChXZWJDb3Jl OjpyZW1vdmVEb2N1bWVudFN0cnVjdHVyZUVsZW1lbnRzUHJlc2VydmluZ0NoaWxkcmVuKTogRmFj dG9yZWQKKyAgICAgICAgb3V0IGxvZ2ljIHVzZWQgaW4gYm90aCBjcmVhdGVDb250ZXh0dWFsRnJh Z21lbnQgYW5kIGNyZWF0ZUZyYWdtZW50RnJvbU1hcmt1cC4KKyAgICAgICAgKFdlYkNvcmU6OmNy ZWF0ZUZyYWdtZW50RnJvbU1hcmt1cCk6IERvbid0IGRlbGVnYXRlIHRvCisgICAgICAgIGNyZWF0 ZUNvbnRleHR1YWxGcmFnbWVudDogd2UgYWxyZWFkeSBrbm93IG91ciBjb250ZXh0IGVsZW1lbnQg aXMgc2FmZSwKKyAgICAgICAgYW5kIHdlIHdhbnQgdG8gZm9yY2UgSFRNTCAobm90IFhNTCkgcGFy c2luZy4KKyAgICAgICAgKFdlYkNvcmU6OmNyZWF0ZUNvbnRleHR1YWxGcmFnbWVudCk6IEZhY3Rv ciBvdXQgaHRtbC9oZWFkL2JvZHkgcmVtb3ZhbCBsb2dpYyBpbnRvCisgICAgICAgIHJlbW92ZURv Y3VtZW50U3RydWN0dXJlRWxlbWVudHNQcmVzZXJ2aW5nQ2hpbGRyZW4oKS4KKwogMjAxMi0xMC0x OCAgSmVyIE5vYmxlICA8amVyLm5vYmxlQGFwcGxlLmNvbT4KIAogICAgICAgICBGdWxsc2NyZWVu IG1vdmllIGNvbnRyb2xzIGJlaGF2ZSBpbmNvcnJlY3RseSB3aGVuIGNsaWNrZWQgKGFuZCBkcmFn Z2VkKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZWRpdGluZy9tYXJrdXAuY3BwIGIvU291 cmNlL1dlYkNvcmUvZWRpdGluZy9tYXJrdXAuY3BwCmluZGV4IGJhNDcyZWU2OTdjNTNlYmMwY2Fl ZTM1Y2UxNGIwMjdjZjNmZDE0NTQuLjhlMmQ3NTRjMTU1ZTgyM2QxMjE4NTE1ZWVhNDZkMTg0ZjI2 NzdmMzYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvbWFya3VwLmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL21hcmt1cC5jcHAKQEAgLTY2MiwxNSArNjYyLDQzIEBA IFN0cmluZyBjcmVhdGVNYXJrdXAoY29uc3QgUmFuZ2UqIHJhbmdlLCBWZWN0b3I8Tm9kZSo+KiBu b2RlcywgRUFubm90YXRlRm9ySW50ZXJjCiAgICAgcmV0dXJuIGFjY3VtdWxhdG9yLnRha2VSZXN1 bHRzKCk7CiB9CiAKK3N0YXRpYyBpbmxpbmUgdm9pZCByZW1vdmVFbGVtZW50UHJlc2VydmluZ0No aWxkcmVuKERvY3VtZW50RnJhZ21lbnQqIGZyYWdtZW50LCBIVE1MRWxlbWVudCogZWxlbWVudCkK K3sKKyAgICBSZWZQdHI8Tm9kZT4gbmV4dENoaWxkOworICAgIGZvciAoUmVmUHRyPE5vZGU+IGNo aWxkID0gZWxlbWVudC0+Zmlyc3RDaGlsZCgpOyBjaGlsZDsgY2hpbGQgPSBuZXh0Q2hpbGQpIHsK KyAgICAgICAgbmV4dENoaWxkID0gY2hpbGQtPm5leHRTaWJsaW5nKCk7CisgICAgICAgIGVsZW1l bnQtPnJlbW92ZUNoaWxkKGNoaWxkLmdldCgpKTsKKyAgICAgICAgZnJhZ21lbnQtPmluc2VydEJl Zm9yZShjaGlsZCwgZWxlbWVudCk7CisgICAgfQorICAgIGZyYWdtZW50LT5yZW1vdmVDaGlsZChl bGVtZW50KTsKK30KKworLy8gTmVlZGVkIHRvIGFsbG93IGNvbW1vbiBmcmFnbWVudC1jcmVhdGlv biB1c2UgY2FzZXMuIFNlZSBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 NjAxNTUgZm9yIGJhY2tncm91bmQuCitzdGF0aWMgaW5saW5lIHZvaWQgcmVtb3ZlRG9jdW1lbnRT dHJ1Y3R1cmVFbGVtZW50c1ByZXNlcnZpbmdDaGlsZHJlbihEb2N1bWVudEZyYWdtZW50KiBmcmFn bWVudCkKK3sKKyAgICBSZWZQdHI8Tm9kZT4gbmV4dE5vZGU7CisgICAgZm9yIChSZWZQdHI8Tm9k ZT4gbm9kZSA9IGZyYWdtZW50LT5maXJzdENoaWxkKCk7IG5vZGU7IG5vZGUgPSBuZXh0Tm9kZSkg eworICAgICAgICBuZXh0Tm9kZSA9IG5vZGUtPm5leHRTaWJsaW5nKCk7CisgICAgICAgIGlmIChu b2RlLT5oYXNUYWdOYW1lKGh0bWxUYWcpIHx8IG5vZGUtPmhhc1RhZ05hbWUoaGVhZFRhZykgfHwg bm9kZS0+aGFzVGFnTmFtZShib2R5VGFnKSkgeworICAgICAgICAgICAgSFRNTEVsZW1lbnQqIGVs ZW1lbnQgPSB0b0hUTUxFbGVtZW50KG5vZGUuZ2V0KCkpOworICAgICAgICAgICAgaWYgKE5vZGUq IGZpcnN0Q2hpbGQgPSBlbGVtZW50LT5maXJzdENoaWxkKCkpCisgICAgICAgICAgICAgICAgbmV4 dE5vZGUgPSBmaXJzdENoaWxkOworICAgICAgICAgICAgcmVtb3ZlRWxlbWVudFByZXNlcnZpbmdD aGlsZHJlbihmcmFnbWVudCwgZWxlbWVudCk7CisgICAgICAgIH0KKyAgICB9Cit9CisKIFBhc3NS ZWZQdHI8RG9jdW1lbnRGcmFnbWVudD4gY3JlYXRlRnJhZ21lbnRGcm9tTWFya3VwKERvY3VtZW50 KiBkb2N1bWVudCwgY29uc3QgU3RyaW5nJiBtYXJrdXAsIGNvbnN0IFN0cmluZyYgYmFzZVVSTCwg RnJhZ21lbnRTY3JpcHRpbmdQZXJtaXNzaW9uIHNjcmlwdGluZ1Blcm1pc3Npb24pCiB7CiAgICAg Ly8gV2UgdXNlIGEgZmFrZSBib2R5IGVsZW1lbnQgaGVyZSB0byB0cmljayB0aGUgSFRNTCBwYXJz ZXIgdG8gdXNpbmcgdGhlIEluQm9keSBpbnNlcnRpb24gbW9kZS4KICAgICBSZWZQdHI8SFRNTEJv ZHlFbGVtZW50PiBmYWtlQm9keSA9IEhUTUxCb2R5RWxlbWVudDo6Y3JlYXRlKGRvY3VtZW50KTsK LSAgICAvLyBJZ25vcmUgZXhjZXB0aW9ucyBoZXJlIHNpbmNlIHRoaXMgZnVuY3Rpb24gaXMgdXNl ZCB0byBwYXJzZSBtYXJrdXAgZm9yIHBhc3Rpbmcgb3IgZm9yIG90aGVyIGVkaXRpbmcgcHVycG9z ZXMuCi0gICAgRXhjZXB0aW9uQ29kZSBpZ25vcmVkRUM7Ci0gICAgUmVmUHRyPERvY3VtZW50RnJh Z21lbnQ+IGZyYWdtZW50ID0gY3JlYXRlQ29udGV4dHVhbEZyYWdtZW50KG1hcmt1cCwgZmFrZUJv ZHkuZ2V0KCksIHNjcmlwdGluZ1Blcm1pc3Npb24sIGlnbm9yZWRFQyk7CiAKLSAgICBpZiAoZnJh Z21lbnQgJiYgIWJhc2VVUkwuaXNFbXB0eSgpICYmIGJhc2VVUkwgIT0gYmxhbmtVUkwoKSAmJiBi YXNlVVJMICE9IGRvY3VtZW50LT5iYXNlVVJMKCkpCisgICAgUmVmUHRyPERvY3VtZW50RnJhZ21l bnQ+IGZyYWdtZW50ID0gRG9jdW1lbnRGcmFnbWVudDo6Y3JlYXRlKGRvY3VtZW50KTsKKyAgICBm cmFnbWVudC0+cGFyc2VIVE1MKG1hcmt1cCwgZmFrZUJvZHkuZ2V0KCksIHNjcmlwdGluZ1Blcm1p c3Npb24pOworCisgICAgcmVtb3ZlRG9jdW1lbnRTdHJ1Y3R1cmVFbGVtZW50c1ByZXNlcnZpbmdD aGlsZHJlbihmcmFnbWVudC5nZXQoKSk7CisKKyAgICBpZiAoIWJhc2VVUkwuaXNFbXB0eSgpICYm IGJhc2VVUkwgIT0gYmxhbmtVUkwoKSAmJiBiYXNlVVJMICE9IGRvY3VtZW50LT5iYXNlVVJMKCkp CiAgICAgICAgIGNvbXBsZXRlVVJMcyhmcmFnbWVudC5nZXQoKSwgYmFzZVVSTCk7CiAKICAgICBy ZXR1cm4gZnJhZ21lbnQucmVsZWFzZSgpOwpAQCAtMTAzOCwyMiArMTA2Niw2IEBAIFBhc3NSZWZQ dHI8RG9jdW1lbnRGcmFnbWVudD4gY3JlYXRlRnJhZ21lbnRGb3JUcmFuc2Zvcm1Ub0ZyYWdtZW50 KGNvbnN0IFN0cmluZyYKICAgICByZXR1cm4gZnJhZ21lbnQucmVsZWFzZSgpOwogfQogCi1zdGF0 aWMgaW5saW5lIHZvaWQgcmVtb3ZlRWxlbWVudFByZXNlcnZpbmdDaGlsZHJlbihQYXNzUmVmUHRy PERvY3VtZW50RnJhZ21lbnQ+IGZyYWdtZW50LCBIVE1MRWxlbWVudCogZWxlbWVudCkKLXsKLSAg ICBFeGNlcHRpb25Db2RlIGlnbm9yZWRFeGNlcHRpb25Db2RlOwotCi0gICAgUmVmUHRyPE5vZGU+ IG5leHRDaGlsZDsKLSAgICBmb3IgKFJlZlB0cjxOb2RlPiBjaGlsZCA9IGVsZW1lbnQtPmZpcnN0 Q2hpbGQoKTsgY2hpbGQ7IGNoaWxkID0gbmV4dENoaWxkKSB7Ci0gICAgICAgIG5leHRDaGlsZCA9 IGNoaWxkLT5uZXh0U2libGluZygpOwotICAgICAgICBlbGVtZW50LT5yZW1vdmVDaGlsZChjaGls ZC5nZXQoKSwgaWdub3JlZEV4Y2VwdGlvbkNvZGUpOwotICAgICAgICBBU1NFUlQoIWlnbm9yZWRF eGNlcHRpb25Db2RlKTsKLSAgICAgICAgZnJhZ21lbnQtPmluc2VydEJlZm9yZShjaGlsZCwgZWxl bWVudCwgaWdub3JlZEV4Y2VwdGlvbkNvZGUpOwotICAgICAgICBBU1NFUlQoIWlnbm9yZWRFeGNl cHRpb25Db2RlKTsKLSAgICB9Ci0gICAgZnJhZ21lbnQtPnJlbW92ZUNoaWxkKGVsZW1lbnQsIGln bm9yZWRFeGNlcHRpb25Db2RlKTsKLSAgICBBU1NFUlQoIWlnbm9yZWRFeGNlcHRpb25Db2RlKTsK LX0KLQogUGFzc1JlZlB0cjxEb2N1bWVudEZyYWdtZW50PiBjcmVhdGVDb250ZXh0dWFsRnJhZ21l bnQoY29uc3QgU3RyaW5nJiBtYXJrdXAsIEhUTUxFbGVtZW50KiBlbGVtZW50LCBGcmFnbWVudFNj cmlwdGluZ1Blcm1pc3Npb24gc2NyaXB0aW5nUGVybWlzc2lvbiwgRXhjZXB0aW9uQ29kZSYgZWMp CiB7CiAgICAgQVNTRVJUKGVsZW1lbnQpOwpAQCAtMTA3MiwyMCArMTA4NCw3IEBAIFBhc3NSZWZQ dHI8RG9jdW1lbnRGcmFnbWVudD4gY3JlYXRlQ29udGV4dHVhbEZyYWdtZW50KGNvbnN0IFN0cmlu ZyYgbWFya3VwLCBIVE1MCiAgICAgaWYgKCFmcmFnbWVudCkKICAgICAgICAgcmV0dXJuIDA7CiAK LSAgICAvLyBXZSBuZWVkIHRvIHBvcCA8aHRtbD4gYW5kIDxib2R5PiBlbGVtZW50cyBhbmQgcmVt b3ZlIDxoZWFkPiB0bwotICAgIC8vIGFjY29tbW9kYXRlIGZvbGtzIHBhc3NpbmcgY29tcGxldGUg SFRNTCBkb2N1bWVudHMgdG8gbWFrZSB0aGUKLSAgICAvLyBjaGlsZCBvZiBhbiBlbGVtZW50Lgot Ci0gICAgUmVmUHRyPE5vZGU+IG5leHROb2RlOwotICAgIGZvciAoUmVmUHRyPE5vZGU+IG5vZGUg PSBmcmFnbWVudC0+Zmlyc3RDaGlsZCgpOyBub2RlOyBub2RlID0gbmV4dE5vZGUpIHsKLSAgICAg ICAgbmV4dE5vZGUgPSBub2RlLT5uZXh0U2libGluZygpOwotICAgICAgICBpZiAobm9kZS0+aGFz VGFnTmFtZShodG1sVGFnKSB8fCBub2RlLT5oYXNUYWdOYW1lKGhlYWRUYWcpIHx8IG5vZGUtPmhh c1RhZ05hbWUoYm9keVRhZykpIHsKLSAgICAgICAgICAgIEhUTUxFbGVtZW50KiBlbGVtZW50ID0g dG9IVE1MRWxlbWVudChub2RlLmdldCgpKTsKLSAgICAgICAgICAgIGlmIChOb2RlKiBmaXJzdENo aWxkID0gZWxlbWVudC0+Zmlyc3RDaGlsZCgpKQotICAgICAgICAgICAgICAgIG5leHROb2RlID0g Zmlyc3RDaGlsZDsKLSAgICAgICAgICAgIHJlbW92ZUVsZW1lbnRQcmVzZXJ2aW5nQ2hpbGRyZW4o ZnJhZ21lbnQsIGVsZW1lbnQpOwotICAgICAgICB9Ci0gICAgfQorICAgIHJlbW92ZURvY3VtZW50 U3RydWN0dXJlRWxlbWVudHNQcmVzZXJ2aW5nQ2hpbGRyZW4oZnJhZ21lbnQuZ2V0KCkpOwogICAg IHJldHVybiBmcmFnbWVudC5yZWxlYXNlKCk7CiB9CiAKZGlmZiAtLWdpdCBhL0xheW91dFRlc3Rz L0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCA2MTVmMjNhNWU1ZGUxMWZk NGZlZmEzN2ZmZmY4ODNkM2VkMmQ1NDA2Li40NmRhOWQ0NWI3Y2FhNjhhZjM2MGI3YTVmMDg3OTJh YjBjZmVjM2YxIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0 VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEgQEAKKzIwMTItMTAtMTkgIEFkYW0gS2xlaW4g IDxhZGFta0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgQWx3YXlzIHBhcnNlIHBhc3RlZCBmcmFn bWVudHMgYXMgSFRNTCBldmVuIG9uIFhIVE1MIHBhZ2VzCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05OTg4MAorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIFVwZGF0ZWQgZXhpc3RpbmcgdGVzdHMgdG8gbWF0Y2gg bmV3IGV4cGVjdGVkIGJlaGF2aW9yLgorCisgICAgICAgICogZWRpdGluZy9wYXN0ZWJvYXJkL3Bh c3RlLW5vc2NyaXB0LXhodG1sLWV4cGVjdGVkLnR4dDogVGhlIEhUTUwKKyAgICAgICAgcGFyc2Vy IGxlYXZlcyA8c2NyaXB0PiB0YWdzIGluIHRoZSBET00gd2hlbiBwYXN0aW5nLCBidXQgcmVtb3Zl cyB0aGVpcgorICAgICAgICBhdHRyaWJ1dGVzIGFuZCBjaGlsZHJlbiwgc28gdGhpcyBpcyBqdXN0 IGFzIHNhZmUgYXMgdGhlIHByZXZpb3VzCisgICAgICAgIGJlaGF2aW9yLgorICAgICAgICAqIHBs YXRmb3JtL21hYy9lZGl0aW5nL3Bhc3RlYm9hcmQvcGFzdGUteG1sLWV4cGVjdGVkLnR4dDogTm93 IHRoYXQgd2UKKyAgICAgICAgdXNlIHRoZSBIVE1MIHBhcnNlciwgcGFyc2luZyB0aGUgcGFzdGUg c3VjY2VlZHMgYW5kIHNvIHdlIGluc2VydCBET00KKyAgICAgICAgaW5zdGVhZCBvZiBwbGFpbiB0 ZXh0LiBTaW1pbGFyIHJlYmFzZWxpbmVzIG1heSBiZSBuZWVkZWQgb24gb3RoZXIKKyAgICAgICAg cGxhdGZvcm1zLgorCiAyMDEyLTEwLTE4ICBKZXIgTm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29t PgogCiAgICAgICAgIEZ1bGxzY3JlZW4gbW92aWUgY29udHJvbHMgYmVoYXZlIGluY29ycmVjdGx5 IHdoZW4gY2xpY2tlZCAoYW5kIGRyYWdnZWQpCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9lZGl0 aW5nL3Bhc3RlYm9hcmQvcGFzdGUtbm9zY3JpcHQteGh0bWwtZXhwZWN0ZWQudHh0IGIvTGF5b3V0 VGVzdHMvZWRpdGluZy9wYXN0ZWJvYXJkL3Bhc3RlLW5vc2NyaXB0LXhodG1sLWV4cGVjdGVkLnR4 dAppbmRleCBiYjhkZTc0MzVmZTMxYjM4YmU3ODFlYzRhY2U5YjI5ZjdhYmMyMjg1Li5iYjQyM2Y4 MGMxOWMyZDQwZDgzY2QyNTQ5NWI1NTBmNDk0ZGEyZjNkIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0 cy9lZGl0aW5nL3Bhc3RlYm9hcmQvcGFzdGUtbm9zY3JpcHQteGh0bWwtZXhwZWN0ZWQudHh0Cisr KyBiL0xheW91dFRlc3RzL2VkaXRpbmcvcGFzdGVib2FyZC9wYXN0ZS1ub3NjcmlwdC14aHRtbC1l eHBlY3RlZC50eHQKQEAgLTY3LDYgKzY3LDggQEAgUGFzdGVkIGNvbnRlbnQ6CiB8ICAgaHJlZj0i IgogfCAgIGlkPSJhbmNob3IyIgogfCAgICJIZWxsbyIKK3wgPHNjcmlwdD4KK3wgPHNjcmlwdD4K IHwgPGlmcmFtZT4KIHwgICBpZD0iaWZyYW1lMSIKIHwgICBzcmM9IiIKZGlmZiAtLWdpdCBhL0xh eW91dFRlc3RzL3BsYXRmb3JtL21hYy9lZGl0aW5nL3Bhc3RlYm9hcmQvcGFzdGUteG1sLWV4cGVj dGVkLnR4dCBiL0xheW91dFRlc3RzL3BsYXRmb3JtL21hYy9lZGl0aW5nL3Bhc3RlYm9hcmQvcGFz dGUteG1sLWV4cGVjdGVkLnR4dAppbmRleCAwNWM3ZDE4ZjgyMGMwN2FhZGVmNmQ4OWM0Mjg0OGNi NTNmZTFmYWNiLi5lYmJhZjg3YjlkMmQzN2U4N2RhOTUyNzM5NDcyZGUyYzQ0Yjc5MWFmIDEwMDY0 NAotLS0gYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvZWRpdGluZy9wYXN0ZWJvYXJkL3Bhc3Rl LXhtbC1leHBlY3RlZC50eHQKKysrIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL2VkaXRpbmcv cGFzdGVib2FyZC9wYXN0ZS14bWwtZXhwZWN0ZWQudHh0CkBAIC05LDEwICs5LDExIEBAIEVESVRJ TkcgREVMRUdBVEU6IHdlYlZpZXdEaWRDaGFuZ2VTZWxlY3Rpb246V2ViVmlld0RpZENoYW5nZVNl bGVjdGlvbk5vdGlmaWNhdGlvCiBFRElUSU5HIERFTEVHQVRFOiB3ZWJWaWV3RGlkQ2hhbmdlU2Vs ZWN0aW9uOldlYlZpZXdEaWRDaGFuZ2VTZWxlY3Rpb25Ob3RpZmljYXRpb24KIEVESVRJTkcgREVM RUdBVEU6IHdlYlZpZXdEaWRDaGFuZ2VTZWxlY3Rpb246V2ViVmlld0RpZENoYW5nZVNlbGVjdGlv bk5vdGlmaWNhdGlvbgogRURJVElORyBERUxFR0FURTogd2ViVmlld0RpZENoYW5nZVNlbGVjdGlv bjpXZWJWaWV3RGlkQ2hhbmdlU2VsZWN0aW9uTm90aWZpY2F0aW9uCi1FRElUSU5HIERFTEVHQVRF OiBzaG91bGRJbnNlcnRUZXh0OmJhciByZXBsYWNpbmdET01SYW5nZTpyYW5nZSBmcm9tIDcgb2Yg I3RleHQgPiBzcGFuID4gZGl2ID4gYm9keSA+IGh0bWwgPiAjZG9jdW1lbnQgdG8gNyBvZiAjdGV4 dCA+IHNwYW4gPiBkaXYgPiBib2R5ID4gaHRtbCA+ICNkb2N1bWVudCBnaXZlbkFjdGlvbjpXZWJW aWV3SW5zZXJ0QWN0aW9uUGFzdGVkCi1FRElUSU5HIERFTEVHQVRFOiBzaG91bGRDaGFuZ2VTZWxl Y3RlZERPTVJhbmdlOnJhbmdlIGZyb20gNyBvZiAjdGV4dCA+IHNwYW4gPiBkaXYgPiBib2R5ID4g aHRtbCA+ICNkb2N1bWVudCB0byA3IG9mICN0ZXh0ID4gc3BhbiA+IGRpdiA+IGJvZHkgPiBodG1s ID4gI2RvY3VtZW50IHRvRE9NUmFuZ2U6cmFuZ2UgZnJvbSAxMCBvZiAjdGV4dCA+IHNwYW4gPiBk aXYgPiBib2R5ID4gaHRtbCA+ICNkb2N1bWVudCB0byAxMCBvZiAjdGV4dCA+IHNwYW4gPiBkaXYg PiBib2R5ID4gaHRtbCA+ICNkb2N1bWVudCBhZmZpbml0eTpOU1NlbGVjdGlvbkFmZmluaXR5RG93 bnN0cmVhbSBzdGlsbFNlbGVjdGluZzpGQUxTRQorRURJVElORyBERUxFR0FURTogc2hvdWxkSW5z ZXJ0Tm9kZTojZG9jdW1lbnQtZnJhZ21lbnQgcmVwbGFjaW5nRE9NUmFuZ2U6cmFuZ2UgZnJvbSA3 IG9mICN0ZXh0ID4gc3BhbiA+IGRpdiA+IGJvZHkgPiBodG1sID4gI2RvY3VtZW50IHRvIDcgb2Yg I3RleHQgPiBzcGFuID4gZGl2ID4gYm9keSA+IGh0bWwgPiAjZG9jdW1lbnQgZ2l2ZW5BY3Rpb246 V2ViVmlld0luc2VydEFjdGlvblBhc3RlZAorRURJVElORyBERUxFR0FURTogd2ViVmlld0RpZENo YW5nZVNlbGVjdGlvbjpXZWJWaWV3RGlkQ2hhbmdlU2VsZWN0aW9uTm90aWZpY2F0aW9uCitFRElU SU5HIERFTEVHQVRFOiBzaG91bGRDaGFuZ2VTZWxlY3RlZERPTVJhbmdlOnJhbmdlIGZyb20gMTAg b2YgI3RleHQgPiBzcGFuID4gZGl2ID4gYm9keSA+IGh0bWwgPiAjZG9jdW1lbnQgdG8gMTAgb2Yg I3RleHQgPiBzcGFuID4gZGl2ID4gYm9keSA+IGh0bWwgPiAjZG9jdW1lbnQgdG9ET01SYW5nZTpy YW5nZSBmcm9tIDEwIG9mICN0ZXh0ID4gc3BhbiA+IGRpdiA+IGJvZHkgPiBodG1sID4gI2RvY3Vt ZW50IHRvIDEwIG9mICN0ZXh0ID4gc3BhbiA+IGRpdiA+IGJvZHkgPiBodG1sID4gI2RvY3VtZW50 IGFmZmluaXR5Ok5TU2VsZWN0aW9uQWZmaW5pdHlEb3duc3RyZWFtIHN0aWxsU2VsZWN0aW5nOkZB TFNFCiBFRElUSU5HIERFTEVHQVRFOiB3ZWJWaWV3RGlkQ2hhbmdlU2VsZWN0aW9uOldlYlZpZXdE aWRDaGFuZ2VTZWxlY3Rpb25Ob3RpZmljYXRpb24KIEVESVRJTkcgREVMRUdBVEU6IHdlYlZpZXdE aWRDaGFuZ2U6V2ViVmlld0RpZENoYW5nZU5vdGlmaWNhdGlvbgotZm9vIGJhcmJhciBiYXoKK2Zv byBiYXJiYXLCoGJhegogZXhlY0NvcHlDb21tYW5kOiA8c3BhbiB4bWxucz0iaHR0cDovL3d3dy53 My5vcmcvMTk5OS94aHRtbCIgaWQ9InRlc3QiPmZvbyBiYXIgYmF6PC9zcGFuPgotZXhlY1Bhc3Rl Q29tbWFuZDogPHNwYW4geG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGh0bWwiIGlkPSJ0 ZXN0Ij5mb28gYmFyYmFyIGJhejwvc3Bhbj4KK2V4ZWNQYXN0ZUNvbW1hbmQ6IDxzcGFuIHhtbG5z PSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hodG1sIiBpZD0idGVzdCI+Zm9vIGJhcmJhcsKgYmF6 PC9zcGFuPgo= 169727 2012-10-19 16:53:13 -0700 2012-10-23 06:06:43 -0700 Patch for landing bug-99880-20121019165156.patch text/plain 6979 adamk U3VidmVyc2lvbiBSZXZpc2lvbjogMTMxNzgxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzdiN2E1NTJhNjg5YzYz Mzc4ZDBhMDVhMzI1Y2MyMDQ4MzNlYzlmZC4uMjAyNDZmNzY0YWE4NzNkYjEzMjNhYTVjNWYzYWY2 ODkwMjFiNjVhYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDEyLTEwLTE5ICBBZGFt IEtsZWluICA8YWRhbWtAY2hyb21pdW0ub3JnPgorCisgICAgICAgIEFsd2F5cyBwYXJzZSBwYXN0 ZWQgZnJhZ21lbnRzIGFzIEhUTUwgZXZlbiBvbiBYSFRNTCBwYWdlcworICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTk4ODAKKworICAgICAgICBSZXZpZXdl ZCBieSBPamFuIFZhZmFpLgorCisgICAgICAgIFdoZW4gcGFzdGluZyBIVE1MIGludG8gYSBwYWdl LCB1c2luZyB0aGUgWE1MIHBhcnNlciBpcyB1bmxpa2VseQorICAgICAgICB0byB3b3JrIGNvcnJl Y3RseSwgYXMgdGhlIGNvbnRlbnRzIG9mIHRoZSBjbGlwYm9hcmQgYXJlIHVubGlrZWx5CisgICAg ICAgIHRvIGJlIHByb3Blcmx5LWZvcm1lZCBYSFRNTC4gVGh1cywgZm9yIHRoZSBwYXN0aW5nIGNh c2UsIGl0J3MgYWx3YXlzCisgICAgICAgIGJldHRlciB0byB1c2UgSFRNTCBwYXJzaW5nLCB3aGlj aCB3aWxsIHByb3Blcmx5IHBhcnNlIGVpdGhlciBIVE1MCisgICAgICAgICh3aGljaCBpcyB3aGF0 J3MgdXN1YWxseSBpbiB0aGUgY2xpcGJvYXJkKSBvciBYSFRNTCAod2hpY2ggaXMKKyAgICAgICAg c29tZXRpbWVzIHRoZXJlIGFzIHdlbGwpLgorCisgICAgICAgIFRoZSBNYWMgcG9ydCBwcmV2aW91 c2x5IHdvcmtlZCBhcm91bmQgdGhpcyBwcm9ibGVtIGJ5IGZhbGxpbmcgYmFjayB0byBwbGFpbiB0 ZXh0CisgICAgICAgIHdoZW4gcGFyc2luZyBmYWlsZWQsIGJ1dCBzd2l0Y2hpbmcgdG8gSFRNTCBz ZWVtcyBsaWtlIGEgY2xlYXIgaW1wcm92ZW1lbnQuCisKKyAgICAgICAgVGhpcyBhbHNvIGZpeGVz IGEgY3Jhc2ggaW4gQ2hyb21pdW0gKHNlZSBodHRwOi8vd2Via2l0Lm9yZy9iLzk5NjA3CisgICAg ICAgIGFuZCBodHRwOi8vY3JidWcuY29tLzEzNjIxOCk7IGl0IGVycm9uZW91c2x5IGFzc3VtZWQg dGhhdCBjcmVhdGVGcmFnbWVudEZyb21NYXJrdXAoKQorICAgICAgICB3b3VsZCBuZXZlciByZXR1 cm4gbnVsbC4gVGhpcyBwYXRjaCBtYWtlcyB0aGF0IHRydWUuCisKKyAgICAgICAgKiBlZGl0aW5n L21hcmt1cC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpjcmVhdGVGcmFnbWVudEZyb21NYXJrdXAp OiBEb24ndCBkZWxlZ2F0ZSB0byBjcmVhdGVDb250ZXh0dWFsRnJhZ21lbnQ6CisgICAgICAgIHdl IGFscmVhZHkga25vdyBvdXIgY29udGV4dCBlbGVtZW50IGlzIHNhZmUgKGkuZS4sIGl0J3MgPGJv ZHk+KSwKKyAgICAgICAgYW5kIHdlIHdhbnQgdG8gZm9yY2UgSFRNTCAobm90IFhNTCkgcGFyc2lu Zy4KKwogMjAxMi0xMC0xOCAgSmVyIE5vYmxlICA8amVyLm5vYmxlQGFwcGxlLmNvbT4KIAogICAg ICAgICBGdWxsc2NyZWVuIG1vdmllIGNvbnRyb2xzIGJlaGF2ZSBpbmNvcnJlY3RseSB3aGVuIGNs aWNrZWQgKGFuZCBkcmFnZ2VkKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZWRpdGluZy9t YXJrdXAuY3BwIGIvU291cmNlL1dlYkNvcmUvZWRpdGluZy9tYXJrdXAuY3BwCmluZGV4IGJhNDcy ZWU2OTdjNTNlYmMwY2FlZTM1Y2UxNGIwMjdjZjNmZDE0NTQuLjQ2ZWU0OTc1YjdjYmY3ZTkxZDY1 MzQ2M2U1OTFjMjFjNmZhN2Q0NTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcv bWFya3VwLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL21hcmt1cC5jcHAKQEAgLTY2 NiwxMSArNjY2LDEwIEBAIFBhc3NSZWZQdHI8RG9jdW1lbnRGcmFnbWVudD4gY3JlYXRlRnJhZ21l bnRGcm9tTWFya3VwKERvY3VtZW50KiBkb2N1bWVudCwgY29uc3QKIHsKICAgICAvLyBXZSB1c2Ug YSBmYWtlIGJvZHkgZWxlbWVudCBoZXJlIHRvIHRyaWNrIHRoZSBIVE1MIHBhcnNlciB0byB1c2lu ZyB0aGUgSW5Cb2R5IGluc2VydGlvbiBtb2RlLgogICAgIFJlZlB0cjxIVE1MQm9keUVsZW1lbnQ+ IGZha2VCb2R5ID0gSFRNTEJvZHlFbGVtZW50OjpjcmVhdGUoZG9jdW1lbnQpOwotICAgIC8vIEln bm9yZSBleGNlcHRpb25zIGhlcmUgc2luY2UgdGhpcyBmdW5jdGlvbiBpcyB1c2VkIHRvIHBhcnNl IG1hcmt1cCBmb3IgcGFzdGluZyBvciBmb3Igb3RoZXIgZWRpdGluZyBwdXJwb3Nlcy4KLSAgICBF eGNlcHRpb25Db2RlIGlnbm9yZWRFQzsKLSAgICBSZWZQdHI8RG9jdW1lbnRGcmFnbWVudD4gZnJh Z21lbnQgPSBjcmVhdGVDb250ZXh0dWFsRnJhZ21lbnQobWFya3VwLCBmYWtlQm9keS5nZXQoKSwg c2NyaXB0aW5nUGVybWlzc2lvbiwgaWdub3JlZEVDKTsKKyAgICBSZWZQdHI8RG9jdW1lbnRGcmFn bWVudD4gZnJhZ21lbnQgPSBEb2N1bWVudEZyYWdtZW50OjpjcmVhdGUoZG9jdW1lbnQpOworICAg IGZyYWdtZW50LT5wYXJzZUhUTUwobWFya3VwLCBmYWtlQm9keS5nZXQoKSwgc2NyaXB0aW5nUGVy bWlzc2lvbik7CiAKLSAgICBpZiAoZnJhZ21lbnQgJiYgIWJhc2VVUkwuaXNFbXB0eSgpICYmIGJh c2VVUkwgIT0gYmxhbmtVUkwoKSAmJiBiYXNlVVJMICE9IGRvY3VtZW50LT5iYXNlVVJMKCkpCisg ICAgaWYgKCFiYXNlVVJMLmlzRW1wdHkoKSAmJiBiYXNlVVJMICE9IGJsYW5rVVJMKCkgJiYgYmFz ZVVSTCAhPSBkb2N1bWVudC0+YmFzZVVSTCgpKQogICAgICAgICBjb21wbGV0ZVVSTHMoZnJhZ21l bnQuZ2V0KCksIGJhc2VVUkwpOwogCiAgICAgcmV0dXJuIGZyYWdtZW50LnJlbGVhc2UoKTsKZGlm ZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpp bmRleCA2MTVmMjNhNWU1ZGUxMWZkNGZlZmEzN2ZmZmY4ODNkM2VkMmQ1NDA2Li5lYTU3MGMyMmZh YmQ4ZTdmYWQxYmNmYzFmMmVhZDRiNTRhOTk2NGRmIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9D aGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEgQEAKKzIw MTItMTAtMTkgIEFkYW0gS2xlaW4gIDxhZGFta0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgQWx3 YXlzIHBhcnNlIHBhc3RlZCBmcmFnbWVudHMgYXMgSFRNTCBldmVuIG9uIFhIVE1MIHBhZ2VzCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05OTg4MAorCisg ICAgICAgIFJldmlld2VkIGJ5IE9qYW4gVmFmYWkuCisKKyAgICAgICAgVXBkYXRlZCBleGlzdGlu ZyB0ZXN0cyB0byBtYXRjaCBuZXcgZXhwZWN0ZWQgYmVoYXZpb3IuCisKKyAgICAgICAgKiBlZGl0 aW5nL3Bhc3RlYm9hcmQvcGFzdGUtbm9zY3JpcHQteGh0bWwtZXhwZWN0ZWQudHh0OiBUaGUgSFRN TAorICAgICAgICBwYXJzZXIgbGVhdmVzIDxzY3JpcHQ+IHRhZ3MgaW4gdGhlIERPTSB3aGVuIHBh c3RpbmcsIGJ1dCByZW1vdmVzIHRoZWlyCisgICAgICAgIGF0dHJpYnV0ZXMgYW5kIGNoaWxkcmVu LCBzbyB0aGlzIGlzIGp1c3QgYXMgc2FmZSBhcyB0aGUgcHJldmlvdXMKKyAgICAgICAgYmVoYXZp b3IuCisgICAgICAgICogcGxhdGZvcm0vbWFjL2VkaXRpbmcvcGFzdGVib2FyZC9wYXN0ZS14bWwt ZXhwZWN0ZWQudHh0OiBOb3cgdGhhdCB3ZQorICAgICAgICB1c2UgdGhlIEhUTUwgcGFyc2VyLCBw YXJzaW5nIHRoZSBwYXN0ZSBzdWNjZWVkcyBhbmQgc28gd2UgaW5zZXJ0IERPTQorICAgICAgICBp bnN0ZWFkIG9mIHBsYWluIHRleHQuIFNpbWlsYXIgcmViYXNlbGluZXMgbWF5IGJlIG5lZWRlZCBv biBvdGhlcgorICAgICAgICBwbGF0Zm9ybXMuCisKIDIwMTItMTAtMTggIEplciBOb2JsZSAgPGpl ci5ub2JsZUBhcHBsZS5jb20+CiAKICAgICAgICAgRnVsbHNjcmVlbiBtb3ZpZSBjb250cm9scyBi ZWhhdmUgaW5jb3JyZWN0bHkgd2hlbiBjbGlja2VkIChhbmQgZHJhZ2dlZCkKZGlmZiAtLWdpdCBh L0xheW91dFRlc3RzL2VkaXRpbmcvcGFzdGVib2FyZC9wYXN0ZS1ub3NjcmlwdC14aHRtbC1leHBl Y3RlZC50eHQgYi9MYXlvdXRUZXN0cy9lZGl0aW5nL3Bhc3RlYm9hcmQvcGFzdGUtbm9zY3JpcHQt eGh0bWwtZXhwZWN0ZWQudHh0CmluZGV4IGJiOGRlNzQzNWZlMzFiMzhiZTc4MWVjNGFjZTliMjlm N2FiYzIyODUuLmJiNDIzZjgwYzE5YzJkNDBkODNjZDI1NDk1YjU1MGY0OTRkYTJmM2QgMTAwNjQ0 Ci0tLSBhL0xheW91dFRlc3RzL2VkaXRpbmcvcGFzdGVib2FyZC9wYXN0ZS1ub3NjcmlwdC14aHRt bC1leHBlY3RlZC50eHQKKysrIGIvTGF5b3V0VGVzdHMvZWRpdGluZy9wYXN0ZWJvYXJkL3Bhc3Rl LW5vc2NyaXB0LXhodG1sLWV4cGVjdGVkLnR4dApAQCAtNjcsNiArNjcsOCBAQCBQYXN0ZWQgY29u dGVudDoKIHwgICBocmVmPSIiCiB8ICAgaWQ9ImFuY2hvcjIiCiB8ICAgIkhlbGxvIgorfCA8c2Ny aXB0PgorfCA8c2NyaXB0PgogfCA8aWZyYW1lPgogfCAgIGlkPSJpZnJhbWUxIgogfCAgIHNyYz0i IgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL2VkaXRpbmcvcGFzdGVib2Fy ZC9wYXN0ZS14bWwtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL2VkaXRp bmcvcGFzdGVib2FyZC9wYXN0ZS14bWwtZXhwZWN0ZWQudHh0CmluZGV4IDA1YzdkMThmODIwYzA3 YWFkZWY2ZDg5YzQyODQ4Y2I1M2ZlMWZhY2IuLmViYmFmODdiOWQyZDM3ZTg3ZGE5NTI3Mzk0NzJk ZTJjNDRiNzkxYWYgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL3BsYXRmb3JtL21hYy9lZGl0aW5n L3Bhc3RlYm9hcmQvcGFzdGUteG1sLWV4cGVjdGVkLnR4dAorKysgYi9MYXlvdXRUZXN0cy9wbGF0 Zm9ybS9tYWMvZWRpdGluZy9wYXN0ZWJvYXJkL3Bhc3RlLXhtbC1leHBlY3RlZC50eHQKQEAgLTks MTAgKzksMTEgQEAgRURJVElORyBERUxFR0FURTogd2ViVmlld0RpZENoYW5nZVNlbGVjdGlvbjpX ZWJWaWV3RGlkQ2hhbmdlU2VsZWN0aW9uTm90aWZpY2F0aW8KIEVESVRJTkcgREVMRUdBVEU6IHdl YlZpZXdEaWRDaGFuZ2VTZWxlY3Rpb246V2ViVmlld0RpZENoYW5nZVNlbGVjdGlvbk5vdGlmaWNh dGlvbgogRURJVElORyBERUxFR0FURTogd2ViVmlld0RpZENoYW5nZVNlbGVjdGlvbjpXZWJWaWV3 RGlkQ2hhbmdlU2VsZWN0aW9uTm90aWZpY2F0aW9uCiBFRElUSU5HIERFTEVHQVRFOiB3ZWJWaWV3 RGlkQ2hhbmdlU2VsZWN0aW9uOldlYlZpZXdEaWRDaGFuZ2VTZWxlY3Rpb25Ob3RpZmljYXRpb24K LUVESVRJTkcgREVMRUdBVEU6IHNob3VsZEluc2VydFRleHQ6YmFyIHJlcGxhY2luZ0RPTVJhbmdl OnJhbmdlIGZyb20gNyBvZiAjdGV4dCA+IHNwYW4gPiBkaXYgPiBib2R5ID4gaHRtbCA+ICNkb2N1 bWVudCB0byA3IG9mICN0ZXh0ID4gc3BhbiA+IGRpdiA+IGJvZHkgPiBodG1sID4gI2RvY3VtZW50 IGdpdmVuQWN0aW9uOldlYlZpZXdJbnNlcnRBY3Rpb25QYXN0ZWQKLUVESVRJTkcgREVMRUdBVEU6 IHNob3VsZENoYW5nZVNlbGVjdGVkRE9NUmFuZ2U6cmFuZ2UgZnJvbSA3IG9mICN0ZXh0ID4gc3Bh biA+IGRpdiA+IGJvZHkgPiBodG1sID4gI2RvY3VtZW50IHRvIDcgb2YgI3RleHQgPiBzcGFuID4g ZGl2ID4gYm9keSA+IGh0bWwgPiAjZG9jdW1lbnQgdG9ET01SYW5nZTpyYW5nZSBmcm9tIDEwIG9m ICN0ZXh0ID4gc3BhbiA+IGRpdiA+IGJvZHkgPiBodG1sID4gI2RvY3VtZW50IHRvIDEwIG9mICN0 ZXh0ID4gc3BhbiA+IGRpdiA+IGJvZHkgPiBodG1sID4gI2RvY3VtZW50IGFmZmluaXR5Ok5TU2Vs ZWN0aW9uQWZmaW5pdHlEb3duc3RyZWFtIHN0aWxsU2VsZWN0aW5nOkZBTFNFCitFRElUSU5HIERF TEVHQVRFOiBzaG91bGRJbnNlcnROb2RlOiNkb2N1bWVudC1mcmFnbWVudCByZXBsYWNpbmdET01S YW5nZTpyYW5nZSBmcm9tIDcgb2YgI3RleHQgPiBzcGFuID4gZGl2ID4gYm9keSA+IGh0bWwgPiAj ZG9jdW1lbnQgdG8gNyBvZiAjdGV4dCA+IHNwYW4gPiBkaXYgPiBib2R5ID4gaHRtbCA+ICNkb2N1 bWVudCBnaXZlbkFjdGlvbjpXZWJWaWV3SW5zZXJ0QWN0aW9uUGFzdGVkCitFRElUSU5HIERFTEVH QVRFOiB3ZWJWaWV3RGlkQ2hhbmdlU2VsZWN0aW9uOldlYlZpZXdEaWRDaGFuZ2VTZWxlY3Rpb25O b3RpZmljYXRpb24KK0VESVRJTkcgREVMRUdBVEU6IHNob3VsZENoYW5nZVNlbGVjdGVkRE9NUmFu Z2U6cmFuZ2UgZnJvbSAxMCBvZiAjdGV4dCA+IHNwYW4gPiBkaXYgPiBib2R5ID4gaHRtbCA+ICNk b2N1bWVudCB0byAxMCBvZiAjdGV4dCA+IHNwYW4gPiBkaXYgPiBib2R5ID4gaHRtbCA+ICNkb2N1 bWVudCB0b0RPTVJhbmdlOnJhbmdlIGZyb20gMTAgb2YgI3RleHQgPiBzcGFuID4gZGl2ID4gYm9k eSA+IGh0bWwgPiAjZG9jdW1lbnQgdG8gMTAgb2YgI3RleHQgPiBzcGFuID4gZGl2ID4gYm9keSA+ IGh0bWwgPiAjZG9jdW1lbnQgYWZmaW5pdHk6TlNTZWxlY3Rpb25BZmZpbml0eURvd25zdHJlYW0g c3RpbGxTZWxlY3Rpbmc6RkFMU0UKIEVESVRJTkcgREVMRUdBVEU6IHdlYlZpZXdEaWRDaGFuZ2VT ZWxlY3Rpb246V2ViVmlld0RpZENoYW5nZVNlbGVjdGlvbk5vdGlmaWNhdGlvbgogRURJVElORyBE RUxFR0FURTogd2ViVmlld0RpZENoYW5nZTpXZWJWaWV3RGlkQ2hhbmdlTm90aWZpY2F0aW9uCi1m b28gYmFyYmFyIGJhegorZm9vIGJhcmJhcsKgYmF6CiBleGVjQ29weUNvbW1hbmQ6IDxzcGFuIHht bG5zPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hodG1sIiBpZD0idGVzdCI+Zm9vIGJhciBiYXo8 L3NwYW4+Ci1leGVjUGFzdGVDb21tYW5kOiA8c3BhbiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv MTk5OS94aHRtbCIgaWQ9InRlc3QiPmZvbyBiYXJiYXIgYmF6PC9zcGFuPgorZXhlY1Bhc3RlQ29t bWFuZDogPHNwYW4geG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGh0bWwiIGlkPSJ0ZXN0 Ij5mb28gYmFyYmFywqBiYXo8L3NwYW4+Cg== 169742 2012-10-19 18:54:58 -0700 2012-10-19 18:54:58 -0700 Test case paste-fail.xhtml application/xhtml+xml 191 adamk PCFET0NUWVBFIGh0bWw+CjxodG1sIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hodG1s Ij4KPGJvZHk+CiAgPGRpdj5TZWxlY3Q6IDxiPnRoaXMgc3R1ZmYgaW4gYm9sZDwvYj4gYnV0IG5v dCBib2xkIGhlcmU8L2Rpdj4KICA8ZGl2IGNvbnRlbnRlZGl0YWJsZT0iIj5QYXN0ZSBoZXJlPC9k aXY+CjwvYm9keT4KPC9odG1sPgo=