80641 2012-03-08 14:34:13 -0800 REGRESSION (r93614): scrolling div does not repaint 2012-03-12 07:01:51 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 80833 1 shawnsingh shawnsingh adele ap danakj jchaffraix simon.fraser webkit.review.bot oldest_to_newest 574221 0 shawnsingh 2012-03-08 14:34:13 -0800 I believe it is a simple fix, but Julien should be able to make the "correct final fix" far more quickly and with awareness of the performance issues involved. cc Dana just in case this is magically related to our other bugs where paint rects seem wrong, too. To reproduce the problem: go to http://www.railgun3d.com:8080/gltest5/demo.htm (requires webGL) scrolling the div does not repaint the divs contents. If you cannot reproduce: go to inspector turn off "position: absolute" for the 200x200 div that has the scrollbar turn it back on. now it should reliably reproduce. The problem is that the repaint rect associated with the 200x200 div is not re-computed, and therefore its position is way off to the side. I bisected this down to 93614. Hacked solution: forcing computeRepaintRects() in all cases for RenderLayer::updateLayerPositionsAfterScroll does indeed fix the problem. 574441 1 shawnsingh 2012-03-08 17:57:15 -0800 To save time for Julien, he essentially told me the correct fix (and it seems to work); I'll create a reduced test case, verify the fix, and upload a patch. Thanks Julien! 574556 2 simon.fraser 2012-03-08 20:42:42 -0800 http://trac.webkit.org/changeset/93614 575203 3 shawnsingh 2012-03-09 14:05:27 -0800 Update - our expected fix was not yet correct. Needs further investigation, there seem to be enough clues to continue investigating. 575462 4 shawnsingh 2012-03-10 00:15:40 -0800 I've traced through the problem, and I have it figured out. Patch is coming in a moment. 1. At first, there is a non-composited layer which paints into an ancestor repaintContainer. because it is positioned, the repaintRect has a non-zero offset. 2. Then, the layer changes position, and becomes composited. At that time, we are not updating the repaintRect. (The code in FrameView::layout() calls updateLayerPositions() where repaintRects are already computed, before updateCompositingLayers().) 3. However, because the layer became composited, it became its own repaintContainer, and the repaintRect should have been updated. But its not, and the repaint rect is skewed by some incorrect offset, and the actual contents don't get repainted. I feel it is correct to computeRepaintRects when a newly composited layer is created. Specifically, we have to wait until the backing is created before we can computeRepaintRects correctly. 575464 5 131162 shawnsingh 2012-03-10 00:24:22 -0800 Created attachment 131162 Patch The included layout test reproduces the problem on both webkit nightly and tip-of-tree chromium before this patch is applied. 575803 6 131162 simon.fraser 2012-03-11 11:28:45 -0700 Comment on attachment 131162 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=131162&action=review > LayoutTests/compositing/repaint/newly-composited-repaint-rect.html:67 > + if (window.layoutTestController) layoutTestController.display(); Use two lines for this. 575835 7 131258 shawnsingh 2012-03-11 14:56:51 -0700 Created attachment 131258 Patch for landing 575837 8 131258 webkit.review.bot 2012-03-11 15:17:54 -0700 Comment on attachment 131258 Patch for landing Clearing flags on attachment: 131258 Committed r110401: <http://trac.webkit.org/changeset/110401> 575838 9 webkit.review.bot 2012-03-11 15:17:59 -0700 All reviewed patches have been landed. Closing bug. 131162 2012-03-10 00:24:22 -0800 2012-03-11 14:56:36 -0700 Patch bug-80641-20120310002421.patch text/plain 6954 shawnsingh U3VidmVyc2lvbiBSZXZpc2lvbjogMTEwMjQwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODhiZDNhOWU0NDM2ZDc0 MGNiMWY0NTdiNGYyNTdmMGE5MzkxMjA0My4uYzhmNzhlZGYwNjFhNzNmOGY5NGU4OWQ0NGFiZDRk MjJjZDNhODlhZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDEyLTAzLTEwICBTaGF3 biBTaW5naCAgPHNoYXduc2luZ2hAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJFR1JFU1NJT04g KHI5MzYxNCk6IHNjcm9sbGluZyBkaXYgZG9lcyBub3QgcmVwYWludAorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODA2NDEKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUZXN0OiBjb21wb3NpdGluZy9yZXBhaW50 L25ld2x5LWNvbXBvc2l0ZWQtcmVwYWludC1yZWN0Lmh0bWwKKworICAgICAgICAqIHJlbmRlcmlu Zy9SZW5kZXJMYXllckNvbXBvc2l0b3IuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5 ZXJDb21wb3NpdG9yOjp1cGRhdGVCYWNraW5nKTogV2hlbiBhIGxheWVyCisgICAgICAgIGJlY29t ZXMgbmV3bHkgY29tcG9zaXRlZCBhbmQgY3JlYXRlcyBpdHMgYmFja2luZywgdGhlIHJlcGFpbnRS ZWN0CisgICAgICAgIG1heSBiZWNvbWUgaW52YWxpZC4gVGhpcyBwYXRjaCByZWNvbXB1dGVzIHJl cGFpbnRSZWN0cyBpbiB0aGlzCisgICAgICAgIGNhc2UuCisKIDIwMTItMDMtMDggIFJ5b3N1a2Ug Tml3YSAgPHJuaXdhQHdlYmtpdC5vcmc+CiAKICAgICAgICAgTWFjIGJ1aWxkIGZpeCBmb3IgbWlj cm8gZGF0YSBBUEkuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy TGF5ZXJDb21wb3NpdG9yLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXll ckNvbXBvc2l0b3IuY3BwCmluZGV4IDc5NzViYzU3ZjE1ODMwNWFiZmEwOGFmM2FkOWY2NDc3NzIx NjFkNGIuLmRiY2JmMjE1ODkzNmI1ZTJhYTk2ZjkxMzMzMjdmN2QyOTE2MTllYjggMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuY3BwCkBA IC00MTcsNiArNDE3LDExIEBAIGJvb2wgUmVuZGVyTGF5ZXJDb21wb3NpdG9yOjp1cGRhdGVCYWNr aW5nKFJlbmRlckxheWVyKiBsYXllciwgQ29tcG9zaXRpbmdDaGFuZ2VSCiAKICAgICAgICAgICAg IGxheWVyLT5lbnN1cmVCYWNraW5nKCk7CiAKKyAgICAgICAgICAgIC8vIFRoZSBSZW5kZXJMYXll cidzIG5lZWRzIHRvIHVwZGF0ZSByZXBhaW50IHJlY3RzIGhlcmUsIGJlY2F1c2UgdGhlIHRhcmdl dAorICAgICAgICAgICAgLy8gcmVwYWludENvbnRhaW5lciBtYXkgaGF2ZSBjaGFuZ2VkIGFmdGVy IGJlY29taW5nIGEgY29tcG9zaXRlZCBsYXllci4KKyAgICAgICAgICAgIC8vIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04MDY0MQorICAgICAgICAgICAgbGF5ZXItPmNv bXB1dGVSZXBhaW50UmVjdHMoKTsKKwogI2lmIFBMQVRGT1JNKE1BQykgJiYgVVNFKENBKQogICAg ICAgICAgICAgU2V0dGluZ3MqIHNldHRpbmdzID0gbV9yZW5kZXJWaWV3LT5kb2N1bWVudCgpLT5z ZXR0aW5ncygpOwogICAgICAgICAgICAgaWYgKHNldHRpbmdzICYmIHNldHRpbmdzLT5hY2NlbGVy YXRlZERyYXdpbmdFbmFibGVkKCkpCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cg Yi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggNjk1NGE0MjEzMzFkMjE1NTJkYTgxMzk2OWYy OWIwY2Y0ZWY2NDNkNS4uZjljMTkwNTgzYTk3NWNkNzJkNWFlZGE0NzlhNDRlZGY2YzYzNGIzYyAx MDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5n ZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDEyLTAzLTEwICBTaGF3biBTaW5naCAgPHNoYXduc2lu Z2hAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJFR1JFU1NJT04gKHI5MzYxNCk6IHNjcm9sbGlu ZyBkaXYgZG9lcyBub3QgcmVwYWludAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9ODA2NDEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICAqIGNvbXBvc2l0aW5nL3JlcGFpbnQvbmV3bHktY29tcG9zaXRlZC1yZXBh aW50LXJlY3QtZXhwZWN0ZWQucG5nOiBBZGRlZC4KKyAgICAgICAgKiBjb21wb3NpdGluZy9yZXBh aW50L25ld2x5LWNvbXBvc2l0ZWQtcmVwYWludC1yZWN0LWV4cGVjdGVkLnR4dDogQWRkZWQuCisg ICAgICAgICogY29tcG9zaXRpbmcvcmVwYWludC9uZXdseS1jb21wb3NpdGVkLXJlcGFpbnQtcmVj dC5odG1sOiBBZGRlZC4KKwogMjAxMi0wMy0wOCAgUm9iZXJ0IEtyb2VnZXIgIDxyamtyb2VnZUBj aHJvbWl1bS5vcmc+CiAKICAgICAgICAgW2Nocm9taXVtXSBtb3JlIGNvbXByZWhlbnNpdmUgdGVz dHMgZm9yIGdlc3R1cmUgc2Nyb2xsaW5nCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9jb21wb3Np dGluZy9yZXBhaW50L25ld2x5LWNvbXBvc2l0ZWQtcmVwYWludC1yZWN0LWV4cGVjdGVkLnBuZyBi L0xheW91dFRlc3RzL2NvbXBvc2l0aW5nL3JlcGFpbnQvbmV3bHktY29tcG9zaXRlZC1yZXBhaW50 LXJlY3QtZXhwZWN0ZWQucG5nCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjU5YTdkZTAzOWYwYTVkNzk5OTM3OGU0OGVi NGQ4Mzc5MWU1MmY4Y2EKR0lUIGJpbmFyeSBwYXRjaApsaXRlcmFsIDMzODYKemNtZUFTQE4/KG9s SHlgdVZCcSFpYTB5fnlVeyt2WVYyYT5pMUIlUWxZYnBSem5rQjlnQ0NNNDckPVN1RnhlVW9rCnoy MVk2NyR0SjAwWHtrbzNOayZGU21TIWV+TXk4M3ppSFhTdU4jXlltQUkldlVjK1BtYklFR1pyZDMk JGI/cUxUSgp6Uj55ZTxfcjE3d043Q0Jib2xscG1YXitXP25MaytteEV5QE5EcGg9TEMoc2ZXeUt7 Q3hZNm18ZjY5WXBFM2tMKGsKejFWSUdgMV8hcVdwcnxCNUZ0VDUrJEZSJSNmelkzfGQ8K01ZI1JN MV82cEQ4PXtQfVFOQDZXaik0dSVnaCsmSn1PCnpIRT5XMSZpd2pAYENlKkc/YEhvVWJOJnxCfEo7 MGcrdXJ2O0ZZNnM8IVhIZTcrRSstP0lpJWVnZEVUeiFmQTs8Rgp6KTlyV1gtdX0oVSRuZH5PMlYw dEBuPHBpVSY7OSZ4UH4hOV5vem4tNmNiTUs2V0B2YUc7bFJNcSg4SXZVeitsQTAKeiFvWUJYMURK ZGlsdCVeZTJnc1c5Yn40Ri1wMnsqWDlOLTBxO0YqVV5NJGRLTDBTbHdOMUVZQ3c3IXxSQHI3KXNm CndBdjA9RzFGI2VyTypYak9Ycm4xKUc9JlZLPUlKd09QamtmJFlxbjNUMF9KLUxQZ2cmZWJ4c0xR MEdnQXstdjlzcgoKbGl0ZXJhbCAwCkhjbVY/ZDAwMDAxCgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVz dHMvY29tcG9zaXRpbmcvcmVwYWludC9uZXdseS1jb21wb3NpdGVkLXJlcGFpbnQtcmVjdC1leHBl Y3RlZC50eHQgYi9MYXlvdXRUZXN0cy9jb21wb3NpdGluZy9yZXBhaW50L25ld2x5LWNvbXBvc2l0 ZWQtcmVwYWludC1yZWN0LWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi44YjEzNzg5MTc5MWZlOTY5 MjdhZDc4ZTY0YjBhYWQ3YmRlZDA4YmRjCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMv Y29tcG9zaXRpbmcvcmVwYWludC9uZXdseS1jb21wb3NpdGVkLXJlcGFpbnQtcmVjdC1leHBlY3Rl ZC50eHQKQEAgLTAsMCArMSBAQAorCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9jb21wb3NpdGlu Zy9yZXBhaW50L25ld2x5LWNvbXBvc2l0ZWQtcmVwYWludC1yZWN0Lmh0bWwgYi9MYXlvdXRUZXN0 cy9jb21wb3NpdGluZy9yZXBhaW50L25ld2x5LWNvbXBvc2l0ZWQtcmVwYWludC1yZWN0Lmh0bWwK bmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMC4uYzQ3YmZkYThjMGFlNDg4YjNmNjFlM2ExMDAyMGY3NjZmM2Y2ZDI1ZgotLS0g L2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2NvbXBvc2l0aW5nL3JlcGFpbnQvbmV3bHktY29t cG9zaXRlZC1yZXBhaW50LXJlY3QuaHRtbApAQCAtMCwwICsxLDg2IEBACis8IURPQ1RZUEUgaHRt bD4KKzxodG1sPgorPGhlYWQ+CisgIDwhLS0gVGhpcyB0ZXN0IGNhc2UgcmVwcm9kdWNlcyBhIGJ1 ZyB0aGF0IGlzIGhvcGVmdWxseSBzb2x2ZWQgYnkgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTgwNjQxCisKKyAgICAgICBJbiB0aGUgYnVnLCBhIGRpdiBlbGVtZW50IGJl Z2lucyBhcyBub24tY29tcG9zaXRlZCwgYW5kIHRoZSByZXBhaW50UmVjdCBoYWQgYQorICAgICAg IGNvcnJlY3Qgbm9uLXplcm8gb2Zmc2V0IGJlY2F1c2UgaXQgcGFpbnRzIGludG8gYW4gYW5jZXN0 b3IgY29udGFpbmVyLiBMYXRlciwgdGhlCisgICAgICAgbGF5ZXIgYmVjb21lcyBjb21wb3NpdGVk IChpbiB0aGlzIGNhc2UsIGJlY2F1c2UgdGhlIGxheWVyIGlzIG1vdmVkIHRvIG92ZXJsYXAKKyAg ICAgICBhbm90aGVyIGNvbXBvc2l0ZWQgbGF5ZXIpLiBCZWNhdXNlIHRoZSBsYXllciBpcyBub3cg Y29tcG9zaXRlZCwgdGhlIHJlcGFpbnRSZWN0CisgICAgICAgc2hvdWxkIGhhdmUgYmVlbiByZWNv bXB1dGVkIC0gaW4gcGFydGljdWxhciwgdGhlIG9mZnNldCBvZiB0aGUgcmVwYWludFJlY3Qgc2hv dWxkCisgICAgICAgYmVjb21lIHplcm8gYmVjYXVzZSBpdCBpcyBub3cgaXRzIG93biByZXBhaW50 IGNvbnRhaW5lci4KKworICAgICAgIFRoZXJlZm9yZSwgYWZ0ZXIgdGhlIGxheWVyIGJlY2FtZSBj b21wb3NpdGVkLCBpdCB3YXMgdXNpbmcgdGhlIHdyb25nIHJlcGFpbnQgcmVjdCwKKyAgICAgICB3 aGljaCBjYXVzZWQgdGhpbmdzIG5vdCB0byByZXBhaW50IHByb3Blcmx5LgorICAgIC0tPgorCisg IDxzdHlsZSB0eXBlPSJ0ZXh0L2NzcyI+CisgICAgICAuY29tcG9zaXRlZCB7CisgICAgICAgICAg LXdlYmtpdC10cmFuc2Zvcm06IHRyYW5zbGF0ZXooMCk7CisgICAgICAgICAgYm9yZGVyOiAycHgg c29saWQgYmxhY2s7CisgICAgICB9CisKKyAgICAgIC5ib3ggeworICAgICAgICAgIHdpZHRoOiAy MDBweDsKKyAgICAgICAgICBoZWlnaHQ6IDIwMHB4OworICAgICAgfQorCisgICAgICAjc2Nyb2xs ZGl2IHsKKyAgICAgICAgICBwb3NpdGlvbjogYWJzb2x1dGU7CisgICAgICAgICAgd2lkdGg6IDEw MHB4OworICAgICAgICAgIGhlaWdodDogMTAwcHg7CisgICAgICAgICAgbGVmdDogMjUwcHg7Cisg ICAgICAgICAgdG9wOiA1MHB4OworICAgICAgICAgIG92ZXJmbG93LXg6IGhpZGRlbjsKKyAgICAg ICAgICBvdmVyZmxvdy15OiBzY3JvbGw7CisgICAgICB9CisKKyAgICAgIC5zaG91bGROb3RCZVNl ZW4geworICAgICAgICAgIGJhY2tncm91bmQtY29sb3I6IHJlZDsKKyAgICAgIH0KKworICAgICAg LnNob3VsZEJlU2VlbiB7CisgICAgICAgICAgYmFja2dyb3VuZC1jb2xvcjogZ3JlZW47CisgICAg ICB9CisgIDwvc3R5bGU+CisKKzwvaGVhZD4KKworPHNjcmlwdCBzcmM9Ii4uLy4uL2Zhc3QvcmVw YWludC9yZXNvdXJjZXMvcmVwYWludC5qcyI+PC9zY3JpcHQ+CisKKzxzY3JpcHQ+CisgICAgaWYg KHdpbmRvdy5sYXlvdXRUZXN0Q29udHJvbGxlcikgeworICAgICAgICBsYXlvdXRUZXN0Q29udHJv bGxlci5kdW1wQXNUZXh0KHRydWUpOworICAgICAgICBsYXlvdXRUZXN0Q29udHJvbGxlci53YWl0 VW50aWxEb25lKCk7CisgICAgfQorCisgICAgZnVuY3Rpb24gY2hhbmdlRGl2UG9zaXRpb24oKSB7 CisgICAgICAgIGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJzY3JvbGxkaXYiKS5zdHlsZS5sZWZ0 PSI1MHB4IjsKKyAgICB9CisKKyAgICBmdW5jdGlvbiByZXBhaW50VGVzdCgpIHsKKyAgICAgICAg Ly8gQ2hhbmdpbmcgdGhlIHBvc2l0aW9uIHdpbGwgY2F1c2UgdGhlIHNjcm9sbGRpdiB0byBiZWNv bWUgY29tcG9zaXRlZCBiZWN1YXNlIGl0IG92ZXJsYXBzIGFub3RoZXIgY29tcG9zdGllZCBlbGVt ZW50LgorICAgICAgICBjaGFuZ2VEaXZQb3NpdGlvbigpOworCisgICAgICAgIC8vIEZvcmNlIER1 bXBSZW5kZXJUcmVlIHRvIGRvIGEgbGF5b3V0IGFuZCByZXBhaW50IGhlcmUsIHRoaXMgaXMgd2hl cmUgdGhlIHJlcGFpbnRSZWN0CisgICAgICAgIC8vIGdvZXMgd3JvbmcgYmVjYXVzZSBpdCBkb2Vz IG5vdCBnZXQgdXBkYXRlZCBmb3IgYSBuZXdseSBjb21wb3NpdGVkIGVsZW1lbnQuCisgICAgICAg IGlmICh3aW5kb3cubGF5b3V0VGVzdENvbnRyb2xsZXIpIGxheW91dFRlc3RDb250cm9sbGVyLmRp c3BsYXkoKTsKKworICAgICAgICB3aW5kb3cuc2V0VGltZW91dChmdW5jdGlvbigpIHsKKyAgICAg ICAgICAgIC8vIFNjcm9sbGluZyBhIGxpdHRsZSB3aWxsIGRlbW9uc3RyYXRlIHdoZXRoZXIgdGhl IHJlcGFpbnQgcmVjdCBpcyBjb3JyZWN0IG9yIG5vdC4KKyAgICAgICAgICAgIGRvY3VtZW50Lmdl dEVsZW1lbnRCeUlkKCdzY3JvbGxkaXYnKS5zY3JvbGxUb3AgPSA1MDA7CisgICAgICAgICAgICBs YXlvdXRUZXN0Q29udHJvbGxlci5ub3RpZnlEb25lKCk7CisgICAgICAgIH0sIDApOworICAgIH0K KworPC9zY3JpcHQ+CisKKzxib2R5IG9ubG9hZD0icnVuUmVwYWludFRlc3QoKSI+CisgIDxkaXYg Y2xhc3M9ImNvbXBvc2l0ZWQgYm94Ij48L2Rpdj4KKyAgPGRpdiBpZD0ic2Nyb2xsZGl2Ij4KKyAg ICA8ZGl2IGNsYXNzPSJzaG91bGROb3RCZVNlZW4gYm94Ij48L2Rpdj4KKyAgICA8ZGl2IGNsYXNz PSJzaG91bGRCZVNlZW4gYm94Ij48L2Rpdj4KKyAgPC9kaXY+Cis8L2JvZHk+CisKKzwvaHRtbD4K 131258 2012-03-11 14:56:51 -0700 2012-03-11 15:17:54 -0700 Patch for landing bug-80641-20120311145650.patch text/plain 6963 shawnsingh U3VidmVyc2lvbiBSZXZpc2lvbjogMTEwMzk5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzFkYWZmNDA4ZTM0ZWU5 M2RiMTNhMWFmNzY4OGY4NjNmNzI2YTRjMi4uNmIyZThkNmFlMGQ5ZDVlYjUwMDExMDE2OWU2OTE4 ZjY5YTg2YTAyNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDEyLTAzLTExICBTaGF3 biBTaW5naCAgPHNoYXduc2luZ2hAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJFR1JFU1NJT04g KHI5MzYxNCk6IHNjcm9sbGluZyBkaXYgZG9lcyBub3QgcmVwYWludAorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODA2NDEKKworICAgICAgICBSZXZpZXdl ZCBieSBTaW1vbiBGcmFzZXIuCisKKyAgICAgICAgVGVzdDogY29tcG9zaXRpbmcvcmVwYWludC9u ZXdseS1jb21wb3NpdGVkLXJlcGFpbnQtcmVjdC5odG1sCisKKyAgICAgICAgKiByZW5kZXJpbmcv UmVuZGVyTGF5ZXJDb21wb3NpdG9yLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVy Q29tcG9zaXRvcjo6dXBkYXRlQmFja2luZyk6IFdoZW4gYSBsYXllcgorICAgICAgICBiZWNvbWVz IG5ld2x5IGNvbXBvc2l0ZWQgYW5kIGNyZWF0ZXMgaXRzIGJhY2tpbmcsIHRoZSByZXBhaW50UmVj dAorICAgICAgICBtYXkgYmVjb21lIGludmFsaWQuIFRoaXMgcGF0Y2ggcmVjb21wdXRlcyByZXBh aW50UmVjdHMgaW4gdGhpcworICAgICAgICBjYXNlLgorCiAyMDEyLTAzLTExICBHZW9yZ2UgU3Rh aWtvcyAgPHN0YWlrb3NAd2Via2l0Lm9yZz4KIAogICAgICAgICBFbmFibGUgSlBFRyBlbmNvZGlu ZyBmb3IgQmxhY2tCZXJyeS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJMYXllckNvbXBvc2l0b3IuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl ckxheWVyQ29tcG9zaXRvci5jcHAKaW5kZXggNzk3NWJjNTdmMTU4MzA1YWJmYTA4YWYzYWQ5ZjY0 Nzc3MjE2MWQ0Yi4uZGJjYmYyMTU4OTM2YjVlMmFhOTZmOTEzMzMyN2Y3ZDI5MTYxOWViOCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5j cHAKQEAgLTQxNyw2ICs0MTcsMTEgQEAgYm9vbCBSZW5kZXJMYXllckNvbXBvc2l0b3I6OnVwZGF0 ZUJhY2tpbmcoUmVuZGVyTGF5ZXIqIGxheWVyLCBDb21wb3NpdGluZ0NoYW5nZVIKIAogICAgICAg ICAgICAgbGF5ZXItPmVuc3VyZUJhY2tpbmcoKTsKIAorICAgICAgICAgICAgLy8gVGhlIFJlbmRl ckxheWVyJ3MgbmVlZHMgdG8gdXBkYXRlIHJlcGFpbnQgcmVjdHMgaGVyZSwgYmVjYXVzZSB0aGUg dGFyZ2V0CisgICAgICAgICAgICAvLyByZXBhaW50Q29udGFpbmVyIG1heSBoYXZlIGNoYW5nZWQg YWZ0ZXIgYmVjb21pbmcgYSBjb21wb3NpdGVkIGxheWVyLgorICAgICAgICAgICAgLy8gaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTgwNjQxCisgICAgICAgICAgICBsYXll ci0+Y29tcHV0ZVJlcGFpbnRSZWN0cygpOworCiAjaWYgUExBVEZPUk0oTUFDKSAmJiBVU0UoQ0Ep CiAgICAgICAgICAgICBTZXR0aW5ncyogc2V0dGluZ3MgPSBtX3JlbmRlclZpZXctPmRvY3VtZW50 KCktPnNldHRpbmdzKCk7CiAgICAgICAgICAgICBpZiAoc2V0dGluZ3MgJiYgc2V0dGluZ3MtPmFj Y2VsZXJhdGVkRHJhd2luZ0VuYWJsZWQoKSkKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCBlNjI3MWNhODkwYjRhNGY2ZWRiMjVi MDlmOGQwODE3OTM3OWUwMmQxLi4wYjI5YTFjNzE3NjI4ZjQ4ZTZmOWVmOWU1NGI2MTMwMDgyMThl N2QwIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTItMDMtMTEgIFNoYXduIFNpbmdoICA8c2hh d25zaW5naEBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUkVHUkVTU0lPTiAocjkzNjE0KTogc2Ny b2xsaW5nIGRpdiBkb2VzIG5vdCByZXBhaW50CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD04MDY0MQorCisgICAgICAgIFJldmlld2VkIGJ5IFNpbW9uIEZy YXNlci4KKworICAgICAgICAqIGNvbXBvc2l0aW5nL3JlcGFpbnQvbmV3bHktY29tcG9zaXRlZC1y ZXBhaW50LXJlY3QtZXhwZWN0ZWQucG5nOiBBZGRlZC4KKyAgICAgICAgKiBjb21wb3NpdGluZy9y ZXBhaW50L25ld2x5LWNvbXBvc2l0ZWQtcmVwYWludC1yZWN0LWV4cGVjdGVkLnR4dDogQWRkZWQu CisgICAgICAgICogY29tcG9zaXRpbmcvcmVwYWludC9uZXdseS1jb21wb3NpdGVkLXJlcGFpbnQt cmVjdC5odG1sOiBBZGRlZC4KKwogMjAxMi0wMy0xMSAgR2F2aW4gQmFycmFjbG91Z2ggIDxiYXJy YWNsb3VnaEBhcHBsZS5jb20+CiAKICAgICAgICAgSW5jb25zaXN0ZW50IFN5bnRheEVycm9yIGZy b20gbmV3IEZ1bmN0aW9uKC4uLikKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2NvbXBvc2l0aW5n L3JlcGFpbnQvbmV3bHktY29tcG9zaXRlZC1yZXBhaW50LXJlY3QtZXhwZWN0ZWQucG5nIGIvTGF5 b3V0VGVzdHMvY29tcG9zaXRpbmcvcmVwYWludC9uZXdseS1jb21wb3NpdGVkLXJlcGFpbnQtcmVj dC1leHBlY3RlZC5wbmcKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uNTlhN2RlMDM5ZjBhNWQ3OTk5Mzc4ZTQ4ZWI0ZDgz NzkxZTUyZjhjYQpHSVQgYmluYXJ5IHBhdGNoCmxpdGVyYWwgMzM4Ngp6Y21lQVNATj8ob2xIeWB1 VkJxIWlhMHl+eVV7K3ZZVjJhPmkxQiVRbFlicFJ6bmtCOWdDQ000NyQ9U3VGeGVVb2sKejIxWTY3 JHRKMDBYe2tvM05rJkZTbVMhZX5NeTgzemlIWFN1TiNeWW1BSSV2VWMrUG1iSUVHWnJkMyQkYj9x TFRKCnpSPnllPF9yMTd3TjdDQmJvbGxwbVheK1c/bkxrK214RXlATkRwaD1MQyhzZld5S3tDeFk2 bXxmNjlZcEUza0woawp6MVZJR2AxXyFxV3ByfEI1RnRUNSskRlIlI2Z6WTN8ZDwrTVkjUk0xXzZw RDg9e1B9UU5ANldqKTR1JWdoKyZKfU8KekhFPlcxJml3akBgQ2UqRz9gSG9VYk4mfEJ8SjswZyt1 cnY7Rlk2czwhWEhlNytFKy0/SWklZWdkRVR6IWZBOzxGCnopOXJXWC11fShVJG5kfk8yVjB0QG48 cGlVJjs5JnhQfiE5Xm96bi02Y2JNSzZXQHZhRztsUk1xKDhJdlV6K2xBMAp6IW9ZQlgxREpkaWx0 JV5lMmdzVzlifjRGLXAyeypYOU4tMHE7RipVXk0kZEtMMFNsd04xRVlDdzchfFJAcjcpc2YKd0F2 MD1HMUYjZXJPKlhqT1hybjEpRz0mVks9SUp3T1Bqa2YkWXFuM1QwX0otTFBnZyZlYnhzTFEwR2dB ey12OXNyCgpsaXRlcmFsIDAKSGNtVj9kMDAwMDEKCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9j b21wb3NpdGluZy9yZXBhaW50L25ld2x5LWNvbXBvc2l0ZWQtcmVwYWludC1yZWN0LWV4cGVjdGVk LnR4dCBiL0xheW91dFRlc3RzL2NvbXBvc2l0aW5nL3JlcGFpbnQvbmV3bHktY29tcG9zaXRlZC1y ZXBhaW50LXJlY3QtZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjhiMTM3ODkxNzkxZmU5NjkyN2Fk NzhlNjRiMGFhZDdiZGVkMDhiZGMKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9jb21w b3NpdGluZy9yZXBhaW50L25ld2x5LWNvbXBvc2l0ZWQtcmVwYWludC1yZWN0LWV4cGVjdGVkLnR4 dApAQCAtMCwwICsxIEBACisKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2NvbXBvc2l0aW5nL3Jl cGFpbnQvbmV3bHktY29tcG9zaXRlZC1yZXBhaW50LXJlY3QuaHRtbCBiL0xheW91dFRlc3RzL2Nv bXBvc2l0aW5nL3JlcGFpbnQvbmV3bHktY29tcG9zaXRlZC1yZXBhaW50LXJlY3QuaHRtbApuZXcg ZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwLi5lZjMyNzUwMTE5NjI0ZTliZTUyOTEzZTQwNWJhMmUzZTgxMDBjOGI3Ci0tLSAvZGV2 L251bGwKKysrIGIvTGF5b3V0VGVzdHMvY29tcG9zaXRpbmcvcmVwYWludC9uZXdseS1jb21wb3Np dGVkLXJlcGFpbnQtcmVjdC5odG1sCkBAIC0wLDAgKzEsODcgQEAKKzwhRE9DVFlQRSBodG1sPgor PGh0bWw+Cis8aGVhZD4KKyAgPCEtLSBUaGlzIHRlc3QgY2FzZSByZXByb2R1Y2VzIGEgYnVnIHRo YXQgaXMgaG9wZWZ1bGx5IHNvbHZlZCBieSBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9ODA2NDEKKworICAgICAgIEluIHRoZSBidWcsIGEgZGl2IGVsZW1lbnQgYmVnaW5z IGFzIG5vbi1jb21wb3NpdGVkLCBhbmQgdGhlIHJlcGFpbnRSZWN0IGhhZCBhCisgICAgICAgY29y cmVjdCBub24temVybyBvZmZzZXQgYmVjYXVzZSBpdCBwYWludHMgaW50byBhbiBhbmNlc3RvciBj b250YWluZXIuIExhdGVyLCB0aGUKKyAgICAgICBsYXllciBiZWNvbWVzIGNvbXBvc2l0ZWQgKGlu IHRoaXMgY2FzZSwgYmVjYXVzZSB0aGUgbGF5ZXIgaXMgbW92ZWQgdG8gb3ZlcmxhcAorICAgICAg IGFub3RoZXIgY29tcG9zaXRlZCBsYXllcikuIEJlY2F1c2UgdGhlIGxheWVyIGlzIG5vdyBjb21w b3NpdGVkLCB0aGUgcmVwYWludFJlY3QKKyAgICAgICBzaG91bGQgaGF2ZSBiZWVuIHJlY29tcHV0 ZWQgLSBpbiBwYXJ0aWN1bGFyLCB0aGUgb2Zmc2V0IG9mIHRoZSByZXBhaW50UmVjdCBzaG91bGQK KyAgICAgICBiZWNvbWUgemVybyBiZWNhdXNlIGl0IGlzIG5vdyBpdHMgb3duIHJlcGFpbnQgY29u dGFpbmVyLgorCisgICAgICAgVGhlcmVmb3JlLCBhZnRlciB0aGUgbGF5ZXIgYmVjYW1lIGNvbXBv c2l0ZWQsIGl0IHdhcyB1c2luZyB0aGUgd3JvbmcgcmVwYWludCByZWN0LAorICAgICAgIHdoaWNo IGNhdXNlZCB0aGluZ3Mgbm90IHRvIHJlcGFpbnQgcHJvcGVybHkuCisgICAgLS0+CisKKyAgPHN0 eWxlIHR5cGU9InRleHQvY3NzIj4KKyAgICAgIC5jb21wb3NpdGVkIHsKKyAgICAgICAgICAtd2Vi a2l0LXRyYW5zZm9ybTogdHJhbnNsYXRleigwKTsKKyAgICAgICAgICBib3JkZXI6IDJweCBzb2xp ZCBibGFjazsKKyAgICAgIH0KKworICAgICAgLmJveCB7CisgICAgICAgICAgd2lkdGg6IDIwMHB4 OworICAgICAgICAgIGhlaWdodDogMjAwcHg7CisgICAgICB9CisKKyAgICAgICNzY3JvbGxkaXYg eworICAgICAgICAgIHBvc2l0aW9uOiBhYnNvbHV0ZTsKKyAgICAgICAgICB3aWR0aDogMTAwcHg7 CisgICAgICAgICAgaGVpZ2h0OiAxMDBweDsKKyAgICAgICAgICBsZWZ0OiAyNTBweDsKKyAgICAg ICAgICB0b3A6IDUwcHg7CisgICAgICAgICAgb3ZlcmZsb3cteDogaGlkZGVuOworICAgICAgICAg IG92ZXJmbG93LXk6IHNjcm9sbDsKKyAgICAgIH0KKworICAgICAgLnNob3VsZE5vdEJlU2VlbiB7 CisgICAgICAgICAgYmFja2dyb3VuZC1jb2xvcjogcmVkOworICAgICAgfQorCisgICAgICAuc2hv dWxkQmVTZWVuIHsKKyAgICAgICAgICBiYWNrZ3JvdW5kLWNvbG9yOiBncmVlbjsKKyAgICAgIH0K KyAgPC9zdHlsZT4KKworPC9oZWFkPgorCis8c2NyaXB0IHNyYz0iLi4vLi4vZmFzdC9yZXBhaW50 L3Jlc291cmNlcy9yZXBhaW50LmpzIj48L3NjcmlwdD4KKworPHNjcmlwdD4KKyAgICBpZiAod2lu ZG93LmxheW91dFRlc3RDb250cm9sbGVyKSB7CisgICAgICAgIGxheW91dFRlc3RDb250cm9sbGVy LmR1bXBBc1RleHQodHJ1ZSk7CisgICAgICAgIGxheW91dFRlc3RDb250cm9sbGVyLndhaXRVbnRp bERvbmUoKTsKKyAgICB9CisKKyAgICBmdW5jdGlvbiBjaGFuZ2VEaXZQb3NpdGlvbigpIHsKKyAg ICAgICAgZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoInNjcm9sbGRpdiIpLnN0eWxlLmxlZnQ9IjUw cHgiOworICAgIH0KKworICAgIGZ1bmN0aW9uIHJlcGFpbnRUZXN0KCkgeworICAgICAgICAvLyBD aGFuZ2luZyB0aGUgcG9zaXRpb24gd2lsbCBjYXVzZSB0aGUgc2Nyb2xsZGl2IHRvIGJlY29tZSBj b21wb3NpdGVkIGJlY3Vhc2UgaXQgb3ZlcmxhcHMgYW5vdGhlciBjb21wb3N0aWVkIGVsZW1lbnQu CisgICAgICAgIGNoYW5nZURpdlBvc2l0aW9uKCk7CisKKyAgICAgICAgLy8gRm9yY2UgRHVtcFJl bmRlclRyZWUgdG8gZG8gYSBsYXlvdXQgYW5kIHJlcGFpbnQgaGVyZSwgdGhpcyBpcyB3aGVyZSB0 aGUgcmVwYWludFJlY3QKKyAgICAgICAgLy8gZ29lcyB3cm9uZyBiZWNhdXNlIGl0IGRvZXMgbm90 IGdldCB1cGRhdGVkIGZvciBhIG5ld2x5IGNvbXBvc2l0ZWQgZWxlbWVudC4KKyAgICAgICAgaWYg KHdpbmRvdy5sYXlvdXRUZXN0Q29udHJvbGxlcikKKyAgICAgICAgICAgIGxheW91dFRlc3RDb250 cm9sbGVyLmRpc3BsYXkoKTsKKworICAgICAgICB3aW5kb3cuc2V0VGltZW91dChmdW5jdGlvbigp IHsKKyAgICAgICAgICAgIC8vIFNjcm9sbGluZyBhIGxpdHRsZSB3aWxsIGRlbW9uc3RyYXRlIHdo ZXRoZXIgdGhlIHJlcGFpbnQgcmVjdCBpcyBjb3JyZWN0IG9yIG5vdC4KKyAgICAgICAgICAgIGRv Y3VtZW50LmdldEVsZW1lbnRCeUlkKCdzY3JvbGxkaXYnKS5zY3JvbGxUb3AgPSA1MDA7CisgICAg ICAgICAgICBsYXlvdXRUZXN0Q29udHJvbGxlci5ub3RpZnlEb25lKCk7CisgICAgICAgIH0sIDAp OworICAgIH0KKworPC9zY3JpcHQ+CisKKzxib2R5IG9ubG9hZD0icnVuUmVwYWludFRlc3QoKSI+ CisgIDxkaXYgY2xhc3M9ImNvbXBvc2l0ZWQgYm94Ij48L2Rpdj4KKyAgPGRpdiBpZD0ic2Nyb2xs ZGl2Ij4KKyAgICA8ZGl2IGNsYXNzPSJzaG91bGROb3RCZVNlZW4gYm94Ij48L2Rpdj4KKyAgICA8 ZGl2IGNsYXNzPSJzaG91bGRCZVNlZW4gYm94Ij48L2Rpdj4KKyAgPC9kaXY+Cis8L2JvZHk+CisK KzwvaHRtbD4K