55170 2011-02-24 12:02:07 -0800 ImageBuffer::clip creates an image of the incorrect context in IOSurface case 2011-02-24 18:08:17 -0800 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 mdelaney7 mdelaney7 simon.fraser oldest_to_newest 357246 0 mdelaney7 2011-02-24 12:02:07 -0800 Currently, when using IOSURFACE_CANVAS_BACKING_STORE, we're creating an image of the passed in context instead of the context of the imageBuffer (the correct one). This patch will serve to fix that. The code fix is tiny, but I'm searching for clients of ImageBuffer::clip that would have been affected by this. Specifically, these clients must be creating ImageBuffers that use IOSurfaces as the backing store. At the moment, this is only CanvasRenderingContext2d. So, I suspect the reason I didn't notice this sooner is because this code path isn't being used. It does appear that CanvasRenderingContext2D::drawTextInternal uses it though. Will investigate that now. 357267 1 83697 mdelaney7 2011-02-24 12:21:45 -0800 Created attachment 83697 Patch 357354 2 83697 simon.fraser 2011-02-24 13:54:04 -0800 Comment on attachment 83697 Patch Would be nice to make a test case for this. 357403 3 83723 mdelaney7 2011-02-24 14:35:52 -0800 Created attachment 83723 Patch 357416 4 83723 simon.fraser 2011-02-24 14:45:17 -0800 Comment on attachment 83723 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=83723&action=review > Source/WebCore/platform/graphics/cg/ImageBufferCG.cpp:249 > +void ImageBuffer::clip(GraphicsContext* clippingContext, const FloatRect& rect) const > { > - CGContextRef platformContext = context->platformContext(); > + CGContextRef platformContext = clippingContext->platformContext(); I don't find that clippingContext clarifies much. Is the one doing clipping, or being clipped? Also, if you use this naming, platformContext should be platformClippingContext. > LayoutTests/fast/canvas/2d.fillText.gradient.html:2 > +<title>2d.fillText.gradient.html</title> The title doesn't help anything; the browser will show the filename in the titlebar if there is no <title>. > LayoutTests/fast/canvas/2d.fillText.gradient.html:6 > +<p>On success, the square should appear entirely green. On failure, the red back should show through.</p> > +<canvas id="c" class="output" width="100" height="100"><p class="fallback">FAIL (fallback content)</p></canvas> > +<div id="console"></div> Is this wording correct? I thought the failure mode was to paint too much. > LayoutTests/fast/canvas/2d.fillText.gradient.html:20 > + ctx.font = "1000px Times"; You could use the Ahem font to get a rectangle. > LayoutTests/fast/canvas/2d.fillText.gradient.html:35 > +var renderedCorrectly = true; > +var imageData = ctx.getImageData(0,0,50,50); > +if (imageData.data[0] != 0) renderedCorrectly = false; > +if (imageData.data[1] != 255) renderedCorrectly = false; > +if (imageData.data[2] != 0) renderedCorrectly = false; > +if (imageData.data[3] != 255) renderedCorrectly = false; You should also test that pixels outside of the glyph are not affected by the gradient. > LayoutTests/fast/canvas/2d.fillText.gradient.html:45 > +</html> > \ No newline at end of file Please fix that. > LayoutTests/platform/mac/fast/canvas/2d.fillText.gradient-expected.txt:15 > +layer at (0,0) size 800x600 > + RenderView at (0,0) size 800x600 > +layer at (0,0) size 800x180 > + RenderBlock {HTML} at (0,0) size 800x180 > + RenderBody {BODY} at (8,16) size 784x156 > + RenderBlock {P} at (0,0) size 784x18 > + RenderText {#text} at (0,0) size 623x18 > + text run at (0,0) width 623: "On success, the square should appear entirely green. On failure, the red back should show through." > + RenderBlock (anonymous) at (0,34) size 784x104 > + RenderText {#text} at (0,0) size 0x0 > + RenderBlock {DIV} at (0,138) size 784x18 > + RenderText {#text} at (0,0) size 124x18 > + text run at (0,0) width 124: "Rendered correctly." > +layer at (8,50) size 100x100 > + RenderHTMLCanvas {CANVAS} at (0,0) size 100x100 This should be a dumpAsText(). 357443 5 83727 mdelaney7 2011-02-24 15:15:44 -0800 Created attachment 83727 Patch 357614 6 mdelaney7 2011-02-24 18:08:17 -0800 Committed r79651: <http://trac.webkit.org/changeset/79651> 83697 2011-02-24 12:21:45 -0800 2011-02-24 14:35:49 -0800 Patch bug-55170-20110224122144.patch text/plain 1892 mdelaney7 SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDc5NjAxKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTEtMDItMjQgIE1hdHRoZXcg RGVsYW5leSAgPG1kZWxhbmV5QGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBJbWFnZUJ1ZmZlcjo6Y2xpcCBjcmVhdGVzIGFuIGltYWdl IG9mIHRoZSBpbmNvcnJlY3QgY29udGV4dCBpbiBJT1N1cmZhY2UgY2FzZQorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTUxNzAKKworICAgICAgICBObyBu ZXcgdGVzdHMuIEN1cnJlbnRseSwgdGhlcmUgZXhpc3Qgbm8gY2xpZW50cyB3aG9zZSBiZWh2YXZp b3IgaXMgYWZmZWN0ZWQuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jZy9JbWFnZUJ1 ZmZlckNHLmNwcDogQ2xpcHBpbmcgYWdhaW5zdCBJbWFnZUJ1ZmZlcidzIGNvbnRleHQKKyAgICAg ICAgaW5zdGVhZCBvZiBvdXJzZWxmICh0aGUgcGFzc2VkIGluIGNvbnRleHQpLgorCiAyMDExLTAy LTI0ICBNaXNoYSBUeXV0eXVuaWsgIDxtaWNoYWVsLnR5dXR5dW5pa0Bub2tpYS5jb20+CiAKICAg ICAgICAgUmV2aWV3ZWQgYnkgQW5kcmVhcyBLbGluZy4KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2NnL0ltYWdlQnVmZmVyQ0cuY3BwCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NnL0ltYWdlQnVmZmVyQ0cuY3BwCShyZXZpc2lv biA3OTQ1MikKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NnL0ltYWdlQnVm ZmVyQ0cuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yNDQsMTUgKzI0NCwxNSBAQCB2b2lkIEltYWdl QnVmZmVyOjpkcmF3UGF0dGVybihHcmFwaGljc0NvCiAgICAgfQogfQogCi12b2lkIEltYWdlQnVm ZmVyOjpjbGlwKEdyYXBoaWNzQ29udGV4dCogY29udGV4dCwgY29uc3QgRmxvYXRSZWN0JiByZWN0 KSBjb25zdAordm9pZCBJbWFnZUJ1ZmZlcjo6Y2xpcChHcmFwaGljc0NvbnRleHQqIGNsaXBwaW5n Q29udGV4dCwgY29uc3QgRmxvYXRSZWN0JiByZWN0KSBjb25zdAogewotICAgIENHQ29udGV4dFJl ZiBwbGF0Zm9ybUNvbnRleHQgPSBjb250ZXh0LT5wbGF0Zm9ybUNvbnRleHQoKTsKKyAgICBDR0Nv bnRleHRSZWYgcGxhdGZvcm1Db250ZXh0ID0gY2xpcHBpbmdDb250ZXh0LT5wbGF0Zm9ybUNvbnRl eHQoKTsKICAgICBSZXRhaW5QdHI8Q0dJbWFnZVJlZj4gaW1hZ2U7CiAgICAgaWYgKCFtX2FjY2Vs ZXJhdGVSZW5kZXJpbmcpCiAgICAgICAgIGltYWdlLmFkb3B0Q0YoY2dJbWFnZShtX3NpemUsIG1f ZGF0YSkpOwogI2lmIFVTRShJT1NVUkZBQ0VfQ0FOVkFTX0JBQ0tJTkdfU1RPUkUpCiAgICAgZWxz ZQotICAgICAgICBpbWFnZS5hZG9wdENGKHdrSU9TdXJmYWNlQ29udGV4dENyZWF0ZUltYWdlKHBs YXRmb3JtQ29udGV4dCkpOworICAgICAgICBpbWFnZS5hZG9wdENGKHdrSU9TdXJmYWNlQ29udGV4 dENyZWF0ZUltYWdlKGNvbnRleHQoKS0+cGxhdGZvcm1Db250ZXh0KCkpKTsKICNlbmRpZgogICAg IENHQ29udGV4dFRyYW5zbGF0ZUNUTShwbGF0Zm9ybUNvbnRleHQsIHJlY3QueCgpLCByZWN0Lnko KSArIHJlY3QuaGVpZ2h0KCkpOwogICAgIENHQ29udGV4dFNjYWxlQ1RNKHBsYXRmb3JtQ29udGV4 dCwgMSwgLTEpOwo= 83723 2011-02-24 14:35:52 -0800 2011-02-24 15:15:41 -0800 Patch bug-55170-20110224143551.patch text/plain 5377 mdelaney7 SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDc5NjIyKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTEtMDItMjQgIE1hdHRoZXcg RGVsYW5leSAgPG1kZWxhbmV5QGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBJbWFnZUJ1ZmZlcjo6Y2xpcCBjcmVhdGVzIGFuIGltYWdl IG9mIHRoZSBpbmNvcnJlY3QgY29udGV4dCBpbiBJT1N1cmZhY2UgY2FzZQorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTUxNzAKKworICAgICAgICBUZXN0 OiBmYXN0L2NhbnZhcy8yZC5maWxsVGV4dC5ncmFkaWVudC5odG1sCisKKyAgICAgICAgKiBwbGF0 Zm9ybS9ncmFwaGljcy9jZy9JbWFnZUJ1ZmZlckNHLmNwcDogQ2xpcHBpbmcgYWdhaW5zdCBJbWFn ZUJ1ZmZlcidzIGNvbnRleHQKKyAgICAgICAgaW5zdGVhZCBvZiBvdXJzZWxmICh0aGUgcGFzc2Vk IGluIGNvbnRleHQpLgorCiAyMDExLTAyLTI0ICBKYW1lcyBSb2JpbnNvbiAgPGphbWVzckBjaHJv bWl1bS5vcmc+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgcm9sbGluZyBvdXQgcjc5NjA0LgpJbmRl eDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2cvSW1hZ2VCdWZmZXJDRy5jcHAK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2cvSW1hZ2VC dWZmZXJDRy5jcHAJKHJldmlzaW9uIDc5NDUyKQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvY2cvSW1hZ2VCdWZmZXJDRy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTI0NCwxNSAr MjQ0LDE1IEBAIHZvaWQgSW1hZ2VCdWZmZXI6OmRyYXdQYXR0ZXJuKEdyYXBoaWNzQ28KICAgICB9 CiB9CiAKLXZvaWQgSW1hZ2VCdWZmZXI6OmNsaXAoR3JhcGhpY3NDb250ZXh0KiBjb250ZXh0LCBj b25zdCBGbG9hdFJlY3QmIHJlY3QpIGNvbnN0Cit2b2lkIEltYWdlQnVmZmVyOjpjbGlwKEdyYXBo aWNzQ29udGV4dCogY2xpcHBpbmdDb250ZXh0LCBjb25zdCBGbG9hdFJlY3QmIHJlY3QpIGNvbnN0 CiB7Ci0gICAgQ0dDb250ZXh0UmVmIHBsYXRmb3JtQ29udGV4dCA9IGNvbnRleHQtPnBsYXRmb3Jt Q29udGV4dCgpOworICAgIENHQ29udGV4dFJlZiBwbGF0Zm9ybUNvbnRleHQgPSBjbGlwcGluZ0Nv bnRleHQtPnBsYXRmb3JtQ29udGV4dCgpOwogICAgIFJldGFpblB0cjxDR0ltYWdlUmVmPiBpbWFn ZTsKICAgICBpZiAoIW1fYWNjZWxlcmF0ZVJlbmRlcmluZykKICAgICAgICAgaW1hZ2UuYWRvcHRD RihjZ0ltYWdlKG1fc2l6ZSwgbV9kYXRhKSk7CiAjaWYgVVNFKElPU1VSRkFDRV9DQU5WQVNfQkFD S0lOR19TVE9SRSkKICAgICBlbHNlCi0gICAgICAgIGltYWdlLmFkb3B0Q0Yod2tJT1N1cmZhY2VD b250ZXh0Q3JlYXRlSW1hZ2UocGxhdGZvcm1Db250ZXh0KSk7CisgICAgICAgIGltYWdlLmFkb3B0 Q0Yod2tJT1N1cmZhY2VDb250ZXh0Q3JlYXRlSW1hZ2UoY29udGV4dCgpLT5wbGF0Zm9ybUNvbnRl eHQoKSkpOwogI2VuZGlmCiAgICAgQ0dDb250ZXh0VHJhbnNsYXRlQ1RNKHBsYXRmb3JtQ29udGV4 dCwgcmVjdC54KCksIHJlY3QueSgpICsgcmVjdC5oZWlnaHQoKSk7CiAgICAgQ0dDb250ZXh0U2Nh bGVDVE0ocGxhdGZvcm1Db250ZXh0LCAxLCAtMSk7CkluZGV4OiBMYXlvdXRUZXN0cy9DaGFuZ2VM b2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCShyZXZpc2lvbiA3OTYyMikK KysrIExheW91dFRlc3RzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE0IEBA CisyMDExLTAyLTI0ICBNYXR0aGV3IERlbGFuZXkgIDxtZGVsYW5leUBhcHBsZS5jb20+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSW1hZ2VCdWZmZXI6 OmNsaXAgY3JlYXRlcyBhbiBpbWFnZSBvZiB0aGUgaW5jb3JyZWN0IGNvbnRleHQgaW4gSU9TdXJm YWNlIGNhc2UKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTU1MTcwCisKKyAgICAgICAgKiBmYXN0L2NhbnZhcy8yZC5maWxsVGV4dC5ncmFkaWVudC5odG1s OiBBZGRlZC4gRHJhd3MgYSBoaWdoICJJIiB3aXRoIGFuIGFsbC1ncmVlbgorICAgICAgICBncmFk aWVudCBvdmVyIGEgcHJldmlvdXNseSByZWQgY2FudmFzLiBDaGVja3MgaWYgbWlkZGxlIHBpeGVs IGlzIGdyZWVuIHRvIG1ha2Ugc3VyZQorICAgICAgICB0aGUgZmlsbCB0ZXh0IHdpdGggYSBmaWxs U3R5bGUgb2YgdGhlIGdyYWRpZW50IGRyZXcuCisKIDIwMTEtMDItMjQgIE1paGFpIFBhcnBhcml0 YSAgPG1paGFpcEBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgVW5yZXZpZXdlZCBDaHJvbWl1bSBT bm93IExlb3BhcmQgZXhwZWN0YXRpb25zIHVwZGF0ZS4KSW5kZXg6IExheW91dFRlc3RzL2Zhc3Qv Y2FudmFzLzJkLmZpbGxUZXh0LmdyYWRpZW50Lmh0bWwKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVz dHMvZmFzdC9jYW52YXMvMmQuZmlsbFRleHQuZ3JhZGllbnQuaHRtbAkocmV2aXNpb24gMCkKKysr IExheW91dFRlc3RzL2Zhc3QvY2FudmFzLzJkLmZpbGxUZXh0LmdyYWRpZW50Lmh0bWwJKHJldmlz aW9uIDApCkBAIC0wLDAgKzEsNDQgQEAKKzwhRE9DVFlQRSBodG1sPgorPHRpdGxlPjJkLmZpbGxU ZXh0LmdyYWRpZW50Lmh0bWw8L3RpdGxlPgorPGJvZHk+Cis8cD5PbiBzdWNjZXNzLCB0aGUgc3F1 YXJlIHNob3VsZCBhcHBlYXIgZW50aXJlbHkgZ3JlZW4uIE9uIGZhaWx1cmUsIHRoZSByZWQgYmFj ayBzaG91bGQgc2hvdyB0aHJvdWdoLjwvcD4KKzxjYW52YXMgaWQ9ImMiIGNsYXNzPSJvdXRwdXQi IHdpZHRoPSIxMDAiIGhlaWdodD0iMTAwIj48cCBjbGFzcz0iZmFsbGJhY2siPkZBSUwgKGZhbGxi YWNrIGNvbnRlbnQpPC9wPjwvY2FudmFzPgorPGRpdiBpZD0iY29uc29sZSI+PC9kaXY+CisKKzxz Y3JpcHQ+CisKK2Z1bmN0aW9uIGRyYXdDYW52YXMoY3R4KSB7CisKKyAgY3R4LmZpbGxTdHlsZSA9 ICcjZjAwJzsKKyAgY3R4LmZpbGxSZWN0KDAsMCwxMDAsMTAwKTsKKworICB2YXIgZ3JhZGllbnQg PSBjdHguY3JlYXRlTGluZWFyR3JhZGllbnQoMCwgMCwgMTAwLCAxMDApOworICBncmFkaWVudC5h ZGRDb2xvclN0b3AoMCwgJyMwZjAnKTsKKyAgZ3JhZGllbnQuYWRkQ29sb3JTdG9wKDEsICcjMGYw Jyk7CisKKyAgY3R4LmZpbGxTdHlsZSA9IGdyYWRpZW50OworICBjdHguZm9udCA9ICIxMDAwcHgg VGltZXMiOworCisgIGN0eC5maWxsVGV4dCgiSSIsIC0xMTUsIDEwMCk7Cit9CisKK3ZhciBjYW52 YXMgPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgnYycpOwordmFyIGN0eCA9IGNhbnZhcy5nZXRD b250ZXh0KCIyZCIpOworZHJhd0NhbnZhcyhjdHgpOworCisvLyBDaGVjayB0aGF0IHRoZSBsZXR0 ZXIgcmVuZGVyZWQgYXBwcm9wcmlhdGVseQordmFyIHJlbmRlcmVkQ29ycmVjdGx5ID0gdHJ1ZTsK K3ZhciBpbWFnZURhdGEgPSBjdHguZ2V0SW1hZ2VEYXRhKDAsMCw1MCw1MCk7CitpZiAoaW1hZ2VE YXRhLmRhdGFbMF0gIT0gMCkgcmVuZGVyZWRDb3JyZWN0bHkgPSBmYWxzZTsKK2lmIChpbWFnZURh dGEuZGF0YVsxXSAhPSAyNTUpIHJlbmRlcmVkQ29ycmVjdGx5ID0gZmFsc2U7CitpZiAoaW1hZ2VE YXRhLmRhdGFbMl0gIT0gMCkgcmVuZGVyZWRDb3JyZWN0bHkgPSBmYWxzZTsKK2lmIChpbWFnZURh dGEuZGF0YVszXSAhPSAyNTUpIHJlbmRlcmVkQ29ycmVjdGx5ID0gZmFsc2U7CisKK2lmICghcmVu ZGVyZWRDb3JyZWN0bHkpCisJZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoImNvbnNvbGUiKS5pbm5l ckhUTUwgPSAiRmFpbGVkIHRvIHJlbmRlciBjb3JyZWN0bHkuIjsKK2Vsc2UKKwlkb2N1bWVudC5n ZXRFbGVtZW50QnlJZCgiY29uc29sZSIpLmlubmVySFRNTCA9ICJSZW5kZXJlZCBjb3JyZWN0bHku IjsKKworPC9zY3JpcHQ+Cis8L2JvZHk+Cis8L2h0bWw+ClwgTm8gbmV3bGluZSBhdCBlbmQgb2Yg ZmlsZQpJbmRleDogTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL2Zhc3QvY2FudmFzLzJkLmZpbGxU ZXh0LmdyYWRpZW50LWV4cGVjdGVkLnR4dAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9wbGF0 Zm9ybS9tYWMvZmFzdC9jYW52YXMvMmQuZmlsbFRleHQuZ3JhZGllbnQtZXhwZWN0ZWQudHh0CShy ZXZpc2lvbiAwKQorKysgTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL2Zhc3QvY2FudmFzLzJkLmZp bGxUZXh0LmdyYWRpZW50LWV4cGVjdGVkLnR4dAkocmV2aXNpb24gMCkKQEAgLTAsMCArMSwxNSBA QAorbGF5ZXIgYXQgKDAsMCkgc2l6ZSA4MDB4NjAwCisgIFJlbmRlclZpZXcgYXQgKDAsMCkgc2l6 ZSA4MDB4NjAwCitsYXllciBhdCAoMCwwKSBzaXplIDgwMHgxODAKKyAgUmVuZGVyQmxvY2sge0hU TUx9IGF0ICgwLDApIHNpemUgODAweDE4MAorICAgIFJlbmRlckJvZHkge0JPRFl9IGF0ICg4LDE2 KSBzaXplIDc4NHgxNTYKKyAgICAgIFJlbmRlckJsb2NrIHtQfSBhdCAoMCwwKSBzaXplIDc4NHgx OAorICAgICAgICBSZW5kZXJUZXh0IHsjdGV4dH0gYXQgKDAsMCkgc2l6ZSA2MjN4MTgKKyAgICAg ICAgICB0ZXh0IHJ1biBhdCAoMCwwKSB3aWR0aCA2MjM6ICJPbiBzdWNjZXNzLCB0aGUgc3F1YXJl IHNob3VsZCBhcHBlYXIgZW50aXJlbHkgZ3JlZW4uIE9uIGZhaWx1cmUsIHRoZSByZWQgYmFjayBz aG91bGQgc2hvdyB0aHJvdWdoLiIKKyAgICAgIFJlbmRlckJsb2NrIChhbm9ueW1vdXMpIGF0ICgw LDM0KSBzaXplIDc4NHgxMDQKKyAgICAgICAgUmVuZGVyVGV4dCB7I3RleHR9IGF0ICgwLDApIHNp emUgMHgwCisgICAgICBSZW5kZXJCbG9jayB7RElWfSBhdCAoMCwxMzgpIHNpemUgNzg0eDE4Cisg ICAgICAgIFJlbmRlclRleHQgeyN0ZXh0fSBhdCAoMCwwKSBzaXplIDEyNHgxOAorICAgICAgICAg IHRleHQgcnVuIGF0ICgwLDApIHdpZHRoIDEyNDogIlJlbmRlcmVkIGNvcnJlY3RseS4iCitsYXll ciBhdCAoOCw1MCkgc2l6ZSAxMDB4MTAwCisgIFJlbmRlckhUTUxDYW52YXMge0NBTlZBU30gYXQg KDAsMCkgc2l6ZSAxMDB4MTAwCg== 83727 2011-02-24 15:15:44 -0800 2011-02-24 15:45:21 -0800 Patch bug-55170-20110224151543.patch text/plain 5795 mdelaney7 SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDc5NjIyKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTEtMDItMjQgIE1hdHRoZXcg RGVsYW5leSAgPG1kZWxhbmV5QGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBJbWFnZUJ1ZmZlcjo6Y2xpcCBjcmVhdGVzIGFuIGltYWdl IG9mIHRoZSBpbmNvcnJlY3QgY29udGV4dCBpbiBJT1N1cmZhY2UgY2FzZQorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTUxNzAKKworICAgICAgICBUZXN0 OiBmYXN0L2NhbnZhcy8yZC5maWxsVGV4dC5ncmFkaWVudC5odG1sCisKKyAgICAgICAgKiBwbGF0 Zm9ybS9ncmFwaGljcy9jZy9JbWFnZUJ1ZmZlckNHLmNwcDogQ2xpcHBpbmcgYWdhaW5zdCBJbWFn ZUJ1ZmZlcidzIGNvbnRleHQKKyAgICAgICAgaW5zdGVhZCBvZiBvdXJzZWxmICh0aGUgcGFzc2Vk IGluIGNvbnRleHQpLgorCiAyMDExLTAyLTI0ICBKYW1lcyBSb2JpbnNvbiAgPGphbWVzckBjaHJv bWl1bS5vcmc+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgcm9sbGluZyBvdXQgcjc5NjA0LgpJbmRl eDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2cvSW1hZ2VCdWZmZXJDRy5jcHAK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2cvSW1hZ2VC dWZmZXJDRy5jcHAJKHJldmlzaW9uIDc5NDUyKQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvY2cvSW1hZ2VCdWZmZXJDRy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTI0NCwyMSAr MjQ0LDIxIEBAIHZvaWQgSW1hZ2VCdWZmZXI6OmRyYXdQYXR0ZXJuKEdyYXBoaWNzQ28KICAgICB9 CiB9CiAKLXZvaWQgSW1hZ2VCdWZmZXI6OmNsaXAoR3JhcGhpY3NDb250ZXh0KiBjb250ZXh0LCBj b25zdCBGbG9hdFJlY3QmIHJlY3QpIGNvbnN0Cit2b2lkIEltYWdlQnVmZmVyOjpjbGlwKEdyYXBo aWNzQ29udGV4dCogY29udGV4dFRvQ2xpcCwgY29uc3QgRmxvYXRSZWN0JiByZWN0KSBjb25zdAog ewotICAgIENHQ29udGV4dFJlZiBwbGF0Zm9ybUNvbnRleHQgPSBjb250ZXh0LT5wbGF0Zm9ybUNv bnRleHQoKTsKKyAgICBDR0NvbnRleHRSZWYgcGxhdGZvcm1Db250ZXh0VG9DbGlwID0gY29udGV4 dFRvQ2xpcC0+cGxhdGZvcm1Db250ZXh0KCk7CiAgICAgUmV0YWluUHRyPENHSW1hZ2VSZWY+IGlt YWdlOwogICAgIGlmICghbV9hY2NlbGVyYXRlUmVuZGVyaW5nKQogICAgICAgICBpbWFnZS5hZG9w dENGKGNnSW1hZ2UobV9zaXplLCBtX2RhdGEpKTsKICNpZiBVU0UoSU9TVVJGQUNFX0NBTlZBU19C QUNLSU5HX1NUT1JFKQogICAgIGVsc2UKLSAgICAgICAgaW1hZ2UuYWRvcHRDRih3a0lPU3VyZmFj ZUNvbnRleHRDcmVhdGVJbWFnZShwbGF0Zm9ybUNvbnRleHQpKTsKKyAgICAgICAgaW1hZ2UuYWRv cHRDRih3a0lPU3VyZmFjZUNvbnRleHRDcmVhdGVJbWFnZShjb250ZXh0KCktPnBsYXRmb3JtQ29u dGV4dCgpKSk7CiAjZW5kaWYKLSAgICBDR0NvbnRleHRUcmFuc2xhdGVDVE0ocGxhdGZvcm1Db250 ZXh0LCByZWN0LngoKSwgcmVjdC55KCkgKyByZWN0LmhlaWdodCgpKTsKLSAgICBDR0NvbnRleHRT Y2FsZUNUTShwbGF0Zm9ybUNvbnRleHQsIDEsIC0xKTsKLSAgICBDR0NvbnRleHRDbGlwVG9NYXNr KHBsYXRmb3JtQ29udGV4dCwgRmxvYXRSZWN0KEZsb2F0UG9pbnQoKSwgcmVjdC5zaXplKCkpLCBp bWFnZS5nZXQoKSk7Ci0gICAgQ0dDb250ZXh0U2NhbGVDVE0ocGxhdGZvcm1Db250ZXh0LCAxLCAt MSk7Ci0gICAgQ0dDb250ZXh0VHJhbnNsYXRlQ1RNKHBsYXRmb3JtQ29udGV4dCwgLXJlY3QueCgp LCAtcmVjdC55KCkgLSByZWN0LmhlaWdodCgpKTsKKyAgICBDR0NvbnRleHRUcmFuc2xhdGVDVE0o cGxhdGZvcm1Db250ZXh0VG9DbGlwLCByZWN0LngoKSwgcmVjdC55KCkgKyByZWN0LmhlaWdodCgp KTsKKyAgICBDR0NvbnRleHRTY2FsZUNUTShwbGF0Zm9ybUNvbnRleHRUb0NsaXAsIDEsIC0xKTsK KyAgICBDR0NvbnRleHRDbGlwVG9NYXNrKHBsYXRmb3JtQ29udGV4dFRvQ2xpcCwgRmxvYXRSZWN0 KEZsb2F0UG9pbnQoKSwgcmVjdC5zaXplKCkpLCBpbWFnZS5nZXQoKSk7CisgICAgQ0dDb250ZXh0 U2NhbGVDVE0ocGxhdGZvcm1Db250ZXh0VG9DbGlwLCAxLCAtMSk7CisgICAgQ0dDb250ZXh0VHJh bnNsYXRlQ1RNKHBsYXRmb3JtQ29udGV4dFRvQ2xpcCwgLXJlY3QueCgpLCAtcmVjdC55KCkgLSBy ZWN0LmhlaWdodCgpKTsKIH0KIAogdGVtcGxhdGUgPE11bHRpcGx5IG11bHRpcGxpZWQ+CkluZGV4 OiBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvQ2hhbmdl TG9nCShyZXZpc2lvbiA3OTYyMikKKysrIExheW91dFRlc3RzL0NoYW5nZUxvZwkod29ya2luZyBj b3B5KQpAQCAtMSwzICsxLDE1IEBACisyMDExLTAyLTI0ICBNYXR0aGV3IERlbGFuZXkgIDxtZGVs YW5leUBhcHBsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgSW1hZ2VCdWZmZXI6OmNsaXAgY3JlYXRlcyBhbiBpbWFnZSBvZiB0aGUgaW5jb3Jy ZWN0IGNvbnRleHQgaW4gSU9TdXJmYWNlIGNhc2UKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTU1MTcwCisKKyAgICAgICAgKiBmYXN0L2NhbnZhcy8yZC5m aWxsVGV4dC5ncmFkaWVudC5odG1sOiBBZGRlZC4gRHJhd3MgYSBsYXJnZSAiSSIgd2l0aCBhbiBh bGwtZ3JlZW4KKyAgICAgICAgZ3JhZGllbnQgb3ZlciBhIHByZXZpb3VzbHkgcmVkIGNhbnZhcy4g Q2hlY2tzIGlmICg3NSw3NSkgcGl4ZWwgaXMgZ3JlZW4gdG8gbWFrZSBzdXJlCisgICAgICAgIHRo ZSBib3R0b20gbGVmdCBiYXNlIG9mIHRoZSBJIHdhcyBwYWludGVkLCBhbmQgY2hlY2tzICgyNSwy NSkgdG8gbWFrZSBzdXJlIHRoZSByZWQKKyAgICAgICAgYmFja2dyb3VuZCB3YXNuJ3Qgb3Zlcndy aXR0ZW4gYnkgdGhlIHRleHRGaWxsLgorCiAyMDExLTAyLTI0ICBNaWhhaSBQYXJwYXJpdGEgIDxt aWhhaXBAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFVucmV2aWV3ZWQgQ2hyb21pdW0gU25vdyBM ZW9wYXJkIGV4cGVjdGF0aW9ucyB1cGRhdGUuCkluZGV4OiBMYXlvdXRUZXN0cy9mYXN0L2NhbnZh cy8yZC5maWxsVGV4dC5ncmFkaWVudC1leHBlY3RlZC50eHQKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0 VGVzdHMvZmFzdC9jYW52YXMvMmQuZmlsbFRleHQuZ3JhZGllbnQtZXhwZWN0ZWQudHh0CShyZXZp c2lvbiAwKQorKysgTGF5b3V0VGVzdHMvZmFzdC9jYW52YXMvMmQuZmlsbFRleHQuZ3JhZGllbnQt ZXhwZWN0ZWQudHh0CShyZXZpc2lvbiAwKQpAQCAtMCwwICsxLDMgQEAKK09uIHN1Y2Nlc3MsIHRo ZSBzcXVhcmUgc2hvdWxkIGhhdmUgdGhlIGJvdHRvbSBsZWZ0IHBvcnRpb24gb2YgdGhlIGJhc2Ug b2YgdGhlIGdyZWVuIEkgYW5kIHJlZCBvdGhlcndpc2UuCisKK1RFU1QgUEFTU0VECkluZGV4OiBM YXlvdXRUZXN0cy9mYXN0L2NhbnZhcy8yZC5maWxsVGV4dC5ncmFkaWVudC5odG1sCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIExheW91dFRlc3RzL2Zhc3QvY2FudmFzLzJkLmZpbGxUZXh0LmdyYWRpZW50Lmh0bWwJ KHJldmlzaW9uIDApCisrKyBMYXlvdXRUZXN0cy9mYXN0L2NhbnZhcy8yZC5maWxsVGV4dC5ncmFk aWVudC5odG1sCShyZXZpc2lvbiAwKQpAQCAtMCwwICsxLDU1IEBACis8IURPQ1RZUEUgaHRtbD4K Kzxib2R5PgorPHA+T24gc3VjY2VzcywgdGhlIHNxdWFyZSBzaG91bGQgaGF2ZSB0aGUgYm90dG9t IGxlZnQgcG9ydGlvbiBvZiB0aGUgYmFzZSBvZiB0aGUgZ3JlZW4gSSBhbmQgcmVkIG90aGVyd2lz ZS48L3A+Cis8Y2FudmFzIGlkPSJjIiBjbGFzcz0ib3V0cHV0IiB3aWR0aD0iMTAwIiBoZWlnaHQ9 IjEwMCI+PHAgY2xhc3M9ImZhbGxiYWNrIj5GQUlMIChmYWxsYmFjayBjb250ZW50KTwvcD48L2Nh bnZhcz4KKzxkaXYgaWQ9ImNvbnNvbGUiPjwvZGl2PgorCis8c2NyaXB0PgorCitmdW5jdGlvbiBk cmF3Q2FudmFzKGN0eCkgeworCisgIGN0eC5maWxsU3R5bGUgPSAnI2YwMCc7CisgIGN0eC5maWxs UmVjdCgwLDAsMTAwLDEwMCk7CisKKyAgdmFyIGdyYWRpZW50ID0gY3R4LmNyZWF0ZUxpbmVhckdy YWRpZW50KDAsIDAsIDEwMCwgMTAwKTsKKyAgZ3JhZGllbnQuYWRkQ29sb3JTdG9wKDAsICcjMGYw Jyk7CisgIGdyYWRpZW50LmFkZENvbG9yU3RvcCgxLCAnIzBmMCcpOworCisgIGN0eC5maWxsU3R5 bGUgPSBncmFkaWVudDsKKyAgY3R4LmZvbnQgPSAiNTAwcHggVGltZXMiOworCisgIGN0eC5maWxs VGV4dCgiSSIsIC01LCAxMDApOworfQorCitpZiAod2luZG93LmxheW91dFRlc3RDb250cm9sbGVy KQorICAgIGxheW91dFRlc3RDb250cm9sbGVyLmR1bXBBc1RleHQoKTsKKwordmFyIGNhbnZhcyA9 IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCdjJyk7Cit2YXIgY3R4ID0gY2FudmFzLmdldENvbnRl eHQoIjJkIik7CitkcmF3Q2FudmFzKGN0eCk7CisKKy8vIENoZWNrIHRoYXQgdGhlIGxldHRlciBy ZW5kZXJlZCBhcHByb3ByaWF0ZWx5Cit2YXIgcmVuZGVyZWRDb3JyZWN0bHkgPSB0cnVlOworCisv LyBDaGVjayBmb3IgYSBncmVlbiBwaXhlbCBmcm9tIHRoZSB0ZXh0Cit2YXIgaW1hZ2VEYXRhID0g Y3R4LmdldEltYWdlRGF0YSg3NSw3NSwxLDEpOworaWYgKGltYWdlRGF0YS5kYXRhWzBdICE9IDAp IHJlbmRlcmVkQ29ycmVjdGx5ID0gZmFsc2U7CitpZiAoaW1hZ2VEYXRhLmRhdGFbMV0gIT0gMjU1 KSByZW5kZXJlZENvcnJlY3RseSA9IGZhbHNlOworaWYgKGltYWdlRGF0YS5kYXRhWzJdICE9IDAp IHJlbmRlcmVkQ29ycmVjdGx5ID0gZmFsc2U7CitpZiAoaW1hZ2VEYXRhLmRhdGFbM10gIT0gMjU1 KSByZW5kZXJlZENvcnJlY3RseSA9IGZhbHNlOworCisvLyBDaGVjayB0aGUgcmVkIHBpeGVsIG91 dHNpZGUgb2YgdGV4dCB3YXNuJ3QgdG91Y2hlZAordmFyIGltYWdlRGF0YSA9IGN0eC5nZXRJbWFn ZURhdGEoMjUsMjUsMSwxKTsKK2lmIChpbWFnZURhdGEuZGF0YVswXSAhPSAyNTUpIHJlbmRlcmVk Q29ycmVjdGx5ID0gZmFsc2U7CitpZiAoaW1hZ2VEYXRhLmRhdGFbMV0gIT0gMCkgcmVuZGVyZWRD b3JyZWN0bHkgPSBmYWxzZTsKK2lmIChpbWFnZURhdGEuZGF0YVsyXSAhPSAwKSByZW5kZXJlZENv cnJlY3RseSA9IGZhbHNlOworaWYgKGltYWdlRGF0YS5kYXRhWzNdICE9IDI1NSkgcmVuZGVyZWRD b3JyZWN0bHkgPSBmYWxzZTsKKworaWYgKHJlbmRlcmVkQ29ycmVjdGx5KQorCWRvY3VtZW50Lmdl dEVsZW1lbnRCeUlkKCJjb25zb2xlIikuaW5uZXJIVE1MID0gIlRFU1QgUEFTU0VEIjsKK2Vsc2UK Kwlkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgiY29uc29sZSIpLmlubmVySFRNTCA9ICJURVNUIEZB SUxFRCI7CisKKzwvc2NyaXB0PgorPC9ib2R5PgorPC9odG1sPgo=