38050 2010-04-23 09:56:47 -0700 Form button input elements lacking text in some cases after switching from visibility:collapse to visibility:visible 2010-08-08 12:08:23 -0700 1 1 1 Unclassified WebKit Forms 528+ (Nightly build) All All RESOLVED FIXED http://www.enchantedage.com/posbug.php P2 Major --- 1 webkit.org webkit-unassigned ap benm commit-queue darin hyatt mitz simon.fraser oldest_to_newest 216453 0 webkit.org 2010-04-23 09:56:47 -0700 1) surf on over to http://www.enchantedage.com/posbug.php 2) click a cell in the sheet 3) watch in amazement as the buttons lack their text works fine in FF and IE (including mobile IE) 216699 1 54214 ap 2010-04-23 22:45:39 -0700 Created attachment 54214 reduced test case 234790 2 benm 2010-06-07 04:40:47 -0700 I have a patch to fix this issue. As far as I can tell there is no support for the visibility:collapse property in WebKit. However, the spec says that elements with visibility:collapse that are not table row, row group, column or column groups should treat it as visibility:hidden. So my fix is to rewrite the collapse rule to hidden when it's not one of these table elements. This fixes this case as the element in question with visibility:collapse is a DIV. Patch and a layout test (based on Alexey's reduced test case) to follow. 234791 3 58014 benm 2010-06-07 04:41:16 -0700 Created attachment 58014 Path and layout test 234840 4 58014 mitz 2010-06-07 07:27:52 -0700 Comment on attachment 58014 Path and layout test This will break computed style and inheritance, and while the spec mentions elements, I’m pretty sure collapse should have the same effect on anything with disaply: table-*. This bug is probably a bug in layout code and should be fixed there. 234850 5 benm 2010-06-07 07:56:09 -0700 (In reply to comment #4) > (From update of attachment 58014 [details]) > This will break computed style and inheritance, and while the spec mentions elements, I’m pretty sure collapse should have the same effect on anything with disaply: table-*. This bug is probably a bug in layout code and should be fixed there. Thanks for the comments, it did seem too easy :) I'd like to delve deeper into the layout code to try and figure this one out, do you have any inkling as to where would be a good place to start looking? 234921 6 benm 2010-06-07 10:33:16 -0700 Spent a bit of time this afternoon and have found out the following: When you change the visibility of an element, we treat this as only needing to do a repaint (see http://trac.webkit.org/browser/trunk/WebCore/rendering/style/RenderStyle.cpp#L509). When going from visible to hidden and vice versa, this is enough. However in the initial layout we seem to skip elements that have visibility collapse (see http://trac.webkit.org/browser/trunk/WebCore/rendering/RenderFlexibleBox.cpp#L93). So (I think) when we come to do the repaint triggered by the change from visible to collapse we still skip them as we don't rerun a layout. This seems to be confirmed by triggering a layout after swapping from collapse to visible - the bug is fixed. I added if (inherited_flags._visibility == COLLAPSE && other->inherited_flags._visibility == VISIBLE) return StyleDifferenceLayout; to RenderStyle::diff. What do you think? Please forgive me if I'm talking nonsense. I'm not very familiar with the layout code (although I'd like to learn it) but would like to see this bug fixed. Thanks, Ben 235140 7 mitz 2010-06-07 22:48:56 -0700 (In reply to comment #6) > This seems to be confirmed by triggering a layout after swapping from collapse to visible - the bug is fixed. I added > > if (inherited_flags._visibility == COLLAPSE && other->inherited_flags._visibility == VISIBLE) > return StyleDifferenceLayout; > > to RenderStyle::diff. What do you think? Seems okay, but doesn’t the same problem exist when changing from HIDDEN to COLLAPSE? Also, it’s suboptimal to force layout for all the other elements, which don’t distinguish between HIDDEN and COLLAPSE, just to support flex boxes (and in the future, table parts). Not sure if that’s a serious concern, though. 235201 8 benm 2010-06-08 04:00:04 -0700 (In reply to comment #7) > Seems okay, but doesn’t the same problem exist when changing from HIDDEN to COLLAPSE? Yes, good point ;) > Also, it’s suboptimal to force layout for all the other elements, which don’t distinguish between HIDDEN and COLLAPSE, just to support flex boxes (and in the future, table parts). Not sure if that’s a serious concern, though. I think I can work around that by moving the code from RenderStyle::diff to RenderObject::adjustStyleDifference and only set the layout hint if it's a flex box (and add a comment to say that it should also apply to table parts in the future). 235263 9 58141 benm 2010-06-08 08:29:33 -0700 Created attachment 58141 Patch and layout test v2 Here's a patch doing what I suggested above. WDYT? Cheers, Ben 241768 10 benm 2010-06-23 02:12:34 -0700 Ping, thoughts anyone? 254744 11 benm 2010-07-22 05:51:12 -0700 Given the recent discussion on webkit-dev regarding old patches, I though I'd ping this one again. I tried applying the current patch and despite being six weeks old it still seems to apply and build fine. Any comments folks? Thanks, Ben 254880 12 58141 simon.fraser 2010-07-22 10:49:44 -0700 Comment on attachment 58141 Patch and layout test v2 This is an OK way to do it, but rather than complexificate adjustStyleDifference(), you could just move this code to RenderStyle::diff(), and use display() == BOX to detect whether you're dealing with a flexbox. Be sure to add your code between the last 'return StyleDifferenceLayout' and the first 'return StyleDifferenceRepaintLayer'. 256152 13 benm 2010-07-26 12:06:32 -0700 (In reply to comment #12) Hi Simon, Thanks for the comments and suggestions! > (From update of attachment 58141 [details]) > This is an OK way to do it, but rather than complexificate adjustStyleDifference(), you could just move this code to RenderStyle::diff(), and use display() == BOX to detect whether you're dealing with a flexbox. Hmm, display() == BOX doesn't seem to be working :( I've moved the code into RenderStyle::diff() and it works without that check. But as Mitz pointed out earlier in comment 7, it would be better to only force a layout when we are dealing with flexboxes. Any other suggestions as to how I could detect a flexbox? Or is this infact not such a big concern? > > Be sure to add your code between the last 'return StyleDifferenceLayout' and the first 'return StyleDifferenceRepaintLayer'. Will do! Thanks, Ben 258244 14 benm 2010-07-30 09:59:24 -0700 I was able to hook up the debugger today to look a little closer at this. It seems that the test page attached to the bug uses a RenderButton, which is a FlexibleBox. It inherits the visibility:collapse from it's containing <div> which I think, is not a FlexibleBox. When we are calculating the style diff for the RenderButton, its display property is set to INLINE_BLOCK. So it doesn't seem to follow that RenderObject::isFlexibleBox() corresponds to a display of BOX. Is that correct? I'm now starting to wonder whether this should be restricted to flexible boxes as Mitz suggested in comment 7. Should we be doing this for all RenderObjects? 260045 15 63455 benm 2010-08-04 09:00:15 -0700 Created attachment 63455 Patch and layout test 260285 16 63455 darin 2010-08-04 17:11:20 -0700 Comment on attachment 63455 Patch and layout test > + if ((visibility() == COLLAPSE && other->visibility() != COLLAPSE) > + || (visibility() != COLLAPSE && other->visibility() == COLLAPSE)) > + return StyleDifferenceLayout; I think it is more readable like this: if ((visibility() == COLLAPSE) != (other->visibility() == COLLAPSE)) return StyleDifferenceLayout; 260523 17 benm 2010-08-05 04:46:31 -0700 (In reply to comment #16) > (From update of attachment 63455 [details]) > > + if ((visibility() == COLLAPSE && other->visibility() != COLLAPSE) > > + || (visibility() != COLLAPSE && other->visibility() == COLLAPSE)) > > + return StyleDifferenceLayout; > > I think it is more readable like this: > > if ((visibility() == COLLAPSE) != (other->visibility() == COLLAPSE)) > return StyleDifferenceLayout; SGTM, will send a replacement patch. 260634 18 63597 benm 2010-08-05 08:44:35 -0700 Created attachment 63597 Patch and layout test 260647 19 mitz 2010-08-05 09:06:42 -0700 (In reply to comment #14) > I was able to hook up the debugger today to look a little closer at this. > > It seems that the test page attached to the bug uses a RenderButton, which is a FlexibleBox. It inherits the visibility:collapse from it's containing <div> which I think, is not a FlexibleBox. > > When we are calculating the style diff for the RenderButton, its display property is set to INLINE_BLOCK. So it doesn't seem to follow that RenderObject::isFlexibleBox() corresponds to a display of BOX. Is that correct? You’re right. RenderButton inherits from RenderFlexibleBox, and thus returns true from isFlexibleBox() regardless of its display type. > I'm now starting to wonder whether this should be restricted to flexible boxes as Mitz suggested in comment 7. Should we be doing this for all RenderObjects? It would still be good to do this only for flexible box, but RenderStyle alone can’t tell you whether you’re a flexible box because of the above. 260711 20 benm 2010-08-05 11:18:38 -0700 (In reply to comment #19) > > It would still be good to do this only for flexible box, but RenderStyle alone can’t tell you whether you’re a flexible box because of the above. Exactly, which is why I moved it into RenderObject::adjustStyleDifference in patch #2. But Simon r-'d it, suggesting I moved it back to RenderStyle::diff. Which I did in the most recent patch :). If not RenderStyle::diff and not RenderObject::adjustSTyleDifference, do you know where else I could move the code? Thanks! 260726 21 63597 benm 2010-08-05 11:33:02 -0700 Comment on attachment 63597 Patch and layout test Thanks :) 260771 22 darin 2010-08-05 12:28:31 -0700 Simon, Dan, maybe we still should change this back so it doesn’t affect objects that are not flexible boxes? 261101 23 63597 commit-queue 2010-08-05 22:57:48 -0700 Comment on attachment 63597 Patch and layout test Clearing flags on attachment: 63597 Committed r64819: <http://trac.webkit.org/changeset/64819> 261102 24 commit-queue 2010-08-05 22:57:54 -0700 All reviewed patches have been landed. Closing bug. 261911 25 mitz 2010-08-08 12:08:23 -0700 (In reply to comment #22) > Simon, Dan, maybe we still should change this back so it doesn’t affect objects that are not flexible boxes? I asked Simon about this and he said that 'collapse' is rarely used, so this doesn’t matter much. I agree that it would be nice to get tighten this up, but I think the patch as landed is okay too. 54214 2010-04-23 22:45:39 -0700 2010-04-23 22:45:39 -0700 reduced test case 38050.html text/html 313 ap PGJvZHk+CjxwPlRoZXNlIGJ1dHRvbnMgc2hvdWxkIGxvb2sgdGhlIHNhbWU6PC9wPgo8ZGl2IGlk PSdlZGl0ZmxvYXRlcicgc3R5bGU9J3Zpc2liaWxpdHk6IGNvbGxhcHNlOyc+CjxpbnB1dCB0eXBl PSdidXR0b24nIHZhbHVlPSdYJz4KPC9kaXY+CjxkaXY+CjxpbnB1dCB0eXBlPSdidXR0b24nIHZh bHVlPSdYJz4KPC9kaXY+CjxzY3JpcHQ+CmRvY3VtZW50LmJvZHkub2Zmc2V0VG9wOyAvLyBGb3Jj ZSBsYXlvdXQuCmRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJlZGl0ZmxvYXRlciIpLnN0eWxlLnZp c2liaWxpdHk9J3Zpc2libGUnCjwvc2NyaXB0Pg== 58014 2010-06-07 04:41:16 -0700 2010-06-08 08:29:33 -0700 Path and layout test 38050.txt text/plain 4580 benm SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2MDc3MikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjQgQEAKKzIwMTAtMDYtMDcgIEJlbiBNdXJkb2NoICA8YmVubUBnb29nbGUuY29t PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEZvcm0g YnV0dG9uIGlucHV0IGVsZW1lbnRzIGxhY2tpbmcgdGV4dCBpbiBzb21lIGNhc2VzIGFmdGVyIHN3 aXRjaGluZyBmcm9tCisgICAgICAgIHZpc2liaWxpdHk6Y29sbGFwc2UgdG8gdmlzaWJpbGl0eTp2 aXNpYmxlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0z ODA1MAorCisgICAgICAgIEVsZW1lbnRzIHdpdGggdmlzaWJpbGl0eTpjb2xsYXBzZSB0aGF0IGFy ZSBub3QgdGFibGUgcm93IG9yIGNvbHVtbnMKKyAgICAgICAgc2hvdWxkIGJlIHRyZWF0ZWQgYXMg dmlzaWJpbGl0eTpoaWRkZW4gYWNjb3JkaW5nIHRvIHRoZSBDU1Mgc3BlYy4KKworICAgICAgICBT ZWUgaHR0cDovL3d3dy53My5vcmcvVFIvQ1NTMi90YWJsZXMuaHRtbCNkeW5hbWljLWVmZmVjdHMg YW5kIAorICAgICAgICBodHRwOi8vd3d3LnczLm9yZy9UUi9DU1MyL3Zpc3VmeC5odG1sI3Zpc2li aWxpdHkKKworICAgICAgICBUZXN0OiBmYXN0L2Nzcy92aXNpYmlsaXR5LWNvbGxhcHNlLWZvcm0t YnV0dG9ucy5odG1sCisKKyAgICAgICAgKiBjc3MvQ1NTU3R5bGVTZWxlY3Rvci5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpDU1NTdHlsZVNlbGVjdG9yOjphZGp1c3RSZW5kZXJTdHlsZSk6IElmIHRo ZSBlbGVtZW50CisgICAgICAgIHNwZWNpZmllcyB2aXNpYmlsaXR5OmNvbGxhcHNlIGJ1dCBpcyBu b3QgYSB0YWJsZSByb3cgb3IgY29sdW1uIGVsZW1lbnQKKyAgICAgICAgdHJlYXQgaXQgYXMgdmlz aWJpbGl0eSBoaWRkZW4uCisKIDIwMTAtMDYtMDcgIEpvY2VseW4gVHVyY290dGUgIDxqb2NlbHlu LnR1cmNvdHRlQG5va2lhLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBTaW1vbiBIYXVzbWFu bi4KSW5kZXg6IFdlYkNvcmUvY3NzL0NTU1N0eWxlU2VsZWN0b3IuY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFdlYkNvcmUvY3NzL0NTU1N0eWxlU2VsZWN0b3IuY3BwCShyZXZpc2lvbiA2MDc3MCkKKysrIFdl YkNvcmUvY3NzL0NTU1N0eWxlU2VsZWN0b3IuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xNzQ5LDYg KzE3NDksMTUgQEAgdm9pZCBDU1NTdHlsZVNlbGVjdG9yOjphZGp1c3RSZW5kZXJTdHlsZQogICAg IGlmIChzdHlsZS0+aGFzQXBwZWFyYW5jZSgpKQogICAgICAgICBSZW5kZXJUaGVtZTo6ZGVmYXVs dFRoZW1lKCktPmFkanVzdFN0eWxlKHRoaXMsIHN0eWxlLCBlLCBtX2hhc1VBQXBwZWFyYW5jZSwg bV9ib3JkZXJEYXRhLCBtX2JhY2tncm91bmREYXRhLCBtX2JhY2tncm91bmRDb2xvcik7CiAKKyAg ICAvLyBBY2NvcmRpbmcgdG8gaHR0cDovL3d3dy53My5vcmcvVFIvQ1NTMi90YWJsZXMuaHRtbCNk eW5hbWljLWVmZmVjdHMgYSB2aXNpYmlsaXR5OmNvbGxhcHNlIHByb3BlcnR5IG9ubHkgYXBwbGll cworICAgIC8vIHRvIHRhYmxlIHJvdywgcm93IGdyb3VwLCBjb2x1bW4sIGFuZCBjb2x1bW4gZ3Jv dXAgZWxlbWVudHMuIGh0dHA6Ly93d3cudzMub3JnL1RSL0NTUzIvdmlzdWZ4Lmh0bWwjdmlzaWJp bGl0eSBzdGF0ZXMKKyAgICAvLyB0aGF0IGlmIHVzZWQgb24gb3RoZXIgZWxlbWVudHMgJ2NvbGxh cHNlJyBoYXMgdGhlIHNhbWUgbWVhbmluZyBhcyAnaGlkZGVuJy4KKyAgICBpZiAoc3R5bGUtPnZp c2liaWxpdHkoKSA9PSBDT0xMQVBTRSAmJiBlCisgICAgICAgICYmICFlLT5oYXNUYWdOYW1lKHRy VGFnKSAmJiAhZS0+aGFzVGFnTmFtZSh0Zm9vdFRhZykKKyAgICAgICAgJiYgIWUtPmhhc1RhZ05h bWUodGhlYWRUYWcpICYmICFlLT5oYXNUYWdOYW1lKHRib2R5VGFnKQorICAgICAgICAmJiAhZS0+ aGFzVGFnTmFtZShjb2xncm91cFRhZykgJiYgIWUtPmhhc1RhZ05hbWUoY29sVGFnKSkKKyAgICAg ICAgc3R5bGUtPnNldFZpc2liaWxpdHkoSElEREVOKTsKKwogI2lmIEVOQUJMRShTVkcpCiAgICAg aWYgKGUgJiYgZS0+aXNTVkdFbGVtZW50KCkpIHsKICAgICAgICAgLy8gU3BlYzogaHR0cDovL3d3 dy53My5vcmcvVFIvU1ZHL21hc2tpbmcuaHRtbCNPdmVyZmxvd1Byb3BlcnR5CkluZGV4OiBMYXlv dXRUZXN0cy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCShy ZXZpc2lvbiA2MDc3MikKKysrIExheW91dFRlc3RzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpA QCAtMSwzICsxLDE0IEBACisyMDEwLTA2LTA3ICBCZW4gTXVyZG9jaCAgPGJlbm1AZ29vZ2xlLmNv bT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBGb3Jt IGJ1dHRvbiBpbnB1dCBlbGVtZW50cyBsYWNraW5nIHRleHQgaW4gc29tZSBjYXNlcyBhZnRlciBz d2l0Y2hpbmcgZnJvbQorICAgICAgICB2aXNpYmlsaXR5OmNvbGxhcHNlIHRvIHZpc2liaWxpdHk6 dmlzaWJsZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MzgwNTAKKworICAgICAgICAqIGZhc3QvY3NzL3Zpc2liaWxpdHktY29sbGFwc2UtZm9ybS1idXR0 b25zLWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICogZmFzdC9jc3MvdmlzaWJpbGl0eS1j b2xsYXBzZS1mb3JtLWJ1dHRvbnMuaHRtbDogQWRkZWQuCisKIDIwMTAtMDYtMDYgIE1PUklUQSBI YWppbWUgIDxtb3JyaXRhQGdvb2dsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgS2VudCBU YW11cmEuCkluZGV4OiBMYXlvdXRUZXN0cy9mYXN0L2Nzcy92aXNpYmlsaXR5LWNvbGxhcHNlLWZv cm0tYnV0dG9ucy1leHBlY3RlZC50eHQKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvZmFzdC9j c3MvdmlzaWJpbGl0eS1jb2xsYXBzZS1mb3JtLWJ1dHRvbnMtZXhwZWN0ZWQudHh0CShyZXZpc2lv biAwKQorKysgTGF5b3V0VGVzdHMvZmFzdC9jc3MvdmlzaWJpbGl0eS1jb2xsYXBzZS1mb3JtLWJ1 dHRvbnMtZXhwZWN0ZWQudHh0CShyZXZpc2lvbiAwKQpAQCAtMCwwICsxLDUgQEAKK1RoZSB0d28g YnV0dG9ucyBiZWxvdyBzaG91bGQgc2F5IFBBU1M6CisKKworCitQQVNTCkluZGV4OiBMYXlvdXRU ZXN0cy9mYXN0L2Nzcy92aXNpYmlsaXR5LWNvbGxhcHNlLWZvcm0tYnV0dG9ucy5odG1sCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIExheW91dFRlc3RzL2Zhc3QvY3NzL3Zpc2liaWxpdHktY29sbGFwc2UtZm9ybS1i dXR0b25zLmh0bWwJKHJldmlzaW9uIDApCisrKyBMYXlvdXRUZXN0cy9mYXN0L2Nzcy92aXNpYmls aXR5LWNvbGxhcHNlLWZvcm0tYnV0dG9ucy5odG1sCShyZXZpc2lvbiAwKQpAQCAtMCwwICsxLDMx IEBACis8aHRtbD4KKzxoZWFkPgorPHRpdGxlPlRlc3QgZm9yIGJ1ZyAzODA1MDwvdGl0bGU+Cis8 L2hlYWQ+Cis8Ym9keT4KKzxwPlRoZSB0d28gYnV0dG9ucyBiZWxvdyBzaG91bGQgc2F5IFBBU1M6 PC9wPgorPGRpdiBpZD0nY29sbGFwc2VEaXYnIHN0eWxlPSd2aXNpYmlsaXR5OiBjb2xsYXBzZTsn PgorICAgIDxpbnB1dCB0eXBlPSdidXR0b24nIHZhbHVlPSdQQVNTJyBpZD0nY29sbGFwc2VCdXR0 b24nIC8+Cis8L2Rpdj4KKzxkaXY+CisgICAgPGlucHV0IHR5cGU9J2J1dHRvbicgdmFsdWU9J1BB U1MnIGlkPSd2aXNpYmlsaXR5QnV0dG9uJyAvPgorPC9kaXY+CisKKzxkaXYgaWQ9J2NvbnNvbGUn PjwvZGl2PgorCis8c2NyaXB0PgoraWYgKHdpbmRvdy5sYXlvdXRUZXN0Q29udHJvbGxlcikKKyAg ICBsYXlvdXRUZXN0Q29udHJvbGxlci5kdW1wQXNUZXh0KCk7CisKK2RvY3VtZW50LmJvZHkub2Zm c2V0VG9wOyAvLyBGb3JjZSBsYXlvdXQuCitkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgiY29sbGFw c2VEaXYiKS5zdHlsZS52aXNpYmlsaXR5PSd2aXNpYmxlJworCisvLyBUaGUgdHdvIGJ1dHRvbnMg c2hvdWxkIGhhdmUgdGhlIHNhbWUgd2lkdGguCitpZiAoZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQo J2NvbGxhcHNlQnV0dG9uJykuY2xpZW50V2lkdGggPT0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQo J3Zpc2liaWxpdHlCdXR0b24nKS5jbGllbnRXaWR0aCkKKyAgICBkb2N1bWVudC5nZXRFbGVtZW50 QnlJZCgnY29uc29sZScpLmlubmVyVGV4dCA9ICdQQVNTJzsKK2Vsc2UKKyAgICBkb2N1bWVudC5n ZXRFbGVtZW50QnlJZCgnY29uc29sZScpLmlubmVyVGV4dCA9ICdGQUlMJzsKKworPC9zY3JpcHQ+ IAorPC9ib2R5PgorPC9odG1sPgo= 58141 2010-06-08 08:29:33 -0700 2010-08-04 09:00:15 -0700 Patch and layout test v2 38050.txt text/plain 6045 benm SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2MDg0MSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTkgQEAKKzIwMTAtMDYtMDggIEJlbiBNdXJkb2NoICA8YmVubUBnb29nbGUuY29t PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEZvcm0g YnV0dG9uIGlucHV0IGVsZW1lbnRzIGxhY2tpbmcgdGV4dCBpbiBzb21lIGNhc2VzIGFmdGVyIHN3 aXRjaGluZyBmcm9tIHZpc2liaWxpdHk6Y29sbGFwc2UgdG8gdmlzaWJpbGl0eTp2aXNpYmxlCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zODA1MAorCisg ICAgICAgIEZsZXhpYmxlIGJveGVzIG11c3QgcmVsYXlvdXQgYWZ0ZXIgdG9nZ2xpbmcgdmlzaWJp bGl0eSBmcm9tIGNvbGxhcHNlIHRvIGFub3RoZXIgdmFsdWUuCisKKyAgICAgICAgVGVzdDogZmFz dC9jc3MvdmlzaWJpbGl0eS1jb2xsYXBzZS1mb3JtLWJ1dHRvbnMuaHRtbAorCisgICAgICAgICog cmVuZGVyaW5nL1JlbmRlck9iamVjdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJPYmpl Y3Q6OmFkanVzdFN0eWxlRGlmZmVyZW5jZSk6IElmIGEgZmxleGlibGUgYm94IGlzIHN3YXBwaW5n IGZyb20gdmlzaWJpbGl0eTpjb2xsYXBzZSB0byBhbm90aGVyIHZpc2liaWxpdHkgdmFsdWUsIHRy aWdnZXIgYSBsYXlvdXQuCisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJPYmplY3Q6OnNldFN0eWxl KToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyT2JqZWN0Lmg6CisKIDIwMTAtMDYtMDggIEFu dG9uaW8gR29tZXMgIDx0b25pa2l0b29Ad2Via2l0Lm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBi eSBPamFuIFZhZmFpIGFuZCBEYXJpbiBBZGxlci4KSW5kZXg6IFdlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlck9iamVjdC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyT2Jq ZWN0LmNwcAkocmV2aXNpb24gNjA4NDEpCisrKyBXZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJPYmpl Y3QuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xNDgxLDcgKzE0ODEsNyBAQCB2b2lkIFJlbmRlck9i amVjdDo6c2V0QW5pbWF0YWJsZVN0eWxlKFBhCiAgICAgICAgIHNldFN0eWxlKHN0eWxlKTsKIH0K IAotU3R5bGVEaWZmZXJlbmNlIFJlbmRlck9iamVjdDo6YWRqdXN0U3R5bGVEaWZmZXJlbmNlKFN0 eWxlRGlmZmVyZW5jZSBkaWZmLCB1bnNpZ25lZCBjb250ZXh0U2Vuc2l0aXZlUHJvcGVydGllcykg Y29uc3QKK1N0eWxlRGlmZmVyZW5jZSBSZW5kZXJPYmplY3Q6OmFkanVzdFN0eWxlRGlmZmVyZW5j ZShjb25zdCBSZW5kZXJTdHlsZSogbmV3U3R5bGUsIGNvbnN0IFJlbmRlclN0eWxlKiBvbGRTdHls ZSwgU3R5bGVEaWZmZXJlbmNlIGRpZmYsIHVuc2lnbmVkIGNvbnRleHRTZW5zaXRpdmVQcm9wZXJ0 aWVzKSBjb25zdAogewogI2lmIFVTRShBQ0NFTEVSQVRFRF9DT01QT1NJVElORykKICAgICAvLyBJ ZiB0cmFuc2Zvcm0gY2hhbmdlZCwgYW5kIHdlIGFyZSBub3QgY29tcG9zaXRlZCwgbmVlZCB0byBk byBhIGxheW91dC4KQEAgLTE1MTEsNiArMTUxMSwxMyBAQCBTdHlsZURpZmZlcmVuY2UgUmVuZGVy T2JqZWN0OjphZGp1c3RTdHlsCiAgICAgaWYgKGRpZmYgPT0gU3R5bGVEaWZmZXJlbmNlUmVwYWlu dExheWVyICYmICFoYXNMYXllcigpKQogICAgICAgICBkaWZmID0gU3R5bGVEaWZmZXJlbmNlUmVw YWludDsKIAorICAgIC8vIFdoZW4gd2Ugc3VwcG9ydCB2aXNpYmlsaXR5OmNvbGxhcHNlIG9uIHRh YmxlIGVsZW1lbnRzLCB3ZSBzaG91bGQgYWxzbworICAgIC8vIGRvIHRoaXMgYWRqdXN0bWVudCBm b3IgdGFibGUgcGFydHMgbm90IGp1c3QgZmxleGlibGUgYm94ZXMuCisgICAgaWYgKGlzRmxleGli bGVCb3goKQorICAgICAgICAmJiBvbGRTdHlsZSAmJiBvbGRTdHlsZS0+dmlzaWJpbGl0eSgpID09 IENPTExBUFNFCisgICAgICAgICYmIG5ld1N0eWxlICYmIG5ld1N0eWxlLT52aXNpYmlsaXR5KCkg IT0gQ09MTEFQU0UpCisgICAgICAgIGRpZmYgPSBTdHlsZURpZmZlcmVuY2VMYXlvdXQ7IAorCiAg ICAgcmV0dXJuIGRpZmY7CiB9CiAKQEAgLTE1MjQsNyArMTUzMSw3IEBAIHZvaWQgUmVuZGVyT2Jq ZWN0OjpzZXRTdHlsZShQYXNzUmVmUHRyPFIKICAgICBpZiAobV9zdHlsZSkKICAgICAgICAgZGlm ZiA9IG1fc3R5bGUtPmRpZmYoc3R5bGUuZ2V0KCksIGNvbnRleHRTZW5zaXRpdmVQcm9wZXJ0aWVz KTsKIAotICAgIGRpZmYgPSBhZGp1c3RTdHlsZURpZmZlcmVuY2UoZGlmZiwgY29udGV4dFNlbnNp dGl2ZVByb3BlcnRpZXMpOworICAgIGRpZmYgPSBhZGp1c3RTdHlsZURpZmZlcmVuY2Uoc3R5bGUu Z2V0KCksIG1fc3R5bGUuZ2V0KCksIGRpZmYsIGNvbnRleHRTZW5zaXRpdmVQcm9wZXJ0aWVzKTsK IAogICAgIHN0eWxlV2lsbENoYW5nZShkaWZmLCBzdHlsZS5nZXQoKSk7CiAgICAgCkBAIC0xNTQ5 LDcgKzE1NTYsNyBAQCB2b2lkIFJlbmRlck9iamVjdDo6c2V0U3R5bGUoUGFzc1JlZlB0cjxSCiAK ICAgICAvLyBOb3cgdGhhdCB0aGUgbGF5ZXIgKGlmIGFueSkgaGFzIGJlZW4gdXBkYXRlZCwgd2Ug bmVlZCB0byBhZGp1c3QgdGhlIGRpZmYgYWdhaW4sCiAgICAgLy8gY2hlY2sgd2hldGhlciB3ZSBz aG91bGQgbGF5b3V0IG5vdywgYW5kIGRlY2lkZSBpZiB3ZSBuZWVkIHRvIHJlcGFpbnQuCi0gICAg U3R5bGVEaWZmZXJlbmNlIHVwZGF0ZWREaWZmID0gYWRqdXN0U3R5bGVEaWZmZXJlbmNlKGRpZmYs IGNvbnRleHRTZW5zaXRpdmVQcm9wZXJ0aWVzKTsKKyAgICBTdHlsZURpZmZlcmVuY2UgdXBkYXRl ZERpZmYgPSBhZGp1c3RTdHlsZURpZmZlcmVuY2Uoc3R5bGUuZ2V0KCksIG9sZFN0eWxlLmdldCgp LCBkaWZmLCBjb250ZXh0U2Vuc2l0aXZlUHJvcGVydGllcyk7CiAgICAgCiAgICAgaWYgKGRpZmYg PD0gU3R5bGVEaWZmZXJlbmNlTGF5b3V0UG9zaXRpb25lZE1vdmVtZW50T25seSkgewogICAgICAg ICBpZiAodXBkYXRlZERpZmYgPT0gU3R5bGVEaWZmZXJlbmNlTGF5b3V0KQpJbmRleDogV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyT2JqZWN0LmgJKHJldmlzaW9uIDYwODQxKQorKysgV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyT2JqZWN0LmgJKHdvcmtpbmcgY29weSkKQEAgLTg1MCw3ICs4NTAsNyBAQCBwcm90ZWN0 ZWQ6CiAgICAgCiBwcml2YXRlOgogICAgIFJlbmRlclN0eWxlKiBmaXJzdExpbmVTdHlsZVNsb3dD YXNlKCkgY29uc3Q7Ci0gICAgU3R5bGVEaWZmZXJlbmNlIGFkanVzdFN0eWxlRGlmZmVyZW5jZShT dHlsZURpZmZlcmVuY2UsIHVuc2lnbmVkIGNvbnRleHRTZW5zaXRpdmVQcm9wZXJ0aWVzKSBjb25z dDsKKyAgICBTdHlsZURpZmZlcmVuY2UgYWRqdXN0U3R5bGVEaWZmZXJlbmNlKGNvbnN0IFJlbmRl clN0eWxlKiBuZXdTdHlsZSwgY29uc3QgUmVuZGVyU3R5bGUqIG9sZFN0eWxlLCBTdHlsZURpZmZl cmVuY2UsIHVuc2lnbmVkIGNvbnRleHRTZW5zaXRpdmVQcm9wZXJ0aWVzKSBjb25zdDsKICAgICAK ICAgICBSZWZQdHI8UmVuZGVyU3R5bGU+IG1fc3R5bGU7CiAKSW5kZXg6IExheW91dFRlc3RzL0No YW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cJKHJldmlzaW9uIDYw ODQxKQorKysgTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEs MTMgQEAKKzIwMTAtMDYtMDggIEJlbiBNdXJkb2NoICA8YmVubUBnb29nbGUuY29tPgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEZvcm0gYnV0dG9uIGlu cHV0IGVsZW1lbnRzIGxhY2tpbmcgdGV4dCBpbiBzb21lIGNhc2VzIGFmdGVyIHN3aXRjaGluZyBm cm9tIHZpc2liaWxpdHk6Y29sbGFwc2UgdG8gdmlzaWJpbGl0eTp2aXNpYmxlCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zODA1MAorCisgICAgICAgICog ZmFzdC9jc3MvdmlzaWJpbGl0eS1jb2xsYXBzZS1mb3JtLWJ1dHRvbnMtZXhwZWN0ZWQudHh0OiBB ZGRlZC4KKyAgICAgICAgKiBmYXN0L2Nzcy92aXNpYmlsaXR5LWNvbGxhcHNlLWZvcm0tYnV0dG9u cy5odG1sOiBBZGRlZC4KKwogMjAxMC0wNi0wOCAgU3RldmUgQmxvY2sgIDxzdGV2ZWJsb2NrQGdv b2dsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgSmVyZW15IE9ybG93LgpJbmRleDogTGF5 b3V0VGVzdHMvZmFzdC9jc3MvdmlzaWJpbGl0eS1jb2xsYXBzZS1mb3JtLWJ1dHRvbnMtZXhwZWN0 ZWQudHh0Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL2Zhc3QvY3NzL3Zpc2liaWxpdHktY29s bGFwc2UtZm9ybS1idXR0b25zLWV4cGVjdGVkLnR4dAkocmV2aXNpb24gMCkKKysrIExheW91dFRl c3RzL2Zhc3QvY3NzL3Zpc2liaWxpdHktY29sbGFwc2UtZm9ybS1idXR0b25zLWV4cGVjdGVkLnR4 dAkocmV2aXNpb24gMCkKQEAgLTAsMCArMSw1IEBACitUaGUgdHdvIGJ1dHRvbnMgYmVsb3cgc2hv dWxkIHNheSBQQVNTOgorCisKKworUEFTUwpJbmRleDogTGF5b3V0VGVzdHMvZmFzdC9jc3Mvdmlz aWJpbGl0eS1jb2xsYXBzZS1mb3JtLWJ1dHRvbnMuaHRtbAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRU ZXN0cy9mYXN0L2Nzcy92aXNpYmlsaXR5LWNvbGxhcHNlLWZvcm0tYnV0dG9ucy5odG1sCShyZXZp c2lvbiAwKQorKysgTGF5b3V0VGVzdHMvZmFzdC9jc3MvdmlzaWJpbGl0eS1jb2xsYXBzZS1mb3Jt LWJ1dHRvbnMuaHRtbAkocmV2aXNpb24gMCkKQEAgLTAsMCArMSwzMSBAQAorPGh0bWw+Cis8aGVh ZD4KKzx0aXRsZT5UZXN0IGZvciBidWcgMzgwNTA8L3RpdGxlPgorPC9oZWFkPgorPGJvZHk+Cis8 cD5UaGUgdHdvIGJ1dHRvbnMgYmVsb3cgc2hvdWxkIHNheSBQQVNTOjwvcD4KKzxkaXYgaWQ9J2Nv bGxhcHNlRGl2JyBzdHlsZT0ndmlzaWJpbGl0eTogY29sbGFwc2U7Jz4KKyAgICA8aW5wdXQgdHlw ZT0nYnV0dG9uJyB2YWx1ZT0nUEFTUycgaWQ9J2NvbGxhcHNlQnV0dG9uJyAvPgorPC9kaXY+Cis8 ZGl2PgorICAgIDxpbnB1dCB0eXBlPSdidXR0b24nIHZhbHVlPSdQQVNTJyBpZD0ndmlzaWJpbGl0 eUJ1dHRvbicgLz4KKzwvZGl2PgorCis8ZGl2IGlkPSdjb25zb2xlJz48L2Rpdj4KKworPHNjcmlw dD4KK2lmICh3aW5kb3cubGF5b3V0VGVzdENvbnRyb2xsZXIpCisgICAgbGF5b3V0VGVzdENvbnRy b2xsZXIuZHVtcEFzVGV4dCgpOworCitkb2N1bWVudC5ib2R5Lm9mZnNldFRvcDsgLy8gRm9yY2Ug bGF5b3V0LgorZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoImNvbGxhcHNlRGl2Iikuc3R5bGUudmlz aWJpbGl0eT0ndmlzaWJsZScKKworLy8gVGhlIHR3byBidXR0b25zIHNob3VsZCBoYXZlIHRoZSBz YW1lIHdpZHRoLgoraWYgKGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCdjb2xsYXBzZUJ1dHRvbicp LmNsaWVudFdpZHRoID09IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCd2aXNpYmlsaXR5QnV0dG9u JykuY2xpZW50V2lkdGgpCisgICAgZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ2NvbnNvbGUnKS5p bm5lclRleHQgPSAnUEFTUyc7CitlbHNlCisgICAgZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ2Nv bnNvbGUnKS5pbm5lclRleHQgPSAnRkFJTCc7CisKKzwvc2NyaXB0PiAKKzwvYm9keT4KKzwvaHRt bD4K 63455 2010-08-04 09:00:15 -0700 2010-08-05 08:44:35 -0700 Patch and layout test 38050.txt text/plain 3884 benm SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2NDY1MykKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTkgQEAKKzIwMTAtMDgtMDQgIEJlbiBNdXJkb2NoICA8YmVubUBnb29nbGUuY29t PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEZvcm0g YnV0dG9uIGlucHV0IGVsZW1lbnRzIGxhY2tpbmcgdGV4dCBpbiBzb21lIGNhc2VzIGFmdGVyIHN3 aXRjaGluZyBmcm9tCisgICAgICAgIHZpc2liaWxpdHk6Y29sbGFwc2UgdG8gdmlzaWJpbGl0eTp2 aXNpYmxlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0z ODA1MAorICAgICAgICAKKyAgICAgICAgQSByZWxheW91dCBpcyByZXF1aXJlZCBhZnRlciB0b2dn bGluZyB2aXNpYmlsaXR5IGZyb20gY29sbGFwc2UgdG8gYW5vdGhlciB2YWx1ZS4KKworICAgICAg ICBUZXN0OiBmYXN0L2Nzcy92aXNpYmlsaXR5LWNvbGxhcHNlLWZvcm0tYnV0dG9ucy5odG1sCisK KyAgICAgICAgKiByZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5bGUuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6UmVuZGVyU3R5bGU6OmRpZmYpOiBJZiB3ZSdyZSB0b2dnbGluZyBmcm9tIHZpc2liaWxp dHk6Y29sbGFwc2UgdG8gYW5vdGhlcgorICAgICAgICAgICAgdmlzaWJpbGl0eSB2YWx1ZSAob3Ig dmljZSB2ZXJzYSkgdGhlbiB3ZSBuZWVkIHRvIHRyaWdnZXIgYSByZWxheW91dC4KKwogMjAxMC0w OC0wNCAgWXVyeSBTZW1pa2hhdHNreSAgPHl1cnlzQGNocm9taXVtLm9yZz4KIAogICAgICAgICBS ZXZpZXdlZCBieSBQYXZlbCBGZWxkbWFuLgpJbmRleDogV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUv UmVuZGVyU3R5bGUuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1Jl bmRlclN0eWxlLmNwcAkocmV2aXNpb24gNjQ2NDApCisrKyBXZWJDb3JlL3JlbmRlcmluZy9zdHls ZS9SZW5kZXJTdHlsZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQ3MSw2ICs0NzEsMTAgQEAgU3R5 bGVEaWZmZXJlbmNlIFJlbmRlclN0eWxlOjpkaWZmKGNvbnN0CiAgICAgICAgIHJldHVybiBTdHls ZURpZmZlcmVuY2VMYXlvdXQ7CiAgICAgfQogCisgICAgaWYgKCh2aXNpYmlsaXR5KCkgPT0gQ09M TEFQU0UgJiYgb3RoZXItPnZpc2liaWxpdHkoKSAhPSBDT0xMQVBTRSkKKyAgICAgICAgfHwgKHZp c2liaWxpdHkoKSAhPSBDT0xMQVBTRSAmJiBvdGhlci0+dmlzaWJpbGl0eSgpID09IENPTExBUFNF KSkKKyAgICAgICAgcmV0dXJuIFN0eWxlRGlmZmVyZW5jZUxheW91dDsKKwogICAgIC8vIE1ha2Ug c3VyZSB0aGVzZSBsZWZ0L3RvcC9yaWdodC9ib3R0b20gY2hlY2tzIHN0YXkgYmVsb3cgYWxsIGxh eW91dCBjaGVja3MgYW5kIGFib3ZlCiAgICAgLy8gYWxsIHZpc2libGUgY2hlY2tzLgogICAgIGlm IChwb3NpdGlvbigpICE9IFN0YXRpY1Bvc2l0aW9uKSB7CkluZGV4OiBMYXlvdXRUZXN0cy9DaGFu Z2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCShyZXZpc2lvbiA2NDY1 MykKKysrIExheW91dFRlc3RzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDEz IEBACisyMDEwLTA4LTA0ICBCZW4gTXVyZG9jaCAgPGJlbm1AZ29vZ2xlLmNvbT4KKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBGb3JtIGJ1dHRvbiBpbnB1 dCBlbGVtZW50cyBsYWNraW5nIHRleHQgaW4gc29tZSBjYXNlcyBhZnRlciBzd2l0Y2hpbmcgZnJv bSB2aXNpYmlsaXR5OmNvbGxhcHNlIHRvIHZpc2liaWxpdHk6dmlzaWJsZQorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzgwNTAKKworICAgICAgICAqIGZh c3QvY3NzL3Zpc2liaWxpdHktY29sbGFwc2UtZm9ybS1idXR0b25zLWV4cGVjdGVkLnR4dDogQWRk ZWQuCisgICAgICAgICogZmFzdC9jc3MvdmlzaWJpbGl0eS1jb2xsYXBzZS1mb3JtLWJ1dHRvbnMu aHRtbDogQWRkZWQuCisKIDIwMTAtMDgtMDQgIEFiaGlzaGVrIEFyeWEgIDxpbmZlcm5vQGNocm9t aXVtLm9yZz4KIAogICAgICAgICBVbnJldmlld2VkLiBRVCBleHBlY3RhdGlvbiBmaXguCkluZGV4 OiBMYXlvdXRUZXN0cy9mYXN0L2Nzcy92aXNpYmlsaXR5LWNvbGxhcHNlLWZvcm0tYnV0dG9ucy1l eHBlY3RlZC50eHQKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvZmFzdC9jc3MvdmlzaWJpbGl0 eS1jb2xsYXBzZS1mb3JtLWJ1dHRvbnMtZXhwZWN0ZWQudHh0CShyZXZpc2lvbiAwKQorKysgTGF5 b3V0VGVzdHMvZmFzdC9jc3MvdmlzaWJpbGl0eS1jb2xsYXBzZS1mb3JtLWJ1dHRvbnMtZXhwZWN0 ZWQudHh0CShyZXZpc2lvbiAwKQpAQCAtMCwwICsxLDUgQEAKK1RoZSB0d28gYnV0dG9ucyBiZWxv dyBzaG91bGQgc2F5IFBBU1M6CisKKworCitQQVNTCkluZGV4OiBMYXlvdXRUZXN0cy9mYXN0L2Nz cy92aXNpYmlsaXR5LWNvbGxhcHNlLWZvcm0tYnV0dG9ucy5odG1sCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExh eW91dFRlc3RzL2Zhc3QvY3NzL3Zpc2liaWxpdHktY29sbGFwc2UtZm9ybS1idXR0b25zLmh0bWwJ KHJldmlzaW9uIDApCisrKyBMYXlvdXRUZXN0cy9mYXN0L2Nzcy92aXNpYmlsaXR5LWNvbGxhcHNl LWZvcm0tYnV0dG9ucy5odG1sCShyZXZpc2lvbiAwKQpAQCAtMCwwICsxLDMxIEBACis8aHRtbD4K KzxoZWFkPgorPHRpdGxlPlRlc3QgZm9yIGJ1ZyAzODA1MDwvdGl0bGU+Cis8L2hlYWQ+Cis8Ym9k eT4KKzxwPlRoZSB0d28gYnV0dG9ucyBiZWxvdyBzaG91bGQgc2F5IFBBU1M6PC9wPgorPGRpdiBp ZD0nY29sbGFwc2VEaXYnIHN0eWxlPSd2aXNpYmlsaXR5OiBjb2xsYXBzZTsnPgorICAgIDxpbnB1 dCB0eXBlPSdidXR0b24nIHZhbHVlPSdQQVNTJyBpZD0nY29sbGFwc2VCdXR0b24nIC8+Cis8L2Rp dj4KKzxkaXY+CisgICAgPGlucHV0IHR5cGU9J2J1dHRvbicgdmFsdWU9J1BBU1MnIGlkPSd2aXNp YmlsaXR5QnV0dG9uJyAvPgorPC9kaXY+CisKKzxkaXYgaWQ9J2NvbnNvbGUnPjwvZGl2PgorCis8 c2NyaXB0PgoraWYgKHdpbmRvdy5sYXlvdXRUZXN0Q29udHJvbGxlcikKKyAgICBsYXlvdXRUZXN0 Q29udHJvbGxlci5kdW1wQXNUZXh0KCk7CisKK2RvY3VtZW50LmJvZHkub2Zmc2V0VG9wOyAvLyBG b3JjZSBsYXlvdXQuCitkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgiY29sbGFwc2VEaXYiKS5zdHls ZS52aXNpYmlsaXR5PSd2aXNpYmxlJworCisvLyBUaGUgdHdvIGJ1dHRvbnMgc2hvdWxkIGhhdmUg dGhlIHNhbWUgd2lkdGguCitpZiAoZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ2NvbGxhcHNlQnV0 dG9uJykuY2xpZW50V2lkdGggPT0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ3Zpc2liaWxpdHlC dXR0b24nKS5jbGllbnRXaWR0aCkKKyAgICBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgnY29uc29s ZScpLmlubmVyVGV4dCA9ICdQQVNTJzsKK2Vsc2UKKyAgICBkb2N1bWVudC5nZXRFbGVtZW50QnlJ ZCgnY29uc29sZScpLmlubmVyVGV4dCA9ICdGQUlMJzsKKworPC9zY3JpcHQ+IAorPC9ib2R5Pgor PC9odG1sPgo= 63597 2010-08-05 08:44:35 -0700 2010-08-05 22:57:48 -0700 Patch and layout test 38050-1.txt text/plain 3819 benm SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2NDczNCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTkgQEAKKzIwMTAtMDgtMDQgIEJlbiBNdXJkb2NoICA8YmVubUBnb29nbGUuY29t PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEZvcm0g YnV0dG9uIGlucHV0IGVsZW1lbnRzIGxhY2tpbmcgdGV4dCBpbiBzb21lIGNhc2VzIGFmdGVyIHN3 aXRjaGluZyBmcm9tCisgICAgICAgIHZpc2liaWxpdHk6Y29sbGFwc2UgdG8gdmlzaWJpbGl0eTp2 aXNpYmxlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0z ODA1MAorICAgICAgICAKKyAgICAgICAgQSByZWxheW91dCBpcyByZXF1aXJlZCBhZnRlciB0b2dn bGluZyB2aXNpYmlsaXR5IGZyb20gY29sbGFwc2UgdG8gYW5vdGhlciB2YWx1ZS4KKworICAgICAg ICBUZXN0OiBmYXN0L2Nzcy92aXNpYmlsaXR5LWNvbGxhcHNlLWZvcm0tYnV0dG9ucy5odG1sCisK KyAgICAgICAgKiByZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5bGUuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6UmVuZGVyU3R5bGU6OmRpZmYpOiBJZiB3ZSdyZSB0b2dnbGluZyBmcm9tIHZpc2liaWxp dHk6Y29sbGFwc2UgdG8gYW5vdGhlcgorICAgICAgICAgICAgdmlzaWJpbGl0eSB2YWx1ZSAob3Ig dmljZSB2ZXJzYSkgdGhlbiB3ZSBuZWVkIHRvIHRyaWdnZXIgYSByZWxheW91dC4KKwogMjAxMC0w OC0wNSAgTmVkIEhvbGJyb29rICA8bmhvbGJyb29rQGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZp ZXdlZCBieSBEYXJpbiBBZGxlci4KSW5kZXg6IFdlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1JlbmRl clN0eWxlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9SZW5kZXJT dHlsZS5jcHAJKHJldmlzaW9uIDY0NzM0KQorKysgV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvUmVu ZGVyU3R5bGUuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00NzIsNiArNDcyLDkgQEAgU3R5bGVEaWZm ZXJlbmNlIFJlbmRlclN0eWxlOjpkaWZmKGNvbnN0CiAgICAgICAgIHJldHVybiBTdHlsZURpZmZl cmVuY2VMYXlvdXQ7CiAgICAgfQogCisgICAgaWYgKCh2aXNpYmlsaXR5KCkgPT0gQ09MTEFQU0Up ICE9IChvdGhlci0+dmlzaWJpbGl0eSgpID09IENPTExBUFNFKSkKKyAgICAgICAgcmV0dXJuIFN0 eWxlRGlmZmVyZW5jZUxheW91dDsKKwogICAgIC8vIE1ha2Ugc3VyZSB0aGVzZSBsZWZ0L3RvcC9y aWdodC9ib3R0b20gY2hlY2tzIHN0YXkgYmVsb3cgYWxsIGxheW91dCBjaGVja3MgYW5kIGFib3Zl CiAgICAgLy8gYWxsIHZpc2libGUgY2hlY2tzLgogICAgIGlmIChwb3NpdGlvbigpICE9IFN0YXRp Y1Bvc2l0aW9uKSB7CkluZGV4OiBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g TGF5b3V0VGVzdHMvQ2hhbmdlTG9nCShyZXZpc2lvbiA2NDczNCkKKysrIExheW91dFRlc3RzL0No YW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDEzIEBACisyMDEwLTA4LTA0ICBCZW4g TXVyZG9jaCAgPGJlbm1AZ29vZ2xlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBGb3JtIGJ1dHRvbiBpbnB1dCBlbGVtZW50cyBsYWNraW5nIHRl eHQgaW4gc29tZSBjYXNlcyBhZnRlciBzd2l0Y2hpbmcgZnJvbSB2aXNpYmlsaXR5OmNvbGxhcHNl IHRvIHZpc2liaWxpdHk6dmlzaWJsZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MzgwNTAKKworICAgICAgICAqIGZhc3QvY3NzL3Zpc2liaWxpdHktY29s bGFwc2UtZm9ybS1idXR0b25zLWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICogZmFzdC9j c3MvdmlzaWJpbGl0eS1jb2xsYXBzZS1mb3JtLWJ1dHRvbnMuaHRtbDogQWRkZWQuCisKIDIwMTAt MDgtMDUgIFBhdmVsIEZlbGRtYW4gIDxwZmVsZG1hbkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAg Tm90IHJldmlld2VkLiBDaHJvbWl1bSBleHBlY3RhdGlvbnMgdXBkYXRlLgpJbmRleDogTGF5b3V0 VGVzdHMvZmFzdC9jc3MvdmlzaWJpbGl0eS1jb2xsYXBzZS1mb3JtLWJ1dHRvbnMtZXhwZWN0ZWQu dHh0Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL2Zhc3QvY3NzL3Zpc2liaWxpdHktY29sbGFw c2UtZm9ybS1idXR0b25zLWV4cGVjdGVkLnR4dAkocmV2aXNpb24gMCkKKysrIExheW91dFRlc3Rz L2Zhc3QvY3NzL3Zpc2liaWxpdHktY29sbGFwc2UtZm9ybS1idXR0b25zLWV4cGVjdGVkLnR4dAko cmV2aXNpb24gMCkKQEAgLTAsMCArMSw1IEBACitUaGUgdHdvIGJ1dHRvbnMgYmVsb3cgc2hvdWxk IHNheSBQQVNTOgorCisKKworUEFTUwpJbmRleDogTGF5b3V0VGVzdHMvZmFzdC9jc3MvdmlzaWJp bGl0eS1jb2xsYXBzZS1mb3JtLWJ1dHRvbnMuaHRtbAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0 cy9mYXN0L2Nzcy92aXNpYmlsaXR5LWNvbGxhcHNlLWZvcm0tYnV0dG9ucy5odG1sCShyZXZpc2lv biAwKQorKysgTGF5b3V0VGVzdHMvZmFzdC9jc3MvdmlzaWJpbGl0eS1jb2xsYXBzZS1mb3JtLWJ1 dHRvbnMuaHRtbAkocmV2aXNpb24gMCkKQEAgLTAsMCArMSwzMSBAQAorPGh0bWw+Cis8aGVhZD4K Kzx0aXRsZT5UZXN0IGZvciBidWcgMzgwNTA8L3RpdGxlPgorPC9oZWFkPgorPGJvZHk+Cis8cD5U aGUgdHdvIGJ1dHRvbnMgYmVsb3cgc2hvdWxkIHNheSBQQVNTOjwvcD4KKzxkaXYgaWQ9J2NvbGxh cHNlRGl2JyBzdHlsZT0ndmlzaWJpbGl0eTogY29sbGFwc2U7Jz4KKyAgICA8aW5wdXQgdHlwZT0n YnV0dG9uJyB2YWx1ZT0nUEFTUycgaWQ9J2NvbGxhcHNlQnV0dG9uJyAvPgorPC9kaXY+Cis8ZGl2 PgorICAgIDxpbnB1dCB0eXBlPSdidXR0b24nIHZhbHVlPSdQQVNTJyBpZD0ndmlzaWJpbGl0eUJ1 dHRvbicgLz4KKzwvZGl2PgorCis8ZGl2IGlkPSdjb25zb2xlJz48L2Rpdj4KKworPHNjcmlwdD4K K2lmICh3aW5kb3cubGF5b3V0VGVzdENvbnRyb2xsZXIpCisgICAgbGF5b3V0VGVzdENvbnRyb2xs ZXIuZHVtcEFzVGV4dCgpOworCitkb2N1bWVudC5ib2R5Lm9mZnNldFRvcDsgLy8gRm9yY2UgbGF5 b3V0LgorZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoImNvbGxhcHNlRGl2Iikuc3R5bGUudmlzaWJp bGl0eT0ndmlzaWJsZScKKworLy8gVGhlIHR3byBidXR0b25zIHNob3VsZCBoYXZlIHRoZSBzYW1l IHdpZHRoLgoraWYgKGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCdjb2xsYXBzZUJ1dHRvbicpLmNs aWVudFdpZHRoID09IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCd2aXNpYmlsaXR5QnV0dG9uJyku Y2xpZW50V2lkdGgpCisgICAgZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ2NvbnNvbGUnKS5pbm5l clRleHQgPSAnUEFTUyc7CitlbHNlCisgICAgZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ2NvbnNv bGUnKS5pbm5lclRleHQgPSAnRkFJTCc7CisKKzwvc2NyaXB0PiAKKzwvYm9keT4KKzwvaHRtbD4K