8851 2006-05-11 09:28:56 -0700 REGRESSION: RTL text shifted to the right 2006-05-11 16:20:21 -0700 1 1 1 Unclassified WebKit Layout and Rendering 420+ Mac OS X 10.4 RESOLVED FIXED Regression P1 Normal --- 1 mitz webkit-unassigned hyatt oldest_to_newest 42003 0 mitz 2006-05-11 09:28:56 -0700 In fast/text/in-rendered-text-rtl.html, the space after the first two words is too big (that test fails for a different reason). 42004 1 8240 mitz 2006-05-11 09:29:51 -0700 Created attachment 8240 Patch 42005 2 8240 mitz 2006-05-11 09:44:30 -0700 Comment on attachment 8240 Patch This made things even worse for highlighting and hit testing. 42036 3 mitz 2006-05-11 12:25:19 -0700 You can't infer the TextRun's length from the StringImpl's length (and the offset). I think I'll add an optional length parameter to the TextRun constructor. 42053 4 8254 mitz 2006-05-11 16:06:48 -0700 Created attachment 8254 Add length to the TextRun constructor 42054 5 8254 hyatt 2006-05-11 16:18:51 -0700 Comment on attachment 8254 Add length to the TextRun constructor r=me 42055 6 hyatt 2006-05-11 16:20:21 -0700 Fixed 8240 2006-05-11 09:29:51 -0700 2006-05-11 09:44:30 -0700 Patch 8851_r0.patch text/plain 626 mitz SW5kZXg6IFdlYkNvcmUvcGxhdGZvcm0vRm9udC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGxh dGZvcm0vRm9udC5oCShyZXZpc2lvbiAxNDI5NykKKysrIFdlYkNvcmUvcGxhdGZvcm0vRm9udC5o CSh3b3JraW5nIGNvcHkpCkBAIC01OSw3ICs1OSwxMCBAQCBwdWJsaWM6CiAKICAgICBUZXh0UnVu KGNvbnN0IFN0cmluZ0ltcGwqIHMsIGludCBvZmZzZXQgPSAwLCBpbnQgZnJvbSA9IC0xLCBpbnQg dG8gPSAtMSkKICAgICA6bV9jaGFyYWN0ZXJzKHMtPmNoYXJhY3RlcnMoKSArIG9mZnNldCksIG1f bGVuKHMtPmxlbmd0aCgpIC0gb2Zmc2V0KSwgbV9mcm9tKGFkanVzdEZyb20oZnJvbSkpLCBtX3Rv KGFkanVzdFRvKHRvKSkKLSAgICB7fQorICAgIHsKKyAgICAgICAgaWYgKG1fdG8gPCBtX2xlbikK KyAgICAgICAgICAgIG1fbGVuID0gbV90bzsKKyAgICB9CiAKICAgICBjb25zdCBVQ2hhciBvcGVy YXRvcltdKGludCBpKSBjb25zdCB7IHJldHVybiBtX2NoYXJhY3RlcnNbaV07IH0KICAgICBjb25z dCBVQ2hhciogZGF0YShpbnQgaSkgY29uc3QgeyByZXR1cm4gJm1fY2hhcmFjdGVyc1tpXTsgfQo= 8254 2006-05-11 16:06:48 -0700 2006-05-11 16:18:51 -0700 Add length to the TextRun constructor 8851_r1.patch text/plain 9719 mitz SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiAxNDMxMikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjcgQEAKKzIwMDYtMDUtIyMgIE1pdHogUGV0dGVsICA8b3BlbmRhcndpbi5vcmdA bWl0enBldHRlbC5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgLSBmaXggaHR0cDovL2J1Z3ppbGxhLm9wZW5kYXJ3aW4ub3JnL3Nob3dfYnVnLmNn aT9pZD04ODUxCisgICAgICAgICAgUkVHUkVTU0lPTjogUlRMIHRleHQgc2hpZnRlZCB0byB0aGUg cmlnaHQKKworICAgICAgICBBbHJlYWR5IGNvdmVyZWQgYnkgc2V2ZXJhbCB0ZXN0cyBpbiBmYXN0 L3RleHQKKworICAgICAgICAqIHBsYXRmb3JtL0ZvbnQuaDoKKyAgICAgICAgKFdlYkNvcmU6OlRl eHRSdW46OlRleHRSdW4pOiBBZGRlZCBsZW5ndGggcGFyYW1ldGVyLgorICAgICAgICAqIHJlbmRl cmluZy9JbmxpbmVUZXh0Qm94LmNwcDogUGFzcyB0aGUgbGVuZ3RoIHRvIHRoZSBUZXh0UnVuIGNv bnN0cnVjdG9yLgorICAgICAgICAoV2ViQ29yZTo6SW5saW5lVGV4dEJveDo6c2VsZWN0aW9uUmVj dCk6CisgICAgICAgIChXZWJDb3JlOjpJbmxpbmVUZXh0Qm94OjpwYWludCk6CisgICAgICAgIChX ZWJDb3JlOjpJbmxpbmVUZXh0Qm94OjpwYWludFNlbGVjdGlvbik6CisgICAgICAgIChXZWJDb3Jl OjpJbmxpbmVUZXh0Qm94OjpwYWludE1hcmtlZFRleHRCYWNrZ3JvdW5kKToKKyAgICAgICAgKFdl YkNvcmU6OklubGluZVRleHRCb3g6OnBhaW50VGV4dE1hdGNoTWFya2VyKToKKyAgICAgICAgKFdl YkNvcmU6OklubGluZVRleHRCb3g6Om9mZnNldEZvclBvc2l0aW9uKToKKyAgICAgICAgKFdlYkNv cmU6OklubGluZVRleHRCb3g6OnBvc2l0aW9uRm9yT2Zmc2V0KToKKyAgICAgICAgKiByZW5kZXJp bmcvUmVuZGVyVGV4dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUZXh0Ojp3aWR0aEZy b21DYWNoZSk6IFBhc3MgbGVuZ3RoIGFuZCBmcm9tIGluc3RlYWQgb2YgZnJvbSBhbmQgdG8KKyAg ICAgICAgdG8gdGhlIFRleHRSdW4gY29uc3RydWN0b3IuCisgICAgICAgIChXZWJDb3JlOjpSZW5k ZXJUZXh0Ojp3aWR0aCk6IERpdHRvLgorCiAyMDA2LTA1LTExICBEYXZpZCBIeWF0dCAgPGh5YXR0 QGFwcGxlLmNvbT4KIAogICAgICAgICBGaXggYSByZWdyZXNzaW9uIGZyb20gdGhlIFRleHRSdW4g bGFuZGluZy4gIERlbGV0ZSB0aGUgY2hhcmFjdGVycyBpbgpJbmRleDogV2ViQ29yZS9wbGF0Zm9y bS9Gb250LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wbGF0Zm9ybS9Gb250LmgJKHJldmlzaW9u IDE0MzExKQorKysgV2ViQ29yZS9wbGF0Zm9ybS9Gb250LmgJKHdvcmtpbmcgY29weSkKQEAgLTU4 LDggKzU4LDggQEAgcHVibGljOgogICAgIDptX2NoYXJhY3RlcnMoYyksIG1fbGVuKGxlbiksIG1f ZnJvbShmcm9tKSwgbV90byh0bykKICAgICB7fQogCi0gICAgVGV4dFJ1bihjb25zdCBTdHJpbmdJ bXBsKiBzLCBpbnQgb2Zmc2V0ID0gMCwgaW50IGZyb20gPSAtMSwgaW50IHRvID0gLTEpCi0gICAg Om1fY2hhcmFjdGVycyhzLT5jaGFyYWN0ZXJzKCkgKyBvZmZzZXQpLCBtX2xlbihzLT5sZW5ndGgo KSAtIG9mZnNldCksIG1fZnJvbShhZGp1c3RGcm9tKGZyb20pKSwgbV90byhhZGp1c3RUbyh0bykp CisgICAgVGV4dFJ1bihjb25zdCBTdHJpbmdJbXBsKiBzLCBpbnQgb2Zmc2V0ID0gMCwgaW50IGxl bmd0aCA9IC0xLCBpbnQgZnJvbSA9IC0xLCBpbnQgdG8gPSAtMSkKKyAgICA6bV9jaGFyYWN0ZXJz KHMtPmNoYXJhY3RlcnMoKSArIG9mZnNldCksIG1fbGVuKGxlbmd0aCA9PSAtMSA/IHMtPmxlbmd0 aCgpIC0gb2Zmc2V0IDogbGVuZ3RoKSwgbV9mcm9tKGFkanVzdEZyb20oZnJvbSkpLCBtX3RvKGFk anVzdFRvKHRvKSkKICAgICB7fQogCiAgICAgY29uc3QgVUNoYXIgb3BlcmF0b3JbXShpbnQgaSkg Y29uc3QgeyByZXR1cm4gbV9jaGFyYWN0ZXJzW2ldOyB9CkluZGV4OiBXZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJUZXh0LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJU ZXh0LmNwcAkocmV2aXNpb24gMTQzMTEpCisrKyBXZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUZXh0 LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDg2LDcgKzQ4Niw3IEBAIEFMV0FZU19JTkxJTkUgaW50 IFJlbmRlclRleHQ6OndpZHRoRnJvbUMKICAgICAgICAgcmV0dXJuIHc7CiAgICAgfQogICAgIAot ICAgIHJldHVybiBmLT53aWR0aChUZXh0UnVuKHN0cmluZygpLCBzdGFydCwgMCwgbGVuKSwgdGFi V2lkdGgsIHhwb3MpOworICAgIHJldHVybiBmLT53aWR0aChUZXh0UnVuKHN0cmluZygpLCBzdGFy dCwgbGVuLCAwKSwgdGFiV2lkdGgsIHhwb3MpOwogfQogCiB2b2lkIFJlbmRlclRleHQ6OnRyaW1t ZWRNaW5NYXhXaWR0aChpbnQgbGVhZFdpZHRoLApAQCAtOTk1LDcgKzk5NSw3IEBAIHVuc2lnbmVk IGludCBSZW5kZXJUZXh0Ojp3aWR0aCh1bnNpZ25lZCAKICAgICBlbHNlIGlmIChmID09ICZzdHls ZSgpLT5mb250KCkpCiAgICAgICAgIHcgPSB3aWR0aEZyb21DYWNoZShmLCBmcm9tLCBsZW4sIHRh YldpZHRoKCksIHhwb3MpOwogICAgIGVsc2UKLSAgICAgICAgdyA9IGYtPndpZHRoKFRleHRSdW4o c3RyaW5nKCksIGZyb20sIDAsIGxlbiksIHRhYldpZHRoKCksIHhwb3MgKTsKKyAgICAgICAgdyA9 IGYtPndpZHRoKFRleHRSdW4oc3RyaW5nKCksIGZyb20sIGxlbiwgMCksIHRhYldpZHRoKCksIHhw b3MgKTsKICAgICAgICAgCiAgICAgcmV0dXJuIHc7CiB9CkluZGV4OiBXZWJDb3JlL3JlbmRlcmlu Zy9JbmxpbmVUZXh0Qm94LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3JlbmRlcmluZy9Jbmxp bmVUZXh0Qm94LmNwcAkocmV2aXNpb24gMTQzMTEpCisrKyBXZWJDb3JlL3JlbmRlcmluZy9Jbmxp bmVUZXh0Qm94LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTE3LDcgKzExNyw3IEBAIEludFJlY3Qg SW5saW5lVGV4dEJveDo6c2VsZWN0aW9uUmVjdChpbnQKICAgICBpbnQgc2VsSGVpZ2h0ID0gcm9v dEJveC0+c2VsZWN0aW9uSGVpZ2h0KCk7CiAgICAgY29uc3QgRm9udCAqZiA9IHRleHRPYmotPmZv bnQobV9maXJzdExpbmUpOwogCi0gICAgSW50UmVjdCByID0gZW5jbG9zaW5nSW50UmVjdChmLT5z ZWxlY3Rpb25SZWN0Rm9yVGV4dChUZXh0UnVuKHRleHRPYmotPnN0cmluZygpLCBtX3N0YXJ0LCBz UG9zLCBlUG9zKSwKKyAgICBJbnRSZWN0IHIgPSBlbmNsb3NpbmdJbnRSZWN0KGYtPnNlbGVjdGlv blJlY3RGb3JUZXh0KFRleHRSdW4odGV4dE9iai0+c3RyaW5nKCksIG1fc3RhcnQsIG1fbGVuLCBz UG9zLCBlUG9zKSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBJbnRQ b2ludCh0eCArIG1feCwgdHkgKyBzZWxUb3ApLCBzZWxIZWlnaHQsIHRleHRPYmotPnRhYldpZHRo KCksIHRleHRQb3MoKSwgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg bV90b0FkZCwgbV9yZXZlcnNlZCwgbV9kaXJPdmVycmlkZSkpOwogICAgIGlmIChyLngoKSA+IHR4 ICsgbV94ICsgbV93aWR0aCkKQEAgLTMzNCw3ICszMzQsNyBAQCB2b2lkIElubGluZVRleHRCb3g6 OnBhaW50KFJlbmRlck9iamVjdDo6CiAgICAgICAgIGludCBlbmRQb2ludCA9IG1fbGVuOwogICAg ICAgICBpZiAobV90cnVuY2F0aW9uICE9IGNOb1RydW5jYXRpb24pCiAgICAgICAgICAgICBlbmRQ b2ludCA9IG1fdHJ1bmNhdGlvbiAtIG1fc3RhcnQ7Ci0gICAgICAgIGkucC0+ZHJhd1RleHQoVGV4 dFJ1bih0ZXh0U3RyLCBtX3N0YXJ0LCAwLCBlbmRQb2ludCksCisgICAgICAgIGkucC0+ZHJhd1Rl eHQoVGV4dFJ1bih0ZXh0U3RyLCBtX3N0YXJ0LCBlbmRQb2ludCksCiAgICAgICAgICAgICAgICAg ICAgICAgSW50UG9pbnQobV94ICsgdHgsIG1feSArIHR5ICsgbV9iYXNlbGluZSksIHRleHRPYmpl Y3QoKS0+dGFiV2lkdGgoKSwgdGV4dFBvcygpLAogICAgICAgICAgICAgICAgICAgICAgIG1fdG9B ZGQsIG1fcmV2ZXJzZWQgPyBSVEwgOiBMVFIsIG1fZGlyT3ZlcnJpZGUgfHwgc3R5bGVUb1VzZS0+ dmlzdWFsbHlPcmRlcmVkKCkpOwogICAgIH0gZWxzZSB7CkBAIC0zNDMsMTQgKzM0MywxNCBAQCB2 b2lkIElubGluZVRleHRCb3g6OnBhaW50KFJlbmRlck9iamVjdDo6CiAgICAgICAgIGlmIChwYWlu dFNlbGVjdGVkVGV4dFNlcGFyYXRlbHkpIHsKICAgICAgICAgICAgIC8vIHBhaW50IG9ubHkgdGhl IHRleHQgdGhhdCBpcyBub3Qgc2VsZWN0ZWQKICAgICAgICAgICAgIGlmIChzUG9zID49IGVQb3Mp Ci0gICAgICAgICAgICAgICAgaS5wLT5kcmF3VGV4dChUZXh0UnVuKHRleHRTdHIsIG1fc3RhcnQp LCBJbnRQb2ludChtX3ggKyB0eCwgbV95ICsgdHkgKyBtX2Jhc2VsaW5lKSwgdGV4dE9iamVjdCgp LT50YWJXaWR0aCgpLCB0ZXh0UG9zKCksCisgICAgICAgICAgICAgICAgaS5wLT5kcmF3VGV4dChU ZXh0UnVuKHRleHRTdHIsIG1fc3RhcnQsIG1fbGVuKSwgSW50UG9pbnQobV94ICsgdHgsIG1feSAr IHR5ICsgbV9iYXNlbGluZSksIHRleHRPYmplY3QoKS0+dGFiV2lkdGgoKSwgdGV4dFBvcygpLAog ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbV90b0FkZCwgbV9yZXZlcnNlZCA/IFJUTCA6 IExUUiwgbV9kaXJPdmVycmlkZSB8fCBzdHlsZVRvVXNlLT52aXN1YWxseU9yZGVyZWQoKSk7CiAg ICAgICAgICAgICBlbHNlIHsKICAgICAgICAgICAgICAgICBpZiAoc1BvcyAtIDEgPj0gMCkKLSAg ICAgICAgICAgICAgICAgICAgaS5wLT5kcmF3VGV4dChUZXh0UnVuKHRleHRTdHIsIG1fc3RhcnQs IDAsIHNQb3MpLCBJbnRQb2ludChtX3ggKyB0eCwgbV95ICsgdHkgKyBtX2Jhc2VsaW5lKSwgdGV4 dE9iamVjdCgpLT50YWJXaWR0aCgpLCB0ZXh0UG9zKCksCisgICAgICAgICAgICAgICAgICAgIGku cC0+ZHJhd1RleHQoVGV4dFJ1bih0ZXh0U3RyLCBtX3N0YXJ0LCBtX2xlbiwgMCwgc1BvcyksIElu dFBvaW50KG1feCArIHR4LCBtX3kgKyB0eSArIG1fYmFzZWxpbmUpLCB0ZXh0T2JqZWN0KCktPnRh YldpZHRoKCksIHRleHRQb3MoKSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBt X3RvQWRkLCBtX3JldmVyc2VkID8gUlRMIDogTFRSLCBtX2Rpck92ZXJyaWRlIHx8IHN0eWxlVG9V c2UtPnZpc3VhbGx5T3JkZXJlZCgpKTsKICAgICAgICAgICAgICAgICBpZiAoZVBvcyA8IG1fc3Rh cnQgKyBtX2xlbikKLSAgICAgICAgICAgICAgICAgICAgaS5wLT5kcmF3VGV4dChUZXh0UnVuKHRl eHRTdHIsIG1fc3RhcnQsIGVQb3MpLCBJbnRQb2ludChtX3ggKyB0eCwgbV95ICsgdHkgKyBtX2Jh c2VsaW5lKSwgdGV4dE9iamVjdCgpLT50YWJXaWR0aCgpLCB0ZXh0UG9zKCksCisgICAgICAgICAg ICAgICAgICAgIGkucC0+ZHJhd1RleHQoVGV4dFJ1bih0ZXh0U3RyLCBtX3N0YXJ0LCBtX2xlbiwg ZVBvcyksIEludFBvaW50KG1feCArIHR4LCBtX3kgKyB0eSArIG1fYmFzZWxpbmUpLCB0ZXh0T2Jq ZWN0KCktPnRhYldpZHRoKCksIHRleHRQb3MoKSwKICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBtX3RvQWRkLCBtX3JldmVyc2VkID8gUlRMIDogTFRSLCBtX2Rpck92ZXJyaWRlIHx8 IHN0eWxlVG9Vc2UtPnZpc3VhbGx5T3JkZXJlZCgpKTsKICAgICAgICAgICAgIH0KICAgICAgICAg fQpAQCAtMzY0LDcgKzM2NCw3IEBAIHZvaWQgSW5saW5lVGV4dEJveDo6cGFpbnQoUmVuZGVyT2Jq ZWN0OjoKICAgICAgICAgICAgICAgICBpLnAtPnNldFNoYWRvdyhJbnRTaXplKHNlbGVjdGlvblRl eHRTaGFkb3ctPngsIHNlbGVjdGlvblRleHRTaGFkb3ctPnkpLAogICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIHNlbGVjdGlvblRleHRTaGFkb3ctPmJsdXIsCiAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgc2VsZWN0aW9uVGV4dFNoYWRvdy0+Y29sb3IpOwotICAgICAgICAgICAg aS5wLT5kcmF3VGV4dChUZXh0UnVuKHRleHRTdHIsIG1fc3RhcnQsIHNQb3MsIGVQb3MpLCBJbnRQ b2ludChtX3ggKyB0eCwgbV95ICsgdHkgKyBtX2Jhc2VsaW5lKSwgdGV4dE9iamVjdCgpLT50YWJX aWR0aCgpLCB0ZXh0UG9zKCksCisgICAgICAgICAgICBpLnAtPmRyYXdUZXh0KFRleHRSdW4odGV4 dFN0ciwgbV9zdGFydCwgbV9sZW4sIHNQb3MsIGVQb3MpLCBJbnRQb2ludChtX3ggKyB0eCwgbV95 ICsgdHkgKyBtX2Jhc2VsaW5lKSwgdGV4dE9iamVjdCgpLT50YWJXaWR0aCgpLCB0ZXh0UG9zKCks CiAgICAgICAgICAgICAgICAgICAgICAgICAgIG1fdG9BZGQsIG1fcmV2ZXJzZWQgPyBSVEwgOiBM VFIsIG1fZGlyT3ZlcnJpZGUgfHwgc3R5bGVUb1VzZS0+dmlzdWFsbHlPcmRlcmVkKCkpOwogICAg ICAgICAgICAgaWYgKHNlbGVjdGlvblRleHRTaGFkb3cpCiAgICAgICAgICAgICAgICAgaS5wLT5j bGVhclNoYWRvdygpOwpAQCAtNDQ4LDcgKzQ0OCw3IEBAIHZvaWQgSW5saW5lVGV4dEJveDo6cGFp bnRTZWxlY3Rpb24oR3JhcGgKICAgICBpbnQgeSA9IHItPnNlbGVjdGlvblRvcCgpOwogICAgIGlu dCBoID0gci0+c2VsZWN0aW9uSGVpZ2h0KCk7CiAgICAgcC0+YWRkQ2xpcChJbnRSZWN0KG1feCAr IHR4LCB5ICsgdHksIG1fd2lkdGgsIGgpKTsKLSAgICBwLT5kcmF3SGlnaGxpZ2h0Rm9yVGV4dChU ZXh0UnVuKHRleHRPYmplY3QoKS0+c3RyaW5nKCksIG1fc3RhcnQsIHNQb3MsIGVQb3MpLCBJbnRQ b2ludChtX3ggKyB0eCwgeSArIHR5KSwgaCwgdGV4dE9iamVjdCgpLT50YWJXaWR0aCgpLCB0ZXh0 UG9zKCksIAorICAgIHAtPmRyYXdIaWdobGlnaHRGb3JUZXh0KFRleHRSdW4odGV4dE9iamVjdCgp LT5zdHJpbmcoKSwgbV9zdGFydCwgbV9sZW4sIHNQb3MsIGVQb3MpLCBJbnRQb2ludChtX3ggKyB0 eCwgeSArIHR5KSwgaCwgdGV4dE9iamVjdCgpLT50YWJXaWR0aCgpLCB0ZXh0UG9zKCksIAogICAg ICAgICAgICAgICAgICAgICAgICAgICAgIG1fdG9BZGQsIG1fcmV2ZXJzZWQgPyBSVEwgOiBMVFIs IG1fZGlyT3ZlcnJpZGUgfHwgc3R5bGUtPnZpc3VhbGx5T3JkZXJlZCgpLCBjKTsKICAgICBwLT5y ZXN0b3JlKCk7CiB9CkBAIC00NzEsNyArNDcxLDcgQEAgdm9pZCBJbmxpbmVUZXh0Qm94OjpwYWlu dE1hcmtlZFRleHRCYWNrZwogICAgIFJvb3RJbmxpbmVCb3gqIHIgPSByb290KCk7CiAgICAgaW50 IHkgPSByLT5zZWxlY3Rpb25Ub3AoKTsKICAgICBpbnQgaCA9IHItPnNlbGVjdGlvbkhlaWdodCgp OwotICAgIHAtPmRyYXdIaWdobGlnaHRGb3JUZXh0KFRleHRSdW4odGV4dE9iamVjdCgpLT5zdHJp bmcoKSwgbV9zdGFydCwgc1BvcywgZVBvcyksCisgICAgcC0+ZHJhd0hpZ2hsaWdodEZvclRleHQo VGV4dFJ1bih0ZXh0T2JqZWN0KCktPnN0cmluZygpLCBtX3N0YXJ0LCBtX2xlbiwgc1BvcywgZVBv cyksCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgSW50UG9pbnQobV94ICsgdHgsIHkgKyB0 eSksIGgsIHRleHRPYmplY3QoKS0+dGFiV2lkdGgoKSwgdGV4dFBvcygpLAogICAgICAgICAgICAg ICAgICAgICAgICAgICAgIG1fdG9BZGQsIG1fcmV2ZXJzZWQgPyBSVEwgOiBMVFIsIG1fZGlyT3Zl cnJpZGUgfHwgc3R5bGUtPnZpc3VhbGx5T3JkZXJlZCgpLCBjKTsKICAgICBwLT5yZXN0b3JlKCk7 CkBAIC01NzAsNyArNTcwLDcgQEAgdm9pZCBJbmxpbmVUZXh0Qm94OjpwYWludFRleHRNYXRjaE1h cmtlcgogICAgIGludCBzUG9zID0gbWF4KG1hcmtlci5zdGFydE9mZnNldCAtIG1fc3RhcnQsICh1 bnNpZ25lZCkwKTsKICAgICBpbnQgZVBvcyA9IG1pbihtYXJrZXIuZW5kT2Zmc2V0IC0gbV9zdGFy dCwgKHVuc2lnbmVkKW1fbGVuKTsKICAgICAKLSAgICBwdC0+ZHJhd0hpZ2hsaWdodEZvclRleHQo VGV4dFJ1bih0ZXh0T2JqZWN0KCktPnN0cmluZygpLCBtX3N0YXJ0LCBzUG9zLCBlUG9zKSwgSW50 UG9pbnQobV94ICsgX3R4LCB5ICsgX3R5KSwgaCwgdGV4dE9iamVjdCgpLT50YWJXaWR0aCgpLCB0 ZXh0UG9zKCksIAorICAgIHB0LT5kcmF3SGlnaGxpZ2h0Rm9yVGV4dChUZXh0UnVuKHRleHRPYmpl Y3QoKS0+c3RyaW5nKCksIG1fc3RhcnQsIG1fbGVuLCBzUG9zLCBlUG9zKSwgSW50UG9pbnQobV94 ICsgX3R4LCB5ICsgX3R5KSwgaCwgdGV4dE9iamVjdCgpLT50YWJXaWR0aCgpLCB0ZXh0UG9zKCks IAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICBtX3RvQWRkLCBtX3JldmVyc2VkID8gUlRM IDogTFRSLCBtX2Rpck92ZXJyaWRlIHx8IHN0eWxlLT52aXN1YWxseU9yZGVyZWQoKSwgeWVsbG93 KTsKICAgICBwdC0+cmVzdG9yZSgpOwogfQpAQCAtNjg0LDcgKzY4NCw3IEBAIGludCBJbmxpbmVU ZXh0Qm94OjpvZmZzZXRGb3JQb3NpdGlvbihpbnQKICAgICBSZW5kZXJUZXh0KiB0ZXh0ID0gc3Rh dGljX2Nhc3Q8UmVuZGVyVGV4dCo+KG1fb2JqZWN0KTsKICAgICBSZW5kZXJTdHlsZSAqc3R5bGUg PSB0ZXh0LT5zdHlsZShtX2ZpcnN0TGluZSk7CiAgICAgY29uc3QgRm9udCogZiA9ICZzdHlsZS0+ Zm9udCgpOwotICAgIHJldHVybiBmLT5jaGVja1NlbGVjdGlvblBvaW50KFRleHRSdW4odGV4dE9i amVjdCgpLT5zdHJpbmcoKSwgbV9zdGFydCksCisgICAgcmV0dXJuIGYtPmNoZWNrU2VsZWN0aW9u UG9pbnQoVGV4dFJ1bih0ZXh0T2JqZWN0KCktPnN0cmluZygpLCBtX3N0YXJ0LCBtX2xlbiksCiAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbV90b0FkZCwgdGV4dC0+dGFiV2lkdGgo KSwgdGV4dFBvcygpLCBfeCAtIG1feCwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBtX3JldmVyc2VkID8gUlRMIDogTFRSLCBtX2Rpck92ZXJyaWRlIHx8IHN0eWxlLT52aXN1YWxs eU9yZGVyZWQoKSwgaW5jbHVkZVBhcnRpYWxHbHlwaHMpOwogfQpAQCAtNjk5LDcgKzY5OSw3IEBA IGludCBJbmxpbmVUZXh0Qm94Ojpwb3NpdGlvbkZvck9mZnNldChpbnQKICAgICBpbnQgZnJvbSA9 IG1fcmV2ZXJzZWQgPyBvZmZzZXQgLSBtX3N0YXJ0IDogMDsKICAgICBpbnQgdG8gPSBtX3JldmVy c2VkID8gbV9sZW4gOiBvZmZzZXQgLSBtX3N0YXJ0OwogICAgIC8vIEZJWE1FOiBEbyB3ZSBuZWVk IHRvIGFkZCByaWdodEJlYXJpbmcgaGVyZT8KLSAgICByZXR1cm4gZW5jbG9zaW5nSW50UmVjdChm LT5zZWxlY3Rpb25SZWN0Rm9yVGV4dChUZXh0UnVuKHRleHQtPnN0cmluZygpLCBtX3N0YXJ0LCBm cm9tLCB0byksIEludFBvaW50KG1feCwgMCksIDAsIHRleHQtPnRhYldpZHRoKCksIHRleHRQb3Mo KSwgbV90b0FkZCwgbV9yZXZlcnNlZCwgbV9kaXJPdmVycmlkZSkpLnJpZ2h0KCk7CisgICAgcmV0 dXJuIGVuY2xvc2luZ0ludFJlY3QoZi0+c2VsZWN0aW9uUmVjdEZvclRleHQoVGV4dFJ1bih0ZXh0 LT5zdHJpbmcoKSwgbV9zdGFydCwgbV9sZW4sIGZyb20sIHRvKSwgSW50UG9pbnQobV94LCAwKSwg MCwgdGV4dC0+dGFiV2lkdGgoKSwgdGV4dFBvcygpLCBtX3RvQWRkLCBtX3JldmVyc2VkLCBtX2Rp ck92ZXJyaWRlKSkucmlnaHQoKTsKIH0KIAogfQo=