29691 2009-09-23 13:35:24 -0700 GraphicsContext::clipOut* functions do not behave as expected when no clipping is enabled before the call. Shadows render erroneously sometimes. 2009-10-06 10:49:54 -0700 1 1 1 Unclassified WebKit WebKit Qt 528+ (Nightly build) PC Linux RESOLVED FIXED Qt P2 Normal --- 1 carol webkit-unassigned ariya.hidayat commit-queue krit laszlo.gombos oldest_to_newest 149490 0 carol 2009-09-23 13:35:24 -0700 The Qt implementation of the clipOut family of methods on GraphicsContext, instead of clipping out the intended area clip it in if clipping was not enabled prior to the call. This leads to shadows being rendered incorrectly in some QtWebKit based applications that use an unclipped painter when calling QWebFrame::paintContent. 149491 1 carol 2009-09-23 13:35:50 -0700 Patch comming later today. 149533 2 40024 carol 2009-09-23 15:52:35 -0700 Created attachment 40024 Proposed patch This patch handles the case when no clipping is set by the user of QtWebKit. 150025 3 krit 2009-09-25 09:04:07 -0700 I'm not a reviewer but you forgot to delete QRectF clipBounds = p->clipPath().boundingRect(); in GC::clipOut(). I don't know what to do if p doesn't have clipping. Maybe torarne or ariya are the right person to review the patch. 150029 4 40113 carol 2009-09-25 09:19:21 -0700 Created attachment 40113 Proposed Patch: Fixed a minor issue highlighted by Dirk (see comments). Fixed a minor issue highlighted by Dirk (see comments). 151845 5 40516 carol 2009-10-02 08:26:51 -0700 Created attachment 40516 Proposed Patch Fixed style issue pointed out by Dirk 151873 6 krit 2009-10-02 09:41:20 -0700 (In reply to comment #5) > Created an attachment (id=40516) [details] > Proposed Patch > > Fixed style issue pointed out by Dirk The code style as well as the fix itself look good to me. I would say r+, but I'm not a reviewer :-) 152786 7 40516 commit-queue 2009-10-06 10:49:48 -0700 Comment on attachment 40516 Proposed Patch Clearing flags on attachment: 40516 Committed r49195: <http://trac.webkit.org/changeset/49195> 152787 8 commit-queue 2009-10-06 10:49:54 -0700 All reviewed patches have been landed. Closing bug. 40024 2009-09-23 15:52:35 -0700 2009-09-25 09:19:21 -0700 Proposed patch patchFor29691.txt text/plain 3826 carol SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0ODY4NikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjMgQEAKKzIwMDktMDktMjMgIENhcm9sIFN6YWJvICA8Y2Fyb2wuc3phYm9Abm9r aWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IFtRdF0gU29tZSBmdW5jdGlvbnMgaW4gR3JhcGhpY3NDb250ZXh0IGRvIG5vdCB3b3JrCisgICAg ICAgIGFzIGV4cGVjdGVkIGlmIHRoZSBhc3NvY2lhdGVkIHBhaW50ZXIgaGFzIG5vIGNsaXBwaW5n LgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Mjk2OTEK KworICAgICAgICBObyBuZXcgdGVzdHMgYXJlIGFzc29jaWF0ZWQgd2l0aCB0aGlzIGJlY2F1c2Ug RHVtcFJlbmRlclRyZWUKKyAgICAgICAgYWx3YXlzIHNldHMgY2xpcHBpbmcgb24gdGhlIHBhaW50 ZXIsIHRodXMgaXQgd291bGQgbmV2ZXIgaGl0IAorICAgICAgICB0aGUgdGVzdCBjYXNlLCBidXQg ZmFzdC9ib3gtc2hhZG93L2Jhc2ljLXNoYWRvd3MuaHRtbCBpcyBhCisgICAgICAgIGdvb2QgZXhh bXBsZSBvZiB3aGF0IGhhcHBlbnMgaWYgdGhlIGNsaXBwaW5nIGlzIG5vdCBzZXQgYnkKKyAgICAg ICAgdGhlIHVzZXIgb2YgUXRXZWJLaXQuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9x dC9HcmFwaGljc0NvbnRleHRRdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0NvbnRl eHQ6OmNsaXBPdXQpOgorICAgICAgICAoV2ViQ29yZTo6R3JhcGhpY3NDb250ZXh0OjpjbGlwT3V0 RWxsaXBzZUluUmVjdCk6CisgICAgICAgIEZpeGVkIHRvIGhhbmRsZSB0aGUgY2FzZSB0aGF0IHRo ZXJlIGlzIG5vIGNsaXBwaW5nCisgICAgICAgIGJlZm9yZSB0aGUgY2FsbC4KKwogMjAwOS0wOS0y MyAgRGF2aWQgS2lsemVyICA8ZGRraWx6ZXJAYXBwbGUuY29tPgogCiAgICAgICAgIDxodHRwOi8v d2Via2l0Lm9yZy9iLzI5NjYwPiBNb3ZlICJHZW5lcmF0ZSA2NC1iaXQgRXhwb3J0IEZpbGUiIGJ1 aWxkIHBoYXNlIHNjcmlwdCBpbnRvIERlcml2ZWRTb3VyY2VzLm1ha2UKSW5kZXg6IFdlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvcXQvR3JhcGhpY3NDb250ZXh0UXQuY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvcXQvR3JhcGhpY3NDb250ZXh0UXQuY3BwCShyZXZp c2lvbiA0ODQ0MikKKysrIFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvcXQvR3JhcGhpY3NDb250 ZXh0UXQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMDY0LDEwICsxMDY0LDE1IEBAIHZvaWQgR3Jh cGhpY3NDb250ZXh0OjpjbGlwT3V0KGNvbnN0IFBhdGgKICAgICBRUGFpbnRlclBhdGggY2xpcHBl ZE91dCA9ICpwYXRoLnBsYXRmb3JtUGF0aCgpOwogICAgIFFQYWludGVyUGF0aCBuZXdDbGlwOwog ICAgIG5ld0NsaXAuc2V0RmlsbFJ1bGUoUXQ6Ok9kZEV2ZW5GaWxsKTsKLSAgICBuZXdDbGlwLmFk ZFJlY3QoY2xpcEJvdW5kcyk7Ci0gICAgbmV3Q2xpcC5hZGRQYXRoKGNsaXBwZWRPdXQpOwotCi0g ICAgcC0+c2V0Q2xpcFBhdGgobmV3Q2xpcCwgUXQ6OkludGVyc2VjdENsaXApOworICAgIGlmIChw LT5oYXNDbGlwcGluZygpKSB7CisgICAgICAgIG5ld0NsaXAuYWRkUmVjdChwLT5jbGlwUGF0aCgp LmJvdW5kaW5nUmVjdCgpKTsKKyAgICAgICAgbmV3Q2xpcC5hZGRQYXRoKGNsaXBwZWRPdXQpOwor ICAgICAgICBwLT5zZXRDbGlwUGF0aChuZXdDbGlwLCBRdDo6SW50ZXJzZWN0Q2xpcCk7CisgICAg fSBlbHNlIHsKKyAgICAgICAgbmV3Q2xpcC5hZGRSZWN0KHAtPndpbmRvdygpKTsKKyAgICAgICAg bmV3Q2xpcC5hZGRQYXRoKGNsaXBwZWRPdXQgJiBuZXdDbGlwKTsKKyAgICAgICAgcC0+c2V0Q2xp cFBhdGgobmV3Q2xpcCk7CisgICAgfQogfQogCiB2b2lkIEdyYXBoaWNzQ29udGV4dDo6dHJhbnNs YXRlKGZsb2F0IHgsIGZsb2F0IHkpCkBAIC0xMTI2LDEzICsxMTMxLDIwIEBAIHZvaWQgR3JhcGhp Y3NDb250ZXh0OjpjbGlwT3V0KGNvbnN0IEludFIKICAgICAgICAgcmV0dXJuOwogCiAgICAgUVBh aW50ZXIqIHAgPSBtX2RhdGEtPnAoKTsKLSAgICBRUmVjdEYgY2xpcEJvdW5kcyA9IHAtPmNsaXBQ YXRoKCkuYm91bmRpbmdSZWN0KCk7CiAgICAgUVBhaW50ZXJQYXRoIG5ld0NsaXA7CiAgICAgbmV3 Q2xpcC5zZXRGaWxsUnVsZShRdDo6T2RkRXZlbkZpbGwpOwotICAgIG5ld0NsaXAuYWRkUmVjdChj bGlwQm91bmRzKTsKLSAgICBuZXdDbGlwLmFkZFJlY3QoUVJlY3QocmVjdCkpOwotCi0gICAgcC0+ c2V0Q2xpcFBhdGgobmV3Q2xpcCwgUXQ6OkludGVyc2VjdENsaXApOworICAgIGlmIChwLT5oYXND bGlwcGluZygpKSB7CisgICAgICAgIG5ld0NsaXAuYWRkUmVjdChwLT5jbGlwUGF0aCgpLmJvdW5k aW5nUmVjdCgpKTsKKyAgICAgICAgbmV3Q2xpcC5hZGRSZWN0KFFSZWN0KHJlY3QpKTsKKyAgICAg ICAgcC0+c2V0Q2xpcFBhdGgobmV3Q2xpcCwgUXQ6OkludGVyc2VjdENsaXApOworICAgIH0gZWxz ZSB7CisgICAgICAgIFFSZWN0IGNsaXBPdXRSZWN0KHJlY3QpOworICAgICAgICBRUmVjdCB3aW5k b3cocC0+d2luZG93KCkpOworICAgICAgICBjbGlwT3V0UmVjdCY9d2luZG93OworICAgICAgICBu ZXdDbGlwLmFkZFJlY3Qod2luZG93KTsKKyAgICAgICAgbmV3Q2xpcC5hZGRSZWN0KGNsaXBPdXRS ZWN0KTsKKyAgICAgICAgcC0+c2V0Q2xpcFBhdGgobmV3Q2xpcCk7CisgICAgfQogfQogCiB2b2lk IEdyYXBoaWNzQ29udGV4dDo6Y2xpcE91dEVsbGlwc2VJblJlY3QoY29uc3QgSW50UmVjdCYgcmVj dCkKQEAgLTExNDEsMTMgKzExNTMsMjAgQEAgdm9pZCBHcmFwaGljc0NvbnRleHQ6OmNsaXBPdXRF bGxpcHNlSW5SZQogICAgICAgICByZXR1cm47CiAKICAgICBRUGFpbnRlciogcCA9IG1fZGF0YS0+ cCgpOwotICAgIFFSZWN0RiBjbGlwQm91bmRzID0gcC0+Y2xpcFBhdGgoKS5ib3VuZGluZ1JlY3Qo KTsKICAgICBRUGFpbnRlclBhdGggbmV3Q2xpcDsKICAgICBuZXdDbGlwLnNldEZpbGxSdWxlKFF0 OjpPZGRFdmVuRmlsbCk7Ci0gICAgbmV3Q2xpcC5hZGRSZWN0KGNsaXBCb3VuZHMpOwotICAgIG5l d0NsaXAuYWRkRWxsaXBzZShRUmVjdChyZWN0KSk7Ci0KLSAgICBwLT5zZXRDbGlwUGF0aChuZXdD bGlwLCBRdDo6SW50ZXJzZWN0Q2xpcCk7CisgICAgaWYgKHAtPmhhc0NsaXBwaW5nKCkpIHsKKyAg ICAgICAgbmV3Q2xpcC5hZGRSZWN0KHAtPmNsaXBQYXRoKCkuYm91bmRpbmdSZWN0KCkpOworICAg ICAgICBuZXdDbGlwLmFkZEVsbGlwc2UoUVJlY3QocmVjdCkpOworICAgICAgICBwLT5zZXRDbGlw UGF0aChuZXdDbGlwLCBRdDo6SW50ZXJzZWN0Q2xpcCk7CisgICAgfSBlbHNlIHsKKyAgICAgICAg UVJlY3QgY2xpcE91dFJlY3QocmVjdCk7CisgICAgICAgIFFSZWN0IHdpbmRvdyhwLT53aW5kb3co KSk7CisgICAgICAgIGNsaXBPdXRSZWN0Jj13aW5kb3c7CisgICAgICAgIG5ld0NsaXAuYWRkUmVj dCh3aW5kb3cpOworICAgICAgICBuZXdDbGlwLmFkZEVsbGlwc2UoY2xpcE91dFJlY3QpOworICAg ICAgICBwLT5zZXRDbGlwUGF0aChuZXdDbGlwKTsKKyAgICB9CiB9CiAKIHZvaWQgR3JhcGhpY3ND b250ZXh0OjpjbGlwVG9JbWFnZUJ1ZmZlcihjb25zdCBGbG9hdFJlY3QmLCBjb25zdCBJbWFnZUJ1 ZmZlciopCg== 40113 2009-09-25 09:19:21 -0700 2009-10-02 08:26:51 -0700 Proposed Patch: Fixed a minor issue highlighted by Dirk (see comments). patchFor29691-2.txt text/plain 3932 carol SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0ODY4NikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjMgQEAKKzIwMDktMDktMjMgIENhcm9sIFN6YWJvICA8Y2Fyb2wuc3phYm9Abm9r aWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IFtRdF0gU29tZSBmdW5jdGlvbnMgaW4gR3JhcGhpY3NDb250ZXh0IGRvIG5vdCB3b3JrCisgICAg ICAgIGFzIGV4cGVjdGVkIGlmIHRoZSBhc3NvY2lhdGVkIHBhaW50ZXIgaGFzIG5vIGNsaXBwaW5n LgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Mjk2OTEK KworICAgICAgICBObyBuZXcgdGVzdHMgYXJlIGFzc29jaWF0ZWQgd2l0aCB0aGlzIGJlY2F1c2Ug RHVtcFJlbmRlclRyZWUKKyAgICAgICAgYWx3YXlzIHNldHMgY2xpcHBpbmcgb24gdGhlIHBhaW50 ZXIsIHRodXMgaXQgd291bGQgbmV2ZXIgaGl0IAorICAgICAgICB0aGUgdGVzdCBjYXNlLCBidXQg ZmFzdC9ib3gtc2hhZG93L2Jhc2ljLXNoYWRvd3MuaHRtbCBpcyBhCisgICAgICAgIGdvb2QgZXhh bXBsZSBvZiB3aGF0IGhhcHBlbnMgaWYgdGhlIGNsaXBwaW5nIGlzIG5vdCBzZXQgYnkKKyAgICAg ICAgdGhlIHVzZXIgb2YgUXRXZWJLaXQuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9x dC9HcmFwaGljc0NvbnRleHRRdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0NvbnRl eHQ6OmNsaXBPdXQpOgorICAgICAgICAoV2ViQ29yZTo6R3JhcGhpY3NDb250ZXh0OjpjbGlwT3V0 RWxsaXBzZUluUmVjdCk6CisgICAgICAgIEZpeGVkIHRvIGhhbmRsZSB0aGUgY2FzZSB0aGF0IHRo ZXJlIGlzIG5vIGNsaXBwaW5nCisgICAgICAgIGJlZm9yZSB0aGUgY2FsbC4KKwogMjAwOS0wOS0y MyAgRGF2aWQgS2lsemVyICA8ZGRraWx6ZXJAYXBwbGUuY29tPgogCiAgICAgICAgIDxodHRwOi8v d2Via2l0Lm9yZy9iLzI5NjYwPiBNb3ZlICJHZW5lcmF0ZSA2NC1iaXQgRXhwb3J0IEZpbGUiIGJ1 aWxkIHBoYXNlIHNjcmlwdCBpbnRvIERlcml2ZWRTb3VyY2VzLm1ha2UKSW5kZXg6IFdlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvcXQvR3JhcGhpY3NDb250ZXh0UXQuY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvcXQvR3JhcGhpY3NDb250ZXh0UXQuY3BwCShyZXZp c2lvbiA0ODQ0MikKKysrIFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvcXQvR3JhcGhpY3NDb250 ZXh0UXQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMDYwLDE0ICsxMDYwLDE4IEBAIHZvaWQgR3Jh cGhpY3NDb250ZXh0OjpjbGlwT3V0KGNvbnN0IFBhdGgKICAgICAgICAgcmV0dXJuOwogCiAgICAg UVBhaW50ZXIqIHAgPSBtX2RhdGEtPnAoKTsKLSAgICBRUmVjdEYgY2xpcEJvdW5kcyA9IHAtPmNs aXBQYXRoKCkuYm91bmRpbmdSZWN0KCk7CiAgICAgUVBhaW50ZXJQYXRoIGNsaXBwZWRPdXQgPSAq cGF0aC5wbGF0Zm9ybVBhdGgoKTsKICAgICBRUGFpbnRlclBhdGggbmV3Q2xpcDsKICAgICBuZXdD bGlwLnNldEZpbGxSdWxlKFF0OjpPZGRFdmVuRmlsbCk7Ci0gICAgbmV3Q2xpcC5hZGRSZWN0KGNs aXBCb3VuZHMpOwotICAgIG5ld0NsaXAuYWRkUGF0aChjbGlwcGVkT3V0KTsKLQotICAgIHAtPnNl dENsaXBQYXRoKG5ld0NsaXAsIFF0OjpJbnRlcnNlY3RDbGlwKTsKKyAgICBpZiAocC0+aGFzQ2xp cHBpbmcoKSkgeworICAgICAgICBuZXdDbGlwLmFkZFJlY3QocC0+Y2xpcFBhdGgoKS5ib3VuZGlu Z1JlY3QoKSk7CisgICAgICAgIG5ld0NsaXAuYWRkUGF0aChjbGlwcGVkT3V0KTsKKyAgICAgICAg cC0+c2V0Q2xpcFBhdGgobmV3Q2xpcCwgUXQ6OkludGVyc2VjdENsaXApOworICAgIH0gZWxzZSB7 CisgICAgICAgIG5ld0NsaXAuYWRkUmVjdChwLT53aW5kb3coKSk7CisgICAgICAgIG5ld0NsaXAu YWRkUGF0aChjbGlwcGVkT3V0ICYgbmV3Q2xpcCk7CisgICAgICAgIHAtPnNldENsaXBQYXRoKG5l d0NsaXApOworICAgIH0KIH0KIAogdm9pZCBHcmFwaGljc0NvbnRleHQ6OnRyYW5zbGF0ZShmbG9h dCB4LCBmbG9hdCB5KQpAQCAtMTEyNiwxMyArMTEzMCwyMCBAQCB2b2lkIEdyYXBoaWNzQ29udGV4 dDo6Y2xpcE91dChjb25zdCBJbnRSCiAgICAgICAgIHJldHVybjsKIAogICAgIFFQYWludGVyKiBw ID0gbV9kYXRhLT5wKCk7Ci0gICAgUVJlY3RGIGNsaXBCb3VuZHMgPSBwLT5jbGlwUGF0aCgpLmJv dW5kaW5nUmVjdCgpOwogICAgIFFQYWludGVyUGF0aCBuZXdDbGlwOwogICAgIG5ld0NsaXAuc2V0 RmlsbFJ1bGUoUXQ6Ok9kZEV2ZW5GaWxsKTsKLSAgICBuZXdDbGlwLmFkZFJlY3QoY2xpcEJvdW5k cyk7Ci0gICAgbmV3Q2xpcC5hZGRSZWN0KFFSZWN0KHJlY3QpKTsKLQotICAgIHAtPnNldENsaXBQ YXRoKG5ld0NsaXAsIFF0OjpJbnRlcnNlY3RDbGlwKTsKKyAgICBpZiAocC0+aGFzQ2xpcHBpbmco KSkgeworICAgICAgICBuZXdDbGlwLmFkZFJlY3QocC0+Y2xpcFBhdGgoKS5ib3VuZGluZ1JlY3Qo KSk7CisgICAgICAgIG5ld0NsaXAuYWRkUmVjdChRUmVjdChyZWN0KSk7CisgICAgICAgIHAtPnNl dENsaXBQYXRoKG5ld0NsaXAsIFF0OjpJbnRlcnNlY3RDbGlwKTsKKyAgICB9IGVsc2UgeworICAg ICAgICBRUmVjdCBjbGlwT3V0UmVjdChyZWN0KTsKKyAgICAgICAgUVJlY3Qgd2luZG93KHAtPndp bmRvdygpKTsKKyAgICAgICAgY2xpcE91dFJlY3QmPXdpbmRvdzsKKyAgICAgICAgbmV3Q2xpcC5h ZGRSZWN0KHdpbmRvdyk7CisgICAgICAgIG5ld0NsaXAuYWRkUmVjdChjbGlwT3V0UmVjdCk7Cisg ICAgICAgIHAtPnNldENsaXBQYXRoKG5ld0NsaXApOworICAgIH0KIH0KIAogdm9pZCBHcmFwaGlj c0NvbnRleHQ6OmNsaXBPdXRFbGxpcHNlSW5SZWN0KGNvbnN0IEludFJlY3QmIHJlY3QpCkBAIC0x MTQxLDEzICsxMTUyLDIwIEBAIHZvaWQgR3JhcGhpY3NDb250ZXh0OjpjbGlwT3V0RWxsaXBzZUlu UmUKICAgICAgICAgcmV0dXJuOwogCiAgICAgUVBhaW50ZXIqIHAgPSBtX2RhdGEtPnAoKTsKLSAg ICBRUmVjdEYgY2xpcEJvdW5kcyA9IHAtPmNsaXBQYXRoKCkuYm91bmRpbmdSZWN0KCk7CiAgICAg UVBhaW50ZXJQYXRoIG5ld0NsaXA7CiAgICAgbmV3Q2xpcC5zZXRGaWxsUnVsZShRdDo6T2RkRXZl bkZpbGwpOwotICAgIG5ld0NsaXAuYWRkUmVjdChjbGlwQm91bmRzKTsKLSAgICBuZXdDbGlwLmFk ZEVsbGlwc2UoUVJlY3QocmVjdCkpOwotCi0gICAgcC0+c2V0Q2xpcFBhdGgobmV3Q2xpcCwgUXQ6 OkludGVyc2VjdENsaXApOworICAgIGlmIChwLT5oYXNDbGlwcGluZygpKSB7CisgICAgICAgIG5l d0NsaXAuYWRkUmVjdChwLT5jbGlwUGF0aCgpLmJvdW5kaW5nUmVjdCgpKTsKKyAgICAgICAgbmV3 Q2xpcC5hZGRFbGxpcHNlKFFSZWN0KHJlY3QpKTsKKyAgICAgICAgcC0+c2V0Q2xpcFBhdGgobmV3 Q2xpcCwgUXQ6OkludGVyc2VjdENsaXApOworICAgIH0gZWxzZSB7CisgICAgICAgIFFSZWN0IGNs aXBPdXRSZWN0KHJlY3QpOworICAgICAgICBRUmVjdCB3aW5kb3cocC0+d2luZG93KCkpOworICAg ICAgICBjbGlwT3V0UmVjdCY9d2luZG93OworICAgICAgICBuZXdDbGlwLmFkZFJlY3Qod2luZG93 KTsKKyAgICAgICAgbmV3Q2xpcC5hZGRFbGxpcHNlKGNsaXBPdXRSZWN0KTsKKyAgICAgICAgcC0+ c2V0Q2xpcFBhdGgobmV3Q2xpcCk7CisgICAgfQogfQogCiB2b2lkIEdyYXBoaWNzQ29udGV4dDo6 Y2xpcFRvSW1hZ2VCdWZmZXIoY29uc3QgRmxvYXRSZWN0JiwgY29uc3QgSW1hZ2VCdWZmZXIqKQo= 40516 2009-10-02 08:26:51 -0700 2009-10-06 10:49:47 -0700 Proposed Patch patchFor29691-3.txt text/plain 3936 carol SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0ODY4NikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjMgQEAKKzIwMDktMDktMjMgIENhcm9sIFN6YWJvICA8Y2Fyb2wuc3phYm9Abm9r aWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IFtRdF0gU29tZSBmdW5jdGlvbnMgaW4gR3JhcGhpY3NDb250ZXh0IGRvIG5vdCB3b3JrCisgICAg ICAgIGFzIGV4cGVjdGVkIGlmIHRoZSBhc3NvY2lhdGVkIHBhaW50ZXIgaGFzIG5vIGNsaXBwaW5n LgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Mjk2OTEK KworICAgICAgICBObyBuZXcgdGVzdHMgYXJlIGFzc29jaWF0ZWQgd2l0aCB0aGlzIGJlY2F1c2Ug RHVtcFJlbmRlclRyZWUKKyAgICAgICAgYWx3YXlzIHNldHMgY2xpcHBpbmcgb24gdGhlIHBhaW50 ZXIsIHRodXMgaXQgd291bGQgbmV2ZXIgaGl0IAorICAgICAgICB0aGUgdGVzdCBjYXNlLCBidXQg ZmFzdC9ib3gtc2hhZG93L2Jhc2ljLXNoYWRvd3MuaHRtbCBpcyBhCisgICAgICAgIGdvb2QgZXhh bXBsZSBvZiB3aGF0IGhhcHBlbnMgaWYgdGhlIGNsaXBwaW5nIGlzIG5vdCBzZXQgYnkKKyAgICAg ICAgdGhlIHVzZXIgb2YgUXRXZWJLaXQuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9x dC9HcmFwaGljc0NvbnRleHRRdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0NvbnRl eHQ6OmNsaXBPdXQpOgorICAgICAgICAoV2ViQ29yZTo6R3JhcGhpY3NDb250ZXh0OjpjbGlwT3V0 RWxsaXBzZUluUmVjdCk6CisgICAgICAgIEZpeGVkIHRvIGhhbmRsZSB0aGUgY2FzZSB0aGF0IHRo ZXJlIGlzIG5vIGNsaXBwaW5nCisgICAgICAgIGJlZm9yZSB0aGUgY2FsbC4KKwogMjAwOS0wOS0y MyAgRGF2aWQgS2lsemVyICA8ZGRraWx6ZXJAYXBwbGUuY29tPgogCiAgICAgICAgIDxodHRwOi8v d2Via2l0Lm9yZy9iLzI5NjYwPiBNb3ZlICJHZW5lcmF0ZSA2NC1iaXQgRXhwb3J0IEZpbGUiIGJ1 aWxkIHBoYXNlIHNjcmlwdCBpbnRvIERlcml2ZWRTb3VyY2VzLm1ha2UKSW5kZXg6IFdlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvcXQvR3JhcGhpY3NDb250ZXh0UXQuY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvcXQvR3JhcGhpY3NDb250ZXh0UXQuY3BwCShyZXZp c2lvbiA0ODQ0MikKKysrIFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvcXQvR3JhcGhpY3NDb250 ZXh0UXQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMDYwLDE0ICsxMDYwLDE4IEBAIHZvaWQgR3Jh cGhpY3NDb250ZXh0OjpjbGlwT3V0KGNvbnN0IFBhdGgKICAgICAgICAgcmV0dXJuOwogCiAgICAg UVBhaW50ZXIqIHAgPSBtX2RhdGEtPnAoKTsKLSAgICBRUmVjdEYgY2xpcEJvdW5kcyA9IHAtPmNs aXBQYXRoKCkuYm91bmRpbmdSZWN0KCk7CiAgICAgUVBhaW50ZXJQYXRoIGNsaXBwZWRPdXQgPSAq cGF0aC5wbGF0Zm9ybVBhdGgoKTsKICAgICBRUGFpbnRlclBhdGggbmV3Q2xpcDsKICAgICBuZXdD bGlwLnNldEZpbGxSdWxlKFF0OjpPZGRFdmVuRmlsbCk7Ci0gICAgbmV3Q2xpcC5hZGRSZWN0KGNs aXBCb3VuZHMpOwotICAgIG5ld0NsaXAuYWRkUGF0aChjbGlwcGVkT3V0KTsKLQotICAgIHAtPnNl dENsaXBQYXRoKG5ld0NsaXAsIFF0OjpJbnRlcnNlY3RDbGlwKTsKKyAgICBpZiAocC0+aGFzQ2xp cHBpbmcoKSkgeworICAgICAgICBuZXdDbGlwLmFkZFJlY3QocC0+Y2xpcFBhdGgoKS5ib3VuZGlu Z1JlY3QoKSk7CisgICAgICAgIG5ld0NsaXAuYWRkUGF0aChjbGlwcGVkT3V0KTsKKyAgICAgICAg cC0+c2V0Q2xpcFBhdGgobmV3Q2xpcCwgUXQ6OkludGVyc2VjdENsaXApOworICAgIH0gZWxzZSB7 CisgICAgICAgIG5ld0NsaXAuYWRkUmVjdChwLT53aW5kb3coKSk7CisgICAgICAgIG5ld0NsaXAu YWRkUGF0aChjbGlwcGVkT3V0ICYgbmV3Q2xpcCk7CisgICAgICAgIHAtPnNldENsaXBQYXRoKG5l d0NsaXApOworICAgIH0KIH0KIAogdm9pZCBHcmFwaGljc0NvbnRleHQ6OnRyYW5zbGF0ZShmbG9h dCB4LCBmbG9hdCB5KQpAQCAtMTEyNiwxMyArMTEzMCwyMCBAQCB2b2lkIEdyYXBoaWNzQ29udGV4 dDo6Y2xpcE91dChjb25zdCBJbnRSCiAgICAgICAgIHJldHVybjsKIAogICAgIFFQYWludGVyKiBw ID0gbV9kYXRhLT5wKCk7Ci0gICAgUVJlY3RGIGNsaXBCb3VuZHMgPSBwLT5jbGlwUGF0aCgpLmJv dW5kaW5nUmVjdCgpOwogICAgIFFQYWludGVyUGF0aCBuZXdDbGlwOwogICAgIG5ld0NsaXAuc2V0 RmlsbFJ1bGUoUXQ6Ok9kZEV2ZW5GaWxsKTsKLSAgICBuZXdDbGlwLmFkZFJlY3QoY2xpcEJvdW5k cyk7Ci0gICAgbmV3Q2xpcC5hZGRSZWN0KFFSZWN0KHJlY3QpKTsKLQotICAgIHAtPnNldENsaXBQ YXRoKG5ld0NsaXAsIFF0OjpJbnRlcnNlY3RDbGlwKTsKKyAgICBpZiAocC0+aGFzQ2xpcHBpbmco KSkgeworICAgICAgICBuZXdDbGlwLmFkZFJlY3QocC0+Y2xpcFBhdGgoKS5ib3VuZGluZ1JlY3Qo KSk7CisgICAgICAgIG5ld0NsaXAuYWRkUmVjdChRUmVjdChyZWN0KSk7CisgICAgICAgIHAtPnNl dENsaXBQYXRoKG5ld0NsaXAsIFF0OjpJbnRlcnNlY3RDbGlwKTsKKyAgICB9IGVsc2UgeworICAg ICAgICBRUmVjdCBjbGlwT3V0UmVjdChyZWN0KTsKKyAgICAgICAgUVJlY3Qgd2luZG93KHAtPndp bmRvdygpKTsKKyAgICAgICAgY2xpcE91dFJlY3QgJj0gd2luZG93OworICAgICAgICBuZXdDbGlw LmFkZFJlY3Qod2luZG93KTsKKyAgICAgICAgbmV3Q2xpcC5hZGRSZWN0KGNsaXBPdXRSZWN0KTsK KyAgICAgICAgcC0+c2V0Q2xpcFBhdGgobmV3Q2xpcCk7CisgICAgfQogfQogCiB2b2lkIEdyYXBo aWNzQ29udGV4dDo6Y2xpcE91dEVsbGlwc2VJblJlY3QoY29uc3QgSW50UmVjdCYgcmVjdCkKQEAg LTExNDEsMTMgKzExNTIsMjAgQEAgdm9pZCBHcmFwaGljc0NvbnRleHQ6OmNsaXBPdXRFbGxpcHNl SW5SZQogICAgICAgICByZXR1cm47CiAKICAgICBRUGFpbnRlciogcCA9IG1fZGF0YS0+cCgpOwot ICAgIFFSZWN0RiBjbGlwQm91bmRzID0gcC0+Y2xpcFBhdGgoKS5ib3VuZGluZ1JlY3QoKTsKICAg ICBRUGFpbnRlclBhdGggbmV3Q2xpcDsKICAgICBuZXdDbGlwLnNldEZpbGxSdWxlKFF0OjpPZGRF dmVuRmlsbCk7Ci0gICAgbmV3Q2xpcC5hZGRSZWN0KGNsaXBCb3VuZHMpOwotICAgIG5ld0NsaXAu YWRkRWxsaXBzZShRUmVjdChyZWN0KSk7Ci0KLSAgICBwLT5zZXRDbGlwUGF0aChuZXdDbGlwLCBR dDo6SW50ZXJzZWN0Q2xpcCk7CisgICAgaWYgKHAtPmhhc0NsaXBwaW5nKCkpIHsKKyAgICAgICAg bmV3Q2xpcC5hZGRSZWN0KHAtPmNsaXBQYXRoKCkuYm91bmRpbmdSZWN0KCkpOworICAgICAgICBu ZXdDbGlwLmFkZEVsbGlwc2UoUVJlY3QocmVjdCkpOworICAgICAgICBwLT5zZXRDbGlwUGF0aChu ZXdDbGlwLCBRdDo6SW50ZXJzZWN0Q2xpcCk7CisgICAgfSBlbHNlIHsKKyAgICAgICAgUVJlY3Qg Y2xpcE91dFJlY3QocmVjdCk7CisgICAgICAgIFFSZWN0IHdpbmRvdyhwLT53aW5kb3coKSk7Cisg ICAgICAgIGNsaXBPdXRSZWN0ICY9IHdpbmRvdzsKKyAgICAgICAgbmV3Q2xpcC5hZGRSZWN0KHdp bmRvdyk7CisgICAgICAgIG5ld0NsaXAuYWRkRWxsaXBzZShjbGlwT3V0UmVjdCk7CisgICAgICAg IHAtPnNldENsaXBQYXRoKG5ld0NsaXApOworICAgIH0KIH0KIAogdm9pZCBHcmFwaGljc0NvbnRl eHQ6OmNsaXBUb0ltYWdlQnVmZmVyKGNvbnN0IEZsb2F0UmVjdCYsIGNvbnN0IEltYWdlQnVmZmVy KikK