23090 2009-01-03 10:49:24 -0800 Redraw issue with width and opacity change 2009-01-04 10:40:06 -0800 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Mac OS X 10.5 RESOLVED FIXED P2 Normal --- 1 simon.fraser simon.fraser hyatt mitz oldest_to_newest 104240 0 simon.fraser 2009-01-03 10:49:24 -0800 The attached testcase shows that a block with width and opacity changing at the same time shows a redraw issue which leaves an area where the element used to be un-repainted. 104241 1 26392 simon.fraser 2009-01-03 10:50:44 -0800 Created attachment 26392 Testcase 104242 2 simon.fraser 2009-01-03 10:51:48 -0800 Seems to be an issue only when the element toggles between having a layer (opacity < 1) and no layer (opacity == 1). 104248 3 26393 simon.fraser 2009-01-03 12:20:06 -0800 Created attachment 26393 Patch, testcase, changelog 104271 4 26393 darin 2009-01-03 18:39:53 -0800 Comment on attachment 26393 Patch, testcase, changelog > + } else if (m_style->hasTransform() != newStyle->hasTransform() || > + m_style->hasOpacity() != newStyle->hasOpacity()) { > + // If we don't have a layer yet, but we are going to get one because of a transform or opacity change, then > // we need to repaint the old position of the object The comment is right, but the code is wrong. This will decide to repaint something that already has a layer if its opacity is going to change. Can we do a better check that gets this right? We want to repaint if "gets own layer" is going to change, so that's what we should be checking. 104272 5 simon.fraser 2009-01-03 19:03:11 -0800 (In reply to comment #4) > (From update of attachment 26393 [review]) > > + } else if (m_style->hasTransform() != newStyle->hasTransform() || > > + m_style->hasOpacity() != newStyle->hasOpacity()) { > > + // If we don't have a layer yet, but we are going to get one because of a transform or opacity change, then > > // we need to repaint the old position of the object > > The comment is right, but the code is wrong. This will decide to repaint > something that already has a layer if its opacity is going to change. Can we do > a better check that gets this right? We want to repaint if "gets own layer" is > going to change, so that's what we should be checking. This is in a !hasLayer() clause, so it will actually do the right thing. However, I will tidy up the logic. 104275 6 26400 simon.fraser 2009-01-03 19:11:16 -0800 Created attachment 26400 Improved patch 104298 7 26400 darin 2009-01-03 20:44:11 -0800 Comment on attachment 26400 Improved patch > + bool hasOpacity() const { return rareNonInheritedData->opacity < 1; } I'm not a huge fan of this name for the function. What this function means is that you have non-standard opacity, non-opaque opacity. It says nothing about whether you have any CSS opacity rules, for example. You could have one saying opacity: 1. But the real problem is it doesn't make sense to say that a fully opaque object with an opacity of "1" does not have opacity. I'd suggest just saying opacity() < 1 at the call site, or coming up with a better name for this helper function. r=me with or without a change to that 104361 8 simon.fraser 2009-01-04 10:40:06 -0800 I changed it to test opacity() < 1 at the call site. Committing to http://svn.webkit.org/repository/webkit/trunk ... M LayoutTests/ChangeLog A LayoutTests/fast/repaint/create-layer-repaint.html A LayoutTests/platform/mac/fast/repaint/create-layer-repaint-expected.checksum A LayoutTests/platform/mac/fast/repaint/create-layer-repaint-expected.png A LayoutTests/platform/mac/fast/repaint/create-layer-repaint-expected.txt M WebCore/ChangeLog M WebCore/rendering/RenderObject.cpp Committed r39588 26392 2009-01-03 10:50:44 -0800 2009-01-03 10:50:44 -0800 Testcase transition-test.html text/html 732 simon.fraser PCFET0NUWVBFIGh0bWwgUFVCTElDICItLy9XM0MvL0RURCBYSFRNTCAxLjAgU3RyaWN0Ly9FTiIK ICAiaHR0cDovL3d3dy53My5vcmcvVFIveGh0bWwxL0RURC94aHRtbDEtc3RyaWN0LmR0ZCI+Cjxo dG1sPgo8aGVhZD4KICA8bWV0YSBodHRwLWVxdWl2PSJDb250ZW50LXR5cGUiIGNvbnRlbnQ9InRl eHQvaHRtbDsgY2hhcnNldD11dGYtOCI+CiAgPHRpdGxlPkNTUyBUcmFuc2l0aW9uIHRlc3QgY2Fz ZTwvdGl0bGU+CiAgPHN0eWxlIHR5cGU9InRleHQvY3NzIiBtZWRpYT0ic2NyZWVuIj4KICAgIC5z dHJldGNoeSB7CiAgICAgIGJhY2tncm91bmQ6IGJsdWU7CiAgICAgIG9wYWNpdHk6IC42NjY7CiAg ICAgIGhlaWdodDogNTBweDsKICAgICAgd2lkdGg6IDIzMnB4OwogICAgICBtYXJnaW46IDIwcHg7 CiAgICB9CiAgICAKICAgIC5zdHJldGNoeTpob3ZlciB7CiAgICAgIG9wYWNpdHk6IDE7CiAgICAg IHdpZHRoOiA1MDBweDsKICAgIH0KICAgIAogIDwvc3R5bGU+CjwvaGVhZD4KCjxib2R5PgogIDxw PkhvdmVyIG92ZXIgdGhlIGJsdWUgYm94LCB0aGVuIHVuaG92ZXIuPC9wPgogIDxkaXYgY2xhc3M9 InN0cmV0Y2h5Ij48L2Rpdj4KCiAgPHA+V2l0aCB0cmFuc2l0aW9uOjwvcD4KICA8ZGl2IGNsYXNz PSJzdHJldGNoeSIgc3R5bGU9Ii13ZWJraXQtdHJhbnNpdGlvbjogb3BhY2l0eSAuNXMgZWFzZS1v dXQsIHdpZHRoIC41cyBlYXNlLW91dDsiPjwvZGl2Pgo8L2JvZHk+Cgo8L2h0bWw+ 26393 2009-01-03 12:20:06 -0800 2009-01-03 19:11:16 -0800 Patch, testcase, changelog 23090_patch.txt text/plain 6219 simon.fraser ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCAyOGMyMDlhLi40ODE3NWU3IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMDktMDEt MDMgIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTIzMDkwCisgICAgICAgIAorICAgICAgICBSZXBhaW50IHRlc3Qg Zm9yIHJlcGFpbnRpbmcgd2hlbiBhbiBlbGVtZW50IGdldHMgc21hbGxlciwKKyAgICAgICAgYW5k IGdhaW5zIGEgUmVuZGVyTGF5ZXIgYXQgdGhlIHNhbWUgdGltZS4KKyAgICAgICAgCisgICAgICAg ICogZmFzdC9yZXBhaW50L3dpZHRoLWxheWVyLWNoYW5nZS5odG1sOiBBZGRlZC4KKyAgICAgICAg KiBwbGF0Zm9ybS9tYWMvZmFzdC9yZXBhaW50L3dpZHRoLWxheWVyLWNoYW5nZS1leHBlY3RlZC5j aGVja3N1bTogQWRkZWQuCisgICAgICAgICogcGxhdGZvcm0vbWFjL2Zhc3QvcmVwYWludC93aWR0 aC1sYXllci1jaGFuZ2UtZXhwZWN0ZWQucG5nOiBBZGRlZC4KKyAgICAgICAgKiBwbGF0Zm9ybS9t YWMvZmFzdC9yZXBhaW50L3dpZHRoLWxheWVyLWNoYW5nZS1leHBlY3RlZC50eHQ6IEFkZGVkLgor CiAyMDA5LTAxLTAyICBEYXZpZCBTbWl0aCAgPGNhdGZpc2gubWFuQGdtYWlsLmNvbT4KIAogICAg ICAgICBSZXZpZXdlZCBieSBEYXJpbiBBZGxlci4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zh c3QvcmVwYWludC93aWR0aC1sYXllci1jaGFuZ2UuaHRtbCBiL0xheW91dFRlc3RzL2Zhc3QvcmVw YWludC93aWR0aC1sYXllci1jaGFuZ2UuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAw MDAwMDAwLi44M2RkMjZjCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9yZXBh aW50L3dpZHRoLWxheWVyLWNoYW5nZS5odG1sCkBAIC0wLDAgKzEsMzQgQEAKKzwhRE9DVFlQRSBo dG1sIFBVQkxJQyAiLS8vVzNDLy9EVEQgWEhUTUwgMS4wIFN0cmljdC8vRU4iCisgICJodHRwOi8v d3d3LnczLm9yZy9UUi94aHRtbDEvRFREL3hodG1sMS1zdHJpY3QuZHRkIj4KKzxodG1sPgorPGhl YWQ+CisgIDxtZXRhIGh0dHAtZXF1aXY9IkNvbnRlbnQtdHlwZSIgY29udGVudD0idGV4dC9odG1s OyBjaGFyc2V0PXV0Zi04Ij4KKyAgPHRpdGxlPkNTUyBUcmFuc2l0aW9uIHRlc3QgY2FzZTwvdGl0 bGU+CisgIDxzdHlsZSB0eXBlPSJ0ZXh0L2NzcyIgbWVkaWE9InNjcmVlbiI+CisgICAgLnN0cmV0 Y2h5IHsKKyAgICAgIGJhY2tncm91bmQ6IGdyZWVuOworICAgICAgb3BhY2l0eTogMC41OworICAg ICAgaGVpZ2h0OiA1MHB4OworICAgICAgd2lkdGg6IDI1MHB4OworICAgICAgbWFyZ2luOiAyMHB4 OworICAgIH0KKyAgICAKKyAgICAuc3RyZXRjaHkuYmlnIHsKKyAgICAgIGJhY2tncm91bmQ6IHJl ZDsKKyAgICAgIG9wYWNpdHk6IDE7CisgICAgICB3aWR0aDogNTAwcHg7CisgICAgfQorICA8L3N0 eWxlPgorICA8c2NyaXB0IHNyYz0icmVwYWludC5qcyIgdHlwZT0idGV4dC9qYXZhc2NyaXB0Ij48 L3NjcmlwdD4KKyAgPHNjcmlwdD4KKyAgICBmdW5jdGlvbiByZXBhaW50VGVzdCgpCisgICAgewor ICAgICAgZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ3Rlc3QnKS5jbGFzc05hbWUgPSAnc3RyZXRj aHknOworICAgIH0KKyAgPC9zY3JpcHQ+Cis8L2hlYWQ+Cis8Ym9keSBvbmxvYWQ9InJ1blJlcGFp bnRUZXN0KCkiPgorICA8cD5JZiB5b3Ugc2VlIHJlZCwgdGhlIHRlc3QgZmFpbGVkPC9wPgorICA8 ZGl2IGlkPSJ0ZXN0IiBjbGFzcz0iYmlnIHN0cmV0Y2h5Ij48L2Rpdj4KKzwvYm9keT4KKzwvaHRt bD4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3BsYXRmb3JtL21hYy9mYXN0L3JlcGFpbnQvd2lk dGgtbGF5ZXItY2hhbmdlLWV4cGVjdGVkLmNoZWNrc3VtIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0v bWFjL2Zhc3QvcmVwYWludC93aWR0aC1sYXllci1jaGFuZ2UtZXhwZWN0ZWQuY2hlY2tzdW0KbmV3 IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uNTdiMDVmZQotLS0gL2Rldi9udWxsCisr KyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL21hYy9mYXN0L3JlcGFpbnQvd2lkdGgtbGF5ZXItY2hh bmdlLWV4cGVjdGVkLmNoZWNrc3VtCkBAIC0wLDAgKzEgQEAKKzYxOTQxMzM4NDNiNjkyYzQ0Njgz N2M1N2Y5OGI5NDA2ClwgTm8gbmV3bGluZSBhdCBlbmQgb2YgZmlsZQpkaWZmIC0tZ2l0IGEvTGF5 b3V0VGVzdHMvcGxhdGZvcm0vbWFjL2Zhc3QvcmVwYWludC93aWR0aC1sYXllci1jaGFuZ2UtZXhw ZWN0ZWQucG5nIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL2Zhc3QvcmVwYWludC93aWR0aC1s YXllci1jaGFuZ2UtZXhwZWN0ZWQucG5nCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAw MDAuLjM4Y2Y5YTQKQmluYXJ5IGZpbGVzIC9kZXYvbnVsbCBhbmQgYi9MYXlvdXRUZXN0cy9wbGF0 Zm9ybS9tYWMvZmFzdC9yZXBhaW50L3dpZHRoLWxheWVyLWNoYW5nZS1leHBlY3RlZC5wbmcgZGlm ZmVyCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvZmFzdC9yZXBhaW50L3dp ZHRoLWxheWVyLWNoYW5nZS1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMv ZmFzdC9yZXBhaW50L3dpZHRoLWxheWVyLWNoYW5nZS1leHBlY3RlZC50eHQKbmV3IGZpbGUgbW9k ZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uMTc1ZGE1NgotLS0gL2Rldi9udWxsCisrKyBiL0xheW91 dFRlc3RzL3BsYXRmb3JtL21hYy9mYXN0L3JlcGFpbnQvd2lkdGgtbGF5ZXItY2hhbmdlLWV4cGVj dGVkLnR4dApAQCAtMCwwICsxLDEwIEBACitsYXllciBhdCAoMCwwKSBzaXplIDgwMHg2MDAKKyAg UmVuZGVyVmlldyBhdCAoMCwwKSBzaXplIDgwMHg2MDAKK2xheWVyIGF0ICgwLDApIHNpemUgODAw eDEyNAorICBSZW5kZXJCbG9jayB7SFRNTH0gYXQgKDAsMCkgc2l6ZSA4MDB4MTI0CisgICAgUmVu ZGVyQm9keSB7Qk9EWX0gYXQgKDgsMTYpIHNpemUgNzg0eDg4CisgICAgICBSZW5kZXJCbG9jayB7 UH0gYXQgKDAsMCkgc2l6ZSA3ODR4MTgKKyAgICAgICAgUmVuZGVyVGV4dCB7I3RleHR9IGF0ICgw LDApIHNpemUgMTc3eDE4CisgICAgICAgICAgdGV4dCBydW4gYXQgKDAsMCkgd2lkdGggMTc3OiAi SWYgeW91IHNlZSByZWQsIHRoZSB0ZXN0IGZhaWxlZCIKK2xheWVyIGF0ICgyOCw1NCkgc2l6ZSAy NTB4NTAKKyAgUmVuZGVyQmxvY2sge0RJVn0gYXQgKDIwLDM4KSBzaXplIDI1MHg1MCBbYmdjb2xv cj0jMDA4MDAwXQpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9DaGFuZ2VMb2cgYi9XZWJDb3JlL0NoYW5n ZUxvZwppbmRleCAwOWNjMWQ4Li5jZTc1MmUxIDEwMDY0NAotLS0gYS9XZWJDb3JlL0NoYW5nZUxv ZworKysgYi9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDA5LTAxLTAzICBT aW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0yMzA5MAorICAgICAgICAKKyAgICAgICAgSWYgYW4gb2JqZWN0IGdldHMg YSBMYXlvdXQgaGludCwgYW5kIHRoZSBzdHlsZSBjaGFuZ2Ugd2lsbCByZXN1bHQgaW4KKyAgICAg ICAgdGhlIGNyZWF0aW9uIG9mIGEgUmVuZGVyTGF5ZXIsIHRoZW4gd2UgbmVlZCB0byByZXBhaW50 IHRoZSBvbGQgcG9zaXRpb24KKyAgICAgICAgb2YgdGhlIG9iamVjdC4gVGhpcyB3YXMgZG9uZSBm b3IgdHJhbnNmb3JtLCBidXQgd2UgaGF2ZSB0byB0ZXN0IG9wYWNpdHkgdG9vLgorICAgICAgICAK KyAgICAgICAgVGVzdDogZmFzdC9yZXBhaW50L3dpZHRoLWxheWVyLWNoYW5nZS5odG1sCisKKyAg ICAgICAgKiByZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJl bmRlck9iamVjdDo6c3R5bGVXaWxsQ2hhbmdlKToKKyAgICAgICAgKiByZW5kZXJpbmcvc3R5bGUv UmVuZGVyU3R5bGUuaDoKKyAgICAgICAgKFdlYkNvcmU6OkluaGVyaXRlZEZsYWdzOjpoYXNPcGFj aXR5KToKKwogMjAwOS0wMS0wMiAgQ2FyeSBDbGFyayAgPGNhcnljbGFya0Bnb29nbGUuY29tPgog CiAgICAgICAgIFJldmlld2VkIGFuZCBsYW5kZWQgYnkgRGFyaW4gQWRsZXIuCmRpZmYgLS1naXQg YS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJPYmplY3QuY3BwIGIvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyT2JqZWN0LmNwcAppbmRleCBlYjRhNjEyLi5kNTNiYzUyIDEwMDY0NAotLS0gYS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJPYmplY3QuY3BwCisrKyBiL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlck9iamVjdC5jcHAKQEAgLTIzMDMsOCArMjMwMyw5IEBAIHZvaWQgUmVuZGVyT2JqZWN0Ojpz dHlsZVdpbGxDaGFuZ2UoUmVuZGVyU3R5bGU6OkRpZmYgZGlmZiwgY29uc3QgUmVuZGVyU3R5bGUq IG5lCiAgICAgICAgICAgICAgICAgICAgIG1fc3R5bGUtPm9wYWNpdHkoKSAhPSBuZXdTdHlsZS0+ b3BhY2l0eSgpIHx8CiAgICAgICAgICAgICAgICAgICAgIG1fc3R5bGUtPnRyYW5zZm9ybSgpICE9 IG5ld1N0eWxlLT50cmFuc2Zvcm0oKSkKICAgICAgICAgICAgICAgICBsYXllcigpLT5yZXBhaW50 SW5jbHVkaW5nRGVzY2VuZGFudHMoKTsKLSAgICAgICAgICAgIH0gZWxzZSBpZiAobV9zdHlsZS0+ dHJhbnNmb3JtKCkgIT0gbmV3U3R5bGUtPnRyYW5zZm9ybSgpKSB7Ci0gICAgICAgICAgICAgICAg Ly8gSWYgd2UgZG9uJ3QgaGF2ZSBhIGxheWVyIHlldCwgYnV0IHdlIGFyZSBnb2luZyB0byBnZXQg b25lIGJlY2F1c2Ugb2YgYSB0cmFuc2Zvcm0gY2hhbmdlLCB0aGVuCisgICAgICAgICAgICB9IGVs c2UgaWYgKG1fc3R5bGUtPmhhc1RyYW5zZm9ybSgpICE9IG5ld1N0eWxlLT5oYXNUcmFuc2Zvcm0o KSB8fAorICAgICAgICAgICAgICAgICAgICAgICBtX3N0eWxlLT5oYXNPcGFjaXR5KCkgIT0gbmV3 U3R5bGUtPmhhc09wYWNpdHkoKSkgeworICAgICAgICAgICAgICAgIC8vIElmIHdlIGRvbid0IGhh dmUgYSBsYXllciB5ZXQsIGJ1dCB3ZSBhcmUgZ29pbmcgdG8gZ2V0IG9uZSBiZWNhdXNlIG9mIGEg dHJhbnNmb3JtIG9yIG9wYWNpdHkgY2hhbmdlLCB0aGVuCiAgICAgICAgICAgICAgICAgLy8gd2Ug bmVlZCB0byByZXBhaW50IHRoZSBvbGQgcG9zaXRpb24gb2YgdGhlIG9iamVjdAogICAgICAgICAg ICAgICAgIHJlcGFpbnQoKTsKICAgICAgICAgICAgIH0KZGlmZiAtLWdpdCBhL1dlYkNvcmUvcmVu ZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlLmggYi9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9SZW5k ZXJTdHlsZS5oCmluZGV4IDJmNGNiY2UuLmQ3M2U0MGIgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcmVu ZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlLmgKKysrIGIvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUv UmVuZGVyU3R5bGUuaApAQCAtNTc3LDYgKzU3Nyw3IEBAIHB1YmxpYzoKICAgICBmbG9hdCB0ZXh0 U3Ryb2tlV2lkdGgoKSBjb25zdCB7IHJldHVybiByYXJlSW5oZXJpdGVkRGF0YS0+dGV4dFN0cm9r ZVdpZHRoOyB9CiAgICAgY29uc3QgQ29sb3ImIHRleHRGaWxsQ29sb3IoKSBjb25zdCB7IHJldHVy biByYXJlSW5oZXJpdGVkRGF0YS0+dGV4dEZpbGxDb2xvcjsgfQogICAgIGZsb2F0IG9wYWNpdHko KSBjb25zdCB7IHJldHVybiByYXJlTm9uSW5oZXJpdGVkRGF0YS0+b3BhY2l0eTsgfQorICAgIGJv b2wgaGFzT3BhY2l0eSgpIGNvbnN0IHsgcmV0dXJuIHJhcmVOb25Jbmhlcml0ZWREYXRhLT5vcGFj aXR5IDwgMTsgfQogICAgIENvbnRyb2xQYXJ0IGFwcGVhcmFuY2UoKSBjb25zdCB7IHJldHVybiBz dGF0aWNfY2FzdDxDb250cm9sUGFydD4ocmFyZU5vbkluaGVyaXRlZERhdGEtPm1fYXBwZWFyYW5j ZSk7IH0KICAgICBFQm94QWxpZ25tZW50IGJveEFsaWduKCkgY29uc3QgeyByZXR1cm4gc3RhdGlj X2Nhc3Q8RUJveEFsaWdubWVudD4ocmFyZU5vbkluaGVyaXRlZERhdGEtPmZsZXhpYmxlQm94LT5h bGlnbik7IH0KICAgICBFQm94RGlyZWN0aW9uIGJveERpcmVjdGlvbigpIGNvbnN0IHsgcmV0dXJu IHN0YXRpY19jYXN0PEVCb3hEaXJlY3Rpb24+KGluaGVyaXRlZF9mbGFncy5fYm94X2RpcmVjdGlv bik7IH0K 26400 2009-01-03 19:11:16 -0800 2009-01-03 20:44:11 -0800 Improved patch 23090_patch.txt text/plain 6217 simon.fraser ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCAyOGMyMDlhLi40ODE3NWU3IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMDktMDEt MDMgIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTIzMDkwCisgICAgICAgIAorICAgICAgICBSZXBhaW50IHRlc3Qg Zm9yIHJlcGFpbnRpbmcgd2hlbiBhbiBlbGVtZW50IGdldHMgc21hbGxlciwKKyAgICAgICAgYW5k IGdhaW5zIGEgUmVuZGVyTGF5ZXIgYXQgdGhlIHNhbWUgdGltZS4KKyAgICAgICAgCisgICAgICAg ICogZmFzdC9yZXBhaW50L3dpZHRoLWxheWVyLWNoYW5nZS5odG1sOiBBZGRlZC4KKyAgICAgICAg KiBwbGF0Zm9ybS9tYWMvZmFzdC9yZXBhaW50L3dpZHRoLWxheWVyLWNoYW5nZS1leHBlY3RlZC5j aGVja3N1bTogQWRkZWQuCisgICAgICAgICogcGxhdGZvcm0vbWFjL2Zhc3QvcmVwYWludC93aWR0 aC1sYXllci1jaGFuZ2UtZXhwZWN0ZWQucG5nOiBBZGRlZC4KKyAgICAgICAgKiBwbGF0Zm9ybS9t YWMvZmFzdC9yZXBhaW50L3dpZHRoLWxheWVyLWNoYW5nZS1leHBlY3RlZC50eHQ6IEFkZGVkLgor CiAyMDA5LTAxLTAyICBEYXZpZCBTbWl0aCAgPGNhdGZpc2gubWFuQGdtYWlsLmNvbT4KIAogICAg ICAgICBSZXZpZXdlZCBieSBEYXJpbiBBZGxlci4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zh c3QvcmVwYWludC93aWR0aC1sYXllci1jaGFuZ2UuaHRtbCBiL0xheW91dFRlc3RzL2Zhc3QvcmVw YWludC93aWR0aC1sYXllci1jaGFuZ2UuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAw MDAwMDAwLi44M2RkMjZjCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9yZXBh aW50L3dpZHRoLWxheWVyLWNoYW5nZS5odG1sCkBAIC0wLDAgKzEsMzQgQEAKKzwhRE9DVFlQRSBo dG1sIFBVQkxJQyAiLS8vVzNDLy9EVEQgWEhUTUwgMS4wIFN0cmljdC8vRU4iCisgICJodHRwOi8v d3d3LnczLm9yZy9UUi94aHRtbDEvRFREL3hodG1sMS1zdHJpY3QuZHRkIj4KKzxodG1sPgorPGhl YWQ+CisgIDxtZXRhIGh0dHAtZXF1aXY9IkNvbnRlbnQtdHlwZSIgY29udGVudD0idGV4dC9odG1s OyBjaGFyc2V0PXV0Zi04Ij4KKyAgPHRpdGxlPkNTUyBUcmFuc2l0aW9uIHRlc3QgY2FzZTwvdGl0 bGU+CisgIDxzdHlsZSB0eXBlPSJ0ZXh0L2NzcyIgbWVkaWE9InNjcmVlbiI+CisgICAgLnN0cmV0 Y2h5IHsKKyAgICAgIGJhY2tncm91bmQ6IGdyZWVuOworICAgICAgb3BhY2l0eTogMC41OworICAg ICAgaGVpZ2h0OiA1MHB4OworICAgICAgd2lkdGg6IDI1MHB4OworICAgICAgbWFyZ2luOiAyMHB4 OworICAgIH0KKyAgICAKKyAgICAuc3RyZXRjaHkuYmlnIHsKKyAgICAgIGJhY2tncm91bmQ6IHJl ZDsKKyAgICAgIG9wYWNpdHk6IDE7CisgICAgICB3aWR0aDogNTAwcHg7CisgICAgfQorICA8L3N0 eWxlPgorICA8c2NyaXB0IHNyYz0icmVwYWludC5qcyIgdHlwZT0idGV4dC9qYXZhc2NyaXB0Ij48 L3NjcmlwdD4KKyAgPHNjcmlwdD4KKyAgICBmdW5jdGlvbiByZXBhaW50VGVzdCgpCisgICAgewor ICAgICAgZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ3Rlc3QnKS5jbGFzc05hbWUgPSAnc3RyZXRj aHknOworICAgIH0KKyAgPC9zY3JpcHQ+Cis8L2hlYWQ+Cis8Ym9keSBvbmxvYWQ9InJ1blJlcGFp bnRUZXN0KCkiPgorICA8cD5JZiB5b3Ugc2VlIHJlZCwgdGhlIHRlc3QgZmFpbGVkPC9wPgorICA8 ZGl2IGlkPSJ0ZXN0IiBjbGFzcz0iYmlnIHN0cmV0Y2h5Ij48L2Rpdj4KKzwvYm9keT4KKzwvaHRt bD4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3BsYXRmb3JtL21hYy9mYXN0L3JlcGFpbnQvd2lk dGgtbGF5ZXItY2hhbmdlLWV4cGVjdGVkLmNoZWNrc3VtIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0v bWFjL2Zhc3QvcmVwYWludC93aWR0aC1sYXllci1jaGFuZ2UtZXhwZWN0ZWQuY2hlY2tzdW0KbmV3 IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uNTdiMDVmZQotLS0gL2Rldi9udWxsCisr KyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL21hYy9mYXN0L3JlcGFpbnQvd2lkdGgtbGF5ZXItY2hh bmdlLWV4cGVjdGVkLmNoZWNrc3VtCkBAIC0wLDAgKzEgQEAKKzYxOTQxMzM4NDNiNjkyYzQ0Njgz N2M1N2Y5OGI5NDA2ClwgTm8gbmV3bGluZSBhdCBlbmQgb2YgZmlsZQpkaWZmIC0tZ2l0IGEvTGF5 b3V0VGVzdHMvcGxhdGZvcm0vbWFjL2Zhc3QvcmVwYWludC93aWR0aC1sYXllci1jaGFuZ2UtZXhw ZWN0ZWQucG5nIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL2Zhc3QvcmVwYWludC93aWR0aC1s YXllci1jaGFuZ2UtZXhwZWN0ZWQucG5nCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAw MDAuLjM4Y2Y5YTQKQmluYXJ5IGZpbGVzIC9kZXYvbnVsbCBhbmQgYi9MYXlvdXRUZXN0cy9wbGF0 Zm9ybS9tYWMvZmFzdC9yZXBhaW50L3dpZHRoLWxheWVyLWNoYW5nZS1leHBlY3RlZC5wbmcgZGlm ZmVyCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvZmFzdC9yZXBhaW50L3dp ZHRoLWxheWVyLWNoYW5nZS1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMv ZmFzdC9yZXBhaW50L3dpZHRoLWxheWVyLWNoYW5nZS1leHBlY3RlZC50eHQKbmV3IGZpbGUgbW9k ZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uMTc1ZGE1NgotLS0gL2Rldi9udWxsCisrKyBiL0xheW91 dFRlc3RzL3BsYXRmb3JtL21hYy9mYXN0L3JlcGFpbnQvd2lkdGgtbGF5ZXItY2hhbmdlLWV4cGVj dGVkLnR4dApAQCAtMCwwICsxLDEwIEBACitsYXllciBhdCAoMCwwKSBzaXplIDgwMHg2MDAKKyAg UmVuZGVyVmlldyBhdCAoMCwwKSBzaXplIDgwMHg2MDAKK2xheWVyIGF0ICgwLDApIHNpemUgODAw eDEyNAorICBSZW5kZXJCbG9jayB7SFRNTH0gYXQgKDAsMCkgc2l6ZSA4MDB4MTI0CisgICAgUmVu ZGVyQm9keSB7Qk9EWX0gYXQgKDgsMTYpIHNpemUgNzg0eDg4CisgICAgICBSZW5kZXJCbG9jayB7 UH0gYXQgKDAsMCkgc2l6ZSA3ODR4MTgKKyAgICAgICAgUmVuZGVyVGV4dCB7I3RleHR9IGF0ICgw LDApIHNpemUgMTc3eDE4CisgICAgICAgICAgdGV4dCBydW4gYXQgKDAsMCkgd2lkdGggMTc3OiAi SWYgeW91IHNlZSByZWQsIHRoZSB0ZXN0IGZhaWxlZCIKK2xheWVyIGF0ICgyOCw1NCkgc2l6ZSAy NTB4NTAKKyAgUmVuZGVyQmxvY2sge0RJVn0gYXQgKDIwLDM4KSBzaXplIDI1MHg1MCBbYmdjb2xv cj0jMDA4MDAwXQpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9DaGFuZ2VMb2cgYi9XZWJDb3JlL0NoYW5n ZUxvZwppbmRleCAwOWNjMWQ4Li5jZTc1MmUxIDEwMDY0NAotLS0gYS9XZWJDb3JlL0NoYW5nZUxv ZworKysgYi9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDA5LTAxLTAzICBT aW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0yMzA5MAorICAgICAgICAKKyAgICAgICAgSWYgYW4gb2JqZWN0IGdldHMg YSBMYXlvdXQgaGludCwgYW5kIHRoZSBzdHlsZSBjaGFuZ2Ugd2lsbCByZXN1bHQgaW4KKyAgICAg ICAgdGhlIGNyZWF0aW9uIG9mIGEgUmVuZGVyTGF5ZXIsIHRoZW4gd2UgbmVlZCB0byByZXBhaW50 IHRoZSBvbGQgcG9zaXRpb24KKyAgICAgICAgb2YgdGhlIG9iamVjdC4gVGhpcyB3YXMgZG9uZSBm b3IgdHJhbnNmb3JtLCBidXQgd2UgaGF2ZSB0byB0ZXN0IG9wYWNpdHkgdG9vLgorICAgICAgICAK KyAgICAgICAgVGVzdDogZmFzdC9yZXBhaW50L3dpZHRoLWxheWVyLWNoYW5nZS5odG1sCisKKyAg ICAgICAgKiByZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJl bmRlck9iamVjdDo6c3R5bGVXaWxsQ2hhbmdlKToKKyAgICAgICAgKiByZW5kZXJpbmcvc3R5bGUv UmVuZGVyU3R5bGUuaDoKKyAgICAgICAgKFdlYkNvcmU6OkluaGVyaXRlZEZsYWdzOjpoYXNPcGFj aXR5KToKKwogMjAwOS0wMS0wMiAgQ2FyeSBDbGFyayAgPGNhcnljbGFya0Bnb29nbGUuY29tPgog CiAgICAgICAgIFJldmlld2VkIGFuZCBsYW5kZWQgYnkgRGFyaW4gQWRsZXIuCmRpZmYgLS1naXQg YS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJPYmplY3QuY3BwIGIvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyT2JqZWN0LmNwcAppbmRleCBlYjRhNjEyLi5kYTc0YzEzIDEwMDY0NAotLS0gYS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJPYmplY3QuY3BwCisrKyBiL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlck9iamVjdC5jcHAKQEAgLTIzMDMsOSArMjMwMyw5IEBAIHZvaWQgUmVuZGVyT2JqZWN0Ojpz dHlsZVdpbGxDaGFuZ2UoUmVuZGVyU3R5bGU6OkRpZmYgZGlmZiwgY29uc3QgUmVuZGVyU3R5bGUq IG5lCiAgICAgICAgICAgICAgICAgICAgIG1fc3R5bGUtPm9wYWNpdHkoKSAhPSBuZXdTdHlsZS0+ b3BhY2l0eSgpIHx8CiAgICAgICAgICAgICAgICAgICAgIG1fc3R5bGUtPnRyYW5zZm9ybSgpICE9 IG5ld1N0eWxlLT50cmFuc2Zvcm0oKSkKICAgICAgICAgICAgICAgICBsYXllcigpLT5yZXBhaW50 SW5jbHVkaW5nRGVzY2VuZGFudHMoKTsKLSAgICAgICAgICAgIH0gZWxzZSBpZiAobV9zdHlsZS0+ dHJhbnNmb3JtKCkgIT0gbmV3U3R5bGUtPnRyYW5zZm9ybSgpKSB7Ci0gICAgICAgICAgICAgICAg Ly8gSWYgd2UgZG9uJ3QgaGF2ZSBhIGxheWVyIHlldCwgYnV0IHdlIGFyZSBnb2luZyB0byBnZXQg b25lIGJlY2F1c2Ugb2YgYSB0cmFuc2Zvcm0gY2hhbmdlLCB0aGVuCi0gICAgICAgICAgICAgICAg Ly8gd2UgbmVlZCB0byByZXBhaW50IHRoZSBvbGQgcG9zaXRpb24gb2YgdGhlIG9iamVjdAorICAg ICAgICAgICAgfSBlbHNlIGlmIChuZXdTdHlsZS0+aGFzVHJhbnNmb3JtKCkgfHwgbmV3U3R5bGUt Pmhhc09wYWNpdHkoKSkgeworICAgICAgICAgICAgICAgIC8vIElmIHdlIGRvbid0IGhhdmUgYSBs YXllciB5ZXQsIGJ1dCB3ZSBhcmUgZ29pbmcgdG8gZ2V0IG9uZSBiZWNhdXNlIG9mIHRyYW5zZm9y bSBvciBvcGFjaXR5LAorICAgICAgICAgICAgICAgIC8vICB0aGVuIHdlIG5lZWQgdG8gcmVwYWlu dCB0aGUgb2xkIHBvc2l0aW9uIG9mIHRoZSBvYmplY3QuCiAgICAgICAgICAgICAgICAgcmVwYWlu dCgpOwogICAgICAgICAgICAgfQogICAgICAgICB9CmRpZmYgLS1naXQgYS9XZWJDb3JlL3JlbmRl cmluZy9zdHlsZS9SZW5kZXJTdHlsZS5oIGIvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvUmVuZGVy U3R5bGUuaAppbmRleCAyZjRjYmNlLi5kNzNlNDBiIDEwMDY0NAotLS0gYS9XZWJDb3JlL3JlbmRl cmluZy9zdHlsZS9SZW5kZXJTdHlsZS5oCisrKyBiL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1Jl bmRlclN0eWxlLmgKQEAgLTU3Nyw2ICs1NzcsNyBAQCBwdWJsaWM6CiAgICAgZmxvYXQgdGV4dFN0 cm9rZVdpZHRoKCkgY29uc3QgeyByZXR1cm4gcmFyZUluaGVyaXRlZERhdGEtPnRleHRTdHJva2VX aWR0aDsgfQogICAgIGNvbnN0IENvbG9yJiB0ZXh0RmlsbENvbG9yKCkgY29uc3QgeyByZXR1cm4g cmFyZUluaGVyaXRlZERhdGEtPnRleHRGaWxsQ29sb3I7IH0KICAgICBmbG9hdCBvcGFjaXR5KCkg Y29uc3QgeyByZXR1cm4gcmFyZU5vbkluaGVyaXRlZERhdGEtPm9wYWNpdHk7IH0KKyAgICBib29s IGhhc09wYWNpdHkoKSBjb25zdCB7IHJldHVybiByYXJlTm9uSW5oZXJpdGVkRGF0YS0+b3BhY2l0 eSA8IDE7IH0KICAgICBDb250cm9sUGFydCBhcHBlYXJhbmNlKCkgY29uc3QgeyByZXR1cm4gc3Rh dGljX2Nhc3Q8Q29udHJvbFBhcnQ+KHJhcmVOb25Jbmhlcml0ZWREYXRhLT5tX2FwcGVhcmFuY2Up OyB9CiAgICAgRUJveEFsaWdubWVudCBib3hBbGlnbigpIGNvbnN0IHsgcmV0dXJuIHN0YXRpY19j YXN0PEVCb3hBbGlnbm1lbnQ+KHJhcmVOb25Jbmhlcml0ZWREYXRhLT5mbGV4aWJsZUJveC0+YWxp Z24pOyB9CiAgICAgRUJveERpcmVjdGlvbiBib3hEaXJlY3Rpb24oKSBjb25zdCB7IHJldHVybiBz dGF0aWNfY2FzdDxFQm94RGlyZWN0aW9uPihpbmhlcml0ZWRfZmxhZ3MuX2JveF9kaXJlY3Rpb24p OyB9Cg==