6889 2006-01-28 05:12:01 -0800 SVG tetris does not work with WebKit+SVG 2006-01-29 06:40:38 -0800 1 1 1 Unclassified WebKit SVG 420+ Mac OS X 10.4 RESOLVED FIXED http://www.croczilla.com/svg/samples/svgtetris/svgtetris.svg P4 Normal --- 1 eric eric oldest_to_newest 30401 0 eric 2006-01-28 05:12:01 -0800 dynamic viewbox update does not work (breaks SVG tetris) http://www.croczilla.com/svg/samples/svgtetris/svgtetris.svg What's more important than SVG Tetris? 30403 1 6046 eric 2006-01-28 05:27:33 -0800 Created attachment 6046 proposed patch. 30404 2 6047 eric 2006-01-28 05:51:36 -0800 Created attachment 6047 better patch (fixes other invalidation issues) This also fixes the absolute transform reversal which we discovered earlier this week. This was necessary to make tetris actually invalidate the pieces as they drop correctly. 30409 3 6048 eric 2006-01-28 06:39:37 -0800 Created attachment 6048 patch to fix SVG Tetris. Aw hell. I was close enough, I figured I'd just fix the whole darn SVG. There were 3 issues which I fixed here: 1. I fixed dynamic viewport updates (previously they were ignored). 2. I fixed absoluteTransform so that invalidation works (mostly... there still seems to be an issue or two). 3. I fixed MacFrame.mm to pass keydown correctly to nonhtml documents. The only part I can see anyone disagreeing with is #3 (perhaps the code should use documentElement() all the time instead of body()? There is also one small piece of my bug fix for CDF (from earlier this evening) shown in this patch. 30507 4 eric 2006-01-29 06:40:38 -0800 Fixed in r12454. 6046 2006-01-28 05:27:33 -0800 2006-01-28 05:51:36 -0800 proposed patch. viewbox.patch text/plain 994 eric SW5kZXg6IGtzdmcyL3N2Zy9TVkdTVkdFbGVtZW50SW1wbC5jcHAKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0ga3N2 ZzIvc3ZnL1NWR1NWR0VsZW1lbnRJbXBsLmNwcAkocmV2aXNpb24gMTI0MjIpCisrKyBrc3ZnMi9z dmcvU1ZHU1ZHRWxlbWVudEltcGwuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yNjksNyArMjY5LDEw IEBAIHZvaWQgU1ZHU1ZHRWxlbWVudEltcGw6OnBhcnNlTWFwcGVkQXR0cmkKICAgICAgICAgaWYo U1ZHVGVzdHNJbXBsOjpwYXJzZU1hcHBlZEF0dHJpYnV0ZShhdHRyKSkgcmV0dXJuOwogICAgICAg ICBpZihTVkdMYW5nU3BhY2VJbXBsOjpwYXJzZU1hcHBlZEF0dHJpYnV0ZShhdHRyKSkgcmV0dXJu OwogICAgICAgICBpZihTVkdFeHRlcm5hbFJlc291cmNlc1JlcXVpcmVkSW1wbDo6cGFyc2VNYXBw ZWRBdHRyaWJ1dGUoYXR0cikpIHJldHVybjsKLSAgICAgICAgaWYoU1ZHRml0VG9WaWV3Qm94SW1w bDo6cGFyc2VNYXBwZWRBdHRyaWJ1dGUoYXR0cikpIHJldHVybjsKKyAgICAgICAgaWYgKFNWR0Zp dFRvVmlld0JveEltcGw6OnBhcnNlTWFwcGVkQXR0cmlidXRlKGF0dHIpKSB7CisgICAgICAgICAg ICBpZiAocmVuZGVyZXIoKSkKKyAgICAgICAgICAgICAgICBzdGF0aWNfY2FzdDxLQ2FudmFzQ29u dGFpbmVyKj4ocmVuZGVyZXIoKSktPnNldFZpZXdCb3goRmxvYXRSZWN0KHZpZXdCb3goKS0+YmFz ZVZhbCgpLT54KCksIHZpZXdCb3goKS0+YmFzZVZhbCgpLT55KCksIHZpZXdCb3goKS0+YmFzZVZh bCgpLT53aWR0aCgpLCB2aWV3Qm94KCktPmJhc2VWYWwoKS0+aGVpZ2h0KCkpKTsKKyAgICAgICAg fQogICAgICAgICBpZihTVkdab29tQW5kUGFuSW1wbDo6cGFyc2VNYXBwZWRBdHRyaWJ1dGUoYXR0 cikpIHJldHVybjsKIAogICAgICAgICBTVkdTdHlsZWRMb2NhdGFibGVFbGVtZW50SW1wbDo6cGFy c2VNYXBwZWRBdHRyaWJ1dGUoYXR0cik7Cg== 6047 2006-01-28 05:51:36 -0800 2006-01-28 06:39:37 -0800 better patch (fixes other invalidation issues) invalidation.patch text/plain 4098 eric SW5kZXg6IHJlbmRlcmluZy9yZW5kZXJfb2JqZWN0LmNwcAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSByZW5kZXJp bmcvcmVuZGVyX29iamVjdC5jcHAJKHJldmlzaW9uIDEyNDIyKQorKysgcmVuZGVyaW5nL3JlbmRl cl9vYmplY3QuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yNjE2LDcgKzI2MTYsNyBAQCBRTWF0cml4 IFJlbmRlck9iamVjdDo6bG9jYWxUcmFuc2Zvcm0oKSBjCiBRTWF0cml4IFJlbmRlck9iamVjdDo6 YWJzb2x1dGVUcmFuc2Zvcm0oKSBjb25zdAogewogICAgIGlmIChwYXJlbnQoKSkKLSAgICAgICAg cmV0dXJuIHBhcmVudCgpLT5hYnNvbHV0ZVRyYW5zZm9ybSgpICogbG9jYWxUcmFuc2Zvcm0oKTsK KyAgICAgICAgcmV0dXJuIGxvY2FsVHJhbnNmb3JtKCkgKiBwYXJlbnQoKS0+YWJzb2x1dGVUcmFu c2Zvcm0oKTsKICAgICByZXR1cm4gbG9jYWxUcmFuc2Zvcm0oKTsKIH0KIApJbmRleDoga2NhbnZh cy9kZXZpY2UvcXVhcnR6L0tDYW52YXNSZXNvdXJjZXNRdWFydHoubW0KPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g a2NhbnZhcy9kZXZpY2UvcXVhcnR6L0tDYW52YXNSZXNvdXJjZXNRdWFydHoubW0JKHJldmlzaW9u IDEyNDIyKQorKysga2NhbnZhcy9kZXZpY2UvcXVhcnR6L0tDYW52YXNSZXNvdXJjZXNRdWFydHou bW0JKHdvcmtpbmcgY29weSkKQEAgLTEyNSwxMiArMTI1LDggQEAgdm9pZCBLQ2FudmFzQ29udGFp bmVyUXVhcnR6OjpwYWludChQYWludAogICAgIGlmIChmaWx0ZXIpCiAgICAgICAgIGZpbHRlci0+ cHJlcGFyZUZpbHRlcihyZWxhdGl2ZUJCb3godHJ1ZSkpOwogICAgIAotICAgIGlmICghdmlld0Jv eCgpLmlzTnVsbCgpKSB7Ci0gICAgICAgIEZsb2F0UmVjdCB2aWV3cG9ydFJlY3QgPSB2aWV3cG9y dCgpOwotICAgICAgICBpZiAoIXBhcmVudCgpLT5pc0tDYW52YXNDb250YWluZXIoKSkKLSAgICAg ICAgICAgIHZpZXdwb3J0UmVjdCA9IEZsb2F0UmVjdCh2aWV3cG9ydCgpLngoKSwgdmlld3BvcnQo KS55KCksIHdpZHRoKCksIGhlaWdodCgpKTsKLSAgICAgICAgZGV2aWNlQ29udGV4dC0+Y29uY2F0 Q1RNKGdldEFzcGVjdFJhdGlvKHZpZXdCb3goKSwgdmlld3BvcnRSZWN0KSk7Ci0gICAgfQorICAg IGlmICghdmlld0JveCgpLmlzTnVsbCgpKQorICAgICAgICBkZXZpY2VDb250ZXh0LT5jb25jYXRD VE0odmlld3BvcnRUcmFuc2Zvcm0oKSk7CiAgICAgCiAgICAgUmVuZGVyQ29udGFpbmVyOjpwYWlu dChwYWludEluZm8sIDAsIDApOwogICAgIApAQCAtMTc4LDE2ICsxNzQsMjAgQEAgS0NBbGlnbiBL Q2FudmFzQ29udGFpbmVyUXVhcnR6OjphbGlnbigpIAogICAgIHJldHVybiBtX2FsaWduOwogfQog Ci1RTWF0cml4IEtDYW52YXNDb250YWluZXJRdWFydHo6OmFic29sdXRlVHJhbnNmb3JtKCkgY29u c3QKK1FNYXRyaXggS0NhbnZhc0NvbnRhaW5lclF1YXJ0ejo6dmlld3BvcnRUcmFuc2Zvcm0oKSBj b25zdAogewotICAgIFFNYXRyaXggdHJhbnNmb3JtID0gS0NhbnZhc0NvbnRhaW5lcjo6YWJzb2x1 dGVUcmFuc2Zvcm0oKTsKICAgICBpZiAoIXZpZXdCb3goKS5pc051bGwoKSkgewogICAgICAgICBG bG9hdFJlY3Qgdmlld3BvcnRSZWN0ID0gdmlld3BvcnQoKTsKICAgICAgICAgaWYgKCFwYXJlbnQo KS0+aXNLQ2FudmFzQ29udGFpbmVyKCkpCiAgICAgICAgICAgICB2aWV3cG9ydFJlY3QgPSBGbG9h dFJlY3Qodmlld3BvcnQoKS54KCksIHZpZXdwb3J0KCkueSgpLCB3aWR0aCgpLCBoZWlnaHQoKSk7 Ci0gICAgICAgIHRyYW5zZm9ybSAqPSBnZXRBc3BlY3RSYXRpbyh2aWV3Qm94KCksIHZpZXdwb3J0 UmVjdCkucW1hdHJpeCgpOworICAgICAgICByZXR1cm4gZ2V0QXNwZWN0UmF0aW8odmlld0JveCgp LCB2aWV3cG9ydFJlY3QpLnFtYXRyaXgoKTsKICAgICB9Ci0gICAgcmV0dXJuIHRyYW5zZm9ybTsK KyAgICByZXR1cm4gUU1hdHJpeCgpOworfQorCitRTWF0cml4IEtDYW52YXNDb250YWluZXJRdWFy dHo6OmFic29sdXRlVHJhbnNmb3JtKCkgY29uc3QKK3sKKyAgICByZXR1cm4gdmlld3BvcnRUcmFu c2Zvcm0oKSAqIEtDYW52YXNDb250YWluZXI6OmFic29sdXRlVHJhbnNmb3JtKCk7CiB9CiAKIHZv aWQgS0NhbnZhc0NsaXBwZXJRdWFydHo6OmFwcGx5Q2xpcChjb25zdCBGbG9hdFJlY3QmIGJvdW5k aW5nQm94KSBjb25zdApJbmRleDoga2NhbnZhcy9kZXZpY2UvcXVhcnR6L0tDYW52YXNSZXNvdXJj ZXNRdWFydHouaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBrY2FudmFzL2RldmljZS9xdWFydHovS0NhbnZhc1Jl c291cmNlc1F1YXJ0ei5oCShyZXZpc2lvbiAxMjQyMikKKysrIGtjYW52YXMvZGV2aWNlL3F1YXJ0 ei9LQ2FudmFzUmVzb3VyY2VzUXVhcnR6LmgJKHdvcmtpbmcgY29weSkKQEAgLTM5LDYgKzM5LDgg QEAgcHVibGljOgogICAgIAogICAgIHZpcnR1YWwgYm9vbCByZXF1aXJlc0xheWVyKCkgeyByZXR1 cm4gZmFsc2U7IH0KICAgICB2aXJ0dWFsIHZvaWQgY2FsY01pbk1heFdpZHRoKCk7CisgICAgdmly dHVhbCBzaG9ydCBsaW5lSGVpZ2h0KGJvb2wgYiwgYm9vbCBpc1Jvb3RMaW5lQm94PWZhbHNlKSBj b25zdCB7IHJldHVybiBoZWlnaHQoKTsgfQorICAgIHZpcnR1YWwgc2hvcnQgYmFzZWxpbmVQb3Np dGlvbihib29sIGIsIGJvb2wgaXNSb290TGluZUJveD1mYWxzZSkgY29uc3QgeyByZXR1cm4gaGVp Z2h0KCk7IH0KICAgICB2aXJ0dWFsIHZvaWQgbGF5b3V0KCk7CiAgICAgdmlydHVhbCB2b2lkIHBh aW50KFBhaW50SW5mbyAmcGFpbnRJbmZvLCBpbnQgcGFyZW50WCwgaW50IHBhcmVudFkpOwogICAg IApAQCAtNTUsNiArNTcsOCBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCBLQ0FsaWduIGFsaWduKCkg Y29uc3Q7CiAgICAgCiBwcml2YXRlOgorICAgIFFNYXRyaXggdmlld3BvcnRUcmFuc2Zvcm0oKSBj b25zdDsKKwogICAgIEZsb2F0UmVjdCBtX3ZpZXdwb3J0OwogICAgIEZsb2F0UmVjdCBtX3ZpZXdC b3g7CiAgICAgS0NBbGlnbiBtX2FsaWduOwpJbmRleDoga3N2ZzIvc3ZnL1NWR1NWR0VsZW1lbnRJ bXBsLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBrc3ZnMi9zdmcvU1ZHU1ZHRWxlbWVudEltcGwuY3BwCShy ZXZpc2lvbiAxMjQyMikKKysrIGtzdmcyL3N2Zy9TVkdTVkdFbGVtZW50SW1wbC5jcHAJKHdvcmtp bmcgY29weSkKQEAgLTI2OSw3ICsyNjksMTAgQEAgdm9pZCBTVkdTVkdFbGVtZW50SW1wbDo6cGFy c2VNYXBwZWRBdHRyaQogICAgICAgICBpZihTVkdUZXN0c0ltcGw6OnBhcnNlTWFwcGVkQXR0cmli dXRlKGF0dHIpKSByZXR1cm47CiAgICAgICAgIGlmKFNWR0xhbmdTcGFjZUltcGw6OnBhcnNlTWFw cGVkQXR0cmlidXRlKGF0dHIpKSByZXR1cm47CiAgICAgICAgIGlmKFNWR0V4dGVybmFsUmVzb3Vy Y2VzUmVxdWlyZWRJbXBsOjpwYXJzZU1hcHBlZEF0dHJpYnV0ZShhdHRyKSkgcmV0dXJuOwotICAg ICAgICBpZihTVkdGaXRUb1ZpZXdCb3hJbXBsOjpwYXJzZU1hcHBlZEF0dHJpYnV0ZShhdHRyKSkg cmV0dXJuOworICAgICAgICBpZiAoU1ZHRml0VG9WaWV3Qm94SW1wbDo6cGFyc2VNYXBwZWRBdHRy aWJ1dGUoYXR0cikpIHsKKyAgICAgICAgICAgIGlmIChyZW5kZXJlcigpKQorICAgICAgICAgICAg ICAgIHN0YXRpY19jYXN0PEtDYW52YXNDb250YWluZXIqPihyZW5kZXJlcigpKS0+c2V0Vmlld0Jv eChGbG9hdFJlY3Qodmlld0JveCgpLT5iYXNlVmFsKCktPngoKSwgdmlld0JveCgpLT5iYXNlVmFs KCktPnkoKSwgdmlld0JveCgpLT5iYXNlVmFsKCktPndpZHRoKCksIHZpZXdCb3goKS0+YmFzZVZh bCgpLT5oZWlnaHQoKSkpOworICAgICAgICB9CiAgICAgICAgIGlmKFNWR1pvb21BbmRQYW5JbXBs OjpwYXJzZU1hcHBlZEF0dHJpYnV0ZShhdHRyKSkgcmV0dXJuOwogCiAgICAgICAgIFNWR1N0eWxl ZExvY2F0YWJsZUVsZW1lbnRJbXBsOjpwYXJzZU1hcHBlZEF0dHJpYnV0ZShhdHRyKTsK 6048 2006-01-28 06:39:37 -0800 2006-01-28 15:21:40 -0800 patch to fix SVG Tetris. invalidation.patch text/plain 4698 eric SW5kZXg6IHJlbmRlcmluZy9yZW5kZXJfb2JqZWN0LmNwcAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSByZW5kZXJp bmcvcmVuZGVyX29iamVjdC5jcHAJKHJldmlzaW9uIDEyNDIyKQorKysgcmVuZGVyaW5nL3JlbmRl cl9vYmplY3QuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yNjE2LDcgKzI2MTYsNyBAQCBRTWF0cml4 IFJlbmRlck9iamVjdDo6bG9jYWxUcmFuc2Zvcm0oKSBjCiBRTWF0cml4IFJlbmRlck9iamVjdDo6 YWJzb2x1dGVUcmFuc2Zvcm0oKSBjb25zdAogewogICAgIGlmIChwYXJlbnQoKSkKLSAgICAgICAg cmV0dXJuIHBhcmVudCgpLT5hYnNvbHV0ZVRyYW5zZm9ybSgpICogbG9jYWxUcmFuc2Zvcm0oKTsK KyAgICAgICAgcmV0dXJuIGxvY2FsVHJhbnNmb3JtKCkgKiBwYXJlbnQoKS0+YWJzb2x1dGVUcmFu c2Zvcm0oKTsKICAgICByZXR1cm4gbG9jYWxUcmFuc2Zvcm0oKTsKIH0KIApJbmRleDoga2NhbnZh cy9kZXZpY2UvcXVhcnR6L0tDYW52YXNSZXNvdXJjZXNRdWFydHoubW0KPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g a2NhbnZhcy9kZXZpY2UvcXVhcnR6L0tDYW52YXNSZXNvdXJjZXNRdWFydHoubW0JKHJldmlzaW9u IDEyNDIyKQorKysga2NhbnZhcy9kZXZpY2UvcXVhcnR6L0tDYW52YXNSZXNvdXJjZXNRdWFydHou bW0JKHdvcmtpbmcgY29weSkKQEAgLTEyNSwxMiArMTI1LDggQEAgdm9pZCBLQ2FudmFzQ29udGFp bmVyUXVhcnR6OjpwYWludChQYWludAogICAgIGlmIChmaWx0ZXIpCiAgICAgICAgIGZpbHRlci0+ cHJlcGFyZUZpbHRlcihyZWxhdGl2ZUJCb3godHJ1ZSkpOwogICAgIAotICAgIGlmICghdmlld0Jv eCgpLmlzTnVsbCgpKSB7Ci0gICAgICAgIEZsb2F0UmVjdCB2aWV3cG9ydFJlY3QgPSB2aWV3cG9y dCgpOwotICAgICAgICBpZiAoIXBhcmVudCgpLT5pc0tDYW52YXNDb250YWluZXIoKSkKLSAgICAg ICAgICAgIHZpZXdwb3J0UmVjdCA9IEZsb2F0UmVjdCh2aWV3cG9ydCgpLngoKSwgdmlld3BvcnQo KS55KCksIHdpZHRoKCksIGhlaWdodCgpKTsKLSAgICAgICAgZGV2aWNlQ29udGV4dC0+Y29uY2F0 Q1RNKGdldEFzcGVjdFJhdGlvKHZpZXdCb3goKSwgdmlld3BvcnRSZWN0KSk7Ci0gICAgfQorICAg IGlmICghdmlld0JveCgpLmlzTnVsbCgpKQorICAgICAgICBkZXZpY2VDb250ZXh0LT5jb25jYXRD VE0odmlld3BvcnRUcmFuc2Zvcm0oKSk7CiAgICAgCiAgICAgUmVuZGVyQ29udGFpbmVyOjpwYWlu dChwYWludEluZm8sIDAsIDApOwogICAgIApAQCAtMTc4LDE2ICsxNzQsMjAgQEAgS0NBbGlnbiBL Q2FudmFzQ29udGFpbmVyUXVhcnR6OjphbGlnbigpIAogICAgIHJldHVybiBtX2FsaWduOwogfQog Ci1RTWF0cml4IEtDYW52YXNDb250YWluZXJRdWFydHo6OmFic29sdXRlVHJhbnNmb3JtKCkgY29u c3QKK1FNYXRyaXggS0NhbnZhc0NvbnRhaW5lclF1YXJ0ejo6dmlld3BvcnRUcmFuc2Zvcm0oKSBj b25zdAogewotICAgIFFNYXRyaXggdHJhbnNmb3JtID0gS0NhbnZhc0NvbnRhaW5lcjo6YWJzb2x1 dGVUcmFuc2Zvcm0oKTsKICAgICBpZiAoIXZpZXdCb3goKS5pc051bGwoKSkgewogICAgICAgICBG bG9hdFJlY3Qgdmlld3BvcnRSZWN0ID0gdmlld3BvcnQoKTsKICAgICAgICAgaWYgKCFwYXJlbnQo KS0+aXNLQ2FudmFzQ29udGFpbmVyKCkpCiAgICAgICAgICAgICB2aWV3cG9ydFJlY3QgPSBGbG9h dFJlY3Qodmlld3BvcnQoKS54KCksIHZpZXdwb3J0KCkueSgpLCB3aWR0aCgpLCBoZWlnaHQoKSk7 Ci0gICAgICAgIHRyYW5zZm9ybSAqPSBnZXRBc3BlY3RSYXRpbyh2aWV3Qm94KCksIHZpZXdwb3J0 UmVjdCkucW1hdHJpeCgpOworICAgICAgICByZXR1cm4gZ2V0QXNwZWN0UmF0aW8odmlld0JveCgp LCB2aWV3cG9ydFJlY3QpLnFtYXRyaXgoKTsKICAgICB9Ci0gICAgcmV0dXJuIHRyYW5zZm9ybTsK KyAgICByZXR1cm4gUU1hdHJpeCgpOworfQorCitRTWF0cml4IEtDYW52YXNDb250YWluZXJRdWFy dHo6OmFic29sdXRlVHJhbnNmb3JtKCkgY29uc3QKK3sKKyAgICByZXR1cm4gdmlld3BvcnRUcmFu c2Zvcm0oKSAqIEtDYW52YXNDb250YWluZXI6OmFic29sdXRlVHJhbnNmb3JtKCk7CiB9CiAKIHZv aWQgS0NhbnZhc0NsaXBwZXJRdWFydHo6OmFwcGx5Q2xpcChjb25zdCBGbG9hdFJlY3QmIGJvdW5k aW5nQm94KSBjb25zdApJbmRleDoga2NhbnZhcy9kZXZpY2UvcXVhcnR6L0tDYW52YXNSZXNvdXJj ZXNRdWFydHouaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBrY2FudmFzL2RldmljZS9xdWFydHovS0NhbnZhc1Jl c291cmNlc1F1YXJ0ei5oCShyZXZpc2lvbiAxMjQyMikKKysrIGtjYW52YXMvZGV2aWNlL3F1YXJ0 ei9LQ2FudmFzUmVzb3VyY2VzUXVhcnR6LmgJKHdvcmtpbmcgY29weSkKQEAgLTM5LDYgKzM5LDgg QEAgcHVibGljOgogICAgIAogICAgIHZpcnR1YWwgYm9vbCByZXF1aXJlc0xheWVyKCkgeyByZXR1 cm4gZmFsc2U7IH0KICAgICB2aXJ0dWFsIHZvaWQgY2FsY01pbk1heFdpZHRoKCk7CisgICAgdmly dHVhbCBzaG9ydCBsaW5lSGVpZ2h0KGJvb2wgYiwgYm9vbCBpc1Jvb3RMaW5lQm94PWZhbHNlKSBj b25zdCB7IHJldHVybiBoZWlnaHQoKTsgfQorICAgIHZpcnR1YWwgc2hvcnQgYmFzZWxpbmVQb3Np dGlvbihib29sIGIsIGJvb2wgaXNSb290TGluZUJveD1mYWxzZSkgY29uc3QgeyByZXR1cm4gaGVp Z2h0KCk7IH0KICAgICB2aXJ0dWFsIHZvaWQgbGF5b3V0KCk7CiAgICAgdmlydHVhbCB2b2lkIHBh aW50KFBhaW50SW5mbyAmcGFpbnRJbmZvLCBpbnQgcGFyZW50WCwgaW50IHBhcmVudFkpOwogICAg IApAQCAtNTUsNiArNTcsOCBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCBLQ0FsaWduIGFsaWduKCkg Y29uc3Q7CiAgICAgCiBwcml2YXRlOgorICAgIFFNYXRyaXggdmlld3BvcnRUcmFuc2Zvcm0oKSBj b25zdDsKKwogICAgIEZsb2F0UmVjdCBtX3ZpZXdwb3J0OwogICAgIEZsb2F0UmVjdCBtX3ZpZXdC b3g7CiAgICAgS0NBbGlnbiBtX2FsaWduOwpJbmRleDogYnJpZGdlL21hYy9NYWNGcmFtZS5tbQo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBicmlkZ2UvbWFjL01hY0ZyYW1lLm1tCShyZXZpc2lvbiAxMjQyMikKKysr IGJyaWRnZS9tYWMvTWFjRnJhbWUubW0JKHdvcmtpbmcgY29weSkKQEAgLTE0NDcsMTAgKzE0NDcs MTIgQEAgYm9vbCBNYWNGcmFtZTo6a2V5RXZlbnQoTlNFdmVudCAqZXZlbnQpCiAgICAgfQogICAg IE5vZGVJbXBsICpub2RlID0gZG9jLT5mb2N1c05vZGUoKTsKICAgICBpZiAoIW5vZGUpIHsKLSAg ICAgICAgbm9kZSA9IGRvYy0+Ym9keSgpOwotICAgICAgICBpZiAoIW5vZGUpIHsKKyAgICAgICAg aWYgKGRvYy0+aXNIVE1MRG9jdW1lbnQoKSkKKyAgICAgICAgICAgIG5vZGUgPSBkb2MtPmJvZHko KTsKKyAgICAgICAgZWxzZQorICAgICAgICAgICAgbm9kZSA9IGRvYy0+ZG9jdW1lbnRFbGVtZW50 KCk7CisgICAgICAgIGlmICghbm9kZSkKICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKLSAgICAg ICAgfQogICAgIH0KICAgICAKICAgICBpZiAoW2V2ZW50IHR5cGVdID09IE5TS2V5RG93bikgewpJ bmRleDoga3N2ZzIvc3ZnL1NWR1NWR0VsZW1lbnRJbXBsLmNwcAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBrc3Zn Mi9zdmcvU1ZHU1ZHRWxlbWVudEltcGwuY3BwCShyZXZpc2lvbiAxMjQyMikKKysrIGtzdmcyL3N2 Zy9TVkdTVkdFbGVtZW50SW1wbC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTI2OSw3ICsyNjksMTAg QEAgdm9pZCBTVkdTVkdFbGVtZW50SW1wbDo6cGFyc2VNYXBwZWRBdHRyaQogICAgICAgICBpZihT VkdUZXN0c0ltcGw6OnBhcnNlTWFwcGVkQXR0cmlidXRlKGF0dHIpKSByZXR1cm47CiAgICAgICAg IGlmKFNWR0xhbmdTcGFjZUltcGw6OnBhcnNlTWFwcGVkQXR0cmlidXRlKGF0dHIpKSByZXR1cm47 CiAgICAgICAgIGlmKFNWR0V4dGVybmFsUmVzb3VyY2VzUmVxdWlyZWRJbXBsOjpwYXJzZU1hcHBl ZEF0dHJpYnV0ZShhdHRyKSkgcmV0dXJuOwotICAgICAgICBpZihTVkdGaXRUb1ZpZXdCb3hJbXBs OjpwYXJzZU1hcHBlZEF0dHJpYnV0ZShhdHRyKSkgcmV0dXJuOworICAgICAgICBpZiAoU1ZHRml0 VG9WaWV3Qm94SW1wbDo6cGFyc2VNYXBwZWRBdHRyaWJ1dGUoYXR0cikpIHsKKyAgICAgICAgICAg IGlmIChyZW5kZXJlcigpKQorICAgICAgICAgICAgICAgIHN0YXRpY19jYXN0PEtDYW52YXNDb250 YWluZXIqPihyZW5kZXJlcigpKS0+c2V0Vmlld0JveChGbG9hdFJlY3Qodmlld0JveCgpLT5iYXNl VmFsKCktPngoKSwgdmlld0JveCgpLT5iYXNlVmFsKCktPnkoKSwgdmlld0JveCgpLT5iYXNlVmFs KCktPndpZHRoKCksIHZpZXdCb3goKS0+YmFzZVZhbCgpLT5oZWlnaHQoKSkpOworICAgICAgICB9 CiAgICAgICAgIGlmKFNWR1pvb21BbmRQYW5JbXBsOjpwYXJzZU1hcHBlZEF0dHJpYnV0ZShhdHRy KSkgcmV0dXJuOwogCiAgICAgICAgIFNWR1N0eWxlZExvY2F0YWJsZUVsZW1lbnRJbXBsOjpwYXJz ZU1hcHBlZEF0dHJpYnV0ZShhdHRyKTsK