33247 2010-01-05 18:28:31 -0800 Upwards cursor movement incorrect when previous block ends with <br> 2011-08-05 16:41:57 -0700 1 1 1 Unclassified WebKit HTML Editing 528+ (Nightly build) PC Windows XP RESOLVED FIXED P2 Normal --- 1 jparent rniwa commit-queue darin dglazkov enrica justin.garcia mitz rniwa tony webkit.review.bot oldest_to_newest 177513 0 jparent 2010-01-05 18:28:31 -0800 Normally, if you press the up arrow, the cursor moves to somewhere close to being right above where you were. However, if the previous line is a block and ends in a br, the cursor always goes to the end of the line instead. See http://www.plexode.com/cgi-bin/eval3.py#ht=%3Cdiv%20contentEditable%3E%3Cp%3Efirst%20line.%20blah%20blah%20blah.%20This%20ends%20in%20a%20br.%3Cbr%2F%3E%3C%2Fp%3E%3Cp%3Esecond%20line.%20Put%20your%20cursor%20here%20%5B%20%5D.%20Now%20hit%20up.%3C%2Fp%3E%3Cp%3EAnother%20line%20line.%20This%20does%20not%20have%20a%20br.%3C%2Fp%3E%3Cp%3Etry%20again%20from%20down%20here%20%5B%20%5D%20and%20hit%20up.%3C%2Fp%3E%3C%2Fdiv%3E&ohh=1&ohj=1&jt=&ojh=1&ojj=1&ms=100&oth=0&otj=0&cex=1 for an example. This seems to happen whenever the <br> doesn't cause a linebreak - that is, if the <p>'s in the example above are replaced with <spans>, this does not happen. Seen in Safari 4.0.4 and Chrome 4.0.266.0. 189939 1 48625 tony 2010-02-11 22:05:05 -0800 Created attachment 48625 Patch 189941 2 tony 2010-02-11 22:06:38 -0800 (In reply to comment #1) > Created an attachment (id=48625) [details] > Patch In theory I should have to do a similar check in nextLinePosition, but I couldn't come up with a test case where we have an inline element that takes up no space at the beginning of a block like a <br/> right before a </p>. 192034 3 48625 eric 2010-02-19 13:40:35 -0800 Comment on attachment 48625 Patch Maybe this check should move into a function with a nice name? ((o->isText() && toRenderText(o)->linesBoundingBox().height()) 593 || (o->isBox() && toRenderBox(o)->borderBoundingBox().height())) { like canHaveCursor(o)? 192328 4 49179 tony 2010-02-21 17:13:53 -0800 Created attachment 49179 Patch 192329 5 49179 tony 2010-02-21 17:14:36 -0800 Comment on attachment 49179 Patch Good idea. Pulled out a function named canHaveCursor. 196624 6 49179 eric 2010-03-05 13:45:28 -0800 Comment on attachment 49179 Patch OK. 196865 7 49179 commit-queue 2010-03-05 23:28:35 -0800 Comment on attachment 49179 Patch Clearing flags on attachment: 49179 Committed r55613: <http://trac.webkit.org/changeset/55613> 196866 8 commit-queue 2010-03-05 23:28:39 -0800 All reviewed patches have been landed. Closing bug. 447321 9 rniwa 2011-08-05 11:52:40 -0700 This is still broken. To reproduce the bug, simply add <!DOCTYPE html> to the test added by r55613. 447409 10 103110 rniwa 2011-08-05 14:08:37 -0700 Created attachment 103110 fixes the bug 447440 11 103110 webkit.review.bot 2011-08-05 15:05:58 -0700 Comment on attachment 103110 fixes the bug Attachment 103110 did not pass chromium-ews (chromium-xvfb): Output: http://queues.webkit.org/results/9306985 New failing tests: editing/execCommand/move-selection-back-line-rtl.html 447442 12 103120 rniwa 2011-08-05 15:13:35 -0700 Created attachment 103120 rebaselined the test 447468 13 103120 tony 2011-08-05 16:27:05 -0700 Comment on attachment 103120 rebaselined the test View in context: https://bugs.webkit.org/attachment.cgi?id=103120&action=review > LayoutTests/editing/execCommand/move-selection-back-line-rtl.html:6 > +<p>Move the caret from [ ] in the second line to [ ] in the first line.</p> It would be nice if this description were more specific like the old test description (what to do and what should happen). > LayoutTests/editing/execCommand/move-selection-back-line-strict.html:1 > +<div contentEditable="true" style="font-family: monospace;"> Did you mean to add a <!DOCTYPE html> here? 447469 14 103120 rniwa 2011-08-05 16:30:23 -0700 Comment on attachment 103120 rebaselined the test View in context: https://bugs.webkit.org/attachment.cgi?id=103120&action=review Thanks for the review. >> LayoutTests/editing/execCommand/move-selection-back-line-rtl.html:6 >> +<p>Move the caret from [ ] in the second line to [ ] in the first line.</p> > > It would be nice if this description were more specific like the old test description (what to do and what should happen). Will fix. >> LayoutTests/editing/execCommand/move-selection-back-line-strict.html:1 >> +<div contentEditable="true" style="font-family: monospace;"> > > Did you mean to add a <!DOCTYPE html> here? Huh that's odd. Apparently svn diff didn't pick up my change to this file. Will fix. 447472 15 rniwa 2011-08-05 16:41:57 -0700 Committed r92526: <http://trac.webkit.org/changeset/92526> 48625 2010-02-11 22:05:05 -0800 2010-02-21 17:13:48 -0800 Patch bug-33247-20100212150504.patch text/plain 4898 tony ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA4NGFiM2VhLi5hYmEwYmQxIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTAtMDIt MTEgIFRvbnkgQ2hhbmcgIDx0b255QGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MzMyNDcKKyAgICAgICAgQmFja3dhcmRzIGN1cnNvciBtb3ZlbWVudCBpbmNv cnJlY3Qgd2hlbiBwcmV2aW91cyBibG9jayBlbmRzIHdpdGggPGJyPi4KKworICAgICAgICBJZiB0 aGUgY3Vyc29yIGlzIHRyeWluZyB0byBtb3ZlIGludG8gYSBub2RlIHRoYXQgaGFzIGEgaGVpZ2h0 IG9mIDAsCisgICAgICAgIHNraXAgb3ZlciBpdC4KKworICAgICAgICAqIGVkaXRpbmcvZXhlY0Nv bW1hbmQvbW92ZS1zZWxlY3Rpb24tYmFjay1saW5lLWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAg ICAgICogZWRpdGluZy9leGVjQ29tbWFuZC9tb3ZlLXNlbGVjdGlvbi1iYWNrLWxpbmUuaHRtbDog QWRkZWQuCisKIDIwMTAtMDItMTEgIEd1c3Rhdm8gTm9yb25oYSBTaWx2YSAgPGduc0Bnbm9tZS5v cmc+CiAKICAgICAgICAgUmVtb3ZlIHBsYXRmb3JtLXNwZWNpZmljIGV4cGVjdGVkIHJlc3VsdHMg dGhhdCBvbmx5IGV4aXN0ZWQKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2VkaXRpbmcvZXhlY0Nv bW1hbmQvbW92ZS1zZWxlY3Rpb24tYmFjay1saW5lLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3Rz L2VkaXRpbmcvZXhlY0NvbW1hbmQvbW92ZS1zZWxlY3Rpb24tYmFjay1saW5lLWV4cGVjdGVkLnR4 dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi4zNTg4MTA4Ci0tLSAvZGV2L251 bGwKKysrIGIvTGF5b3V0VGVzdHMvZWRpdGluZy9leGVjQ29tbWFuZC9tb3ZlLXNlbGVjdGlvbi1i YWNrLWxpbmUtZXhwZWN0ZWQudHh0CkBAIC0wLDAgKzEsNiBAQAorZmlyc3QgbGluZS4uIHRlc3Qg dGVzdCB0ZXN0IHRlc3QgLVsgXSB0ZXN0IHRlc3QgdGVzdAorCitzZWNvbmQgbGluZS4gUHV0IHlv dXIgY3Vyc29yIGhlcmUgWyBdIGFuZCBwcmVzcyB0aGUgdXAgYXJyb3cuIFRoZSBjdXJzb3Igc2hv dWxkIGFwcGVhciBpbiB0aGUgZ3JlZW4gYm94IG9uIHRoZSBmaXJzdCBsaW5lCisKK1BBU1MKKwpk aWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZWRpdGluZy9leGVjQ29tbWFuZC9tb3ZlLXNlbGVjdGlv bi1iYWNrLWxpbmUuaHRtbCBiL0xheW91dFRlc3RzL2VkaXRpbmcvZXhlY0NvbW1hbmQvbW92ZS1z ZWxlY3Rpb24tYmFjay1saW5lLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAw MC4uYThkNWMxMAotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2VkaXRpbmcvZXhlY0Nv bW1hbmQvbW92ZS1zZWxlY3Rpb24tYmFjay1saW5lLmh0bWwKQEAgLTAsMCArMSwxNyBAQAorPGRp diBjb250ZW50RWRpdGFibGU9InRydWUiIHN0eWxlPSJmb250LWZhbWlseTogbW9ub3NwYWNlOyI+ Cis8cD5maXJzdCBsaW5lLi4gdGVzdCB0ZXN0IHRlc3QgdGVzdCAtPHNwYW4gaWQ9InRhcmdldCIg c3R5bGU9ImJhY2tncm91bmQtY29sb3I6Z3JlZW4iPlsgXTwvc3Bhbj4gdGVzdCB0ZXN0IHRlc3Q8 YnIvPjwvcD4KKzxwPnNlY29uZCBsaW5lLiBQdXQgeW91ciBjdXJzb3IgaGVyZSBbPHNwYW4gaWQ9 InRlc3QiPiA8L3NwYW4+XSBhbmQgcHJlc3MgdGhlIHVwIGFycm93LiBUaGUgY3Vyc29yIHNob3Vs ZCBhcHBlYXIgaW4gdGhlIGdyZWVuIGJveCBvbiB0aGUgZmlyc3QgbGluZTwvcD4KKzwvZGl2Pgor PGRpdiBpZD0icmVzdWx0cyI+RkFJTEVEPC9kaXY+Cis8c2NyaXB0IHNyYz0iLi4vZWRpdGluZy5q cyI+PC9zY3JpcHQ+Cis8c2NyaXB0PgorZnVuY3Rpb24gZWRpdGluZ1Rlc3QoKQoreworICAgIGV4 ZWNNb3ZlU2VsZWN0aW9uQmFja3dhcmRCeUxpbmVDb21tYW5kKCk7CisKKyAgICAvLyBWZXJpZnkg dGhhdCB3ZSBlbmRlZCB1cCBpbiAidGFyZ2V0Ii4KKyAgICBpZiAod2luZG93LmdldFNlbGVjdGlv bigpLmFuY2hvck5vZGUucGFyZW50Tm9kZSA9PSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgidGFy Z2V0IikpCisgICAgICAgIGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJyZXN1bHRzIikuaW5uZXJU ZXh0ID0gIlBBU1MiOworfQorcnVuRHVtcEFzVGV4dEVkaXRpbmdUZXN0KGZhbHNlKTsKKzwvc2Ny aXB0PgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9DaGFuZ2VMb2cgYi9XZWJDb3JlL0NoYW5nZUxvZwpp bmRleCA4NjcyNGFiLi40MWY2M2I5IDEwMDY0NAotLS0gYS9XZWJDb3JlL0NoYW5nZUxvZworKysg Yi9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDEwLTAyLTExICBUb255IENo YW5nICA8dG9ueUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTMzMjQ3CisgICAgICAgIEJhY2t3YXJkcyBjdXJzb3IgbW92ZW1lbnQgaW5jb3JyZWN0IHdoZW4g cHJldmlvdXMgYmxvY2sgZW5kcyB3aXRoIDxicj4uCisKKyAgICAgICAgSWYgdGhlIGN1cnNvciBp cyB0cnlpbmcgdG8gbW92ZSBpbnRvIGEgbm9kZSB0aGF0IGhhcyBhIGhlaWdodCBvZiAwLAorICAg ICAgICBza2lwIG92ZXIgaXQuCisKKyAgICAgICAgVGVzdDogZWRpdGluZy9leGVjQ29tbWFuZC9t b3ZlLXNlbGVjdGlvbi1iYWNrLWxpbmUuaHRtbAorCisgICAgICAgICogZWRpdGluZy92aXNpYmxl X3VuaXRzLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OnByZXZpb3VzTGluZVBvc2l0aW9uKToKKwog MjAxMC0wMi0xMSAgTmF0ZSBDaGFwaW4gIDxqYXBoZXRAY2hyb21pdW0ub3JnPgogCiAgICAgICAg IFJldmlld2VkIGJ5IERpbWl0cmkgR2xhemtvdi4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvZWRpdGlu Zy92aXNpYmxlX3VuaXRzLmNwcCBiL1dlYkNvcmUvZWRpdGluZy92aXNpYmxlX3VuaXRzLmNwcApp bmRleCA4NGFjZTgzLi4yYWJmMjIyIDEwMDY0NAotLS0gYS9XZWJDb3JlL2VkaXRpbmcvdmlzaWJs ZV91bml0cy5jcHAKKysrIGIvV2ViQ29yZS9lZGl0aW5nL3Zpc2libGVfdW5pdHMuY3BwCkBAIC0z MSw2ICszMSw3IEBACiAjaW5jbHVkZSAiSFRNTE5hbWVzLmgiCiAjaW5jbHVkZSAiUmVuZGVyQmxv Y2suaCIKICNpbmNsdWRlICJSZW5kZXJMYXllci5oIgorI2luY2x1ZGUgIlJlbmRlck9iamVjdC5o IgogI2luY2x1ZGUgIlRleHRCb3VuZGFyaWVzLmgiCiAjaW5jbHVkZSAiVGV4dEJyZWFrSXRlcmF0 b3IuaCIKICNpbmNsdWRlICJUZXh0SXRlcmF0b3IuaCIKQEAgLTU4NiwxNyArNTg3LDIxIEBAIFZp c2libGVQb3NpdGlvbiBwcmV2aW91c0xpbmVQb3NpdGlvbihjb25zdCBWaXNpYmxlUG9zaXRpb24g JnZpc2libGVQb3NpdGlvbiwgaW50CiAgICAgICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgICAg ICBQb3NpdGlvbiBwb3MobiwgY2FyZXRNaW5PZmZzZXQobikpOwogICAgICAgICAgICAgaWYgKHBv cy5pc0NhbmRpZGF0ZSgpKSB7Ci0gICAgICAgICAgICAgICAgQVNTRVJUKG4tPnJlbmRlcmVyKCkp OwotICAgICAgICAgICAgICAgIFBvc2l0aW9uIG1heFBvcyhuLCBjYXJldE1heE9mZnNldChuKSk7 Ci0gICAgICAgICAgICAgICAgbWF4UG9zLmdldElubGluZUJveEFuZE9mZnNldChET1dOU1RSRUFN LCBib3gsIGlnbm9yZWRDYXJldE9mZnNldCk7Ci0gICAgICAgICAgICAgICAgaWYgKGJveCkgewot ICAgICAgICAgICAgICAgICAgICAvLyBwcmV2aW91cyByb290IGxpbmUgYm94IGZvdW5kCi0gICAg ICAgICAgICAgICAgICAgIHJvb3QgPSBib3gtPnJvb3QoKTsKLSAgICAgICAgICAgICAgICAgICAg Y29udGFpbmluZ0Jsb2NrID0gbi0+cmVuZGVyZXIoKS0+Y29udGFpbmluZ0Jsb2NrKCk7Ci0gICAg ICAgICAgICAgICAgICAgIGJyZWFrOworICAgICAgICAgICAgICAgIFJlbmRlck9iamVjdCogbyA9 IG4tPnJlbmRlcmVyKCk7CisgICAgICAgICAgICAgICAgQVNTRVJUKG8pOworICAgICAgICAgICAg ICAgIGlmICgoby0+aXNUZXh0KCkgJiYgdG9SZW5kZXJUZXh0KG8pLT5saW5lc0JvdW5kaW5nQm94 KCkuaGVpZ2h0KCkpCisgICAgICAgICAgICAgICAgICAgIHx8IChvLT5pc0JveCgpICYmIHRvUmVu ZGVyQm94KG8pLT5ib3JkZXJCb3VuZGluZ0JveCgpLmhlaWdodCgpKSkgeworICAgICAgICAgICAg ICAgICAgICBQb3NpdGlvbiBtYXhQb3MobiwgY2FyZXRNYXhPZmZzZXQobikpOworICAgICAgICAg ICAgICAgICAgICBtYXhQb3MuZ2V0SW5saW5lQm94QW5kT2Zmc2V0KERPV05TVFJFQU0sIGJveCwg aWdub3JlZENhcmV0T2Zmc2V0KTsKKyAgICAgICAgICAgICAgICAgICAgaWYgKGJveCkgeworICAg ICAgICAgICAgICAgICAgICAgICAgLy8gcHJldmlvdXMgcm9vdCBsaW5lIGJveCBmb3VuZAorICAg ICAgICAgICAgICAgICAgICAgICAgcm9vdCA9IGJveC0+cm9vdCgpOworICAgICAgICAgICAgICAg ICAgICAgICAgY29udGFpbmluZ0Jsb2NrID0gbi0+cmVuZGVyZXIoKS0+Y29udGFpbmluZ0Jsb2Nr KCk7CisgICAgICAgICAgICAgICAgICAgICAgICBicmVhazsKKyAgICAgICAgICAgICAgICAgICAg fQorCisgICAgICAgICAgICAgICAgICAgIHJldHVybiBWaXNpYmxlUG9zaXRpb24ocG9zLCBET1dO U1RSRUFNKTsKICAgICAgICAgICAgICAgICB9Ci0KLSAgICAgICAgICAgICAgICByZXR1cm4gVmlz aWJsZVBvc2l0aW9uKHBvcywgRE9XTlNUUkVBTSk7CiAgICAgICAgICAgICB9CiAgICAgICAgICAg ICBuID0gcHJldmlvdXNMZWFmV2l0aFNhbWVFZGl0YWJpbGl0eShuKTsKICAgICAgICAgfQo= 49179 2010-02-21 17:13:53 -0800 2011-08-05 14:08:29 -0700 Patch bug-33247-20100222101351.patch text/plain 5285 tony ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBkZTk2OGUzLi45OWQ0ZDEzIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTAtMDIt MjEgIFRvbnkgQ2hhbmcgIDx0b255QGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MzMyNDcKKyAgICAgICAgQmFja3dhcmRzIGN1cnNvciBtb3ZlbWVudCBpbmNv cnJlY3Qgd2hlbiBwcmV2aW91cyBibG9jayBlbmRzIHdpdGggPGJyPi4KKworICAgICAgICBJZiB0 aGUgY3Vyc29yIGlzIHRyeWluZyB0byBtb3ZlIGludG8gYSBub2RlIHRoYXQgaGFzIGEgaGVpZ2h0 IG9mIDAsCisgICAgICAgIHNraXAgb3ZlciBpdC4KKworICAgICAgICAqIGVkaXRpbmcvZXhlY0Nv bW1hbmQvbW92ZS1zZWxlY3Rpb24tYmFjay1saW5lLWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAg ICAgICogZWRpdGluZy9leGVjQ29tbWFuZC9tb3ZlLXNlbGVjdGlvbi1iYWNrLWxpbmUuaHRtbDog QWRkZWQuCisKIDIwMTAtMDItMTkgIEVyaWMgU2VpZGVsICA8ZXJpY0B3ZWJraXQub3JnPgogCiAg ICAgICAgIFJldmlld2VkIGJ5IERpbWl0cmkgR2xhemtvdi4KZGlmZiAtLWdpdCBhL0xheW91dFRl c3RzL2VkaXRpbmcvZXhlY0NvbW1hbmQvbW92ZS1zZWxlY3Rpb24tYmFjay1saW5lLWV4cGVjdGVk LnR4dCBiL0xheW91dFRlc3RzL2VkaXRpbmcvZXhlY0NvbW1hbmQvbW92ZS1zZWxlY3Rpb24tYmFj ay1saW5lLWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi4z NTg4MTA4Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZWRpdGluZy9leGVjQ29tbWFu ZC9tb3ZlLXNlbGVjdGlvbi1iYWNrLWxpbmUtZXhwZWN0ZWQudHh0CkBAIC0wLDAgKzEsNiBAQAor Zmlyc3QgbGluZS4uIHRlc3QgdGVzdCB0ZXN0IHRlc3QgLVsgXSB0ZXN0IHRlc3QgdGVzdAorCitz ZWNvbmQgbGluZS4gUHV0IHlvdXIgY3Vyc29yIGhlcmUgWyBdIGFuZCBwcmVzcyB0aGUgdXAgYXJy b3cuIFRoZSBjdXJzb3Igc2hvdWxkIGFwcGVhciBpbiB0aGUgZ3JlZW4gYm94IG9uIHRoZSBmaXJz dCBsaW5lCisKK1BBU1MKKwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZWRpdGluZy9leGVjQ29t bWFuZC9tb3ZlLXNlbGVjdGlvbi1iYWNrLWxpbmUuaHRtbCBiL0xheW91dFRlc3RzL2VkaXRpbmcv ZXhlY0NvbW1hbmQvbW92ZS1zZWxlY3Rpb24tYmFjay1saW5lLmh0bWwKbmV3IGZpbGUgbW9kZSAx MDA2NDQKaW5kZXggMDAwMDAwMC4uYThkNWMxMAotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRl c3RzL2VkaXRpbmcvZXhlY0NvbW1hbmQvbW92ZS1zZWxlY3Rpb24tYmFjay1saW5lLmh0bWwKQEAg LTAsMCArMSwxNyBAQAorPGRpdiBjb250ZW50RWRpdGFibGU9InRydWUiIHN0eWxlPSJmb250LWZh bWlseTogbW9ub3NwYWNlOyI+Cis8cD5maXJzdCBsaW5lLi4gdGVzdCB0ZXN0IHRlc3QgdGVzdCAt PHNwYW4gaWQ9InRhcmdldCIgc3R5bGU9ImJhY2tncm91bmQtY29sb3I6Z3JlZW4iPlsgXTwvc3Bh bj4gdGVzdCB0ZXN0IHRlc3Q8YnIvPjwvcD4KKzxwPnNlY29uZCBsaW5lLiBQdXQgeW91ciBjdXJz b3IgaGVyZSBbPHNwYW4gaWQ9InRlc3QiPiA8L3NwYW4+XSBhbmQgcHJlc3MgdGhlIHVwIGFycm93 LiBUaGUgY3Vyc29yIHNob3VsZCBhcHBlYXIgaW4gdGhlIGdyZWVuIGJveCBvbiB0aGUgZmlyc3Qg bGluZTwvcD4KKzwvZGl2PgorPGRpdiBpZD0icmVzdWx0cyI+RkFJTEVEPC9kaXY+Cis8c2NyaXB0 IHNyYz0iLi4vZWRpdGluZy5qcyI+PC9zY3JpcHQ+Cis8c2NyaXB0PgorZnVuY3Rpb24gZWRpdGlu Z1Rlc3QoKQoreworICAgIGV4ZWNNb3ZlU2VsZWN0aW9uQmFja3dhcmRCeUxpbmVDb21tYW5kKCk7 CisKKyAgICAvLyBWZXJpZnkgdGhhdCB3ZSBlbmRlZCB1cCBpbiAidGFyZ2V0Ii4KKyAgICBpZiAo d2luZG93LmdldFNlbGVjdGlvbigpLmFuY2hvck5vZGUucGFyZW50Tm9kZSA9PSBkb2N1bWVudC5n ZXRFbGVtZW50QnlJZCgidGFyZ2V0IikpCisgICAgICAgIGRvY3VtZW50LmdldEVsZW1lbnRCeUlk KCJyZXN1bHRzIikuaW5uZXJUZXh0ID0gIlBBU1MiOworfQorcnVuRHVtcEFzVGV4dEVkaXRpbmdU ZXN0KGZhbHNlKTsKKzwvc2NyaXB0PgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9DaGFuZ2VMb2cgYi9X ZWJDb3JlL0NoYW5nZUxvZwppbmRleCA2Njg3NDhjLi45ZDE4MzFlIDEwMDY0NAotLS0gYS9XZWJD b3JlL0NoYW5nZUxvZworKysgYi9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisy MDEwLTAyLTIxICBUb255IENoYW5nICA8dG9ueUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTMzMjQ3CisgICAgICAgIEJhY2t3YXJkcyBjdXJzb3IgbW92ZW1l bnQgaW5jb3JyZWN0IHdoZW4gcHJldmlvdXMgYmxvY2sgZW5kcyB3aXRoIDxicj4uCisKKyAgICAg ICAgSWYgdGhlIGN1cnNvciBpcyB0cnlpbmcgdG8gbW92ZSBpbnRvIGEgbm9kZSB0aGF0IGhhcyBh IGhlaWdodCBvZiAwLAorICAgICAgICBza2lwIG92ZXIgaXQuCisKKyAgICAgICAgVGVzdDogZWRp dGluZy9leGVjQ29tbWFuZC9tb3ZlLXNlbGVjdGlvbi1iYWNrLWxpbmUuaHRtbAorCisgICAgICAg ICogZWRpdGluZy92aXNpYmxlX3VuaXRzLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OnByZXZpb3Vz TGluZVBvc2l0aW9uKToKKwogMjAxMC0wMi0yMSAgSnVsaWVuIENoYWZmcmFpeCAgPGpjaGFmZnJh aXhAd2Via2l0Lm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBFcmljIFNlaWRlbC4KZGlmZiAt LWdpdCBhL1dlYkNvcmUvZWRpdGluZy92aXNpYmxlX3VuaXRzLmNwcCBiL1dlYkNvcmUvZWRpdGlu Zy92aXNpYmxlX3VuaXRzLmNwcAppbmRleCA4NGFjZTgzLi4zZTBlMGYyIDEwMDY0NAotLS0gYS9X ZWJDb3JlL2VkaXRpbmcvdmlzaWJsZV91bml0cy5jcHAKKysrIGIvV2ViQ29yZS9lZGl0aW5nL3Zp c2libGVfdW5pdHMuY3BwCkBAIC0zMSw2ICszMSw3IEBACiAjaW5jbHVkZSAiSFRNTE5hbWVzLmgi CiAjaW5jbHVkZSAiUmVuZGVyQmxvY2suaCIKICNpbmNsdWRlICJSZW5kZXJMYXllci5oIgorI2lu Y2x1ZGUgIlJlbmRlck9iamVjdC5oIgogI2luY2x1ZGUgIlRleHRCb3VuZGFyaWVzLmgiCiAjaW5j bHVkZSAiVGV4dEJyZWFrSXRlcmF0b3IuaCIKICNpbmNsdWRlICJUZXh0SXRlcmF0b3IuaCIKQEAg LTI1Myw2ICsyNTQsMTIgQEAgc3RhdGljIFZpc2libGVQb3NpdGlvbiBuZXh0Qm91bmRhcnkoY29u c3QgVmlzaWJsZVBvc2l0aW9uJiBjLCBCb3VuZGFyeVNlYXJjaEZ1bmMKICAgICByZXR1cm4gVmlz aWJsZVBvc2l0aW9uKHBvcywgVlBfVVBTVFJFQU1fSUZfUE9TU0lCTEUpOwogfQogCitzdGF0aWMg Ym9vbCBjYW5IYXZlQ3Vyc29yKFJlbmRlck9iamVjdCogbykKK3sKKyAgICByZXR1cm4gKG8tPmlz VGV4dCgpICYmIHRvUmVuZGVyVGV4dChvKS0+bGluZXNCb3VuZGluZ0JveCgpLmhlaWdodCgpKQor ICAgICAgICB8fCAoby0+aXNCb3goKSAmJiB0b1JlbmRlckJveChvKS0+Ym9yZGVyQm91bmRpbmdC b3goKS5oZWlnaHQoKSk7Cit9CisKIC8vIC0tLS0tLS0tLQogCiBzdGF0aWMgdW5zaWduZWQgc3Rh cnRXb3JkQm91bmRhcnkoY29uc3QgVUNoYXIqIGNoYXJhY3RlcnMsIHVuc2lnbmVkIGxlbmd0aCwg dW5zaWduZWQgb2Zmc2V0LCBCb3VuZGFyeVNlYXJjaENvbnRleHRBdmFpbGFiaWxpdHkgbWF5SGF2 ZU1vcmVDb250ZXh0LCBib29sJiBuZWVkTW9yZUNvbnRleHQpCkBAIC01ODYsMTcgKzU5MywyMCBA QCBWaXNpYmxlUG9zaXRpb24gcHJldmlvdXNMaW5lUG9zaXRpb24oY29uc3QgVmlzaWJsZVBvc2l0 aW9uICZ2aXNpYmxlUG9zaXRpb24sIGludAogICAgICAgICAgICAgICAgIGJyZWFrOwogICAgICAg ICAgICAgUG9zaXRpb24gcG9zKG4sIGNhcmV0TWluT2Zmc2V0KG4pKTsKICAgICAgICAgICAgIGlm IChwb3MuaXNDYW5kaWRhdGUoKSkgewotICAgICAgICAgICAgICAgIEFTU0VSVChuLT5yZW5kZXJl cigpKTsKLSAgICAgICAgICAgICAgICBQb3NpdGlvbiBtYXhQb3MobiwgY2FyZXRNYXhPZmZzZXQo bikpOwotICAgICAgICAgICAgICAgIG1heFBvcy5nZXRJbmxpbmVCb3hBbmRPZmZzZXQoRE9XTlNU UkVBTSwgYm94LCBpZ25vcmVkQ2FyZXRPZmZzZXQpOwotICAgICAgICAgICAgICAgIGlmIChib3gp IHsKLSAgICAgICAgICAgICAgICAgICAgLy8gcHJldmlvdXMgcm9vdCBsaW5lIGJveCBmb3VuZAot ICAgICAgICAgICAgICAgICAgICByb290ID0gYm94LT5yb290KCk7Ci0gICAgICAgICAgICAgICAg ICAgIGNvbnRhaW5pbmdCbG9jayA9IG4tPnJlbmRlcmVyKCktPmNvbnRhaW5pbmdCbG9jaygpOwot ICAgICAgICAgICAgICAgICAgICBicmVhazsKKyAgICAgICAgICAgICAgICBSZW5kZXJPYmplY3Qq IG8gPSBuLT5yZW5kZXJlcigpOworICAgICAgICAgICAgICAgIEFTU0VSVChvKTsKKyAgICAgICAg ICAgICAgICBpZiAoY2FuSGF2ZUN1cnNvcihvKSkgeworICAgICAgICAgICAgICAgICAgICBQb3Np dGlvbiBtYXhQb3MobiwgY2FyZXRNYXhPZmZzZXQobikpOworICAgICAgICAgICAgICAgICAgICBt YXhQb3MuZ2V0SW5saW5lQm94QW5kT2Zmc2V0KERPV05TVFJFQU0sIGJveCwgaWdub3JlZENhcmV0 T2Zmc2V0KTsKKyAgICAgICAgICAgICAgICAgICAgaWYgKGJveCkgeworICAgICAgICAgICAgICAg ICAgICAgICAgLy8gcHJldmlvdXMgcm9vdCBsaW5lIGJveCBmb3VuZAorICAgICAgICAgICAgICAg ICAgICAgICAgcm9vdCA9IGJveC0+cm9vdCgpOworICAgICAgICAgICAgICAgICAgICAgICAgY29u dGFpbmluZ0Jsb2NrID0gbi0+cmVuZGVyZXIoKS0+Y29udGFpbmluZ0Jsb2NrKCk7CisgICAgICAg ICAgICAgICAgICAgICAgICBicmVhazsKKyAgICAgICAgICAgICAgICAgICAgfQorCisgICAgICAg ICAgICAgICAgICAgIHJldHVybiBWaXNpYmxlUG9zaXRpb24ocG9zLCBET1dOU1RSRUFNKTsKICAg ICAgICAgICAgICAgICB9Ci0KLSAgICAgICAgICAgICAgICByZXR1cm4gVmlzaWJsZVBvc2l0aW9u KHBvcywgRE9XTlNUUkVBTSk7CiAgICAgICAgICAgICB9CiAgICAgICAgICAgICBuID0gcHJldmlv dXNMZWFmV2l0aFNhbWVFZGl0YWJpbGl0eShuKTsKICAgICAgICAgfQo= 103110 2011-08-05 14:08:37 -0700 2011-08-05 15:13:31 -0700 fixes the bug bug-33247-20110805140836.patch text/plain 9620 rniwa SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDkyNTEwKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjcgQEAKKzIwMTEtMDgtMDUgIFJ5b3N1a2Ug Tml3YSAgPHJuaXdhQHdlYmtpdC5vcmc+CisKKyAgICAgICAgVXB3YXJkcyBjdXJzb3IgbW92ZW1l bnQgaW5jb3JyZWN0IHdoZW4gcHJldmlvdXMgYmxvY2sgZW5kcyB3aXRoIDxicj4KKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTMzMjQ3CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhlIGJ1ZyB3YXMgY2F1c2Vk IGJ5IHByZXZpb3VzTGluZVBvc2l0aW9uJ3MgdHJ5aW5nIHRvIG9idGFpbiB0aGUgcm9vdCBsaW5l IGJveCBhdCB0aGUgcG9zaXRpb24KKyAgICAgICAgYWZ0ZXIgdGhlIHByZXZpb3VzIGxpbmUncyBi ci4gVGhpcyBvYnZpb3VzbHkgZmFpbHMgYmVjYXVzZSB0aGUgdGhlIHBvc2l0aW9uIGFmdGVyIGJy IGlzIGNvbnNpZGVyZWQKKyAgICAgICAgYXMgYSBwYXJ0IG9mIHRoZSBuZXh0IGxpbmUuCisKKyAg ICAgICAgRml4ZWQgdGhlIGJ1ZyBieSBvYnRhaW5pbmcgcm9vdCBpbmxpbmUgYm94ZXMgdXNpbmcg cG9zaXRpb24gYXQgdGhlIG1pbmltdW0gY2FyZXQgb2Zmc2V0IGFzIHN1cHBvc2VkCisgICAgICAg IHRvIG1heGltdW0gY2FyZXQgb2Zmc2V0LiBUaGUgY29kZSB3YXMgaW5pdGlhbGx5IGludHJvZHVj ZWQgYnkgcjMyNTA4IHRvIGZpeCBhcnJvdyBrZXkgbW92ZW1lbnQgaW4gUlRMIHRleHQKKyAgICAg ICAgYnV0IHRoZSB0ZXN0IGFkZGVkIGJ5IHRoZSByZXZpc2lvbiBjb250aW51ZXMgdG8gcGFzcyBh ZnRlciB0aGlzIGNoYW5nZS4gRnVydGhlcm1vcmUsIHRoaXMgY2hhbmdlIG1ha2VzCisgICAgICAg IG5ldyBjb2RlIGNvbnNpc3RlbnQgd2l0aCBuZXh0TGluZVBvc2l0aW9uLgorCisgICAgICAgIEFs c28gcmV2ZXJ0ZWQgdGhlIGNoYW5nZSBhZGRlZCBieSByNTU2MTMgYmVjYXVzZSBpdCBpcyBubyBs b25nZXIgbmVlZGVkLgorCisgICAgICAgIFRlc3RzOiBlZGl0aW5nL2V4ZWNDb21tYW5kL21vdmUt c2VsZWN0aW9uLWJhY2stbGluZS1ydGwuaHRtbAorICAgICAgICAgICAgICAgZWRpdGluZy9leGVj Q29tbWFuZC9tb3ZlLXNlbGVjdGlvbi1iYWNrLWxpbmUtc3RyaWN0Lmh0bWwKKworICAgICAgICAq IGVkaXRpbmcvdmlzaWJsZV91bml0cy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpwcmV2aW91c0xp bmVQb3NpdGlvbik6CisKIDIwMTEtMDgtMDUgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFw cGxlLmNvbT4KIAogICAgICAgICBGaXggQ2hyb21pdW0gYnVpbGQuCkluZGV4OiBTb3VyY2UvV2Vi Q29yZS9lZGl0aW5nL3Zpc2libGVfdW5pdHMuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJD b3JlL2VkaXRpbmcvdmlzaWJsZV91bml0cy5jcHAJKHJldmlzaW9uIDkyNDgzKQorKysgU291cmNl L1dlYkNvcmUvZWRpdGluZy92aXNpYmxlX3VuaXRzLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjE3 LDEyICsyMTcsNiBAQCBzdGF0aWMgVmlzaWJsZVBvc2l0aW9uIG5leHRCb3VuZGFyeShjb25zCiAg ICAgcmV0dXJuIFZpc2libGVQb3NpdGlvbihwb3MsIFZQX1VQU1RSRUFNX0lGX1BPU1NJQkxFKTsK IH0KIAotc3RhdGljIGJvb2wgY2FuSGF2ZUN1cnNvcihSZW5kZXJPYmplY3QqIG8pCi17Ci0gICAg cmV0dXJuIChvLT5pc1RleHQoKSAmJiB0b1JlbmRlclRleHQobyktPmxpbmVzQm91bmRpbmdCb3go KS5oZWlnaHQoKSkKLSAgICAgICAgfHwgKG8tPmlzQm94KCkgJiYgdG9SZW5kZXJCb3gobyktPmJv cmRlckJvdW5kaW5nQm94KCkuaGVpZ2h0KCkpOwotfQotCiAvLyAtLS0tLS0tLS0KIAogc3RhdGlj IHVuc2lnbmVkIHN0YXJ0V29yZEJvdW5kYXJ5KGNvbnN0IFVDaGFyKiBjaGFyYWN0ZXJzLCB1bnNp Z25lZCBsZW5ndGgsIHVuc2lnbmVkIG9mZnNldCwgQm91bmRhcnlTZWFyY2hDb250ZXh0QXZhaWxh YmlsaXR5IG1heUhhdmVNb3JlQ29udGV4dCwgYm9vbCYgbmVlZE1vcmVDb250ZXh0KQpAQCAtNTQx LDE5ICs1MzUsMTQgQEAgVmlzaWJsZVBvc2l0aW9uIHByZXZpb3VzTGluZVBvc2l0aW9uKGNvbgog ICAgICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICAgICAgUG9zaXRpb24gcG9zID0gY3JlYXRl TGVnYWN5RWRpdGluZ1Bvc2l0aW9uKG4sIGNhcmV0TWluT2Zmc2V0KG4pKTsKICAgICAgICAgICAg IGlmIChwb3MuaXNDYW5kaWRhdGUoKSkgewotICAgICAgICAgICAgICAgIFJlbmRlck9iamVjdCog byA9IG4tPnJlbmRlcmVyKCk7Ci0gICAgICAgICAgICAgICAgQVNTRVJUKG8pOwotICAgICAgICAg ICAgICAgIGlmIChjYW5IYXZlQ3Vyc29yKG8pKSB7Ci0gICAgICAgICAgICAgICAgICAgIFBvc2l0 aW9uIG1heFBvcyA9IGNyZWF0ZUxlZ2FjeUVkaXRpbmdQb3NpdGlvbihuLCBjYXJldE1heE9mZnNl dChuKSk7Ci0gICAgICAgICAgICAgICAgICAgIG1heFBvcy5nZXRJbmxpbmVCb3hBbmRPZmZzZXQo RE9XTlNUUkVBTSwgYm94LCBpZ25vcmVkQ2FyZXRPZmZzZXQpOwotICAgICAgICAgICAgICAgICAg ICBpZiAoYm94KSB7Ci0gICAgICAgICAgICAgICAgICAgICAgICAvLyBwcmV2aW91cyByb290IGxp bmUgYm94IGZvdW5kCi0gICAgICAgICAgICAgICAgICAgICAgICByb290ID0gYm94LT5yb290KCk7 Ci0gICAgICAgICAgICAgICAgICAgICAgICBicmVhazsKLSAgICAgICAgICAgICAgICAgICAgfQot Ci0gICAgICAgICAgICAgICAgICAgIHJldHVybiBWaXNpYmxlUG9zaXRpb24ocG9zLCBET1dOU1RS RUFNKTsKKyAgICAgICAgICAgICAgICBwb3MuZ2V0SW5saW5lQm94QW5kT2Zmc2V0KERPV05TVFJF QU0sIGJveCwgaWdub3JlZENhcmV0T2Zmc2V0KTsKKyAgICAgICAgICAgICAgICBpZiAoYm94KSB7 CisgICAgICAgICAgICAgICAgICAgIC8vIHByZXZpb3VzIHJvb3QgbGluZSBib3ggZm91bmQKKyAg ICAgICAgICAgICAgICAgICAgcm9vdCA9IGJveC0+cm9vdCgpOworICAgICAgICAgICAgICAgICAg ICBicmVhazsKICAgICAgICAgICAgICAgICB9CisKKyAgICAgICAgICAgICAgICByZXR1cm4gVmlz aWJsZVBvc2l0aW9uKHBvcywgRE9XTlNUUkVBTSk7CiAgICAgICAgICAgICB9CiAgICAgICAgICAg ICBuID0gcHJldmlvdXNMZWFmV2l0aFNhbWVFZGl0YWJpbGl0eShuKTsKICAgICAgICAgfQpJbmRl eDogTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL0NoYW5n ZUxvZwkocmV2aXNpb24gOTI1MTApCisrKyBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cJKHdvcmtpbmcg Y29weSkKQEAgLTEsMyArMSwyMiBAQAorMjAxMS0wOC0wNSAgUnlvc3VrZSBOaXdhICA8cm5pd2FA d2Via2l0Lm9yZz4KKworICAgICAgICBVcHdhcmRzIGN1cnNvciBtb3ZlbWVudCBpbmNvcnJlY3Qg d2hlbiBwcmV2aW91cyBibG9jayBlbmRzIHdpdGggPGJyPgorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzMyNDcKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGRlZCB0ZXN0cyB0byBlbnN1cmUgV2ViS2l0IGxl dHMgdXNlciBtb3ZlIGNhcmV0IHVwIGluIHN0cmljdCBtb2RlIGFuZCBpbiBSVEwgY29udGVudAor ICAgICAgICB3aGVuIHRoZSBwcmV2aW91cyBsaW5lIGVuZHMgd2l0aCBhIGJyLgorCisgICAgICAg ICogZWRpdGluZy9leGVjQ29tbWFuZC9tb3ZlLXNlbGVjdGlvbi1iYWNrLWxpbmUtcnRsLWV4cGVj dGVkLnR4dDogQ29waWVkIGZyb20KKyAgICAgICAgTGF5b3V0VGVzdHMvZWRpdGluZy9leGVjQ29t bWFuZC9tb3ZlLXNlbGVjdGlvbi1iYWNrLWxpbmUtZXhwZWN0ZWQudHh0LgorICAgICAgICAqIGVk aXRpbmcvZXhlY0NvbW1hbmQvbW92ZS1zZWxlY3Rpb24tYmFjay1saW5lLXJ0bC5odG1sOiBDb3Bp ZWQgZnJvbQorICAgICAgICBMYXlvdXRUZXN0cy9lZGl0aW5nL2V4ZWNDb21tYW5kL21vdmUtc2Vs ZWN0aW9uLWJhY2stbGluZS5odG1sLgorICAgICAgICAqIGVkaXRpbmcvZXhlY0NvbW1hbmQvbW92 ZS1zZWxlY3Rpb24tYmFjay1saW5lLXN0cmljdC1leHBlY3RlZC50eHQ6IENvcGllZCBmcm9tCisg ICAgICAgIExheW91dFRlc3RzL2VkaXRpbmcvZXhlY0NvbW1hbmQvbW92ZS1zZWxlY3Rpb24tYmFj ay1saW5lLWV4cGVjdGVkLnR4dC4KKyAgICAgICAgKiBlZGl0aW5nL2V4ZWNDb21tYW5kL21vdmUt c2VsZWN0aW9uLWJhY2stbGluZS1zdHJpY3QuaHRtbDogQ29waWVkIGZyb20KKyAgICAgICAgTGF5 b3V0VGVzdHMvZWRpdGluZy9leGVjQ29tbWFuZC9tb3ZlLXNlbGVjdGlvbi1iYWNrLWxpbmUuaHRt bC4KKwogMjAxMS0wOC0wNSAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgog CiAgICAgICAgIEFkZCBhIExpb24gc3BlY2lmaWMgdGVzdCBmb3IgZmFzdC9yZXBhaW50L2NhbnZh cy1wdXRJbWFnZURhdGEuaHRtbApJbmRleDogTGF5b3V0VGVzdHMvZWRpdGluZy9leGVjQ29tbWFu ZC9tb3ZlLXNlbGVjdGlvbi1iYWNrLWxpbmUtcnRsLWV4cGVjdGVkLnR4dAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBMYXlvdXRUZXN0cy9lZGl0aW5nL2V4ZWNDb21tYW5kL21vdmUtc2VsZWN0aW9uLWJhY2stbGlu ZS1ydGwtZXhwZWN0ZWQudHh0CShyZXZpc2lvbiA5MjQ4MykJKGZyb20gTGF5b3V0VGVzdHMvZWRp dGluZy9leGVjQ29tbWFuZC9tb3ZlLXNlbGVjdGlvbi1iYWNrLWxpbmUtZXhwZWN0ZWQudHh0Ojky NDgzKQorKysgTGF5b3V0VGVzdHMvZWRpdGluZy9leGVjQ29tbWFuZC9tb3ZlLXNlbGVjdGlvbi1i YWNrLWxpbmUtcnRsLWV4cGVjdGVkLnR4dAkod29ya2luZyBjb3B5KQpAQCAtMCwwICsxLDYgQEAK K2ZpcnN0IGxpbmUuLiB0ZXN0IHRlc3QgdGVzdCB0ZXN0IC1bIF0gdGVzdCB0ZXN0IHRlc3QKKwor c2Vjb25kIGxpbmUuIFB1dCB5b3VyIGN1cnNvciBoZXJlIFsgXSBhbmQgcHJlc3MgdGhlIHVwIGFy cm93LiBUaGUgY3Vyc29yIHNob3VsZCBhcHBlYXIgaW4gdGhlIGdyZWVuIGJveCBvbiB0aGUgZmly c3QgbGluZQorCitQQVNTCisKSW5kZXg6IExheW91dFRlc3RzL2VkaXRpbmcvZXhlY0NvbW1hbmQv bW92ZS1zZWxlY3Rpb24tYmFjay1saW5lLXJ0bC5odG1sCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRl c3RzL2VkaXRpbmcvZXhlY0NvbW1hbmQvbW92ZS1zZWxlY3Rpb24tYmFjay1saW5lLXJ0bC5odG1s CShyZXZpc2lvbiA5MjQ4MykJKGZyb20gTGF5b3V0VGVzdHMvZWRpdGluZy9leGVjQ29tbWFuZC9t b3ZlLXNlbGVjdGlvbi1iYWNrLWxpbmUuaHRtbDo5MjQ4MykKKysrIExheW91dFRlc3RzL2VkaXRp bmcvZXhlY0NvbW1hbmQvbW92ZS1zZWxlY3Rpb24tYmFjay1saW5lLXJ0bC5odG1sCSh3b3JraW5n IGNvcHkpCkBAIC0wLDAgKzEsMTcgQEAKKzxkaXYgY29udGVudEVkaXRhYmxlPSJ0cnVlIiBzdHls ZT0iZm9udC1mYW1pbHk6IG1vbm9zcGFjZTsiPgorPHA+Zmlyc3QgbGluZS4uIHRlc3QgdGVzdCB0 ZXN0IHRlc3QgLTxzcGFuIGlkPSJ0YXJnZXQiIHN0eWxlPSJiYWNrZ3JvdW5kLWNvbG9yOmdyZWVu Ij5bIF08L3NwYW4+IHRlc3QgdGVzdCB0ZXN0PGJyLz48L3A+Cis8cD5zZWNvbmQgbGluZS4gUHV0 IHlvdXIgY3Vyc29yIGhlcmUgWzxzcGFuIGlkPSJ0ZXN0Ij4gPC9zcGFuPl0gYW5kIHByZXNzIHRo ZSB1cCBhcnJvdy4gVGhlIGN1cnNvciBzaG91bGQgYXBwZWFyIGluIHRoZSBncmVlbiBib3ggb24g dGhlIGZpcnN0IGxpbmU8L3A+Cis8L2Rpdj4KKzxkaXYgaWQ9InJlc3VsdHMiPkZBSUxFRDwvZGl2 PgorPHNjcmlwdCBzcmM9Ii4uL2VkaXRpbmcuanMiPjwvc2NyaXB0PgorPHNjcmlwdD4KK2Z1bmN0 aW9uIGVkaXRpbmdUZXN0KCkKK3sKKyAgICBleGVjTW92ZVNlbGVjdGlvbkJhY2t3YXJkQnlMaW5l Q29tbWFuZCgpOworCisgICAgLy8gVmVyaWZ5IHRoYXQgd2UgZW5kZWQgdXAgaW4gInRhcmdldCIu CisgICAgaWYgKHdpbmRvdy5nZXRTZWxlY3Rpb24oKS5hbmNob3JOb2RlLnBhcmVudE5vZGUgPT0g ZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoInRhcmdldCIpKQorICAgICAgICBkb2N1bWVudC5nZXRF bGVtZW50QnlJZCgicmVzdWx0cyIpLmlubmVyVGV4dCA9ICJQQVNTIjsKK30KK3J1bkR1bXBBc1Rl eHRFZGl0aW5nVGVzdChmYWxzZSk7Cis8L3NjcmlwdD4KSW5kZXg6IExheW91dFRlc3RzL2VkaXRp bmcvZXhlY0NvbW1hbmQvbW92ZS1zZWxlY3Rpb24tYmFjay1saW5lLXJ0bC5odG1sCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIExheW91dFRlc3RzL2VkaXRpbmcvZXhlY0NvbW1hbmQvbW92ZS1zZWxlY3Rpb24tYmFj ay1saW5lLXJ0bC5odG1sCShyZXZpc2lvbiA5MjQ4MykKKysrIExheW91dFRlc3RzL2VkaXRpbmcv ZXhlY0NvbW1hbmQvbW92ZS1zZWxlY3Rpb24tYmFjay1saW5lLXJ0bC5odG1sCSh3b3JraW5nIGNv cHkpCkBAIC0xLDEyICsxLDE5IEBACi08ZGl2IGNvbnRlbnRFZGl0YWJsZT0idHJ1ZSIgc3R5bGU9 ImZvbnQtZmFtaWx5OiBtb25vc3BhY2U7Ij4KLTxwPmZpcnN0IGxpbmUuLiB0ZXN0IHRlc3QgdGVz dCB0ZXN0IC08c3BhbiBpZD0idGFyZ2V0IiBzdHlsZT0iYmFja2dyb3VuZC1jb2xvcjpncmVlbiI+ WyBdPC9zcGFuPiB0ZXN0IHRlc3QgdGVzdDxici8+PC9wPgotPHA+c2Vjb25kIGxpbmUuIFB1dCB5 b3VyIGN1cnNvciBoZXJlIFs8c3BhbiBpZD0idGVzdCI+IDwvc3Bhbj5dIGFuZCBwcmVzcyB0aGUg dXAgYXJyb3cuIFRoZSBjdXJzb3Igc2hvdWxkIGFwcGVhciBpbiB0aGUgZ3JlZW4gYm94IG9uIHRo ZSBmaXJzdCBsaW5lPC9wPgorPCFET0NUWVBFIGh0bWw+Cis8aGVhZD4KKzxtZXRhIGh0dHAtZXF1 aXY9ImNvbnRlbnQtdHlwZSIgY29udGVudD0idGV4dC9odG1sOyBjaGFyc2V0PXV0Zi04Ij4KKzwv aGVhZD4KKzxib2R5PgorPHA+TW92ZSB0aGUgY2FyZXQgZnJvbSBbIF0gaW4gdGhlIHNlY29uZCBs aW5lIHRvIFsgXSBpbiB0aGUgZmlyc3QgbGluZS48L3A+Cis8ZGl2IGRpcj0icnRsIiBjb250ZW50 RWRpdGFibGU9InRydWUiIHN0eWxlPSJmb250LWZhbWlseTogbW9ub3NwYWNlOyI+Cis8cCBkaXI9 InJ0bCI+16fXlSA8c3BhbiBpZD0idGFyZ2V0IiBzdHlsZT0iYmFja2dyb3VuZC1jb2xvcjpncmVl biI+WyBdPC9zcGFuPiDXqNeQ16nXldefPGJyPjwvcD4KKzxwIGRpcj0icnRsIj7Xp9eVIDxzcGFu IGlkPSJ0ZXN0Ij5bIF08L3NwYW4+INep16DXmTxicj48L3A+CiA8L2Rpdj4KIDxkaXYgaWQ9InJl c3VsdHMiPkZBSUxFRDwvZGl2PgogPHNjcmlwdCBzcmM9Ii4uL2VkaXRpbmcuanMiPjwvc2NyaXB0 PgogPHNjcmlwdD4KIGZ1bmN0aW9uIGVkaXRpbmdUZXN0KCkKIHsKKyAgICBleGVjTW92ZVNlbGVj dGlvbkZvcndhcmRCeUNoYXJhY3RlckNvbW1hbmQoKTsKICAgICBleGVjTW92ZVNlbGVjdGlvbkJh Y2t3YXJkQnlMaW5lQ29tbWFuZCgpOwogCiAgICAgLy8gVmVyaWZ5IHRoYXQgd2UgZW5kZWQgdXAg aW4gInRhcmdldCIuCkluZGV4OiBMYXlvdXRUZXN0cy9lZGl0aW5nL2V4ZWNDb21tYW5kL21vdmUt c2VsZWN0aW9uLWJhY2stbGluZS1zdHJpY3QtZXhwZWN0ZWQudHh0Cj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExh eW91dFRlc3RzL2VkaXRpbmcvZXhlY0NvbW1hbmQvbW92ZS1zZWxlY3Rpb24tYmFjay1saW5lLXN0 cmljdC1leHBlY3RlZC50eHQJKHJldmlzaW9uIDkyNDgzKQkoZnJvbSBMYXlvdXRUZXN0cy9lZGl0 aW5nL2V4ZWNDb21tYW5kL21vdmUtc2VsZWN0aW9uLWJhY2stbGluZS1leHBlY3RlZC50eHQ6OTI0 ODMpCisrKyBMYXlvdXRUZXN0cy9lZGl0aW5nL2V4ZWNDb21tYW5kL21vdmUtc2VsZWN0aW9uLWJh Y2stbGluZS1zdHJpY3QtZXhwZWN0ZWQudHh0CSh3b3JraW5nIGNvcHkpCkBAIC0wLDAgKzEsNiBA QAorZmlyc3QgbGluZS4uIHRlc3QgdGVzdCB0ZXN0IHRlc3QgLVsgXSB0ZXN0IHRlc3QgdGVzdAor CitzZWNvbmQgbGluZS4gUHV0IHlvdXIgY3Vyc29yIGhlcmUgWyBdIGFuZCBwcmVzcyB0aGUgdXAg YXJyb3cuIFRoZSBjdXJzb3Igc2hvdWxkIGFwcGVhciBpbiB0aGUgZ3JlZW4gYm94IG9uIHRoZSBm aXJzdCBsaW5lCisKK1BBU1MKKwpJbmRleDogTGF5b3V0VGVzdHMvZWRpdGluZy9leGVjQ29tbWFu ZC9tb3ZlLXNlbGVjdGlvbi1iYWNrLWxpbmUtc3RyaWN0Lmh0bWwKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5 b3V0VGVzdHMvZWRpdGluZy9leGVjQ29tbWFuZC9tb3ZlLXNlbGVjdGlvbi1iYWNrLWxpbmUtc3Ry aWN0Lmh0bWwJKHJldmlzaW9uIDkyNDgzKQkoZnJvbSBMYXlvdXRUZXN0cy9lZGl0aW5nL2V4ZWND b21tYW5kL21vdmUtc2VsZWN0aW9uLWJhY2stbGluZS5odG1sOjkyNDgzKQorKysgTGF5b3V0VGVz dHMvZWRpdGluZy9leGVjQ29tbWFuZC9tb3ZlLXNlbGVjdGlvbi1iYWNrLWxpbmUtc3RyaWN0Lmh0 bWwJKHdvcmtpbmcgY29weSkKQEAgLTAsMCArMSwxNyBAQAorPGRpdiBjb250ZW50RWRpdGFibGU9 InRydWUiIHN0eWxlPSJmb250LWZhbWlseTogbW9ub3NwYWNlOyI+Cis8cD5maXJzdCBsaW5lLi4g dGVzdCB0ZXN0IHRlc3QgdGVzdCAtPHNwYW4gaWQ9InRhcmdldCIgc3R5bGU9ImJhY2tncm91bmQt Y29sb3I6Z3JlZW4iPlsgXTwvc3Bhbj4gdGVzdCB0ZXN0IHRlc3Q8YnIvPjwvcD4KKzxwPnNlY29u ZCBsaW5lLiBQdXQgeW91ciBjdXJzb3IgaGVyZSBbPHNwYW4gaWQ9InRlc3QiPiA8L3NwYW4+XSBh bmQgcHJlc3MgdGhlIHVwIGFycm93LiBUaGUgY3Vyc29yIHNob3VsZCBhcHBlYXIgaW4gdGhlIGdy ZWVuIGJveCBvbiB0aGUgZmlyc3QgbGluZTwvcD4KKzwvZGl2PgorPGRpdiBpZD0icmVzdWx0cyI+ RkFJTEVEPC9kaXY+Cis8c2NyaXB0IHNyYz0iLi4vZWRpdGluZy5qcyI+PC9zY3JpcHQ+Cis8c2Ny aXB0PgorZnVuY3Rpb24gZWRpdGluZ1Rlc3QoKQoreworICAgIGV4ZWNNb3ZlU2VsZWN0aW9uQmFj a3dhcmRCeUxpbmVDb21tYW5kKCk7CisKKyAgICAvLyBWZXJpZnkgdGhhdCB3ZSBlbmRlZCB1cCBp biAidGFyZ2V0Ii4KKyAgICBpZiAod2luZG93LmdldFNlbGVjdGlvbigpLmFuY2hvck5vZGUucGFy ZW50Tm9kZSA9PSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgidGFyZ2V0IikpCisgICAgICAgIGRv Y3VtZW50LmdldEVsZW1lbnRCeUlkKCJyZXN1bHRzIikuaW5uZXJUZXh0ID0gIlBBU1MiOworfQor cnVuRHVtcEFzVGV4dEVkaXRpbmdUZXN0KGZhbHNlKTsKKzwvc2NyaXB0Pgo= 103120 2011-08-05 15:13:35 -0700 2011-08-05 16:30:23 -0700 rebaselined the test bug-33247-20110805151334.patch text/plain 10272 rniwa SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDkyNTEwKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjcgQEAKKzIwMTEtMDgtMDUgIFJ5b3N1a2Ug Tml3YSAgPHJuaXdhQHdlYmtpdC5vcmc+CisKKyAgICAgICAgVXB3YXJkcyBjdXJzb3IgbW92ZW1l bnQgaW5jb3JyZWN0IHdoZW4gcHJldmlvdXMgYmxvY2sgZW5kcyB3aXRoIDxicj4KKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTMzMjQ3CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhlIGJ1ZyB3YXMgY2F1c2Vk IGJ5IHByZXZpb3VzTGluZVBvc2l0aW9uJ3MgdHJ5aW5nIHRvIG9idGFpbiB0aGUgcm9vdCBsaW5l IGJveCBhdCB0aGUgcG9zaXRpb24KKyAgICAgICAgYWZ0ZXIgdGhlIHByZXZpb3VzIGxpbmUncyBi ci4gVGhpcyBvYnZpb3VzbHkgZmFpbHMgYmVjYXVzZSB0aGUgdGhlIHBvc2l0aW9uIGFmdGVyIGJy IGlzIGNvbnNpZGVyZWQKKyAgICAgICAgYXMgYSBwYXJ0IG9mIHRoZSBuZXh0IGxpbmUuCisKKyAg ICAgICAgRml4ZWQgdGhlIGJ1ZyBieSBvYnRhaW5pbmcgcm9vdCBpbmxpbmUgYm94ZXMgdXNpbmcg cG9zaXRpb24gYXQgdGhlIG1pbmltdW0gY2FyZXQgb2Zmc2V0IGFzIHN1cHBvc2VkCisgICAgICAg IHRvIG1heGltdW0gY2FyZXQgb2Zmc2V0LiBUaGUgY29kZSB3YXMgaW5pdGlhbGx5IGludHJvZHVj ZWQgYnkgcjMyNTA4IHRvIGZpeCBhcnJvdyBrZXkgbW92ZW1lbnQgaW4gUlRMIHRleHQKKyAgICAg ICAgYnV0IHRoZSB0ZXN0IGFkZGVkIGJ5IHRoZSByZXZpc2lvbiBjb250aW51ZXMgdG8gcGFzcyBh ZnRlciB0aGlzIGNoYW5nZS4gRnVydGhlcm1vcmUsIHRoaXMgY2hhbmdlIG1ha2VzCisgICAgICAg IG5ldyBjb2RlIGNvbnNpc3RlbnQgd2l0aCBuZXh0TGluZVBvc2l0aW9uLgorCisgICAgICAgIEFs c28gcmV2ZXJ0ZWQgdGhlIGNoYW5nZSBhZGRlZCBieSByNTU2MTMgYmVjYXVzZSBpdCBpcyBubyBs b25nZXIgbmVlZGVkLgorCisgICAgICAgIFRlc3RzOiBlZGl0aW5nL2V4ZWNDb21tYW5kL21vdmUt c2VsZWN0aW9uLWJhY2stbGluZS1ydGwuaHRtbAorICAgICAgICAgICAgICAgZWRpdGluZy9leGVj Q29tbWFuZC9tb3ZlLXNlbGVjdGlvbi1iYWNrLWxpbmUtc3RyaWN0Lmh0bWwKKworICAgICAgICAq IGVkaXRpbmcvdmlzaWJsZV91bml0cy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpwcmV2aW91c0xp bmVQb3NpdGlvbik6CisKIDIwMTEtMDgtMDUgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFw cGxlLmNvbT4KIAogICAgICAgICBGaXggQ2hyb21pdW0gYnVpbGQuCkluZGV4OiBTb3VyY2UvV2Vi Q29yZS9lZGl0aW5nL3Zpc2libGVfdW5pdHMuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJD b3JlL2VkaXRpbmcvdmlzaWJsZV91bml0cy5jcHAJKHJldmlzaW9uIDkyNDgzKQorKysgU291cmNl L1dlYkNvcmUvZWRpdGluZy92aXNpYmxlX3VuaXRzLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjE3 LDEyICsyMTcsNiBAQCBzdGF0aWMgVmlzaWJsZVBvc2l0aW9uIG5leHRCb3VuZGFyeShjb25zCiAg ICAgcmV0dXJuIFZpc2libGVQb3NpdGlvbihwb3MsIFZQX1VQU1RSRUFNX0lGX1BPU1NJQkxFKTsK IH0KIAotc3RhdGljIGJvb2wgY2FuSGF2ZUN1cnNvcihSZW5kZXJPYmplY3QqIG8pCi17Ci0gICAg cmV0dXJuIChvLT5pc1RleHQoKSAmJiB0b1JlbmRlclRleHQobyktPmxpbmVzQm91bmRpbmdCb3go KS5oZWlnaHQoKSkKLSAgICAgICAgfHwgKG8tPmlzQm94KCkgJiYgdG9SZW5kZXJCb3gobyktPmJv cmRlckJvdW5kaW5nQm94KCkuaGVpZ2h0KCkpOwotfQotCiAvLyAtLS0tLS0tLS0KIAogc3RhdGlj IHVuc2lnbmVkIHN0YXJ0V29yZEJvdW5kYXJ5KGNvbnN0IFVDaGFyKiBjaGFyYWN0ZXJzLCB1bnNp Z25lZCBsZW5ndGgsIHVuc2lnbmVkIG9mZnNldCwgQm91bmRhcnlTZWFyY2hDb250ZXh0QXZhaWxh YmlsaXR5IG1heUhhdmVNb3JlQ29udGV4dCwgYm9vbCYgbmVlZE1vcmVDb250ZXh0KQpAQCAtNTQx LDE5ICs1MzUsMTQgQEAgVmlzaWJsZVBvc2l0aW9uIHByZXZpb3VzTGluZVBvc2l0aW9uKGNvbgog ICAgICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICAgICAgUG9zaXRpb24gcG9zID0gY3JlYXRl TGVnYWN5RWRpdGluZ1Bvc2l0aW9uKG4sIGNhcmV0TWluT2Zmc2V0KG4pKTsKICAgICAgICAgICAg IGlmIChwb3MuaXNDYW5kaWRhdGUoKSkgewotICAgICAgICAgICAgICAgIFJlbmRlck9iamVjdCog byA9IG4tPnJlbmRlcmVyKCk7Ci0gICAgICAgICAgICAgICAgQVNTRVJUKG8pOwotICAgICAgICAg ICAgICAgIGlmIChjYW5IYXZlQ3Vyc29yKG8pKSB7Ci0gICAgICAgICAgICAgICAgICAgIFBvc2l0 aW9uIG1heFBvcyA9IGNyZWF0ZUxlZ2FjeUVkaXRpbmdQb3NpdGlvbihuLCBjYXJldE1heE9mZnNl dChuKSk7Ci0gICAgICAgICAgICAgICAgICAgIG1heFBvcy5nZXRJbmxpbmVCb3hBbmRPZmZzZXQo RE9XTlNUUkVBTSwgYm94LCBpZ25vcmVkQ2FyZXRPZmZzZXQpOwotICAgICAgICAgICAgICAgICAg ICBpZiAoYm94KSB7Ci0gICAgICAgICAgICAgICAgICAgICAgICAvLyBwcmV2aW91cyByb290IGxp bmUgYm94IGZvdW5kCi0gICAgICAgICAgICAgICAgICAgICAgICByb290ID0gYm94LT5yb290KCk7 Ci0gICAgICAgICAgICAgICAgICAgICAgICBicmVhazsKLSAgICAgICAgICAgICAgICAgICAgfQot Ci0gICAgICAgICAgICAgICAgICAgIHJldHVybiBWaXNpYmxlUG9zaXRpb24ocG9zLCBET1dOU1RS RUFNKTsKKyAgICAgICAgICAgICAgICBwb3MuZ2V0SW5saW5lQm94QW5kT2Zmc2V0KERPV05TVFJF QU0sIGJveCwgaWdub3JlZENhcmV0T2Zmc2V0KTsKKyAgICAgICAgICAgICAgICBpZiAoYm94KSB7 CisgICAgICAgICAgICAgICAgICAgIC8vIHByZXZpb3VzIHJvb3QgbGluZSBib3ggZm91bmQKKyAg ICAgICAgICAgICAgICAgICAgcm9vdCA9IGJveC0+cm9vdCgpOworICAgICAgICAgICAgICAgICAg ICBicmVhazsKICAgICAgICAgICAgICAgICB9CisKKyAgICAgICAgICAgICAgICByZXR1cm4gVmlz aWJsZVBvc2l0aW9uKHBvcywgRE9XTlNUUkVBTSk7CiAgICAgICAgICAgICB9CiAgICAgICAgICAg ICBuID0gcHJldmlvdXNMZWFmV2l0aFNhbWVFZGl0YWJpbGl0eShuKTsKICAgICAgICAgfQpJbmRl eDogTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL0NoYW5n ZUxvZwkocmV2aXNpb24gOTI1MTApCisrKyBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cJKHdvcmtpbmcg Y29weSkKQEAgLTEsMyArMSwyMiBAQAorMjAxMS0wOC0wNSAgUnlvc3VrZSBOaXdhICA8cm5pd2FA d2Via2l0Lm9yZz4KKworICAgICAgICBVcHdhcmRzIGN1cnNvciBtb3ZlbWVudCBpbmNvcnJlY3Qg d2hlbiBwcmV2aW91cyBibG9jayBlbmRzIHdpdGggPGJyPgorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzMyNDcKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGRlZCB0ZXN0cyB0byBlbnN1cmUgV2ViS2l0IGxl dHMgdXNlciBtb3ZlIGNhcmV0IHVwIGluIHN0cmljdCBtb2RlIGFuZCBpbiBSVEwgY29udGVudAor ICAgICAgICB3aGVuIHRoZSBwcmV2aW91cyBsaW5lIGVuZHMgd2l0aCBhIGJyLgorCisgICAgICAg ICogZWRpdGluZy9leGVjQ29tbWFuZC9tb3ZlLXNlbGVjdGlvbi1iYWNrLWxpbmUtcnRsLWV4cGVj dGVkLnR4dDogQ29waWVkIGZyb20KKyAgICAgICAgTGF5b3V0VGVzdHMvZWRpdGluZy9leGVjQ29t bWFuZC9tb3ZlLXNlbGVjdGlvbi1iYWNrLWxpbmUtZXhwZWN0ZWQudHh0LgorICAgICAgICAqIGVk aXRpbmcvZXhlY0NvbW1hbmQvbW92ZS1zZWxlY3Rpb24tYmFjay1saW5lLXJ0bC5odG1sOiBDb3Bp ZWQgZnJvbQorICAgICAgICBMYXlvdXRUZXN0cy9lZGl0aW5nL2V4ZWNDb21tYW5kL21vdmUtc2Vs ZWN0aW9uLWJhY2stbGluZS5odG1sLgorICAgICAgICAqIGVkaXRpbmcvZXhlY0NvbW1hbmQvbW92 ZS1zZWxlY3Rpb24tYmFjay1saW5lLXN0cmljdC1leHBlY3RlZC50eHQ6IENvcGllZCBmcm9tCisg ICAgICAgIExheW91dFRlc3RzL2VkaXRpbmcvZXhlY0NvbW1hbmQvbW92ZS1zZWxlY3Rpb24tYmFj ay1saW5lLWV4cGVjdGVkLnR4dC4KKyAgICAgICAgKiBlZGl0aW5nL2V4ZWNDb21tYW5kL21vdmUt c2VsZWN0aW9uLWJhY2stbGluZS1zdHJpY3QuaHRtbDogQ29waWVkIGZyb20KKyAgICAgICAgTGF5 b3V0VGVzdHMvZWRpdGluZy9leGVjQ29tbWFuZC9tb3ZlLXNlbGVjdGlvbi1iYWNrLWxpbmUuaHRt bC4KKwogMjAxMS0wOC0wNSAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgog CiAgICAgICAgIEFkZCBhIExpb24gc3BlY2lmaWMgdGVzdCBmb3IgZmFzdC9yZXBhaW50L2NhbnZh cy1wdXRJbWFnZURhdGEuaHRtbApJbmRleDogTGF5b3V0VGVzdHMvZWRpdGluZy9leGVjQ29tbWFu ZC9tb3ZlLXNlbGVjdGlvbi1iYWNrLWxpbmUtcnRsLWV4cGVjdGVkLnR4dAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBMYXlvdXRUZXN0cy9lZGl0aW5nL2V4ZWNDb21tYW5kL21vdmUtc2VsZWN0aW9uLWJhY2stbGlu ZS1ydGwtZXhwZWN0ZWQudHh0CShyZXZpc2lvbiA5MjQ4MykJKGZyb20gTGF5b3V0VGVzdHMvZWRp dGluZy9leGVjQ29tbWFuZC9tb3ZlLXNlbGVjdGlvbi1iYWNrLWxpbmUtZXhwZWN0ZWQudHh0Ojky NDgzKQorKysgTGF5b3V0VGVzdHMvZWRpdGluZy9leGVjQ29tbWFuZC9tb3ZlLXNlbGVjdGlvbi1i YWNrLWxpbmUtcnRsLWV4cGVjdGVkLnR4dAkod29ya2luZyBjb3B5KQpAQCAtMCwwICsxLDYgQEAK K2ZpcnN0IGxpbmUuLiB0ZXN0IHRlc3QgdGVzdCB0ZXN0IC1bIF0gdGVzdCB0ZXN0IHRlc3QKKwor c2Vjb25kIGxpbmUuIFB1dCB5b3VyIGN1cnNvciBoZXJlIFsgXSBhbmQgcHJlc3MgdGhlIHVwIGFy cm93LiBUaGUgY3Vyc29yIHNob3VsZCBhcHBlYXIgaW4gdGhlIGdyZWVuIGJveCBvbiB0aGUgZmly c3QgbGluZQorCitQQVNTCisKSW5kZXg6IExheW91dFRlc3RzL2VkaXRpbmcvZXhlY0NvbW1hbmQv bW92ZS1zZWxlY3Rpb24tYmFjay1saW5lLXJ0bC1leHBlY3RlZC50eHQKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g TGF5b3V0VGVzdHMvZWRpdGluZy9leGVjQ29tbWFuZC9tb3ZlLXNlbGVjdGlvbi1iYWNrLWxpbmUt cnRsLWV4cGVjdGVkLnR4dAkocmV2aXNpb24gOTI0ODMpCisrKyBMYXlvdXRUZXN0cy9lZGl0aW5n L2V4ZWNDb21tYW5kL21vdmUtc2VsZWN0aW9uLWJhY2stbGluZS1ydGwtZXhwZWN0ZWQudHh0CSh3 b3JraW5nIGNvcHkpCkBAIC0xLDYgKzEsOCBAQAotZmlyc3QgbGluZS4uIHRlc3QgdGVzdCB0ZXN0 IHRlc3QgLVsgXSB0ZXN0IHRlc3QgdGVzdAorTW92ZSB0aGUgY2FyZXQgZnJvbSBbIF0gaW4gdGhl IHNlY29uZCBsaW5lIHRvIFsgXSBpbiB0aGUgZmlyc3QgbGluZS4KIAotc2Vjb25kIGxpbmUuIFB1 dCB5b3VyIGN1cnNvciBoZXJlIFsgXSBhbmQgcHJlc3MgdGhlIHVwIGFycm93LiBUaGUgY3Vyc29y IHNob3VsZCBhcHBlYXIgaW4gdGhlIGdyZWVuIGJveCBvbiB0aGUgZmlyc3QgbGluZQor16fXlSBb IF0g16jXkNep15XXnworCivXp9eVIFsgXSDXqdeg15kKIAogUEFTUwogCkluZGV4OiBMYXlvdXRU ZXN0cy9lZGl0aW5nL2V4ZWNDb21tYW5kL21vdmUtc2VsZWN0aW9uLWJhY2stbGluZS1ydGwuaHRt bAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9lZGl0aW5nL2V4ZWNDb21tYW5kL21vdmUtc2Vs ZWN0aW9uLWJhY2stbGluZS1ydGwuaHRtbAkocmV2aXNpb24gOTI0ODMpCShmcm9tIExheW91dFRl c3RzL2VkaXRpbmcvZXhlY0NvbW1hbmQvbW92ZS1zZWxlY3Rpb24tYmFjay1saW5lLmh0bWw6OTI0 ODMpCisrKyBMYXlvdXRUZXN0cy9lZGl0aW5nL2V4ZWNDb21tYW5kL21vdmUtc2VsZWN0aW9uLWJh Y2stbGluZS1ydGwuaHRtbAkod29ya2luZyBjb3B5KQpAQCAtMCwwICsxLDE3IEBACis8ZGl2IGNv bnRlbnRFZGl0YWJsZT0idHJ1ZSIgc3R5bGU9ImZvbnQtZmFtaWx5OiBtb25vc3BhY2U7Ij4KKzxw PmZpcnN0IGxpbmUuLiB0ZXN0IHRlc3QgdGVzdCB0ZXN0IC08c3BhbiBpZD0idGFyZ2V0IiBzdHls ZT0iYmFja2dyb3VuZC1jb2xvcjpncmVlbiI+WyBdPC9zcGFuPiB0ZXN0IHRlc3QgdGVzdDxici8+ PC9wPgorPHA+c2Vjb25kIGxpbmUuIFB1dCB5b3VyIGN1cnNvciBoZXJlIFs8c3BhbiBpZD0idGVz dCI+IDwvc3Bhbj5dIGFuZCBwcmVzcyB0aGUgdXAgYXJyb3cuIFRoZSBjdXJzb3Igc2hvdWxkIGFw cGVhciBpbiB0aGUgZ3JlZW4gYm94IG9uIHRoZSBmaXJzdCBsaW5lPC9wPgorPC9kaXY+Cis8ZGl2 IGlkPSJyZXN1bHRzIj5GQUlMRUQ8L2Rpdj4KKzxzY3JpcHQgc3JjPSIuLi9lZGl0aW5nLmpzIj48 L3NjcmlwdD4KKzxzY3JpcHQ+CitmdW5jdGlvbiBlZGl0aW5nVGVzdCgpCit7CisgICAgZXhlY01v dmVTZWxlY3Rpb25CYWNrd2FyZEJ5TGluZUNvbW1hbmQoKTsKKworICAgIC8vIFZlcmlmeSB0aGF0 IHdlIGVuZGVkIHVwIGluICJ0YXJnZXQiLgorICAgIGlmICh3aW5kb3cuZ2V0U2VsZWN0aW9uKCku YW5jaG9yTm9kZS5wYXJlbnROb2RlID09IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJ0YXJnZXQi KSkKKyAgICAgICAgZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoInJlc3VsdHMiKS5pbm5lclRleHQg PSAiUEFTUyI7Cit9CitydW5EdW1wQXNUZXh0RWRpdGluZ1Rlc3QoZmFsc2UpOworPC9zY3JpcHQ+ CkluZGV4OiBMYXlvdXRUZXN0cy9lZGl0aW5nL2V4ZWNDb21tYW5kL21vdmUtc2VsZWN0aW9uLWJh Y2stbGluZS1ydGwuaHRtbAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9lZGl0aW5nL2V4ZWND b21tYW5kL21vdmUtc2VsZWN0aW9uLWJhY2stbGluZS1ydGwuaHRtbAkocmV2aXNpb24gOTI0ODMp CisrKyBMYXlvdXRUZXN0cy9lZGl0aW5nL2V4ZWNDb21tYW5kL21vdmUtc2VsZWN0aW9uLWJhY2st bGluZS1ydGwuaHRtbAkod29ya2luZyBjb3B5KQpAQCAtMSwxMiArMSwxOSBAQAotPGRpdiBjb250 ZW50RWRpdGFibGU9InRydWUiIHN0eWxlPSJmb250LWZhbWlseTogbW9ub3NwYWNlOyI+Ci08cD5m aXJzdCBsaW5lLi4gdGVzdCB0ZXN0IHRlc3QgdGVzdCAtPHNwYW4gaWQ9InRhcmdldCIgc3R5bGU9 ImJhY2tncm91bmQtY29sb3I6Z3JlZW4iPlsgXTwvc3Bhbj4gdGVzdCB0ZXN0IHRlc3Q8YnIvPjwv cD4KLTxwPnNlY29uZCBsaW5lLiBQdXQgeW91ciBjdXJzb3IgaGVyZSBbPHNwYW4gaWQ9InRlc3Qi PiA8L3NwYW4+XSBhbmQgcHJlc3MgdGhlIHVwIGFycm93LiBUaGUgY3Vyc29yIHNob3VsZCBhcHBl YXIgaW4gdGhlIGdyZWVuIGJveCBvbiB0aGUgZmlyc3QgbGluZTwvcD4KKzwhRE9DVFlQRSBodG1s PgorPGhlYWQ+Cis8bWV0YSBodHRwLWVxdWl2PSJjb250ZW50LXR5cGUiIGNvbnRlbnQ9InRleHQv aHRtbDsgY2hhcnNldD11dGYtOCI+Cis8L2hlYWQ+Cis8Ym9keT4KKzxwPk1vdmUgdGhlIGNhcmV0 IGZyb20gWyBdIGluIHRoZSBzZWNvbmQgbGluZSB0byBbIF0gaW4gdGhlIGZpcnN0IGxpbmUuPC9w PgorPGRpdiBkaXI9InJ0bCIgY29udGVudEVkaXRhYmxlPSJ0cnVlIiBzdHlsZT0iZm9udC1mYW1p bHk6IG1vbm9zcGFjZTsiPgorPHAgZGlyPSJydGwiPten15UgPHNwYW4gaWQ9InRhcmdldCIgc3R5 bGU9ImJhY2tncm91bmQtY29sb3I6Z3JlZW4iPlsgXTwvc3Bhbj4g16jXkNep15XXnzxicj48L3A+ Cis8cCBkaXI9InJ0bCI+16fXlSA8c3BhbiBpZD0idGVzdCI+WyBdPC9zcGFuPiDXqdeg15k8YnI+ PC9wPgogPC9kaXY+CiA8ZGl2IGlkPSJyZXN1bHRzIj5GQUlMRUQ8L2Rpdj4KIDxzY3JpcHQgc3Jj PSIuLi9lZGl0aW5nLmpzIj48L3NjcmlwdD4KIDxzY3JpcHQ+CiBmdW5jdGlvbiBlZGl0aW5nVGVz dCgpCiB7CisgICAgZXhlY01vdmVTZWxlY3Rpb25Gb3J3YXJkQnlDaGFyYWN0ZXJDb21tYW5kKCk7 CiAgICAgZXhlY01vdmVTZWxlY3Rpb25CYWNrd2FyZEJ5TGluZUNvbW1hbmQoKTsKIAogICAgIC8v IFZlcmlmeSB0aGF0IHdlIGVuZGVkIHVwIGluICJ0YXJnZXQiLgpJbmRleDogTGF5b3V0VGVzdHMv ZWRpdGluZy9leGVjQ29tbWFuZC9tb3ZlLXNlbGVjdGlvbi1iYWNrLWxpbmUtc3RyaWN0LWV4cGVj dGVkLnR4dAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9lZGl0aW5nL2V4ZWNDb21tYW5kL21v dmUtc2VsZWN0aW9uLWJhY2stbGluZS1zdHJpY3QtZXhwZWN0ZWQudHh0CShyZXZpc2lvbiA5MjQ4 MykJKGZyb20gTGF5b3V0VGVzdHMvZWRpdGluZy9leGVjQ29tbWFuZC9tb3ZlLXNlbGVjdGlvbi1i YWNrLWxpbmUtZXhwZWN0ZWQudHh0OjkyNDgzKQorKysgTGF5b3V0VGVzdHMvZWRpdGluZy9leGVj Q29tbWFuZC9tb3ZlLXNlbGVjdGlvbi1iYWNrLWxpbmUtc3RyaWN0LWV4cGVjdGVkLnR4dAkod29y a2luZyBjb3B5KQpAQCAtMCwwICsxLDYgQEAKK2ZpcnN0IGxpbmUuLiB0ZXN0IHRlc3QgdGVzdCB0 ZXN0IC1bIF0gdGVzdCB0ZXN0IHRlc3QKKworc2Vjb25kIGxpbmUuIFB1dCB5b3VyIGN1cnNvciBo ZXJlIFsgXSBhbmQgcHJlc3MgdGhlIHVwIGFycm93LiBUaGUgY3Vyc29yIHNob3VsZCBhcHBlYXIg aW4gdGhlIGdyZWVuIGJveCBvbiB0aGUgZmlyc3QgbGluZQorCitQQVNTCisKSW5kZXg6IExheW91 dFRlc3RzL2VkaXRpbmcvZXhlY0NvbW1hbmQvbW92ZS1zZWxlY3Rpb24tYmFjay1saW5lLXN0cmlj dC5odG1sCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL2VkaXRpbmcvZXhlY0NvbW1hbmQvbW92 ZS1zZWxlY3Rpb24tYmFjay1saW5lLXN0cmljdC5odG1sCShyZXZpc2lvbiA5MjQ4MykJKGZyb20g TGF5b3V0VGVzdHMvZWRpdGluZy9leGVjQ29tbWFuZC9tb3ZlLXNlbGVjdGlvbi1iYWNrLWxpbmUu aHRtbDo5MjQ4MykKKysrIExheW91dFRlc3RzL2VkaXRpbmcvZXhlY0NvbW1hbmQvbW92ZS1zZWxl Y3Rpb24tYmFjay1saW5lLXN0cmljdC5odG1sCSh3b3JraW5nIGNvcHkpCkBAIC0wLDAgKzEsMTcg QEAKKzxkaXYgY29udGVudEVkaXRhYmxlPSJ0cnVlIiBzdHlsZT0iZm9udC1mYW1pbHk6IG1vbm9z cGFjZTsiPgorPHA+Zmlyc3QgbGluZS4uIHRlc3QgdGVzdCB0ZXN0IHRlc3QgLTxzcGFuIGlkPSJ0 YXJnZXQiIHN0eWxlPSJiYWNrZ3JvdW5kLWNvbG9yOmdyZWVuIj5bIF08L3NwYW4+IHRlc3QgdGVz dCB0ZXN0PGJyLz48L3A+Cis8cD5zZWNvbmQgbGluZS4gUHV0IHlvdXIgY3Vyc29yIGhlcmUgWzxz cGFuIGlkPSJ0ZXN0Ij4gPC9zcGFuPl0gYW5kIHByZXNzIHRoZSB1cCBhcnJvdy4gVGhlIGN1cnNv ciBzaG91bGQgYXBwZWFyIGluIHRoZSBncmVlbiBib3ggb24gdGhlIGZpcnN0IGxpbmU8L3A+Cis8 L2Rpdj4KKzxkaXYgaWQ9InJlc3VsdHMiPkZBSUxFRDwvZGl2PgorPHNjcmlwdCBzcmM9Ii4uL2Vk aXRpbmcuanMiPjwvc2NyaXB0PgorPHNjcmlwdD4KK2Z1bmN0aW9uIGVkaXRpbmdUZXN0KCkKK3sK KyAgICBleGVjTW92ZVNlbGVjdGlvbkJhY2t3YXJkQnlMaW5lQ29tbWFuZCgpOworCisgICAgLy8g VmVyaWZ5IHRoYXQgd2UgZW5kZWQgdXAgaW4gInRhcmdldCIuCisgICAgaWYgKHdpbmRvdy5nZXRT ZWxlY3Rpb24oKS5hbmNob3JOb2RlLnBhcmVudE5vZGUgPT0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5 SWQoInRhcmdldCIpKQorICAgICAgICBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgicmVzdWx0cyIp LmlubmVyVGV4dCA9ICJQQVNTIjsKK30KK3J1bkR1bXBBc1RleHRFZGl0aW5nVGVzdChmYWxzZSk7 Cis8L3NjcmlwdD4K