41113 2010-06-23 16:58:28 -0700 [WinCairo] Text box backgrounds do not render in partially opaque layers 2010-06-28 09:02:08 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) PC Windows XP RESOLVED FIXED P2 Normal --- 41111 1 mrobinson webkit-unassigned aroben bfulgham oldest_to_newest 242157 0 mrobinson 2010-06-23 16:58:28 -0700 Even after the fixes here ( https://bugs.webkit.org/show_bug.cgi?id=41111 ), text box backgrounds do not render in partially opaque layers. The reason is that the internal Windows theme drawing code is rendering the text box background with GDI. The HDC that it is rendering to is backed by an HBITMAP with an alpha layer. Since GDI is malevolently alpha unaware, rendering onto such an HDC will peg alpha values to 0, meaning everything on the context is fully transparent. Controls other than text boxes (checkboxes and radio buttons, for instance) render in an alpha-aware fashion. The CoreGraphics port handles this issue via a special image surface type which ignores the alpha channel. There is no such thing in Cairo, as far as I can tell, so the solution is to manually adjust the alpha values on Windows surfaces not supporting alpha-blending to 255 (fully opaque). 242158 1 59581 mrobinson 2010-06-23 16:59:01 -0700 Created attachment 59581 Test case demonstrating this issue 242160 2 59582 mrobinson 2010-06-23 17:00:31 -0700 Created attachment 59582 Rendering of this test in WinLauncher 242165 3 59583 mrobinson 2010-06-23 17:10:42 -0700 Created attachment 59583 Patch 242547 4 bfulgham 2010-06-24 09:29:47 -0700 I hadn't noticed this problem before -- this is a great fix! I only had one minor suggestion: > + unsigned char* bytes = reinterpret_cast<unsigned char*>(info.bmBits); > + if (!supportAlphaBlend) > + for (size_t i = 0; i < info.bmHeight * info.bmWidthBytes; i += 4) > + bytes[i + 3] = 255; > + Could the byte flipping code be represented as a static function for clarity? For example: static void setRGBABitmapAlpha(unsigned char* bytes, size_t length, unsigned char level) { for (size_t i = 0; i < length; i += 4) bytes[i + 3] = level; } ... then your other change would read: if (!supportAlphaBlend) setRGBABitmapAlpha(bytes, info.bmHeight * info.bmWidthBytes, 255); Otherwise, looks great! 243052 5 59583 aroben 2010-06-25 09:46:50 -0700 Comment on attachment 59583 Patch > + Functionality unchanged, no new tests. This doesn't seem correct. You are changing functionality (by fixing a bug). Can we come up with a test? > + // If this context does not support alpha blending, then it may have > + // been drawn with GDI functions which always set the alpha channel > + // to zero. We need to manually set the bitmap to be fully opaque. > + unsigned char* bytes = reinterpret_cast<unsigned char*>(info.bmBits); > + if (!supportAlphaBlend) > + for (size_t i = 0; i < info.bmHeight * info.bmWidthBytes; i += 4) > + bytes[i + 3] = 255; Our style guidelines say that there should be braces around the body of the if (because it spans multiple lines, even though it's only a single statement). But I agree with Brent that a function might be clearer. 243054 6 mrobinson 2010-06-25 09:53:04 -0700 (In reply to comment #5) > This doesn't seem correct. You are changing functionality (by fixing a bug). Can we come up with a test? Thanks for looking at this patch. I agree after reading your comments that this does deserve a test. Given that the WinCairo port doesn't yet support pixel tests, do you have a suggestion for how best to test this change? > Our style guidelines say that there should be braces around the body of the if (because it spans multiple lines, even though it's only a single statement). > But I agree with Brent that a function might be clearer. Alright, I should have an updated patch tonight. 243057 7 aroben 2010-06-25 09:57:06 -0700 (In reply to comment #6) > (In reply to comment #5) > > This doesn't seem correct. You are changing functionality (by fixing a bug). Can we come up with a test? > > Thanks for looking at this patch. I agree after reading your comments that this does deserve a test. Given that the WinCairo port doesn't yet support pixel tests, do you have a suggestion for how best to test this change? Hm, that is a tricky issue. But it seems like it should be possible for you to write a test that would show the bug if we did have pixel tests, given that you already have attachment 59581. I think it's probably best to just land that as a test case. 243284 8 59818 mrobinson 2010-06-25 17:47:01 -0700 Created attachment 59818 Patch including manual test 243681 9 59818 aroben 2010-06-28 06:48:36 -0700 Comment on attachment 59818 Patch including manual test r=me 243721 10 59818 mrobinson 2010-06-28 09:02:03 -0700 Comment on attachment 59818 Patch including manual test Clearing flags on attachment: 59818 Committed r62012: <http://trac.webkit.org/changeset/62012> 243722 11 mrobinson 2010-06-28 09:02:08 -0700 All reviewed patches have been landed. Closing bug. 59581 2010-06-23 16:59:01 -0700 2010-06-23 16:59:01 -0700 Test case demonstrating this issue opacity-test2.html text/html 169 mrobinson PGh0bWw+CjxzdHlsZT4KCWJvZHkgeyBvcGFjaXR5OiAwLjU7IH0KPC9zdHlsZT4KPGJvZHk+IAoJ WW91IGNhbiBzZWUgbWUuCgk8aW5wdXQgdmFsdWU9IlRoaXMgdGV4dGJveCBoYXMgbm8gYm9yZGVy IiB0eXBlPSJ0ZXh0Ii8+CglZb3UgY2FuIGFsc28gc2VlIG1lLgo8L2JvZHk+IAo8L2h0bWw+Cg== 59582 2010-06-23 17:00:31 -0700 2010-06-23 17:00:31 -0700 Rendering of this test in WinLauncher opacity-test2-output.png image/png 7091 mrobinson iVBORw0KGgoAAAANSUhEUgAAAi0AAACWCAIAAACdGS+6AAAAAXNSR0IArs4c6QAAAARnQU1BAACx jwv8YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAGzFJREFU eF7tnQuQHMV5x+du0elExS4jEgocEiPbIiROORFxAAsUMAjkIAOSpcN6IBACPTiBiCQsI7CjgIyx CJQlwEgICjuonBRgh9hR2XWAXXZRjkHoOHQ28Uk65TBwkk5PhE6n03Pz9fZub2/PTHfP7GNmdv5b XVtzs91ff/37uvs/3TO36zh4gQAIgAAIgEBEBLLZrKvm8e0NX3qLkjPu9yxd3ZVPE95xJv3Bmfa+ c+MO/t5w8y7nxj5n2g7nhj52QO88TdmNBAIBCexzpiCBgB2BqTsdpDoiUKJDXH6a5vYPXXTi9Huy H7+fpU89kP2LR7KjHs6Oejw7ehVLY77L0qWrfRPPgAQC9gQ03QkfgYBCwL5fIWciCBR1iBSocUYf iVDj7QeG3nWSdEhI0YgVWUqkRp9ZWUwkSzzJJ3EMAiAAAiAAAoEIFHToCxucCe86k7Y0zN5NyZm7 lyfSpMyCQ5k7j5IyOYtPZBZlKfFjehcn+QE/2bTwJC2neE4kEAABEKg4gYbbTyLVEwFJh8a3O9N6 ioluAs3q45pEasQT0ySfxD6d119Msw9kkEAABEAABEDARCCnQ+f/yrm62yEdmrQln7gg5aRIqFF+ kXTbh45IhWUTfcQUa+a+fLphj4MEAsEISM+5iAdecAACIJACAgUdIin6wgb2jByXIpcO8f06ecuO aw87Q8sm/uAcf2SOHp+jNGU7EgiAAAiAAAgoBIZM653zxO7evcdIfsTLcT7972xJpOpQ7vnswnpI 6JDQHkl+duSe5C4krkAtvUggEIDA5PccJBCwJED/QIKUWAJzHuvr7j2xeO3gzIcPt3xz4Jp/Hsit h858genQmI2NV8rrocJ/CPHlTu5eEUs378r/yddAYgEkr4EsOxOygQAIgEAIAomdgiGfRIBUZ8nT gytfPPL4T4488B+DX316sESH2H+t5jblTr377T9Z1v1H92wdtnRr89KtH7m3+6Nf7x7+ja2nLt3S fPcWZ1FX09e2OIu7nHt3OHO6PPbisBgCgaAEQkxGKJJaAtChJBMg1Zm98vDq9UfW/uzoiueP3PN9 oUOj/se5tJN9bwJ9aQJ17vlvOPM3OQvecu7YlFnUOWQhHW9y7uhg73d2XLa612ntGPvswInWz9Kf znVvlNwTCjoBIT8IgAAIgEBqCJAOTfnWACnQIz86smzd4MInfXTozZ7uts7Nbb/d0ta5hb2ztJmd oT87N/+0o+tnmzav7+h6vvO9Cx/5nXPta9ChADdCUtPbwAQEQAAE3ARIh758/8DS7w1+/d+YCM1d xXXo4684F77hXEzroW62fdnSm3uG4ahFys5a966iQ9072FMQH7uJPapA78oxfcrdeqP7CCVNkPhz FLWM4kubDu89eLyWNaIuEACBMAQm9jpIiSVAEzs9m7Bg9eA/PTnY+tjgrIeFDl3Q6VzWzXSINuXy OnQkm6WkqJE4cyKbPcm2+Z7taZy4ofidg1O2r3m5n85f3bLOmfB/V9y3Wzl++tmNzZ9YyXVoY2ff 0E8/4dcLuQ6deubyMN001JqD1zjs7G/XrEZUBAIgAAJpI0DT7FVLD817lInQ7O8M3rjicGE9JHSI NLaoQ8ezWVrcaBZG2XnPbM1MbM/MoH9c7eNqNPk7e8novctfaRy7Ycm6D5Tj6be+MORvn+fcSYRi qEO1VL609T+0FwRAAAS4DtFD27MeGZz5r4enP6joEH3FHP3rz9SduYUBX/q4l0QlstT69O8LOrSH fc//1J0fu6WPCv/8l9tOuajtpU1swSUfn3XuQ5nLfsNXHrltt12U6OC5X9OeGK2xslRkxPw9/GRh PcTyiMT3/eScIrOwprdM2ZasO8jt0PsV9+2XC5K3/Dx3g9Kal9jj7fSiA+GGOJPbaSzxEH+CAAiA AAj4EaDJ85JF/VMfHJjx0OEZKw5P/RbXoXNecy7qcq56n2250pQ6hW2mGRUop1LH5j/1dmbCRloP 5ZZEOSmasrt7B32UHXreM/T+yq/fF8fb/nCArTYmvVeoIrftlq8ue+64Fz//xe/zIg3XMTHI65Dr 14yaz1n5Vxc8Rp9u/O1uyulpTWN5yQ8OUtkVz24jOz/88dv3PPhq47g3hRGyfNGX/4sytG/aScbX vMxEaN79G2mnkQ7W/pBVJzLT8m7c3F+RnYC/tYPfZ3IRgJaDAAikgwBNpBcu6J9438BXHmAiRO8u HaJJ9oY99jp0x5NvNU54LTPzgDP9Q5ZyP2W25mVml+Zoeh995VPimN0cOmcVzyPJTPG44boefp5r WEGHSn4ai4zzlVM+58g1ftbk87Ll7p2038gkcMjfr6c8TX/9g1NGv+ydeeQaXhdlzvzDq3Swb//A kFE/kjNnLt/QOG4TfsMNBEAABEDAhgBNpOfP7x//jUOTlw9c/83DLcu5Dn2i0xnTzdZDdNumqEO0 bUXztf6puWMLn9jYSPeHbh5omHnImZZL0z+cvOoQ2aUNru7ewzSDd28/wje72M2h81/kilWUGZ9j OUNe5KZ/+FIn20z7yldfH3b2CqMFv1o8LeszC9mjA6paySzcwwEIgEAtCEw56CAllgDNop+Z0z/2 7kPXLhugB7gnLeff60M6dPE7OR3axfbWbuIiYRQhkqjjix9/rXFyB+kQT6RGlE5rZTpEr6ee62oe 8eiaX7BtOnrRzaFTxr3J8wgx8DuWM/Aick6yY7TgZ1kscYRZjUsiMwmqSIplxQ7+DEEgfxHDL2WQ QAAE6pcATd0jZx0cs7j/i/ceuvZf8nffHedT/5vToV3OxN0kQgUd4vM8uwkkrwZKj08sXv164/Vv Ns4+QqnhVpacmSzxvS+2APrcTyY/znRoW89eds9m+gc8Q3FR4nMsZ+BFKK35BTNLt3Bmfy+vbXTM qutju2d0fMWK/HlWl4/lJc+xFtETfZThudePP7j+mMYlkZlq3HvwpGdm4R4OQAAEQAAE9ARo+v3z GQcvWNB/+ZJD/3hvfk1S0KHx9GMNTIfoYvaMy1YNv/ih4aMfYu+XyGnF8EtK0ukX3t04pbOx9WRD 61FKzuwTlEiN1vySCQZbAF296bQ72FNz7ObQiEe5VlEqrmZ8jt3ixwuu/c8e+ujbP+5fu54910eP DzRO62tZfXTffrbJ+Pxv2Du9SIc0tSxds410kbKRgJ07/r+HXNymz0y3hZiU9h7+y9FPujOLRuEA BECgBgScmceRkkuA5tIzpx787Lz+0Qv7L/+a0CG2L/euM54eYdrHdahx5p7MzB2ZW3ZSarq1r2nu rqbbdrM0t7fptu0sze0dMmc7T5kFJzMLsvxHakmQRGq6aD2JQeOth9iZWw/RMZ2RM/BtLn7G81je CpMzcMtNY17hB5nJ3WThlGt/N+zPHqI/h57/gtEy5R8y9tXmTz5GOek9c9NejRs8Mzful1luF45B AASqSoBf7yIllADp0B9ff3DkrP5R8/s/v7B/zF1Miuh7fTqEDpEI0W0e2mTLzDuamX+s6c6jQ+88 0bTwJKWhi04MveuknPj54o/PL8iSIPFU1V4I4yAAAiAAAgklQKrz0Ql7z56+/7xbPvibeR/83fwD HjrEpYjp0LyjTbcfJx1iiUTIpUOkSRopEpqEAxAwEkjoiILbIAACQQn07jtx3o09p1/X86ctPSOm vTvyBvaLRCXrIXrmUiyJ+KqoqfWIqkaL8iskPxEK6hbygwAIgAAIpITA3GcG3tpy4LzrX/3IpT89 bezPh1/5stChd/L3h/j/ok7/kP41lSW2MOrPqxEJUk6TeKJdO3fiHPlaCgkE7AkkdKcbboMACAQl MGTOsTlP5R9PEM+j8fVQToeueY993zZ9xRxL7IsVnJnsyYXM7AP5xDRJJPaAnJL4w3Li6W08vwgC 1gTwBBQI2BPI/yOHde9C/lgTkNZDTIreccZsdK7oaBj7VuOVLLFfaM2lhmu6eWI/2EpyRd+IyhP9 XpE45gf0KRIIgAAIVI/AVfT/jkj1Q8ClQ1d0MB3KSZFQI65JSuIZWBL5pYLFT0U2HICAPwHqdUgg YEkgP+fwCQcp+QRyOnRWx9DPbTmjdV9zy7Y9fV1IIAACIAACIFAzAtAh6C4IgAAIgECUBKBDUdKv 2eUGKgIBEACB2BKADkGHQAAEQAAEoiQQXoccx6m2utagimo3AfZBAARAAAT0BMw6RGIgv8gcl4dy REIp62eqnCoQeBAAARAAgUQQsNIhz5aUIxLQoUR0DjgJAiAAAjUgEEaHlPWQWC3Zu+unQ4opUVGI KuydQU4QAAEQAIEICVjpkGZfTlYU+xWSstfn3uiTz4SrIkKmqBoEQAAEQMCegJUOKeYUkVBUyqZu z/WQzY0oe6mzcQN5QAAEQAAEIidQAR0K0QY/HdIIHv8IOhSCNoqAAAiAQJwJVFKH7EXCqEPYl4tz p4FvIAACIFBBAuXqEF+j8Je9W3hOwZ4VcoIACIBAfRMw61Dk7Q+kcJF7CwdAAARAAAQCEcjr0LAY f982dChQRJEZBEAABJJFIAE6lCyg8BYEQAAEQCAQAehQlN/uFyhUyAwCIAACdUkAOgQdAgEQAAEQ iJIAdChK+nV5aYNGgQAIgEAgAqoO0d94gQAIgAAIgEAtCTjOWR3ieTn3N7/hDAiAAAiAAAhUj4C6 HqKaaqmBqAsEQAAEQAAE1PUQiIAACIAACIBALQlAh2pJG3WBAAiAAAioBKBD6BMgAAIgAAJREvDV IX5XKncHKX+gHFt67VdcPi8sKyeVKvSfWvpjmc2yLk9KllWUk81Yr6X/fj7YFBf3LTVhku9tytk8 z3veCDVS8nPVpglG4/YZyqwuUCvKqaucsu4I2vPR5KyUS3pnalOLEYjfiBAFK+VnpewYW1SRDN46 ZCkeNh7YmLKUulqStazLqAc2iELkMdZr6b/fzGIs7udAOeF2V2p0Q3NtZFM2BPlylDvEXOzZCsvx 4jm1BS1bpfZWSdIsCQftG0Hz2wyrQFcemn5egwBVcJj4e1v63DbPF5SRplcZJybP2cfTjXJ6Q5VQ GvWgNvWSG+4QKCeNngTC69lwxYIx9EpPq6wOGdtb2QyB6LmrDj3ibOoNbbyyiOIzY9pAq5RS2owC m7pq6XNt4l7a6rM6mkdtPqN1X3PLNj5z8QbbTzSa2Ucz0djM4MZ5TWPEHX6/Rnl2An1x95WmDM1P FeTzSn6FuWJfM0HLjXKX0tvx88EzakpFbvL6cWIzGjXNlK9LPHuFm0OgCPpVbVmXe9QoI9nPGc8A ufuJclmmwLch7xevyjqm7zn6Th4ixBrs7ro8oRm7nGcV9qPVL6cCyvMiUhMam9lD3ytqrzT6Gtm+ nKJDNuJhvJJVRo6lTY2v+onMOFP7jWQ/x4LOm9Hm188mRnThgiVP/TZToVu8jb0oWqohsBgdNmYo p0P6DZ/QlVoO20TY93TSRocqCMFzCBgvWUL0Q43OxU2BCq0rT4c0gh8ifiF0KNDspu+L8RxOmiu7 ilyshQboLigrk2bIGXXRs1NVOzrua9Iyx79yAS5bs4mpO78xUuXokF911cZejn0bn43QNHNC6Aj6 9SV3j3KHrBwgfmXjqT2llMrTIX0LgzKFDtn0pKAjR74g0NgPFyz3WDU2waaiMjXA8hrIU8gtyxpb oZnFgs4+ZMpGJsvUIaPDxiZXCp2lHcuOHa4vhQBuvH5S2uUZr2pAhg4xqvb9QOS0H6ju7iIH0tih 5a5TjR5QKZvGUaGMgaD1GkF5XsppFFEz5Gx8s+8zNtaM0hii+fp6bfqVMaZBZbIcHSoHY5zLCibG KzBl3rCJTjnAyykbFHhadEg/H2kGueV0E0Ja7Puf/Qzrd/1V8VlMgyUQCku89tmMg1mDyBgR90QQ dLxFkt/e7XL6iU3Tajm12fhjzFOlzhxoOvITexsdMjbQOPWVP/RsfKhnHTJerAUCpFzOK+HxG+r6 KUCZ+EQVxgnRZr6wHEJGSvqe6sZiWa9nNoWAhp4xdp4Xj572NZHVtEUTI5um2URQ7mOWHcw4wemn FU2NMiU61ndRG27K1COKGPuPppP49Qqlkwv/Q/QiY2+R4fjV6zno9NA8+7Neiiz7jPvKTD+ojZAt +7axRbESJ+/n5SriorEX2tdiz1Sf096O0bcKmjLW5TceAhVE5ioRiKonVKk5tTRric4yWzme16CK ctyr+7J1pUOenUlzfVFOdKPquFHVWw6r+i6LiISOryU6y2zVdiO0fRQ0EqiiDhnrrmwGTWf1XOxX tnZYA4FoCcidvM46fFV1qKrGo+0SCaq9fnQoQdDhKgiAAAiAgCAAHUJnAAEQAAEQiJIAdChK+qgb BEAABEAAOoQ+AAIgAAIgECUBpkNDR3XJ37cdpTuoGwRAAARAIGUEVB3ye+oG50EABEAABECg4gRI c0t0KGUajOaCAAiAAAhETwA6FH0M4AEIgAAIpJkAdCjN0UfbQQAEQCB6AtCh6GMAD0AABEAgzQSg Q2mOPtoOAiAAAtETgA5FHwN4AAIgAAJpJgAdSnP00XYQAAEQiJ4AdCj6GMADEAABEEgzAehQmqOP toMACIBA9ASgQ9HHAB6AAAiAQJoJQIfSHH20HQRAAASiJwAdij4G8AAEQAAE0kwAOpTm6KPtIAAC IBA9AehQ9DGAByAAAiCQZgLQoTRHH20HARAAgegJ2OrQssKrra2Ne00H4mT07YAHIFATAskdCOR5 T09PTSChEhAIRsBWh/bv30/9uL29XTZPUqScCVZ5GnP3FNVbTGnL1rXvJxb0ET+QX54nKwuuglVU 0FS4NlbdgYQOBN7XoEPhehVKVZuArQ6xabKnh7oyjUPuEx2ItVG1vaxH++4Zs5w5NERZUSREWb+A VNBUuJjXwoEkDgQun9ChcL0KpapNIIAOkSvrci/uEx0ITaq2l/VoHzpUjajWQoeSOBCgQ9XobbBZ KQLBdEj0Zrqwcu/IkTLx5T/XKn7ZyK/C5GO366KgWGCRcfdGPDfFM3suxeRSohZhXHbY8yQvIq52 5YrclWos2MXGR4fa8/t2hR06KZu0pdfWI1eyv70APretJ/4kTDxfrmTeIv+0GKv2/bkqCvWKMrmC kql8cbcp2ZcSU8VNRskMi51w3rdF3OeiV9J+pdslGUWgtuRraWsjItypvHFjBBM0EPhIkXVIP0zE haYCIVGDyxhAZIgXgWA6RL5Tt+ZzmNIOOikmerFsknu/3xWZKMgFgN7lnEIVhCzRp8rGCPeEzosh JHvCF22yTbGSc7vEz/CXqEg+5tY0FqzD66lD8nzIZ8ZCNjZDFiZwNn2XKpF0b0m2KxViZWg2z020 pZZLVCo3E0sa6FWn25RodE5YilO6qEjRntx5c4vcpnK+ajCEbQtvgAdX/3DGeSCILTgxUkRX9xsm 7sErNz1pg8t6FCJjPAgE1iHP+7S8u4sWyZ1eDAlPHVIKKkzEJRiVdUuasivIM8jrJLEIE9JCBj1P KkPO02duXxYn2WzwaOr35dw3b/Kzv09FPjd71LmeuSxN457PR4QwJeuQWLr4bJEVXbJskSTGyqMc cuvyLiiVGtsi5w+2pxfbgSCC4Tl8/IaJe/C6B0VyBlfw4YgSkRIIrEPkrZimlR4vN4Ty0DAwrof4 PpubAB9CwoKnDrlvuorVDB8wnsb9avQch57+Gy3YBTSoDuWv17n4uZ6rk5dNQh+VvLm1ULGkzxzt uQLLrxZEYcWUUYdKN+aKq6Pixpxvi+SqVeHRM5QEzLegZMFD1QyRjO1AsBk+4qKNZ3YPXqXxiRpc dkMQuWJDoDI6JLbURLv4ELXRIb7IkIHIiySxCjGaKs6Fhf09z8WWfgVGRvwqEueNFuyCG0KHCobl vbP8OT9RKfqSK8RuhbjuPAVdQ/C9O9mUXodKt7s8p3tdiyQ5idN6yPOCLA4DwTh8eLSEq34+e3Zj pZSSxzg0ajW47IYgcsWGQGV0iJoj3zSiKyyxyuHLGsrAL7vcixjKKdb71E3F1hkXJ17KZj3Ed8w4 WPGPTfIDfvQp98TzpIiIcagYLdgFN6AO+dz2KdRV/Lhk1hd/iIm+OOPL0lVcJsmbZd43YzxMGXVI eWQhtzVo3SI5q839IXln0OJeV8kKUb3vpo2lX38Wy4tIBoJ899Q9fPyGiafP8qBI1OCyG4LIFRsC wXTI8zE20RbleTkhCXx7SHz/grvtYiNJfihcKSXyyDd45IWU2DcQGw68IlFQ3t32PKnklxsrH/NK 3RZkebOIb0AdKnl2zT1b5je+xAMABfekE/LtffHIArtdVNwcc235uR5O4ydUU3odyj+vl98lZOuo fHl5t0557qJUplTJyrfO/V+//DmFYn+S/y3Y80E7JQq2z8vFeSDw6ySb4SOPCM/Bq1ycCZvifC0H l8WYQpakEmA61Dyq64zWfc0t25LaCPgNAiAAAiCQWALQocSGDo6DAAiAQF0QgA7VRRjRCBAAARBI LAHoUGJDB8dBAARAoC4IQIfqIoxoBAiAAAgklgB0KLGhg+MgAAIgUBcEoEN1EUY0AgRAAAQSSwA6 lNjQwXEQAAEQqAsC0KG6CCMaAQIgAAKJJQAdSmzo4DgIgAAI1AUB6FBdhBGNAAEQAIHEEoAOJTZ0 cBwEQAAE6oIAdKguwohGgAAIgEBiCUCHEhs6OA4CIAACdUEg2O8+1EWT0QgQAAEQAIEYEYAOxSgY cAUEQAAEUkgAOpTCoKPJIAACIBAjAtChGAUDroAACIBACglAh1IYdDQZBEAABGJEADoUo2DAFRAA ARBIIQHoUAqDjiaDAAiAQIwIQIdiFAy4AgIgAAIpJAAdSmHQ0WQQAAEQiBEB6FCMggFXQAAEQCCF BKBDKQw6mgwCIAACMSIAHYpRMOAKCIAACKSQAHQohUFHk0EABEAgRgSgQzEKBlwBARAAgRQSwO8+ pDDoaDIIgAAIxIgAdChGwYArIAACIJBCAtChFAYdTQYBEACBGBGADsUoGHAFBEAABFJIADqUwqCj ySAAAiAQIwLQoRgFA66AAAiAQAoJQIdSGHQ0GQRAAARiRAA6FKNgwBUQAAEQSCEB6FAKg44mgwAI gECMCECHYhQMuAICIAACKSQAHUph0NFkEAABEIgRAehQjIIBV0AABEAghQSgQykMOpoMAiAAAjEi AB2KUTDgCgiAAAikkADXoc1ntO5rbtmWwvajySAAAiAAAtESgA5Fyx+1gwAIgEDaCUCH0t4D0H4Q AAEQiJYAdCha/qgdBEAABNJOADqU9h6A9oMACIBAtASgQ9HyR+0gAAIgkHYC0KG09wC0HwRAAASi JfD/q4TcKuA6T+8AAAAASUVORK5CYII= 59583 2010-06-23 17:10:42 -0700 2010-06-25 17:46:59 -0700 Patch bug-41113-20100624001042.patch text/plain 2499 mrobinson ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg NDY4NzM0YmZhY2RiNDJkYzMzMDNhNTRkZjBhZjQwZTc1YTFhZDk5MC4uYjkyODhhZTc5NjAwMDE2 YmY4ZDYzYjFlNWMzMmFlM2Q5ZmI1YmZkNyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOSBAQAorMjAxMC0wNi0yNCAgTWFy dGluIFJvYmluc29uICA8bWFydGluLmphbWVzLnJvYmluc29uQGdtYWlsLmNvbT4KKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbV2luQ2Fpcm9dIFRleHQg Ym94IGJhY2tncm91bmRzIGRvIG5vdCByZW5kZXIgaW4gcGFydGlhbGx5IG9wYXF1ZSBsYXllcnMK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQxMTEzCisK KyAgICAgICAgRnVuY3Rpb25hbGl0eSB1bmNoYW5nZWQsIG5vIG5ldyB0ZXN0cy4KKworICAgICAg ICAqIHBsYXRmb3JtL2dyYXBoaWNzL3dpbi9HcmFwaGljc0NvbnRleHRDYWlyb1dpbi5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0NvbnRleHQ6OnJlbGVhc2VXaW5kb3dzQ29udGV4dCk6 CisgICAgICAgIFdoZW4gcmVzdG9yaW5nIGEgY29udGV4dCB3aGljaCBkb2VzIG5vdCBzdXBwb3J0 IGFscGhhIGJsZW5kaW5nLCBtYW51YWxseQorICAgICAgICBzZXQgdGhlIGFscGhhIGNoYW5uZWwg b2YgdGhlIEhCSVRNQVAgdG8gZnVsbHkgb3BhcXVlLiBUaGlzIHdpbGwgZWZmZWN0aXZlbHkKKyAg ICAgICAgaWdub3JlIHRoZSBhbHBoYSBjaGFubmVsIG9mIHRoZSBIQklUTUFQLCB3aGljaCBpcyBu ZWNlc3NhcnkgYmVjYXVzZSBHREkKKyAgICAgICAgZHJhd2luZyBmdW5jdGlvbnMgc2V0IHRoZSBh bHBoYSB2YWx1ZSB0byBiZSBmdWxseSB0cmFuc3BhcmVudCAoMCkuCisKIDIwMTAtMDYtMjMgIE1h cnRpbiBSb2JpbnNvbiAgPG1hcnRpbi5qYW1lcy5yb2JpbnNvbkBnbWFpbC5jb20+CiAKICAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCmRpZmYgLS1naXQgYS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL3dpbi9HcmFwaGljc0NvbnRleHRDYWlyb1dpbi5jcHAgYi9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL3dpbi9HcmFwaGljc0NvbnRleHRDYWlyb1dpbi5jcHAKaW5kZXggZDkx MmNiNTUwYjdlZWZlZDEwNGZmZGVjYmYxYjNlOGFhYmY5NGJjNy4uM2MyMGVmNzRiNThkMjY1NTli OThlYzA5Njk4MWVjY2ZiODkzMDc2MyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy93aW4vR3JhcGhpY3NDb250ZXh0Q2Fpcm9XaW4uY3BwCisrKyBiL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3Mvd2luL0dyYXBoaWNzQ29udGV4dENhaXJvV2luLmNwcApAQCAtMTAwLDkgKzEw MCwxNyBAQCB2b2lkIEdyYXBoaWNzQ29udGV4dDo6cmVsZWFzZVdpbmRvd3NDb250ZXh0KEhEQyBo ZGMsIGNvbnN0IEludFJlY3QmIGRzdFJlY3QsIGJvbwogICAgIEdldE9iamVjdChiaXRtYXAsIHNp emVvZihpbmZvKSwgJmluZm8pOwogICAgIEFTU0VSVChpbmZvLmJtQml0c1BpeGVsID09IDMyKTsK IAorICAgIC8vIElmIHRoaXMgY29udGV4dCBkb2VzIG5vdCBzdXBwb3J0IGFscGhhIGJsZW5kaW5n LCB0aGVuIGl0IG1heSBoYXZlCisgICAgLy8gYmVlbiBkcmF3biB3aXRoIEdESSBmdW5jdGlvbnMg d2hpY2ggYWx3YXlzIHNldCB0aGUgYWxwaGEgY2hhbm5lbAorICAgIC8vIHRvIHplcm8uIFdlIG5l ZWQgdG8gbWFudWFsbHkgc2V0IHRoZSBiaXRtYXAgdG8gYmUgZnVsbHkgb3BhcXVlLgorICAgIHVu c2lnbmVkIGNoYXIqIGJ5dGVzID0gcmVpbnRlcnByZXRfY2FzdDx1bnNpZ25lZCBjaGFyKj4oaW5m by5ibUJpdHMpOworICAgIGlmICghc3VwcG9ydEFscGhhQmxlbmQpCisgICAgICAgIGZvciAoc2l6 ZV90IGkgPSAwOyBpIDwgaW5mby5ibUhlaWdodCAqIGluZm8uYm1XaWR0aEJ5dGVzOyBpICs9IDQp CisgICAgICAgICAgICBieXRlc1tpICsgM10gPSAyNTU7CisKICAgICAvLyBOZWVkIHRvIG1ha2Ug YSBjYWlyb19zdXJmYWNlX3Qgb3V0IG9mIHRoZSBiaXRtYXAncyBwaXhlbCBidWZmZXIgYW5kIHRo ZW4gZHJhdwogICAgIC8vIGl0IGludG8gb3VyIGNvbnRleHQuCi0gICAgY2Fpcm9fc3VyZmFjZV90 KiBpbWFnZSA9IGNhaXJvX2ltYWdlX3N1cmZhY2VfY3JlYXRlX2Zvcl9kYXRhKCh1bnNpZ25lZCBj aGFyKilpbmZvLmJtQml0cywKKyAgICBjYWlyb19zdXJmYWNlX3QqIGltYWdlID0gY2Fpcm9faW1h Z2Vfc3VyZmFjZV9jcmVhdGVfZm9yX2RhdGEoYnl0ZXMsCiAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIENBSVJPX0ZPUk1BVF9BUkdCMzIsCiAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGluZm8uYm1XaWR0aCwKICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgaW5mby5ibUhlaWdodCwK 59818 2010-06-25 17:47:01 -0700 2010-06-28 09:02:03 -0700 Patch including manual test bug-41113-20100626004700.patch text/plain 3869 mrobinson ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg NzU4ZmRiMjZjMDQ2NTdkZmEwNjA4OTU0OWMwMWJkY2UzMjNiMjY0MC4uNjc2ZDk0ZTY1ODllNGY1 MDgzMGFhNWI3NjZjMTc1ZjVhZGQwOTdkNCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMCBAQAorMjAxMC0wNi0yNCAgTWFy dGluIFJvYmluc29uICA8bWFydGluLmphbWVzLnJvYmluc29uQGdtYWlsLmNvbT4KKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbV2luQ2Fpcm9dIFRleHQg Ym94IGJhY2tncm91bmRzIGRvIG5vdCByZW5kZXIgaW4gcGFydGlhbGx5IG9wYXF1ZSBsYXllcnMK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQxMTEzCisK KyAgICAgICAgVGVzdHM6CisgICAgICAgICBtYW51YWwtdGVzdHMvcGFydGlhbGx5LW9wYXF1ZS10 ZXh0LWlucHV0Lmh0bWwKKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL3dpbi9HcmFwaGlj c0NvbnRleHRDYWlyb1dpbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0NvbnRleHQ6 OnJlbGVhc2VXaW5kb3dzQ29udGV4dCk6CisgICAgICAgIFdoZW4gcmVzdG9yaW5nIGEgY29udGV4 dCB3aGljaCBkb2VzIG5vdCBzdXBwb3J0IGFscGhhIGJsZW5kaW5nLCBtYW51YWxseQorICAgICAg ICBzZXQgdGhlIGFscGhhIGNoYW5uZWwgb2YgdGhlIEhCSVRNQVAgdG8gZnVsbHkgb3BhcXVlLiBU aGlzIHdpbGwgZWZmZWN0aXZlbHkKKyAgICAgICAgaWdub3JlIHRoZSBhbHBoYSBjaGFubmVsIG9m IHRoZSBIQklUTUFQLCB3aGljaCBpcyBuZWNlc3NhcnkgYmVjYXVzZSBHREkKKyAgICAgICAgZHJh d2luZyBmdW5jdGlvbnMgc2V0IHRoZSBhbHBoYSB2YWx1ZSB0byBiZSBmdWxseSB0cmFuc3BhcmVu dCAoMCkuCisKIDIwMTAtMDYtMjMgIE1hcnRpbiBSb2JpbnNvbiAgPG1hcnRpbi5qYW1lcy5yb2Jp bnNvbkBnbWFpbC5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCmRp ZmYgLS1naXQgYS9XZWJDb3JlL21hbnVhbC10ZXN0cy9wYXJ0aWFsbHktb3BhcXVlLXRleHQtaW5w dXQuaHRtbCBiL1dlYkNvcmUvbWFudWFsLXRlc3RzL3BhcnRpYWxseS1vcGFxdWUtdGV4dC1pbnB1 dC5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAuLmJlZjE0N2VkYzkyYWRmMWI5NGZkMTMzODhkOWM2Y2UxNzAxY2U4 YmIKLS0tIC9kZXYvbnVsbAorKysgYi9XZWJDb3JlL21hbnVhbC10ZXN0cy9wYXJ0aWFsbHktb3Bh cXVlLXRleHQtaW5wdXQuaHRtbApAQCAtMCwwICsxLDI1IEBACis8aHRtbD4KKzxzdHlsZT4KKyAg ICBib2R5IHsgb3BhY2l0eTogMC41OyB9Cis8L3N0eWxlPgorPGJvZHk+IAorPHA+PGI+QlVHIElE OjwvYj4gPGEgaHJlZj0iaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQx MTEzIj5CdWd6aWxsYSBidWcgNDExMTM8L2E+IFtXaW5DYWlyb10gVGV4dCBib3ggYmFja2dyb3Vu ZHMgZG8gbm90IHJlbmRlciBpbiBwYXJ0aWFsbHkgb3BhcXVlIGxheWVyczwvcD4KKworPGRpdiBz dHlsZT0iYmFja2dyb3VuZC1jb2xvcjpza3libHVlOyBwYWRkaW5nOjNweDsiPgorSW4gdGhlIG5l eHQgcGFyYWdyYXBoIHlvdSBzaG91bGQgc2VlIGEgcGFydGlhbGx5IG9wYXF1ZSBzZXF1ZW5jZSBp bmNsdWRpbmc6Cis8b2w+Cis8bGk+VGhlIHdvcmQgIkJlZm9yZSI8L2xpPgorPGxpPkEgdGV4dCBi b3g8L2xpPgorPGxpPlRoZSB3b3JsZCAiQWZ0ZXIiPC9saT4KKzwvb2w+CitJZiB0aGlzIHRlc3Qg aXMgZmFpbGluZyB5b3Ugd2lsbCBub3Qgc2VlIHRoZSB0ZXh0IGJveCBib3JkZXIuCis8L2Rpdj4K KworPHA+CitCZWZvcmUKKzxpbnB1dCB0eXBlPSJ0ZXh0Ii8+CitBZnRlcgorPC9wPgorCis8L2Jv ZHk+IAorPC9odG1sPgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy93aW4v R3JhcGhpY3NDb250ZXh0Q2Fpcm9XaW4uY3BwIGIvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy93 aW4vR3JhcGhpY3NDb250ZXh0Q2Fpcm9XaW4uY3BwCmluZGV4IGQ5MTJjYjU1MGI3ZWVmZWQxMDRm ZmRlY2JmMWIzZThhYWJmOTRiYzcuLjk0ZGY2YWU2ZTMxYWY5NjYwY2VkZTkzYWViZjNhODk0MmJj ZDhjMTQgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvd2luL0dyYXBoaWNz Q29udGV4dENhaXJvV2luLmNwcAorKysgYi9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3dpbi9H cmFwaGljc0NvbnRleHRDYWlyb1dpbi5jcHAKQEAgLTg0LDYgKzg0LDEyIEBAIEdyYXBoaWNzQ29u dGV4dDo6R3JhcGhpY3NDb250ZXh0KEhEQyBkYywgYm9vbCBoYXNBbHBoYSkKICAgICB9CiB9CiAK K3N0YXRpYyB2b2lkIHNldFJHQkFCaXRtYXBBbHBoYSh1bnNpZ25lZCBjaGFyKiBieXRlcywgc2l6 ZV90IGxlbmd0aCwgdW5zaWduZWQgY2hhciBsZXZlbCkKK3sKKyAgICBmb3IgKHNpemVfdCBpID0g MDsgaSA8IGxlbmd0aDsgaSArPSA0KQorICAgICAgICBieXRlc1tpICsgM10gPSBsZXZlbDsKK30K Kwogdm9pZCBHcmFwaGljc0NvbnRleHQ6OnJlbGVhc2VXaW5kb3dzQ29udGV4dChIREMgaGRjLCBj b25zdCBJbnRSZWN0JiBkc3RSZWN0LCBib29sIHN1cHBvcnRBbHBoYUJsZW5kLCBib29sIG1heUNy ZWF0ZUJpdG1hcCkKIHsKICAgICBpZiAoIW1heUNyZWF0ZUJpdG1hcCB8fCAhaGRjIHx8ICFpblRy YW5zcGFyZW5jeUxheWVyKCkpIHsKQEAgLTEwMCw5ICsxMDYsMTYgQEAgdm9pZCBHcmFwaGljc0Nv bnRleHQ6OnJlbGVhc2VXaW5kb3dzQ29udGV4dChIREMgaGRjLCBjb25zdCBJbnRSZWN0JiBkc3RS ZWN0LCBib28KICAgICBHZXRPYmplY3QoYml0bWFwLCBzaXplb2YoaW5mbyksICZpbmZvKTsKICAg ICBBU1NFUlQoaW5mby5ibUJpdHNQaXhlbCA9PSAzMik7CiAKKyAgICAvLyBJZiB0aGlzIGNvbnRl eHQgZG9lcyBub3Qgc3VwcG9ydCBhbHBoYSBibGVuZGluZywgdGhlbiBpdCBtYXkgaGF2ZQorICAg IC8vIGJlZW4gZHJhd24gd2l0aCBHREkgZnVuY3Rpb25zIHdoaWNoIGFsd2F5cyBzZXQgdGhlIGFs cGhhIGNoYW5uZWwKKyAgICAvLyB0byB6ZXJvLiBXZSBuZWVkIHRvIG1hbnVhbGx5IHNldCB0aGUg Yml0bWFwIHRvIGJlIGZ1bGx5IG9wYXF1ZS4KKyAgICB1bnNpZ25lZCBjaGFyKiBieXRlcyA9IHJl aW50ZXJwcmV0X2Nhc3Q8dW5zaWduZWQgY2hhcio+KGluZm8uYm1CaXRzKTsKKyAgICBpZiAoIXN1 cHBvcnRBbHBoYUJsZW5kKQorICAgICAgICBzZXRSR0JBQml0bWFwQWxwaGEoYnl0ZXMsIGluZm8u Ym1IZWlnaHQgKiBpbmZvLmJtV2lkdGhCeXRlcywgMjU1KTsKKwogICAgIC8vIE5lZWQgdG8gbWFr ZSBhIGNhaXJvX3N1cmZhY2VfdCBvdXQgb2YgdGhlIGJpdG1hcCdzIHBpeGVsIGJ1ZmZlciBhbmQg dGhlbiBkcmF3CiAgICAgLy8gaXQgaW50byBvdXIgY29udGV4dC4KLSAgICBjYWlyb19zdXJmYWNl X3QqIGltYWdlID0gY2Fpcm9faW1hZ2Vfc3VyZmFjZV9jcmVhdGVfZm9yX2RhdGEoKHVuc2lnbmVk IGNoYXIqKWluZm8uYm1CaXRzLAorICAgIGNhaXJvX3N1cmZhY2VfdCogaW1hZ2UgPSBjYWlyb19p bWFnZV9zdXJmYWNlX2NyZWF0ZV9mb3JfZGF0YShieXRlcywKICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgQ0FJUk9fRk9STUFUX0FSR0IzMiwKICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgaW5mby5ibVdpZHRoLAogICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBpbmZvLmJtSGVpZ2h0LAo=