90052 2012-06-27 00:16:10 -0700 REGRESSION (r116203): overflow sections don’t have scrollbars 2012-07-11 10:51:15 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Mac OS X 10.7 RESOLVED FIXED data:text/html,<div style="border: solid; height: 100px; overflow: auto;">a<div style="height: 300px;"></div>z</div> InRadar, Regression P1 Major --- 1 mitz jchaffraix adele bdakin darin eric jchaffraix simon.fraser webkit.review.bot oldest_to_newest 658405 0 mitz 2012-06-27 00:16:10 -0700 <rdar://problem/11757381> The overlay scrollbars in overflow: scroll blocks never show, so it’s impossible to tell that they can scroll. To reproduce: navigate to the URL. Notice that as the page loads, the scrollbar doesn’t flash in the top right, and as you scroll the overflow section, the scrollbar doesn’t appear. This was caused by <http://trac.webkit.org/r116203>. 658408 1 mitz 2012-06-27 00:17:17 -0700 (In reply to comment #0) > This was caused by <http://trac.webkit.org/r116203>. …which was the fix for bug 85678. 658418 2 mitz 2012-06-27 00:36:39 -0700 Resize corners (for resize: both) also don’t paint sometimes. 658673 3 adele 2012-06-27 09:46:09 -0700 Should we roll out r116203 and re-assess the optimization? 658675 4 simon.fraser 2012-06-27 09:49:17 -0700 Yes. 658764 5 jchaffraix 2012-06-27 12:02:17 -0700 (In reply to comment #3) > Should we roll out r116203 and re-assess the optimization? If it is rolled out, the has self-painting layer descendant optimization should be rolled out as well due to the same issue. The fix should be fairly simple though: the current definition of self-painting layer doesn't seem to cover all the cases (scrollbars, resizing, ...). I will see if I can get something by EOD, if not, it's better to roll it out as I won't be able to look into it before some time. 659470 6 jchaffraix 2012-06-28 06:53:17 -0700 (In reply to comment #5) > (In reply to comment #3) > > Should we roll out r116203 and re-assess the optimization? > > If it is rolled out, the has self-painting layer descendant optimization should be rolled out as well due to the same issue. > > The fix should be fairly simple though: the current definition of self-painting layer doesn't seem to cover all the cases (scrollbars, resizing, ...). I will see if I can get something by EOD, if not, it's better to roll it out as I won't be able to look into it before some time. Scratch that comment, I spoke too early. I couldn't reproduce the issue on Mac SL or Linux Chomium so it should be related to overlay scrollbars. The bad news is that I have no Lion machine to test but I think I have a blind fix for that that I will post. 659494 7 149953 jchaffraix 2012-06-28 07:28:09 -0700 Created attachment 149953 Proposed blind fix, would appreciate if someone could test it on Lion. 660622 8 149953 mitz 2012-06-29 10:38:06 -0700 Comment on attachment 149953 Proposed blind fix, would appreciate if someone could test it on Lion. With the patch applied, I hit ASSERTION FAILED: isSelfPaintingLayer() || hasSelfPaintingLayerDescendant() in RenderLayer.cpp:2995 as soon as I open the test case or cause a <textarea> to have a scroll bar. 665902 9 jchaffraix 2012-07-10 11:24:39 -0700 (In reply to comment #8) > (From update of attachment 149953 [details]) > With the patch applied, I hit ASSERTION FAILED: isSelfPaintingLayer() || hasSelfPaintingLayerDescendant() in RenderLayer.cpp:2995 as soon as I open the test case or cause a <textarea> to have a scroll bar. That's because I forgot to update this ASSERT. I got my hand on a Lion machine and unfortunately the test case seemed to work fine (both ToT and a nightly build). Is there some special option that I need to enable to see the issue? 666096 10 mitz 2012-07-10 15:11:27 -0700 (In reply to comment #9) > (In reply to comment #8) > > (From update of attachment 149953 [details] [details]) > > With the patch applied, I hit ASSERTION FAILED: isSelfPaintingLayer() || hasSelfPaintingLayerDescendant() in RenderLayer.cpp:2995 as soon as I open the test case or cause a <textarea> to have a scroll bar. > > That's because I forgot to update this ASSERT. I got my hand on a Lion machine and unfortunately the test case seemed to work fine (both ToT and a nightly build). Is there some special option that I need to enable to see the issue? You need to have overlay scrollbars enabled. In System Preferences > General, select “Show scrollbars: When scrolling”. 666223 11 149953 jchaffraix 2012-07-10 18:10:46 -0700 Comment on attachment 149953 Proposed blind fix, would appreciate if someone could test it on Lion. > You need to have overlay scrollbars enabled. In System Preferences > General, select “Show scrollbars: When scrolling”. Terrific Dan, that did the trick! I have understood the regression and will upload a fix shortly. 666239 12 151569 jchaffraix 2012-07-10 18:30:29 -0700 Created attachment 151569 Proposed fix 1: Make RenderLayer with overlay scrollbars self-painting. 666243 13 151569 simon.fraser 2012-07-10 18:33:32 -0700 Comment on attachment 151569 Proposed fix 1: Make RenderLayer with overlay scrollbars self-painting. Why is this specific to overlay scrollbars? 666248 14 jchaffraix 2012-07-10 18:43:48 -0700 (In reply to comment #13) > (From update of attachment 151569 [details]) > Why is this specific to overlay scrollbars? Non-overlay scrollbars are painted by their renderer as part of the regular paint() code path (see RenderBlock::paint). Overlay scrollbars are treated differently and painted in a follow-up phase in FrameView::paintContents. The RenderLayer code also has this distinction: we don't call paintOverflowControl in paintLayer if we don't have overlay scrollbars. 666298 15 151569 simon.fraser 2012-07-10 20:55:35 -0700 Comment on attachment 151569 Proposed fix 1: Make RenderLayer with overlay scrollbars self-painting. View in context: https://bugs.webkit.org/attachment.cgi?id=151569&action=review > Source/WebCore/ChangeLog:11 > + After r120395 (follow-up of r116203), we ignore subtree that have no self-painting layers for subtrees (plural)? 666793 16 151569 jchaffraix 2012-07-11 09:20:39 -0700 Comment on attachment 151569 Proposed fix 1: Make RenderLayer with overlay scrollbars self-painting. View in context: https://bugs.webkit.org/attachment.cgi?id=151569&action=review >> Source/WebCore/ChangeLog:11 >> + After r120395 (follow-up of r116203), we ignore subtree that have no self-painting layers for > > subtrees (plural)? You are right, we may skip several subtrees. 666797 17 151716 jchaffraix 2012-07-11 09:21:52 -0700 Created attachment 151716 Patch for landing 666871 18 151716 webkit.review.bot 2012-07-11 10:51:10 -0700 Comment on attachment 151716 Patch for landing Clearing flags on attachment: 151716 Committed r122342: <http://trac.webkit.org/changeset/122342> 666872 19 webkit.review.bot 2012-07-11 10:51:15 -0700 All reviewed patches have been landed. Closing bug. 149953 2012-06-28 07:28:09 -0700 2012-07-10 18:30:24 -0700 Proposed blind fix, would appreciate if someone could test it on Lion. bug-90052-20120628072809.patch text/plain 2289 jchaffraix U3VidmVyc2lvbiBSZXZpc2lvbjogMTIxMzU0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzI4NzEzZWZlZjZhYTkx Mzc1OWRmMWI2YzVmZmEwZDI0Njk3MzNjZS4uOTMxMjI5ZmFmY2Q3NjEwMTNhOWQxMmU5NDAxZDg1 Y2E1NjMwODQyOCAxMDA3NTUKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDEyLTA2LTI4ICBKdWxp ZW4gQ2hhZmZyYWl4ICA8amNoYWZmcmFpeEB3ZWJraXQub3JnPgorCisgICAgICAgIFJFR1JFU1NJ T04gKHIxMTYyMDMpOiBvdmVyZmxvdyBzZWN0aW9ucyBkb27igJl0IGhhdmUgc2Nyb2xsYmFycwor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTAwNTIKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBObyB0ZXN0IGFz IEkgZG9uJ3QgdGhpbmsgd2UgaGF2ZSBhIHdheSBvZiBleGVyY2l6aW5nIHRoaXMgY29kZSBpbiBE dW1wUmVuZGVyVHJlZS4KKworICAgICAgICBUaGlzIGlzIGEgYmxpbmQgZml4IGZvciBvdmVybGF5 IHNjcm9sbGJhcnMgYWZ0ZXIgcjExNjIwMy4gVGhlIG9wdGltaXphdGlvbiB3aGVyZQorICAgICAg ICB3ZSBkb24ndCB3YWxrIG5vbi1zZWxmLXBhaW50aW5nIHN1YnRyZWVzIGRvZXNuJ3Qgd29yayB3 aGVuIHBhaW50aW5nIG92ZXJsYXkgc2Nyb2xsYmFycworICAgICAgICBhcyB0aGlzIGNvZGUgZXhw ZWN0IHRoZSBSZW5kZXJMYXllcnMgdG8gcGFpbnQgdGhlIG92ZXJmbG93IGNvbnRyb2xzIChzZWUg UmVuZGVyTGF5ZXI6OnBhaW50TGF5ZXJDb250ZW50KS4KKworICAgICAgICAqIHJlbmRlcmluZy9S ZW5kZXJMYXllci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllcjo6cGFpbnRMYXll cik6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllcjo6cGFpbnRMaXN0KToKKyAgICAgICAg RGlzYWJsZSB0aGUgb3B0aW1pemF0aW9uIGlmIHdlIGFyZSBwYWludGluZyBvdmVybGF5IHNjcm9s bGJhcnMuCisKIDIwMTItMDYtMjcgIEFuZHJlaSBPbmVhICA8b25lYUBhZG9iZS5jb20+CiAKICAg ICAgICAgW0NTU1JlZ2lvbnNdQ2hhbmdlIGRpc3BsYXkgdmFsdWVzIHRoYXQgYWxsb3cgcmVnaW9u cwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcCBi L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAKaW5kZXggMTJjM2I5MjY3 MTY5Mzc0MDY2ZTBiMmU0OWY5MmIwZDYwMjQ5YzI4Zi4uNTE0ZmFkZTJhZWFkMmMzZmI4MDRmMDRh NDRjOGVmMjI0MjQ5ZDgxMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlckxheWVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIu Y3BwCkBAIC0yOTIyLDcgKzI5MjIsNyBAQCB2b2lkIFJlbmRlckxheWVyOjpwYWludExheWVyKFJl bmRlckxheWVyKiByb290TGF5ZXIsIEdyYXBoaWNzQ29udGV4dCogY29udGV4dCwKICNlbmRpZgog CiAgICAgLy8gTm9uIHNlbGYtcGFpbnRpbmcgbGVhZiBsYXllcnMgZG9uJ3QgbmVlZCB0byBiZSBw YWludGVkIGFzIHRoZWlyIHJlbmRlcmVyKCkgc2hvdWxkIHByb3Blcmx5IHBhaW50IGl0c2VsZi4K LSAgICBpZiAoIWlzU2VsZlBhaW50aW5nTGF5ZXIoKSAmJiAhaGFzU2VsZlBhaW50aW5nTGF5ZXJE ZXNjZW5kYW50KCkpCisgICAgaWYgKCEocGFpbnRGbGFncyAmIFBhaW50TGF5ZXJQYWludGluZ092 ZXJsYXlTY3JvbGxiYXJzKSAmJiAhaXNTZWxmUGFpbnRpbmdMYXllcigpICYmICFoYXNTZWxmUGFp bnRpbmdMYXllckRlc2NlbmRhbnQoKSkKICAgICAgICAgcmV0dXJuOwogCiAgICAgaWYgKHNob3Vs ZFN1cHByZXNzUGFpbnRpbmdMYXllcih0aGlzKSkKQEAgLTMyMDksNyArMzIwOSw3IEBAIHZvaWQg UmVuZGVyTGF5ZXI6OnBhaW50TGlzdChWZWN0b3I8UmVuZGVyTGF5ZXIqPiogbGlzdCwgUmVuZGVy TGF5ZXIqIHJvb3RMYXllciwKICAgICBpZiAoIWxpc3QpCiAgICAgICAgIHJldHVybjsKIAotICAg IGlmICghaGFzU2VsZlBhaW50aW5nTGF5ZXJEZXNjZW5kYW50KCkpCisgICAgaWYgKCEocGFpbnRG bGFncyAmIFBhaW50TGF5ZXJQYWludGluZ092ZXJsYXlTY3JvbGxiYXJzKSAmJiAhaGFzU2VsZlBh aW50aW5nTGF5ZXJEZXNjZW5kYW50KCkpCiAgICAgICAgIHJldHVybjsKIAogI2lmICFBU1NFUlRf RElTQUJMRUQK 151569 2012-07-10 18:30:29 -0700 2012-07-11 09:21:47 -0700 Proposed fix 1: Make RenderLayer with overlay scrollbars self-painting. bug-90052-20120710183028.patch text/plain 4583 jchaffraix U3VidmVyc2lvbiBSZXZpc2lvbjogMTIyMjY0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODFmN2I0NzE4OWFlYjg0 MGYyNmYyOTJmOTZhNTdkN2ZhODUzYjcxZi4uMWQzZGQzOTY3NGZjNjRlODQwZGE5YmVjZmQ4YzU4 NTk5MGY4NTAyYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM5IEBACisyMDEyLTA3LTEwICBKdWxp ZW4gQ2hhZmZyYWl4ICA8amNoYWZmcmFpeEB3ZWJraXQub3JnPgorCisgICAgICAgIFJFR1JFU1NJ T04gKHIxMTYyMDMpOiBvdmVyZmxvdyBzZWN0aW9ucyBkb24ndCBoYXZlIHNjcm9sbGJhcnMKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTkwMDUyCisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhpcyBpc3N1ZSBz dGVtcyBmcm9tIFJlbmRlckxheWVycyB3aXRoIG92ZXJsYXkgc2Nyb2xsYmFycyBub3QgYmVpbmcg Y29uc2lkZXJlZAorICAgICAgICBzZWxmLXBhaW50aW5nLgorCisgICAgICAgIEFmdGVyIHIxMjAz OTUgKGZvbGxvdy11cCBvZiByMTE2MjAzKSwgd2UgaWdub3JlIHN1YnRyZWUgdGhhdCBoYXZlIG5v IHNlbGYtcGFpbnRpbmcgbGF5ZXJzIGZvcgorICAgICAgICBwYWludGluZy4gTm9ybWFsIHNjcm9s bGJhcnMgYXJlIHBhaW50ZWQgYnkgdGhlaXIgcmVuZGVyZXIgc28gdGhleSB3ZXJlIHByb3Blcmx5 IHBhaW50ZWQuIEhvd2V2ZXIKKyAgICAgICAgb3ZlcmxheSBzY3JvbGxiYXJzIG5lZWRzIHRvIGJl IHBhaW50ZWQgYnkgdGhlIFJlbmRlckxheWVyIGFzIGEgc2VwYXJhdGUgcGhhc2UgKHNlZSBidWcg NTcwNTcpIHNvCisgICAgICAgIHRoZXkgd2VyZSBub3QgcGFpbnRlZCBhbnltb3JlLiBUaGUgZml4 IGlzIHNpbXBsZTogbWFrZSBSZW5kZXJMYXllciB3aXRoIG92ZXJsYXkgc2Nyb2xsYmFycworICAg ICAgICBzZWxmLXBhaW50aW5nIGFzIHRoZXkgc2hvdWxkIGhhdmUgYmVlbiBpbiB0aGUgZmlyc3Qg cGxhY2UuCisKKyAgICAgICAgVW5mb3J0dW5hdGVseSBubyB0ZXN0cyBhcyBJIGRvbid0IHRoaW5r IHdlIGhhdmUgYSBnb29kIHdheSBvZiB0ZXN0aW5nIG92ZXJsYXkKKyAgICAgICAgc2Nyb2xsYmFy cy4gVGVzdGVkIG1hbnVhbGx5IHRob3VnaCBvbiB0aGUgc3VwZXIgc2ltcGxlIHRlc3QgY2FzZSBm cm9tIHRoZSBidWcuCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXI6OnNob3VsZEJlU2VsZlBhaW50aW5nTGF5ZXIpOgor ICAgICAgICBPdmVybGF5IHNjcm9sbGJhcnMgbWFrZSB0aGUgbGF5ZXIgc2VsZi1wYWludGluZy4K KworICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXI6OnVwZGF0ZVNjcm9sbGJhcnNBZnRlckxh eW91dCk6CisgICAgICAgIEFkZGVkIGEgY2FsbCB0byB1cGRhdGVTZWxmUGFpbnRpbmdMYXllci4K KworICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXI6OnN0eWxlQ2hhbmdlZCk6CisgICAgICAg IE1vdmVkIHRoZSBjYWxsIHRvIHVwZGF0ZVNlbGZQYWludGluZ0xheWVyIGFmdGVyIHJlY29tcHV0 aW5nIHRoZSBzY3JvbGxiYXJzIHRvIGVuc3VyZSBwcm9wZXIgYmVoYXZpb3IuCisgICAgICAgIEFk ZGVkIGEgY29tbWVudCB1bmRlcmxpbmluZyB0aGUgcmVhc29uLgorCisgICAgICAgIChXZWJDb3Jl OjpSZW5kZXJMYXllcjo6dXBkYXRlU2VsZlBhaW50aW5nTGF5ZXIpOgorICAgICAgICBSZW5hbWVk IGFzIGl0IGlzIG5vdyBjYWxsZWQgZHVyaW5nIGxheW91dCB0b28uCisKKyAgICAgICAgKiByZW5k ZXJpbmcvUmVuZGVyTGF5ZXIuaDoKKyAgICAgICAgKFJlbmRlckxheWVyKTogVXBkYXRlZCBhZnRl ciB1cGRhdGVTZWxmUGFpbnRpbmdMYXllciByZW5hbWUuCisKIDIwMTItMDctMTAgIE9qYW4gVmFm YWkgIDxvamFuQGNocm9taXVtLm9yZz4KIAogICAgICAgICBBZGQgc3VwcG9ydCBmb3IgbWluLWhl aWdodDphdXRvIGFuZCBtaW4td2lkdGg6YXV0bwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJMYXllci5jcHAKaW5kZXggMTI3OTRjYjQ2NDc5YTQ3MmM5YjIyNGNjMTRlMjFkODUxYTQ0OWZh Ni4uMzFiZTJlOGEzMzAyMTM4Njc5MGUwYzQzNmVjODkxMzk4MDY1MmIwZCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwCkBAIC0yNTM0LDYgKzI1MzQsOCBAQCB2b2lk IFJlbmRlckxheWVyOjp1cGRhdGVTY3JvbGxiYXJzQWZ0ZXJMYXlvdXQoKQogICAgICAgICBpZiAo Ym94LT5oYXNBdXRvVmVydGljYWxTY3JvbGxiYXIoKSkKICAgICAgICAgICAgIHNldEhhc1ZlcnRp Y2FsU2Nyb2xsYmFyKGhhc1ZlcnRpY2FsT3ZlcmZsb3cpOwogCisgICAgICAgIHVwZGF0ZVNlbGZQ YWludGluZ0xheWVyKCk7CisKICNpZiBFTkFCTEUoREFTSEJPQVJEX1NVUFBPUlQpCiAgICAgICAg IC8vIEZvcmNlIGFuIHVwZGF0ZSBzaW5jZSB3ZSBrbm93IHRoZSBzY3JvbGxiYXJzIGhhdmUgY2hh bmdlZCB0aGluZ3MuCiAgICAgICAgIGlmIChyZW5kZXJlcigpLT5kb2N1bWVudCgpLT5oYXNEYXNo Ym9hcmRSZWdpb25zKCkpCkBAIC00NzQwLDYgKzQ3NDIsNyBAQCBib29sIFJlbmRlckxheWVyOjpz aG91bGRCZU5vcm1hbEZsb3dPbmx5KCkgY29uc3QKIGJvb2wgUmVuZGVyTGF5ZXI6OnNob3VsZEJl U2VsZlBhaW50aW5nTGF5ZXIoKSBjb25zdAogewogICAgIHJldHVybiAhaXNOb3JtYWxGbG93T25s eSgpCisgICAgICAgIHx8IGhhc092ZXJsYXlTY3JvbGxiYXJzKCkKICAgICAgICAgfHwgcmVuZGVy ZXIoKS0+aGFzUmVmbGVjdGlvbigpCiAgICAgICAgIHx8IHJlbmRlcmVyKCktPmhhc01hc2soKQog ICAgICAgICB8fCByZW5kZXJlcigpLT5pc1RhYmxlUm93KCkKQEAgLTQ3NTAsNyArNDc1Myw3IEBA IGJvb2wgUmVuZGVyTGF5ZXI6OnNob3VsZEJlU2VsZlBhaW50aW5nTGF5ZXIoKSBjb25zdAogICAg ICAgICB8fCByZW5kZXJlcigpLT5pc1JlbmRlcklGcmFtZSgpOwogfQogCi12b2lkIFJlbmRlckxh eWVyOjp1cGRhdGVTZWxmUGFpbnRpbmdMYXllckFmdGVyU3R5bGVDaGFuZ2UoY29uc3QgUmVuZGVy U3R5bGUqKQordm9pZCBSZW5kZXJMYXllcjo6dXBkYXRlU2VsZlBhaW50aW5nTGF5ZXIoKQogewog ICAgIGJvb2wgaXNTZWxmUGFpbnRpbmdMYXllciA9IHNob3VsZEJlU2VsZlBhaW50aW5nTGF5ZXIo KTsKICAgICBpZiAobV9pc1NlbGZQYWludGluZ0xheWVyID09IGlzU2VsZlBhaW50aW5nTGF5ZXIp CkBAIC00ODQ1LDkgKzQ4NDgsMTEgQEAgdm9pZCBSZW5kZXJMYXllcjo6c3R5bGVDaGFuZ2VkKFN0 eWxlRGlmZmVyZW5jZSwgY29uc3QgUmVuZGVyU3R5bGUqIG9sZFN0eWxlKQogICAgICAgICBtX21h cnF1ZWUgPSAwOwogICAgIH0KIAotICAgIHVwZGF0ZVNlbGZQYWludGluZ0xheWVyQWZ0ZXJTdHls ZUNoYW5nZShvbGRTdHlsZSk7CiAgICAgdXBkYXRlU3RhY2tpbmdDb250ZXh0c0FmdGVyU3R5bGVD aGFuZ2Uob2xkU3R5bGUpOwogICAgIHVwZGF0ZVNjcm9sbGJhcnNBZnRlclN0eWxlQ2hhbmdlKG9s ZFN0eWxlKTsKKyAgICAvLyBPdmVybGF5IHNjcm9sbGJhcnMgY2FuIG1ha2UgdGhpcyBsYXllciBz ZWxmLXBhaW50aW5nIHNvIHdlIG5lZWQKKyAgICAvLyB0byByZWNvbXB1dGUgdGhlIGJpdCBvbmNl IHNjcm9sbGJhcnMgaGF2ZSBiZWVuIHVwZGF0ZWQuCisgICAgdXBkYXRlU2VsZlBhaW50aW5nTGF5 ZXIoKTsKIAogICAgIGlmICghaGFzUmVmbGVjdGlvbigpICYmIG1fcmVmbGVjdGlvbikKICAgICAg ICAgcmVtb3ZlUmVmbGVjdGlvbigpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlckxheWVyLmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIu aAppbmRleCAxYzMyYTRmODllMjI2MTM1YmE0ZjgwOGZiZGRhNmY2MzZmMTVhNmM2Li5iOWRjNWQ3 YzdjYzZkMzIwYWZlNTdjNDcxNzBmMzk1NTgxMmVlMGJiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyTGF5ZXIuaApAQCAtNjc5LDcgKzY3OSw3IEBAIHByaXZhdGU6CiAKICAgICBib29s IHNob3VsZFJlcGFpbnRBZnRlckxheW91dCgpIGNvbnN0OwogCi0gICAgdm9pZCB1cGRhdGVTZWxm UGFpbnRpbmdMYXllckFmdGVyU3R5bGVDaGFuZ2UoY29uc3QgUmVuZGVyU3R5bGUqIG9sZFN0eWxl KTsKKyAgICB2b2lkIHVwZGF0ZVNlbGZQYWludGluZ0xheWVyKCk7CiAgICAgdm9pZCB1cGRhdGVT dGFja2luZ0NvbnRleHRzQWZ0ZXJTdHlsZUNoYW5nZShjb25zdCBSZW5kZXJTdHlsZSogb2xkU3R5 bGUpOwogCiAgICAgdm9pZCB1cGRhdGVTY3JvbGxiYXJzQWZ0ZXJTdHlsZUNoYW5nZShjb25zdCBS ZW5kZXJTdHlsZSogb2xkU3R5bGUpOwo= 151716 2012-07-11 09:21:52 -0700 2012-07-11 10:51:10 -0700 Patch for landing bug-90052-20120711092151.patch text/plain 4623 jchaffraix U3VidmVyc2lvbiBSZXZpc2lvbjogMTIyMzM1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDEzYWRlNTk0OTg1MmVl NDk5YTFjMDdjOThiZTZjNTZjODJhNGU1Yy4uZjVhNDEwNjRiNDMxOWIxZGZiYjRlN2VjYzM5ZmI1 ZmE0NmZiNjkzYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM5IEBACisyMDEyLTA3LTExICBKdWxp ZW4gQ2hhZmZyYWl4ICA8amNoYWZmcmFpeEB3ZWJraXQub3JnPgorCisgICAgICAgIFJFR1JFU1NJ T04gKHIxMTYyMDMpOiBvdmVyZmxvdyBzZWN0aW9ucyBkb24ndCBoYXZlIHNjcm9sbGJhcnMKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTkwMDUyCisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgU2ltb24gRnJhc2VyLgorCisgICAgICAgIFRoaXMgaXNzdWUgc3Rl bXMgZnJvbSBSZW5kZXJMYXllcnMgd2l0aCBvdmVybGF5IHNjcm9sbGJhcnMgbm90IGJlaW5nIGNv bnNpZGVyZWQKKyAgICAgICAgc2VsZi1wYWludGluZy4KKworICAgICAgICBBZnRlciByMTIwMzk1 IChmb2xsb3ctdXAgb2YgcjExNjIwMyksIHdlIGlnbm9yZSBzdWJ0cmVlcyB0aGF0IGhhdmUgbm8g c2VsZi1wYWludGluZyBsYXllciBmb3IKKyAgICAgICAgcGFpbnRpbmcuIE5vcm1hbCBzY3JvbGxi YXJzIGFyZSBwYWludGVkIGJ5IHRoZWlyIHJlbmRlcmVyIHNvIHRoZXkgd2VyZSBwcm9wZXJseSBw YWludGVkLiBIb3dldmVyCisgICAgICAgIG92ZXJsYXkgc2Nyb2xsYmFycyBuZWVkIHRvIGJlIHBh aW50ZWQgYnkgdGhlaXIgUmVuZGVyTGF5ZXIgYXMgYSBzZXBhcmF0ZSBwaGFzZSAoc2VlIGJ1ZyA1 NzA1Nykgc28KKyAgICAgICAgdGhleSB3ZXJlIG5vdCBwYWludGVkIGFueW1vcmUuIFRoZSBmaXgg aXMgc2ltcGxlOiBtYWtlIFJlbmRlckxheWVyIHdpdGggb3ZlcmxheSBzY3JvbGxiYXJzCisgICAg ICAgIHNlbGYtcGFpbnRpbmcgYXMgdGhleSBzaG91bGQgaGF2ZSBiZWVuIGluIHRoZSBmaXJzdCBw bGFjZS4KKworICAgICAgICBVbmZvcnR1bmF0ZWx5IG5vIHRlc3RzIGFzIEkgZG9uJ3QgdGhpbmsg d2UgaGF2ZSBhIGdvb2Qgd2F5IG9mIHRlc3Rpbmcgb3ZlcmxheQorICAgICAgICBzY3JvbGxiYXJz LiBUZXN0ZWQgbWFudWFsbHkgdGhvdWdoIG9uIHRoZSBzdXBlciBzaW1wbGUgdGVzdCBjYXNlIGZy b20gdGhlIGJ1Zy4KKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJMYXllci5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpSZW5kZXJMYXllcjo6c2hvdWxkQmVTZWxmUGFpbnRpbmdMYXllcik6Cisg ICAgICAgIE92ZXJsYXkgc2Nyb2xsYmFycyBtYWtlIHRoZSBsYXllciBzZWxmLXBhaW50aW5nLgor CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllcjo6dXBkYXRlU2Nyb2xsYmFyc0FmdGVyTGF5 b3V0KToKKyAgICAgICAgQWRkZWQgYSBjYWxsIHRvIHVwZGF0ZVNlbGZQYWludGluZ0xheWVyLgor CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllcjo6c3R5bGVDaGFuZ2VkKToKKyAgICAgICAg TW92ZWQgdGhlIGNhbGwgdG8gdXBkYXRlU2VsZlBhaW50aW5nTGF5ZXIgYWZ0ZXIgcmVjb21wdXRp bmcgdGhlIHNjcm9sbGJhcnMgdG8gZW5zdXJlIHByb3BlciBiZWhhdmlvci4KKyAgICAgICAgQWRk ZWQgYSBjb21tZW50IHVuZGVybGluaW5nIHRoZSByZWFzb24uCisKKyAgICAgICAgKFdlYkNvcmU6 OlJlbmRlckxheWVyOjp1cGRhdGVTZWxmUGFpbnRpbmdMYXllcik6CisgICAgICAgIFJlbmFtZWQg YXMgaXQgaXMgbm93IGNhbGxlZCBkdXJpbmcgbGF5b3V0IHRvby4KKworICAgICAgICAqIHJlbmRl cmluZy9SZW5kZXJMYXllci5oOgorICAgICAgICAoUmVuZGVyTGF5ZXIpOiBVcGRhdGVkIGFmdGVy IHVwZGF0ZVNlbGZQYWludGluZ0xheWVyIHJlbmFtZS4KKwogMjAxMi0wNy0xMSAgSm9zaHVhIE5l dHRlcmZpZWxkICA8am5ldHRlcmZpZWxkQHJpbS5jb20+CiAKICAgICAgICAgW1F0XSBSRUdSRVNT SU9OKHIxMjIyNTApOiBJdCBicm9rZSBVU0UoM0RfR1JBUEhJQ1MpPTEgYW5kIEVOQUJMRShXRUJH TCk9MCBidWlsZHMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJM YXllci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwCmluZGV4 IDEyNzk0Y2I0NjQ3OWE0NzJjOWIyMjRjYzE0ZTIxZDg1MWE0NDlmYTYuLjMxYmUyZThhMzMwMjEz ODY3OTBlMGM0MzZlYzg5MTM5ODA2NTJiMGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJMYXllci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlckxheWVyLmNwcApAQCAtMjUzNCw2ICsyNTM0LDggQEAgdm9pZCBSZW5kZXJMYXllcjo6dXBk YXRlU2Nyb2xsYmFyc0FmdGVyTGF5b3V0KCkKICAgICAgICAgaWYgKGJveC0+aGFzQXV0b1ZlcnRp Y2FsU2Nyb2xsYmFyKCkpCiAgICAgICAgICAgICBzZXRIYXNWZXJ0aWNhbFNjcm9sbGJhcihoYXNW ZXJ0aWNhbE92ZXJmbG93KTsKIAorICAgICAgICB1cGRhdGVTZWxmUGFpbnRpbmdMYXllcigpOwor CiAjaWYgRU5BQkxFKERBU0hCT0FSRF9TVVBQT1JUKQogICAgICAgICAvLyBGb3JjZSBhbiB1cGRh dGUgc2luY2Ugd2Uga25vdyB0aGUgc2Nyb2xsYmFycyBoYXZlIGNoYW5nZWQgdGhpbmdzLgogICAg ICAgICBpZiAocmVuZGVyZXIoKS0+ZG9jdW1lbnQoKS0+aGFzRGFzaGJvYXJkUmVnaW9ucygpKQpA QCAtNDc0MCw2ICs0NzQyLDcgQEAgYm9vbCBSZW5kZXJMYXllcjo6c2hvdWxkQmVOb3JtYWxGbG93 T25seSgpIGNvbnN0CiBib29sIFJlbmRlckxheWVyOjpzaG91bGRCZVNlbGZQYWludGluZ0xheWVy KCkgY29uc3QKIHsKICAgICByZXR1cm4gIWlzTm9ybWFsRmxvd09ubHkoKQorICAgICAgICB8fCBo YXNPdmVybGF5U2Nyb2xsYmFycygpCiAgICAgICAgIHx8IHJlbmRlcmVyKCktPmhhc1JlZmxlY3Rp b24oKQogICAgICAgICB8fCByZW5kZXJlcigpLT5oYXNNYXNrKCkKICAgICAgICAgfHwgcmVuZGVy ZXIoKS0+aXNUYWJsZVJvdygpCkBAIC00NzUwLDcgKzQ3NTMsNyBAQCBib29sIFJlbmRlckxheWVy OjpzaG91bGRCZVNlbGZQYWludGluZ0xheWVyKCkgY29uc3QKICAgICAgICAgfHwgcmVuZGVyZXIo KS0+aXNSZW5kZXJJRnJhbWUoKTsKIH0KIAotdm9pZCBSZW5kZXJMYXllcjo6dXBkYXRlU2VsZlBh aW50aW5nTGF5ZXJBZnRlclN0eWxlQ2hhbmdlKGNvbnN0IFJlbmRlclN0eWxlKikKK3ZvaWQgUmVu ZGVyTGF5ZXI6OnVwZGF0ZVNlbGZQYWludGluZ0xheWVyKCkKIHsKICAgICBib29sIGlzU2VsZlBh aW50aW5nTGF5ZXIgPSBzaG91bGRCZVNlbGZQYWludGluZ0xheWVyKCk7CiAgICAgaWYgKG1faXNT ZWxmUGFpbnRpbmdMYXllciA9PSBpc1NlbGZQYWludGluZ0xheWVyKQpAQCAtNDg0NSw5ICs0ODQ4 LDExIEBAIHZvaWQgUmVuZGVyTGF5ZXI6OnN0eWxlQ2hhbmdlZChTdHlsZURpZmZlcmVuY2UsIGNv bnN0IFJlbmRlclN0eWxlKiBvbGRTdHlsZSkKICAgICAgICAgbV9tYXJxdWVlID0gMDsKICAgICB9 CiAKLSAgICB1cGRhdGVTZWxmUGFpbnRpbmdMYXllckFmdGVyU3R5bGVDaGFuZ2Uob2xkU3R5bGUp OwogICAgIHVwZGF0ZVN0YWNraW5nQ29udGV4dHNBZnRlclN0eWxlQ2hhbmdlKG9sZFN0eWxlKTsK ICAgICB1cGRhdGVTY3JvbGxiYXJzQWZ0ZXJTdHlsZUNoYW5nZShvbGRTdHlsZSk7CisgICAgLy8g T3ZlcmxheSBzY3JvbGxiYXJzIGNhbiBtYWtlIHRoaXMgbGF5ZXIgc2VsZi1wYWludGluZyBzbyB3 ZSBuZWVkCisgICAgLy8gdG8gcmVjb21wdXRlIHRoZSBiaXQgb25jZSBzY3JvbGxiYXJzIGhhdmUg YmVlbiB1cGRhdGVkLgorICAgIHVwZGF0ZVNlbGZQYWludGluZ0xheWVyKCk7CiAKICAgICBpZiAo IWhhc1JlZmxlY3Rpb24oKSAmJiBtX3JlZmxlY3Rpb24pCiAgICAgICAgIHJlbW92ZVJlZmxlY3Rp b24oKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5o IGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmgKaW5kZXggMWMzMmE0Zjg5 ZTIyNjEzNWJhNGY4MDhmYmRkYTZmNjM2ZjE1YTZjNi4uYjlkYzVkN2M3Y2M2ZDMyMGFmZTU3YzQ3 MTcwZjM5NTU4MTJlZTBiYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlckxheWVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmgK QEAgLTY3OSw3ICs2NzksNyBAQCBwcml2YXRlOgogCiAgICAgYm9vbCBzaG91bGRSZXBhaW50QWZ0 ZXJMYXlvdXQoKSBjb25zdDsKIAotICAgIHZvaWQgdXBkYXRlU2VsZlBhaW50aW5nTGF5ZXJBZnRl clN0eWxlQ2hhbmdlKGNvbnN0IFJlbmRlclN0eWxlKiBvbGRTdHlsZSk7CisgICAgdm9pZCB1cGRh dGVTZWxmUGFpbnRpbmdMYXllcigpOwogICAgIHZvaWQgdXBkYXRlU3RhY2tpbmdDb250ZXh0c0Fm dGVyU3R5bGVDaGFuZ2UoY29uc3QgUmVuZGVyU3R5bGUqIG9sZFN0eWxlKTsKIAogICAgIHZvaWQg dXBkYXRlU2Nyb2xsYmFyc0FmdGVyU3R5bGVDaGFuZ2UoY29uc3QgUmVuZGVyU3R5bGUqIG9sZFN0 eWxlKTsK