27522 2009-07-21 15:23:14 -0700 Creating list clears background color 2011-08-04 13:56:52 -0700 1 1 1 Unclassified WebKit HTML Editing 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED http://www.plexode.com/cgi-bin/eval3.py#ht=%3Cdiv%20id%3Deditor%20contenteditable%3Dtrue%3Eone%3Cdiv%3Etwo%3C%2Fdiv%3E%3Cdiv%3Ethree%3C%2Fdiv%3E%3C%2Fdiv%3E&ohh=1&ohj=1&jt=var%20div%20%3D%20document.getElementById('editor')%3B%0Adiv.focus()%3B%0A%2F%2F%20After%20this%2C%20background%20is%20yellow%0Adocument.execCommand('backcolor'%2Cfalse%2C%20'yellow')%3B%0Adiv.focus()%3B%0A%2F%2F%20After%20this%2C%20background%20color%20is%20removed.%0Adocument.execCommand('insertUnorderedList'%2C%20false%2C%20null)%3B%0Adiv.blur()%3B&ojh=1&ojj=1&ms=100&oth=0&otj=0&cex=1 P2 Normal --- 42436 1 sullivan webkit-unassigned enrica eric jparent michaelthomas mitz rniwa tony oldest_to_newest 133615 0 sullivan 2009-07-21 15:23:14 -0700 STEPS TO REPRODUCE: 1. Type a few lines of text 2. Select all the text 3. Use execCommand to set the background color of the text. 4. Use execCommand to create and unordered list EXPECTED RESULT: List is created with background color ACTUAL RESULT: List is created, background color removed. Repro at http://www.plexode.com/cgi-bin/eval3.py#ht=%3Cdiv%20id%3Deditor%20contenteditable%3Dtrue%3Eone%3Cdiv%3Etwo%3C%2Fdiv%3E%3Cdiv%3Ethree%3C%2Fdiv%3E%3C%2Fdiv%3E&ohh=1&ohj=1&jt=var%20div%20%3D%20document.getElementById('editor')%3B%0Adiv.focus()%3B%0A%2F%2F%20After%20this%2C%20background%20is%20yellow%0Adocument.execCommand('backcolor'%2Cfalse%2C%20'yellow')%3B%0Adiv.focus()%3B%0A%2F%2F%20After%20this%2C%20background%20color%20is%20removed.%0Adocument.execCommand('insertUnorderedList'%2C%20false%2C%20null)%3B%0Adiv.blur()%3B&ojh=1&ojj=1&ms=100&oth=0&otj=0&cex=1 133663 1 jparent 2009-07-21 17:22:26 -0700 Ryosuke, this looks up your alley. 183121 2 47104 tony 2010-01-21 01:17:38 -0800 Created attachment 47104 Patch 183123 3 tony 2010-01-21 01:20:30 -0800 (In reply to comment #2) > Created an attachment (id=47104) [details] > Patch A few notes: - TextEdit doesn't seem to have the ability to have multiple background colors, so it's hard to use that as a reference implementation. - This seems to match the behavior on Firefox which remembers the background color. - 2 tests had to be rebaselined. There's no visible change in these tests, but they are cases where the background color of a form control (white) was copied. This seems like a general bug with form controls where we inherit styles-- we were already inheriting the font face and the font size from the form control. I think this should be fixed in a different patch. 183125 4 mitz 2010-01-21 01:27:11 -0800 background-color is not and inheritable property 183129 5 mitz 2010-01-21 01:30:28 -0800 See <http://trac.webkit.org/changeset/49985> (fix for bug 27522). 183130 6 rniwa 2010-01-21 01:33:02 -0800 As Mitz pointed out, copying background-color all the time caused some regression and cannot be re-introduced. We need an alternative approach to this problem. Could you post a reduction as a separate attachment? 183132 7 47104 tony 2010-01-21 01:35:36 -0800 Comment on attachment 47104 Patch I see. I will investigate some more. 183133 8 tony 2010-01-21 01:36:34 -0800 (In reply to comment #6) > As Mitz pointed out, copying background-color all the time caused some > regression and cannot be re-introduced. We need an alternative approach to > this problem. Could you post a reduction as a separate attachment? The reduction is in the original bug report. 183208 9 47104 enrica 2010-01-21 08:49:41 -0800 Comment on attachment 47104 Patch > diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog > index f230799..6286626 100644 > --- a/LayoutTests/ChangeLog > +++ b/LayoutTests/ChangeLog > @@ -1,3 +1,15 @@ > +2010-01-21 Tony Chang <tony@chromium.org> > + > + Reviewed by NOBODY (OOPS!). > + > + https://bugs.webkit.org/show_bug.cgi?id=27522 > + Preserve background color when creating a list. > + > + * editing/execCommand/insert-list-preserve-bgcolor-expected.txt: Added. > + * editing/execCommand/insert-list-preserve-bgcolor.html: Added. > + * editing/inserting/5994480-2-expected.txt: > + * platform/mac/editing/pasteboard/select-element-1-expected.txt: > + > 2010-01-20 Daniel Bates <dbates@webkit.org> > > Unreviewed. Add failing test fast/css/button-height.html > diff --git a/LayoutTests/editing/execCommand/insert-list-preserve-bgcolor-expected.txt b/LayoutTests/editing/execCommand/insert-list-preserve-bgcolor-expected.txt > new file mode 100644 > index 0000000..a7236fa > --- /dev/null > +++ b/LayoutTests/editing/execCommand/insert-list-preserve-bgcolor-expected.txt > @@ -0,0 +1,3 @@ > +this should have a yellow background > + > +<ul><li><span class="Apple-style-span" style="background-color: rgb(255, 255, 0); ">this should have a yellow background</span></li></ul> > diff --git a/LayoutTests/editing/execCommand/insert-list-preserve-bgcolor.html b/LayoutTests/editing/execCommand/insert-list-preserve-bgcolor.html > new file mode 100644 > index 0000000..f64442c > --- /dev/null > +++ b/LayoutTests/editing/execCommand/insert-list-preserve-bgcolor.html > @@ -0,0 +1,14 @@ > +<body contentEditable='true'> > +<p id="paragraph"><span style='background-color: yellow;'>this should have a yellow background</span></p> > +<p id="results"></p> > +</body> > +<script src="../editing.js"></script> > +<script> > + if (window.layoutTestController) > + layoutTestController.dumpAsText(); > + var p = document.getElementById("paragraph"); > + setSelectionCommand(p, 0, p, 0); > + execExtendSelectionForwardBySentenceCommand(); > + document.execCommand("insertunorderedlist"); > + document.getElementById("results").innerText = p.innerHTML; > +</script> > diff --git a/LayoutTests/editing/inserting/5994480-2-expected.txt b/LayoutTests/editing/inserting/5994480-2-expected.txt > index 224592b..5a360f2 100644 > --- a/LayoutTests/editing/inserting/5994480-2-expected.txt > +++ b/LayoutTests/editing/inserting/5994480-2-expected.txt > @@ -1 +1 @@ > -<font class="Apple-style-span" face="'Lucida Grande'" size="3"><span class="Apple-style-span" style="font-size: 11px;"><br></span></font> > +<font class="Apple-style-span" face="'Lucida Grande'" size="3"><span class="Apple-style-span" style="background-color: rgb(255, 255, 255); font-size: 11px;"><br></span></font> > diff --git a/LayoutTests/platform/mac/editing/pasteboard/select-element-1-expected.txt b/LayoutTests/platform/mac/editing/pasteboard/select-element-1-expected.txt > index 30d1d13..510acfb 100644 > --- a/LayoutTests/platform/mac/editing/pasteboard/select-element-1-expected.txt > +++ b/LayoutTests/platform/mac/editing/pasteboard/select-element-1-expected.txt > @@ -30,7 +30,7 @@ layer at (0,0) size 800x600 > text run at (253,0) width 220: "All the options should be included." > RenderBlock {DIV} at (0,34) size 784x13 > RenderInline {FONT} at (0,0) size 0x18 > - RenderInline {SPAN} at (0,0) size 0x13 > + RenderInline {SPAN} at (0,0) size 0x13 [bgcolor=#FFFFFF] > RenderBR {BR} at (0,0) size 0x13 > RenderBlock {DIV} at (0,47) size 784x22 > RenderMenuList {SELECT} at (2,2) size 62x18 [bgcolor=#FFFFFF] > diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog > index 47f3eb2..873b8b0 100644 > --- a/WebCore/ChangeLog > +++ b/WebCore/ChangeLog > @@ -1,3 +1,16 @@ > +2010-01-21 Tony Chang <tony@chromium.org> > + > + Reviewed by NOBODY (OOPS!). > + > + https://bugs.webkit.org/show_bug.cgi?id=27522 > + Preserve background color when creating a list. > + > + Test: editing/execCommand/insert-list-preserve-bgcolor.html > + > + * editing/ApplyStyleCommand.cpp: > + (WebCore::): > + (WebCore::editingStyleAtPosition): > + > 2010-01-20 Fumitoshi Ukai <ukai@chromium.org> > > Reviewed by Alexey Proskuryakov. > diff --git a/WebCore/editing/ApplyStyleCommand.cpp b/WebCore/editing/ApplyStyleCommand.cpp > index 7a8f025..93d9310 100644 > --- a/WebCore/editing/ApplyStyleCommand.cpp > +++ b/WebCore/editing/ApplyStyleCommand.cpp > @@ -388,6 +388,7 @@ RefPtr<CSSMutableStyleDeclaration> getPropertiesNotInComputedStyle(CSSStyleDecla > // FIXME: The current editingStyleProperties contains all inheritableProperties but we may not need to preserve all inheritable properties > static const int editingStyleProperties[] = { > // CSS inheritable properties > + CSSPropertyBackgroundColor, > CSSPropertyBorderCollapse, > CSSPropertyColor, > CSSPropertyFontFamily, This is not the correct fix and will have unwanted side effects. We had the equivalent bug for Indent command.Take a look at https://bugs.webkit.org/show_bug.cgi?id=29697 and also to https://bugs.webkit.org/show_bug.cgi?id=29740 to see how the style gets preserved.I did a lot of work in this area and I'll be happy to provide more context if you want. 183535 10 47180 tony 2010-01-22 01:12:48 -0800 Created attachment 47180 work in progress 183536 11 tony 2010-01-22 01:14:13 -0800 (In reply to comment #10) > Created an attachment (id=47180) [details] > work in progress I'm not done with this, but I wanted to post it to see if it's moving in the right direction. There are some issues with an extra <br> getting inserted by moveParagraphWithClones and I need to make a thorough layout test for this. 250994 12 rniwa 2010-07-13 23:40:59 -0700 (In reply to comment #11) > (In reply to comment #10) > > Created an attachment (id=47180) [details] [details] > > work in progress > > I'm not done with this, but I wanted to post it to see if it's moving in the right direction. There are some issues with an extra <br> getting inserted by moveParagraphWithClones and I need to make a thorough layout test for this. Will your extra BRs go away if you used if (beforeParagraph.isNotNull() && !isTableElement(beforeParagraph.deepEquivalent().node()) && ((!isEndOfParagraph(beforeParagraph) && !isStartOfParagraph(beforeParagraph)) || beforeParagraph == afterParagraph)) { instead of if (beforeParagraph.isNotNull() && !isTableElement(beforeParagraph.deepEquivalent().node()) && (!isEndOfParagraph(beforeParagraph) || beforeParagraph == afterParagraph)) { for the last if statement in moveParagraphWithClones? 446756 13 rniwa 2011-08-04 13:56:52 -0700 This bug has been fixed by Enrica's patch. Yay! 47104 2010-01-21 01:17:38 -0800 2010-01-21 08:49:41 -0800 Patch bug-27522-20100121181737.patch text/plain 4824 tony ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBmMjMwNzk5Li42Mjg2NjI2IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTAtMDEt MjEgIFRvbnkgQ2hhbmcgIDx0b255QGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9Mjc1MjIKKyAgICAgICAgUHJlc2VydmUgYmFja2dyb3VuZCBjb2xvciB3aGVu IGNyZWF0aW5nIGEgbGlzdC4KKworICAgICAgICAqIGVkaXRpbmcvZXhlY0NvbW1hbmQvaW5zZXJ0 LWxpc3QtcHJlc2VydmUtYmdjb2xvci1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGVk aXRpbmcvZXhlY0NvbW1hbmQvaW5zZXJ0LWxpc3QtcHJlc2VydmUtYmdjb2xvci5odG1sOiBBZGRl ZC4KKyAgICAgICAgKiBlZGl0aW5nL2luc2VydGluZy81OTk0NDgwLTItZXhwZWN0ZWQudHh0Ogor ICAgICAgICAqIHBsYXRmb3JtL21hYy9lZGl0aW5nL3Bhc3RlYm9hcmQvc2VsZWN0LWVsZW1lbnQt MS1leHBlY3RlZC50eHQ6CisKIDIwMTAtMDEtMjAgIERhbmllbCBCYXRlcyAgPGRiYXRlc0B3ZWJr aXQub3JnPgogCiAgICAgICAgIFVucmV2aWV3ZWQuIEFkZCBmYWlsaW5nIHRlc3QgZmFzdC9jc3Mv YnV0dG9uLWhlaWdodC5odG1sCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9lZGl0aW5nL2V4ZWND b21tYW5kL2luc2VydC1saXN0LXByZXNlcnZlLWJnY29sb3ItZXhwZWN0ZWQudHh0IGIvTGF5b3V0 VGVzdHMvZWRpdGluZy9leGVjQ29tbWFuZC9pbnNlcnQtbGlzdC1wcmVzZXJ2ZS1iZ2NvbG9yLWV4 cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5hNzIzNmZhCi0t LSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZWRpdGluZy9leGVjQ29tbWFuZC9pbnNlcnQt bGlzdC1wcmVzZXJ2ZS1iZ2NvbG9yLWV4cGVjdGVkLnR4dApAQCAtMCwwICsxLDMgQEAKK3RoaXMg c2hvdWxkIGhhdmUgYSB5ZWxsb3cgYmFja2dyb3VuZAorCis8dWw+PGxpPjxzcGFuIGNsYXNzPSJB cHBsZS1zdHlsZS1zcGFuIiBzdHlsZT0iYmFja2dyb3VuZC1jb2xvcjogcmdiKDI1NSwgMjU1LCAw KTsgIj50aGlzIHNob3VsZCBoYXZlIGEgeWVsbG93IGJhY2tncm91bmQ8L3NwYW4+PC9saT48L3Vs PgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZWRpdGluZy9leGVjQ29tbWFuZC9pbnNlcnQtbGlz dC1wcmVzZXJ2ZS1iZ2NvbG9yLmh0bWwgYi9MYXlvdXRUZXN0cy9lZGl0aW5nL2V4ZWNDb21tYW5k L2luc2VydC1saXN0LXByZXNlcnZlLWJnY29sb3IuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NApp bmRleCAwMDAwMDAwLi5mNjQ0NDJjCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZWRp dGluZy9leGVjQ29tbWFuZC9pbnNlcnQtbGlzdC1wcmVzZXJ2ZS1iZ2NvbG9yLmh0bWwKQEAgLTAs MCArMSwxNCBAQAorPGJvZHkgY29udGVudEVkaXRhYmxlPSd0cnVlJz4KKzxwIGlkPSJwYXJhZ3Jh cGgiPjxzcGFuIHN0eWxlPSdiYWNrZ3JvdW5kLWNvbG9yOiB5ZWxsb3c7Jz50aGlzIHNob3VsZCBo YXZlIGEgeWVsbG93IGJhY2tncm91bmQ8L3NwYW4+PC9wPgorPHAgaWQ9InJlc3VsdHMiPjwvcD4K KzwvYm9keT4KKzxzY3JpcHQgc3JjPSIuLi9lZGl0aW5nLmpzIj48L3NjcmlwdD4KKzxzY3JpcHQ+ CisgIGlmICh3aW5kb3cubGF5b3V0VGVzdENvbnRyb2xsZXIpCisgICAgICBsYXlvdXRUZXN0Q29u dHJvbGxlci5kdW1wQXNUZXh0KCk7CisgIHZhciBwID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQo InBhcmFncmFwaCIpOworICBzZXRTZWxlY3Rpb25Db21tYW5kKHAsIDAsIHAsIDApOworICBleGVj RXh0ZW5kU2VsZWN0aW9uRm9yd2FyZEJ5U2VudGVuY2VDb21tYW5kKCk7CisgIGRvY3VtZW50LmV4 ZWNDb21tYW5kKCJpbnNlcnR1bm9yZGVyZWRsaXN0Iik7CisgIGRvY3VtZW50LmdldEVsZW1lbnRC eUlkKCJyZXN1bHRzIikuaW5uZXJUZXh0ID0gcC5pbm5lckhUTUw7Cis8L3NjcmlwdD4KZGlmZiAt LWdpdCBhL0xheW91dFRlc3RzL2VkaXRpbmcvaW5zZXJ0aW5nLzU5OTQ0ODAtMi1leHBlY3RlZC50 eHQgYi9MYXlvdXRUZXN0cy9lZGl0aW5nL2luc2VydGluZy81OTk0NDgwLTItZXhwZWN0ZWQudHh0 CmluZGV4IDIyNDU5MmIuLjVhMzYwZjIgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2VkaXRpbmcv aW5zZXJ0aW5nLzU5OTQ0ODAtMi1leHBlY3RlZC50eHQKKysrIGIvTGF5b3V0VGVzdHMvZWRpdGlu Zy9pbnNlcnRpbmcvNTk5NDQ4MC0yLWV4cGVjdGVkLnR4dApAQCAtMSArMSBAQAotPGZvbnQgY2xh c3M9IkFwcGxlLXN0eWxlLXNwYW4iIGZhY2U9IidMdWNpZGEgR3JhbmRlJyIgc2l6ZT0iMyI+PHNw YW4gY2xhc3M9IkFwcGxlLXN0eWxlLXNwYW4iIHN0eWxlPSJmb250LXNpemU6IDExcHg7Ij48YnI+ PC9zcGFuPjwvZm9udD4KKzxmb250IGNsYXNzPSJBcHBsZS1zdHlsZS1zcGFuIiBmYWNlPSInTHVj aWRhIEdyYW5kZSciIHNpemU9IjMiPjxzcGFuIGNsYXNzPSJBcHBsZS1zdHlsZS1zcGFuIiBzdHls ZT0iYmFja2dyb3VuZC1jb2xvcjogcmdiKDI1NSwgMjU1LCAyNTUpOyBmb250LXNpemU6IDExcHg7 Ij48YnI+PC9zcGFuPjwvZm9udD4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3BsYXRmb3JtL21h Yy9lZGl0aW5nL3Bhc3RlYm9hcmQvc2VsZWN0LWVsZW1lbnQtMS1leHBlY3RlZC50eHQgYi9MYXlv dXRUZXN0cy9wbGF0Zm9ybS9tYWMvZWRpdGluZy9wYXN0ZWJvYXJkL3NlbGVjdC1lbGVtZW50LTEt ZXhwZWN0ZWQudHh0CmluZGV4IDMwZDFkMTMuLjUxMGFjZmIgMTAwNjQ0Ci0tLSBhL0xheW91dFRl c3RzL3BsYXRmb3JtL21hYy9lZGl0aW5nL3Bhc3RlYm9hcmQvc2VsZWN0LWVsZW1lbnQtMS1leHBl Y3RlZC50eHQKKysrIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL2VkaXRpbmcvcGFzdGVib2Fy ZC9zZWxlY3QtZWxlbWVudC0xLWV4cGVjdGVkLnR4dApAQCAtMzAsNyArMzAsNyBAQCBsYXllciBh dCAoMCwwKSBzaXplIDgwMHg2MDAKICAgICAgICAgICB0ZXh0IHJ1biBhdCAoMjUzLDApIHdpZHRo IDIyMDogIkFsbCB0aGUgb3B0aW9ucyBzaG91bGQgYmUgaW5jbHVkZWQuIgogICAgICAgUmVuZGVy QmxvY2sge0RJVn0gYXQgKDAsMzQpIHNpemUgNzg0eDEzCiAgICAgICAgIFJlbmRlcklubGluZSB7 Rk9OVH0gYXQgKDAsMCkgc2l6ZSAweDE4Ci0gICAgICAgICAgUmVuZGVySW5saW5lIHtTUEFOfSBh dCAoMCwwKSBzaXplIDB4MTMKKyAgICAgICAgICBSZW5kZXJJbmxpbmUge1NQQU59IGF0ICgwLDAp IHNpemUgMHgxMyBbYmdjb2xvcj0jRkZGRkZGXQogICAgICAgICAgICAgUmVuZGVyQlIge0JSfSBh dCAoMCwwKSBzaXplIDB4MTMKICAgICAgIFJlbmRlckJsb2NrIHtESVZ9IGF0ICgwLDQ3KSBzaXpl IDc4NHgyMgogICAgICAgICBSZW5kZXJNZW51TGlzdCB7U0VMRUNUfSBhdCAoMiwyKSBzaXplIDYy eDE4IFtiZ2NvbG9yPSNGRkZGRkZdCmRpZmYgLS1naXQgYS9XZWJDb3JlL0NoYW5nZUxvZyBiL1dl YkNvcmUvQ2hhbmdlTG9nCmluZGV4IDQ3ZjNlYjIuLjg3M2I4YjAgMTAwNjQ0Ci0tLSBhL1dlYkNv cmUvQ2hhbmdlTG9nCisrKyBiL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIw MTAtMDEtMjEgIFRvbnkgQ2hhbmcgIDx0b255QGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9Mjc1MjIKKyAgICAgICAgUHJlc2VydmUgYmFja2dyb3VuZCBjb2xv ciB3aGVuIGNyZWF0aW5nIGEgbGlzdC4KKworICAgICAgICBUZXN0OiBlZGl0aW5nL2V4ZWNDb21t YW5kL2luc2VydC1saXN0LXByZXNlcnZlLWJnY29sb3IuaHRtbAorCisgICAgICAgICogZWRpdGlu Zy9BcHBseVN0eWxlQ29tbWFuZC5jcHA6CisgICAgICAgIChXZWJDb3JlOjopOgorICAgICAgICAo V2ViQ29yZTo6ZWRpdGluZ1N0eWxlQXRQb3NpdGlvbik6CisKIDIwMTAtMDEtMjAgIEZ1bWl0b3No aSBVa2FpICA8dWthaUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgQWxleGV5 IFByb3NrdXJ5YWtvdi4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvZWRpdGluZy9BcHBseVN0eWxlQ29t bWFuZC5jcHAgYi9XZWJDb3JlL2VkaXRpbmcvQXBwbHlTdHlsZUNvbW1hbmQuY3BwCmluZGV4IDdh OGYwMjUuLjkzZDkzMTAgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvZWRpdGluZy9BcHBseVN0eWxlQ29t bWFuZC5jcHAKKysrIGIvV2ViQ29yZS9lZGl0aW5nL0FwcGx5U3R5bGVDb21tYW5kLmNwcApAQCAt Mzg4LDYgKzM4OCw3IEBAIFJlZlB0cjxDU1NNdXRhYmxlU3R5bGVEZWNsYXJhdGlvbj4gZ2V0UHJv cGVydGllc05vdEluQ29tcHV0ZWRTdHlsZShDU1NTdHlsZURlY2xhCiAvLyBGSVhNRTogVGhlIGN1 cnJlbnQgZWRpdGluZ1N0eWxlUHJvcGVydGllcyBjb250YWlucyBhbGwgaW5oZXJpdGFibGVQcm9w ZXJ0aWVzIGJ1dCB3ZSBtYXkgbm90IG5lZWQgdG8gcHJlc2VydmUgYWxsIGluaGVyaXRhYmxlIHBy b3BlcnRpZXMKIHN0YXRpYyBjb25zdCBpbnQgZWRpdGluZ1N0eWxlUHJvcGVydGllc1tdID0gewog ICAgIC8vIENTUyBpbmhlcml0YWJsZSBwcm9wZXJ0aWVzCisgICAgQ1NTUHJvcGVydHlCYWNrZ3Jv dW5kQ29sb3IsCiAgICAgQ1NTUHJvcGVydHlCb3JkZXJDb2xsYXBzZSwKICAgICBDU1NQcm9wZXJ0 eUNvbG9yLAogICAgIENTU1Byb3BlcnR5Rm9udEZhbWlseSwK 47180 2010-01-22 01:12:48 -0800 2010-06-10 20:36:25 -0700 work in progress bug-27522-20100122181246.patch text/plain 5132 tony ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg M2EzMmE2YS4uOWMyOTMyNyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOCBAQAorMjAxMC0wMS0yMiAgVG9ueSBDaGFuZyAg PHRvbnlAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNzUy MgorICAgICAgICBXaGVuIGluc2VydGluZy9yZW1vdmluZyBhIGxpc3QsIGNsb25lIHRoZSBub2Rl cyBzbworICAgICAgICB3ZSBwcmVzZXJ2ZSBzdHlsZXMgaW5jbHVkaW5nIGJhY2tncm91bmQgY29s b3IuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLiAoT09QUyEpCisKKyAgICAgICAgKiBlZGl0aW5n L0NvbXBvc2l0ZUVkaXRDb21tYW5kLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNvbXBvc2l0ZUVk aXRDb21tYW5kOjptb3ZlUGFyYWdyYXBoV2l0aENsb25lcyk6CisgICAgICAgICogZWRpdGluZy9J bnNlcnRMaXN0Q29tbWFuZC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJbnNlcnRMaXN0Q29tbWFu ZDo6ZG9BcHBseSk6CisKIDIwMTAtMDEtMjEgIEVucmljYSBDYXN1Y2NpICA8ZW5yaWNhQGFwcGxl LmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBEYXJpbiBBZGxlci4KZGlmZiAtLWdpdCBhL1dl YkNvcmUvZWRpdGluZy9Db21wb3NpdGVFZGl0Q29tbWFuZC5jcHAgYi9XZWJDb3JlL2VkaXRpbmcv Q29tcG9zaXRlRWRpdENvbW1hbmQuY3BwCmluZGV4IGU5YjY5NzEuLmQ4NjlmMzIgMTAwNjQ0Ci0t LSBhL1dlYkNvcmUvZWRpdGluZy9Db21wb3NpdGVFZGl0Q29tbWFuZC5jcHAKKysrIGIvV2ViQ29y ZS9lZGl0aW5nL0NvbXBvc2l0ZUVkaXRDb21tYW5kLmNwcApAQCAtODU3LDYgKzg1Nyw4IEBAIHZv aWQgQ29tcG9zaXRlRWRpdENvbW1hbmQ6Om1vdmVQYXJhZ3JhcGhXaXRoQ2xvbmVzKGNvbnN0IFZp c2libGVQb3NpdGlvbiYgc3RhcnRPCiAgICAgICAgCiAgICAgY2xlYW51cEFmdGVyRGVsZXRpb24o KTsKICAgICAKKyAgICAvLyBXZSBwcm9iYWJseSBqdXN0IGRlbGV0ZWQgb3VyIGVuZGluZyBzZWxl Y3Rpb24sIHNvIHBvc2l0aW9uIGl0IGJhc2VkIG9uIHRoZSBjbG9uZWQgbm9kZXMuCisgICAgc2V0 RW5kaW5nU2VsZWN0aW9uKFZpc2libGVTZWxlY3Rpb246OnNlbGVjdGlvbkZyb21Db250ZW50c09m Tm9kZShibG9ja0VsZW1lbnQpKTsKICAgICAvLyBBZGQgYSBiciBpZiBwcnVuaW5nIGFuIGVtcHR5 IGJsb2NrIGxldmVsIGVsZW1lbnQgY2F1c2VkIGEgY29sbGFwc2UuICBGb3IgZXhhbXBsZToKICAg ICAvLyBmb29eCiAgICAgLy8gPGRpdj5iYXI8L2Rpdj4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvZWRp dGluZy9JbnNlcnRMaXN0Q29tbWFuZC5jcHAgYi9XZWJDb3JlL2VkaXRpbmcvSW5zZXJ0TGlzdENv bW1hbmQuY3BwCmluZGV4IGJlYjVkMDguLjM5NmY1NTcgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvZWRp dGluZy9JbnNlcnRMaXN0Q29tbWFuZC5jcHAKKysrIGIvV2ViQ29yZS9lZGl0aW5nL0luc2VydExp c3RDb21tYW5kLmNwcApAQCAtMTM2LDcgKzEzNiw3IEBAIHZvaWQgSW5zZXJ0TGlzdENvbW1hbmQ6 OmRvQXBwbHkoKQogICAgIE5vZGUqIGxpc3RDaGlsZE5vZGUgPSBlbmNsb3NpbmdMaXN0Q2hpbGQo c2VsZWN0aW9uTm9kZSk7CiAgICAgYm9vbCBzd2l0Y2hMaXN0VHlwZSA9IGZhbHNlOwogICAgIGlm IChsaXN0Q2hpbGROb2RlKSB7Ci0gICAgICAgIC8vIFJlbW92ZSB0aGUgbGlzdCBjaGxpbGQuCisg ICAgICAgIC8vIFJlbW92ZSB0aGUgbGlzdCBjaGlsZC4KICAgICAgICAgSFRNTEVsZW1lbnQqIGxp c3ROb2RlID0gZW5jbG9zaW5nTGlzdChsaXN0Q2hpbGROb2RlKTsKICAgICAgICAgaWYgKCFsaXN0 Tm9kZSkKICAgICAgICAgICAgIGxpc3ROb2RlID0gZml4T3JwaGFuZWRMaXN0Q2hpbGQobGlzdENo aWxkTm9kZSk7CkBAIC0xNjcsNyArMTY3LDcgQEAgdm9pZCBJbnNlcnRMaXN0Q29tbWFuZDo6ZG9B cHBseSgpCiAgICAgICAgIH0KICAgICAgICAgLy8gV2hlbiByZW1vdmluZyBhIGxpc3QsIHdlIG11 c3QgYWx3YXlzIGNyZWF0ZSBhIHBsYWNlaG9sZGVyIHRvIGFjdCBhcyBhIHBvaW50IG9mIGluc2Vy dGlvbgogICAgICAgICAvLyBmb3IgdGhlIGxpc3QgY29udGVudCBiZWluZyByZW1vdmVkLgotICAg ICAgICBSZWZQdHI8RWxlbWVudD4gcGxhY2Vob2xkZXIgPSBjcmVhdGVCcmVha0VsZW1lbnQoZG9j dW1lbnQoKSk7CisgICAgICAgIFJlZlB0cjxFbGVtZW50PiBwbGFjZWhvbGRlciA9IGNyZWF0ZURl ZmF1bHRQYXJhZ3JhcGhFbGVtZW50KGRvY3VtZW50KCkpOwogICAgICAgICBSZWZQdHI8RWxlbWVu dD4gbm9kZVRvSW5zZXJ0ID0gcGxhY2Vob2xkZXI7CiAgICAgICAgIC8vIElmIHRoZSBjb250ZW50 IG9mIHRoZSBsaXN0IGl0ZW0gd2lsbCBiZSBtb3ZlZCBpbnRvIGFub3RoZXIgbGlzdCwgcHV0IGl0 IGluIGEgbGlzdCBpdGVtCiAgICAgICAgIC8vIHNvIHRoYXQgd2UgZG9uJ3QgY3JlYXRlIGFuIG9y cGhhbmVkIGxpc3QgY2hpbGQuCkBAIC0xOTYsMjIgKzE5NiwzMyBAQCB2b2lkIEluc2VydExpc3RD b21tYW5kOjpkb0FwcGx5KCkKICAgICAgICAgICAgIGluc2VydE5vZGVCZWZvcmUobm9kZVRvSW5z ZXJ0LCBsaXN0Tm9kZSk7CiAgICAgICAgIH0gZWxzZQogICAgICAgICAgICAgaW5zZXJ0Tm9kZUFm dGVyKG5vZGVUb0luc2VydCwgbGlzdE5vZGUpOwotICAgICAgICAKLSAgICAgICAgVmlzaWJsZVBv c2l0aW9uIGluc2VydGlvblBvaW50ID0gVmlzaWJsZVBvc2l0aW9uKFBvc2l0aW9uKHBsYWNlaG9s ZGVyLmdldCgpLCAwKSk7Ci0gICAgICAgIG1vdmVQYXJhZ3JhcGhzKHN0YXJ0LCBlbmQsIGluc2Vy dGlvblBvaW50LCB0cnVlKTsKKworICAgICAgICBtb3ZlUGFyYWdyYXBoV2l0aENsb25lcyhzdGFy dCwgZW5kLCBwbGFjZWhvbGRlci5nZXQoKSwgbGlzdENoaWxkTm9kZSk7CisgICAgICAgIC8vIFJl bW92ZSB0aGUgbGlzdCBpdGVtIGNsb25lIGFuZCB0aGUgcGxhY2Vob2xkZXIuCisgICAgICAgIHJl bW92ZU5vZGVQcmVzZXJ2aW5nQ2hpbGRyZW4ocGxhY2Vob2xkZXItPmZpcnN0Q2hpbGQoKSk7Cisg ICAgICAgIHJlbW92ZU5vZGVQcmVzZXJ2aW5nQ2hpbGRyZW4ocGxhY2Vob2xkZXIpOwogICAgIH0K ICAgICBpZiAoIWxpc3RDaGlsZE5vZGUgfHwgc3dpdGNoTGlzdFR5cGUgfHwgbV9mb3JjZUNyZWF0 ZUxpc3QpIHsKICAgICAgICAgLy8gQ3JlYXRlIGxpc3QuCiAgICAgICAgIFZpc2libGVQb3NpdGlv biBvcmlnaW5hbFN0YXJ0ID0gZW5kaW5nU2VsZWN0aW9uKCkudmlzaWJsZVN0YXJ0KCk7CiAgICAg ICAgIFZpc2libGVQb3NpdGlvbiBzdGFydCA9IHN0YXJ0T2ZQYXJhZ3JhcGgob3JpZ2luYWxTdGFy dCk7CiAgICAgICAgIFZpc2libGVQb3NpdGlvbiBlbmQgPSBlbmRPZlBhcmFncmFwaChlbmRpbmdT ZWxlY3Rpb24oKS52aXNpYmxlRW5kKCkpOworCisgICAgICAgIFBvc2l0aW9uIHN0YXJ0UG9zaXRp b24gPSBzdGFydC5kZWVwRXF1aXZhbGVudCgpOworICAgICAgICBOb2RlKiBlbmNsb3NpbmdDZWxs ID0gZW5jbG9zaW5nTm9kZU9mVHlwZShzdGFydFBvc2l0aW9uLCAmaXNUYWJsZUNlbGwpOworICAg ICAgICBOb2RlKiBub2RlVG9TcGxpdFRvOworICAgICAgICBpZiAoZW5jbG9zaW5nQ2VsbCkKKyAg ICAgICAgICAgIG5vZGVUb1NwbGl0VG8gPSBlbmNsb3NpbmdDZWxsOworICAgICAgICBlbHNlIGlm IChlbmNsb3NpbmdMaXN0KHN0YXJ0UG9zaXRpb24ubm9kZSgpKSkKKyAgICAgICAgICAgIG5vZGVU b1NwbGl0VG8gPSBlbmNsb3NpbmdCbG9jayhzdGFydFBvc2l0aW9uLm5vZGUoKSk7CisgICAgICAg IGVsc2UKKyAgICAgICAgICAgIG5vZGVUb1NwbGl0VG8gPSBlZGl0YWJsZVJvb3RGb3JQb3NpdGlv bihzdGFydFBvc2l0aW9uKTsKKyAgICAgICAgUmVmUHRyPE5vZGU+IG91dGVyQmxvY2sgPSBzcGxp dFRyZWVUb05vZGUoc3RhcnRQb3NpdGlvbi5ub2RlKCksIG5vZGVUb1NwbGl0VG8pOwogICAgICAg ICAKICAgICAgICAgLy8gQ2hlY2sgZm9yIGFkam9pbmluZyBsaXN0cy4KICAgICAgICAgVmlzaWJs ZVBvc2l0aW9uIHByZXZpb3VzUG9zaXRpb24gPSBzdGFydC5wcmV2aW91cyh0cnVlKTsKICAgICAg ICAgVmlzaWJsZVBvc2l0aW9uIG5leHRQb3NpdGlvbiA9IGVuZC5uZXh0KHRydWUpOwogICAgICAg ICBSZWZQdHI8SFRNTEVsZW1lbnQ+IGxpc3RJdGVtRWxlbWVudCA9IGNyZWF0ZUxpc3RJdGVtRWxl bWVudChkb2N1bWVudCgpKTsKLSAgICAgICAgUmVmUHRyPEhUTUxFbGVtZW50PiBwbGFjZWhvbGRl ciA9IGNyZWF0ZUJyZWFrRWxlbWVudChkb2N1bWVudCgpKTsKLSAgICAgICAgYXBwZW5kTm9kZShw bGFjZWhvbGRlciwgbGlzdEl0ZW1FbGVtZW50KTsKICAgICAgICAgRWxlbWVudCogcHJldmlvdXNM aXN0ID0gb3V0ZXJtb3N0RW5jbG9zaW5nTGlzdChwcmV2aW91c1Bvc2l0aW9uLmRlZXBFcXVpdmFs ZW50KCkubm9kZSgpKTsKICAgICAgICAgRWxlbWVudCogbmV4dExpc3QgPSBvdXRlcm1vc3RFbmNs b3NpbmdMaXN0KG5leHRQb3NpdGlvbi5kZWVwRXF1aXZhbGVudCgpLm5vZGUoKSk7CiAgICAgICAg IE5vZGUqIHN0YXJ0Tm9kZSA9IHN0YXJ0LmRlZXBFcXVpdmFsZW50KCkubm9kZSgpOwpAQCAtMjYw LDcgKzI3MSw3IEBAIHZvaWQgSW5zZXJ0TGlzdENvbW1hbmQ6OmRvQXBwbHkoKQogICAgICAgICAg ICAgaWYgKGluc2VydGlvblBvcyA9PSBzdGFydC5kZWVwRXF1aXZhbGVudCgpKQogICAgICAgICAg ICAgICAgIHN0YXJ0ID0gc3RhcnRPZlBhcmFncmFwaChvcmlnaW5hbFN0YXJ0KTsKICAgICAgICAg fQotICAgICAgICBtb3ZlUGFyYWdyYXBoKHN0YXJ0LCBlbmQsIFZpc2libGVQb3NpdGlvbihQb3Np dGlvbihwbGFjZWhvbGRlci5nZXQoKSwgMCkpLCB0cnVlKTsKKyAgICAgICAgbW92ZVBhcmFncmFw aFdpdGhDbG9uZXMoc3RhcnQsIGVuZCwgbGlzdEl0ZW1FbGVtZW50LmdldCgpLCBvdXRlckJsb2Nr LmdldCgpKTsKICAgICAgICAgaWYgKG5leHRMaXN0ICYmIHByZXZpb3VzTGlzdCkKICAgICAgICAg ICAgIG1lcmdlSWRlbnRpY2FsRWxlbWVudHMocHJldmlvdXNMaXN0LCBuZXh0TGlzdCk7CiAgICAg fQo=