47743 2010-10-15 15:15:19 -0700 Clean up RenderFlexibleBox::applyLineClamp() 2010-10-15 15:28:22 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 mitz mitz oldest_to_newest 294952 0 mitz 2010-10-15 15:15:19 -0700 Clean up RenderFlexibleBox::applyLineClamp() 294955 1 70904 mitz 2010-10-15 15:19:09 -0700 Created attachment 70904 Patch 294958 2 mitz 2010-10-15 15:28:22 -0700 <http://trac.webkit.org/projects/webkit/changeset/69890>. 70904 2010-10-15 15:19:09 -0700 2010-10-15 15:26:33 -0700 Patch bug-47743-20101015151907.patch text/plain 10334 mitz SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2OTg4OCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTMgQEAKKzIwMTAtMTAtMTUgIERhbiBCZXJuc3RlaW4gIDxtaXR6QGFwcGxlLmNv bT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBDbGVh biB1cCBSZW5kZXJGbGV4aWJsZUJveDo6YXBwbHlMaW5lQ2xhbXAoKQorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDc3NDMKKworICAgICAgICAqIHJlbmRl cmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJGbGV4 aWJsZUJveDo6YXBwbHlMaW5lQ2xhbXApOgorCiAyMDEwLTEwLTE1ICBBbGV4ZXkgUHJvc2t1cnlh a292ICA8YXBAYXBwbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IERhcmluIEFkbGVyLgpJ bmRleDogV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3BwCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFdlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmNwcAkocmV2aXNpb24gNjk4 NjMpCisrKyBXZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHAJKHdvcmtpbmcg Y29weSkKQEAgLTkxMywxMDMgKzkxMywxMDIgQEAgdm9pZCBSZW5kZXJGbGV4aWJsZUJveDo6bGF5 b3V0VmVydGljYWxCbwogdm9pZCBSZW5kZXJGbGV4aWJsZUJveDo6YXBwbHlMaW5lQ2xhbXAoRmxl eEJveEl0ZXJhdG9yJiBpdGVyYXRvciwgYm9vbCByZWxheW91dENoaWxkcmVuKQogewogICAgIGlu dCBtYXhMaW5lQ291bnQgPSAwOwotICAgIFJlbmRlckJveCogY2hpbGQgPSBpdGVyYXRvci5maXJz dCgpOwotICAgIHdoaWxlIChjaGlsZCkgewotICAgICAgICBpZiAoIWNoaWxkLT5pc1Bvc2l0aW9u ZWQoKSkgewotICAgICAgICAgICAgaWYgKHJlbGF5b3V0Q2hpbGRyZW4gfHwgKGNoaWxkLT5pc1Jl cGxhY2VkKCkgJiYgKGNoaWxkLT5zdHlsZSgpLT53aWR0aCgpLmlzUGVyY2VudCgpIHx8IGNoaWxk LT5zdHlsZSgpLT5oZWlnaHQoKS5pc1BlcmNlbnQoKSkpIHx8Ci0gICAgICAgICAgICAgICAgKGNo aWxkLT5zdHlsZSgpLT5oZWlnaHQoKS5pc0F1dG8oKSAmJiBjaGlsZC0+aXNCbG9ja0Zsb3coKSAm JiAhY2hpbGQtPm5lZWRzTGF5b3V0KCkpKSB7Ci0gICAgICAgICAgICAgICAgY2hpbGQtPnNldENo aWxkTmVlZHNMYXlvdXQodHJ1ZSwgZmFsc2UpOwotICAgICAgICAgICAgICAgIAotICAgICAgICAg ICAgICAgIC8vIERpcnR5IGFsbCB0aGUgcG9zaXRpb25lZCBvYmplY3RzLgotICAgICAgICAgICAg ICAgIGlmIChjaGlsZC0+aXNSZW5kZXJCbG9jaygpKSB7Ci0gICAgICAgICAgICAgICAgICAgIHRv UmVuZGVyQmxvY2soY2hpbGQpLT5tYXJrUG9zaXRpb25lZE9iamVjdHNGb3JMYXlvdXQoKTsKLSAg ICAgICAgICAgICAgICAgICAgdG9SZW5kZXJCbG9jayhjaGlsZCktPmNsZWFyVHJ1bmNhdGlvbigp OwotICAgICAgICAgICAgICAgIH0KKyAgICBmb3IgKFJlbmRlckJveCogY2hpbGQgPSBpdGVyYXRv ci5maXJzdCgpOyBjaGlsZDsgY2hpbGQgPSBpdGVyYXRvci5uZXh0KCkpIHsKKyAgICAgICAgaWYg KGNoaWxkLT5pc1Bvc2l0aW9uZWQoKSkKKyAgICAgICAgICAgIGNvbnRpbnVlOworCisgICAgICAg IGlmIChyZWxheW91dENoaWxkcmVuIHx8IChjaGlsZC0+aXNSZXBsYWNlZCgpICYmIChjaGlsZC0+ c3R5bGUoKS0+d2lkdGgoKS5pc1BlcmNlbnQoKSB8fCBjaGlsZC0+c3R5bGUoKS0+aGVpZ2h0KCku aXNQZXJjZW50KCkpKQorICAgICAgICAgICAgfHwgKGNoaWxkLT5zdHlsZSgpLT5oZWlnaHQoKS5p c0F1dG8oKSAmJiBjaGlsZC0+aXNCbG9ja0Zsb3coKSAmJiAhY2hpbGQtPm5lZWRzTGF5b3V0KCkp KSB7CisgICAgICAgICAgICBjaGlsZC0+c2V0Q2hpbGROZWVkc0xheW91dCh0cnVlLCBmYWxzZSk7 CisKKyAgICAgICAgICAgIC8vIERpcnR5IGFsbCB0aGUgcG9zaXRpb25lZCBvYmplY3RzLgorICAg ICAgICAgICAgaWYgKGNoaWxkLT5pc1JlbmRlckJsb2NrKCkpIHsKKyAgICAgICAgICAgICAgICB0 b1JlbmRlckJsb2NrKGNoaWxkKS0+bWFya1Bvc2l0aW9uZWRPYmplY3RzRm9yTGF5b3V0KCk7Cisg ICAgICAgICAgICAgICAgdG9SZW5kZXJCbG9jayhjaGlsZCktPmNsZWFyVHJ1bmNhdGlvbigpOwog ICAgICAgICAgICAgfQotICAgICAgICAgICAgY2hpbGQtPmxheW91dElmTmVlZGVkKCk7Ci0gICAg ICAgICAgICBpZiAoY2hpbGQtPnN0eWxlKCktPmhlaWdodCgpLmlzQXV0bygpICYmIGNoaWxkLT5p c0Jsb2NrRmxvdygpKQotICAgICAgICAgICAgICAgIG1heExpbmVDb3VudCA9IG1heChtYXhMaW5l Q291bnQsIHRvUmVuZGVyQmxvY2soY2hpbGQpLT5saW5lQ291bnQoKSk7CiAgICAgICAgIH0KLSAg ICAgICAgY2hpbGQgPSBpdGVyYXRvci5uZXh0KCk7CisgICAgICAgIGNoaWxkLT5sYXlvdXRJZk5l ZWRlZCgpOworICAgICAgICBpZiAoY2hpbGQtPnN0eWxlKCktPmhlaWdodCgpLmlzQXV0bygpICYm IGNoaWxkLT5pc0Jsb2NrRmxvdygpKQorICAgICAgICAgICAgbWF4TGluZUNvdW50ID0gbWF4KG1h eExpbmVDb3VudCwgdG9SZW5kZXJCbG9jayhjaGlsZCktPmxpbmVDb3VudCgpKTsKICAgICB9Ci0g ICAgCi0gICAgLy8gR2V0IHRoZSAjIG9mIGxpbmVzIGFuZCB0aGVuIGFsdGVyIGFsbCBibG9jayBm bG93IGNoaWxkcmVuIHdpdGggYXV0byBoZWlnaHQgdG8gdXNlIHRoZQorCisgICAgLy8gR2V0IHRo ZSBudW1iZXIgb2YgbGluZXMgYW5kIHRoZW4gYWx0ZXIgYWxsIGJsb2NrIGZsb3cgY2hpbGRyZW4g d2l0aCBhdXRvIGhlaWdodCB0byB1c2UgdGhlCiAgICAgLy8gc3BlY2lmaWVkIGhlaWdodC4gV2Ug YWx3YXlzIHRyeSB0byBsZWF2ZSByb29tIGZvciBhdCBsZWFzdCBvbmUgbGluZS4KICAgICBMaW5l Q2xhbXBWYWx1ZSBsaW5lQ2xhbXAgPSBzdHlsZSgpLT5saW5lQ2xhbXAoKTsKICAgICBpbnQgbnVt VmlzaWJsZUxpbmVzID0gbGluZUNsYW1wLmlzUGVyY2VudGFnZSgpID8gbWF4KDEsIChtYXhMaW5l Q291bnQgKyAxKSAqIGxpbmVDbGFtcC52YWx1ZSgpIC8gMTAwKSA6IGxpbmVDbGFtcC52YWx1ZSgp OwotICAgIGlmIChudW1WaXNpYmxlTGluZXMgPCBtYXhMaW5lQ291bnQpIHsKLSAgICAgICAgZm9y IChjaGlsZCA9IGl0ZXJhdG9yLmZpcnN0KCk7IGNoaWxkOyBjaGlsZCA9IGl0ZXJhdG9yLm5leHQo KSkgewotICAgICAgICAgICAgaWYgKGNoaWxkLT5pc1Bvc2l0aW9uZWQoKSB8fCAhY2hpbGQtPnN0 eWxlKCktPmhlaWdodCgpLmlzQXV0bygpIHx8ICFjaGlsZC0+aXNCbG9ja0Zsb3coKSkKLSAgICAg ICAgICAgICAgICBjb250aW51ZTsKLSAgICAgICAgICAgIAotICAgICAgICAgICAgUmVuZGVyQmxv Y2sqIGJsb2NrQ2hpbGQgPSB0b1JlbmRlckJsb2NrKGNoaWxkKTsKLSAgICAgICAgICAgIGludCBs aW5lQ291bnQgPSBibG9ja0NoaWxkLT5saW5lQ291bnQoKTsKLSAgICAgICAgICAgIGlmIChsaW5l Q291bnQgPD0gbnVtVmlzaWJsZUxpbmVzKQotICAgICAgICAgICAgICAgIGNvbnRpbnVlOwotICAg ICAgICAgICAgCi0gICAgICAgICAgICBpbnQgbmV3SGVpZ2h0ID0gYmxvY2tDaGlsZC0+aGVpZ2h0 Rm9yTGluZUNvdW50KG51bVZpc2libGVMaW5lcyk7Ci0gICAgICAgICAgICBpZiAobmV3SGVpZ2h0 ID09IGNoaWxkLT5oZWlnaHQoKSkKLSAgICAgICAgICAgICAgICBjb250aW51ZTsKLSAgICAgICAg ICAgIAotICAgICAgICAgICAgY2hpbGQtPnNldENoaWxkTmVlZHNMYXlvdXQodHJ1ZSwgZmFsc2Up OwotICAgICAgICAgICAgY2hpbGQtPnNldE92ZXJyaWRlU2l6ZShuZXdIZWlnaHQpOwotICAgICAg ICAgICAgbV9mbGV4aW5nQ2hpbGRyZW4gPSB0cnVlOwotICAgICAgICAgICAgY2hpbGQtPmxheW91 dElmTmVlZGVkKCk7Ci0gICAgICAgICAgICBtX2ZsZXhpbmdDaGlsZHJlbiA9IGZhbHNlOwotICAg ICAgICAgICAgY2hpbGQtPnNldE92ZXJyaWRlU2l6ZSgtMSk7Ci0gICAgICAgICAgICAKLSAgICAg ICAgICAgIC8vIEZJWE1FOiBGb3Igbm93IGRvbid0IHN1cHBvcnQgUlRMLgotICAgICAgICAgICAg aWYgKHN0eWxlKCktPmRpcmVjdGlvbigpICE9IExUUikKLSAgICAgICAgICAgICAgICBjb250aW51 ZTsKLSAgICAgICAgICAgIAotICAgICAgICAgICAgLy8gR2V0IHRoZSBsYXN0IGxpbmUKLSAgICAg ICAgICAgIFJvb3RJbmxpbmVCb3gqIGxhc3RMaW5lID0gYmxvY2tDaGlsZC0+bGluZUF0SW5kZXgo bGluZUNvdW50LTEpOwotICAgICAgICAgICAgaWYgKCFsYXN0TGluZSkKLSAgICAgICAgICAgICAg ICBjb250aW51ZTsKLSAgICAgICAgICAgIAotICAgICAgICAgICAgUm9vdElubGluZUJveCogbGFz dFZpc2libGVMaW5lID0gYmxvY2tDaGlsZC0+bGluZUF0SW5kZXgobnVtVmlzaWJsZUxpbmVzLTEp OwotICAgICAgICAgICAgaWYgKCFsYXN0VmlzaWJsZUxpbmUpCi0gICAgICAgICAgICAgICAgY29u dGludWU7Ci0gICAgICAgICAgICAKLSAgICAgICAgICAgIGNvbnN0IFVDaGFyIGVsbGlwc2lzQW5k U3BhY2VbMl0gPSB7IGhvcml6b250YWxFbGxpcHNpcywgJyAnIH07Ci0gICAgICAgICAgICBERUZJ TkVfU1RBVElDX0xPQ0FMKEF0b21pY1N0cmluZywgZWxsaXBzaXNBbmRTcGFjZVN0ciwgKGVsbGlw c2lzQW5kU3BhY2UsIDIpKTsKLSAgICAgICAgICAgIERFRklORV9TVEFUSUNfTE9DQUwoQXRvbWlj U3RyaW5nLCBlbGxpcHNpc1N0ciwgKCZob3Jpem9udGFsRWxsaXBzaXMsIDEpKTsKLSAgICAgICAg ICAgIGNvbnN0IEZvbnQmIGZvbnQgPSBzdHlsZShudW1WaXNpYmxlTGluZXMgPT0gMSktPmZvbnQo KTsKLSAgICAgICAgICAgIAotICAgICAgICAgICAgLy8gR2V0IGVsbGlwc2lzIHdpZHRoLCBhbmQg aWYgdGhlIGxhc3QgY2hpbGQgaXMgYW4gYW5jaG9yLCBpdCB3aWxsIGdvIGFmdGVyIHRoZSBlbGxp cHNpcywgc28gYWRkIGluIGEgc3BhY2UgYW5kIHRoZSBhbmNob3Igd2lkdGggdG9vIAotICAgICAg ICAgICAgaW50IHRvdGFsV2lkdGg7Ci0gICAgICAgICAgICBJbmxpbmVCb3gqIGFuY2hvckJveCA9 IGxhc3RMaW5lLT5sYXN0Q2hpbGQoKTsKLSAgICAgICAgICAgIGlmIChhbmNob3JCb3ggJiYgYW5j aG9yQm94LT5yZW5kZXJlcigpLT5ub2RlKCkgJiYgYW5jaG9yQm94LT5yZW5kZXJlcigpLT5ub2Rl KCktPmlzTGluaygpKQotICAgICAgICAgICAgICAgIHRvdGFsV2lkdGggPSBhbmNob3JCb3gtPmxv Z2ljYWxXaWR0aCgpICsgZm9udC53aWR0aChUZXh0UnVuKGVsbGlwc2lzQW5kU3BhY2UsIDIpKTsK LSAgICAgICAgICAgIGVsc2UgewotICAgICAgICAgICAgICAgIGFuY2hvckJveCA9IDA7Ci0gICAg ICAgICAgICAgICAgdG90YWxXaWR0aCA9IGZvbnQud2lkdGgoVGV4dFJ1bigmaG9yaXpvbnRhbEVs bGlwc2lzLCAxKSk7Ci0gICAgICAgICAgICB9Ci0gICAgICAgICAgICAKLSAgICAgICAgICAgIC8v IFNlZSBpZiB0aGlzIHdpZHRoIGNhbiBiZSBhY2NvbW1vZGF0ZWQgb24gdGhlIGxhc3QgdmlzaWJs ZSBsaW5lCi0gICAgICAgICAgICBSZW5kZXJCbG9jayogZGVzdEJsb2NrID0gdG9SZW5kZXJCbG9j ayhsYXN0VmlzaWJsZUxpbmUtPnJlbmRlcmVyKCkpOwotICAgICAgICAgICAgUmVuZGVyQmxvY2sq IHNyY0Jsb2NrID0gdG9SZW5kZXJCbG9jayhsYXN0TGluZS0+cmVuZGVyZXIoKSk7Ci0gICAgICAg ICAgICAKLSAgICAgICAgICAgIC8vIEZJWE1FOiBEaXJlY3Rpb25zIG9mIHNyYy9kZXN0QmxvY2sg Y291bGQgYmUgZGlmZmVyZW50IGZyb20gb3VyIGRpcmVjdGlvbiBhbmQgZnJvbSBvbmUgYW5vdGhl ci4KLSAgICAgICAgICAgIGlmIChzcmNCbG9jay0+c3R5bGUoKS0+ZGlyZWN0aW9uKCkgIT0gTFRS KQotICAgICAgICAgICAgICAgIGNvbnRpbnVlOwotICAgICAgICAgICAgaWYgKGRlc3RCbG9jay0+ c3R5bGUoKS0+ZGlyZWN0aW9uKCkgIT0gTFRSKQotICAgICAgICAgICAgICAgIGNvbnRpbnVlOwot ICAgICAgICAgICAgaW50IGx0ciA9IHRydWU7Ci0gICAgICAgICAgICAKLSAgICAgICAgICAgIGlu dCBibG9ja1JpZ2h0RWRnZSA9IGRlc3RCbG9jay0+bG9naWNhbFJpZ2h0T2Zmc2V0Rm9yTGluZShs YXN0VmlzaWJsZUxpbmUtPnkoKSwgZmFsc2UpOwotICAgICAgICAgICAgaW50IGJsb2NrTGVmdEVk Z2UgPSBkZXN0QmxvY2stPmxvZ2ljYWxMZWZ0T2Zmc2V0Rm9yTGluZShsYXN0VmlzaWJsZUxpbmUt PnkoKSwgZmFsc2UpOwotICAgICAgICAgICAgCi0gICAgICAgICAgICBpbnQgYmxvY2tFZGdlID0g bHRyID8gYmxvY2tSaWdodEVkZ2UgOiBibG9ja0xlZnRFZGdlOwotICAgICAgICAgICAgaWYgKCFs YXN0VmlzaWJsZUxpbmUtPmNhbkFjY29tbW9kYXRlRWxsaXBzaXMobHRyLCBibG9ja0VkZ2UsCi0g ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBs YXN0VmlzaWJsZUxpbmUtPngoKSArIGxhc3RWaXNpYmxlTGluZS0+bG9naWNhbFdpZHRoKCksCi0g ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB0 b3RhbFdpZHRoKSkKLSAgICAgICAgICAgICAgICBjb250aW51ZTsKLSAgICAgICAgICAgIAotICAg ICAgICAgICAgLy8gTGV0IHRoZSB0cnVuY2F0aW9uIGNvZGUga2ljayBpbi4KLSAgICAgICAgICAg IGxhc3RWaXNpYmxlTGluZS0+cGxhY2VFbGxpcHNpcyhhbmNob3JCb3ggPyBlbGxpcHNpc0FuZFNw YWNlU3RyIDogZWxsaXBzaXNTdHIsIGx0ciwgYmxvY2tMZWZ0RWRnZSwgYmxvY2tSaWdodEVkZ2Us IHRvdGFsV2lkdGgsIGFuY2hvckJveCk7Ci0gICAgICAgICAgICBkZXN0QmxvY2stPnNldEhhc01h cmt1cFRydW5jYXRpb24odHJ1ZSk7CisgICAgaWYgKG51bVZpc2libGVMaW5lcyA+PSBtYXhMaW5l Q291bnQpCisgICAgICAgIHJldHVybjsKKworICAgIGZvciAoUmVuZGVyQm94KiBjaGlsZCA9IGl0 ZXJhdG9yLmZpcnN0KCk7IGNoaWxkOyBjaGlsZCA9IGl0ZXJhdG9yLm5leHQoKSkgeworICAgICAg ICBpZiAoY2hpbGQtPmlzUG9zaXRpb25lZCgpIHx8ICFjaGlsZC0+c3R5bGUoKS0+aGVpZ2h0KCku aXNBdXRvKCkgfHwgIWNoaWxkLT5pc0Jsb2NrRmxvdygpKQorICAgICAgICAgICAgY29udGludWU7 CisgICAgICAgIAorICAgICAgICBSZW5kZXJCbG9jayogYmxvY2tDaGlsZCA9IHRvUmVuZGVyQmxv Y2soY2hpbGQpOworICAgICAgICBpbnQgbGluZUNvdW50ID0gYmxvY2tDaGlsZC0+bGluZUNvdW50 KCk7CisgICAgICAgIGlmIChsaW5lQ291bnQgPD0gbnVtVmlzaWJsZUxpbmVzKQorICAgICAgICAg ICAgY29udGludWU7CisgICAgICAgIAorICAgICAgICBpbnQgbmV3SGVpZ2h0ID0gYmxvY2tDaGls ZC0+aGVpZ2h0Rm9yTGluZUNvdW50KG51bVZpc2libGVMaW5lcyk7CisgICAgICAgIGlmIChuZXdI ZWlnaHQgPT0gY2hpbGQtPmhlaWdodCgpKQorICAgICAgICAgICAgY29udGludWU7CisgICAgICAg IAorICAgICAgICBjaGlsZC0+c2V0Q2hpbGROZWVkc0xheW91dCh0cnVlLCBmYWxzZSk7CisgICAg ICAgIGNoaWxkLT5zZXRPdmVycmlkZVNpemUobmV3SGVpZ2h0KTsKKyAgICAgICAgbV9mbGV4aW5n Q2hpbGRyZW4gPSB0cnVlOworICAgICAgICBjaGlsZC0+bGF5b3V0SWZOZWVkZWQoKTsKKyAgICAg ICAgbV9mbGV4aW5nQ2hpbGRyZW4gPSBmYWxzZTsKKyAgICAgICAgY2hpbGQtPnNldE92ZXJyaWRl U2l6ZSgtMSk7CisKKyAgICAgICAgLy8gRklYTUU6IEZvciBub3cgZG9uJ3Qgc3VwcG9ydCBSVEwu CisgICAgICAgIGlmIChzdHlsZSgpLT5kaXJlY3Rpb24oKSAhPSBMVFIpCisgICAgICAgICAgICBj b250aW51ZTsKKworICAgICAgICAvLyBHZXQgdGhlIGxhc3QgbGluZQorICAgICAgICBSb290SW5s aW5lQm94KiBsYXN0TGluZSA9IGJsb2NrQ2hpbGQtPmxpbmVBdEluZGV4KGxpbmVDb3VudC0xKTsK KyAgICAgICAgaWYgKCFsYXN0TGluZSkKKyAgICAgICAgICAgIGNvbnRpbnVlOworCisgICAgICAg IFJvb3RJbmxpbmVCb3gqIGxhc3RWaXNpYmxlTGluZSA9IGJsb2NrQ2hpbGQtPmxpbmVBdEluZGV4 KG51bVZpc2libGVMaW5lcy0xKTsKKyAgICAgICAgaWYgKCFsYXN0VmlzaWJsZUxpbmUpCisgICAg ICAgICAgICBjb250aW51ZTsKKworICAgICAgICBjb25zdCBVQ2hhciBlbGxpcHNpc0FuZFNwYWNl WzJdID0geyBob3Jpem9udGFsRWxsaXBzaXMsICcgJyB9OworICAgICAgICBERUZJTkVfU1RBVElD X0xPQ0FMKEF0b21pY1N0cmluZywgZWxsaXBzaXNBbmRTcGFjZVN0ciwgKGVsbGlwc2lzQW5kU3Bh Y2UsIDIpKTsKKyAgICAgICAgREVGSU5FX1NUQVRJQ19MT0NBTChBdG9taWNTdHJpbmcsIGVsbGlw c2lzU3RyLCAoJmhvcml6b250YWxFbGxpcHNpcywgMSkpOworICAgICAgICBjb25zdCBGb250JiBm b250ID0gc3R5bGUobnVtVmlzaWJsZUxpbmVzID09IDEpLT5mb250KCk7CisKKyAgICAgICAgLy8g R2V0IGVsbGlwc2lzIHdpZHRoLCBhbmQgaWYgdGhlIGxhc3QgY2hpbGQgaXMgYW4gYW5jaG9yLCBp dCB3aWxsIGdvIGFmdGVyIHRoZSBlbGxpcHNpcywgc28gYWRkIGluIGEgc3BhY2UgYW5kIHRoZSBh bmNob3Igd2lkdGggdG9vIAorICAgICAgICBpbnQgdG90YWxXaWR0aDsKKyAgICAgICAgSW5saW5l Qm94KiBhbmNob3JCb3ggPSBsYXN0TGluZS0+bGFzdENoaWxkKCk7CisgICAgICAgIGlmIChhbmNo b3JCb3ggJiYgYW5jaG9yQm94LT5yZW5kZXJlcigpLT5ub2RlKCkgJiYgYW5jaG9yQm94LT5yZW5k ZXJlcigpLT5ub2RlKCktPmlzTGluaygpKQorICAgICAgICAgICAgdG90YWxXaWR0aCA9IGFuY2hv ckJveC0+bG9naWNhbFdpZHRoKCkgKyBmb250LndpZHRoKFRleHRSdW4oZWxsaXBzaXNBbmRTcGFj ZSwgMikpOworICAgICAgICBlbHNlIHsKKyAgICAgICAgICAgIGFuY2hvckJveCA9IDA7CisgICAg ICAgICAgICB0b3RhbFdpZHRoID0gZm9udC53aWR0aChUZXh0UnVuKCZob3Jpem9udGFsRWxsaXBz aXMsIDEpKTsKICAgICAgICAgfQorCisgICAgICAgIC8vIFNlZSBpZiB0aGlzIHdpZHRoIGNhbiBi ZSBhY2NvbW1vZGF0ZWQgb24gdGhlIGxhc3QgdmlzaWJsZSBsaW5lCisgICAgICAgIFJlbmRlckJs b2NrKiBkZXN0QmxvY2sgPSB0b1JlbmRlckJsb2NrKGxhc3RWaXNpYmxlTGluZS0+cmVuZGVyZXIo KSk7CisgICAgICAgIFJlbmRlckJsb2NrKiBzcmNCbG9jayA9IHRvUmVuZGVyQmxvY2sobGFzdExp bmUtPnJlbmRlcmVyKCkpOworICAgICAgICAKKyAgICAgICAgLy8gRklYTUU6IERpcmVjdGlvbnMg b2Ygc3JjL2Rlc3RCbG9jayBjb3VsZCBiZSBkaWZmZXJlbnQgZnJvbSBvdXIgZGlyZWN0aW9uIGFu ZCBmcm9tIG9uZSBhbm90aGVyLgorICAgICAgICBpZiAoIXNyY0Jsb2NrLT5zdHlsZSgpLT5pc0xl ZnRUb1JpZ2h0RGlyZWN0aW9uKCkpCisgICAgICAgICAgICBjb250aW51ZTsKKworICAgICAgICBi b29sIGxlZnRUb1JpZ2h0ID0gZGVzdEJsb2NrLT5zdHlsZSgpLT5pc0xlZnRUb1JpZ2h0RGlyZWN0 aW9uKCk7CisgICAgICAgIGlmICghbGVmdFRvUmlnaHQpCisgICAgICAgICAgICBjb250aW51ZTsK KworICAgICAgICBpbnQgYmxvY2tSaWdodEVkZ2UgPSBkZXN0QmxvY2stPmxvZ2ljYWxSaWdodE9m ZnNldEZvckxpbmUobGFzdFZpc2libGVMaW5lLT55KCksIGZhbHNlKTsKKyAgICAgICAgaW50IGJs b2NrTGVmdEVkZ2UgPSBkZXN0QmxvY2stPmxvZ2ljYWxMZWZ0T2Zmc2V0Rm9yTGluZShsYXN0Vmlz aWJsZUxpbmUtPnkoKSwgZmFsc2UpOworCisgICAgICAgIGludCBibG9ja0VkZ2UgPSBsZWZ0VG9S aWdodCA/IGJsb2NrUmlnaHRFZGdlIDogYmxvY2tMZWZ0RWRnZTsKKyAgICAgICAgaWYgKCFsYXN0 VmlzaWJsZUxpbmUtPmNhbkFjY29tbW9kYXRlRWxsaXBzaXMobGVmdFRvUmlnaHQsIGJsb2NrRWRn ZSwgbGFzdFZpc2libGVMaW5lLT54KCkgKyBsYXN0VmlzaWJsZUxpbmUtPmxvZ2ljYWxXaWR0aCgp LCB0b3RhbFdpZHRoKSkKKyAgICAgICAgICAgIGNvbnRpbnVlOworCisgICAgICAgIC8vIExldCB0 aGUgdHJ1bmNhdGlvbiBjb2RlIGtpY2sgaW4uCisgICAgICAgIGxhc3RWaXNpYmxlTGluZS0+cGxh Y2VFbGxpcHNpcyhhbmNob3JCb3ggPyBlbGxpcHNpc0FuZFNwYWNlU3RyIDogZWxsaXBzaXNTdHIs IGxlZnRUb1JpZ2h0LCBibG9ja0xlZnRFZGdlLCBibG9ja1JpZ2h0RWRnZSwgdG90YWxXaWR0aCwg YW5jaG9yQm94KTsKKyAgICAgICAgZGVzdEJsb2NrLT5zZXRIYXNNYXJrdXBUcnVuY2F0aW9uKHRy dWUpOwogICAgIH0KIH0KIAo=