40271 2010-06-07 16:56:02 -0700 The HTML5 canvas 2d.drawImage.zerocanvas test does not pass 2010-07-01 11:49:33 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) All All RESOLVED FIXED http://philip.html5.org/tests/canvas/suite/tests/2d.drawImage.zerocanvas.html HTML5 P3 Normal --- 1 jhanssen jhanssen adele commit-queue darin heldercorreia jchaffraix jhanssen kling mdelaney7 oldest_to_newest 235068 0 jhanssen 2010-06-07 16:56:02 -0700 The HTML5 canvas 2d.drawImage.zerocanvas test does not pass, the INVALID_STATE_ERR DOM exception should be set when no image data is present. http://philip.html5.org/tests/canvas/suite/tests/2d.drawImage.zerocanvas.html 242789 1 59721 kling 2010-06-24 19:58:10 -0700 Created attachment 59721 Proposed patch 242797 2 59721 kling 2010-06-24 20:44:52 -0700 Comment on attachment 59721 Proposed patch Not quite there. 242807 3 59726 kling 2010-06-24 21:10:18 -0700 Created attachment 59726 Proposed patch v2 Proper patch. See HTML5 spec at http://www.whatwg.org/specs/web-apps/current-work/#dom-context-2d-drawimage "If the image argument is an HTMLCanvasElement object with either a horizontal dimension or a vertical dimension equal to zero, then the implementation must raise an INVALID_STATE_ERR exception." 245349 4 60249 kling 2010-07-01 08:03:12 -0700 Created attachment 60249 Proposed patch v3 Ok, a patch for *this* bug now :-) 245444 5 60249 darin 2010-07-01 11:29:09 -0700 Comment on attachment 60249 Proposed patch v3 > + if (!srcCanvasRect.width() || !srcCanvasRect.height()) { Could you use srcCanvasRect.isEmpty() instead? If so, I think it would read nicer. 245450 6 60249 commit-queue 2010-07-01 11:43:05 -0700 Comment on attachment 60249 Proposed patch v3 Clearing flags on attachment: 60249 Committed r62277: <http://trac.webkit.org/changeset/62277> 245451 7 commit-queue 2010-07-01 11:43:09 -0700 All reviewed patches have been landed. Closing bug. 245455 8 kling 2010-07-01 11:49:33 -0700 (In reply to comment #5) > (From update of attachment 60249 [details]) > > + if (!srcCanvasRect.width() || !srcCanvasRect.height()) { > > Could you use srcCanvasRect.isEmpty() instead? If so, I think it would read nicer. I could, but FloatRect::isEmpty() checks (width <= 0 && height <= 0) which would open some incorrect code paths until bug 39149 is fixed. 59721 2010-06-24 19:58:10 -0700 2010-06-24 20:44:52 -0700 Proposed patch bug-40271.diff text/plain 4447 kling ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCAzOWU5YzQwLi5kOGVlNDlhIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTAtMDYt MjQgIEFuZHJlYXMgS2xpbmcgIDxhbmRyZWFzLmtsaW5nQG5va2lhLmNvbT4KKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGUgSFRNTDUgY2FudmFzIDJk LmRyYXdJbWFnZS56ZXJvY2FudmFzIHRlc3QgZG9lcyBub3QgcGFzcworICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDAyNzEKKworICAgICAgICBVbnNraXBw ZWQgY2FudmFzL3BoaWxpcC90ZXN0cy8yZC5kcmF3SW1hZ2UuemVyb2NhbnZhcy5odG1sCisKKyAg ICAgICAgKiBwbGF0Zm9ybS9tYWMvU2tpcHBlZDoKKyAgICAgICAgKiBwbGF0Zm9ybS9xdC9Ta2lw cGVkOgorCiAyMDEwLTA2LTI0ICBKYW1lcyBSb2JpbnNvbiAgPGphbWVzckBjaHJvbWl1bS5vcmc+ CiAKICAgICAgICAgVW5yZXZpZXdlZC4gQWRkIG1hYyBwaXhlbCBiYXNlbGluZXMgZm9yIGZhc3Qv aW1hZ2VzL2ljb24tZGVjb2RpbmcgYW5kIGZpeCBFT0xzIGZvciB0ZXh0IGJhc2VsaW5lLgpkaWZm IC0tZ2l0IGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL1NraXBwZWQgYi9MYXlvdXRUZXN0cy9w bGF0Zm9ybS9tYWMvU2tpcHBlZAppbmRleCAxMmEwNzYwLi4xZjk0MzczIDEwMDY0NAotLS0gYS9M YXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvU2tpcHBlZAorKysgYi9MYXlvdXRUZXN0cy9wbGF0Zm9y bS9tYWMvU2tpcHBlZApAQCAtMjA1LDcgKzIwNSw2IEBAIGNhbnZhcy9waGlsaXAvdGVzdHMvMmQu ZHJhd0ltYWdlLmJyb2tlbi5odG1sCiBjYW52YXMvcGhpbGlwL3Rlc3RzLzJkLmRyYXdJbWFnZS5p bmNvbXBsZXRlLmh0bWwKIGNhbnZhcy9waGlsaXAvdGVzdHMvMmQuZHJhd0ltYWdlLm51bGwuaHRt bAogY2FudmFzL3BoaWxpcC90ZXN0cy8yZC5kcmF3SW1hZ2Uud3Jvbmd0eXBlLmh0bWwKLWNhbnZh cy9waGlsaXAvdGVzdHMvMmQuZHJhd0ltYWdlLnplcm9jYW52YXMuaHRtbAogY2FudmFzL3BoaWxp cC90ZXN0cy8yZC5maWxsU3R5bGUucGFyc2UuY3VycmVudC5iYXNpYy5odG1sCiBjYW52YXMvcGhp bGlwL3Rlc3RzLzJkLmZpbGxTdHlsZS5wYXJzZS5jdXJyZW50LmNoYW5nZWQuaHRtbAogY2FudmFz L3BoaWxpcC90ZXN0cy8yZC5maWxsU3R5bGUucGFyc2UuY3VycmVudC5yZW1vdmVkLmh0bWwKZGlm ZiAtLWdpdCBhL0xheW91dFRlc3RzL3BsYXRmb3JtL3F0L1NraXBwZWQgYi9MYXlvdXRUZXN0cy9w bGF0Zm9ybS9xdC9Ta2lwcGVkCmluZGV4IDY1Zjc5ZmIuLjNhOTIwMzIgMTAwNjQ0Ci0tLSBhL0xh eW91dFRlc3RzL3BsYXRmb3JtL3F0L1NraXBwZWQKKysrIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0v cXQvU2tpcHBlZApAQCAtNTI1Miw3ICs1MjUyLDYgQEAgY2FudmFzL3BoaWxpcC90ZXN0cy8yZC5k cmF3SW1hZ2UubmVnYXRpdmVkaXIuaHRtbAogY2FudmFzL3BoaWxpcC90ZXN0cy8yZC5kcmF3SW1h Z2UubmVnYXRpdmVzb3VyY2UuaHRtbAogY2FudmFzL3BoaWxpcC90ZXN0cy8yZC5kcmF3SW1hZ2Uu bnVsbC5odG1sCiBjYW52YXMvcGhpbGlwL3Rlc3RzLzJkLmRyYXdJbWFnZS53cm9uZ3R5cGUuaHRt bAotY2FudmFzL3BoaWxpcC90ZXN0cy8yZC5kcmF3SW1hZ2UuemVyb2NhbnZhcy5odG1sCiBjYW52 YXMvcGhpbGlwL3Rlc3RzLzJkLmZpbGxTdHlsZS5wYXJzZS5jdXJyZW50LmJhc2ljLmh0bWwKIGNh bnZhcy9waGlsaXAvdGVzdHMvMmQuZmlsbFN0eWxlLnBhcnNlLmN1cnJlbnQuY2hhbmdlZC5odG1s CiBjYW52YXMvcGhpbGlwL3Rlc3RzLzJkLmZpbGxTdHlsZS5wYXJzZS5jdXJyZW50LnJlbW92ZWQu aHRtbApkaWZmIC0tZ2l0IGEvV2ViQ29yZS9DaGFuZ2VMb2cgYi9XZWJDb3JlL0NoYW5nZUxvZwpp bmRleCAwODljNWM4Li4yNGEwMjA2IDEwMDY0NAotLS0gYS9XZWJDb3JlL0NoYW5nZUxvZworKysg Yi9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDEwLTA2LTI0ICBBbmRyZWFz IEtsaW5nICA8YW5kcmVhcy5rbGluZ0Bub2tpYS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhlIEhUTUw1IGNhbnZhcyAyZC5kcmF3SW1hZ2Uu emVyb2NhbnZhcyB0ZXN0IGRvZXMgbm90IHBhc3MKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTQwMjcxCisKKyAgICAgICAgVGhyb3cgSU5WQUxJRF9TVEFU RV9FUlIgd2hlbiBhdHRlbXB0aW5nIHRvIGRyYXcgYSBjYW52YXMgd2l0aCB6ZXJvIHdpZHRoIG9y IGhlaWdodAorICAgICAgICBvbnRvIGFub3RoZXIgY2FudmFzLgorCisgICAgICAgICogYmluZGlu Z3MvanMvSlNDYW52YXNSZW5kZXJpbmdDb250ZXh0MkRDdXN0b20uY3BwOgorICAgICAgICAoV2Vi Q29yZTo6SlNDYW52YXNSZW5kZXJpbmdDb250ZXh0MkQ6OmRyYXdJbWFnZSk6IENhbGwgc2V0RE9N RXhjZXB0aW9uIGFmdGVyIGRyYXdJbWFnZShjYW52YXMsIHgsIHkpCisgICAgICAgICogaHRtbC9j YW52YXMvQ2FudmFzUmVuZGVyaW5nQ29udGV4dDJELmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNh bnZhc1JlbmRlcmluZ0NvbnRleHQyRDo6ZHJhd0ltYWdlKToKKwogMjAxMC0wNi0yNCAgRXJpYyBT ZWlkZWwgIDxlcmljQHdlYmtpdC5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgQWRhbSBCYXJ0 aC4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvYmluZGluZ3MvanMvSlNDYW52YXNSZW5kZXJpbmdDb250 ZXh0MkRDdXN0b20uY3BwIGIvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0NhbnZhc1JlbmRlcmluZ0Nv bnRleHQyREN1c3RvbS5jcHAKaW5kZXggOTE0ZGVhMC4uZTg4YWZjMiAxMDA2NDQKLS0tIGEvV2Vi Q29yZS9iaW5kaW5ncy9qcy9KU0NhbnZhc1JlbmRlcmluZ0NvbnRleHQyREN1c3RvbS5jcHAKKysr IGIvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0NhbnZhc1JlbmRlcmluZ0NvbnRleHQyREN1c3RvbS5j cHAKQEAgLTIyMCw2ICsyMjAsNyBAQCBKU1ZhbHVlIEpTQ2FudmFzUmVuZGVyaW5nQ29udGV4dDJE OjpkcmF3SW1hZ2UoRXhlY1N0YXRlKiBleGVjKQogICAgICAgICBzd2l0Y2ggKGV4ZWMtPmFyZ3Vt ZW50Q291bnQoKSkgewogICAgICAgICAgICAgY2FzZSAzOgogICAgICAgICAgICAgICAgIGNvbnRl eHQtPmRyYXdJbWFnZShjYW52YXMsIGV4ZWMtPmFyZ3VtZW50KDEpLnRvRmxvYXQoZXhlYyksIGV4 ZWMtPmFyZ3VtZW50KDIpLnRvRmxvYXQoZXhlYyksIGVjKTsKKyAgICAgICAgICAgICAgICBzZXRE T01FeGNlcHRpb24oZXhlYywgZWMpOwogICAgICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICAg ICAgY2FzZSA1OgogICAgICAgICAgICAgICAgIGNvbnRleHQtPmRyYXdJbWFnZShjYW52YXMsIGV4 ZWMtPmFyZ3VtZW50KDEpLnRvRmxvYXQoZXhlYyksIGV4ZWMtPmFyZ3VtZW50KDIpLnRvRmxvYXQo ZXhlYyksCmRpZmYgLS1naXQgYS9XZWJDb3JlL2h0bWwvY2FudmFzL0NhbnZhc1JlbmRlcmluZ0Nv bnRleHQyRC5jcHAgYi9XZWJDb3JlL2h0bWwvY2FudmFzL0NhbnZhc1JlbmRlcmluZ0NvbnRleHQy RC5jcHAKaW5kZXggNTIyZTUxZC4uOWRjMWRiNiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9odG1sL2Nh bnZhcy9DYW52YXNSZW5kZXJpbmdDb250ZXh0MkQuY3BwCisrKyBiL1dlYkNvcmUvaHRtbC9jYW52 YXMvQ2FudmFzUmVuZGVyaW5nQ29udGV4dDJELmNwcApAQCAtMTA3NCwxNCArMTA3NCwyMCBAQCB2 b2lkIENhbnZhc1JlbmRlcmluZ0NvbnRleHQyRDo6ZHJhd0ltYWdlKEhUTUxDYW52YXNFbGVtZW50 KiBzb3VyY2VDYW52YXMsIGNvbnN0CiAgICAgICAgIHJldHVybjsKICAgICB9CiAKLSAgICBlYyA9 IDA7Ci0KICAgICBGbG9hdFJlY3Qgc3JjQ2FudmFzUmVjdCA9IEZsb2F0UmVjdChGbG9hdFBvaW50 KCksIHNvdXJjZUNhbnZhcy0+c2l6ZSgpKTsKLSAgICBpZiAoIXNyY0NhbnZhc1JlY3QuY29udGFp bnMobm9ybWFsaXplUmVjdChzcmNSZWN0KSkgfHwgc3JjUmVjdC53aWR0aCgpID09IDAgfHwgc3Jj UmVjdC5oZWlnaHQoKSA9PSAwKSB7CisKKyAgICBpZiAoIXNyY0NhbnZhc1JlY3Qud2lkdGgoKSB8 fCAhc3JjQ2FudmFzUmVjdC5oZWlnaHQoKSkgeworICAgICAgICBlYyA9IElOVkFMSURfU1RBVEVf RVJSOworICAgICAgICByZXR1cm47CisgICAgfQorCisgICAgaWYgKCFzcmNDYW52YXNSZWN0LmNv bnRhaW5zKG5vcm1hbGl6ZVJlY3Qoc3JjUmVjdCkpKSB7CiAgICAgICAgIGVjID0gSU5ERVhfU0la RV9FUlI7CiAgICAgICAgIHJldHVybjsKICAgICB9CiAKKyAgICBlYyA9IDA7CisKICAgICBpZiAo IWRzdFJlY3Qud2lkdGgoKSB8fCAhZHN0UmVjdC5oZWlnaHQoKSkKICAgICAgICAgcmV0dXJuOwog Cg== 59726 2010-06-24 21:10:18 -0700 2010-07-01 08:03:12 -0700 Proposed patch v2 bug-41025-v2.diff text/plain 4333 kling ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA2OGVkMzlmLi4yMzNjYmUyIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAKKzIwMTAtMDYt MjQgIEFuZHJlYXMgS2xpbmcgIDxhbmRyZWFzLmtsaW5nQG5va2lhLmNvbT4KKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBlZGl0aW5nL2V4ZWNDb21tYW5k L2NvcHktd2l0aG91dC1zZWxlY3Rpb24uaHRtbCBmYWlscyBvbiBRdCBhZnRlciByNjE2MzcKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQxMDI1CisKKyAg ICAgICAgKiBwbGF0Zm9ybS9xdC9Ta2lwcGVkOiBVbnNraXAgZWRpdGluZy9leGVjQ29tbWFuZC9j b3B5LXdpdGhvdXQtc2VsZWN0aW9uLmh0bWwKKwogMjAxMC0wNi0yNCAgS2VudCBUYW11cmEgIDx0 a2VudEBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgQWRhbSBCYXJ0aC4KZGlm ZiAtLWdpdCBhL0xheW91dFRlc3RzL3BsYXRmb3JtL3F0L1NraXBwZWQgYi9MYXlvdXRUZXN0cy9w bGF0Zm9ybS9xdC9Ta2lwcGVkCmluZGV4IGU0NTQwZDMuLmU2ZTczN2YgMTAwNjQ0Ci0tLSBhL0xh eW91dFRlc3RzL3BsYXRmb3JtL3F0L1NraXBwZWQKKysrIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0v cXQvU2tpcHBlZApAQCAtNTQ0Niw3ICs1NDQ2LDMgQEAgZmFzdC9qcy9zcHV0bmlrL0NvbmZvcm1h bmNlLzEwX0V4ZWN1dGlvbl9Db250ZXh0cy8xMC4yX0VudGVyaW5nX0FuX0V4ZWN1dGlvbl9Db24K IGZhc3QvanMvc3B1dG5pay9Db25mb3JtYW5jZS8xMF9FeGVjdXRpb25fQ29udGV4dHMvMTAuMl9F bnRlcmluZ19Bbl9FeGVjdXRpb25fQ29udGV4dC8xMC4yLjJfRXZhbF9Db2RlL1MxMC4yLjJfQTEu Ml9UNy5odG1sCiBmYXN0L2pzL3NwdXRuaWsvQ29uZm9ybWFuY2UvMTBfRXhlY3V0aW9uX0NvbnRl eHRzLzEwLjJfRW50ZXJpbmdfQW5fRXhlY3V0aW9uX0NvbnRleHQvMTAuMi4yX0V2YWxfQ29kZS9T MTAuMi4yX0ExLjFfVDkuaHRtbAogZmFzdC9qcy9zcHV0bmlrL0NvbmZvcm1hbmNlLzEwX0V4ZWN1 dGlvbl9Db250ZXh0cy8xMC4yX0VudGVyaW5nX0FuX0V4ZWN1dGlvbl9Db250ZXh0LzEwLjIuMl9F dmFsX0NvZGUvUzEwLjIuMl9BMS4yX1Q5Lmh0bWwKLQotIyBDbGlwYm9hcmQ6OnNldERhdGEgaXMg YnJva2VuIG9uIFF0Ci0jIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00 MTAyNQotZWRpdGluZy9leGVjQ29tbWFuZC9jb3B5LXdpdGhvdXQtc2VsZWN0aW9uLmh0bWwKZGlm ZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTA3 M2Y3OS4uMTFhM2Y3OCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2ViQ29y ZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNyBAQAorMjAxMC0wNi0yNCAgQW5kcmVhcyBLbGluZyAg PGFuZHJlYXMua2xpbmdAbm9raWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIGVkaXRpbmcvZXhlY0NvbW1hbmQvY29weS13aXRob3V0LXNlbGVj dGlvbi5odG1sIGZhaWxzIG9uIFF0IGFmdGVyIHI2MTYzNworICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDEwMjUKKworICAgICAgICBUaGUgcHJvYmxlbSB3 YXMgdGhhdCB3aGVuIGdldHRpbmcgZGF0YSBiYWNrIHZpYSBDbGlwYm9hcmQ6OmdldERhdGEoKSwK KyAgICAgICAgdGhlIFN0cmluZzo6U3RyaW5nKGNvbnN0IGNoYXIqLCBpbnQpIGNvbnN0cnVjdG9y IHdhcyBjYWxsZWQKKyAgICAgICAgd2l0aCBVVEYtMTYgZGF0YS4KKworICAgICAgICBUaGUgc29s dXRpb24gaXMgdG8gdXNlIFFNaW1lRGF0YSdzIHRleHQoKSBhbmQgc2V0VGV4dCgpIGZvciAidGV4 dC9wbGFpbiIuCisKKyAgICAgICAgc2V0VGV4dCgpIHdoaWNoIG1ha2VzIHN1cmUgUXQgcGFzc2Vz IHRoZSBzdHJpbmcgaW4gcHJvcGVyIGZvcm1hdCB0byB0aGUKKyAgICAgICAgc3lzdGVtIGNsaXBi b2FyZC4gKFRoZSBwcmV2aW91cyBpbXBsZW1lbnRhdGlvbiB3b3VsZCBjb252ZXJ0IGl0IHRvIFVU Ri04KQorCisgICAgICAgIHRleHQoKSBtYWtlcyBzdXJlIHRoYXQgdGhlIGNvcnJlY3QgZW5jb2Rp bmcgaXMgdXNlZCAoVVRGLTE2KSBhbmQgdGhhdAorICAgICAgICB3ZSBnZXQgYmFjayB3aGF0ZXZl ciB3ZSBvcmlnaW5hbGx5IHB1dCBpbiB0aGVyZS4KKworICAgICAgICAqIHBsYXRmb3JtL3F0L0Ns aXBib2FyZFF0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmlzVGV4dE1pbWVUeXBlKToKKyAgICAg ICAgKFdlYkNvcmU6OkNsaXBib2FyZFF0OjpnZXREYXRhKToKKyAgICAgICAgKFdlYkNvcmU6OkNs aXBib2FyZFF0OjpzZXREYXRhKToKKwogMjAxMC0wNi0yNCAgS2VudCBUYW11cmEgIDx0a2VudEBj aHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgQWRhbSBCYXJ0aC4KZGlmZiAtLWdp dCBhL1dlYkNvcmUvcGxhdGZvcm0vcXQvQ2xpcGJvYXJkUXQuY3BwIGIvV2ViQ29yZS9wbGF0Zm9y bS9xdC9DbGlwYm9hcmRRdC5jcHAKaW5kZXggNDg1ZDBkMS4uZjQ3OGU2NCAxMDA2NDQKLS0tIGEv V2ViQ29yZS9wbGF0Zm9ybS9xdC9DbGlwYm9hcmRRdC5jcHAKKysrIGIvV2ViQ29yZS9wbGF0Zm9y bS9xdC9DbGlwYm9hcmRRdC5jcHAKQEAgLTU3LDYgKzU3LDExIEBACiAKIG5hbWVzcGFjZSBXZWJD b3JlIHsKIAorc3RhdGljIGJvb2wgaXNUZXh0TWltZVR5cGUoY29uc3QgU3RyaW5nJiB0eXBlKQor eworICAgIHJldHVybiB0eXBlID09ICJ0ZXh0L3BsYWluIiB8fCB0eXBlLnN0YXJ0c1dpdGgoInRl eHQvcGxhaW47Iik7Cit9CisKIENsaXBib2FyZFF0OjpDbGlwYm9hcmRRdChDbGlwYm9hcmRBY2Nl c3NQb2xpY3kgcG9saWN5LCBjb25zdCBRTWltZURhdGEqIHJlYWRhYmxlQ2xpcGJvYXJkKQogICAg IDogQ2xpcGJvYXJkKHBvbGljeSwgdHJ1ZSkKICAgICAsIG1fcmVhZGFibGVEYXRhKHJlYWRhYmxl Q2xpcGJvYXJkKQpAQCAtMTMwLDEwICsxMzUsMTUgQEAgU3RyaW5nIENsaXBib2FyZFF0OjpnZXRE YXRhKGNvbnN0IFN0cmluZyYgdHlwZSwgYm9vbCYgc3VjY2VzcykgY29uc3QKICAgICAgICAgcmV0 dXJuIFN0cmluZygpOwogICAgIH0KIAorICAgIGlmIChpc1RleHRNaW1lVHlwZSh0eXBlKSAmJiBt X3JlYWRhYmxlRGF0YS0+aGFzVGV4dCgpKSB7CisgICAgICAgIHN1Y2Nlc3MgPSB0cnVlOworICAg ICAgICByZXR1cm4gbV9yZWFkYWJsZURhdGEtPnRleHQoKTsKKyAgICB9CisKICAgICBBU1NFUlQo bV9yZWFkYWJsZURhdGEpOwogICAgIFFCeXRlQXJyYXkgZGF0YSA9IG1fcmVhZGFibGVEYXRhLT5k YXRhKFFTdHJpbmcodHlwZSkpOwogICAgIHN1Y2Nlc3MgPSAhZGF0YS5pc0VtcHR5KCk7Ci0gICAg cmV0dXJuIFN0cmluZyhkYXRhLmRhdGEoKSwgZGF0YS5zaXplKCkpOworICAgIHJldHVybiBTdHJp bmcoZGF0YS5jb25zdERhdGEoKSwgZGF0YS5zaXplKCkpOwogfQogCiBib29sIENsaXBib2FyZFF0 OjpzZXREYXRhKGNvbnN0IFN0cmluZyYgdHlwZSwgY29uc3QgU3RyaW5nJiBkYXRhKQpAQCAtMTQz LDkgKzE1MywxNCBAQCBib29sIENsaXBib2FyZFF0OjpzZXREYXRhKGNvbnN0IFN0cmluZyYgdHlw ZSwgY29uc3QgU3RyaW5nJiBkYXRhKQogCiAgICAgaWYgKCFtX3dyaXRhYmxlRGF0YSkKICAgICAg ICAgbV93cml0YWJsZURhdGEgPSBuZXcgUU1pbWVEYXRhOwotICAgIFFCeXRlQXJyYXkgYXJyYXko cmVpbnRlcnByZXRfY2FzdDxjb25zdCBjaGFyKj4oZGF0YS5jaGFyYWN0ZXJzKCkpLAotICAgICAg ICAgICAgICAgICAgICAgZGF0YS5sZW5ndGgoKSoyKTsKLSAgICBtX3dyaXRhYmxlRGF0YS0+c2V0 RGF0YShRU3RyaW5nKHR5cGUpLCBhcnJheSk7CisKKyAgICBpZiAoaXNUZXh0TWltZVR5cGUodHlw ZSkpCisgICAgICAgIG1fd3JpdGFibGVEYXRhLT5zZXRUZXh0KFFTdHJpbmcoZGF0YSkpOworICAg IGVsc2UgeworICAgICAgICBRQnl0ZUFycmF5IGFycmF5KHJlaW50ZXJwcmV0X2Nhc3Q8Y29uc3Qg Y2hhcio+KGRhdGEuY2hhcmFjdGVycygpKSwgZGF0YS5sZW5ndGgoKSAqIDIpOworICAgICAgICBt X3dyaXRhYmxlRGF0YS0+c2V0RGF0YShRU3RyaW5nKHR5cGUpLCBhcnJheSk7CisgICAgfQorCiAj aWZuZGVmIFFUX05PX0NMSVBCT0FSRAogICAgIGlmICghaXNGb3JEcmFnZ2luZygpKQogICAgICAg ICBRQXBwbGljYXRpb246OmNsaXBib2FyZCgpLT5zZXRNaW1lRGF0YShtX3dyaXRhYmxlRGF0YSk7 Cg== 60249 2010-07-01 08:03:12 -0700 2010-07-01 11:43:05 -0700 Proposed patch v3 bug-40271-v3.diff text/plain 4894 kling ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBiZGU2NzViLi5mOWY1YjQzIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTAtMDct MDEgIEFuZHJlYXMgS2xpbmcgIDxhbmRyZWFzLmtsaW5nQG5va2lhLmNvbT4KKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGUgSFRNTDUgY2FudmFzIDJk LmRyYXdJbWFnZS56ZXJvY2FudmFzIHRlc3QgZG9lcyBub3QgcGFzcworICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDAyNzEKKworICAgICAgICBVbnNraXBw ZWQgY2FudmFzL3BoaWxpcC90ZXN0cy8yZC5kcmF3SW1hZ2UuemVyb2NhbnZhcy5odG1sCisKKyAg ICAgICAgKiBjYW52YXMvcGhpbGlwL3Rlc3RzLzJkLmRyYXdJbWFnZS56ZXJvY2FudmFzLWV4cGVj dGVkLnR4dDoKKyAgICAgICAgKiBwbGF0Zm9ybS9tYWMvU2tpcHBlZDoKKyAgICAgICAgKiBwbGF0 Zm9ybS9xdC9Ta2lwcGVkOgorCiAyMDEwLTA3LTAxICBZdXJ5IFNlbWlraGF0c2t5ICA8eXVyeXNA Y2hyb21pdW0ub3JnPgogCiAgICAgICAgIFVucmV2aWV3ZWQuIFVwZGF0ZSBDaHJvbWl1bSB0ZXN0 IGV4cGVjdGF0aW9ucy4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2NhbnZhcy9waGlsaXAvdGVz dHMvMmQuZHJhd0ltYWdlLnplcm9jYW52YXMtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvY2Fu dmFzL3BoaWxpcC90ZXN0cy8yZC5kcmF3SW1hZ2UuemVyb2NhbnZhcy1leHBlY3RlZC50eHQKaW5k ZXggNzI1ZThmNy4uNTYzNTYwZSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvY2FudmFzL3BoaWxp cC90ZXN0cy8yZC5kcmF3SW1hZ2UuemVyb2NhbnZhcy1leHBlY3RlZC50eHQKKysrIGIvTGF5b3V0 VGVzdHMvY2FudmFzL3BoaWxpcC90ZXN0cy8yZC5kcmF3SW1hZ2UuemVyb2NhbnZhcy1leHBlY3Rl ZC50eHQKQEAgLTUsNSArNSwzIEBAIEFjdHVhbCBvdXRwdXQ6CiBFeHBlY3RlZCBvdXRwdXQ6CiAK IFBhc3NlZAotCi0KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3BsYXRmb3JtL21hYy9Ta2lwcGVk IGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL1NraXBwZWQKaW5kZXggNThmZDQ2MS4uZjY0MjY2 NCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL1NraXBwZWQKKysrIGIvTGF5 b3V0VGVzdHMvcGxhdGZvcm0vbWFjL1NraXBwZWQKQEAgLTIwNSw3ICsyMDUsNiBAQCBjYW52YXMv cGhpbGlwL3Rlc3RzLzJkLmRyYXdJbWFnZS5icm9rZW4uaHRtbAogY2FudmFzL3BoaWxpcC90ZXN0 cy8yZC5kcmF3SW1hZ2UuaW5jb21wbGV0ZS5odG1sCiBjYW52YXMvcGhpbGlwL3Rlc3RzLzJkLmRy YXdJbWFnZS5udWxsLmh0bWwKIGNhbnZhcy9waGlsaXAvdGVzdHMvMmQuZHJhd0ltYWdlLndyb25n dHlwZS5odG1sCi1jYW52YXMvcGhpbGlwL3Rlc3RzLzJkLmRyYXdJbWFnZS56ZXJvY2FudmFzLmh0 bWwKIGNhbnZhcy9waGlsaXAvdGVzdHMvMmQuZmlsbFN0eWxlLnBhcnNlLmN1cnJlbnQuYmFzaWMu aHRtbAogY2FudmFzL3BoaWxpcC90ZXN0cy8yZC5maWxsU3R5bGUucGFyc2UuY3VycmVudC5jaGFu Z2VkLmh0bWwKIGNhbnZhcy9waGlsaXAvdGVzdHMvMmQuZmlsbFN0eWxlLnBhcnNlLmN1cnJlbnQu cmVtb3ZlZC5odG1sCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9xdC9Ta2lwcGVk IGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vcXQvU2tpcHBlZAppbmRleCA4ZjdjZTZlLi42ODlhOGIz IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9xdC9Ta2lwcGVkCisrKyBiL0xheW91 dFRlc3RzL3BsYXRmb3JtL3F0L1NraXBwZWQKQEAgLTUyMzIsNyArNTIzMiw2IEBAIGNhbnZhcy9w aGlsaXAvdGVzdHMvMmQuZHJhd0ltYWdlLm5lZ2F0aXZlZGlyLmh0bWwKIGNhbnZhcy9waGlsaXAv dGVzdHMvMmQuZHJhd0ltYWdlLm5lZ2F0aXZlc291cmNlLmh0bWwKIGNhbnZhcy9waGlsaXAvdGVz dHMvMmQuZHJhd0ltYWdlLm51bGwuaHRtbAogY2FudmFzL3BoaWxpcC90ZXN0cy8yZC5kcmF3SW1h Z2Uud3Jvbmd0eXBlLmh0bWwKLWNhbnZhcy9waGlsaXAvdGVzdHMvMmQuZHJhd0ltYWdlLnplcm9j YW52YXMuaHRtbAogY2FudmFzL3BoaWxpcC90ZXN0cy8yZC5maWxsU3R5bGUucGFyc2UuY3VycmVu dC5iYXNpYy5odG1sCiBjYW52YXMvcGhpbGlwL3Rlc3RzLzJkLmZpbGxTdHlsZS5wYXJzZS5jdXJy ZW50LmNoYW5nZWQuaHRtbAogY2FudmFzL3BoaWxpcC90ZXN0cy8yZC5maWxsU3R5bGUucGFyc2Uu Y3VycmVudC5yZW1vdmVkLmh0bWwKZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKaW5kZXggNjhlZmI3My4uNDFmNzVmYSAxMDA2NDQKLS0tIGEvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMCBAQAorMjAx MC0wNi0yNCAgQW5kcmVhcyBLbGluZyAgPGFuZHJlYXMua2xpbmdAbm9raWEuY29tPgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoZSBIVE1MNSBjYW52 YXMgMmQuZHJhd0ltYWdlLnplcm9jYW52YXMgdGVzdCBkb2VzIG5vdCBwYXNzCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00MDI3MQorCisgICAgICAgIFRo cm93IElOVkFMSURfU1RBVEVfRVJSIHdoZW4gYXR0ZW1wdGluZyB0byBkcmF3IGEgY2FudmFzIHdp dGggemVybyB3aWR0aCBvciBoZWlnaHQuCisKKyAgICAgICAgU3BlYyBsaW5rOgorICAgICAgICBo dHRwOi8vd3d3LndoYXR3Zy5vcmcvc3BlY3Mvd2ViLWFwcHMvY3VycmVudC13b3JrLyNkb20tY29u dGV4dC0yZC1kcmF3aW1hZ2UKKworICAgICAgICAqIGJpbmRpbmdzL2pzL0pTQ2FudmFzUmVuZGVy aW5nQ29udGV4dDJEQ3VzdG9tLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkpTQ2FudmFzUmVuZGVy aW5nQ29udGV4dDJEOjpkcmF3SW1hZ2UpOiBDYWxsIHNldERPTUV4Y2VwdGlvbiBhZnRlciBkcmF3 SW1hZ2UoY2FudmFzLCB4LCB5KQorICAgICAgICAqIGh0bWwvY2FudmFzL0NhbnZhc1JlbmRlcmlu Z0NvbnRleHQyRC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDYW52YXNSZW5kZXJpbmdDb250ZXh0 MkQ6OmRyYXdJbWFnZSk6CisKIDIwMTAtMDctMDEgIEFuZHJlYXMgS2xpbmcgIDxhbmRyZWFzLmts aW5nQG5va2lhLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KZGlm ZiAtLWdpdCBhL1dlYkNvcmUvYmluZGluZ3MvanMvSlNDYW52YXNSZW5kZXJpbmdDb250ZXh0MkRD dXN0b20uY3BwIGIvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0NhbnZhc1JlbmRlcmluZ0NvbnRleHQy REN1c3RvbS5jcHAKaW5kZXggOTE0ZGVhMC4uZTg4YWZjMiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9i aW5kaW5ncy9qcy9KU0NhbnZhc1JlbmRlcmluZ0NvbnRleHQyREN1c3RvbS5jcHAKKysrIGIvV2Vi Q29yZS9iaW5kaW5ncy9qcy9KU0NhbnZhc1JlbmRlcmluZ0NvbnRleHQyREN1c3RvbS5jcHAKQEAg LTIyMCw2ICsyMjAsNyBAQCBKU1ZhbHVlIEpTQ2FudmFzUmVuZGVyaW5nQ29udGV4dDJEOjpkcmF3 SW1hZ2UoRXhlY1N0YXRlKiBleGVjKQogICAgICAgICBzd2l0Y2ggKGV4ZWMtPmFyZ3VtZW50Q291 bnQoKSkgewogICAgICAgICAgICAgY2FzZSAzOgogICAgICAgICAgICAgICAgIGNvbnRleHQtPmRy YXdJbWFnZShjYW52YXMsIGV4ZWMtPmFyZ3VtZW50KDEpLnRvRmxvYXQoZXhlYyksIGV4ZWMtPmFy Z3VtZW50KDIpLnRvRmxvYXQoZXhlYyksIGVjKTsKKyAgICAgICAgICAgICAgICBzZXRET01FeGNl cHRpb24oZXhlYywgZWMpOwogICAgICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICAgICAgY2Fz ZSA1OgogICAgICAgICAgICAgICAgIGNvbnRleHQtPmRyYXdJbWFnZShjYW52YXMsIGV4ZWMtPmFy Z3VtZW50KDEpLnRvRmxvYXQoZXhlYyksIGV4ZWMtPmFyZ3VtZW50KDIpLnRvRmxvYXQoZXhlYyks CmRpZmYgLS1naXQgYS9XZWJDb3JlL2h0bWwvY2FudmFzL0NhbnZhc1JlbmRlcmluZ0NvbnRleHQy RC5jcHAgYi9XZWJDb3JlL2h0bWwvY2FudmFzL0NhbnZhc1JlbmRlcmluZ0NvbnRleHQyRC5jcHAK aW5kZXggYjYyNjdmNy4uYzk0Zjk3MSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9odG1sL2NhbnZhcy9D YW52YXNSZW5kZXJpbmdDb250ZXh0MkQuY3BwCisrKyBiL1dlYkNvcmUvaHRtbC9jYW52YXMvQ2Fu dmFzUmVuZGVyaW5nQ29udGV4dDJELmNwcApAQCAtMTA4NywxNCArMTA4NywyMCBAQCB2b2lkIENh bnZhc1JlbmRlcmluZ0NvbnRleHQyRDo6ZHJhd0ltYWdlKEhUTUxDYW52YXNFbGVtZW50KiBzb3Vy Y2VDYW52YXMsIGNvbnN0CiAgICAgICAgIHJldHVybjsKICAgICB9CiAKLSAgICBlYyA9IDA7Ci0K ICAgICBGbG9hdFJlY3Qgc3JjQ2FudmFzUmVjdCA9IEZsb2F0UmVjdChGbG9hdFBvaW50KCksIHNv dXJjZUNhbnZhcy0+c2l6ZSgpKTsKKworICAgIGlmICghc3JjQ2FudmFzUmVjdC53aWR0aCgpIHx8 ICFzcmNDYW52YXNSZWN0LmhlaWdodCgpKSB7CisgICAgICAgIGVjID0gSU5WQUxJRF9TVEFURV9F UlI7CisgICAgICAgIHJldHVybjsKKyAgICB9CisKICAgICBpZiAoIXNyY0NhbnZhc1JlY3QuY29u dGFpbnMobm9ybWFsaXplUmVjdChzcmNSZWN0KSkgfHwgc3JjUmVjdC53aWR0aCgpID09IDAgfHwg c3JjUmVjdC5oZWlnaHQoKSA9PSAwKSB7CiAgICAgICAgIGVjID0gSU5ERVhfU0laRV9FUlI7CiAg ICAgICAgIHJldHVybjsKICAgICB9CiAKKyAgICBlYyA9IDA7CisKICAgICBpZiAoIWRzdFJlY3Qu d2lkdGgoKSB8fCAhZHN0UmVjdC5oZWlnaHQoKSkKICAgICAgICAgcmV0dXJuOwogCg==