90082 2012-06-27 10:04:16 -0700 [Qt] Add support for tiled shadow blur 2013-03-14 07:06:49 -0700 1 1 1 Unclassified WebKit WebKit Qt 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED Qt P2 Enhancement --- 45042 90562 111736 1 bruno.abinader lamarque allan.jensen hausmann helder.correia igor.oliveira kenneth noam webkit.review.bot oldest_to_newest 658687 0 bruno.abinader 2012-06-27 10:04:16 -0700 This change takes advantage of tiling (implemented on ShadowBlur::drawRectShadow) to improve drawing performance. However there are some issues to consider before finishing this change: [1] Both Qt and Cairo does not support tiling drawing on rotated rectangles (see bug 45042) - basically the shadows are painted well, but with some graphical artifacts between tile edges and sides. [2] However it works fine in Cairo, using drawRectShadow without tiling for rotated rectangles is currently broken on Qt (seems that shadow drawing does not respect rectangle rotation). [3] When forcing usage of tiling drawing code inside drawRectShadow on Qt port, issue [2] ceases to exist, but issue [1] maintains, so it is imperative to fix tiling artifacts and Qt handling of drawRectShadow before anything else. My plan is to let a provisional patch here for consideration, while working on the issues mentioned above. What do you guys think? 658690 1 igor.oliveira 2012-06-27 10:08:38 -0700 [1] Is a different bug. Should not be treated in this patch. For [2] and [3] would be great! 658691 2 149771 bruno.abinader 2012-06-27 10:09:20 -0700 Created attachment 149771 Proposed patch for Qt's GC This is the proposed patch for Qt's GC implementation. I haven't touched on the "void GraphicsContext::fillRect(const FloatRect& rect)" overloaded function as I haven't found any layout test that actually triggers it yet. 658717 3 bruno.abinader 2012-06-27 11:04:52 -0700 Changing bug summary to a proper meaning - less cryptful, at least :D 658849 4 149792 bruno.abinader 2012-06-27 13:59:38 -0700 Created attachment 149792 Proposed patch (with fix for shadow rotation) Updated patch with fix for rotated shadows in Qt's GraphicsContext::pushTransparencyLayerInternal. A missing device transform was preventing the shadows from being properly drawn. This patch probably will need some layout tests rebaselines :) 659448 5 149934 bruno.abinader 2012-06-28 06:03:32 -0700 Created attachment 149934 Proposed patch (v3) Fixed an unnecessary cast to QRectF on GraphicsContext::fillRoundedRect. 659547 6 149934 webkit.review.bot 2012-06-28 09:15:10 -0700 Comment on attachment 149934 Proposed patch (v3) Clearing flags on attachment: 149934 Committed r121435: <http://trac.webkit.org/changeset/121435> 659548 7 webkit.review.bot 2012-06-28 09:15:16 -0700 All reviewed patches have been landed. Closing bug. 660428 8 150165 bruno.abinader 2012-06-29 06:35:02 -0700 Created attachment 150165 Additional patch for GraphicsContext::fillRect(const FloatRect& rect) overloaded function This is an additional patch for a certain case in the first fillRect() overload. Tested with canvas/philip/tests/2d.shadow.blur.high.html and canvas/philip/tests/2d.shadow.blur.low.html with same results. 660430 9 bruno.abinader 2012-06-29 06:37:39 -0700 Changing status to "reopened" while additional patch is pending review/commit-queue authorization. 660598 10 150165 webkit.review.bot 2012-06-29 10:17:19 -0700 Comment on attachment 150165 Additional patch for GraphicsContext::fillRect(const FloatRect& rect) overloaded function Clearing flags on attachment: 150165 Committed r121569: <http://trac.webkit.org/changeset/121569> 660599 11 webkit.review.bot 2012-06-29 10:17:26 -0700 All reviewed patches have been landed. Closing bug. 660851 12 noam 2012-06-29 16:19:48 -0700 I believe this broke the Qt Linux release bot. Mind taking a look? 660858 13 noam 2012-06-29 16:42:49 -0700 Reopening to attach new patch. 660859 14 150271 noam 2012-06-29 16:43:12 -0700 Created attachment 150271 Patch for landing 660943 15 bruno.abinader 2012-06-29 19:45:03 -0700 Sure, sorry for the delay (just checked my mail - Manaus timezone is -04:00). I am running a second pass with and without the patch to see any changes on the test results. (In reply to comment #12) > I believe this broke the Qt Linux release bot. Mind taking a look? 660970 16 150271 webkit.review.bot 2012-06-29 20:52:34 -0700 Comment on attachment 150271 Patch for landing Clearing flags on attachment: 150271 Committed r121618: <http://trac.webkit.org/changeset/121618> 660971 17 webkit.review.bot 2012-06-29 20:52:40 -0700 All reviewed patches have been landed. Closing bug. 661009 18 bruno.abinader 2012-06-30 00:20:22 -0700 Indeed, I detected 29 regressions with the additional patch. Sorry :/ I've only tested them with philip patches but forgot to do a full test run. Thanks for pointing it out, No'am. 661010 19 bruno.abinader 2012-06-30 00:28:44 -0700 Actually pardon again, but these 29 were actually tests with no expected results from the reverted patch test run, not the patched test run. The actual diff are these two tests: fast/canvas/canvas-scale-fillRect-shadow.html fast/canvas/canvas-transforms-fillRect-shadow.html I'll have a look at these tomorrow. (In reply to comment #18) > Indeed, I detected 29 regressions with the additional patch. Sorry :/ I've only tested them with philip patches but forgot to do a full test run. Thanks for pointing it out, No'am. 662994 20 bruno.abinader 2012-07-04 08:57:51 -0700 Seems that ShadowBlur's current drawRectShadow() implementation does not take into consideration Qt's brush properties for some reason. I am going to issue that into another bug. With the first patch landed and sounding well on tests, I'd assume this bug is fixed. (In reply to comment #19) > Actually pardon again, but these 29 were actually tests with no expected results from the reverted patch test run, not the patched test run. The actual diff are these two tests: > > fast/canvas/canvas-scale-fillRect-shadow.html > fast/canvas/canvas-transforms-fillRect-shadow.html > > I'll have a look at these tomorrow. > > (In reply to comment #18) > > Indeed, I detected 29 regressions with the additional patch. Sorry :/ I've only tested them with philip patches but forgot to do a full test run. Thanks for pointing it out, No'am. 812935 21 allan.jensen 2013-01-22 04:46:24 -0800 The fix was rolled out, so the issue is still open. 829934 22 187626 lamarque 2013-02-11 11:28:54 -0800 Created attachment 187626 Patch Fix for patch 'Additional patch for GraphicsContext::fillRect(const FloatRect& rect) overloaded function' which was rolled out in comment #16. 850038 23 187626 allan.jensen 2013-03-07 06:27:08 -0800 Comment on attachment 187626 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=187626&action=review > Source/WebCore/ChangeLog:9 > + This overloaded fillRect implementation also supports this optimization in > + certain situations. Could you instead explain what the issue was and what the patch changes in ShadowBlur? 850541 24 lamarque 2013-03-07 15:34:54 -0800 (In reply to comment #23) > (From update of attachment 187626 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=187626&action=review > > > Source/WebCore/ChangeLog:9 > > + This overloaded fillRect implementation also supports this optimization in > > + certain situations. > > Could you instead explain what the issue was and what the patch changes in ShadowBlur? The main goal of this patch is improving performance according to what is written in comment #1. I am not 100% sure if the changes I made in the patch are correct, that is why I asked for reviewing. One thing I noticed during my tests is that using save()/restore() instead of GraphicsContextStateSaver in computeSliceSizesFromRadii() helps fixing the regressions mentioned in comment #19. The changes in ShadowBlur::drawShadowBuffer() and computeSliceSizesFromRadii() are basically to fix the regressions but I am not sure exactly how this code work. 851361 25 lamarque 2013-03-08 11:35:59 -0800 This patch is a working in progress. What I did was compare the sequence of function/method calls with and without the original patch (https://bugs.webkit.org/attachment.cgi?id=149934). My patch basically outlines the difference between the two sequence of calls. I still need to investigate further why the changes in ShadowBlur::drawShadowBuffer() makes the regressions mentioned in comment #19 go away. The main goal is to use ShadowBlur::drawRectShadow(), which according to the bug description, improves drawing performance by taking advantage of tiled shadow rendering. 852320 26 192473 allan.jensen 2013-03-11 08:12:49 -0700 Created attachment 192473 Patch 852325 27 allan.jensen 2013-03-11 08:15:09 -0700 (In reply to comment #24) > (In reply to comment #23) > > (From update of attachment 187626 [details] [details]) > > View in context: https://bugs.webkit.org/attachment.cgi?id=187626&action=review > > > > > Source/WebCore/ChangeLog:9 > > > + This overloaded fillRect implementation also supports this optimization in > > > + certain situations. > > > > Could you instead explain what the issue was and what the patch changes in ShadowBlur? > > The main goal of this patch is improving performance according to what is written in comment #1. I am not 100% sure if the changes I made in the patch are correct, that is why I asked for reviewing. One thing I noticed during my tests is that using save()/restore() instead of GraphicsContextStateSaver in computeSliceSizesFromRadii() helps fixing the regressions mentioned in comment #19. The changes in ShadowBlur::drawShadowBuffer() and computeSliceSizesFromRadii() are basically to fix the regressions but I am not sure exactly how this code work. Your patch only worked on the transform test-case not the scale test-case, but it worked by avoiding clipToImageBuffer which produces scaling artifacts due to the way we transform alphaMaps. 855173 28 allan.jensen 2013-03-14 07:06:49 -0700 Committed r145810: <http://trac.webkit.org/changeset/145810> 149771 2012-06-27 10:09:20 -0700 2012-06-27 13:59:38 -0700 Proposed patch for Qt's GC 0001-Qt-Make-GC-s-fill-Rounded-Rect-use-optimized-shadow-.patch text/plain 4438 bruno.abinader RnJvbSBiMjYyOWNmODlhZGJkMTU2MDllODRkYWM1YmMwYmExMWFhMzljZTkyIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBCcnVubyBkZSBPbGl2ZWlyYSBBYmluYWRlciA8YnJ1bm8uYWJp bmFkZXJAYmFzeXNrb20uY29tPgpEYXRlOiBXZWQsIDI3IEp1biAyMDEyIDEyOjQ0OjI0IC0wNDAw ClN1YmplY3Q6IFtQQVRDSF0gW1F0XSBNYWtlIEdDJ3MgZmlsbHtSb3VuZGVkfVJlY3QgdXNlIG9w dGltaXplZCBzaGFkb3cgYmx1cgogY29kZSBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9OTAwODIKClNoYWRvd0JsdXI6OmRyYXdSZWN0U2hhZG93IG1ha2VzIHVzZSBvZiBv cHRpbWl6ZWQgdGlsZXMtYmFzZWQgZHJhd1BhdHRlcm4sIHdoaWNoCmlzIG5vdCBwcmVzZW50IHdo ZW4gdXNpbmcge2JlZ2luL2VuZH1zaGFkb3dMYXllci4KLS0tCiBTb3VyY2UvV2ViQ29yZS9DaGFu Z2VMb2cgICAgICAgICAgICAgICAgICAgICAgICAgICB8ICAgMTQgKysrKysrKysrKysKIC4uLi9w bGF0Zm9ybS9ncmFwaGljcy9xdC9HcmFwaGljc0NvbnRleHRRdC5jcHAgICAgIHwgICAyNSArKysr LS0tLS0tLS0tLS0tLS0tLQogMiBmaWxlcyBjaGFuZ2VkLCAxOSBpbnNlcnRpb25zKCspLCAyMCBk ZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3Vy Y2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMmIyNTg0MS4uMzU4MWZmOCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpA QCAtMSwzICsxLDE3IEBACisyMDEyLTA2LTI3ICBCcnVubyBkZSBPbGl2ZWlyYSBBYmluYWRlciAg PGJydW5vLmFiaW5hZGVyQGJhc3lza29tLmNvbT4KKworICAgICAgICBbUXRdIE1ha2UgR0MncyBm aWxse1JvdW5kZWR9UmVjdCB1c2Ugb3B0aW1pemVkIHNoYWRvdyBibHVyIGNvZGUKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTkwMDgyCisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgU2hhZG93Qmx1cjo6ZHJhd1Jl Y3RTaGFkb3cgbWFrZXMgdXNlIG9mIG9wdGltaXplZCB0aWxlcy1iYXNlZCBkcmF3UGF0dGVybiwg d2hpY2gKKyAgICAgICAgaXMgbm90IHByZXNlbnQgd2hlbiB1c2luZyB7YmVnaW4vZW5kfXNoYWRv d0xheWVyLgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvcXQvR3JhcGhpY3NDb250ZXh0 UXQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6R3JhcGhpY3NDb250ZXh0OjpmaWxsUmVjdCk6Cisg ICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0NvbnRleHQ6OmZpbGxSb3VuZGVkUmVjdCk6CisKIDIw MTItMDYtMjIgIEpvY2VseW4gVHVyY290dGUgIDx0dXJjb3R0ZS5qQGdtYWlsLmNvbT4KIAogICAg ICAgICBbUXRdIEZpeCB0aGUgcmVtb3RlIGluc3BlY3RvciBsb2FkaW5nIHByb2JsZW1zIG9uIE1h YwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvcXQvR3JhcGhp Y3NDb250ZXh0UXQuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvcXQvR3Jh cGhpY3NDb250ZXh0UXQuY3BwCmluZGV4IDA3NGU3ZGYuLjM2MWJhMTQgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3F0L0dyYXBoaWNzQ29udGV4dFF0LmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9HcmFwaGljc0NvbnRleHRR dC5jcHAKQEAgLTcwMywyOCArNzAzLDE5IEBAIHZvaWQgR3JhcGhpY3NDb250ZXh0OjpmaWxsUmVj dChjb25zdCBGbG9hdFJlY3QmIHJlY3QsIGNvbnN0IENvbG9yJiBjb2xvciwgQ29sb3JTCiAgICAg aWYgKHBhaW50aW5nRGlzYWJsZWQoKSB8fCAhY29sb3IuaXNWYWxpZCgpKQogICAgICAgICByZXR1 cm47CiAKLSAgICBtX2RhdGEtPnNvbGlkQ29sb3Iuc2V0Q29sb3IoY29sb3IpOworICAgIFFSZWN0 RiBwbGF0Zm9ybVJlY3QocmVjdCk7CiAgICAgUVBhaW50ZXIqIHAgPSBtX2RhdGEtPnAoKTsKLSAg ICBRUmVjdEYgbm9ybWFsaXplZFJlY3QgPSByZWN0Lm5vcm1hbGl6ZWQoKTsKLQogICAgIGlmICho YXNTaGFkb3coKSkgewogICAgICAgICBTaGFkb3dCbHVyKiBzaGFkb3cgPSBzaGFkb3dCbHVyKCk7 CiAgICAgICAgIGlmIChzaGFkb3ctPm11c3RVc2VTaGFkb3dCbHVyKHRoaXMpKSB7Ci0gICAgICAg ICAgICBHcmFwaGljc0NvbnRleHQqIHNoYWRvd0NvbnRleHQgPSBzaGFkb3ctPmJlZ2luU2hhZG93 TGF5ZXIodGhpcywgbm9ybWFsaXplZFJlY3QpOwotICAgICAgICAgICAgaWYgKHNoYWRvd0NvbnRl eHQpIHsKLSAgICAgICAgICAgICAgICBRUGFpbnRlciogc2hhZG93UGFpbnRlciA9IHNoYWRvd0Nv bnRleHQtPnBsYXRmb3JtQ29udGV4dCgpOwotICAgICAgICAgICAgICAgIHNoYWRvd1BhaW50ZXIt PnNldENvbXBvc2l0aW9uTW9kZShRUGFpbnRlcjo6Q29tcG9zaXRpb25Nb2RlX1NvdXJjZSk7Ci0g ICAgICAgICAgICAgICAgc2hhZG93UGFpbnRlci0+ZmlsbFJlY3Qobm9ybWFsaXplZFJlY3QsIG1f c3RhdGUuc2hhZG93Q29sb3IpOwotICAgICAgICAgICAgICAgIHNoYWRvdy0+ZW5kU2hhZG93TGF5 ZXIodGhpcyk7Ci0gICAgICAgICAgICB9CisgICAgICAgICAgICBzaGFkb3ctPmRyYXdSZWN0U2hh ZG93KHRoaXMsIHBsYXRmb3JtUmVjdCwgUm91bmRlZFJlY3Q6OlJhZGlpKCkpOwogICAgICAgICB9 IGVsc2UgewogICAgICAgICAgICAgUUNvbG9yIHNoYWRvd0NvbG9yID0gbV9zdGF0ZS5zaGFkb3dD b2xvcjsKICAgICAgICAgICAgIHNoYWRvd0NvbG9yLnNldEFscGhhRihzaGFkb3dDb2xvci5hbHBo YUYoKSAqIHAtPmJydXNoKCkuY29sb3IoKS5hbHBoYUYoKSk7Ci0gICAgICAgICAgICBwLT5maWxs UmVjdChub3JtYWxpemVkUmVjdC50cmFuc2xhdGVkKFFQb2ludEYobV9zdGF0ZS5zaGFkb3dPZmZz ZXQud2lkdGgoKSwgbV9zdGF0ZS5zaGFkb3dPZmZzZXQuaGVpZ2h0KCkpKSwgc2hhZG93Q29sb3Ip OworICAgICAgICAgICAgcC0+ZmlsbFJlY3QocGxhdGZvcm1SZWN0LnRyYW5zbGF0ZWQoUVBvaW50 RihtX3N0YXRlLnNoYWRvd09mZnNldC53aWR0aCgpLCBtX3N0YXRlLnNoYWRvd09mZnNldC5oZWln aHQoKSkpLCBzaGFkb3dDb2xvcik7CiAgICAgICAgIH0KICAgICB9Ci0KLSAgICBwLT5maWxsUmVj dChub3JtYWxpemVkUmVjdCwgbV9kYXRhLT5zb2xpZENvbG9yKTsKKyAgICBwLT5maWxsUmVjdChw bGF0Zm9ybVJlY3QsIFFDb2xvcihjb2xvcikpOwogfQogCiB2b2lkIEdyYXBoaWNzQ29udGV4dDo6 ZmlsbFJvdW5kZWRSZWN0KGNvbnN0IEludFJlY3QmIHJlY3QsIGNvbnN0IEludFNpemUmIHRvcExl ZnQsIGNvbnN0IEludFNpemUmIHRvcFJpZ2h0LCBjb25zdCBJbnRTaXplJiBib3R0b21MZWZ0LCBj b25zdCBJbnRTaXplJiBib3R0b21SaWdodCwgY29uc3QgQ29sb3ImIGNvbG9yLCBDb2xvclNwYWNl IGNvbG9yU3BhY2UpCkBAIC03MzgsMTMgKzcyOSw3IEBAIHZvaWQgR3JhcGhpY3NDb250ZXh0Ojpm aWxsUm91bmRlZFJlY3QoY29uc3QgSW50UmVjdCYgcmVjdCwgY29uc3QgSW50U2l6ZSYgdG9wTGVm CiAgICAgaWYgKGhhc1NoYWRvdygpKSB7CiAgICAgICAgIFNoYWRvd0JsdXIqIHNoYWRvdyA9IHNo YWRvd0JsdXIoKTsKICAgICAgICAgaWYgKHNoYWRvdy0+bXVzdFVzZVNoYWRvd0JsdXIodGhpcykp IHsKLSAgICAgICAgICAgIEdyYXBoaWNzQ29udGV4dCogc2hhZG93Q29udGV4dCA9IHNoYWRvdy0+ YmVnaW5TaGFkb3dMYXllcih0aGlzLCByZWN0KTsKLSAgICAgICAgICAgIGlmIChzaGFkb3dDb250 ZXh0KSB7Ci0gICAgICAgICAgICAgICAgUVBhaW50ZXIqIHNoYWRvd1BhaW50ZXIgPSBzaGFkb3dD b250ZXh0LT5wbGF0Zm9ybUNvbnRleHQoKTsKLSAgICAgICAgICAgICAgICBzaGFkb3dQYWludGVy LT5zZXRDb21wb3NpdGlvbk1vZGUoUVBhaW50ZXI6OkNvbXBvc2l0aW9uTW9kZV9Tb3VyY2UpOwot ICAgICAgICAgICAgICAgIHNoYWRvd1BhaW50ZXItPmZpbGxQYXRoKHBhdGgucGxhdGZvcm1QYXRo KCksIFFDb2xvcihtX3N0YXRlLnNoYWRvd0NvbG9yKSk7Ci0gICAgICAgICAgICAgICAgc2hhZG93 LT5lbmRTaGFkb3dMYXllcih0aGlzKTsKLSAgICAgICAgICAgIH0KKyAgICAgICAgICAgIHNoYWRv dy0+ZHJhd1JlY3RTaGFkb3codGhpcywgUVJlY3RGKHJlY3QpLCBSb3VuZGVkUmVjdDo6UmFkaWko dG9wTGVmdCwgdG9wUmlnaHQsIGJvdHRvbUxlZnQsIGJvdHRvbVJpZ2h0KSk7CiAgICAgICAgIH0g ZWxzZSB7CiAgICAgICAgICAgICBjb25zdCBRUG9pbnRGIHNoYWRvd09mZnNldChtX3N0YXRlLnNo YWRvd09mZnNldC53aWR0aCgpLCBtX3N0YXRlLnNoYWRvd09mZnNldC5oZWlnaHQoKSk7CiAgICAg ICAgICAgICBwLT50cmFuc2xhdGUoc2hhZG93T2Zmc2V0KTsKLS0gCjEuNy45LjUKCg== 149792 2012-06-27 13:59:38 -0700 2012-06-28 06:03:32 -0700 Proposed patch (with fix for shadow rotation) 0001-Qt-Make-GC-s-fill-Rounded-Rect-use-optimized-shadow-.patch text/plain 5041 bruno.abinader RnJvbSAxOWYwYWNiODVjYjFiMjg1ZDgwMjc3M2NmODJlYWJlMDgxMzQwZWYzIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBCcnVubyBkZSBPbGl2ZWlyYSBBYmluYWRlciA8YnJ1bm8uYWJp bmFkZXJAYmFzeXNrb20uY29tPgpEYXRlOiBXZWQsIDI3IEp1biAyMDEyIDEyOjQ0OjI0IC0wNDAw ClN1YmplY3Q6IFtQQVRDSF0gW1F0XSBNYWtlIEdDJ3MgZmlsbHtSb3VuZGVkfVJlY3QgdXNlIG9w dGltaXplZCBzaGFkb3cgYmx1cgogY29kZSBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9OTAwODIKClNoYWRvd0JsdXI6OmRyYXdSZWN0U2hhZG93IG1ha2VzIHVzZSBvZiBv cHRpbWl6ZWQgdGlsZXMtYmFzZWQgZHJhd1BhdHRlcm4sIHdoaWNoCmlzIG5vdCBwcmVzZW50IHdo ZW4gdXNpbmcge2JlZ2luL2VuZH1zaGFkb3dMYXllci4KLS0tCiBTb3VyY2UvV2ViQ29yZS9DaGFu Z2VMb2cgICAgICAgICAgICAgICAgICAgICAgICAgICB8ICAgMTUgKysrKysrKysrKwogLi4uL3Bs YXRmb3JtL2dyYXBoaWNzL3F0L0dyYXBoaWNzQ29udGV4dFF0LmNwcCAgICAgfCAgIDMwICsrKysr Ky0tLS0tLS0tLS0tLS0tCiAyIGZpbGVzIGNoYW5nZWQsIDI0IGluc2VydGlvbnMoKyksIDIxIGRl bGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCAyYjI1ODQxLi5mZjhmOWViIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMTggQEAKKzIwMTItMDYtMjcgIEJydW5vIGRlIE9saXZlaXJhIEFiaW5hZGVyICA8 YnJ1bm8uYWJpbmFkZXJAYmFzeXNrb20uY29tPgorCisgICAgICAgIFtRdF0gTWFrZSBHQydzIGZp bGx7Um91bmRlZH1SZWN0IHVzZSBvcHRpbWl6ZWQgc2hhZG93IGJsdXIgY29kZQorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTAwODIKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBTaGFkb3dCbHVyOjpkcmF3UmVj dFNoYWRvdyBtYWtlcyB1c2Ugb2Ygb3B0aW1pemVkIHRpbGVzLWJhc2VkIGRyYXdQYXR0ZXJuLCB3 aGljaAorICAgICAgICBpcyBub3QgcHJlc2VudCB3aGVuIHVzaW5nIHtiZWdpbi9lbmR9c2hhZG93 TGF5ZXIuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9xdC9HcmFwaGljc0NvbnRleHRR dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0NvbnRleHQ6OmZpbGxSZWN0KToKKyAg ICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzQ29udGV4dDo6ZmlsbFJvdW5kZWRSZWN0KToKKyAgICAg ICAgKFdlYkNvcmU6OkdyYXBoaWNzQ29udGV4dDo6cHVzaFRyYW5zcGFyZW5jeUxheWVySW50ZXJu YWwpOgorCiAyMDEyLTA2LTIyICBKb2NlbHluIFR1cmNvdHRlICA8dHVyY290dGUuakBnbWFpbC5j b20+CiAKICAgICAgICAgW1F0XSBGaXggdGhlIHJlbW90ZSBpbnNwZWN0b3IgbG9hZGluZyBwcm9i bGVtcyBvbiBNYWMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L3F0L0dyYXBoaWNzQ29udGV4dFF0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL3F0L0dyYXBoaWNzQ29udGV4dFF0LmNwcAppbmRleCAwNzRlN2RmLi40NTQ2YTVkIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9HcmFwaGljc0NvbnRl eHRRdC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvcXQvR3JhcGhp Y3NDb250ZXh0UXQuY3BwCkBAIC03MDMsMjggKzcwMywxOSBAQCB2b2lkIEdyYXBoaWNzQ29udGV4 dDo6ZmlsbFJlY3QoY29uc3QgRmxvYXRSZWN0JiByZWN0LCBjb25zdCBDb2xvciYgY29sb3IsIENv bG9yUwogICAgIGlmIChwYWludGluZ0Rpc2FibGVkKCkgfHwgIWNvbG9yLmlzVmFsaWQoKSkKICAg ICAgICAgcmV0dXJuOwogCi0gICAgbV9kYXRhLT5zb2xpZENvbG9yLnNldENvbG9yKGNvbG9yKTsK KyAgICBRUmVjdEYgcGxhdGZvcm1SZWN0KHJlY3QpOwogICAgIFFQYWludGVyKiBwID0gbV9kYXRh LT5wKCk7Ci0gICAgUVJlY3RGIG5vcm1hbGl6ZWRSZWN0ID0gcmVjdC5ub3JtYWxpemVkKCk7Ci0K ICAgICBpZiAoaGFzU2hhZG93KCkpIHsKICAgICAgICAgU2hhZG93Qmx1ciogc2hhZG93ID0gc2hh ZG93Qmx1cigpOwogICAgICAgICBpZiAoc2hhZG93LT5tdXN0VXNlU2hhZG93Qmx1cih0aGlzKSkg ewotICAgICAgICAgICAgR3JhcGhpY3NDb250ZXh0KiBzaGFkb3dDb250ZXh0ID0gc2hhZG93LT5i ZWdpblNoYWRvd0xheWVyKHRoaXMsIG5vcm1hbGl6ZWRSZWN0KTsKLSAgICAgICAgICAgIGlmIChz aGFkb3dDb250ZXh0KSB7Ci0gICAgICAgICAgICAgICAgUVBhaW50ZXIqIHNoYWRvd1BhaW50ZXIg PSBzaGFkb3dDb250ZXh0LT5wbGF0Zm9ybUNvbnRleHQoKTsKLSAgICAgICAgICAgICAgICBzaGFk b3dQYWludGVyLT5zZXRDb21wb3NpdGlvbk1vZGUoUVBhaW50ZXI6OkNvbXBvc2l0aW9uTW9kZV9T b3VyY2UpOwotICAgICAgICAgICAgICAgIHNoYWRvd1BhaW50ZXItPmZpbGxSZWN0KG5vcm1hbGl6 ZWRSZWN0LCBtX3N0YXRlLnNoYWRvd0NvbG9yKTsKLSAgICAgICAgICAgICAgICBzaGFkb3ctPmVu ZFNoYWRvd0xheWVyKHRoaXMpOwotICAgICAgICAgICAgfQorICAgICAgICAgICAgc2hhZG93LT5k cmF3UmVjdFNoYWRvdyh0aGlzLCBwbGF0Zm9ybVJlY3QsIFJvdW5kZWRSZWN0OjpSYWRpaSgpKTsK ICAgICAgICAgfSBlbHNlIHsKICAgICAgICAgICAgIFFDb2xvciBzaGFkb3dDb2xvciA9IG1fc3Rh dGUuc2hhZG93Q29sb3I7CiAgICAgICAgICAgICBzaGFkb3dDb2xvci5zZXRBbHBoYUYoc2hhZG93 Q29sb3IuYWxwaGFGKCkgKiBwLT5icnVzaCgpLmNvbG9yKCkuYWxwaGFGKCkpOwotICAgICAgICAg ICAgcC0+ZmlsbFJlY3Qobm9ybWFsaXplZFJlY3QudHJhbnNsYXRlZChRUG9pbnRGKG1fc3RhdGUu c2hhZG93T2Zmc2V0LndpZHRoKCksIG1fc3RhdGUuc2hhZG93T2Zmc2V0LmhlaWdodCgpKSksIHNo YWRvd0NvbG9yKTsKKyAgICAgICAgICAgIHAtPmZpbGxSZWN0KHBsYXRmb3JtUmVjdC50cmFuc2xh dGVkKFFQb2ludEYobV9zdGF0ZS5zaGFkb3dPZmZzZXQud2lkdGgoKSwgbV9zdGF0ZS5zaGFkb3dP ZmZzZXQuaGVpZ2h0KCkpKSwgc2hhZG93Q29sb3IpOwogICAgICAgICB9CiAgICAgfQotCi0gICAg cC0+ZmlsbFJlY3Qobm9ybWFsaXplZFJlY3QsIG1fZGF0YS0+c29saWRDb2xvcik7CisgICAgcC0+ ZmlsbFJlY3QocGxhdGZvcm1SZWN0LCBRQ29sb3IoY29sb3IpKTsKIH0KIAogdm9pZCBHcmFwaGlj c0NvbnRleHQ6OmZpbGxSb3VuZGVkUmVjdChjb25zdCBJbnRSZWN0JiByZWN0LCBjb25zdCBJbnRT aXplJiB0b3BMZWZ0LCBjb25zdCBJbnRTaXplJiB0b3BSaWdodCwgY29uc3QgSW50U2l6ZSYgYm90 dG9tTGVmdCwgY29uc3QgSW50U2l6ZSYgYm90dG9tUmlnaHQsIGNvbnN0IENvbG9yJiBjb2xvciwg Q29sb3JTcGFjZSBjb2xvclNwYWNlKQpAQCAtNzM4LDEzICs3MjksNyBAQCB2b2lkIEdyYXBoaWNz Q29udGV4dDo6ZmlsbFJvdW5kZWRSZWN0KGNvbnN0IEludFJlY3QmIHJlY3QsIGNvbnN0IEludFNp emUmIHRvcExlZgogICAgIGlmIChoYXNTaGFkb3coKSkgewogICAgICAgICBTaGFkb3dCbHVyKiBz aGFkb3cgPSBzaGFkb3dCbHVyKCk7CiAgICAgICAgIGlmIChzaGFkb3ctPm11c3RVc2VTaGFkb3dC bHVyKHRoaXMpKSB7Ci0gICAgICAgICAgICBHcmFwaGljc0NvbnRleHQqIHNoYWRvd0NvbnRleHQg PSBzaGFkb3ctPmJlZ2luU2hhZG93TGF5ZXIodGhpcywgcmVjdCk7Ci0gICAgICAgICAgICBpZiAo c2hhZG93Q29udGV4dCkgewotICAgICAgICAgICAgICAgIFFQYWludGVyKiBzaGFkb3dQYWludGVy ID0gc2hhZG93Q29udGV4dC0+cGxhdGZvcm1Db250ZXh0KCk7Ci0gICAgICAgICAgICAgICAgc2hh ZG93UGFpbnRlci0+c2V0Q29tcG9zaXRpb25Nb2RlKFFQYWludGVyOjpDb21wb3NpdGlvbk1vZGVf U291cmNlKTsKLSAgICAgICAgICAgICAgICBzaGFkb3dQYWludGVyLT5maWxsUGF0aChwYXRoLnBs YXRmb3JtUGF0aCgpLCBRQ29sb3IobV9zdGF0ZS5zaGFkb3dDb2xvcikpOwotICAgICAgICAgICAg ICAgIHNoYWRvdy0+ZW5kU2hhZG93TGF5ZXIodGhpcyk7Ci0gICAgICAgICAgICB9CisgICAgICAg ICAgICBzaGFkb3ctPmRyYXdSZWN0U2hhZG93KHRoaXMsIFFSZWN0RihyZWN0KSwgUm91bmRlZFJl Y3Q6OlJhZGlpKHRvcExlZnQsIHRvcFJpZ2h0LCBib3R0b21MZWZ0LCBib3R0b21SaWdodCkpOwog ICAgICAgICB9IGVsc2UgewogICAgICAgICAgICAgY29uc3QgUVBvaW50RiBzaGFkb3dPZmZzZXQo bV9zdGF0ZS5zaGFkb3dPZmZzZXQud2lkdGgoKSwgbV9zdGF0ZS5zaGFkb3dPZmZzZXQuaGVpZ2h0 KCkpOwogICAgICAgICAgICAgcC0+dHJhbnNsYXRlKHNoYWRvd09mZnNldCk7CkBAIC0xMDQ1LDcg KzEwMzAsMTAgQEAgdm9pZCBHcmFwaGljc0NvbnRleHQ6OnB1c2hUcmFuc3BhcmVuY3lMYXllcklu dGVybmFsKGNvbnN0IFFSZWN0ICZyZWN0LCBxcmVhbCBvcGEKIHsKICAgICBRUGFpbnRlciogcCA9 IG1fZGF0YS0+cCgpOwogCi0gICAgUVJlY3QgZGV2aWNlQ2xpcCA9IHAtPnRyYW5zZm9ybSgpLm1h cFJlY3QocmVjdCk7CisgICAgUVRyYW5zZm9ybSBkZXZpY2VUcmFuc2Zvcm0gPSBwLT50cmFuc2Zv cm0oKTsKKyAgICBRUmVjdCBkZXZpY2VDbGlwID0gZGV2aWNlVHJhbnNmb3JtLm1hcFJlY3QocmVj dCk7CisKKyAgICBhbHBoYU1hc2sgPSBhbHBoYU1hc2sudHJhbnNmb3JtZWQoZGV2aWNlVHJhbnNm b3JtKTsKICAgICBpZiAoYWxwaGFNYXNrLndpZHRoKCkgIT0gZGV2aWNlQ2xpcC53aWR0aCgpIHx8 IGFscGhhTWFzay5oZWlnaHQoKSAhPSBkZXZpY2VDbGlwLmhlaWdodCgpKQogICAgICAgICBhbHBo YU1hc2sgPSBhbHBoYU1hc2suc2NhbGVkKGRldmljZUNsaXAud2lkdGgoKSwgZGV2aWNlQ2xpcC5o ZWlnaHQoKSk7CiAKLS0gCjEuNy45LjUKCg== 149934 2012-06-28 06:03:32 -0700 2012-06-29 16:41:52 -0700 Proposed patch (v3) 0001-Qt-Make-GC-s-fill-Rounded-Rect-use-optimized-shadow-.patch text/plain 5033 bruno.abinader RnJvbSA2N2I3N2Q2MWVkZjRlZmQxMjU4YmY0MWVlNjU3OTc2N2ZkMTIxMThmIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBCcnVubyBkZSBPbGl2ZWlyYSBBYmluYWRlciA8YnJ1bm8uYWJp bmFkZXJAYmFzeXNrb20uY29tPgpEYXRlOiBXZWQsIDI3IEp1biAyMDEyIDEyOjQ0OjI0IC0wNDAw ClN1YmplY3Q6IFtQQVRDSF0gW1F0XSBNYWtlIEdDJ3MgZmlsbHtSb3VuZGVkfVJlY3QgdXNlIG9w dGltaXplZCBzaGFkb3cgYmx1cgogY29kZSBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9OTAwODIKClNoYWRvd0JsdXI6OmRyYXdSZWN0U2hhZG93IG1ha2VzIHVzZSBvZiBv cHRpbWl6ZWQgdGlsZXMtYmFzZWQgZHJhd1BhdHRlcm4sIHdoaWNoCmlzIG5vdCBwcmVzZW50IHdo ZW4gdXNpbmcge2JlZ2luL2VuZH1zaGFkb3dMYXllci4KLS0tCiBTb3VyY2UvV2ViQ29yZS9DaGFu Z2VMb2cgICAgICAgICAgICAgICAgICAgICAgICAgICB8ICAgMTUgKysrKysrKysrKwogLi4uL3Bs YXRmb3JtL2dyYXBoaWNzL3F0L0dyYXBoaWNzQ29udGV4dFF0LmNwcCAgICAgfCAgIDMwICsrKysr Ky0tLS0tLS0tLS0tLS0tCiAyIGZpbGVzIGNoYW5nZWQsIDI0IGluc2VydGlvbnMoKyksIDIxIGRl bGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCAyYjI1ODQxLi5mZjhmOWViIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMTggQEAKKzIwMTItMDYtMjcgIEJydW5vIGRlIE9saXZlaXJhIEFiaW5hZGVyICA8 YnJ1bm8uYWJpbmFkZXJAYmFzeXNrb20uY29tPgorCisgICAgICAgIFtRdF0gTWFrZSBHQydzIGZp bGx7Um91bmRlZH1SZWN0IHVzZSBvcHRpbWl6ZWQgc2hhZG93IGJsdXIgY29kZQorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTAwODIKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBTaGFkb3dCbHVyOjpkcmF3UmVj dFNoYWRvdyBtYWtlcyB1c2Ugb2Ygb3B0aW1pemVkIHRpbGVzLWJhc2VkIGRyYXdQYXR0ZXJuLCB3 aGljaAorICAgICAgICBpcyBub3QgcHJlc2VudCB3aGVuIHVzaW5nIHtiZWdpbi9lbmR9c2hhZG93 TGF5ZXIuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9xdC9HcmFwaGljc0NvbnRleHRR dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0NvbnRleHQ6OmZpbGxSZWN0KToKKyAg ICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzQ29udGV4dDo6ZmlsbFJvdW5kZWRSZWN0KToKKyAgICAg ICAgKFdlYkNvcmU6OkdyYXBoaWNzQ29udGV4dDo6cHVzaFRyYW5zcGFyZW5jeUxheWVySW50ZXJu YWwpOgorCiAyMDEyLTA2LTIyICBKb2NlbHluIFR1cmNvdHRlICA8dHVyY290dGUuakBnbWFpbC5j b20+CiAKICAgICAgICAgW1F0XSBGaXggdGhlIHJlbW90ZSBpbnNwZWN0b3IgbG9hZGluZyBwcm9i bGVtcyBvbiBNYWMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L3F0L0dyYXBoaWNzQ29udGV4dFF0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL3F0L0dyYXBoaWNzQ29udGV4dFF0LmNwcAppbmRleCAwNzRlN2RmLi40MDBlM2QxIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9HcmFwaGljc0NvbnRl eHRRdC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvcXQvR3JhcGhp Y3NDb250ZXh0UXQuY3BwCkBAIC03MDMsMjggKzcwMywxOSBAQCB2b2lkIEdyYXBoaWNzQ29udGV4 dDo6ZmlsbFJlY3QoY29uc3QgRmxvYXRSZWN0JiByZWN0LCBjb25zdCBDb2xvciYgY29sb3IsIENv bG9yUwogICAgIGlmIChwYWludGluZ0Rpc2FibGVkKCkgfHwgIWNvbG9yLmlzVmFsaWQoKSkKICAg ICAgICAgcmV0dXJuOwogCi0gICAgbV9kYXRhLT5zb2xpZENvbG9yLnNldENvbG9yKGNvbG9yKTsK KyAgICBRUmVjdEYgcGxhdGZvcm1SZWN0KHJlY3QpOwogICAgIFFQYWludGVyKiBwID0gbV9kYXRh LT5wKCk7Ci0gICAgUVJlY3RGIG5vcm1hbGl6ZWRSZWN0ID0gcmVjdC5ub3JtYWxpemVkKCk7Ci0K ICAgICBpZiAoaGFzU2hhZG93KCkpIHsKICAgICAgICAgU2hhZG93Qmx1ciogc2hhZG93ID0gc2hh ZG93Qmx1cigpOwogICAgICAgICBpZiAoc2hhZG93LT5tdXN0VXNlU2hhZG93Qmx1cih0aGlzKSkg ewotICAgICAgICAgICAgR3JhcGhpY3NDb250ZXh0KiBzaGFkb3dDb250ZXh0ID0gc2hhZG93LT5i ZWdpblNoYWRvd0xheWVyKHRoaXMsIG5vcm1hbGl6ZWRSZWN0KTsKLSAgICAgICAgICAgIGlmIChz aGFkb3dDb250ZXh0KSB7Ci0gICAgICAgICAgICAgICAgUVBhaW50ZXIqIHNoYWRvd1BhaW50ZXIg PSBzaGFkb3dDb250ZXh0LT5wbGF0Zm9ybUNvbnRleHQoKTsKLSAgICAgICAgICAgICAgICBzaGFk b3dQYWludGVyLT5zZXRDb21wb3NpdGlvbk1vZGUoUVBhaW50ZXI6OkNvbXBvc2l0aW9uTW9kZV9T b3VyY2UpOwotICAgICAgICAgICAgICAgIHNoYWRvd1BhaW50ZXItPmZpbGxSZWN0KG5vcm1hbGl6 ZWRSZWN0LCBtX3N0YXRlLnNoYWRvd0NvbG9yKTsKLSAgICAgICAgICAgICAgICBzaGFkb3ctPmVu ZFNoYWRvd0xheWVyKHRoaXMpOwotICAgICAgICAgICAgfQorICAgICAgICAgICAgc2hhZG93LT5k cmF3UmVjdFNoYWRvdyh0aGlzLCBwbGF0Zm9ybVJlY3QsIFJvdW5kZWRSZWN0OjpSYWRpaSgpKTsK ICAgICAgICAgfSBlbHNlIHsKICAgICAgICAgICAgIFFDb2xvciBzaGFkb3dDb2xvciA9IG1fc3Rh dGUuc2hhZG93Q29sb3I7CiAgICAgICAgICAgICBzaGFkb3dDb2xvci5zZXRBbHBoYUYoc2hhZG93 Q29sb3IuYWxwaGFGKCkgKiBwLT5icnVzaCgpLmNvbG9yKCkuYWxwaGFGKCkpOwotICAgICAgICAg ICAgcC0+ZmlsbFJlY3Qobm9ybWFsaXplZFJlY3QudHJhbnNsYXRlZChRUG9pbnRGKG1fc3RhdGUu c2hhZG93T2Zmc2V0LndpZHRoKCksIG1fc3RhdGUuc2hhZG93T2Zmc2V0LmhlaWdodCgpKSksIHNo YWRvd0NvbG9yKTsKKyAgICAgICAgICAgIHAtPmZpbGxSZWN0KHBsYXRmb3JtUmVjdC50cmFuc2xh dGVkKFFQb2ludEYobV9zdGF0ZS5zaGFkb3dPZmZzZXQud2lkdGgoKSwgbV9zdGF0ZS5zaGFkb3dP ZmZzZXQuaGVpZ2h0KCkpKSwgc2hhZG93Q29sb3IpOwogICAgICAgICB9CiAgICAgfQotCi0gICAg cC0+ZmlsbFJlY3Qobm9ybWFsaXplZFJlY3QsIG1fZGF0YS0+c29saWRDb2xvcik7CisgICAgcC0+ ZmlsbFJlY3QocGxhdGZvcm1SZWN0LCBRQ29sb3IoY29sb3IpKTsKIH0KIAogdm9pZCBHcmFwaGlj c0NvbnRleHQ6OmZpbGxSb3VuZGVkUmVjdChjb25zdCBJbnRSZWN0JiByZWN0LCBjb25zdCBJbnRT aXplJiB0b3BMZWZ0LCBjb25zdCBJbnRTaXplJiB0b3BSaWdodCwgY29uc3QgSW50U2l6ZSYgYm90 dG9tTGVmdCwgY29uc3QgSW50U2l6ZSYgYm90dG9tUmlnaHQsIGNvbnN0IENvbG9yJiBjb2xvciwg Q29sb3JTcGFjZSBjb2xvclNwYWNlKQpAQCAtNzM4LDEzICs3MjksNyBAQCB2b2lkIEdyYXBoaWNz Q29udGV4dDo6ZmlsbFJvdW5kZWRSZWN0KGNvbnN0IEludFJlY3QmIHJlY3QsIGNvbnN0IEludFNp emUmIHRvcExlZgogICAgIGlmIChoYXNTaGFkb3coKSkgewogICAgICAgICBTaGFkb3dCbHVyKiBz aGFkb3cgPSBzaGFkb3dCbHVyKCk7CiAgICAgICAgIGlmIChzaGFkb3ctPm11c3RVc2VTaGFkb3dC bHVyKHRoaXMpKSB7Ci0gICAgICAgICAgICBHcmFwaGljc0NvbnRleHQqIHNoYWRvd0NvbnRleHQg PSBzaGFkb3ctPmJlZ2luU2hhZG93TGF5ZXIodGhpcywgcmVjdCk7Ci0gICAgICAgICAgICBpZiAo c2hhZG93Q29udGV4dCkgewotICAgICAgICAgICAgICAgIFFQYWludGVyKiBzaGFkb3dQYWludGVy ID0gc2hhZG93Q29udGV4dC0+cGxhdGZvcm1Db250ZXh0KCk7Ci0gICAgICAgICAgICAgICAgc2hh ZG93UGFpbnRlci0+c2V0Q29tcG9zaXRpb25Nb2RlKFFQYWludGVyOjpDb21wb3NpdGlvbk1vZGVf U291cmNlKTsKLSAgICAgICAgICAgICAgICBzaGFkb3dQYWludGVyLT5maWxsUGF0aChwYXRoLnBs YXRmb3JtUGF0aCgpLCBRQ29sb3IobV9zdGF0ZS5zaGFkb3dDb2xvcikpOwotICAgICAgICAgICAg ICAgIHNoYWRvdy0+ZW5kU2hhZG93TGF5ZXIodGhpcyk7Ci0gICAgICAgICAgICB9CisgICAgICAg ICAgICBzaGFkb3ctPmRyYXdSZWN0U2hhZG93KHRoaXMsIHJlY3QsIFJvdW5kZWRSZWN0OjpSYWRp aSh0b3BMZWZ0LCB0b3BSaWdodCwgYm90dG9tTGVmdCwgYm90dG9tUmlnaHQpKTsKICAgICAgICAg fSBlbHNlIHsKICAgICAgICAgICAgIGNvbnN0IFFQb2ludEYgc2hhZG93T2Zmc2V0KG1fc3RhdGUu c2hhZG93T2Zmc2V0LndpZHRoKCksIG1fc3RhdGUuc2hhZG93T2Zmc2V0LmhlaWdodCgpKTsKICAg ICAgICAgICAgIHAtPnRyYW5zbGF0ZShzaGFkb3dPZmZzZXQpOwpAQCAtMTA0NSw3ICsxMDMwLDEw IEBAIHZvaWQgR3JhcGhpY3NDb250ZXh0OjpwdXNoVHJhbnNwYXJlbmN5TGF5ZXJJbnRlcm5hbChj b25zdCBRUmVjdCAmcmVjdCwgcXJlYWwgb3BhCiB7CiAgICAgUVBhaW50ZXIqIHAgPSBtX2RhdGEt PnAoKTsKIAotICAgIFFSZWN0IGRldmljZUNsaXAgPSBwLT50cmFuc2Zvcm0oKS5tYXBSZWN0KHJl Y3QpOworICAgIFFUcmFuc2Zvcm0gZGV2aWNlVHJhbnNmb3JtID0gcC0+dHJhbnNmb3JtKCk7Cisg ICAgUVJlY3QgZGV2aWNlQ2xpcCA9IGRldmljZVRyYW5zZm9ybS5tYXBSZWN0KHJlY3QpOworCisg ICAgYWxwaGFNYXNrID0gYWxwaGFNYXNrLnRyYW5zZm9ybWVkKGRldmljZVRyYW5zZm9ybSk7CiAg ICAgaWYgKGFscGhhTWFzay53aWR0aCgpICE9IGRldmljZUNsaXAud2lkdGgoKSB8fCBhbHBoYU1h c2suaGVpZ2h0KCkgIT0gZGV2aWNlQ2xpcC5oZWlnaHQoKSkKICAgICAgICAgYWxwaGFNYXNrID0g YWxwaGFNYXNrLnNjYWxlZChkZXZpY2VDbGlwLndpZHRoKCksIGRldmljZUNsaXAuaGVpZ2h0KCkp OwogCi0tIAoxLjcuOS41Cgo= 150165 2012-06-29 06:35:02 -0700 2012-06-29 16:42:15 -0700 Additional patch for GraphicsContext::fillRect(const FloatRect& rect) overloaded function 0001-Qt-Add-missing-support-for-tiled-shadow-blur-on-fill.patch text/plain 2425 bruno.abinader RnJvbSBjZTdkMWY2ODdjZTlhZGU1OGEwYmQzOTljNDQ2NTEyYzIxMWVkZDJmIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBCcnVubyBkZSBPbGl2ZWlyYSBBYmluYWRlciA8YnJ1bm8uYWJp bmFkZXJAYmFzeXNrb20uY29tPgpEYXRlOiBGcmksIDI5IEp1biAyMDEyIDA5OjIzOjQ5IC0wNDAw ClN1YmplY3Q6IFtQQVRDSF0gW1F0XSBBZGQgbWlzc2luZyBzdXBwb3J0IGZvciB0aWxlZCBzaGFk b3cgYmx1ciBvbiBmaWxsUmVjdAogaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTkwMDgyCgpUaGlzIG92ZXJsb2FkZWQgZmlsbFJlY3QgaW1wbGVtZW50YXRpb24gYWxzbyBz dXBwb3J0cyB0aGlzIG9wdGltaXphdGlvbiBpbgpjZXJ0YWluIHNpdHVhdGlvbnMuCi0tLQogU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nICAgICAgICAgICAgICAgICAgICAgICAgICAgfCAgIDEzICsr KysrKysrKysrKysKIC4uLi9wbGF0Zm9ybS9ncmFwaGljcy9xdC9HcmFwaGljc0NvbnRleHRRdC5j cHAgICAgIHwgICAgNyArLS0tLS0tCiAyIGZpbGVzIGNoYW5nZWQsIDE0IGluc2VydGlvbnMoKyks IDYgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIv U291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IDZmZDU5NzEuLjJiZTA1MTIgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VM b2cKQEAgLTEsMyArMSwxNiBAQAorMjAxMi0wNi0yOSAgQnJ1bm8gZGUgT2xpdmVpcmEgQWJpbmFk ZXIgIDxicnVuby5hYmluYWRlckBiYXN5c2tvbS5jb20+CisKKyAgICAgICAgW1F0XSBBZGQgbWlz c2luZyBzdXBwb3J0IGZvciB0aWxlZCBzaGFkb3cgYmx1ciBvbiBmaWxsUmVjdAorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTAwODIKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIG92ZXJsb2FkZWQgZmls bFJlY3QgaW1wbGVtZW50YXRpb24gYWxzbyBzdXBwb3J0cyB0aGlzIG9wdGltaXphdGlvbiBpbgor ICAgICAgICBjZXJ0YWluIHNpdHVhdGlvbnMuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGlj cy9xdC9HcmFwaGljc0NvbnRleHRRdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0Nv bnRleHQ6OmZpbGxSZWN0KToKKwogMjAxMi0wNi0yOSAgS2VudCBUYW11cmEgIDx0a2VudEBjaHJv bWl1bS5vcmc+CiAKICAgICAgICAgPHRleHRhcmVhPiB1bm5lY2Vzc2FyaWx5IHNhdmVzIHRoZSB2 YWx1ZSBpbiBzb21lIGNhc2VzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9xdC9HcmFwaGljc0NvbnRleHRRdC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9xdC9HcmFwaGljc0NvbnRleHRRdC5jcHAKaW5kZXggNDY1ODkwZS4uMjcwNmFh MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvcXQvR3JhcGhp Y3NDb250ZXh0UXQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3F0 L0dyYXBoaWNzQ29udGV4dFF0LmNwcApAQCAtNjc0LDEyICs2NzQsNyBAQCB2b2lkIEdyYXBoaWNz Q29udGV4dDo6ZmlsbFJlY3QoY29uc3QgRmxvYXRSZWN0JiByZWN0KQogICAgIH0gZWxzZSB7CiAg ICAgICAgIGlmIChoYXNTaGFkb3coKSkgewogICAgICAgICAgICAgaWYgKHNoYWRvdy0+bXVzdFVz ZVNoYWRvd0JsdXIodGhpcykpIHsKLSAgICAgICAgICAgICAgICBHcmFwaGljc0NvbnRleHQqIHNo YWRvd0NvbnRleHQgPSBzaGFkb3ctPmJlZ2luU2hhZG93TGF5ZXIodGhpcywgbm9ybWFsaXplZFJl Y3QpOwotICAgICAgICAgICAgICAgIGlmIChzaGFkb3dDb250ZXh0KSB7Ci0gICAgICAgICAgICAg ICAgICAgIFFQYWludGVyKiBzaGFkb3dQYWludGVyID0gc2hhZG93Q29udGV4dC0+cGxhdGZvcm1D b250ZXh0KCk7Ci0gICAgICAgICAgICAgICAgICAgIHNoYWRvd1BhaW50ZXItPmZpbGxSZWN0KG5v cm1hbGl6ZWRSZWN0LCBwLT5icnVzaCgpKTsKLSAgICAgICAgICAgICAgICAgICAgc2hhZG93LT5l bmRTaGFkb3dMYXllcih0aGlzKTsKLSAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICAgICAg c2hhZG93LT5kcmF3UmVjdFNoYWRvdyh0aGlzLCByZWN0LCBSb3VuZGVkUmVjdDo6UmFkaWkoKSk7 CiAgICAgICAgICAgICB9IGVsc2UgewogICAgICAgICAgICAgICAgIC8vIFNvbGlkIHJlY3Rhbmds ZSBmaWxsIHdpdGggbm8gYmx1ciBzaGFkb3cgb3IgdHJhbnNmb3JtYXRpb25zIGFwcGxpZWQgY2Fu IGJlIGRvbmUKICAgICAgICAgICAgICAgICAvLyBmYXN0ZXIgd2l0aG91dCB1c2luZyB0aGUgc2hh ZG93IGxheWVyIGF0IGFsbC4KLS0gCjEuNy45LjUKCg== 150271 2012-06-29 16:43:12 -0700 2013-03-11 08:12:39 -0700 Patch for landing bug-90082-20120629164248.patch text/plain 1907 noam U3VidmVyc2lvbiBSZXZpc2lvbjogMTIxNTk5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOGM5NWE1NDY4NTQzNGFj ODdkMmZkYTMyNTk0Y2E4NjJiOGJkY2YwOC4uY2I2OThkODI2MDM2M2VkYzAwMDUyMWVhMjQzZmI4 YmJmZTQ4N2VhZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDExLTA2LTI5ICBObydh bSBSb3NlbnRoYWwgIDxub2FtLnJvc2VudGhhbEBub2tpYS5jb20+CisKKyAgICAgICAgVW5yZXZp ZXdlZCwgcm9sbGluZyBvdXQgcjEyMTU2OS4KKyAgICAgICAgaHR0cDovL3RyYWMud2Via2l0Lm9y Zy9jaGFuZ2VzZXQvMTIxNTY5CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD05MDA4MgorCisgICAgICAgIEl0IGJyb2tlIGEgY291cGxlIG9mIHRlc3RzIGlu IFF0IExpbnV4IFJlbGVhc2UKKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL3F0L0dyYXBo aWNzQ29udGV4dFF0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzQ29udGV4dDo6Zmls bFJlY3QpOgorCiAyMDEyLTA2LTI5ICBFbWlsIEEgRWtsdW5kICA8ZWFlQGNocm9taXVtLm9yZz4K IAogICAgICAgICBBbGxvdyBub24tYm9yZGVycyB0byBiZSBhZGp1c3RlZCB0byBsZXNzIHRoYW4g MSB3aGVuIHpvb21lZCBvdXQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL3F0L0dyYXBoaWNzQ29udGV4dFF0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL3F0L0dyYXBoaWNzQ29udGV4dFF0LmNwcAppbmRleCAyNzA2YWEzMTgzODA3Y2My Y2Y1ODExMGZkMzY5MzViMWJlMTk4YzRkLi40NjU4OTBlMzQ4N2ZhYjIwNzFmOTM2ZmU0NDczOGQ2 ODk1OTllM2YwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9x dC9HcmFwaGljc0NvbnRleHRRdC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvcXQvR3JhcGhpY3NDb250ZXh0UXQuY3BwCkBAIC02NzQsNyArNjc0LDEyIEBAIHZvaWQg R3JhcGhpY3NDb250ZXh0OjpmaWxsUmVjdChjb25zdCBGbG9hdFJlY3QmIHJlY3QpCiAgICAgfSBl bHNlIHsKICAgICAgICAgaWYgKGhhc1NoYWRvdygpKSB7CiAgICAgICAgICAgICBpZiAoc2hhZG93 LT5tdXN0VXNlU2hhZG93Qmx1cih0aGlzKSkgewotICAgICAgICAgICAgICAgIHNoYWRvdy0+ZHJh d1JlY3RTaGFkb3codGhpcywgcmVjdCwgUm91bmRlZFJlY3Q6OlJhZGlpKCkpOworICAgICAgICAg ICAgICAgIEdyYXBoaWNzQ29udGV4dCogc2hhZG93Q29udGV4dCA9IHNoYWRvdy0+YmVnaW5TaGFk b3dMYXllcih0aGlzLCBub3JtYWxpemVkUmVjdCk7CisgICAgICAgICAgICAgICAgaWYgKHNoYWRv d0NvbnRleHQpIHsKKyAgICAgICAgICAgICAgICAgICAgUVBhaW50ZXIqIHNoYWRvd1BhaW50ZXIg PSBzaGFkb3dDb250ZXh0LT5wbGF0Zm9ybUNvbnRleHQoKTsKKyAgICAgICAgICAgICAgICAgICAg c2hhZG93UGFpbnRlci0+ZmlsbFJlY3Qobm9ybWFsaXplZFJlY3QsIHAtPmJydXNoKCkpOworICAg ICAgICAgICAgICAgICAgICBzaGFkb3ctPmVuZFNoYWRvd0xheWVyKHRoaXMpOworICAgICAgICAg ICAgICAgIH0KICAgICAgICAgICAgIH0gZWxzZSB7CiAgICAgICAgICAgICAgICAgLy8gU29saWQg cmVjdGFuZ2xlIGZpbGwgd2l0aCBubyBibHVyIHNoYWRvdyBvciB0cmFuc2Zvcm1hdGlvbnMgYXBw bGllZCBjYW4gYmUgZG9uZQogICAgICAgICAgICAgICAgIC8vIGZhc3RlciB3aXRob3V0IHVzaW5n IHRoZSBzaGFkb3cgbGF5ZXIgYXQgYWxsLgo= 187626 2013-02-11 11:28:54 -0800 2013-03-11 08:12:44 -0700 Patch bug-90082-20130211172524.patch text/plain 4737 lamarque U3VidmVyc2lvbiBSZXZpc2lvbjogMTQyNDU4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2UxMzA2N2IxY2VmNjE1 MzY1Y2I0ZjcyMDdhMjY4NmJhOWI3ZWRiNi4uMzQxOWYyMGU1NzhiNmI1YWM3OGIwZTViODFkZjAz Njc0NGRkMDRmYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDEzLTAyLTExICBMYW1h cnF1ZSBWLiBTb3V6YSAgPExhbWFycXVlLlNvdXphQGJhc3lza29tLmNvbT4KKworICAgICAgICBb UXRdIEFkZCBzdXBwb3J0IGZvciB0aWxlZCBzaGFkb3cgYmx1ci4KKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTkwMDgyCisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhpcyBvdmVybG9hZGVkIGZpbGxSZWN0IGlt cGxlbWVudGF0aW9uIGFsc28gc3VwcG9ydHMgdGhpcyBvcHRpbWl6YXRpb24gaW4KKyAgICAgICAg Y2VydGFpbiBzaXR1YXRpb25zLgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvU2hhZG93 Qmx1ci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTaGFkb3dCbHVyOjpkcmF3U2hhZG93QnVmZmVy KToKKyAgICAgICAgKFdlYkNvcmU6OlNoYWRvd0JsdXI6OmRyYXdSZWN0U2hhZG93V2l0aG91dFRp bGluZyk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvcXQvR3JhcGhpY3NDb250ZXh0UXQu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6R3JhcGhpY3NDb250ZXh0OjpmaWxsUmVjdCk6CisKIDIw MTMtMDItMTEgIFpvbHRhbiBBcnZhaSAgPHphcnZhaUBpbmYudS1zemVnZWQuaHU+CiAKICAgICAg ICAgW1F0XSBVbnJldmlld2VkLiBGaXggbWluaW1hbCBidWlsZCBhZnRlciByMTQyNDQ0LgpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvU2hhZG93Qmx1ci5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9TaGFkb3dCbHVyLmNwcAppbmRleCAz MzU5MjgzNjdiZjdjNDIxMGRlZjIyZWJlZGEwZTViMWNlYzI4NjU2Li44ODcxMDYzMTg5Mjk2YmU2 MWU2MWM5YmYzNjQzOWMyZjU5ZTdkNWIwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9TaGFkb3dCbHVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9TaGFkb3dCbHVyLmNwcApAQCAtNDQ2LDE3ICs0NDYsOCBAQCB2b2lkIFNoYWRv d0JsdXI6OmRyYXdTaGFkb3dCdWZmZXIoR3JhcGhpY3NDb250ZXh0KiBncmFwaGljc0NvbnRleHQp CiAKICAgICBHcmFwaGljc0NvbnRleHRTdGF0ZVNhdmVyIHN0YXRlU2F2ZXIoKmdyYXBoaWNzQ29u dGV4dCk7CiAKLSAgICBJbnRTaXplIGJ1ZmZlclNpemUgPSBtX2xheWVySW1hZ2UtPmludGVybmFs U2l6ZSgpOwotICAgIGlmIChidWZmZXJTaXplICE9IG1fbGF5ZXJTaXplKSB7Ci0gICAgICAgIC8v IFRoZSByZWN0IHBhc3NlZCB0byBjbGlwVG9JbWFnZUJ1ZmZlcigpIGhhcyB0byBiZSB0aGUgc2l6 ZSBvZiB0aGUgZW50aXJlIGJ1ZmZlciwKLSAgICAgICAgLy8gYnV0IHdlIG1heSBub3QgaGF2ZSBj bGVhcmVkIGl0IGFsbCwgc28gY2xpcCB0byB0aGUgZmlsbGVkIHBhcnQgZmlyc3QuCi0gICAgICAg IGdyYXBoaWNzQ29udGV4dC0+Y2xpcChGbG9hdFJlY3QobV9sYXllck9yaWdpbiwgbV9sYXllclNp emUpKTsKLSAgICB9Ci0gICAgZ3JhcGhpY3NDb250ZXh0LT5jbGlwVG9JbWFnZUJ1ZmZlcihtX2xh eWVySW1hZ2UsIEZsb2F0UmVjdChtX2xheWVyT3JpZ2luLCBidWZmZXJTaXplKSk7Ci0gICAgZ3Jh cGhpY3NDb250ZXh0LT5zZXRGaWxsQ29sb3IobV9jb2xvciwgbV9jb2xvclNwYWNlKTsKLQogICAg IGdyYXBoaWNzQ29udGV4dC0+Y2xlYXJTaGFkb3coKTsKLSAgICBncmFwaGljc0NvbnRleHQtPmZp bGxSZWN0KEZsb2F0UmVjdChtX2xheWVyT3JpZ2luLCBtX3NvdXJjZVJlY3Quc2l6ZSgpKSk7Cisg ICAgZ3JhcGhpY3NDb250ZXh0LT5kcmF3SW1hZ2VCdWZmZXIobV9sYXllckltYWdlLCBtX2NvbG9y U3BhY2UsIHJvdW5kZWRJbnRQb2ludChtX2xheWVyT3JpZ2luKSwgSW50UmVjdCgwLCAwLCBtX2xh eWVyU2l6ZS53aWR0aCgpLCBtX2xheWVyU2l6ZS5oZWlnaHQoKSksIGdyYXBoaWNzQ29udGV4dC0+ Y29tcG9zaXRlT3BlcmF0aW9uKCkpOwogfQogCiBzdGF0aWMgdm9pZCBjb21wdXRlU2xpY2VTaXpl c0Zyb21SYWRpaShjb25zdCBJbnRTaXplJiB0d2ljZVJhZGl1cywgY29uc3QgUm91bmRlZFJlY3Q6 OlJhZGlpJiByYWRpaSwgaW50JiBsZWZ0U2xpY2UsIGludCYgcmlnaHRTbGljZSwgaW50JiB0b3BT bGljZSwgaW50JiBib3R0b21TbGljZSkKQEAgLTU1Myw3ICs1NDQsNyBAQCB2b2lkIFNoYWRvd0Js dXI6OmRyYXdSZWN0U2hhZG93V2l0aG91dFRpbGluZyhHcmFwaGljc0NvbnRleHQqIGdyYXBoaWNz Q29udGV4dCwgYwogICAgIGJvb2wgcmVkcmF3TmVlZGVkID0gU2NyYXRjaEJ1ZmZlcjo6c2hhcmVk KCkuc2V0Q2FjaGVkU2hhZG93VmFsdWVzKG1fYmx1clJhZGl1cywgQ29sb3I6OmJsYWNrLCBDb2xv clNwYWNlRGV2aWNlUkdCLCBidWZmZXJSZWxhdGl2ZVNoYWRvd2VkUmVjdCwgcmFkaWksIG1fbGF5 ZXJTaXplKTsKICAgICBpZiAocmVkcmF3TmVlZGVkKSB7CiAgICAgICAgIEdyYXBoaWNzQ29udGV4 dCogc2hhZG93Q29udGV4dCA9IG1fbGF5ZXJJbWFnZS0+Y29udGV4dCgpOwotICAgICAgICBHcmFw aGljc0NvbnRleHRTdGF0ZVNhdmVyIHN0YXRlU2F2ZXIoKnNoYWRvd0NvbnRleHQpOworICAgICAg ICBzaGFkb3dDb250ZXh0LT5zYXZlKCk7CiAKICAgICAgICAgLy8gQWRkIGEgcGl4ZWwgdG8gYXZv aWQgbGF0ZXIgZWRnZSBhbGlhc2luZyB3aGVuIHJvdGF0ZWQuCiAgICAgICAgIHNoYWRvd0NvbnRl eHQtPmNsZWFyUmVjdChGbG9hdFJlY3QoMCwgMCwgbV9sYXllclNpemUud2lkdGgoKSArIDEsIG1f bGF5ZXJTaXplLmhlaWdodCgpICsgMSkpOwpAQCAtNTY3LDcgKzU1OCw4IEBAIHZvaWQgU2hhZG93 Qmx1cjo6ZHJhd1JlY3RTaGFkb3dXaXRob3V0VGlsaW5nKEdyYXBoaWNzQ29udGV4dCogZ3JhcGhp Y3NDb250ZXh0LCBjCiAgICAgICAgICAgICBzaGFkb3dDb250ZXh0LT5maWxsUGF0aChwYXRoKTsK ICAgICAgICAgfQogCi0gICAgICAgIGJsdXJTaGFkb3dCdWZmZXIoZXhwYW5kZWRJbnRTaXplKG1f bGF5ZXJTaXplKSk7CisgICAgICAgIHNoYWRvd0NvbnRleHQtPnJlc3RvcmUoKTsKKyAgICAgICAg Ymx1ckFuZENvbG9yU2hhZG93QnVmZmVyKGV4cGFuZGVkSW50U2l6ZShtX2xheWVyU2l6ZSkpOwog ICAgIH0KICAgICAKICAgICBkcmF3U2hhZG93QnVmZmVyKGdyYXBoaWNzQ29udGV4dCk7CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9HcmFwaGljc0NvbnRl eHRRdC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9HcmFwaGljc0Nv bnRleHRRdC5jcHAKaW5kZXggMmQzYWM2ZDNlNDFlNDhkYzVkZjhkZjdlMjM3YTAzZTExMzk1ZWE3 OC4uYTkxZGJmN2Y2OGFlYjk0M2NhZGYxY2YyMzEzODI4NDQzMTMwNmQ0ZCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvcXQvR3JhcGhpY3NDb250ZXh0UXQuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3F0L0dyYXBoaWNzQ29udGV4 dFF0LmNwcApAQCAtODAxLDE0ICs4MDEsOSBAQCB2b2lkIEdyYXBoaWNzQ29udGV4dDo6ZmlsbFJl Y3QoY29uc3QgRmxvYXRSZWN0JiByZWN0KQogICAgICAgICBwLT5maWxsUmVjdChub3JtYWxpemVk UmVjdCwgYnJ1c2gpOwogICAgIH0gZWxzZSB7CiAgICAgICAgIGlmIChoYXNTaGFkb3coKSkgewot ICAgICAgICAgICAgaWYgKHNoYWRvdy0+bXVzdFVzZVNoYWRvd0JsdXIodGhpcykpIHsKLSAgICAg ICAgICAgICAgICBHcmFwaGljc0NvbnRleHQqIHNoYWRvd0NvbnRleHQgPSBzaGFkb3ctPmJlZ2lu U2hhZG93TGF5ZXIodGhpcywgbm9ybWFsaXplZFJlY3QpOwotICAgICAgICAgICAgICAgIGlmIChz aGFkb3dDb250ZXh0KSB7Ci0gICAgICAgICAgICAgICAgICAgIFFQYWludGVyKiBzaGFkb3dQYWlu dGVyID0gc2hhZG93Q29udGV4dC0+cGxhdGZvcm1Db250ZXh0KCk7Ci0gICAgICAgICAgICAgICAg ICAgIHNoYWRvd1BhaW50ZXItPmZpbGxSZWN0KG5vcm1hbGl6ZWRSZWN0LCBwLT5icnVzaCgpKTsK LSAgICAgICAgICAgICAgICAgICAgc2hhZG93LT5lbmRTaGFkb3dMYXllcih0aGlzKTsKLSAgICAg ICAgICAgICAgICB9Ci0gICAgICAgICAgICB9IGVsc2UgeworICAgICAgICAgICAgaWYgKHNoYWRv dy0+bXVzdFVzZVNoYWRvd0JsdXIodGhpcykpCisgICAgICAgICAgICAgICAgc2hhZG93LT5kcmF3 UmVjdFNoYWRvdyh0aGlzLCByZWN0LCBSb3VuZGVkUmVjdDo6UmFkaWkoKSk7CisgICAgICAgICAg ICBlbHNlIHsKICAgICAgICAgICAgICAgICAvLyBTb2xpZCByZWN0YW5nbGUgZmlsbCB3aXRoIG5v IGJsdXIgc2hhZG93IG9yIHRyYW5zZm9ybWF0aW9ucyBhcHBsaWVkIGNhbiBiZSBkb25lCiAgICAg ICAgICAgICAgICAgLy8gZmFzdGVyIHdpdGhvdXQgdXNpbmcgdGhlIHNoYWRvdyBsYXllciBhdCBh bGwuCiAgICAgICAgICAgICAgICAgUUNvbG9yIHNoYWRvd0NvbG9yID0gbV9zdGF0ZS5zaGFkb3dD b2xvcjsK 192473 2013-03-11 08:12:49 -0700 2013-03-14 06:10:36 -0700 Patch bug-90082-20130311160758.patch text/plain 4947 allan.jensen U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ1MjM2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzU2MzA1ODBhMTAwY2Qz Y2I2NWEwOGFkMDU0MGNlZGJhMTVjMjhkZS4uNDg4OGZjNzYwOWUwOWI0YzFiOWRjYjM3ZGNhZWQw MGM0MTdhMGY1MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDEzLTAzLTExICBBbGxh biBTYW5kZmVsZCBKZW5zZW4gIDxhbGxhbi5qZW5zZW5AZGlnaWEuY29tPgorCisgICAgICAgIFtR dF0gQWRkIHN1cHBvcnQgZm9yIHRpbGVkIHNoYWRvdyBibHVyCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05MDA4MgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFVzZSB0aGUgb3B0aW1pemVkIFNoYWRvd0JsdXI6 OmRyYXdSZWN0U2hhZG93IGFzIGxvbmcgYXMgd2UgZG8gbm90CisgICAgICAgIGhhdmUgYSByb3Rh dGluZyB0cmFuc2Zvcm0uIFN1Y2ggYSB0cmFuc2Zvcm0gd291bGQgZ28gdGhyb3VnaCB0aGUKKyAg ICAgICAgc2xvdyBwYXRoIGluIFNoYWRvd0JsdXIgYW55d2F5LCBhbmQgd291bGQgZW5kIHVwIHVz aW5nIGEgdHJhbnNmb3JtZWQKKyAgICAgICAgVHJhbnNwYXJlbmN5TGF5ZXIgd2l0aCBhbiBhbHBo YU1hcCB3aGljaCBjYXVzZXMgc2NhbGluZyBhcnRpZmFjdHMKKyAgICAgICAgZm9yIHVzLgorCisg ICAgICAgIFRlc3RlZCBieSBmYXN0L2NhbnZhcy9jYW52YXMtc2NhbGUtZmlsbFJlY3Qtc2hhZG93 Lmh0bWwKKyAgICAgICAgYW5kIGZhc3QvY2FudmFzL2NhbnZhcy10cmFuc2Zvcm1zLWZpbGxSZWN0 LXNoYWRvdy5odG1sCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9TaGFkb3dCbHVyLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OlNoYWRvd0JsdXI6OmRyYXdJbnNldFNoYWRvd1dpdGhUaWxp bmcpOgorICAgICAgICAgICAgSGFuZGxlIHNjYWxpbmcgdHJhbnNmb3JtcyB3aGVuIHNoYWRvd3Mg aWdub3JlIHRyYW5zZm9ybXMuCisgICAgICAgIChXZWJDb3JlOjpTaGFkb3dCbHVyOjpkcmF3UmVj dFNoYWRvd1dpdGhUaWxpbmcpOgorICAgICAgICAgICAgRGl0dG8uCisgICAgICAgICogcGxhdGZv cm0vZ3JhcGhpY3MvcXQvR3JhcGhpY3NDb250ZXh0UXQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 R3JhcGhpY3NDb250ZXh0OjpmaWxsUmVjdCk6CisKIDIwMTMtMDMtMDggIEFsbGFuIFNhbmRmZWxk IEplbnNlbiAgPGFsbGFuLmplbnNlbkBkaWdpYS5jb20+CiAKICAgICAgICAgW1F0XSBFbmFibGUg dGlsZWQgc2hhZG93IGJsdXIgZm9yIGluc2V0IGJveCBzaGFkb3dzCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9TaGFkb3dCbHVyLmNwcCBiL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL1NoYWRvd0JsdXIuY3BwCmluZGV4IDVjOTI2MTJkMjVmOWNj NWM2NDZjMzdkZjIxZDU4NjdmNTc3NGU0MGYuLjQ4YWY5NDE1NThlYmQ0NTc2YTc1MzIzMTFiY2Ey MTdhNDlkNDFlZWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L1NoYWRvd0JsdXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL1No YWRvd0JsdXIuY3BwCkBAIC02NzksMTIgKzY3OSwxNyBAQCB2b2lkIFNoYWRvd0JsdXI6OmRyYXdJ bnNldFNoYWRvd1dpdGhUaWxpbmcoR3JhcGhpY3NDb250ZXh0KiBncmFwaGljc0NvbnRleHQsIGNv bgogCiAgICAgICAgIGJsdXJBbmRDb2xvclNoYWRvd0J1ZmZlcih0ZW1wbGF0ZVNpemUpOwogICAg IH0KKyAgICBGbG9hdFNpemUgb2Zmc2V0ID0gbV9vZmZzZXQ7CisgICAgaWYgKHNoYWRvd3NJZ25v cmVUcmFuc2Zvcm1zKCkpIHsKKyAgICAgICAgQWZmaW5lVHJhbnNmb3JtIHRyYW5zZm9ybSA9IGdy YXBoaWNzQ29udGV4dC0+Z2V0Q1RNKCk7CisgICAgICAgIG9mZnNldC5zY2FsZSgxIC8gc3RhdGlj X2Nhc3Q8ZmxvYXQ+KHRyYW5zZm9ybS54U2NhbGUoKSksIDEgLyBzdGF0aWNfY2FzdDxmbG9hdD4o dHJhbnNmb3JtLnlTY2FsZSgpKSk7CisgICAgfQogCiAgICAgRmxvYXRSZWN0IGJvdW5kaW5nUmVj dCA9IHJlY3Q7Ci0gICAgYm91bmRpbmdSZWN0Lm1vdmUobV9vZmZzZXQpOworICAgIGJvdW5kaW5n UmVjdC5tb3ZlKG9mZnNldCk7CiAKICAgICBGbG9hdFJlY3QgZGVzdEhvbGVSZWN0ID0gaG9sZVJl Y3Q7Ci0gICAgZGVzdEhvbGVSZWN0Lm1vdmUobV9vZmZzZXQpOworICAgIGRlc3RIb2xlUmVjdC5t b3ZlKG9mZnNldCk7CiAgICAgRmxvYXRSZWN0IGRlc3RIb2xlQm91bmRzID0gZGVzdEhvbGVSZWN0 OwogICAgIGRlc3RIb2xlQm91bmRzLmluZmxhdGVYKGVkZ2VTaXplLndpZHRoKCkpOwogICAgIGRl c3RIb2xlQm91bmRzLmluZmxhdGVZKGVkZ2VTaXplLmhlaWdodCgpKTsKQEAgLTczNiw5ICs3NDEs MTQgQEAgdm9pZCBTaGFkb3dCbHVyOjpkcmF3UmVjdFNoYWRvd1dpdGhUaWxpbmcoR3JhcGhpY3ND b250ZXh0KiBncmFwaGljc0NvbnRleHQsIGNvbnMKIAogICAgICAgICBibHVyQW5kQ29sb3JTaGFk b3dCdWZmZXIodGVtcGxhdGVTaXplKTsKICAgICB9CisgICAgRmxvYXRTaXplIG9mZnNldCA9IG1f b2Zmc2V0OworICAgIGlmIChzaGFkb3dzSWdub3JlVHJhbnNmb3JtcygpKSB7CisgICAgICAgIEFm ZmluZVRyYW5zZm9ybSB0cmFuc2Zvcm0gPSBncmFwaGljc0NvbnRleHQtPmdldENUTSgpOworICAg ICAgICBvZmZzZXQuc2NhbGUoMSAvIHN0YXRpY19jYXN0PGZsb2F0Pih0cmFuc2Zvcm0ueFNjYWxl KCkpLCAxIC8gc3RhdGljX2Nhc3Q8ZmxvYXQ+KHRyYW5zZm9ybS55U2NhbGUoKSkpOworICAgIH0K IAogICAgIEZsb2F0UmVjdCBzaGFkb3dCb3VuZHMgPSBzaGFkb3dlZFJlY3Q7Ci0gICAgc2hhZG93 Qm91bmRzLm1vdmUobV9vZmZzZXQud2lkdGgoKSwgbV9vZmZzZXQuaGVpZ2h0KCkpOworICAgIHNo YWRvd0JvdW5kcy5tb3ZlKG9mZnNldCk7CiAgICAgc2hhZG93Qm91bmRzLmluZmxhdGVYKGVkZ2VT aXplLndpZHRoKCkpOwogICAgIHNoYWRvd0JvdW5kcy5pbmZsYXRlWShlZGdlU2l6ZS5oZWlnaHQo KSk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3F0L0dy YXBoaWNzQ29udGV4dFF0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3F0 L0dyYXBoaWNzQ29udGV4dFF0LmNwcAppbmRleCBlZjJiNzE4MTU0M2MwYjM0NWFiZWJjZTRjOTcz MTViNjE4OWJiMTNlLi45ODRmZTY5NmRkNTJmOTNjN2M4YmUzNmI1NDZjMGJlYjExZmQyOTJlIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9HcmFwaGljc0Nv bnRleHRRdC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvcXQvR3Jh cGhpY3NDb250ZXh0UXQuY3BwCkBAIC04MDIsMTIgKzgwMiwxNyBAQCB2b2lkIEdyYXBoaWNzQ29u dGV4dDo6ZmlsbFJlY3QoY29uc3QgRmxvYXRSZWN0JiByZWN0KQogICAgIH0gZWxzZSB7CiAgICAg ICAgIGlmIChoYXNTaGFkb3coKSkgewogICAgICAgICAgICAgaWYgKHNoYWRvdy0+bXVzdFVzZVNo YWRvd0JsdXIodGhpcykpIHsKLSAgICAgICAgICAgICAgICBHcmFwaGljc0NvbnRleHQqIHNoYWRv d0NvbnRleHQgPSBzaGFkb3ctPmJlZ2luU2hhZG93TGF5ZXIodGhpcywgbm9ybWFsaXplZFJlY3Qp OwotICAgICAgICAgICAgICAgIGlmIChzaGFkb3dDb250ZXh0KSB7Ci0gICAgICAgICAgICAgICAg ICAgIFFQYWludGVyKiBzaGFkb3dQYWludGVyID0gc2hhZG93Q29udGV4dC0+cGxhdGZvcm1Db250 ZXh0KCk7Ci0gICAgICAgICAgICAgICAgICAgIHNoYWRvd1BhaW50ZXItPmZpbGxSZWN0KG5vcm1h bGl6ZWRSZWN0LCBwLT5icnVzaCgpKTsKLSAgICAgICAgICAgICAgICAgICAgc2hhZG93LT5lbmRT aGFkb3dMYXllcih0aGlzKTsKLSAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICAgICAgLy8g ZHJhd1JlY3RTaGFkb3dXaXRoVGlsaW5nIGRvZXMgbm90IHdvcmsgd2l0aCByb3RhdGlvbnMsIGFu ZCB0aGUgZmFsbGJhY2sgb2YKKyAgICAgICAgICAgICAgICAvLyBkcmF3aW5nIHRob3VnaCBjbGlw VG9JbWFnZUJ1ZmZlcigpIHByb2R1Y2VzIHNjYWxpbmcgYXJ0aWZhY3RzIGZvciB1cy4KKyAgICAg ICAgICAgICAgICBpZiAoIWdldENUTSgpLnByZXNlcnZlc0F4aXNBbGlnbm1lbnQoKSkgeworICAg ICAgICAgICAgICAgICAgICBHcmFwaGljc0NvbnRleHQqIHNoYWRvd0NvbnRleHQgPSBzaGFkb3ct PmJlZ2luU2hhZG93TGF5ZXIodGhpcywgbm9ybWFsaXplZFJlY3QpOworICAgICAgICAgICAgICAg ICAgICBpZiAoc2hhZG93Q29udGV4dCkgeworICAgICAgICAgICAgICAgICAgICAgICAgUVBhaW50 ZXIqIHNoYWRvd1BhaW50ZXIgPSBzaGFkb3dDb250ZXh0LT5wbGF0Zm9ybUNvbnRleHQoKTsKKyAg ICAgICAgICAgICAgICAgICAgICAgIHNoYWRvd1BhaW50ZXItPmZpbGxSZWN0KG5vcm1hbGl6ZWRS ZWN0LCBwLT5icnVzaCgpKTsKKyAgICAgICAgICAgICAgICAgICAgICAgIHNoYWRvdy0+ZW5kU2hh ZG93TGF5ZXIodGhpcyk7CisgICAgICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgICAgICB9 IGVsc2UKKyAgICAgICAgICAgICAgICAgICAgc2hhZG93LT5kcmF3UmVjdFNoYWRvdyh0aGlzLCBy ZWN0LCBSb3VuZGVkUmVjdDo6UmFkaWkoKSk7CiAgICAgICAgICAgICB9IGVsc2UgewogICAgICAg ICAgICAgICAgIC8vIFNvbGlkIHJlY3RhbmdsZSBmaWxsIHdpdGggbm8gYmx1ciBzaGFkb3cgb3Ig dHJhbnNmb3JtYXRpb25zIGFwcGxpZWQgY2FuIGJlIGRvbmUKICAgICAgICAgICAgICAgICAvLyBm YXN0ZXIgd2l0aG91dCB1c2luZyB0aGUgc2hhZG93IGxheWVyIGF0IGFsbC4K