42888 2010-07-23 04:35:07 -0700 [WINCE] Buildfix for GraphicsContext 2010-07-23 11:38:40 -0700 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 paroga webkit-unassigned aroben commit-queue oldest_to_newest 255296 0 paroga 2010-07-23 04:35:07 -0700 see patch 255298 1 62410 paroga 2010-07-23 04:35:59 -0700 Created attachment 62410 Patch 255301 2 paroga 2010-07-23 04:40:34 -0700 (From attachment 62410) > - dstRect.move(shadowSize); > + dstRect.move(shadowSize.width(), shadowSize.height()); shadowSize is a FloatSize and dstRect is a IntRect 255382 3 62410 aroben 2010-07-23 08:12:42 -0700 Comment on attachment 62410 Patch In the future, it would be helpful for you to use svn-create-patch rather than plain "svn diff" to create your patches. The former does a few things to make the patches slightly easier to read (like putting function names above each chunk). > @@ -1268,7 +1268,7 @@ > > IntRect dstRect = fillRect; > > - dstRect.move(shadowSize); > + dstRect.move(shadowSize.width(), shadowSize.height()); Is truncating to int really the right thing to do here? r=me, but I'll wait for an answer before marking this cq+. 255385 4 paroga 2010-07-23 08:20:21 -0700 (In reply to comment #3) > Is truncating to int really the right thing to do here? dstRect.inflate(shadowBlur) also casts shadowBlur from float to int. 255443 5 aroben 2010-07-23 09:53:17 -0700 (In reply to comment #4) > (In reply to comment #3) > > Is truncating to int really the right thing to do here? > dstRect.inflate(shadowBlur) also casts shadowBlur from float to int. OK, but that doesn't answer the question. Maybe we should be rounding from float to int in both cases instead of truncating? 255447 6 62438 paroga 2010-07-23 10:01:29 -0700 Created attachment 62438 Patch 255467 7 62438 aroben 2010-07-23 10:35:24 -0700 Comment on attachment 62438 Patch r=me 255485 8 62438 commit-queue 2010-07-23 11:38:34 -0700 Comment on attachment 62438 Patch Clearing flags on attachment: 62438 Committed r63989: <http://trac.webkit.org/changeset/63989> 255486 9 commit-queue 2010-07-23 11:38:40 -0700 All reviewed patches have been landed. Closing bug. 62410 2010-07-23 04:35:59 -0700 2010-07-23 10:01:29 -0700 Patch bug-42888.patch text/plain 5479 paroga SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nDQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09DQotLS0gV2ViQ29yZS9DaGFuZ2VM b2cJKHJldmlzaW9uIDYzOTYwKQ0KKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkp DQpAQCAtMSwzICsxLDIwIEBADQorMjAxMC0wNy0yMyAgUGF0cmljayBHYW5zdGVyZXIgIDxwYXJv Z2FAcGFyb2dhLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBbV0lOQ0VdIEJ1aWxkZml4IGZvciBHcmFwaGljc0NvbnRleHQKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQyODg4CisKKyAgICAgICAgVXNl IEFmZmluZVRyYW5zZm9ybSBpbnN0ZWQgb2YgVHJhbnNmb3JtYXRpb25NYXRyaXggYW5kCisgICAg ICAgIGFkZCBDb2xvclNwYWNlIHBhcmFtZXRlciB0byB0aGUgZHJhd0JpdG1hcCBtZXRob2RzLgor CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvR3JhcGhpY3NDb250ZXh0Lmg6CisgICAgICAg ICogcGxhdGZvcm0vZ3JhcGhpY3Mvd2luY2UvR3JhcGhpY3NDb250ZXh0V2luY2UuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6R3JhcGhpY3NDb250ZXh0OjphZmZpbmVUcmFuc2Zvcm0pOgorICAgICAg ICAoV2ViQ29yZTo6R3JhcGhpY3NDb250ZXh0OjpmaWxsUm91bmRlZFJlY3QpOgorICAgICAgICAo V2ViQ29yZTo6R3JhcGhpY3NDb250ZXh0OjpkcmF3Qml0bWFwKToKKyAgICAgICAgKFdlYkNvcmU6 OkdyYXBoaWNzQ29udGV4dDo6ZHJhd0JpdG1hcFBhdHRlcm4pOgorCiAyMDEwLTA3LTIzICBTaGlu aWNoaXJvIEhhbWFqaSAgPGhhbWFqaUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQg YnkgS2VudCBUYW11cmEuCkluZGV4OiBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNz Q29udGV4dC5oDQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09DQotLS0gV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9HcmFw aGljc0NvbnRleHQuaAkocmV2aXNpb24gNjI1NDcpDQorKysgV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9HcmFwaGljc0NvbnRleHQuaAkod29ya2luZyBjb3B5KQ0KQEAgLTMwNywxNiArMzA3LDE2 IEBADQogCiAjaWYgT1MoV0lOQ0UpICYmICFQTEFURk9STShRVCkKICAgICAgICAgdm9pZCBzZXRC aXRtYXAoUGFzc1JlZlB0cjxTaGFyZWRCaXRtYXA+KTsKLSAgICAgICAgY29uc3QgVHJhbnNmb3Jt YXRpb25NYXRyaXgmIGFmZmluZVRyYW5zZm9ybSgpIGNvbnN0OwotICAgICAgICBUcmFuc2Zvcm1h dGlvbk1hdHJpeCYgYWZmaW5lVHJhbnNmb3JtKCk7CisgICAgICAgIGNvbnN0IEFmZmluZVRyYW5z Zm9ybSYgYWZmaW5lVHJhbnNmb3JtKCkgY29uc3Q7CisgICAgICAgIEFmZmluZVRyYW5zZm9ybSYg YWZmaW5lVHJhbnNmb3JtKCk7CiAgICAgICAgIHZvaWQgcmVzZXRBZmZpbmVUcmFuc2Zvcm0oKTsK ICAgICAgICAgdm9pZCBmaWxsUmVjdChjb25zdCBGbG9hdFJlY3QmLCBjb25zdCBHcmFkaWVudCop OwogICAgICAgICB2b2lkIGRyYXdUZXh0KGNvbnN0IFNpbXBsZUZvbnREYXRhKiBmb250RGF0YSwg Y29uc3QgR2x5cGhCdWZmZXImIGdseXBoQnVmZmVyLCBpbnQgZnJvbSwgaW50IG51bUdseXBocywg Y29uc3QgRmxvYXRQb2ludCYgcG9pbnQpOwogICAgICAgICB2b2lkIGRyYXdGcmFtZUNvbnRyb2wo Y29uc3QgSW50UmVjdCYgcmVjdCwgdW5zaWduZWQgdHlwZSwgdW5zaWduZWQgc3RhdGUpOwogICAg ICAgICB2b2lkIGRyYXdGb2N1c1JlY3QoY29uc3QgSW50UmVjdCYgcmVjdCk7CiAgICAgICAgIHZv aWQgcGFpbnRUZXh0RmllbGQoY29uc3QgSW50UmVjdCYgcmVjdCwgdW5zaWduZWQgc3RhdGUpOwot ICAgICAgICB2b2lkIGRyYXdCaXRtYXAoU2hhcmVkQml0bWFwKiwgY29uc3QgSW50UmVjdCYgZHN0 UmVjdCwgY29uc3QgSW50UmVjdCYgc3JjUmVjdCwgQ29tcG9zaXRlT3BlcmF0b3IgY29tcG9zaXRl T3ApOwotICAgICAgICB2b2lkIGRyYXdCaXRtYXBQYXR0ZXJuKFNoYXJlZEJpdG1hcCosIGNvbnN0 IEZsb2F0UmVjdCYgdGlsZVJlY3RJbiwgY29uc3QgQWZmaW5lVHJhbnNmb3JtJiBwYXR0ZXJuVHJh bnNmb3JtLCBjb25zdCBGbG9hdFBvaW50JiBwaGFzZSwgQ29tcG9zaXRlT3BlcmF0b3Igb3AsIGNv bnN0IEZsb2F0UmVjdCYgZGVzdFJlY3QsIGNvbnN0IEludFNpemUmIG9yaWdTb3VyY2VTaXplKTsK KyAgICAgICAgdm9pZCBkcmF3Qml0bWFwKFNoYXJlZEJpdG1hcCosIGNvbnN0IEludFJlY3QmIGRz dFJlY3QsIGNvbnN0IEludFJlY3QmIHNyY1JlY3QsIENvbG9yU3BhY2Ugc3R5bGVDb2xvclNwYWNl LCBDb21wb3NpdGVPcGVyYXRvciBjb21wb3NpdGVPcCk7CisgICAgICAgIHZvaWQgZHJhd0JpdG1h cFBhdHRlcm4oU2hhcmVkQml0bWFwKiwgY29uc3QgRmxvYXRSZWN0JiB0aWxlUmVjdEluLCBjb25z dCBBZmZpbmVUcmFuc2Zvcm0mIHBhdHRlcm5UcmFuc2Zvcm0sIGNvbnN0IEZsb2F0UG9pbnQmIHBo YXNlLCBDb2xvclNwYWNlIHN0eWxlQ29sb3JTcGFjZSwgQ29tcG9zaXRlT3BlcmF0b3Igb3AsIGNv bnN0IEZsb2F0UmVjdCYgZGVzdFJlY3QsIGNvbnN0IEludFNpemUmIG9yaWdTb3VyY2VTaXplKTsK ICAgICAgICAgdm9pZCBkcmF3SWNvbihISUNPTiBpY29uLCBjb25zdCBJbnRSZWN0JiBkc3RSZWN0 LCBVSU5UIGZsYWdzKTsKICAgICAgICAgSERDIGdldFdpbmRvd3NDb250ZXh0KGNvbnN0IEludFJl Y3QmLCBib29sIHN1cHBvcnRBbHBoYUJsZW5kID0gZmFsc2UsIGJvb2wgbWF5Q3JlYXRlQml0bWFw ID0gdHJ1ZSk7IC8vIFRoZSBwYXNzZWQgaW4gcmVjdCBpcyB1c2VkIHRvIGNyZWF0ZSBhIGJpdG1h cCBmb3IgY29tcG9zaXRpbmcgaW5zaWRlIHRyYW5zcGFyZW5jeSBsYXllcnMuCiAgICAgICAgIHZv aWQgcmVsZWFzZVdpbmRvd3NDb250ZXh0KEhEQywgY29uc3QgSW50UmVjdCYsIGJvb2wgc3VwcG9y dEFscGhhQmxlbmQgPSBmYWxzZSwgYm9vbCBtYXlDcmVhdGVCaXRtYXAgPSB0cnVlKTsgICAgLy8g VGhlIHBhc3NlZCBpbiBIREMgc2hvdWxkIGJlIHRoZSBvbmUgaGFuZGVkIGJhY2sgYnkgZ2V0V2lu ZG93c0NvbnRleHQuCkluZGV4OiBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3dpbmNlL0dyYXBo aWNzQ29udGV4dFdpbmNlLmNwcA0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQ0KLS0tIFdlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3Mvd2luY2UvR3JhcGhpY3NDb250ZXh0V2luY2UuY3BwCShyZXZpc2lvbiA2MjU0NykNCisr KyBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3dpbmNlL0dyYXBoaWNzQ29udGV4dFdpbmNlLmNw cAkod29ya2luZyBjb3B5KQ0KQEAgLTExNjAsMTIgKzExNjAsMTIgQEANCiAgICAgbV9kYXRhLT5j b25jYXRDVE0odHJhbnNmb3JtKTsKIH0KIAotVHJhbnNmb3JtYXRpb25NYXRyaXgmIEdyYXBoaWNz Q29udGV4dDo6YWZmaW5lVHJhbnNmb3JtKCkKK0FmZmluZVRyYW5zZm9ybSYgR3JhcGhpY3NDb250 ZXh0OjphZmZpbmVUcmFuc2Zvcm0oKQogewogICAgIHJldHVybiBtX2RhdGEtPm1fdHJhbnNmb3Jt OwogfQogCi1jb25zdCBUcmFuc2Zvcm1hdGlvbk1hdHJpeCYgR3JhcGhpY3NDb250ZXh0OjphZmZp bmVUcmFuc2Zvcm0oKSBjb25zdAorY29uc3QgQWZmaW5lVHJhbnNmb3JtJiBHcmFwaGljc0NvbnRl eHQ6OmFmZmluZVRyYW5zZm9ybSgpIGNvbnN0CiB7CiAgICAgcmV0dXJuIG1fZGF0YS0+bV90cmFu c2Zvcm07CiB9CkBAIC0xMjY4LDcgKzEyNjgsNyBAQA0KICAgICAKICAgICBJbnRSZWN0IGRzdFJl Y3QgPSBmaWxsUmVjdDsKICAgICAKLSAgICBkc3RSZWN0Lm1vdmUoc2hhZG93U2l6ZSk7CisgICAg ZHN0UmVjdC5tb3ZlKHNoYWRvd1NpemUud2lkdGgoKSwgc2hhZG93U2l6ZS5oZWlnaHQoKSk7CiAg ICAgZHN0UmVjdC5pbmZsYXRlKHNoYWRvd0JsdXIpOwogICAgIGRzdFJlY3QgPSBtX2RhdGEtPm1h cFJlY3QoZHN0UmVjdCk7CiAgIApAQCAtMTg2NCw3ICsxODY0LDcgQEANCiAgICAgRmlsbFJlY3Qo ZGMsICZyZWN0V2luLCByZWludGVycHJldF9jYXN0PEhCUlVTSD4oKChzdGF0ZSAmIERGQ1NfSU5B Q1RJVkUpID8gQ09MT1JfQlRORkFDRSA6IENPTE9SX1dJTkRPVykgKyAxKSk7CiB9CiAKLXZvaWQg R3JhcGhpY3NDb250ZXh0OjpkcmF3Qml0bWFwKFNoYXJlZEJpdG1hcCogYm1wLCBjb25zdCBJbnRS ZWN0JiBkc3RSZWN0SW4sIGNvbnN0IEludFJlY3QmIHNyY1JlY3QsIENvbXBvc2l0ZU9wZXJhdG9y IGNvbXBvc2l0ZU9wKQordm9pZCBHcmFwaGljc0NvbnRleHQ6OmRyYXdCaXRtYXAoU2hhcmVkQml0 bWFwKiBibXAsIGNvbnN0IEludFJlY3QmIGRzdFJlY3RJbiwgY29uc3QgSW50UmVjdCYgc3JjUmVj dCwgQ29sb3JTcGFjZSBzdHlsZUNvbG9yU3BhY2UsIENvbXBvc2l0ZU9wZXJhdG9yIGNvbXBvc2l0 ZU9wKQogewogICAgIGlmICghbV9kYXRhLT5tX29wYWNpdHkpCiAgICAgICAgIHJldHVybjsKQEAg LTE4ODcsNyArMTg4Nyw3IEBADQogfQogCiB2b2lkIEdyYXBoaWNzQ29udGV4dDo6ZHJhd0JpdG1h cFBhdHRlcm4oU2hhcmVkQml0bWFwKiBibXAsIGNvbnN0IEZsb2F0UmVjdCYgdGlsZVJlY3RJbiwg Y29uc3QgQWZmaW5lVHJhbnNmb3JtJiBwYXR0ZXJuVHJhbnNmb3JtLAotICAgICAgICAgICAgICAg IGNvbnN0IEZsb2F0UG9pbnQmIHBoYXNlLCBDb21wb3NpdGVPcGVyYXRvciBvcCwgY29uc3QgRmxv YXRSZWN0JiBkZXN0UmVjdEluLCBjb25zdCBJbnRTaXplJiBvcmlnU291cmNlU2l6ZSkKKyAgICAg ICAgICAgICAgICBjb25zdCBGbG9hdFBvaW50JiBwaGFzZSwgQ29sb3JTcGFjZSBzdHlsZUNvbG9y U3BhY2UsIENvbXBvc2l0ZU9wZXJhdG9yIG9wLCBjb25zdCBGbG9hdFJlY3QmIGRlc3RSZWN0SW4s IGNvbnN0IEludFNpemUmIG9yaWdTb3VyY2VTaXplKQogewogICAgIGlmICghbV9kYXRhLT5tX29w YWNpdHkpCiAgICAgICAgIHJldHVybjsKQEAgLTE5MDgsNyArMTkwOCw3IEBADQogICAgIEFmZmlu ZVRyYW5zZm9ybSB0cmFuc2Zvcm0gPSBtX2RhdGEtPm1fdHJhbnNmb3JtOwogICAgIHRyYW5zZm9y bS50cmFuc2xhdGUobW92ZWQud2lkdGgoKSwgbW92ZWQuaGVpZ2h0KCkpOwogCi0gICAgYm1wLT5k cmF3UGF0dGVybihkYywgdHJhbnNmb3JtLCB0aWxlUmVjdEluLCBwYXR0ZXJuVHJhbnNmb3JtLCBw aGFzZSwgb3AsIGRlc3RSZWN0SW4sIG9yaWdTb3VyY2VTaXplKTsKKyAgICBibXAtPmRyYXdQYXR0 ZXJuKGRjLCB0cmFuc2Zvcm0sIHRpbGVSZWN0SW4sIHBhdHRlcm5UcmFuc2Zvcm0sIHBoYXNlLCBz dHlsZUNvbG9yU3BhY2UsIG9wLCBkZXN0UmVjdEluLCBvcmlnU291cmNlU2l6ZSk7CiAKICAgICBp ZiAoIWJtcC0+aGFzQWxwaGEoKSkKICAgICAgICAgdHJhbnNwYXJlbnREQy5maWxsQWxwaGFDaGFu bmVsKCk7Cg== 62438 2010-07-23 10:01:29 -0700 2010-07-23 11:38:34 -0700 Patch bug-42888b.patch text/plain 6045 paroga SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nDQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09DQotLS0gV2ViQ29yZS9DaGFuZ2VM b2cJKHJldmlzaW9uIDYzOTYwKQ0KKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkp DQpAQCAtMSwzICsxLDIwIEBADQorMjAxMC0wNy0yMyAgUGF0cmljayBHYW5zdGVyZXIgIDxwYXJv Z2FAcGFyb2dhLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBbV0lOQ0VdIEJ1aWxkZml4IGZvciBHcmFwaGljc0NvbnRleHQKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQyODg4CisKKyAgICAgICAgVXNl IEFmZmluZVRyYW5zZm9ybSBpbnN0ZWQgb2YgVHJhbnNmb3JtYXRpb25NYXRyaXggYW5kCisgICAg ICAgIGFkZCBDb2xvclNwYWNlIHBhcmFtZXRlciB0byB0aGUgZHJhd0JpdG1hcCBtZXRob2RzLgor CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvR3JhcGhpY3NDb250ZXh0Lmg6CisgICAgICAg ICogcGxhdGZvcm0vZ3JhcGhpY3Mvd2luY2UvR3JhcGhpY3NDb250ZXh0V2luY2UuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6R3JhcGhpY3NDb250ZXh0OjphZmZpbmVUcmFuc2Zvcm0pOgorICAgICAg ICAoV2ViQ29yZTo6R3JhcGhpY3NDb250ZXh0OjpmaWxsUm91bmRlZFJlY3QpOgorICAgICAgICAo V2ViQ29yZTo6R3JhcGhpY3NDb250ZXh0OjpkcmF3Qml0bWFwKToKKyAgICAgICAgKFdlYkNvcmU6 OkdyYXBoaWNzQ29udGV4dDo6ZHJhd0JpdG1hcFBhdHRlcm4pOgorCiAyMDEwLTA3LTIzICBTaGlu aWNoaXJvIEhhbWFqaSAgPGhhbWFqaUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQg YnkgS2VudCBUYW11cmEuCkluZGV4OiBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNz Q29udGV4dC5oDQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09DQotLS0gV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9HcmFw aGljc0NvbnRleHQuaAkocmV2aXNpb24gNjI1NDcpDQorKysgV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9HcmFwaGljc0NvbnRleHQuaAkod29ya2luZyBjb3B5KQ0KQEAgLTMwNywxNiArMzA3LDE2 IEBADQogCiAjaWYgT1MoV0lOQ0UpICYmICFQTEFURk9STShRVCkKICAgICAgICAgdm9pZCBzZXRC aXRtYXAoUGFzc1JlZlB0cjxTaGFyZWRCaXRtYXA+KTsKLSAgICAgICAgY29uc3QgVHJhbnNmb3Jt YXRpb25NYXRyaXgmIGFmZmluZVRyYW5zZm9ybSgpIGNvbnN0OwotICAgICAgICBUcmFuc2Zvcm1h dGlvbk1hdHJpeCYgYWZmaW5lVHJhbnNmb3JtKCk7CisgICAgICAgIGNvbnN0IEFmZmluZVRyYW5z Zm9ybSYgYWZmaW5lVHJhbnNmb3JtKCkgY29uc3Q7CisgICAgICAgIEFmZmluZVRyYW5zZm9ybSYg YWZmaW5lVHJhbnNmb3JtKCk7CiAgICAgICAgIHZvaWQgcmVzZXRBZmZpbmVUcmFuc2Zvcm0oKTsK ICAgICAgICAgdm9pZCBmaWxsUmVjdChjb25zdCBGbG9hdFJlY3QmLCBjb25zdCBHcmFkaWVudCop OwogICAgICAgICB2b2lkIGRyYXdUZXh0KGNvbnN0IFNpbXBsZUZvbnREYXRhKiBmb250RGF0YSwg Y29uc3QgR2x5cGhCdWZmZXImIGdseXBoQnVmZmVyLCBpbnQgZnJvbSwgaW50IG51bUdseXBocywg Y29uc3QgRmxvYXRQb2ludCYgcG9pbnQpOwogICAgICAgICB2b2lkIGRyYXdGcmFtZUNvbnRyb2wo Y29uc3QgSW50UmVjdCYgcmVjdCwgdW5zaWduZWQgdHlwZSwgdW5zaWduZWQgc3RhdGUpOwogICAg ICAgICB2b2lkIGRyYXdGb2N1c1JlY3QoY29uc3QgSW50UmVjdCYgcmVjdCk7CiAgICAgICAgIHZv aWQgcGFpbnRUZXh0RmllbGQoY29uc3QgSW50UmVjdCYgcmVjdCwgdW5zaWduZWQgc3RhdGUpOwot ICAgICAgICB2b2lkIGRyYXdCaXRtYXAoU2hhcmVkQml0bWFwKiwgY29uc3QgSW50UmVjdCYgZHN0 UmVjdCwgY29uc3QgSW50UmVjdCYgc3JjUmVjdCwgQ29tcG9zaXRlT3BlcmF0b3IgY29tcG9zaXRl T3ApOwotICAgICAgICB2b2lkIGRyYXdCaXRtYXBQYXR0ZXJuKFNoYXJlZEJpdG1hcCosIGNvbnN0 IEZsb2F0UmVjdCYgdGlsZVJlY3RJbiwgY29uc3QgQWZmaW5lVHJhbnNmb3JtJiBwYXR0ZXJuVHJh bnNmb3JtLCBjb25zdCBGbG9hdFBvaW50JiBwaGFzZSwgQ29tcG9zaXRlT3BlcmF0b3Igb3AsIGNv bnN0IEZsb2F0UmVjdCYgZGVzdFJlY3QsIGNvbnN0IEludFNpemUmIG9yaWdTb3VyY2VTaXplKTsK KyAgICAgICAgdm9pZCBkcmF3Qml0bWFwKFNoYXJlZEJpdG1hcCosIGNvbnN0IEludFJlY3QmIGRz dFJlY3QsIGNvbnN0IEludFJlY3QmIHNyY1JlY3QsIENvbG9yU3BhY2Ugc3R5bGVDb2xvclNwYWNl LCBDb21wb3NpdGVPcGVyYXRvciBjb21wb3NpdGVPcCk7CisgICAgICAgIHZvaWQgZHJhd0JpdG1h cFBhdHRlcm4oU2hhcmVkQml0bWFwKiwgY29uc3QgRmxvYXRSZWN0JiB0aWxlUmVjdEluLCBjb25z dCBBZmZpbmVUcmFuc2Zvcm0mIHBhdHRlcm5UcmFuc2Zvcm0sIGNvbnN0IEZsb2F0UG9pbnQmIHBo YXNlLCBDb2xvclNwYWNlIHN0eWxlQ29sb3JTcGFjZSwgQ29tcG9zaXRlT3BlcmF0b3Igb3AsIGNv bnN0IEZsb2F0UmVjdCYgZGVzdFJlY3QsIGNvbnN0IEludFNpemUmIG9yaWdTb3VyY2VTaXplKTsK ICAgICAgICAgdm9pZCBkcmF3SWNvbihISUNPTiBpY29uLCBjb25zdCBJbnRSZWN0JiBkc3RSZWN0 LCBVSU5UIGZsYWdzKTsKICAgICAgICAgSERDIGdldFdpbmRvd3NDb250ZXh0KGNvbnN0IEludFJl Y3QmLCBib29sIHN1cHBvcnRBbHBoYUJsZW5kID0gZmFsc2UsIGJvb2wgbWF5Q3JlYXRlQml0bWFw ID0gdHJ1ZSk7IC8vIFRoZSBwYXNzZWQgaW4gcmVjdCBpcyB1c2VkIHRvIGNyZWF0ZSBhIGJpdG1h cCBmb3IgY29tcG9zaXRpbmcgaW5zaWRlIHRyYW5zcGFyZW5jeSBsYXllcnMuCiAgICAgICAgIHZv aWQgcmVsZWFzZVdpbmRvd3NDb250ZXh0KEhEQywgY29uc3QgSW50UmVjdCYsIGJvb2wgc3VwcG9y dEFscGhhQmxlbmQgPSBmYWxzZSwgYm9vbCBtYXlDcmVhdGVCaXRtYXAgPSB0cnVlKTsgICAgLy8g VGhlIHBhc3NlZCBpbiBIREMgc2hvdWxkIGJlIHRoZSBvbmUgaGFuZGVkIGJhY2sgYnkgZ2V0V2lu ZG93c0NvbnRleHQuCkluZGV4OiBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3dpbmNlL0dyYXBo aWNzQ29udGV4dFdpbmNlLmNwcA0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQ0KLS0tIFdlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3Mvd2luY2UvR3JhcGhpY3NDb250ZXh0V2luY2UuY3BwCShyZXZpc2lvbiA2MjU0NykNCisr KyBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3dpbmNlL0dyYXBoaWNzQ29udGV4dFdpbmNlLmNw cAkod29ya2luZyBjb3B5KQ0KQEAgLTExNjAsMTIgKzExNjAsMTIgQEAgdm9pZCBHcmFwaGljc0Nv bnRleHQ6OmNvbmNhdENUTShjb25zdCBBZg0KICAgICBtX2RhdGEtPmNvbmNhdENUTSh0cmFuc2Zv cm0pOw0KIH0NCiANCi1UcmFuc2Zvcm1hdGlvbk1hdHJpeCYgR3JhcGhpY3NDb250ZXh0OjphZmZp bmVUcmFuc2Zvcm0oKQ0KK0FmZmluZVRyYW5zZm9ybSYgR3JhcGhpY3NDb250ZXh0OjphZmZpbmVU cmFuc2Zvcm0oKQ0KIHsNCiAgICAgcmV0dXJuIG1fZGF0YS0+bV90cmFuc2Zvcm07DQogfQ0KIA0K LWNvbnN0IFRyYW5zZm9ybWF0aW9uTWF0cml4JiBHcmFwaGljc0NvbnRleHQ6OmFmZmluZVRyYW5z Zm9ybSgpIGNvbnN0DQorY29uc3QgQWZmaW5lVHJhbnNmb3JtJiBHcmFwaGljc0NvbnRleHQ6OmFm ZmluZVRyYW5zZm9ybSgpIGNvbnN0DQogew0KICAgICByZXR1cm4gbV9kYXRhLT5tX3RyYW5zZm9y bTsNCiB9DQpAQCAtMTI2OCw4ICsxMjY4LDggQEAgdm9pZCBHcmFwaGljc0NvbnRleHQ6OmZpbGxS b3VuZGVkUmVjdChjbw0KICAgICANCiAgICAgSW50UmVjdCBkc3RSZWN0ID0gZmlsbFJlY3Q7DQog ICAgIA0KLSAgICBkc3RSZWN0Lm1vdmUoc2hhZG93U2l6ZSk7DQotICAgIGRzdFJlY3QuaW5mbGF0 ZShzaGFkb3dCbHVyKTsNCisgICAgZHN0UmVjdC5tb3ZlKHN0YWJsZVJvdW5kKHNoYWRvd1NpemUu d2lkdGgoKSksIHN0YWJsZVJvdW5kKHNoYWRvd1NpemUuaGVpZ2h0KCkpKTsNCisgICAgZHN0UmVj dC5pbmZsYXRlKHN0YWJsZVJvdW5kKHNoYWRvd0JsdXIpKTsNCiAgICAgZHN0UmVjdCA9IG1fZGF0 YS0+bWFwUmVjdChkc3RSZWN0KTsNCiAgIA0KICAgICBGbG9hdFNpemUgbmV3VG9wTGVmdChtX2Rh dGEtPm1hcFNpemUodG9wTGVmdCkpOw0KQEAgLTE4NjQsNyArMTg2NCw3IEBAIHZvaWQgR3JhcGhp Y3NDb250ZXh0OjpwYWludFRleHRGaWVsZChjb24NCiAgICAgRmlsbFJlY3QoZGMsICZyZWN0V2lu LCByZWludGVycHJldF9jYXN0PEhCUlVTSD4oKChzdGF0ZSAmIERGQ1NfSU5BQ1RJVkUpID8gQ09M T1JfQlRORkFDRSA6IENPTE9SX1dJTkRPVykgKyAxKSk7DQogfQ0KIA0KLXZvaWQgR3JhcGhpY3ND b250ZXh0OjpkcmF3Qml0bWFwKFNoYXJlZEJpdG1hcCogYm1wLCBjb25zdCBJbnRSZWN0JiBkc3RS ZWN0SW4sIGNvbnN0IEludFJlY3QmIHNyY1JlY3QsIENvbXBvc2l0ZU9wZXJhdG9yIGNvbXBvc2l0 ZU9wKQ0KK3ZvaWQgR3JhcGhpY3NDb250ZXh0OjpkcmF3Qml0bWFwKFNoYXJlZEJpdG1hcCogYm1w LCBjb25zdCBJbnRSZWN0JiBkc3RSZWN0SW4sIGNvbnN0IEludFJlY3QmIHNyY1JlY3QsIENvbG9y U3BhY2Ugc3R5bGVDb2xvclNwYWNlLCBDb21wb3NpdGVPcGVyYXRvciBjb21wb3NpdGVPcCkNCiB7 DQogICAgIGlmICghbV9kYXRhLT5tX29wYWNpdHkpDQogICAgICAgICByZXR1cm47DQpAQCAtMTg4 Nyw3ICsxODg3LDcgQEAgdm9pZCBHcmFwaGljc0NvbnRleHQ6OmRyYXdCaXRtYXAoU2hhcmVkQg0K IH0NCiANCiB2b2lkIEdyYXBoaWNzQ29udGV4dDo6ZHJhd0JpdG1hcFBhdHRlcm4oU2hhcmVkQml0 bWFwKiBibXAsIGNvbnN0IEZsb2F0UmVjdCYgdGlsZVJlY3RJbiwgY29uc3QgQWZmaW5lVHJhbnNm b3JtJiBwYXR0ZXJuVHJhbnNmb3JtLA0KLSAgICAgICAgICAgICAgICBjb25zdCBGbG9hdFBvaW50 JiBwaGFzZSwgQ29tcG9zaXRlT3BlcmF0b3Igb3AsIGNvbnN0IEZsb2F0UmVjdCYgZGVzdFJlY3RJ biwgY29uc3QgSW50U2l6ZSYgb3JpZ1NvdXJjZVNpemUpDQorICAgICAgICAgICAgICAgIGNvbnN0 IEZsb2F0UG9pbnQmIHBoYXNlLCBDb2xvclNwYWNlIHN0eWxlQ29sb3JTcGFjZSwgQ29tcG9zaXRl T3BlcmF0b3Igb3AsIGNvbnN0IEZsb2F0UmVjdCYgZGVzdFJlY3RJbiwgY29uc3QgSW50U2l6ZSYg b3JpZ1NvdXJjZVNpemUpDQogew0KICAgICBpZiAoIW1fZGF0YS0+bV9vcGFjaXR5KQ0KICAgICAg ICAgcmV0dXJuOw0KQEAgLTE5MDgsNyArMTkwOCw3IEBAIHZvaWQgR3JhcGhpY3NDb250ZXh0Ojpk cmF3Qml0bWFwUGF0dGVybigNCiAgICAgQWZmaW5lVHJhbnNmb3JtIHRyYW5zZm9ybSA9IG1fZGF0 YS0+bV90cmFuc2Zvcm07DQogICAgIHRyYW5zZm9ybS50cmFuc2xhdGUobW92ZWQud2lkdGgoKSwg bW92ZWQuaGVpZ2h0KCkpOw0KIA0KLSAgICBibXAtPmRyYXdQYXR0ZXJuKGRjLCB0cmFuc2Zvcm0s IHRpbGVSZWN0SW4sIHBhdHRlcm5UcmFuc2Zvcm0sIHBoYXNlLCBvcCwgZGVzdFJlY3RJbiwgb3Jp Z1NvdXJjZVNpemUpOw0KKyAgICBibXAtPmRyYXdQYXR0ZXJuKGRjLCB0cmFuc2Zvcm0sIHRpbGVS ZWN0SW4sIHBhdHRlcm5UcmFuc2Zvcm0sIHBoYXNlLCBzdHlsZUNvbG9yU3BhY2UsIG9wLCBkZXN0 UmVjdEluLCBvcmlnU291cmNlU2l6ZSk7DQogDQogICAgIGlmICghYm1wLT5oYXNBbHBoYSgpKQ0K ICAgICAgICAgdHJhbnNwYXJlbnREQy5maWxsQWxwaGFDaGFubmVsKCk7DQoNClByb3BlcnR5IGNo YW5nZXMgb246IFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvd2luY2UvR3JhcGhpY3NDb250ZXh0 V2luY2UuY3BwDQpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fDQpBZGRlZDogc3ZuOmVvbC1zdHlsZQ0KICAgKyBuYXRpdmUN Cg0K