60331 2011-05-05 19:26:23 -0700 Remove canvas usage of roundToDevicePixels 2011-05-09 13:23:13 -0700 1 1 1 Unclassified WebKit Canvas 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 mdelaney7 mdelaney7 mdelaney7 simon.fraser oldest_to_newest 399287 0 mdelaney7 2011-05-05 19:26:23 -0700 roundToDevicePixels() was added in http://trac.webkit.org/changeset/14739 to canvas in order to remedy pixel cracks when at non-integral scales. This code path causes us to create clips for drawImage which causes the drawImage path to be much slower in CG. Chromium appears to ignore the method altogether by early returning from it. I don't believe it's necessary to worry about rounding to device pixels when drawing in the canvas' backing stores. 399293 1 92531 mdelaney7 2011-05-05 19:39:03 -0700 Created attachment 92531 Patch 399336 2 92531 simon.fraser 2011-05-05 22:34:28 -0700 Comment on attachment 92531 Patch Were all these calls to roundToDevicePixels() added at the same time? Have you looked at the history to check why each was added? 400596 3 92810 mdelaney7 2011-05-09 11:22:35 -0700 Created attachment 92810 Patch 400655 4 92810 simon.fraser 2011-05-09 12:27:23 -0700 Comment on attachment 92810 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=92810&action=review > Source/WebCore/platform/graphics/cg/ImageCG.cpp:271 > - CGContextDrawImage(context, GraphicsContext(context).roundToDevicePixels(FloatRect(0, 0, CGImageGetWidth(image), CGImageGetHeight(image))), image); > + CGContextDrawImage(context, FloatRect(0, 0, CGImageGetWidth(image), CGImageGetHeight(image)), image); The change log says "This could only affect canvases at non-integral scale factors" but that doesn't seem to be true for this change. > Source/WebCore/platform/graphics/cg/PatternCG.cpp:43 > + CGRect rect = FloatRect(0, 0, CGImageGetWidth(platformImage), CGImageGetHeight(platformImage)); Ditto. 400676 5 92829 mdelaney7 2011-05-09 12:42:46 -0700 Created attachment 92829 Patch 400704 6 mdelaney7 2011-05-09 13:23:13 -0700 Committed r86085: <http://trac.webkit.org/changeset/86085> 92531 2011-05-05 19:39:03 -0700 2011-05-09 11:22:31 -0700 Patch bug-60331-20110505193859.patch text/plain 3249 mdelaney7 SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDg1OTEzKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTEtMDUtMDUgIE1hdHRoZXcg RGVsYW5leSAgPG1kZWxhbmV5QGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBSZW1vdmUgY2FudmFzIHVzYWdlIG9mIHJvdW5kVG9EZXZp Y2VQaXhlbHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTYwMzMxCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLiBUaGlzIGNvdWxkIG9ubHkgYWZmZWN0IGNh bnZhc2VzIGF0IG5vbi1pbnRlZ3JhbCBzY2FsZSBmYWN0b3JzLiBPdXIgdGVzdHMgb25seSBydW4g aW4gMS4weC4KKworICAgICAgICAqIGh0bWwvY2FudmFzL0NhbnZhc1JlbmRlcmluZ0NvbnRleHQy RC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDYW52YXNSZW5kZXJpbmdDb250ZXh0MkQ6OmRyYXdJ bWFnZSk6CisKIDIwMTEtMDUtMDUgIEVyaWMgQ2FybHNvbiAgPGVyaWMuY2FybHNvbkBhcHBsZS5j b20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGFyaW4gQWRsZXIuCkluZGV4OiBTb3VyY2UvV2Vi Q29yZS9odG1sL2NhbnZhcy9DYW52YXNSZW5kZXJpbmdDb250ZXh0MkQuY3BwCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJDb3JlL2h0bWwvY2FudmFzL0NhbnZhc1JlbmRlcmluZ0NvbnRleHQyRC5j cHAJKHJldmlzaW9uIDg1Nzc1KQorKysgU291cmNlL1dlYkNvcmUvaHRtbC9jYW52YXMvQ2FudmFz UmVuZGVyaW5nQ29udGV4dDJELmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTMxMywxMCArMTMxMyw4 IEBAIHZvaWQgQ2FudmFzUmVuZGVyaW5nQ29udGV4dDJEOjpkcmF3SW1hZ2UKIAogICAgIGNoZWNr T3JpZ2luKGltYWdlKTsKIAotICAgIEZsb2F0UmVjdCBzb3VyY2VSZWN0ID0gYy0+cm91bmRUb0Rl dmljZVBpeGVscyhub3JtYWxpemVkU3JjUmVjdCk7Ci0gICAgRmxvYXRSZWN0IGRlc3RSZWN0ID0g Yy0+cm91bmRUb0RldmljZVBpeGVscyhub3JtYWxpemVkRHN0UmVjdCk7Ci0gICAgYy0+ZHJhd0lt YWdlKGNhY2hlZEltYWdlLT5pbWFnZSgpLCBDb2xvclNwYWNlRGV2aWNlUkdCLCBkZXN0UmVjdCwg c291cmNlUmVjdCwgb3ApOwotICAgIGRpZERyYXcoZGVzdFJlY3QpOworICAgIGMtPmRyYXdJbWFn ZShjYWNoZWRJbWFnZS0+aW1hZ2UoKSwgQ29sb3JTcGFjZURldmljZVJHQiwgbm9ybWFsaXplZERz dFJlY3QsIG5vcm1hbGl6ZWRTcmNSZWN0LCBvcCk7CisgICAgZGlkRHJhdyhub3JtYWxpemVkRHN0 UmVjdCk7CiB9CiAKIHZvaWQgQ2FudmFzUmVuZGVyaW5nQ29udGV4dDJEOjpkcmF3SW1hZ2UoSFRN TENhbnZhc0VsZW1lbnQqIGNhbnZhcywgZmxvYXQgeCwgZmxvYXQgeSwgRXhjZXB0aW9uQ29kZSYg ZWMpCkBAIC0xMzc2LDkgKzEzNzQsNiBAQCB2b2lkIENhbnZhc1JlbmRlcmluZ0NvbnRleHQyRDo6 ZHJhd0ltYWdlCiAgICAgaWYgKCFzdGF0ZSgpLm1faW52ZXJ0aWJsZUNUTSkKICAgICAgICAgcmV0 dXJuOwogCi0gICAgRmxvYXRSZWN0IHNvdXJjZVJlY3QgPSBjLT5yb3VuZFRvRGV2aWNlUGl4ZWxz KHNyY1JlY3QpOwotICAgIEZsb2F0UmVjdCBkZXN0UmVjdCA9IGMtPnJvdW5kVG9EZXZpY2VQaXhl bHMoZHN0UmVjdCk7Ci0KICAgICAvLyBGSVhNRTogRG8gdGhpcyB0aHJvdWdoIHBsYXRmb3JtLWlu ZGVwZW5kZW50IEdyYXBoaWNzQ29udGV4dCBBUEkuCiAgICAgSW1hZ2VCdWZmZXIqIGJ1ZmZlciA9 IHNvdXJjZUNhbnZhcy0+YnVmZmVyKCk7CiAgICAgaWYgKCFidWZmZXIpCkBAIC0xMzk3LDggKzEz OTIsOCBAQCB2b2lkIENhbnZhc1JlbmRlcmluZ0NvbnRleHQyRDo6ZHJhd0ltYWdlCiAgICAgc291 cmNlQ2FudmFzLT5tYWtlUmVuZGVyaW5nUmVzdWx0c0F2YWlsYWJsZSgpOwogI2VuZGlmCiAKLSAg ICBjLT5kcmF3SW1hZ2VCdWZmZXIoYnVmZmVyLCBDb2xvclNwYWNlRGV2aWNlUkdCLCBkZXN0UmVj dCwgc291cmNlUmVjdCwgc3RhdGUoKS5tX2dsb2JhbENvbXBvc2l0ZSk7Ci0gICAgZGlkRHJhdyhk ZXN0UmVjdCk7CisgICAgYy0+ZHJhd0ltYWdlQnVmZmVyKGJ1ZmZlciwgQ29sb3JTcGFjZURldmlj ZVJHQiwgZHN0UmVjdCwgc3JjUmVjdCwgc3RhdGUoKS5tX2dsb2JhbENvbXBvc2l0ZSk7CisgICAg ZGlkRHJhdyhkc3RSZWN0KTsKIH0KIAogI2lmIEVOQUJMRShWSURFTykKQEAgLTE0NjAsMTcgKzE0 NTUsMTQgQEAgdm9pZCBDYW52YXNSZW5kZXJpbmdDb250ZXh0MkQ6OmRyYXdJbWFnZQogCiAgICAg Y2hlY2tPcmlnaW4odmlkZW8pOwogCi0gICAgRmxvYXRSZWN0IHNvdXJjZVJlY3QgPSBjLT5yb3Vu ZFRvRGV2aWNlUGl4ZWxzKHNyY1JlY3QpOwotICAgIEZsb2F0UmVjdCBkZXN0UmVjdCA9IGMtPnJv dW5kVG9EZXZpY2VQaXhlbHMoZHN0UmVjdCk7Ci0KICAgICBHcmFwaGljc0NvbnRleHRTdGF0ZVNh dmVyIHN0YXRlU2F2ZXIoKmMpOwotICAgIGMtPmNsaXAoZGVzdFJlY3QpOwotICAgIGMtPnRyYW5z bGF0ZShkZXN0UmVjdC54KCksIGRlc3RSZWN0LnkoKSk7Ci0gICAgYy0+c2NhbGUoRmxvYXRTaXpl KGRlc3RSZWN0LndpZHRoKCkgLyBzb3VyY2VSZWN0LndpZHRoKCksIGRlc3RSZWN0LmhlaWdodCgp IC8gc291cmNlUmVjdC5oZWlnaHQoKSkpOwotICAgIGMtPnRyYW5zbGF0ZSgtc291cmNlUmVjdC54 KCksIC1zb3VyY2VSZWN0LnkoKSk7CisgICAgYy0+Y2xpcChkc3RSZWN0KTsKKyAgICBjLT50cmFu c2xhdGUoZHN0UmVjdC54KCksIGRzdFJlY3QueSgpKTsKKyAgICBjLT5zY2FsZShGbG9hdFNpemUo ZHN0UmVjdC53aWR0aCgpIC8gc3JjUmVjdC53aWR0aCgpLCBkc3RSZWN0LmhlaWdodCgpIC8gc3Jj UmVjdC5oZWlnaHQoKSkpOworICAgIGMtPnRyYW5zbGF0ZSgtc3JjUmVjdC54KCksIC1zcmNSZWN0 LnkoKSk7CiAgICAgdmlkZW8tPnBhaW50Q3VycmVudEZyYW1lSW5Db250ZXh0KGMsIEludFJlY3Qo SW50UG9pbnQoKSwgc2l6ZSh2aWRlbykpKTsKICAgICBzdGF0ZVNhdmVyLnJlc3RvcmUoKTsKLSAg ICBkaWREcmF3KGRlc3RSZWN0KTsKKyAgICBkaWREcmF3KGRzdFJlY3QpOwogfQogI2VuZGlmCiAK 92810 2011-05-09 11:22:35 -0700 2011-05-09 12:42:41 -0700 Patch bug-60331-20110509112244.patch text/plain 4748 mdelaney7 SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDg1OTEzKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTEtMDUtMDUgIE1hdHRoZXcg RGVsYW5leSAgPG1kZWxhbmV5QGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBSZW1vdmUgY2FudmFzIHVzYWdlIG9mIHJvdW5kVG9EZXZp Y2VQaXhlbHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTYwMzMxCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLiBUaGlzIGNvdWxkIG9ubHkgYWZmZWN0IGNh bnZhc2VzIGF0IG5vbi1pbnRlZ3JhbCBzY2FsZSBmYWN0b3JzLiBPdXIgdGVzdHMgb25seSBydW4g aW4gMS4weC4KKworICAgICAgICAqIGh0bWwvY2FudmFzL0NhbnZhc1JlbmRlcmluZ0NvbnRleHQy RC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDYW52YXNSZW5kZXJpbmdDb250ZXh0MkQ6OmRyYXdJ bWFnZSk6CisKIDIwMTEtMDUtMDUgIEVyaWMgQ2FybHNvbiAgPGVyaWMuY2FybHNvbkBhcHBsZS5j b20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGFyaW4gQWRsZXIuCkluZGV4OiBTb3VyY2UvV2Vi Q29yZS9odG1sL2NhbnZhcy9DYW52YXNSZW5kZXJpbmdDb250ZXh0MkQuY3BwCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJDb3JlL2h0bWwvY2FudmFzL0NhbnZhc1JlbmRlcmluZ0NvbnRleHQyRC5j cHAJKHJldmlzaW9uIDg1Nzc1KQorKysgU291cmNlL1dlYkNvcmUvaHRtbC9jYW52YXMvQ2FudmFz UmVuZGVyaW5nQ29udGV4dDJELmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTMxMywxMCArMTMxMyw4 IEBAIHZvaWQgQ2FudmFzUmVuZGVyaW5nQ29udGV4dDJEOjpkcmF3SW1hZ2UKIAogICAgIGNoZWNr T3JpZ2luKGltYWdlKTsKIAotICAgIEZsb2F0UmVjdCBzb3VyY2VSZWN0ID0gYy0+cm91bmRUb0Rl dmljZVBpeGVscyhub3JtYWxpemVkU3JjUmVjdCk7Ci0gICAgRmxvYXRSZWN0IGRlc3RSZWN0ID0g Yy0+cm91bmRUb0RldmljZVBpeGVscyhub3JtYWxpemVkRHN0UmVjdCk7Ci0gICAgYy0+ZHJhd0lt YWdlKGNhY2hlZEltYWdlLT5pbWFnZSgpLCBDb2xvclNwYWNlRGV2aWNlUkdCLCBkZXN0UmVjdCwg c291cmNlUmVjdCwgb3ApOwotICAgIGRpZERyYXcoZGVzdFJlY3QpOworICAgIGMtPmRyYXdJbWFn ZShjYWNoZWRJbWFnZS0+aW1hZ2UoKSwgQ29sb3JTcGFjZURldmljZVJHQiwgbm9ybWFsaXplZERz dFJlY3QsIG5vcm1hbGl6ZWRTcmNSZWN0LCBvcCk7CisgICAgZGlkRHJhdyhub3JtYWxpemVkRHN0 UmVjdCk7CiB9CiAKIHZvaWQgQ2FudmFzUmVuZGVyaW5nQ29udGV4dDJEOjpkcmF3SW1hZ2UoSFRN TENhbnZhc0VsZW1lbnQqIGNhbnZhcywgZmxvYXQgeCwgZmxvYXQgeSwgRXhjZXB0aW9uQ29kZSYg ZWMpCkBAIC0xMzc2LDkgKzEzNzQsNiBAQCB2b2lkIENhbnZhc1JlbmRlcmluZ0NvbnRleHQyRDo6 ZHJhd0ltYWdlCiAgICAgaWYgKCFzdGF0ZSgpLm1faW52ZXJ0aWJsZUNUTSkKICAgICAgICAgcmV0 dXJuOwogCi0gICAgRmxvYXRSZWN0IHNvdXJjZVJlY3QgPSBjLT5yb3VuZFRvRGV2aWNlUGl4ZWxz KHNyY1JlY3QpOwotICAgIEZsb2F0UmVjdCBkZXN0UmVjdCA9IGMtPnJvdW5kVG9EZXZpY2VQaXhl bHMoZHN0UmVjdCk7Ci0KICAgICAvLyBGSVhNRTogRG8gdGhpcyB0aHJvdWdoIHBsYXRmb3JtLWlu ZGVwZW5kZW50IEdyYXBoaWNzQ29udGV4dCBBUEkuCiAgICAgSW1hZ2VCdWZmZXIqIGJ1ZmZlciA9 IHNvdXJjZUNhbnZhcy0+YnVmZmVyKCk7CiAgICAgaWYgKCFidWZmZXIpCkBAIC0xMzk3LDggKzEz OTIsOCBAQCB2b2lkIENhbnZhc1JlbmRlcmluZ0NvbnRleHQyRDo6ZHJhd0ltYWdlCiAgICAgc291 cmNlQ2FudmFzLT5tYWtlUmVuZGVyaW5nUmVzdWx0c0F2YWlsYWJsZSgpOwogI2VuZGlmCiAKLSAg ICBjLT5kcmF3SW1hZ2VCdWZmZXIoYnVmZmVyLCBDb2xvclNwYWNlRGV2aWNlUkdCLCBkZXN0UmVj dCwgc291cmNlUmVjdCwgc3RhdGUoKS5tX2dsb2JhbENvbXBvc2l0ZSk7Ci0gICAgZGlkRHJhdyhk ZXN0UmVjdCk7CisgICAgYy0+ZHJhd0ltYWdlQnVmZmVyKGJ1ZmZlciwgQ29sb3JTcGFjZURldmlj ZVJHQiwgZHN0UmVjdCwgc3JjUmVjdCwgc3RhdGUoKS5tX2dsb2JhbENvbXBvc2l0ZSk7CisgICAg ZGlkRHJhdyhkc3RSZWN0KTsKIH0KIAogI2lmIEVOQUJMRShWSURFTykKQEAgLTE0NjAsMTcgKzE0 NTUsMTQgQEAgdm9pZCBDYW52YXNSZW5kZXJpbmdDb250ZXh0MkQ6OmRyYXdJbWFnZQogCiAgICAg Y2hlY2tPcmlnaW4odmlkZW8pOwogCi0gICAgRmxvYXRSZWN0IHNvdXJjZVJlY3QgPSBjLT5yb3Vu ZFRvRGV2aWNlUGl4ZWxzKHNyY1JlY3QpOwotICAgIEZsb2F0UmVjdCBkZXN0UmVjdCA9IGMtPnJv dW5kVG9EZXZpY2VQaXhlbHMoZHN0UmVjdCk7Ci0KICAgICBHcmFwaGljc0NvbnRleHRTdGF0ZVNh dmVyIHN0YXRlU2F2ZXIoKmMpOwotICAgIGMtPmNsaXAoZGVzdFJlY3QpOwotICAgIGMtPnRyYW5z bGF0ZShkZXN0UmVjdC54KCksIGRlc3RSZWN0LnkoKSk7Ci0gICAgYy0+c2NhbGUoRmxvYXRTaXpl KGRlc3RSZWN0LndpZHRoKCkgLyBzb3VyY2VSZWN0LndpZHRoKCksIGRlc3RSZWN0LmhlaWdodCgp IC8gc291cmNlUmVjdC5oZWlnaHQoKSkpOwotICAgIGMtPnRyYW5zbGF0ZSgtc291cmNlUmVjdC54 KCksIC1zb3VyY2VSZWN0LnkoKSk7CisgICAgYy0+Y2xpcChkc3RSZWN0KTsKKyAgICBjLT50cmFu c2xhdGUoZHN0UmVjdC54KCksIGRzdFJlY3QueSgpKTsKKyAgICBjLT5zY2FsZShGbG9hdFNpemUo ZHN0UmVjdC53aWR0aCgpIC8gc3JjUmVjdC53aWR0aCgpLCBkc3RSZWN0LmhlaWdodCgpIC8gc3Jj UmVjdC5oZWlnaHQoKSkpOworICAgIGMtPnRyYW5zbGF0ZSgtc3JjUmVjdC54KCksIC1zcmNSZWN0 LnkoKSk7CiAgICAgdmlkZW8tPnBhaW50Q3VycmVudEZyYW1lSW5Db250ZXh0KGMsIEludFJlY3Qo SW50UG9pbnQoKSwgc2l6ZSh2aWRlbykpKTsKICAgICBzdGF0ZVNhdmVyLnJlc3RvcmUoKTsKLSAg ICBkaWREcmF3KGRlc3RSZWN0KTsKKyAgICBkaWREcmF3KGRzdFJlY3QpOwogfQogI2VuZGlmCiAK SW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NnL0ltYWdlQ0cuY3BwCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NnL0ltYWdlQ0cu Y3BwCShyZXZpc2lvbiA4NTc3NSkKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L2NnL0ltYWdlQ0cuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yNjgsNyArMjY4LDcgQEAgdm9pZCBC aXRtYXBJbWFnZTo6ZHJhdyhHcmFwaGljc0NvbnRleHQqIAogc3RhdGljIHZvaWQgZHJhd1BhdHRl cm5DYWxsYmFjayh2b2lkKiBpbmZvLCBDR0NvbnRleHRSZWYgY29udGV4dCkKIHsKICAgICBDR0lt YWdlUmVmIGltYWdlID0gKENHSW1hZ2VSZWYpaW5mbzsKLSAgICBDR0NvbnRleHREcmF3SW1hZ2Uo Y29udGV4dCwgR3JhcGhpY3NDb250ZXh0KGNvbnRleHQpLnJvdW5kVG9EZXZpY2VQaXhlbHMoRmxv YXRSZWN0KDAsIDAsIENHSW1hZ2VHZXRXaWR0aChpbWFnZSksIENHSW1hZ2VHZXRIZWlnaHQoaW1h Z2UpKSksIGltYWdlKTsKKyAgICBDR0NvbnRleHREcmF3SW1hZ2UoY29udGV4dCwgRmxvYXRSZWN0 KDAsIDAsIENHSW1hZ2VHZXRXaWR0aChpbWFnZSksIENHSW1hZ2VHZXRIZWlnaHQoaW1hZ2UpKSwg aW1hZ2UpOwogfQogCiB2b2lkIEltYWdlOjpkcmF3UGF0dGVybihHcmFwaGljc0NvbnRleHQqIGN0 eHQsIGNvbnN0IEZsb2F0UmVjdCYgdGlsZVJlY3QsIGNvbnN0IEFmZmluZVRyYW5zZm9ybSYgcGF0 dGVyblRyYW5zZm9ybSwKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nn L1BhdHRlcm5DRy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvY2cvUGF0dGVybkNHLmNwcAkocmV2aXNpb24gODU3NzUpCisrKyBTb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9jZy9QYXR0ZXJuQ0cuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00 MCw4ICs0MCw3IEBAIHN0YXRpYyB2b2lkIHBhdHRlcm5DYWxsYmFjayh2b2lkKiBpbmZvLCAKICAg ICBpZiAoIXBsYXRmb3JtSW1hZ2UpCiAgICAgICAgIHJldHVybjsKIAotICAgIENHUmVjdCByZWN0 ID0gR3JhcGhpY3NDb250ZXh0KGNvbnRleHQpLnJvdW5kVG9EZXZpY2VQaXhlbHMoCi0gICAgICAg IEZsb2F0UmVjdCgwLCAwLCBDR0ltYWdlR2V0V2lkdGgocGxhdGZvcm1JbWFnZSksIENHSW1hZ2VH ZXRIZWlnaHQocGxhdGZvcm1JbWFnZSkpKTsKKyAgICBDR1JlY3QgcmVjdCA9IEZsb2F0UmVjdCgw LCAwLCBDR0ltYWdlR2V0V2lkdGgocGxhdGZvcm1JbWFnZSksIENHSW1hZ2VHZXRIZWlnaHQocGxh dGZvcm1JbWFnZSkpOwogICAgIENHQ29udGV4dERyYXdJbWFnZShjb250ZXh0LCByZWN0LCBwbGF0 Zm9ybUltYWdlKTsKIH0KIAo= 92829 2011-05-09 12:42:46 -0700 2011-05-09 13:14:16 -0700 Patch bug-60331-20110509124254.patch text/plain 3249 mdelaney7 SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDg1OTEzKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTEtMDUtMDUgIE1hdHRoZXcg RGVsYW5leSAgPG1kZWxhbmV5QGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBSZW1vdmUgY2FudmFzIHVzYWdlIG9mIHJvdW5kVG9EZXZp Y2VQaXhlbHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTYwMzMxCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLiBUaGlzIGNvdWxkIG9ubHkgYWZmZWN0IGNh bnZhc2VzIGF0IG5vbi1pbnRlZ3JhbCBzY2FsZSBmYWN0b3JzLiBPdXIgdGVzdHMgb25seSBydW4g aW4gMS4weC4KKworICAgICAgICAqIGh0bWwvY2FudmFzL0NhbnZhc1JlbmRlcmluZ0NvbnRleHQy RC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDYW52YXNSZW5kZXJpbmdDb250ZXh0MkQ6OmRyYXdJ bWFnZSk6CisKIDIwMTEtMDUtMDUgIEVyaWMgQ2FybHNvbiAgPGVyaWMuY2FybHNvbkBhcHBsZS5j b20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGFyaW4gQWRsZXIuCkluZGV4OiBTb3VyY2UvV2Vi Q29yZS9odG1sL2NhbnZhcy9DYW52YXNSZW5kZXJpbmdDb250ZXh0MkQuY3BwCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJDb3JlL2h0bWwvY2FudmFzL0NhbnZhc1JlbmRlcmluZ0NvbnRleHQyRC5j cHAJKHJldmlzaW9uIDg1Nzc1KQorKysgU291cmNlL1dlYkNvcmUvaHRtbC9jYW52YXMvQ2FudmFz UmVuZGVyaW5nQ29udGV4dDJELmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTMxMywxMCArMTMxMyw4 IEBAIHZvaWQgQ2FudmFzUmVuZGVyaW5nQ29udGV4dDJEOjpkcmF3SW1hZ2UKIAogICAgIGNoZWNr T3JpZ2luKGltYWdlKTsKIAotICAgIEZsb2F0UmVjdCBzb3VyY2VSZWN0ID0gYy0+cm91bmRUb0Rl dmljZVBpeGVscyhub3JtYWxpemVkU3JjUmVjdCk7Ci0gICAgRmxvYXRSZWN0IGRlc3RSZWN0ID0g Yy0+cm91bmRUb0RldmljZVBpeGVscyhub3JtYWxpemVkRHN0UmVjdCk7Ci0gICAgYy0+ZHJhd0lt YWdlKGNhY2hlZEltYWdlLT5pbWFnZSgpLCBDb2xvclNwYWNlRGV2aWNlUkdCLCBkZXN0UmVjdCwg c291cmNlUmVjdCwgb3ApOwotICAgIGRpZERyYXcoZGVzdFJlY3QpOworICAgIGMtPmRyYXdJbWFn ZShjYWNoZWRJbWFnZS0+aW1hZ2UoKSwgQ29sb3JTcGFjZURldmljZVJHQiwgbm9ybWFsaXplZERz dFJlY3QsIG5vcm1hbGl6ZWRTcmNSZWN0LCBvcCk7CisgICAgZGlkRHJhdyhub3JtYWxpemVkRHN0 UmVjdCk7CiB9CiAKIHZvaWQgQ2FudmFzUmVuZGVyaW5nQ29udGV4dDJEOjpkcmF3SW1hZ2UoSFRN TENhbnZhc0VsZW1lbnQqIGNhbnZhcywgZmxvYXQgeCwgZmxvYXQgeSwgRXhjZXB0aW9uQ29kZSYg ZWMpCkBAIC0xMzc2LDkgKzEzNzQsNiBAQCB2b2lkIENhbnZhc1JlbmRlcmluZ0NvbnRleHQyRDo6 ZHJhd0ltYWdlCiAgICAgaWYgKCFzdGF0ZSgpLm1faW52ZXJ0aWJsZUNUTSkKICAgICAgICAgcmV0 dXJuOwogCi0gICAgRmxvYXRSZWN0IHNvdXJjZVJlY3QgPSBjLT5yb3VuZFRvRGV2aWNlUGl4ZWxz KHNyY1JlY3QpOwotICAgIEZsb2F0UmVjdCBkZXN0UmVjdCA9IGMtPnJvdW5kVG9EZXZpY2VQaXhl bHMoZHN0UmVjdCk7Ci0KICAgICAvLyBGSVhNRTogRG8gdGhpcyB0aHJvdWdoIHBsYXRmb3JtLWlu ZGVwZW5kZW50IEdyYXBoaWNzQ29udGV4dCBBUEkuCiAgICAgSW1hZ2VCdWZmZXIqIGJ1ZmZlciA9 IHNvdXJjZUNhbnZhcy0+YnVmZmVyKCk7CiAgICAgaWYgKCFidWZmZXIpCkBAIC0xMzk3LDggKzEz OTIsOCBAQCB2b2lkIENhbnZhc1JlbmRlcmluZ0NvbnRleHQyRDo6ZHJhd0ltYWdlCiAgICAgc291 cmNlQ2FudmFzLT5tYWtlUmVuZGVyaW5nUmVzdWx0c0F2YWlsYWJsZSgpOwogI2VuZGlmCiAKLSAg ICBjLT5kcmF3SW1hZ2VCdWZmZXIoYnVmZmVyLCBDb2xvclNwYWNlRGV2aWNlUkdCLCBkZXN0UmVj dCwgc291cmNlUmVjdCwgc3RhdGUoKS5tX2dsb2JhbENvbXBvc2l0ZSk7Ci0gICAgZGlkRHJhdyhk ZXN0UmVjdCk7CisgICAgYy0+ZHJhd0ltYWdlQnVmZmVyKGJ1ZmZlciwgQ29sb3JTcGFjZURldmlj ZVJHQiwgZHN0UmVjdCwgc3JjUmVjdCwgc3RhdGUoKS5tX2dsb2JhbENvbXBvc2l0ZSk7CisgICAg ZGlkRHJhdyhkc3RSZWN0KTsKIH0KIAogI2lmIEVOQUJMRShWSURFTykKQEAgLTE0NjAsMTcgKzE0 NTUsMTQgQEAgdm9pZCBDYW52YXNSZW5kZXJpbmdDb250ZXh0MkQ6OmRyYXdJbWFnZQogCiAgICAg Y2hlY2tPcmlnaW4odmlkZW8pOwogCi0gICAgRmxvYXRSZWN0IHNvdXJjZVJlY3QgPSBjLT5yb3Vu ZFRvRGV2aWNlUGl4ZWxzKHNyY1JlY3QpOwotICAgIEZsb2F0UmVjdCBkZXN0UmVjdCA9IGMtPnJv dW5kVG9EZXZpY2VQaXhlbHMoZHN0UmVjdCk7Ci0KICAgICBHcmFwaGljc0NvbnRleHRTdGF0ZVNh dmVyIHN0YXRlU2F2ZXIoKmMpOwotICAgIGMtPmNsaXAoZGVzdFJlY3QpOwotICAgIGMtPnRyYW5z bGF0ZShkZXN0UmVjdC54KCksIGRlc3RSZWN0LnkoKSk7Ci0gICAgYy0+c2NhbGUoRmxvYXRTaXpl KGRlc3RSZWN0LndpZHRoKCkgLyBzb3VyY2VSZWN0LndpZHRoKCksIGRlc3RSZWN0LmhlaWdodCgp IC8gc291cmNlUmVjdC5oZWlnaHQoKSkpOwotICAgIGMtPnRyYW5zbGF0ZSgtc291cmNlUmVjdC54 KCksIC1zb3VyY2VSZWN0LnkoKSk7CisgICAgYy0+Y2xpcChkc3RSZWN0KTsKKyAgICBjLT50cmFu c2xhdGUoZHN0UmVjdC54KCksIGRzdFJlY3QueSgpKTsKKyAgICBjLT5zY2FsZShGbG9hdFNpemUo ZHN0UmVjdC53aWR0aCgpIC8gc3JjUmVjdC53aWR0aCgpLCBkc3RSZWN0LmhlaWdodCgpIC8gc3Jj UmVjdC5oZWlnaHQoKSkpOworICAgIGMtPnRyYW5zbGF0ZSgtc3JjUmVjdC54KCksIC1zcmNSZWN0 LnkoKSk7CiAgICAgdmlkZW8tPnBhaW50Q3VycmVudEZyYW1lSW5Db250ZXh0KGMsIEludFJlY3Qo SW50UG9pbnQoKSwgc2l6ZSh2aWRlbykpKTsKICAgICBzdGF0ZVNhdmVyLnJlc3RvcmUoKTsKLSAg ICBkaWREcmF3KGRlc3RSZWN0KTsKKyAgICBkaWREcmF3KGRzdFJlY3QpOwogfQogI2VuZGlmCiAK