22163 2008-11-10 14:27:21 -0800 [QT] GraphicsContext's currenPath can be transformed 2008-11-26 07:34:53 -0800 1 1 1 Unclassified WebKit WebKit Qt 528+ (Nightly build) PC All RESOLVED FIXED Qt P2 Normal --- 1 krit webkit-unassigned hausmann oldest_to_newest 98207 0 krit 2008-11-10 14:27:21 -0800 The currenPath of the GraphicsContext is transformed, when the GraphicsContext is transformed. That shouldn't be the case. The path will be drawn using the CTM but shouldn't be transformed itself. Only beginPath should respect the CTM. 98211 1 25027 krit 2008-11-10 14:40:02 -0800 Created attachment 25027 Undo the transformation This patch just undo the transformation to the path. That means new path's still respect the CTM and transformations to the context don't influence the current path. 99285 2 25259 krit 2008-11-19 00:23:23 -0800 Created attachment 25259 theoretical tests That are some theoretical test cases. There should be a green rectangle on the top left. 99286 3 25260 krit 2008-11-19 00:25:56 -0800 Created attachment 25260 Undo the transformation This patch should match all test cases above. 99304 4 25267 krit 2008-11-19 07:09:23 -0800 Created attachment 25267 Undo the transformation Update Path had to be cleared after the drawing. Added speed up by asking if currentPath is empty before all types of transformation. 99305 5 hausmann 2008-11-19 07:28:16 -0800 I think the patch looks good, but I also think that "affine" should be called "pathTransform" or so instead. A slightly more descriptive name that relates to the use of the transform with the gc's path. 99314 6 25273 krit 2008-11-19 09:17:30 -0800 Created attachment 25273 Undo the transformation You're right. I changed affine to pathTransform. 99432 7 25273 hausmann 2008-11-19 23:34:12 -0800 Comment on attachment 25273 Undo the transformation Great stuff Dirk :) 100403 8 krit 2008-11-26 07:34:53 -0800 landed in r38785. 25027 2008-11-10 14:40:02 -0800 2008-11-19 00:25:56 -0800 Undo the transformation qt.patch text/plain 2270 krit SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiAzODI3NSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTYgQEAKKzIwMDgtMTEtMTAgIERpcmsgU2NodWx6ZSAgPHZiczg1QGdteC5kZT4K KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGUgY3Vy cmVuUGF0aCBpcyB0cmFuc2Zvcm1lZCB3aGVuIHRoZSBHcmFwaGljc0NvbnRleHQgaXMgdHJhbnNm b3JtZWQuCisgICAgICAgIFdlIGp1c3QgdW5kbyB0aGUgdHJhbnNmb3JtYXRpb24gdG8gdGhlIHBh dGguCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9xdC9HcmFwaGljc0NvbnRleHRRdC5j cHA6CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0NvbnRleHQ6OnRyYW5zbGF0ZSk6CisgICAg ICAgIChXZWJDb3JlOjpHcmFwaGljc0NvbnRleHQ6OnJvdGF0ZSk6CisgICAgICAgIChXZWJDb3Jl OjpHcmFwaGljc0NvbnRleHQ6OnNjYWxlKToKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzQ29u dGV4dDo6Y29uY2F0Q1RNKToKKwogMjAwOC0xMS0xMCAgQWRhbSBSb2JlbiAgPGFyb2JlbkBhcHBs ZS5jb20+CiAKICAgICAgICAgRml4IEJ1ZyAyMjE2MTogQXNzZXJ0aW9uIGZhaWx1cmUgaW4gUmVu ZGVyVGhlbWVXaW46OnN5c3RlbUNvbG9yIHdoZW4KSW5kZXg6IFdlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvcXQvR3JhcGhpY3NDb250ZXh0UXQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvcXQvR3JhcGhpY3NDb250ZXh0UXQuY3BwCShyZXZpc2lvbiAzODI3NSkK KysrIFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvcXQvR3JhcGhpY3NDb250ZXh0UXQuY3BwCSh3 b3JraW5nIGNvcHkpCkBAIC05MDIsNiArOTAyLDkgQEAgdm9pZCBHcmFwaGljc0NvbnRleHQ6OnRy YW5zbGF0ZShmbG9hdCB4LAogICAgICAgICByZXR1cm47CiAKICAgICBtX2RhdGEtPnAoKS0+dHJh bnNsYXRlKHgsIHkpOworICAgIFFNYXRyaXggbWF0cml4OworICAgIG1hdHJpeC50cmFuc2xhdGUo LXgsIC15KTsKKyAgICBtX2RhdGEtPmN1cnJlbnRQYXRoID0gbV9kYXRhLT5jdXJyZW50UGF0aCAq IG1hdHJpeDsKIH0KIAogSW50UG9pbnQgR3JhcGhpY3NDb250ZXh0OjpvcmlnaW4oKQpAQCAtOTE4 LDYgKzkyMSw5IEBAIHZvaWQgR3JhcGhpY3NDb250ZXh0Ojpyb3RhdGUoZmxvYXQgcmFkaWEKICAg ICAgICAgcmV0dXJuOwogCiAgICAgbV9kYXRhLT5wKCktPnJvdGF0ZSgxODAvTV9QSSpyYWRpYW5z KTsKKyAgICBRTWF0cml4IG1hdHJpeDsKKyAgICBtYXRyaXgucm90YXRlKC0xODAvTV9QSSpyYWRp YW5zKTsKKyAgICBtX2RhdGEtPmN1cnJlbnRQYXRoID0gbV9kYXRhLT5jdXJyZW50UGF0aCAqIG1h dHJpeDsKIH0KIAogdm9pZCBHcmFwaGljc0NvbnRleHQ6OnNjYWxlKGNvbnN0IEZsb2F0U2l6ZSYg cykKQEAgLTkyNiw2ICs5MzIsOSBAQCB2b2lkIEdyYXBoaWNzQ29udGV4dDo6c2NhbGUoY29uc3Qg RmxvYXRTCiAgICAgICAgIHJldHVybjsKIAogICAgIG1fZGF0YS0+cCgpLT5zY2FsZShzLndpZHRo KCksIHMuaGVpZ2h0KCkpOworICAgIFFNYXRyaXggbWF0cml4OworICAgIG1hdHJpeC5zY2FsZSgt cy53aWR0aCgpLCAtcy5oZWlnaHQoKSk7CisgICAgbV9kYXRhLT5jdXJyZW50UGF0aCA9IG1fZGF0 YS0+Y3VycmVudFBhdGggKiBtYXRyaXg7CiB9CiAKIHZvaWQgR3JhcGhpY3NDb250ZXh0OjpjbGlw T3V0KGNvbnN0IEludFJlY3QmIHJlY3QpCkBAIC05ODksNiArOTk4LDEwIEBAIHZvaWQgR3JhcGhp Y3NDb250ZXh0Ojpjb25jYXRDVE0oY29uc3QgQWYKICAgICAgICAgcmV0dXJuOwogCiAgICAgbV9k YXRhLT5wKCktPnNldE1hdHJpeCh0cmFuc2Zvcm0sIHRydWUpOworICAgIGlmICh0cmFuc2Zvcm0u aXNJbnZlcnRpYmxlKCkpIHsKKyAgICAgICAgUU1hdHJpeCBtYXRyaXggPSB0cmFuc2Zvcm0uaW52 ZXJzZSgpOworICAgICAgICBtX2RhdGEtPmN1cnJlbnRQYXRoID0gbV9kYXRhLT5jdXJyZW50UGF0 aCAqIG1hdHJpeDsKKyAgICB9CiB9CiAKIHZvaWQgR3JhcGhpY3NDb250ZXh0OjpzZXRVUkxGb3JS ZWN0KGNvbnN0IEtVUkwmIGxpbmssIGNvbnN0IEludFJlY3QmIGRlc3RSZWN0KQo= 25259 2008-11-19 00:23:23 -0800 2008-11-19 00:23:23 -0800 theoretical tests tests text/plain 855 krit UGF0aCA6PSByZWN0YW5nbGUoMCwgMCwgMTAsIDEwKQpHcmFwaGljc0NvbnRleHQgZ2M7CmdjLT5m aWxsQ29sb3IoZ3JlZW4pOwoKMSkKZ2MtPmJlZ2luUGF0aCgpOwpnYy0+YWRkUGF0aChwYXRoKTsK Z2MtPmZpbGxQYXRoKCk7CgoyKQpnYy0+YmVnaW5QYXRoKCk7CmdjLT5hZGRQYXRoKHBhdGgpOwpn Yy0+dHJhbnNsYXRlKDEwLCAxMCk7CmdjLT5maWxsUGF0aCgpOwoKMykKZ2MtPmJlZ2luUGF0aCgp OwpnYy0+YWRkUGF0aChwYXRoKTsKZ2MtPnNhdmUoKTsKZ2MtPnRyYW5zbGF0ZSgxMCwgMTApOwpn Yy0+ZmlsbFBhdGgoKTsKZ2MtPnJlc3RvcmUoKTsKCjQpCmdjLT50cmFuc2xhdGUoLTEwLCAtMTAp OwpnYy0+YmVnaW5QYXRoKCk7CmdjLT5hZGRQYXRoKHBhdGgpOwpnYy0+c2F2ZSgpOwpnYy0+dHJh bnNsYXRlKDEwLCAxMCk7CmdjLT5hZGRQYXRoKHBhdGgpOwpnYy0+ZmlsbFBhdGgoKTsKZ2MtPnJl c3RvcmUoKTsKCjUpCmdjLT50cmFuc2xhdGUoLTEwLCAtMTApOwpnYy0+YmVnaW5QYXRoKCk7Cmdj LT5hZGRQYXRoKHBhdGgpOwpnYy0+c2F2ZSgpOwpnYy0+dHJhbnNsYXRlKDEwLCAxMCk7CmdjLT5h ZGRQYXRoKHBhdGgpOwpnYy0+cmVzdG9yZSgpOwpnYy0+ZmlsbFBhdGgoKTsKCjYpCmdjLT5zYXZl KCk7CmdjLT5iZWdpblBhdGgoKTsKZ2MtPmFkZFBhdGgocGF0aCk7CmdjLT50cmFuc2xhdGUoMTAs IDEwKTsKZ2MtPnJlc3RvcmUoKTsKZ2MtPmZpbGxQYXRoKCk7Cgo3KQpnYy0+dHJhbnNsYXRlKC0x MCwgLTEwKTsKZ2MtPnNhdmUoKTsKZ2MtPnRyYW5zbGF0ZSgxMCwgMTApOwpnYy0+YmVnaW5QYXRo KCk7CmdjLT5hZGRQYXRoKHBhdGgpOwpnYy0+cmVzdG9yZSgpOwpnYy0+ZmlsbFBhdGgoKTsKCgoK 25260 2008-11-19 00:25:56 -0800 2008-11-19 07:09:23 -0800 Undo the transformation qt.patch text/plain 3706 krit SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiAzODU5MSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTcgQEAKKzIwMDgtMTEtMTkgIERpcmsgU2NodWx6ZSAgPGtyaXRAd2Via2l0Lm9y Zz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXQVJO SU5HOiBOTyBURVNUIENBU0VTIEFEREVEIE9SIENIQU5HRUQKKworICAgICAgICAqIHBsYXRmb3Jt L2dyYXBoaWNzL0dyYXBoaWNzQ29udGV4dFByaXZhdGUuaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9n cmFwaGljcy9xdC9HcmFwaGljc0NvbnRleHRRdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpHcmFw aGljc0NvbnRleHQ6OnJlc3RvcmVQbGF0Zm9ybVN0YXRlKToKKyAgICAgICAgKFdlYkNvcmU6Okdy YXBoaWNzQ29udGV4dDo6dHJhbnNsYXRlKToKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzQ29u dGV4dDo6cm90YXRlKToKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzQ29udGV4dDo6c2NhbGUp OgorICAgICAgICAoV2ViQ29yZTo6R3JhcGhpY3NDb250ZXh0Ojpjb25jYXRDVE0pOgorCiAyMDA4 LTExLTE4ICBEYW4gQmVybnN0ZWluICA8bWl0ekBhcHBsZS5jb20+CiAKICAgICAgICAgUmV2aWV3 ZWQgYnkgTWFyayBSb3dlLgpJbmRleDogV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGlj c0NvbnRleHRQcml2YXRlLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9HcmFwaGljc0NvbnRleHRQcml2YXRlLmgJKHJldmlzaW9uIDM4NTEwKQorKysgV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0NvbnRleHRQcml2YXRlLmgJKHdvcmtpbmcgY29weSkK QEAgLTI2LDYgKzI2LDcgQEAKICNpZm5kZWYgR3JhcGhpY3NDb250ZXh0UHJpdmF0ZV9oCiAjZGVm aW5lIEdyYXBoaWNzQ29udGV4dFByaXZhdGVfaAogCisjaW5jbHVkZSAiQWZmaW5lVHJhbnNmb3Jt LmgiCiAjaW5jbHVkZSAiRm9udC5oIgogI2luY2x1ZGUgIkdyYWRpZW50LmgiCiAjaW5jbHVkZSAi R3JhcGhpY3NDb250ZXh0LmgiCkBAIC03MCw2ICs3MSw4IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsK ICAgICAgICAgZmxvYXQgc3Ryb2tlVGhpY2tuZXNzOwogI2lmIFBMQVRGT1JNKENBSVJPKQogICAg ICAgICBmbG9hdCBnbG9iYWxBbHBoYTsKKyNlbGlmIFBMQVRGT1JNKFFUKQorICAgICAgICBBZmZp bmVUcmFuc2Zvcm0gYWZmaW5lOwogI2VuZGlmCiAgICAgICAgIENvbG9yU3BhY2Ugc3Ryb2tlQ29s b3JTcGFjZTsKICAgICAgICAgQ29sb3Igc3Ryb2tlQ29sb3I7CkluZGV4OiBXZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL3F0L0dyYXBoaWNzQ29udGV4dFF0LmNwcAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL3F0L0dyYXBoaWNzQ29udGV4dFF0LmNwcAkocmV2aXNpb24g Mzg1MTApCisrKyBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3F0L0dyYXBoaWNzQ29udGV4dFF0 LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjkzLDYgKzI5MywxMSBAQCB2b2lkIEdyYXBoaWNzQ29u dGV4dDo6c2F2ZVBsYXRmb3JtU3RhdGUoCiB2b2lkIEdyYXBoaWNzQ29udGV4dDo6cmVzdG9yZVBs YXRmb3JtU3RhdGUoKQogewogICAgIG1fZGF0YS0+cCgpLT5yZXN0b3JlKCk7CisKKyAgICBpZiAo bV9jb21tb24tPnN0YXRlLmFmZmluZS5pc0ludmVydGlibGUoKSkgeworICAgICAgICBRTWF0cml4 IG1hdHJpeCA9IG1fY29tbW9uLT5zdGF0ZS5hZmZpbmU7CisgICAgICAgIG1fZGF0YS0+Y3VycmVu dFBhdGggPSBtX2RhdGEtPmN1cnJlbnRQYXRoICogbWF0cml4OworICAgIH0KIH0KIAogLyogRklY TUU6IERJU0FCTEVEIFdISUxFIE1FUkdJTkcgQkFDSyBGUk9NIFVOSVRZCkBAIC05MjAsNiArOTI1 LDEwIEBAIHZvaWQgR3JhcGhpY3NDb250ZXh0Ojp0cmFuc2xhdGUoZmxvYXQgeCwKICAgICAgICAg cmV0dXJuOwogCiAgICAgbV9kYXRhLT5wKCktPnRyYW5zbGF0ZSh4LCB5KTsKKworICAgIFFNYXRy aXggbWF0cml4OworICAgIG1fZGF0YS0+Y3VycmVudFBhdGggPSBtX2RhdGEtPmN1cnJlbnRQYXRo ICogbWF0cml4LnRyYW5zbGF0ZSgteCwgLXkpOworICAgIG1fY29tbW9uLT5zdGF0ZS5hZmZpbmUu dHJhbnNsYXRlKHgsIHkpOwogfQogCiBJbnRQb2ludCBHcmFwaGljc0NvbnRleHQ6Om9yaWdpbigp CkBAIC05MzYsNiArOTQ1LDEwIEBAIHZvaWQgR3JhcGhpY3NDb250ZXh0Ojpyb3RhdGUoZmxvYXQg cmFkaWEKICAgICAgICAgcmV0dXJuOwogCiAgICAgbV9kYXRhLT5wKCktPnJvdGF0ZSgxODAvTV9Q SSpyYWRpYW5zKTsKKworICAgIFFNYXRyaXggbWF0cml4OworICAgIG1fZGF0YS0+Y3VycmVudFBh dGggPSBtX2RhdGEtPmN1cnJlbnRQYXRoICogbWF0cml4LnJvdGF0ZSgtMTgwL01fUEkqcmFkaWFu cyk7CisgICAgbV9jb21tb24tPnN0YXRlLmFmZmluZS5yb3RhdGUocmFkaWFucyk7CiB9CiAKIHZv aWQgR3JhcGhpY3NDb250ZXh0OjpzY2FsZShjb25zdCBGbG9hdFNpemUmIHMpCkBAIC05NDQsNiAr OTU3LDEwIEBAIHZvaWQgR3JhcGhpY3NDb250ZXh0OjpzY2FsZShjb25zdCBGbG9hdFMKICAgICAg ICAgcmV0dXJuOwogCiAgICAgbV9kYXRhLT5wKCktPnNjYWxlKHMud2lkdGgoKSwgcy5oZWlnaHQo KSk7CisKKyAgICBRTWF0cml4IG1hdHJpeDsKKyAgICBtX2RhdGEtPmN1cnJlbnRQYXRoID0gbV9k YXRhLT5jdXJyZW50UGF0aCAqIG1hdHJpeC5zY2FsZSgxIC8gcy53aWR0aCgpLCAxIC8gcy5oZWln aHQoKSk7CisgICAgbV9jb21tb24tPnN0YXRlLmFmZmluZS5zY2FsZShzLndpZHRoKCksIHMuaGVp Z2h0KCkpOwogfQogCiB2b2lkIEdyYXBoaWNzQ29udGV4dDo6Y2xpcE91dChjb25zdCBJbnRSZWN0 JiByZWN0KQpAQCAtMTAwNyw2ICsxMDI0LDE1IEBAIHZvaWQgR3JhcGhpY3NDb250ZXh0Ojpjb25j YXRDVE0oY29uc3QgQWYKICAgICAgICAgcmV0dXJuOwogCiAgICAgbV9kYXRhLT5wKCktPnNldE1h dHJpeCh0cmFuc2Zvcm0sIHRydWUpOworCisgICAgLy8gVHJhbnNmb3JtYXRpb25zIHRvIHRoZSBj b250ZXh0IHNob3VsZG4ndCBhZmZlY3QgdGhlIGNvb3JkaW5hdGVzIG9mIHRoZSBjdXJyZW50UGF0 aC4gCisgICAgLy8gV2UgaGF2ZSB0byB1bmRvIGV2ZXJ5IGNoYW5nZSBvbiB0aGUgY29udGV4dCB0 byB0aGUgY3VycmVudFBhdGggdG8gYXZvaWQgd3JvbmcgZHJhd2luZ3MuCisgICAgaWYgKHRyYW5z Zm9ybS5pc0ludmVydGlibGUoKSkgeworICAgICAgICBRTWF0cml4IG1hdHJpeCA9IHRyYW5zZm9y bS5pbnZlcnNlKCk7CisgICAgICAgIG1fZGF0YS0+Y3VycmVudFBhdGggPSBtX2RhdGEtPmN1cnJl bnRQYXRoICogbWF0cml4OworICAgICAgICBtX2NvbW1vbi0+c3RhdGUuYWZmaW5lLm11bHRpcGx5 KHRyYW5zZm9ybSk7CisgICAgICAgIAorICAgIH0KIH0KIAogdm9pZCBHcmFwaGljc0NvbnRleHQ6 OnNldFVSTEZvclJlY3QoY29uc3QgS1VSTCYgbGluaywgY29uc3QgSW50UmVjdCYgZGVzdFJlY3Qp Cg== 25267 2008-11-19 07:09:23 -0800 2008-11-19 09:17:30 -0800 Undo the transformation qt.patch text/plain 4487 krit SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiAzODU5MykKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjAgQEAKKzIwMDgtMTEtMTkgIERpcmsgU2NodWx6ZSAgPGtyaXRAd2Via2l0Lm9y Zz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUcmFu c2Zvcm1hdGlvbnMgdG8gdGhlIGNvbnRleHQgc2hvdWxkbid0IHRyYW5zZm9ybSB0aGUgY3VycmVu dFBhdGguCisgICAgICAgIEZpeGVkIHRoaXMgb24gUXQuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9n cmFwaGljcy9HcmFwaGljc0NvbnRleHRQcml2YXRlLmg6CisgICAgICAgICogcGxhdGZvcm0vZ3Jh cGhpY3MvcXQvR3JhcGhpY3NDb250ZXh0UXQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6R3JhcGhp Y3NDb250ZXh0OjpyZXN0b3JlUGxhdGZvcm1TdGF0ZSk6CisgICAgICAgIChXZWJDb3JlOjpHcmFw aGljc0NvbnRleHQ6OmZpbGxQYXRoKToKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzQ29udGV4 dDo6c3Ryb2tlUGF0aCk6CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0NvbnRleHQ6OnRyYW5z bGF0ZSk6CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0NvbnRleHQ6OnJvdGF0ZSk6CisgICAg ICAgIChXZWJDb3JlOjpHcmFwaGljc0NvbnRleHQ6OnNjYWxlKToKKyAgICAgICAgKFdlYkNvcmU6 OkdyYXBoaWNzQ29udGV4dDo6Y29uY2F0Q1RNKToKKwogMjAwOC0xMS0xOCAgRGFuIEJlcm5zdGVp biAgPG1pdHpAYXBwbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IE1hcmsgUm93ZS4KSW5k ZXg6IFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvR3JhcGhpY3NDb250ZXh0UHJpdmF0ZS5oCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvR3JhcGhpY3NDb250ZXh0UHJp dmF0ZS5oCShyZXZpc2lvbiAzODUxMCkKKysrIFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvR3Jh cGhpY3NDb250ZXh0UHJpdmF0ZS5oCSh3b3JraW5nIGNvcHkpCkBAIC0yNiw2ICsyNiw3IEBACiAj aWZuZGVmIEdyYXBoaWNzQ29udGV4dFByaXZhdGVfaAogI2RlZmluZSBHcmFwaGljc0NvbnRleHRQ cml2YXRlX2gKIAorI2luY2x1ZGUgIkFmZmluZVRyYW5zZm9ybS5oIgogI2luY2x1ZGUgIkZvbnQu aCIKICNpbmNsdWRlICJHcmFkaWVudC5oIgogI2luY2x1ZGUgIkdyYXBoaWNzQ29udGV4dC5oIgpA QCAtNzAsNiArNzEsOCBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgIGZsb2F0IHN0cm9r ZVRoaWNrbmVzczsKICNpZiBQTEFURk9STShDQUlSTykKICAgICAgICAgZmxvYXQgZ2xvYmFsQWxw aGE7CisjZWxpZiBQTEFURk9STShRVCkKKyAgICAgICAgQWZmaW5lVHJhbnNmb3JtIGFmZmluZTsK ICNlbmRpZgogICAgICAgICBDb2xvclNwYWNlIHN0cm9rZUNvbG9yU3BhY2U7CiAgICAgICAgIENv bG9yIHN0cm9rZUNvbG9yOwpJbmRleDogV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9HcmFw aGljc0NvbnRleHRRdC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9xdC9HcmFwaGljc0NvbnRleHRRdC5jcHAJKHJldmlzaW9uIDM4NTEwKQorKysgV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9xdC9HcmFwaGljc0NvbnRleHRRdC5jcHAJKHdvcmtpbmcgY29weSkK QEAgLTI5Myw2ICsyOTMsMTEgQEAgdm9pZCBHcmFwaGljc0NvbnRleHQ6OnNhdmVQbGF0Zm9ybVN0 YXRlKAogdm9pZCBHcmFwaGljc0NvbnRleHQ6OnJlc3RvcmVQbGF0Zm9ybVN0YXRlKCkKIHsKICAg ICBtX2RhdGEtPnAoKS0+cmVzdG9yZSgpOworCisgICAgaWYgKCFtX2RhdGEtPmN1cnJlbnRQYXRo LmlzRW1wdHkoKSAmJiBtX2NvbW1vbi0+c3RhdGUuYWZmaW5lLmlzSW52ZXJ0aWJsZSgpKSB7Cisg ICAgICAgIFFNYXRyaXggbWF0cml4ID0gbV9jb21tb24tPnN0YXRlLmFmZmluZTsKKyAgICAgICAg bV9kYXRhLT5jdXJyZW50UGF0aCA9IG1fZGF0YS0+Y3VycmVudFBhdGggKiBtYXRyaXg7CisgICAg fQogfQogCiAvKiBGSVhNRTogRElTQUJMRUQgV0hJTEUgTUVSR0lORyBCQUNLIEZST00gVU5JVFkK QEAgLTU0NCw2ICs1NDksNyBAQCB2b2lkIEdyYXBoaWNzQ29udGV4dDo6ZmlsbFBhdGgoKQogICAg ICAgICBwLT5maWxsUGF0aChwYXRoLCBRQnJ1c2goKmdyYWRpZW50KSk7CiAgICAgICAgIGJyZWFr OwogICAgIH0KKyAgICBtX2RhdGEtPmN1cnJlbnRQYXRoID0gUVBhaW50ZXJQYXRoKCk7CiB9CiAK IHZvaWQgR3JhcGhpY3NDb250ZXh0OjpzdHJva2VQYXRoKCkKQEAgLTU3Niw2ICs1ODIsNyBAQCB2 b2lkIEdyYXBoaWNzQ29udGV4dDo6c3Ryb2tlUGF0aCgpCiAgICAgICAgIGJyZWFrOwogICAgIH0K ICAgICB9CisgICAgbV9kYXRhLT5jdXJyZW50UGF0aCA9IFFQYWludGVyUGF0aCgpOwogfQogCiB2 b2lkIEdyYXBoaWNzQ29udGV4dDo6ZmlsbFJlY3QoY29uc3QgRmxvYXRSZWN0JiByZWN0KQpAQCAt OTIwLDYgKzkyNywxMiBAQCB2b2lkIEdyYXBoaWNzQ29udGV4dDo6dHJhbnNsYXRlKGZsb2F0IHgs CiAgICAgICAgIHJldHVybjsKIAogICAgIG1fZGF0YS0+cCgpLT50cmFuc2xhdGUoeCwgeSk7CisK KyAgICBpZiAoIW1fZGF0YS0+Y3VycmVudFBhdGguaXNFbXB0eSgpKSB7CisgICAgICAgIFFNYXRy aXggbWF0cml4OworICAgICAgICBtX2RhdGEtPmN1cnJlbnRQYXRoID0gbV9kYXRhLT5jdXJyZW50 UGF0aCAqIG1hdHJpeC50cmFuc2xhdGUoLXgsIC15KTsKKyAgICAgICAgbV9jb21tb24tPnN0YXRl LmFmZmluZS50cmFuc2xhdGUoeCwgeSk7CisgICAgfQogfQogCiBJbnRQb2ludCBHcmFwaGljc0Nv bnRleHQ6Om9yaWdpbigpCkBAIC05MzYsNiArOTQ5LDEyIEBAIHZvaWQgR3JhcGhpY3NDb250ZXh0 Ojpyb3RhdGUoZmxvYXQgcmFkaWEKICAgICAgICAgcmV0dXJuOwogCiAgICAgbV9kYXRhLT5wKCkt PnJvdGF0ZSgxODAvTV9QSSpyYWRpYW5zKTsKKworICAgIGlmICghbV9kYXRhLT5jdXJyZW50UGF0 aC5pc0VtcHR5KCkpIHsKKyAgICAgICAgUU1hdHJpeCBtYXRyaXg7CisgICAgICAgIG1fZGF0YS0+ Y3VycmVudFBhdGggPSBtX2RhdGEtPmN1cnJlbnRQYXRoICogbWF0cml4LnJvdGF0ZSgtMTgwL01f UEkqcmFkaWFucyk7CisgICAgICAgIG1fY29tbW9uLT5zdGF0ZS5hZmZpbmUucm90YXRlKHJhZGlh bnMpOworICAgIH0KIH0KIAogdm9pZCBHcmFwaGljc0NvbnRleHQ6OnNjYWxlKGNvbnN0IEZsb2F0 U2l6ZSYgcykKQEAgLTk0NCw2ICs5NjMsMTIgQEAgdm9pZCBHcmFwaGljc0NvbnRleHQ6OnNjYWxl KGNvbnN0IEZsb2F0UwogICAgICAgICByZXR1cm47CiAKICAgICBtX2RhdGEtPnAoKS0+c2NhbGUo cy53aWR0aCgpLCBzLmhlaWdodCgpKTsKKworICAgIGlmICghbV9kYXRhLT5jdXJyZW50UGF0aC5p c0VtcHR5KCkpIHsKKyAgICAgICAgUU1hdHJpeCBtYXRyaXg7CisgICAgICAgIG1fZGF0YS0+Y3Vy cmVudFBhdGggPSBtX2RhdGEtPmN1cnJlbnRQYXRoICogbWF0cml4LnNjYWxlKDEgLyBzLndpZHRo KCksIDEgLyBzLmhlaWdodCgpKTsKKyAgICAgICAgbV9jb21tb24tPnN0YXRlLmFmZmluZS5zY2Fs ZShzLndpZHRoKCksIHMuaGVpZ2h0KCkpOworICAgIH0KIH0KIAogdm9pZCBHcmFwaGljc0NvbnRl eHQ6OmNsaXBPdXQoY29uc3QgSW50UmVjdCYgcmVjdCkKQEAgLTEwMDcsNiArMTAzMiwxNCBAQCB2 b2lkIEdyYXBoaWNzQ29udGV4dDo6Y29uY2F0Q1RNKGNvbnN0IEFmCiAgICAgICAgIHJldHVybjsK IAogICAgIG1fZGF0YS0+cCgpLT5zZXRNYXRyaXgodHJhbnNmb3JtLCB0cnVlKTsKKworICAgIC8v IFRyYW5zZm9ybWF0aW9ucyB0byB0aGUgY29udGV4dCBzaG91bGRuJ3QgdHJhbnNmb3JtIHRoZSBj dXJyZW50UGF0aC4gCisgICAgLy8gV2UgaGF2ZSB0byB1bmRvIGV2ZXJ5IGNoYW5nZSBtYWRlIHRv IHRoZSBjb250ZXh0IGZyb20gdGhlIGN1cnJlbnRQYXRoIHRvIGF2b2lkIHdyb25nIGRyYXdpbmdz LgorICAgIGlmICghbV9kYXRhLT5jdXJyZW50UGF0aC5pc0VtcHR5KCkgJiYgdHJhbnNmb3JtLmlz SW52ZXJ0aWJsZSgpKSB7CisgICAgICAgIFFNYXRyaXggbWF0cml4ID0gdHJhbnNmb3JtLmludmVy c2UoKTsKKyAgICAgICAgbV9kYXRhLT5jdXJyZW50UGF0aCA9IG1fZGF0YS0+Y3VycmVudFBhdGgg KiBtYXRyaXg7CisgICAgICAgIG1fY29tbW9uLT5zdGF0ZS5hZmZpbmUubXVsdGlwbHkodHJhbnNm b3JtKTsKKyAgICB9CiB9CiAKIHZvaWQgR3JhcGhpY3NDb250ZXh0OjpzZXRVUkxGb3JSZWN0KGNv bnN0IEtVUkwmIGxpbmssIGNvbnN0IEludFJlY3QmIGRlc3RSZWN0KQo= 25273 2008-11-19 09:17:30 -0800 2008-11-19 23:34:12 -0800 Undo the transformation qt.patch text/plain 5000 krit SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiAzODU5NCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjQgQEAKKzIwMDgtMTEtMTkgIERpcmsgU2NodWx6ZSAgPGtyaXRAd2Via2l0Lm9y Zz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUcmFu c2Zvcm1hdGlvbnMgdG8gdGhlIGNvbnRleHQgc2hvdWxkbid0IHRyYW5zZm9ybSB0aGUgY3VycmVu dFBhdGguCisgICAgICAgIEZpeGVkIHRoaXMgb24gUXQuCisKKyAgICAgICAgW1FUXSBHcmFwaGlj c0NvbnRleHQncyBjdXJyZW5QYXRoIGNhbiBiZSB0cmFuc2Zvcm1lZAorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIxNjMKKworICAgICAgICAqIHBsYXRm b3JtL2dyYXBoaWNzL0dyYXBoaWNzQ29udGV4dFByaXZhdGUuaDoKKyAgICAgICAgKiBwbGF0Zm9y bS9ncmFwaGljcy9xdC9HcmFwaGljc0NvbnRleHRRdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpH cmFwaGljc0NvbnRleHQ6OnJlc3RvcmVQbGF0Zm9ybVN0YXRlKToKKyAgICAgICAgKFdlYkNvcmU6 OkdyYXBoaWNzQ29udGV4dDo6ZmlsbFBhdGgpOgorICAgICAgICAoV2ViQ29yZTo6R3JhcGhpY3ND b250ZXh0OjpzdHJva2VQYXRoKToKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzQ29udGV4dDo6 ZmlsbFJlY3QpOgorICAgICAgICAoV2ViQ29yZTo6R3JhcGhpY3NDb250ZXh0Ojp0cmFuc2xhdGUp OgorICAgICAgICAoV2ViQ29yZTo6R3JhcGhpY3NDb250ZXh0Ojpyb3RhdGUpOgorICAgICAgICAo V2ViQ29yZTo6R3JhcGhpY3NDb250ZXh0OjpzY2FsZSk6CisgICAgICAgIChXZWJDb3JlOjpHcmFw aGljc0NvbnRleHQ6OmNvbmNhdENUTSk6CisKIDIwMDgtMTEtMTggIERhbiBCZXJuc3RlaW4gIDxt aXR6QGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBNYXJrIFJvd2UuCkluZGV4OiBX ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzQ29udGV4dFByaXZhdGUuaAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzQ29udGV4dFByaXZhdGUu aAkocmV2aXNpb24gMzg1MTApCisrKyBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNz Q29udGV4dFByaXZhdGUuaAkod29ya2luZyBjb3B5KQpAQCAtMjYsNiArMjYsNyBAQAogI2lmbmRl ZiBHcmFwaGljc0NvbnRleHRQcml2YXRlX2gKICNkZWZpbmUgR3JhcGhpY3NDb250ZXh0UHJpdmF0 ZV9oCiAKKyNpbmNsdWRlICJBZmZpbmVUcmFuc2Zvcm0uaCIKICNpbmNsdWRlICJGb250LmgiCiAj aW5jbHVkZSAiR3JhZGllbnQuaCIKICNpbmNsdWRlICJHcmFwaGljc0NvbnRleHQuaCIKQEAgLTcw LDYgKzcxLDggQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAgICBmbG9hdCBzdHJva2VUaGlj a25lc3M7CiAjaWYgUExBVEZPUk0oQ0FJUk8pCiAgICAgICAgIGZsb2F0IGdsb2JhbEFscGhhOwor I2VsaWYgUExBVEZPUk0oUVQpCisgICAgICAgIEFmZmluZVRyYW5zZm9ybSBwYXRoVHJhbnNmb3Jt OwogI2VuZGlmCiAgICAgICAgIENvbG9yU3BhY2Ugc3Ryb2tlQ29sb3JTcGFjZTsKICAgICAgICAg Q29sb3Igc3Ryb2tlQ29sb3I7CkluZGV4OiBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3F0L0dy YXBoaWNzQ29udGV4dFF0LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL3F0L0dyYXBoaWNzQ29udGV4dFF0LmNwcAkocmV2aXNpb24gMzg1MTApCisrKyBXZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL3F0L0dyYXBoaWNzQ29udGV4dFF0LmNwcAkod29ya2luZyBjb3B5 KQpAQCAtMjkzLDYgKzI5MywxMSBAQCB2b2lkIEdyYXBoaWNzQ29udGV4dDo6c2F2ZVBsYXRmb3Jt U3RhdGUoCiB2b2lkIEdyYXBoaWNzQ29udGV4dDo6cmVzdG9yZVBsYXRmb3JtU3RhdGUoKQogewog ICAgIG1fZGF0YS0+cCgpLT5yZXN0b3JlKCk7CisKKyAgICBpZiAoIW1fZGF0YS0+Y3VycmVudFBh dGguaXNFbXB0eSgpICYmIG1fY29tbW9uLT5zdGF0ZS5wYXRoVHJhbnNmb3JtLmlzSW52ZXJ0aWJs ZSgpKSB7CisgICAgICAgIFFNYXRyaXggbWF0cml4ID0gbV9jb21tb24tPnN0YXRlLnBhdGhUcmFu c2Zvcm07CisgICAgICAgIG1fZGF0YS0+Y3VycmVudFBhdGggPSBtX2RhdGEtPmN1cnJlbnRQYXRo ICogbWF0cml4OworICAgIH0KIH0KIAogLyogRklYTUU6IERJU0FCTEVEIFdISUxFIE1FUkdJTkcg QkFDSyBGUk9NIFVOSVRZCkBAIC01NDQsNiArNTQ5LDcgQEAgdm9pZCBHcmFwaGljc0NvbnRleHQ6 OmZpbGxQYXRoKCkKICAgICAgICAgcC0+ZmlsbFBhdGgocGF0aCwgUUJydXNoKCpncmFkaWVudCkp OwogICAgICAgICBicmVhazsKICAgICB9CisgICAgbV9kYXRhLT5jdXJyZW50UGF0aCA9IFFQYWlu dGVyUGF0aCgpOwogfQogCiB2b2lkIEdyYXBoaWNzQ29udGV4dDo6c3Ryb2tlUGF0aCgpCkBAIC01 NzYsNiArNTgyLDcgQEAgdm9pZCBHcmFwaGljc0NvbnRleHQ6OnN0cm9rZVBhdGgoKQogICAgICAg ICBicmVhazsKICAgICB9CiAgICAgfQorICAgIG1fZGF0YS0+Y3VycmVudFBhdGggPSBRUGFpbnRl clBhdGgoKTsKIH0KIAogdm9pZCBHcmFwaGljc0NvbnRleHQ6OmZpbGxSZWN0KGNvbnN0IEZsb2F0 UmVjdCYgcmVjdCkKQEAgLTU5OSw2ICs2MDYsNyBAQCB2b2lkIEdyYXBoaWNzQ29udGV4dDo6Zmls bFJlY3QoY29uc3QgRmxvCiAgICAgICAgIHAtPmZpbGxSZWN0KHJlY3QsIFFCcnVzaCgqKG1fY29t bW9uLT5zdGF0ZS5maWxsR3JhZGllbnQuZ2V0KCktPnBsYXRmb3JtR3JhZGllbnQoKSkpKTsKICAg ICAgICAgYnJlYWs7CiAgICAgfQorICAgIG1fZGF0YS0+Y3VycmVudFBhdGggPSBRUGFpbnRlclBh dGgoKTsKIH0KIAogdm9pZCBHcmFwaGljc0NvbnRleHQ6OmZpbGxSZWN0KGNvbnN0IEZsb2F0UmVj dCYgcmVjdCwgY29uc3QgQ29sb3ImIGMpCkBAIC05MjAsNiArOTI4LDEyIEBAIHZvaWQgR3JhcGhp Y3NDb250ZXh0Ojp0cmFuc2xhdGUoZmxvYXQgeCwKICAgICAgICAgcmV0dXJuOwogCiAgICAgbV9k YXRhLT5wKCktPnRyYW5zbGF0ZSh4LCB5KTsKKworICAgIGlmICghbV9kYXRhLT5jdXJyZW50UGF0 aC5pc0VtcHR5KCkpIHsKKyAgICAgICAgUU1hdHJpeCBtYXRyaXg7CisgICAgICAgIG1fZGF0YS0+ Y3VycmVudFBhdGggPSBtX2RhdGEtPmN1cnJlbnRQYXRoICogbWF0cml4LnRyYW5zbGF0ZSgteCwg LXkpOworICAgICAgICBtX2NvbW1vbi0+c3RhdGUucGF0aFRyYW5zZm9ybS50cmFuc2xhdGUoeCwg eSk7CisgICAgfQogfQogCiBJbnRQb2ludCBHcmFwaGljc0NvbnRleHQ6Om9yaWdpbigpCkBAIC05 MzYsNiArOTUwLDEyIEBAIHZvaWQgR3JhcGhpY3NDb250ZXh0Ojpyb3RhdGUoZmxvYXQgcmFkaWEK ICAgICAgICAgcmV0dXJuOwogCiAgICAgbV9kYXRhLT5wKCktPnJvdGF0ZSgxODAvTV9QSSpyYWRp YW5zKTsKKworICAgIGlmICghbV9kYXRhLT5jdXJyZW50UGF0aC5pc0VtcHR5KCkpIHsKKyAgICAg ICAgUU1hdHJpeCBtYXRyaXg7CisgICAgICAgIG1fZGF0YS0+Y3VycmVudFBhdGggPSBtX2RhdGEt PmN1cnJlbnRQYXRoICogbWF0cml4LnJvdGF0ZSgtMTgwL01fUEkqcmFkaWFucyk7CisgICAgICAg IG1fY29tbW9uLT5zdGF0ZS5wYXRoVHJhbnNmb3JtLnJvdGF0ZShyYWRpYW5zKTsKKyAgICB9CiB9 CiAKIHZvaWQgR3JhcGhpY3NDb250ZXh0OjpzY2FsZShjb25zdCBGbG9hdFNpemUmIHMpCkBAIC05 NDQsNiArOTY0LDEyIEBAIHZvaWQgR3JhcGhpY3NDb250ZXh0OjpzY2FsZShjb25zdCBGbG9hdFMK ICAgICAgICAgcmV0dXJuOwogCiAgICAgbV9kYXRhLT5wKCktPnNjYWxlKHMud2lkdGgoKSwgcy5o ZWlnaHQoKSk7CisKKyAgICBpZiAoIW1fZGF0YS0+Y3VycmVudFBhdGguaXNFbXB0eSgpKSB7Cisg ICAgICAgIFFNYXRyaXggbWF0cml4OworICAgICAgICBtX2RhdGEtPmN1cnJlbnRQYXRoID0gbV9k YXRhLT5jdXJyZW50UGF0aCAqIG1hdHJpeC5zY2FsZSgxIC8gcy53aWR0aCgpLCAxIC8gcy5oZWln aHQoKSk7CisgICAgICAgIG1fY29tbW9uLT5zdGF0ZS5wYXRoVHJhbnNmb3JtLnNjYWxlKHMud2lk dGgoKSwgcy5oZWlnaHQoKSk7CisgICAgfQogfQogCiB2b2lkIEdyYXBoaWNzQ29udGV4dDo6Y2xp cE91dChjb25zdCBJbnRSZWN0JiByZWN0KQpAQCAtMTAwNyw2ICsxMDMzLDE0IEBAIHZvaWQgR3Jh cGhpY3NDb250ZXh0Ojpjb25jYXRDVE0oY29uc3QgQWYKICAgICAgICAgcmV0dXJuOwogCiAgICAg bV9kYXRhLT5wKCktPnNldE1hdHJpeCh0cmFuc2Zvcm0sIHRydWUpOworCisgICAgLy8gVHJhbnNm b3JtYXRpb25zIHRvIHRoZSBjb250ZXh0IHNob3VsZG4ndCB0cmFuc2Zvcm0gdGhlIGN1cnJlbnRQ YXRoLiAKKyAgICAvLyBXZSBoYXZlIHRvIHVuZG8gZXZlcnkgY2hhbmdlIG1hZGUgdG8gdGhlIGNv bnRleHQgZnJvbSB0aGUgY3VycmVudFBhdGggdG8gYXZvaWQgd3JvbmcgZHJhd2luZ3MuCisgICAg aWYgKCFtX2RhdGEtPmN1cnJlbnRQYXRoLmlzRW1wdHkoKSAmJiB0cmFuc2Zvcm0uaXNJbnZlcnRp YmxlKCkpIHsKKyAgICAgICAgUU1hdHJpeCBtYXRyaXggPSB0cmFuc2Zvcm0uaW52ZXJzZSgpOwor ICAgICAgICBtX2RhdGEtPmN1cnJlbnRQYXRoID0gbV9kYXRhLT5jdXJyZW50UGF0aCAqIG1hdHJp eDsKKyAgICAgICAgbV9jb21tb24tPnN0YXRlLnBhdGhUcmFuc2Zvcm0ubXVsdGlwbHkodHJhbnNm b3JtKTsKKyAgICB9CiB9CiAKIHZvaWQgR3JhcGhpY3NDb250ZXh0OjpzZXRVUkxGb3JSZWN0KGNv bnN0IEtVUkwmIGxpbmssIGNvbnN0IEludFJlY3QmIGRlc3RSZWN0KQo=