45722 2010-09-13 17:14:51 -0700 Lower the default canvas interpolation quality for platforms that use CG 2011-03-28 09:10:38 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Mac OS X 10.5 RESOLVED FIXED P2 Normal --- 46243 1 mdelaney7 mdelaney7 adele aroben cmarcelo commit-queue ggaren hyatt oliver simon.fraser oldest_to_newest 278586 0 mdelaney7 2010-09-13 17:14:51 -0700 Currently Safari is using CG's "high" interpolation quality setting as the default for canvas. Dropping it down to "low" speeds up many canvas demos (including GUIMark 2 bitmap, IE Asteroid, etc.) without any noticeable degradation of quality. As a result, the speedups for animations make the apparent quality seem much better. Also, CG's low interpolation quality setting is equivalent to most other browsers' default or high settings. Note: Dropping the interpolation quality down to low still causes the drawing of large images to go slowly if they're scaled down when drawn into the canvas. This will be addressed in a followup bug that will block on this one. 278835 1 67542 mdelaney7 2010-09-14 05:25:07 -0700 Created attachment 67542 Patch 278836 2 mdelaney7 2010-09-14 05:26:54 -0700 This patch is likely WIP due to it possibly causing a small issue in 2 of the canvas layout tests. Will investigate very soon. 279139 3 67542 ggaren 2010-09-14 13:50:33 -0700 Comment on attachment 67542 Patch r- due to layout test failures. 281706 4 aroben 2010-09-20 11:43:47 -0700 Why not do this on Windows, too? 281710 5 ggaren 2010-09-20 11:48:19 -0700 Why not on all platforms? 281712 6 oliver 2010-09-20 11:50:31 -0700 (In reply to comment #5) > Why not on all platforms? It should be PLATFORM(CG) as the specific problem is that CG's high quality is higher quality (and hence slower) than any other graphics libraries high quality. Medium quality in CG is trilinear filtering, which is higher quality than anything firefox, et al use anywhere afaik 281731 7 mdelaney7 2010-09-20 12:16:32 -0700 Yes, Oliver said it well. This is specifically to address CG. Cross-platform, there is a concept of basically 4 possible "Interpolation Quality" settings: none, low, medium, and high. Per platform, these quality settings match to different scaling algorithms. CG's low setting happens to be others' high/medium settings which is quantized bilinear interpolation. AFAIK, everywhere else in webkit, we're using CG's high setting. This patch is just changing the quality setting used in the CG version of canvas. 283936 8 68584 mdelaney7 2010-09-23 14:11:00 -0700 Created attachment 68584 Patch 284084 9 68584 oliver 2010-09-23 16:32:45 -0700 Comment on attachment 68584 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=68584&action=review > WebCore/html/canvas/CanvasRenderingContext2D.cpp:140 > + if (GraphicsContext* c = drawingContext()) > + c->setImageInterpolationQuality(DefaultInterpolationQuality); We deliberately delayed creation of the underlying ImageBuffer in the canvas so that we don't end up doing a whole lot of work on an imagebuffer that is going to be thrown out. Also this means when we do throw out the buffer and then recreate it we won't reset the interpolation quality. The existing location of the call to setInterpolation quality is the correct one. 284107 10 68624 mdelaney7 2010-09-23 16:53:05 -0700 Created attachment 68624 Patch 284139 11 68624 commit-queue 2010-09-23 17:29:47 -0700 Comment on attachment 68624 Patch Clearing flags on attachment: 68624 Committed r68221: <http://trac.webkit.org/changeset/68221> 284140 12 commit-queue 2010-09-23 17:29:53 -0700 All reviewed patches have been landed. Closing bug. 374526 13 cmarcelo 2011-03-28 09:10:38 -0700 Revision r68221 cherry-picked into qtwebkit-2.1-x with commit 318b799eee638d69247276fa8b9ba48027562bcd <http://gitorious.org/webkit/qtwebkit/commit/318b799eee638d69247276fa8b9ba48027562bcd> 67542 2010-09-14 05:25:07 -0700 2010-09-23 14:10:57 -0700 Patch bug-45722-20100914082504.patch text/plain 5085 mdelaney7 SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2NzQ1OCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTggQEAKKzIwMTAtMDktMTQgIE1hdHRoZXcgRGVsYW5leSAgPG1kZWxhbmV5QGFw cGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBMb3dlciB0aGUgZGVmYXVsdCBjYW52YXMgaW50ZXJwb2xhdGlvbiBxdWFsaXR5IGZvciBtYWMK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ1NzIyCisK KyAgICAgICAgTm8gbmV3IHRlc3RzLiAoT09QUyEpCisKKyAgICAgICAgKiBXZWJDb3JlLnhjb2Rl cHJvai9wcm9qZWN0LnBieHByb2o6CisgICAgICAgICogaHRtbC9IVE1MQ2FudmFzRWxlbWVudC5j cHA6IE1vdmVkIG91dCBzZXR1cCBjYWxsIHRvIHNldEludGVycG9sYXRpb25RdWFsaXR5LgorICAg ICAgICAqIGh0bWwvY2FudmFzL0NhbnZhc1JlbmRlcmluZ0NvbnRleHQyRC5jcHA6IE1vdmVkIGlu IHNldHVwIGNhbGwgdG8gc2V0SW50ZXJwb2xhdGlvblF1YWxpdHkuCisgICAgICAgICogaHRtbC9j YW52YXMvQ2FudmFzUmVuZGVyaW5nQ29udGV4dDJELmg6IE1vdmVkIGluIG1hY3JvcyBmb3IgZGVm YXVsdCBjYW52YXMgaW50ZXJwIHF1YWxpdHkuCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3Mv R3JhcGhpY3NDb250ZXh0Lmg6IE1vdmVkIG91dCBtYWNyb3MgZm9yIGRlZmF1bHQgY2FudmFzIGlu dGVycCBxdWFsaXR5LiBJdCBtYWtlcyBtb3JlIHNlbnNlIHRvIG1lIGZvciB0aGVtIHRvIGJlIGhv dXNlZCBpbiB0aGUgY2FudmFzcmVuZGVyaW5nY29udGV4dDJkIHdoZXJlIHRoZXkgc2hvdWxkIGJl IHVzZWQgdGhhbiBpbiBhIGdlbmVyYWwgZ3JhcGhpY3MgY29udGV4dC4KKwogMjAxMC0wOS0xNCAg RXJpYyBTZWlkZWwgIDxlcmljQHdlYmtpdC5vcmc+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgcmV2 ZXJ0aW5nIGNoYW5nZXMgcjY3NDUxIGFuZCByNjc0NTEuCkluZGV4OiBXZWJDb3JlL1dlYkNvcmUu eGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvago9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL1dlYkNvcmUu eGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagkocmV2aXNpb24gNjc0MDQpCisrKyBXZWJDb3JlL1dl YkNvcmUueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagkod29ya2luZyBjb3B5KQpAQCAtMjA2MTYs NiArMjA2MTYsNyBAQAogCQkJaXNhID0gUEJYUHJvamVjdDsKIAkJCWJ1aWxkQ29uZmlndXJhdGlv bkxpc3QgPSAxNDlDMjg0MzA4OTAyQjExMDA4QTlFRkMgLyogQnVpbGQgY29uZmlndXJhdGlvbiBs aXN0IGZvciBQQlhQcm9qZWN0ICJXZWJDb3JlIiAqLzsKIAkJCWNvbXBhdGliaWxpdHlWZXJzaW9u ID0gIlhjb2RlIDIuNCI7CisJCQlkZXZlbG9wbWVudFJlZ2lvbiA9IEVuZ2xpc2g7CiAJCQloYXNT Y2FubmVkRm9yRW5jb2RpbmdzID0gMTsKIAkJCWtub3duUmVnaW9ucyA9ICgKIAkJCQlFbmdsaXNo LApJbmRleDogV2ViQ29yZS9odG1sL0hUTUxDYW52YXNFbGVtZW50LmNwcAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBXZWJDb3JlL2h0bWwvSFRNTENhbnZhc0VsZW1lbnQuY3BwCShyZXZpc2lvbiA2NzQwNCkKKysr IFdlYkNvcmUvaHRtbC9IVE1MQ2FudmFzRWxlbWVudC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTM3 Nyw3ICszNzcsNiBAQCB2b2lkIEhUTUxDYW52YXNFbGVtZW50OjpjcmVhdGVJbWFnZUJ1ZmZlCiAg ICAgICAgIHJldHVybjsKICAgICBtX2ltYWdlQnVmZmVyLT5jb250ZXh0KCktPnNjYWxlKEZsb2F0 U2l6ZShzaXplLndpZHRoKCkgLyB1bnNjYWxlZFNpemUud2lkdGgoKSwgc2l6ZS5oZWlnaHQoKSAv IHVuc2NhbGVkU2l6ZS5oZWlnaHQoKSkpOwogICAgIG1faW1hZ2VCdWZmZXItPmNvbnRleHQoKS0+ c2V0U2hhZG93c0lnbm9yZVRyYW5zZm9ybXModHJ1ZSk7Ci0gICAgbV9pbWFnZUJ1ZmZlci0+Y29u dGV4dCgpLT5zZXRJbWFnZUludGVycG9sYXRpb25RdWFsaXR5KENhbnZhc0ludGVycG9sYXRpb25R dWFsaXR5KTsKIH0KIAogR3JhcGhpY3NDb250ZXh0KiBIVE1MQ2FudmFzRWxlbWVudDo6ZHJhd2lu Z0NvbnRleHQoKSBjb25zdApJbmRleDogV2ViQ29yZS9odG1sL2NhbnZhcy9DYW52YXNSZW5kZXJp bmdDb250ZXh0MkQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvaHRtbC9jYW52YXMvQ2FudmFz UmVuZGVyaW5nQ29udGV4dDJELmNwcAkocmV2aXNpb24gNjc0MDQpCisrKyBXZWJDb3JlL2h0bWwv Y2FudmFzL0NhbnZhc1JlbmRlcmluZ0NvbnRleHQyRC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEz NSw2ICsxMzUsOSBAQCBDYW52YXNSZW5kZXJpbmdDb250ZXh0MkQ6OkNhbnZhc1JlbmRlcmluCiAg ICAgICAgICAgICBjLT5zZXRTaGFyZWRHcmFwaGljc0NvbnRleHQzRChtX2NvbnRleHQzRC5nZXQo KSwgbV9kcmF3aW5nQnVmZmVyLmdldCgpLCBJbnRTaXplKGNhbnZhcy0+d2lkdGgoKSwgY2FudmFz LT5oZWlnaHQoKSkpOwogICAgICAgICB9CiAgICAgfQorI2Vsc2UKKyAgICBpZiAoR3JhcGhpY3ND b250ZXh0KiBjID0gZHJhd2luZ0NvbnRleHQoKSkKKyAgICAgICAgYy0+c2V0SW1hZ2VJbnRlcnBv bGF0aW9uUXVhbGl0eShEZWZhdWx0SW50ZXJwb2xhdGlvblF1YWxpdHkpOwogI2VuZGlmCiB9CiAK SW5kZXg6IFdlYkNvcmUvaHRtbC9jYW52YXMvQ2FudmFzUmVuZGVyaW5nQ29udGV4dDJELmgKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gV2ViQ29yZS9odG1sL2NhbnZhcy9DYW52YXNSZW5kZXJpbmdDb250ZXh0MkQu aAkocmV2aXNpb24gNjc0MDQpCisrKyBXZWJDb3JlL2h0bWwvY2FudmFzL0NhbnZhc1JlbmRlcmlu Z0NvbnRleHQyRC5oCSh3b3JraW5nIGNvcHkpCkBAIC00Niw2ICs0NiwxNCBAQAogI2luY2x1ZGUg IkdyYXBoaWNzTGF5ZXIuaCIKICNlbmRpZgogCisjaWYgUExBVEZPUk0oQ0hST01JVU0pCisjZGVm aW5lIERlZmF1bHRJbnRlcnBvbGF0aW9uUXVhbGl0eSBJbnRlcnBvbGF0aW9uTWVkaXVtCisjZWxp ZiBQTEFURk9STShDRykKKyNkZWZpbmUgRGVmYXVsdEludGVycG9sYXRpb25RdWFsaXR5IEludGVy cG9sYXRpb25Mb3cKKyNlbHNlCisjZGVmaW5lIERlZmF1bHRJbnRlcnBvbGF0aW9uUXVhbGl0eSBJ bnRlcnBvbGF0aW9uRGVmYXVsdAorI2VuZGlmCisKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogY2xh c3MgQ2FudmFzR3JhZGllbnQ7CkluZGV4OiBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dyYXBo aWNzQ29udGV4dC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvR3Jh cGhpY3NDb250ZXh0LmgJKHJldmlzaW9uIDY3NDA0KQorKysgV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9HcmFwaGljc0NvbnRleHQuaAkod29ya2luZyBjb3B5KQpAQCAtMTAwLDEyICsxMDAsNiBA QCB0eXBlZGVmIHVuc2lnbmVkIGNoYXIgVUludDg7CiAjZW5kaWYKICNlbmRpZgogCi0jaWYgUExB VEZPUk0oQ0hST01JVU0pCi0jZGVmaW5lIENhbnZhc0ludGVycG9sYXRpb25RdWFsaXR5IEludGVy cG9sYXRpb25NZWRpdW0KLSNlbHNlCi0jZGVmaW5lIENhbnZhc0ludGVycG9sYXRpb25RdWFsaXR5 IEludGVycG9sYXRpb25EZWZhdWx0Ci0jZW5kaWYKLQogI2lmIFBMQVRGT1JNKFFUKSAmJiBkZWZp bmVkKFFfV1NfV0lOKQogI2luY2x1ZGUgPHdpbmRvd3MuaD4KICNlbmRpZgpJbmRleDogV2ViS2l0 L0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvQ2hhbmdlTG9nCShyZXZpc2lvbiA2NzQ1 OCkKKysrIFdlYktpdC9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxMiBAQAor MjAxMC0wOS0xNCAgTWF0dGhldyBEZWxhbmV5ICA8bWRlbGFuZXlAYXBwbGUuY29tPgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIExvd2VyIHRoZSBkZWZh dWx0IGNhbnZhcyBpbnRlcnBvbGF0aW9uIHF1YWxpdHkgZm9yIG1hYworICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDU3MjIKKworICAgICAgICAqIFdlYktp dC54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qOgorCiAyMDEwLTA5LTEwICBEYXJpbiBBZGxlciAg PGRhcmluQGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBTYW0gV2VpbmlnLgpJbmRl eDogV2ViS2l0L1dlYktpdC54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFdlYktpdC9XZWJLaXQueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagkocmV2aXNpb24gNjc0MDQp CisrKyBXZWJLaXQvV2ViS2l0Lnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oJKHdvcmtpbmcgY29w eSkKQEAgLTE2NzAsNiArMTY3MCw3IEBACiAJCQlpc2EgPSBQQlhQcm9qZWN0OwogCQkJYnVpbGRD b25maWd1cmF0aW9uTGlzdCA9IDE0OUMyODMyMDg5MDJCMEYwMDhBOUVGQyAvKiBCdWlsZCBjb25m aWd1cmF0aW9uIGxpc3QgZm9yIFBCWFByb2plY3QgIldlYktpdCIgKi87CiAJCQljb21wYXRpYmls aXR5VmVyc2lvbiA9ICJYY29kZSAyLjQiOworCQkJZGV2ZWxvcG1lbnRSZWdpb24gPSBFbmdsaXNo OwogCQkJaGFzU2Nhbm5lZEZvckVuY29kaW5ncyA9IDE7CiAJCQlrbm93blJlZ2lvbnMgPSAoCiAJ CQkJRW5nbGlzaCwK 68584 2010-09-23 14:11:00 -0700 2010-09-23 16:53:02 -0700 Patch bug-45722-20100923141059.patch text/plain 4197 mdelaney7 SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2ODE4NykKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjEgQEAKKzIwMTAtMDktMjMgIE1hdHRoZXcgRGVsYW5leSAgPG1kZWxhbmV5QGFw cGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBMb3dlciB0aGUgZGVmYXVsdCBjYW52YXMgaW50ZXJwb2xhdGlvbiBxdWFsaXR5IGZvciBwbGF0 Zm9ybXMgdGhhdCB1c2UgQ0cKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTQ1NzIyCisKKyAgICAgICAgTG93ZXJlZCB0aGUgZGVmYXVsdCBpbWFnZSBpbnRl cnBvbGF0aW9uIHF1YWxpdHkgZm9yIHBsYXRmb3JtcyB0aGF0CisgICAgICAgIHVzZSBDRyBkb3du IHRvIGxvdyBzaW5jZSB0aGlzIGlzIGFzIGdvb2QgYXMgaWYgbm90IGJldHRlciB0aGFuCisgICAg ICAgIG90aGVyIGdyYXBoaWNzIHBsYXRmb3JtcyBkZWZhdWx0cyAoYmVpbmcgYmlsaW5lYXIgaW50 ZXJwb2xhdGlvbikuLgorCisgICAgICAgIENhbid0IHRlc3QgdGhyb3VnaCBsYXlvdXQgdGVzdHMu CisKKyAgICAgICAgKiBodG1sL0hUTUxDYW52YXNFbGVtZW50LmNwcDogTW92ZWQgb3V0IHNldHVw IGNhbGwgdG8gc2V0SW50ZXJwb2xhdGlvblF1YWxpdHkuCisgICAgICAgICogaHRtbC9jYW52YXMv Q2FudmFzUmVuZGVyaW5nQ29udGV4dDJELmNwcDogTW92ZWQgaW4gc2V0dXAgY2FsbCB0byBzZXRJ bnRlcnBvbGF0aW9uUXVhbGl0eS4KKyAgICAgICAgKiBodG1sL2NhbnZhcy9DYW52YXNSZW5kZXJp bmdDb250ZXh0MkQuaDogTW92ZWQgaW4gbWFjcm9zIGZvciBkZWZhdWx0IGNhbnZhcyBpbnRlcnAg cXVhbGl0eS4KKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0NvbnRleHQuaDog TW92ZWQgb3V0IG1hY3JvcyBmb3IgZGVmYXVsdCBjYW52YXMgaW50ZXJwIHF1YWxpdHkuIEl0IG1h a2VzIG1vcmUgc2Vuc2UgdG8gbWUgZm9yIHRoZW0gdG8gYmUgaG91c2VkIGluIHRoZSBjYW52YXNy ZW5kZXJpbmdjb250ZXh0MmQgd2hlcmUgdGhleSBzaG91bGQgYmUgdXNlZCB0aGFuIGluIGEgZ2Vu ZXJhbCBncmFwaGljcyBjb250ZXh0LgorCiAyMDEwLTA5LTIzICBEYXZpZCBIeWF0dCAgPGh5YXR0 QGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBEYW4gQmVybnN0ZWluLgpJbmRleDog V2ViQ29yZS9odG1sL0hUTUxDYW52YXNFbGVtZW50LmNwcAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3Jl L2h0bWwvSFRNTENhbnZhc0VsZW1lbnQuY3BwCShyZXZpc2lvbiA2ODE4NykKKysrIFdlYkNvcmUv aHRtbC9IVE1MQ2FudmFzRWxlbWVudC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTM3Nyw3ICszNzcs NiBAQCB2b2lkIEhUTUxDYW52YXNFbGVtZW50OjpjcmVhdGVJbWFnZUJ1ZmZlCiAgICAgICAgIHJl dHVybjsKICAgICBtX2ltYWdlQnVmZmVyLT5jb250ZXh0KCktPnNjYWxlKEZsb2F0U2l6ZShzaXpl LndpZHRoKCkgLyB1bnNjYWxlZFNpemUud2lkdGgoKSwgc2l6ZS5oZWlnaHQoKSAvIHVuc2NhbGVk U2l6ZS5oZWlnaHQoKSkpOwogICAgIG1faW1hZ2VCdWZmZXItPmNvbnRleHQoKS0+c2V0U2hhZG93 c0lnbm9yZVRyYW5zZm9ybXModHJ1ZSk7Ci0gICAgbV9pbWFnZUJ1ZmZlci0+Y29udGV4dCgpLT5z ZXRJbWFnZUludGVycG9sYXRpb25RdWFsaXR5KENhbnZhc0ludGVycG9sYXRpb25RdWFsaXR5KTsK IH0KIAogR3JhcGhpY3NDb250ZXh0KiBIVE1MQ2FudmFzRWxlbWVudDo6ZHJhd2luZ0NvbnRleHQo KSBjb25zdApJbmRleDogV2ViQ29yZS9odG1sL2NhbnZhcy9DYW52YXNSZW5kZXJpbmdDb250ZXh0 MkQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvaHRtbC9jYW52YXMvQ2FudmFzUmVuZGVyaW5n Q29udGV4dDJELmNwcAkocmV2aXNpb24gNjgxODcpCisrKyBXZWJDb3JlL2h0bWwvY2FudmFzL0Nh bnZhc1JlbmRlcmluZ0NvbnRleHQyRC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEzNSw2ICsxMzUs OSBAQCBDYW52YXNSZW5kZXJpbmdDb250ZXh0MkQ6OkNhbnZhc1JlbmRlcmluCiAgICAgICAgICAg ICBjLT5zZXRTaGFyZWRHcmFwaGljc0NvbnRleHQzRChtX2NvbnRleHQzRC5nZXQoKSwgbV9kcmF3 aW5nQnVmZmVyLmdldCgpLCBJbnRTaXplKGNhbnZhcy0+d2lkdGgoKSwgY2FudmFzLT5oZWlnaHQo KSkpOwogICAgICAgICB9CiAgICAgfQorI2Vsc2UKKyAgICBpZiAoR3JhcGhpY3NDb250ZXh0KiBj ID0gZHJhd2luZ0NvbnRleHQoKSkKKyAgICAgICAgYy0+c2V0SW1hZ2VJbnRlcnBvbGF0aW9uUXVh bGl0eShEZWZhdWx0SW50ZXJwb2xhdGlvblF1YWxpdHkpOwogI2VuZGlmCiB9CiAKSW5kZXg6IFdl YkNvcmUvaHRtbC9jYW52YXMvQ2FudmFzUmVuZGVyaW5nQ29udGV4dDJELmgKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gV2ViQ29yZS9odG1sL2NhbnZhcy9DYW52YXNSZW5kZXJpbmdDb250ZXh0MkQuaAkocmV2aXNp b24gNjgxODcpCisrKyBXZWJDb3JlL2h0bWwvY2FudmFzL0NhbnZhc1JlbmRlcmluZ0NvbnRleHQy RC5oCSh3b3JraW5nIGNvcHkpCkBAIC00Niw2ICs0NiwxNCBAQAogI2luY2x1ZGUgIkdyYXBoaWNz TGF5ZXIuaCIKICNlbmRpZgogCisjaWYgUExBVEZPUk0oQ0hST01JVU0pCisjZGVmaW5lIERlZmF1 bHRJbnRlcnBvbGF0aW9uUXVhbGl0eSBJbnRlcnBvbGF0aW9uTWVkaXVtCisjZWxpZiBQTEFURk9S TShDRykKKyNkZWZpbmUgRGVmYXVsdEludGVycG9sYXRpb25RdWFsaXR5IEludGVycG9sYXRpb25M b3cKKyNlbHNlCisjZGVmaW5lIERlZmF1bHRJbnRlcnBvbGF0aW9uUXVhbGl0eSBJbnRlcnBvbGF0 aW9uRGVmYXVsdAorI2VuZGlmCisKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogY2xhc3MgQ2FudmFz R3JhZGllbnQ7CkluZGV4OiBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzQ29udGV4 dC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvR3JhcGhpY3NDb250 ZXh0LmgJKHJldmlzaW9uIDY4MTg3KQorKysgV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9HcmFw aGljc0NvbnRleHQuaAkod29ya2luZyBjb3B5KQpAQCAtMTAwLDEyICsxMDAsNiBAQCB0eXBlZGVm IHVuc2lnbmVkIGNoYXIgVUludDg7CiAjZW5kaWYKICNlbmRpZgogCi0jaWYgUExBVEZPUk0oQ0hS T01JVU0pCi0jZGVmaW5lIENhbnZhc0ludGVycG9sYXRpb25RdWFsaXR5IEludGVycG9sYXRpb25N ZWRpdW0KLSNlbHNlCi0jZGVmaW5lIENhbnZhc0ludGVycG9sYXRpb25RdWFsaXR5IEludGVycG9s YXRpb25EZWZhdWx0Ci0jZW5kaWYKLQogI2lmIFBMQVRGT1JNKFFUKSAmJiBkZWZpbmVkKFFfV1Nf V0lOKQogI2luY2x1ZGUgPHdpbmRvd3MuaD4KICNlbmRpZgpJbmRleDogV2ViS2l0L0NoYW5nZUxv Zwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBXZWJLaXQvQ2hhbmdlTG9nCShyZXZpc2lvbiA2ODE4NykKKysrIFdl YktpdC9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxMCBAQAorMjAxMC0wOS0y MyAgTWF0dGhldyBEZWxhbmV5ICA8bWRlbGFuZXlAYXBwbGUuY29tPgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIExvd2VyIHRoZSBkZWZhdWx0IGNhbnZh cyBpbnRlcnBvbGF0aW9uIHF1YWxpdHkgZm9yIHBsYXRmb3JtcyB0aGF0IHVzZSBDRworICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDU3MjIKKwogMjAxMC0w OS0yMiAgTHVjYXMgRGUgTWFyY2hpICA8bHVjYXMuZGVtYXJjaGlAcHJvZnVzaW9uLm1vYmk+CiAK ICAgICAgICAgVW5yZXZpZXdlZCwgRUZMIGJ1aWxkIGZpeC4K 68624 2010-09-23 16:53:05 -0700 2010-09-23 17:29:47 -0700 Patch bug-45722-20100923165304.patch text/plain 2912 mdelaney7 SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2ODIxNikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTkgQEAKKzIwMTAtMDktMjMgIE1hdHRoZXcgRGVsYW5leSAgPG1kZWxhbmV5QGFw cGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBMb3dlciB0aGUgZGVmYXVsdCBjYW52YXMgaW50ZXJwb2xhdGlvbiBxdWFsaXR5IGZvciBwbGF0 Zm9ybXMgdGhhdCB1c2UgQ0cKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTQ1NzIyCisKKyAgICAgICAgTG93ZXJlZCB0aGUgZGVmYXVsdCBpbWFnZSBpbnRl cnBvbGF0aW9uIHF1YWxpdHkgZm9yIHBsYXRmb3JtcyB0aGF0CisgICAgICAgIHVzZSBDRyBkb3du IHRvIGxvdyBzaW5jZSB0aGlzIGlzIGFzIGdvb2QgYXMgaWYgbm90IGJldHRlciB0aGFuCisgICAg ICAgIG90aGVyIGdyYXBoaWNzIHBsYXRmb3JtcyBkZWZhdWx0cyAoYmVpbmcgYmlsaW5lYXIgaW50 ZXJwb2xhdGlvbikuCisKKyAgICAgICAgKiBodG1sL0hUTUxDYW52YXNFbGVtZW50LmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OkhUTUxDYW52YXNFbGVtZW50OjpjcmVhdGVJbWFnZUJ1ZmZlcik6Cisg ICAgICAgICogaHRtbC9IVE1MQ2FudmFzRWxlbWVudC5oOiBNb3ZlZCBpbiBtYWNyb3MgZm9yIGRl ZmF1bHQgY2FudmFzIGludGVycCBxdWFsaXR5LgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNz L0dyYXBoaWNzQ29udGV4dC5oOiBNb3ZlZCBvdXQgbWFjcm9zIGZvciBkZWZhdWx0IGNhbnZhcyBp bnRlcnAgcXVhbGl0eS4gSXQgbWFrZXMgbW9yZSBzZW5zZSBmb3IgdGhlbSB0byBiZSBob3VzZWQg d2hlcmUgdGhleSdyZSB1c2VkLgorCiAyMDEwLTA5LTIzICBEYXZpZCBIeWF0dCAgPGh5YXR0QGFw cGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBBZGVsZSBQZXRlcnNvbi4KSW5kZXg6IFdl YkNvcmUvaHRtbC9IVE1MQ2FudmFzRWxlbWVudC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9o dG1sL0hUTUxDYW52YXNFbGVtZW50LmNwcAkocmV2aXNpb24gNjgxODYpCisrKyBXZWJDb3JlL2h0 bWwvSFRNTENhbnZhc0VsZW1lbnQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zNzcsNyArMzc3LDcg QEAgdm9pZCBIVE1MQ2FudmFzRWxlbWVudDo6Y3JlYXRlSW1hZ2VCdWZmZQogICAgICAgICByZXR1 cm47CiAgICAgbV9pbWFnZUJ1ZmZlci0+Y29udGV4dCgpLT5zY2FsZShGbG9hdFNpemUoc2l6ZS53 aWR0aCgpIC8gdW5zY2FsZWRTaXplLndpZHRoKCksIHNpemUuaGVpZ2h0KCkgLyB1bnNjYWxlZFNp emUuaGVpZ2h0KCkpKTsKICAgICBtX2ltYWdlQnVmZmVyLT5jb250ZXh0KCktPnNldFNoYWRvd3NJ Z25vcmVUcmFuc2Zvcm1zKHRydWUpOwotICAgIG1faW1hZ2VCdWZmZXItPmNvbnRleHQoKS0+c2V0 SW1hZ2VJbnRlcnBvbGF0aW9uUXVhbGl0eShDYW52YXNJbnRlcnBvbGF0aW9uUXVhbGl0eSk7Cisg ICAgbV9pbWFnZUJ1ZmZlci0+Y29udGV4dCgpLT5zZXRJbWFnZUludGVycG9sYXRpb25RdWFsaXR5 KERlZmF1bHRJbnRlcnBvbGF0aW9uUXVhbGl0eSk7CiB9CiAKIEdyYXBoaWNzQ29udGV4dCogSFRN TENhbnZhc0VsZW1lbnQ6OmRyYXdpbmdDb250ZXh0KCkgY29uc3QKSW5kZXg6IFdlYkNvcmUvaHRt bC9IVE1MQ2FudmFzRWxlbWVudC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvaHRtbC9IVE1MQ2Fu dmFzRWxlbWVudC5oCShyZXZpc2lvbiA2ODE4NikKKysrIFdlYkNvcmUvaHRtbC9IVE1MQ2FudmFz RWxlbWVudC5oCSh3b3JraW5nIGNvcHkpCkBAIC0zMiw2ICszMiwxNCBAQAogI2luY2x1ZGUgIkhU TUxFbGVtZW50LmgiCiAjaW5jbHVkZSAiSW50U2l6ZS5oIgogCisjaWYgUExBVEZPUk0oQ0hST01J VU0pCisjZGVmaW5lIERlZmF1bHRJbnRlcnBvbGF0aW9uUXVhbGl0eSBJbnRlcnBvbGF0aW9uTWVk aXVtCisjZWxpZiBQTEFURk9STShDRykKKyNkZWZpbmUgRGVmYXVsdEludGVycG9sYXRpb25RdWFs aXR5IEludGVycG9sYXRpb25Mb3cKKyNlbHNlCisjZGVmaW5lIERlZmF1bHRJbnRlcnBvbGF0aW9u UXVhbGl0eSBJbnRlcnBvbGF0aW9uRGVmYXVsdAorI2VuZGlmCisKIG5hbWVzcGFjZSBXZWJDb3Jl IHsKIAogY2xhc3MgQ2FudmFzQ29udGV4dEF0dHJpYnV0ZXM7CkluZGV4OiBXZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL0dyYXBoaWNzQ29udGV4dC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvR3JhcGhpY3NDb250ZXh0LmgJKHJldmlzaW9uIDY4MTg2KQorKysgV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0NvbnRleHQuaAkod29ya2luZyBjb3B5KQpA QCAtMTAwLDEyICsxMDAsNiBAQCB0eXBlZGVmIHVuc2lnbmVkIGNoYXIgVUludDg7CiAjZW5kaWYK ICNlbmRpZgogCi0jaWYgUExBVEZPUk0oQ0hST01JVU0pCi0jZGVmaW5lIENhbnZhc0ludGVycG9s YXRpb25RdWFsaXR5IEludGVycG9sYXRpb25NZWRpdW0KLSNlbHNlCi0jZGVmaW5lIENhbnZhc0lu dGVycG9sYXRpb25RdWFsaXR5IEludGVycG9sYXRpb25EZWZhdWx0Ci0jZW5kaWYKLQogI2lmIFBM QVRGT1JNKFFUKSAmJiBkZWZpbmVkKFFfV1NfV0lOKQogI2luY2x1ZGUgPHdpbmRvd3MuaD4KICNl bmRpZgo=