45587 2010-09-10 23:01:46 -0700 Line clamp cleanup 2010-09-11 06:21:21 -0700 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 adele webkit-unassigned webkit.review.bot oldest_to_newest 277651 0 adele 2010-09-10 23:01:46 -0700 Move line clamp to its own function 277657 1 67293 adele 2010-09-10 23:04:32 -0700 Created attachment 67293 patch 277661 2 webkit.review.bot 2010-09-10 23:06:04 -0700 Attachment 67293 did not pass style-queue: Failed to run "['WebKitTools/Scripts/check-webkit-style']" exit_code: 1 WebCore/rendering/RenderFlexibleBox.cpp:906: Boolean expressions that span multiple lines should have their operators on the left side of the line instead of the right side. [whitespace/operators] [4] Total errors found: 1 in 3 files If any of these errors are false positives, please file a bug against check-webkit-style. 277704 3 adele 2010-09-11 06:21:21 -0700 Committed revision 67296. 67293 2010-09-10 23:04:32 -0700 2010-09-10 23:44:38 -0700 patch patch_line-clamp-cleanup.txt text/plain 12707 adele SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2NzI4MykKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTUgQEAKKzIwMTAtMDktMTAgIEFkZWxlIFBldGVyc29uICA8YWRlbGVAYXBwbGUu Y29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEZp eCBmb3IgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ1NTg3CisgICAg ICAgIE1vdmUgbGluZSBjbGFtcCBjb2RlIHRvIGl0cyBvd24gZnVuY3Rpb24uCisKKyAgICAgICAg KiByZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVu ZGVyRmxleGlibGVCb3g6OmxheW91dFZlcnRpY2FsQm94KToKKyAgICAgICAgKFdlYkNvcmU6OlJl bmRlckZsZXhpYmxlQm94OjphcHBseUxpbmVDbGFtcCk6CisgICAgICAgICogcmVuZGVyaW5nL1Jl bmRlckZsZXhpYmxlQm94Lmg6CisKIDIwMTAtMDktMTAgIERhbiBCZXJuc3RlaW4gIDxtaXR6QGFw cGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBEYXJpbiBBZGxlci4KSW5kZXg6IFdlYkNv cmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmNwcAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHAJKHJldmlzaW9uIDY3MTYxKQorKysgV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3BwCSh3b3JraW5nIGNvcHkpCkBAIC02 NDYsMTA3ICs2NDYsOCBAQCB2b2lkIFJlbmRlckZsZXhpYmxlQm94OjpsYXlvdXRWZXJ0aWNhbEJv CiAgICAgLy8gV2UgY29uZmluZSB0aGUgbGluZSBjbGFtcCB1Z2xpbmVzcyB0byB2ZXJ0aWNhbCBm bGV4aWJsZSBib3hlcyAodGh1cyBrZWVwaW5nIGl0IG91dCBvZgogICAgIC8vIG1haW5zdHJlYW0g YmxvY2sgbGF5b3V0KTsgdGhpcyBpcyBub3QgcmVhbGx5IHBhcnQgb2YgdGhlIFhVTCBib3ggbW9k ZWwuCiAgICAgYm9vbCBoYXZlTGluZUNsYW1wID0gIXN0eWxlKCktPmxpbmVDbGFtcCgpLmlzTm9u ZSgpOwotICAgIGlmIChoYXZlTGluZUNsYW1wKSB7Ci0gICAgICAgIGludCBtYXhMaW5lQ291bnQg PSAwOwotICAgICAgICBjaGlsZCA9IGl0ZXJhdG9yLmZpcnN0KCk7Ci0gICAgICAgIHdoaWxlIChj aGlsZCkgewotICAgICAgICAgICAgaWYgKCFjaGlsZC0+aXNQb3NpdGlvbmVkKCkpIHsKLSAgICAg ICAgICAgICAgICBpZiAocmVsYXlvdXRDaGlsZHJlbiB8fCAoY2hpbGQtPmlzUmVwbGFjZWQoKSAm JiAoY2hpbGQtPnN0eWxlKCktPndpZHRoKCkuaXNQZXJjZW50KCkgfHwgY2hpbGQtPnN0eWxlKCkt PmhlaWdodCgpLmlzUGVyY2VudCgpKSkgfHwKLSAgICAgICAgICAgICAgICAgICAgKGNoaWxkLT5z dHlsZSgpLT5oZWlnaHQoKS5pc0F1dG8oKSAmJiBjaGlsZC0+aXNCbG9ja0Zsb3coKSAmJiAhY2hp bGQtPm5lZWRzTGF5b3V0KCkpKSB7Ci0gICAgICAgICAgICAgICAgICAgIGNoaWxkLT5zZXRDaGls ZE5lZWRzTGF5b3V0KHRydWUsIGZhbHNlKTsKLSAgICAgICAgICAgICAgICAgICAgCi0gICAgICAg ICAgICAgICAgICAgIC8vIERpcnR5IGFsbCB0aGUgcG9zaXRpb25lZCBvYmplY3RzLgotICAgICAg ICAgICAgICAgICAgICBpZiAoY2hpbGQtPmlzUmVuZGVyQmxvY2soKSkgewotICAgICAgICAgICAg ICAgICAgICAgICAgdG9SZW5kZXJCbG9jayhjaGlsZCktPm1hcmtQb3NpdGlvbmVkT2JqZWN0c0Zv ckxheW91dCgpOwotICAgICAgICAgICAgICAgICAgICAgICAgdG9SZW5kZXJCbG9jayhjaGlsZCkt PmNsZWFyVHJ1bmNhdGlvbigpOwotICAgICAgICAgICAgICAgICAgICB9Ci0gICAgICAgICAgICAg ICAgfQotICAgICAgICAgICAgICAgIGNoaWxkLT5sYXlvdXRJZk5lZWRlZCgpOwotICAgICAgICAg ICAgICAgIGlmIChjaGlsZC0+c3R5bGUoKS0+aGVpZ2h0KCkuaXNBdXRvKCkgJiYgY2hpbGQtPmlz QmxvY2tGbG93KCkpCi0gICAgICAgICAgICAgICAgICAgIG1heExpbmVDb3VudCA9IG1heChtYXhM aW5lQ291bnQsIHRvUmVuZGVyQmxvY2soY2hpbGQpLT5saW5lQ291bnQoKSk7Ci0gICAgICAgICAg ICB9Ci0gICAgICAgICAgICBjaGlsZCA9IGl0ZXJhdG9yLm5leHQoKTsKLSAgICAgICAgfQotICAg ICAgICAKLSAgICAgICAgLy8gR2V0IHRoZSAjIG9mIGxpbmVzIGFuZCB0aGVuIGFsdGVyIGFsbCBi bG9jayBmbG93IGNoaWxkcmVuIHdpdGggYXV0byBoZWlnaHQgdG8gdXNlIHRoZQotICAgICAgICAv LyBzcGVjaWZpZWQgaGVpZ2h0LiBXZSBhbHdheXMgdHJ5IHRvIGxlYXZlIHJvb20gZm9yIGF0IGxl YXN0IG9uZSBsaW5lLgotICAgICAgICBMaW5lQ2xhbXBWYWx1ZSBsaW5lQ2xhbXAgPSBzdHlsZSgp LT5saW5lQ2xhbXAoKTsKLSAgICAgICAgaW50IG51bVZpc2libGVMaW5lcyA9IGxpbmVDbGFtcC5p c1BlcmNlbnRhZ2UoKSA/IG1heCgxLCAobWF4TGluZUNvdW50ICsgMSkgKiBsaW5lQ2xhbXAudmFs dWUoKSAvIDEwMCkgOiBsaW5lQ2xhbXAudmFsdWUoKTsKLSAgICAgICAgaWYgKG51bVZpc2libGVM aW5lcyA8IG1heExpbmVDb3VudCkgewotICAgICAgICAgICAgZm9yIChjaGlsZCA9IGl0ZXJhdG9y LmZpcnN0KCk7IGNoaWxkOyBjaGlsZCA9IGl0ZXJhdG9yLm5leHQoKSkgewotICAgICAgICAgICAg ICAgIGlmIChjaGlsZC0+aXNQb3NpdGlvbmVkKCkgfHwgIWNoaWxkLT5zdHlsZSgpLT5oZWlnaHQo KS5pc0F1dG8oKSB8fCAhY2hpbGQtPmlzQmxvY2tGbG93KCkpCi0gICAgICAgICAgICAgICAgICAg IGNvbnRpbnVlOwotICAgICAgICAgICAgICAgIAotICAgICAgICAgICAgICAgIFJlbmRlckJsb2Nr KiBibG9ja0NoaWxkID0gdG9SZW5kZXJCbG9jayhjaGlsZCk7Ci0gICAgICAgICAgICAgICAgaW50 IGxpbmVDb3VudCA9IGJsb2NrQ2hpbGQtPmxpbmVDb3VudCgpOwotICAgICAgICAgICAgICAgIGlm IChsaW5lQ291bnQgPD0gbnVtVmlzaWJsZUxpbmVzKQotICAgICAgICAgICAgICAgICAgICBjb250 aW51ZTsKLSAgICAgICAgICAgICAgICAKLSAgICAgICAgICAgICAgICBpbnQgbmV3SGVpZ2h0ID0g YmxvY2tDaGlsZC0+aGVpZ2h0Rm9yTGluZUNvdW50KG51bVZpc2libGVMaW5lcyk7Ci0gICAgICAg ICAgICAgICAgaWYgKG5ld0hlaWdodCA9PSBjaGlsZC0+aGVpZ2h0KCkpCi0gICAgICAgICAgICAg ICAgICAgIGNvbnRpbnVlOwotICAgICAgICAgICAgICAgIAotICAgICAgICAgICAgICAgIGNoaWxk LT5zZXRDaGlsZE5lZWRzTGF5b3V0KHRydWUsIGZhbHNlKTsKLSAgICAgICAgICAgICAgICBjaGls ZC0+c2V0T3ZlcnJpZGVTaXplKG5ld0hlaWdodCk7Ci0gICAgICAgICAgICAgICAgbV9mbGV4aW5n Q2hpbGRyZW4gPSB0cnVlOwotICAgICAgICAgICAgICAgIGNoaWxkLT5sYXlvdXRJZk5lZWRlZCgp OwotICAgICAgICAgICAgICAgIG1fZmxleGluZ0NoaWxkcmVuID0gZmFsc2U7Ci0gICAgICAgICAg ICAgICAgY2hpbGQtPnNldE92ZXJyaWRlU2l6ZSgtMSk7Ci0gICAgICAgICAgICAgICAgCi0gICAg ICAgICAgICAgICAgLy8gRklYTUU6IEZvciBub3cgZG9uJ3Qgc3VwcG9ydCBSVEwuCi0gICAgICAg ICAgICAgICAgaWYgKHN0eWxlKCktPmRpcmVjdGlvbigpICE9IExUUikKLSAgICAgICAgICAgICAg ICAgICAgY29udGludWU7Ci0gICAgICAgICAgICAgICAgCi0gICAgICAgICAgICAgICAgLy8gR2V0 IHRoZSBsYXN0IGxpbmUKLSAgICAgICAgICAgICAgICBSb290SW5saW5lQm94KiBsYXN0TGluZSA9 IGJsb2NrQ2hpbGQtPmxpbmVBdEluZGV4KGxpbmVDb3VudC0xKTsKLSAgICAgICAgICAgICAgICBp ZiAoIWxhc3RMaW5lKQotICAgICAgICAgICAgICAgICAgICBjb250aW51ZTsKLSAgICAgICAgICAg ICAgICAKLSAgICAgICAgICAgICAgICBSb290SW5saW5lQm94KiBsYXN0VmlzaWJsZUxpbmUgPSBi bG9ja0NoaWxkLT5saW5lQXRJbmRleChudW1WaXNpYmxlTGluZXMtMSk7Ci0gICAgICAgICAgICAg ICAgaWYgKCFsYXN0VmlzaWJsZUxpbmUpCi0gICAgICAgICAgICAgICAgICAgIGNvbnRpbnVlOwot Ci0gICAgICAgICAgICAgICAgY29uc3QgVUNoYXIgZWxsaXBzaXNBbmRTcGFjZVsyXSA9IHsgaG9y aXpvbnRhbEVsbGlwc2lzLCAnICcgfTsKLSAgICAgICAgICAgICAgICBERUZJTkVfU1RBVElDX0xP Q0FMKEF0b21pY1N0cmluZywgZWxsaXBzaXNBbmRTcGFjZVN0ciwgKGVsbGlwc2lzQW5kU3BhY2Us IDIpKTsKLSAgICAgICAgICAgICAgICBERUZJTkVfU1RBVElDX0xPQ0FMKEF0b21pY1N0cmluZywg ZWxsaXBzaXNTdHIsICgmaG9yaXpvbnRhbEVsbGlwc2lzLCAxKSk7Ci0gICAgICAgICAgICAgICAg Y29uc3QgRm9udCYgZm9udCA9IHN0eWxlKG51bVZpc2libGVMaW5lcyA9PSAxKS0+Zm9udCgpOwot Ci0gICAgICAgICAgICAgICAgLy8gR2V0IGVsbGlwc2lzIHdpZHRoLCBhbmQgaWYgdGhlIGxhc3Qg Y2hpbGQgaXMgYW4gYW5jaG9yLCBpdCB3aWxsIGdvIGFmdGVyIHRoZSBlbGxpcHNpcywgc28gYWRk IGluIGEgc3BhY2UgYW5kIHRoZSBhbmNob3Igd2lkdGggdG9vIAotICAgICAgICAgICAgICAgIGlu dCB0b3RhbFdpZHRoOwotICAgICAgICAgICAgICAgIElubGluZUJveCogYW5jaG9yQm94ID0gbGFz dExpbmUtPmxhc3RDaGlsZCgpOwotICAgICAgICAgICAgICAgIGlmIChhbmNob3JCb3ggJiYgYW5j aG9yQm94LT5yZW5kZXJlcigpLT5ub2RlKCkgJiYgYW5jaG9yQm94LT5yZW5kZXJlcigpLT5ub2Rl KCktPmlzTGluaygpKQotICAgICAgICAgICAgICAgICAgICB0b3RhbFdpZHRoID0gYW5jaG9yQm94 LT53aWR0aCgpICsgZm9udC53aWR0aChUZXh0UnVuKGVsbGlwc2lzQW5kU3BhY2UsIDIpKTsKLSAg ICAgICAgICAgICAgICBlbHNlIHsKLSAgICAgICAgICAgICAgICAgICAgYW5jaG9yQm94ID0gMDsK LSAgICAgICAgICAgICAgICAgICAgdG90YWxXaWR0aCA9IGZvbnQud2lkdGgoVGV4dFJ1bigmaG9y aXpvbnRhbEVsbGlwc2lzLCAxKSk7Ci0gICAgICAgICAgICAgICAgfQotICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAKLSAgICAgICAgICAgICAgICAvLyBTZWUgaWYgdGhpcyB3aWR0aCBj YW4gYmUgYWNjb21tb2RhdGVkIG9uIHRoZSBsYXN0IHZpc2libGUgbGluZQotICAgICAgICAgICAg ICAgIFJlbmRlckJsb2NrKiBkZXN0QmxvY2sgPSB0b1JlbmRlckJsb2NrKGxhc3RWaXNpYmxlTGlu ZS0+cmVuZGVyZXIoKSk7Ci0gICAgICAgICAgICAgICAgUmVuZGVyQmxvY2sqIHNyY0Jsb2NrID0g dG9SZW5kZXJCbG9jayhsYXN0TGluZS0+cmVuZGVyZXIoKSk7Ci0gICAgICAgICAgICAgICAgCi0g ICAgICAgICAgICAgICAgLy8gRklYTUU6IERpcmVjdGlvbnMgb2Ygc3JjL2Rlc3RCbG9jayBjb3Vs ZCBiZSBkaWZmZXJlbnQgZnJvbSBvdXIgZGlyZWN0aW9uIGFuZCBmcm9tIG9uZSBhbm90aGVyLgot ICAgICAgICAgICAgICAgIGlmIChzcmNCbG9jay0+c3R5bGUoKS0+ZGlyZWN0aW9uKCkgIT0gTFRS KQotICAgICAgICAgICAgICAgICAgICBjb250aW51ZTsKLSAgICAgICAgICAgICAgICBpZiAoZGVz dEJsb2NrLT5zdHlsZSgpLT5kaXJlY3Rpb24oKSAhPSBMVFIpCi0gICAgICAgICAgICAgICAgICAg IGNvbnRpbnVlOwotICAgICAgICAgICAgICAgIGludCBsdHIgPSB0cnVlOwotCi0gICAgICAgICAg ICAgICAgaW50IGJsb2NrUmlnaHRFZGdlID0gZGVzdEJsb2NrLT5yaWdodE9mZnNldChsYXN0Vmlz aWJsZUxpbmUtPnkoKSwgZmFsc2UpOwotICAgICAgICAgICAgICAgIGludCBibG9ja0xlZnRFZGdl ID0gZGVzdEJsb2NrLT5sZWZ0T2Zmc2V0KGxhc3RWaXNpYmxlTGluZS0+eSgpLCBmYWxzZSk7Ci0K LSAgICAgICAgICAgICAgICBpbnQgYmxvY2tFZGdlID0gbHRyID8gYmxvY2tSaWdodEVkZ2UgOiBi bG9ja0xlZnRFZGdlOwotICAgICAgICAgICAgICAgIGlmICghbGFzdFZpc2libGVMaW5lLT5jYW5B Y2NvbW1vZGF0ZUVsbGlwc2lzKGx0ciwgYmxvY2tFZGdlLAotICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGxhc3RWaXNpYmxlTGluZS0+ eCgpICsgbGFzdFZpc2libGVMaW5lLT53aWR0aCgpLAotICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHRvdGFsV2lkdGgpKQotICAgICAg ICAgICAgICAgICAgICBjb250aW51ZTsKLQotICAgICAgICAgICAgICAgIC8vIExldCB0aGUgdHJ1 bmNhdGlvbiBjb2RlIGtpY2sgaW4uCi0gICAgICAgICAgICAgICAgbGFzdFZpc2libGVMaW5lLT5w bGFjZUVsbGlwc2lzKGFuY2hvckJveCA/IGVsbGlwc2lzQW5kU3BhY2VTdHIgOiBlbGxpcHNpc1N0 ciwgbHRyLCBibG9ja0xlZnRFZGdlLCBibG9ja1JpZ2h0RWRnZSwgdG90YWxXaWR0aCwgYW5jaG9y Qm94KTsKLSAgICAgICAgICAgICAgICBkZXN0QmxvY2stPnNldEhhc01hcmt1cFRydW5jYXRpb24o dHJ1ZSk7Ci0gICAgICAgICAgICB9Ci0gICAgICAgIH0KLSAgICB9CisgICAgaWYgKGhhdmVMaW5l Q2xhbXApCisgICAgICAgIGFwcGx5TGluZUNsYW1wKGl0ZXJhdG9yLCByZWxheW91dENoaWxkcmVu KTsKIAogICAgIFJlbmRlckJsb2NrOjpzdGFydERlbGF5VXBkYXRlU2Nyb2xsSW5mbygpOwogCkBA IC05OTYsNiArODk3LDEwOSBAQCB2b2lkIFJlbmRlckZsZXhpYmxlQm94OjpsYXlvdXRWZXJ0aWNh bEJvCiAgICAgICAgIHNldEhlaWdodChvbGRIZWlnaHQpOyAKIH0KIAordm9pZCBSZW5kZXJGbGV4 aWJsZUJveDo6YXBwbHlMaW5lQ2xhbXAoRmxleEJveEl0ZXJhdG9yJiBpdGVyYXRvciwgYm9vbCBy ZWxheW91dENoaWxkcmVuKQoreworICAgIGludCBtYXhMaW5lQ291bnQgPSAwOworICAgIFJlbmRl ckJveCogY2hpbGQgPSBpdGVyYXRvci5maXJzdCgpOworICAgIHdoaWxlIChjaGlsZCkgeworICAg ICAgICBpZiAoIWNoaWxkLT5pc1Bvc2l0aW9uZWQoKSkgeworICAgICAgICAgICAgaWYgKHJlbGF5 b3V0Q2hpbGRyZW4gfHwgKGNoaWxkLT5pc1JlcGxhY2VkKCkgJiYgKGNoaWxkLT5zdHlsZSgpLT53 aWR0aCgpLmlzUGVyY2VudCgpIHx8IGNoaWxkLT5zdHlsZSgpLT5oZWlnaHQoKS5pc1BlcmNlbnQo KSkpIHx8CisgICAgICAgICAgICAgICAgKGNoaWxkLT5zdHlsZSgpLT5oZWlnaHQoKS5pc0F1dG8o KSAmJiBjaGlsZC0+aXNCbG9ja0Zsb3coKSAmJiAhY2hpbGQtPm5lZWRzTGF5b3V0KCkpKSB7Cisg ICAgICAgICAgICAgICAgY2hpbGQtPnNldENoaWxkTmVlZHNMYXlvdXQodHJ1ZSwgZmFsc2UpOwor ICAgICAgICAgICAgICAgIAorICAgICAgICAgICAgICAgIC8vIERpcnR5IGFsbCB0aGUgcG9zaXRp b25lZCBvYmplY3RzLgorICAgICAgICAgICAgICAgIGlmIChjaGlsZC0+aXNSZW5kZXJCbG9jaygp KSB7CisgICAgICAgICAgICAgICAgICAgIHRvUmVuZGVyQmxvY2soY2hpbGQpLT5tYXJrUG9zaXRp b25lZE9iamVjdHNGb3JMYXlvdXQoKTsKKyAgICAgICAgICAgICAgICAgICAgdG9SZW5kZXJCbG9j ayhjaGlsZCktPmNsZWFyVHJ1bmNhdGlvbigpOworICAgICAgICAgICAgICAgIH0KKyAgICAgICAg ICAgIH0KKyAgICAgICAgICAgIGNoaWxkLT5sYXlvdXRJZk5lZWRlZCgpOworICAgICAgICAgICAg aWYgKGNoaWxkLT5zdHlsZSgpLT5oZWlnaHQoKS5pc0F1dG8oKSAmJiBjaGlsZC0+aXNCbG9ja0Zs b3coKSkKKyAgICAgICAgICAgICAgICBtYXhMaW5lQ291bnQgPSBtYXgobWF4TGluZUNvdW50LCB0 b1JlbmRlckJsb2NrKGNoaWxkKS0+bGluZUNvdW50KCkpOworICAgICAgICB9CisgICAgICAgIGNo aWxkID0gaXRlcmF0b3IubmV4dCgpOworICAgIH0KKyAgICAKKyAgICAvLyBHZXQgdGhlICMgb2Yg bGluZXMgYW5kIHRoZW4gYWx0ZXIgYWxsIGJsb2NrIGZsb3cgY2hpbGRyZW4gd2l0aCBhdXRvIGhl aWdodCB0byB1c2UgdGhlCisgICAgLy8gc3BlY2lmaWVkIGhlaWdodC4gV2UgYWx3YXlzIHRyeSB0 byBsZWF2ZSByb29tIGZvciBhdCBsZWFzdCBvbmUgbGluZS4KKyAgICBMaW5lQ2xhbXBWYWx1ZSBs aW5lQ2xhbXAgPSBzdHlsZSgpLT5saW5lQ2xhbXAoKTsKKyAgICBpbnQgbnVtVmlzaWJsZUxpbmVz ID0gbGluZUNsYW1wLmlzUGVyY2VudGFnZSgpID8gbWF4KDEsIChtYXhMaW5lQ291bnQgKyAxKSAq IGxpbmVDbGFtcC52YWx1ZSgpIC8gMTAwKSA6IGxpbmVDbGFtcC52YWx1ZSgpOworICAgIGlmIChu dW1WaXNpYmxlTGluZXMgPCBtYXhMaW5lQ291bnQpIHsKKyAgICAgICAgZm9yIChjaGlsZCA9IGl0 ZXJhdG9yLmZpcnN0KCk7IGNoaWxkOyBjaGlsZCA9IGl0ZXJhdG9yLm5leHQoKSkgeworICAgICAg ICAgICAgaWYgKGNoaWxkLT5pc1Bvc2l0aW9uZWQoKSB8fCAhY2hpbGQtPnN0eWxlKCktPmhlaWdo dCgpLmlzQXV0bygpIHx8ICFjaGlsZC0+aXNCbG9ja0Zsb3coKSkKKyAgICAgICAgICAgICAgICBj b250aW51ZTsKKyAgICAgICAgICAgIAorICAgICAgICAgICAgUmVuZGVyQmxvY2sqIGJsb2NrQ2hp bGQgPSB0b1JlbmRlckJsb2NrKGNoaWxkKTsKKyAgICAgICAgICAgIGludCBsaW5lQ291bnQgPSBi bG9ja0NoaWxkLT5saW5lQ291bnQoKTsKKyAgICAgICAgICAgIGlmIChsaW5lQ291bnQgPD0gbnVt VmlzaWJsZUxpbmVzKQorICAgICAgICAgICAgICAgIGNvbnRpbnVlOworICAgICAgICAgICAgCisg ICAgICAgICAgICBpbnQgbmV3SGVpZ2h0ID0gYmxvY2tDaGlsZC0+aGVpZ2h0Rm9yTGluZUNvdW50 KG51bVZpc2libGVMaW5lcyk7CisgICAgICAgICAgICBpZiAobmV3SGVpZ2h0ID09IGNoaWxkLT5o ZWlnaHQoKSkKKyAgICAgICAgICAgICAgICBjb250aW51ZTsKKyAgICAgICAgICAgIAorICAgICAg ICAgICAgY2hpbGQtPnNldENoaWxkTmVlZHNMYXlvdXQodHJ1ZSwgZmFsc2UpOworICAgICAgICAg ICAgY2hpbGQtPnNldE92ZXJyaWRlU2l6ZShuZXdIZWlnaHQpOworICAgICAgICAgICAgbV9mbGV4 aW5nQ2hpbGRyZW4gPSB0cnVlOworICAgICAgICAgICAgY2hpbGQtPmxheW91dElmTmVlZGVkKCk7 CisgICAgICAgICAgICBtX2ZsZXhpbmdDaGlsZHJlbiA9IGZhbHNlOworICAgICAgICAgICAgY2hp bGQtPnNldE92ZXJyaWRlU2l6ZSgtMSk7CisgICAgICAgICAgICAKKyAgICAgICAgICAgIC8vIEZJ WE1FOiBGb3Igbm93IGRvbid0IHN1cHBvcnQgUlRMLgorICAgICAgICAgICAgaWYgKHN0eWxlKCkt PmRpcmVjdGlvbigpICE9IExUUikKKyAgICAgICAgICAgICAgICBjb250aW51ZTsKKyAgICAgICAg ICAgIAorICAgICAgICAgICAgLy8gR2V0IHRoZSBsYXN0IGxpbmUKKyAgICAgICAgICAgIFJvb3RJ bmxpbmVCb3gqIGxhc3RMaW5lID0gYmxvY2tDaGlsZC0+bGluZUF0SW5kZXgobGluZUNvdW50LTEp OworICAgICAgICAgICAgaWYgKCFsYXN0TGluZSkKKyAgICAgICAgICAgICAgICBjb250aW51ZTsK KyAgICAgICAgICAgIAorICAgICAgICAgICAgUm9vdElubGluZUJveCogbGFzdFZpc2libGVMaW5l ID0gYmxvY2tDaGlsZC0+bGluZUF0SW5kZXgobnVtVmlzaWJsZUxpbmVzLTEpOworICAgICAgICAg ICAgaWYgKCFsYXN0VmlzaWJsZUxpbmUpCisgICAgICAgICAgICAgICAgY29udGludWU7CisgICAg ICAgICAgICAKKyAgICAgICAgICAgIGNvbnN0IFVDaGFyIGVsbGlwc2lzQW5kU3BhY2VbMl0gPSB7 IGhvcml6b250YWxFbGxpcHNpcywgJyAnIH07CisgICAgICAgICAgICBERUZJTkVfU1RBVElDX0xP Q0FMKEF0b21pY1N0cmluZywgZWxsaXBzaXNBbmRTcGFjZVN0ciwgKGVsbGlwc2lzQW5kU3BhY2Us IDIpKTsKKyAgICAgICAgICAgIERFRklORV9TVEFUSUNfTE9DQUwoQXRvbWljU3RyaW5nLCBlbGxp cHNpc1N0ciwgKCZob3Jpem9udGFsRWxsaXBzaXMsIDEpKTsKKyAgICAgICAgICAgIGNvbnN0IEZv bnQmIGZvbnQgPSBzdHlsZShudW1WaXNpYmxlTGluZXMgPT0gMSktPmZvbnQoKTsKKyAgICAgICAg ICAgIAorICAgICAgICAgICAgLy8gR2V0IGVsbGlwc2lzIHdpZHRoLCBhbmQgaWYgdGhlIGxhc3Qg Y2hpbGQgaXMgYW4gYW5jaG9yLCBpdCB3aWxsIGdvIGFmdGVyIHRoZSBlbGxpcHNpcywgc28gYWRk IGluIGEgc3BhY2UgYW5kIHRoZSBhbmNob3Igd2lkdGggdG9vIAorICAgICAgICAgICAgaW50IHRv dGFsV2lkdGg7CisgICAgICAgICAgICBJbmxpbmVCb3gqIGFuY2hvckJveCA9IGxhc3RMaW5lLT5s YXN0Q2hpbGQoKTsKKyAgICAgICAgICAgIGlmIChhbmNob3JCb3ggJiYgYW5jaG9yQm94LT5yZW5k ZXJlcigpLT5ub2RlKCkgJiYgYW5jaG9yQm94LT5yZW5kZXJlcigpLT5ub2RlKCktPmlzTGluaygp KQorICAgICAgICAgICAgICAgIHRvdGFsV2lkdGggPSBhbmNob3JCb3gtPndpZHRoKCkgKyBmb250 LndpZHRoKFRleHRSdW4oZWxsaXBzaXNBbmRTcGFjZSwgMikpOworICAgICAgICAgICAgZWxzZSB7 CisgICAgICAgICAgICAgICAgYW5jaG9yQm94ID0gMDsKKyAgICAgICAgICAgICAgICB0b3RhbFdp ZHRoID0gZm9udC53aWR0aChUZXh0UnVuKCZob3Jpem9udGFsRWxsaXBzaXMsIDEpKTsKKyAgICAg ICAgICAgIH0KKyAgICAgICAgICAgIAorICAgICAgICAgICAgLy8gU2VlIGlmIHRoaXMgd2lkdGgg Y2FuIGJlIGFjY29tbW9kYXRlZCBvbiB0aGUgbGFzdCB2aXNpYmxlIGxpbmUKKyAgICAgICAgICAg IFJlbmRlckJsb2NrKiBkZXN0QmxvY2sgPSB0b1JlbmRlckJsb2NrKGxhc3RWaXNpYmxlTGluZS0+ cmVuZGVyZXIoKSk7CisgICAgICAgICAgICBSZW5kZXJCbG9jayogc3JjQmxvY2sgPSB0b1JlbmRl ckJsb2NrKGxhc3RMaW5lLT5yZW5kZXJlcigpKTsKKyAgICAgICAgICAgIAorICAgICAgICAgICAg Ly8gRklYTUU6IERpcmVjdGlvbnMgb2Ygc3JjL2Rlc3RCbG9jayBjb3VsZCBiZSBkaWZmZXJlbnQg ZnJvbSBvdXIgZGlyZWN0aW9uIGFuZCBmcm9tIG9uZSBhbm90aGVyLgorICAgICAgICAgICAgaWYg KHNyY0Jsb2NrLT5zdHlsZSgpLT5kaXJlY3Rpb24oKSAhPSBMVFIpCisgICAgICAgICAgICAgICAg Y29udGludWU7CisgICAgICAgICAgICBpZiAoZGVzdEJsb2NrLT5zdHlsZSgpLT5kaXJlY3Rpb24o KSAhPSBMVFIpCisgICAgICAgICAgICAgICAgY29udGludWU7CisgICAgICAgICAgICBpbnQgbHRy ID0gdHJ1ZTsKKyAgICAgICAgICAgIAorICAgICAgICAgICAgaW50IGJsb2NrUmlnaHRFZGdlID0g ZGVzdEJsb2NrLT5yaWdodE9mZnNldChsYXN0VmlzaWJsZUxpbmUtPnkoKSwgZmFsc2UpOworICAg ICAgICAgICAgaW50IGJsb2NrTGVmdEVkZ2UgPSBkZXN0QmxvY2stPmxlZnRPZmZzZXQobGFzdFZp c2libGVMaW5lLT55KCksIGZhbHNlKTsKKyAgICAgICAgICAgIAorICAgICAgICAgICAgaW50IGJs b2NrRWRnZSA9IGx0ciA/IGJsb2NrUmlnaHRFZGdlIDogYmxvY2tMZWZ0RWRnZTsKKyAgICAgICAg ICAgIGlmICghbGFzdFZpc2libGVMaW5lLT5jYW5BY2NvbW1vZGF0ZUVsbGlwc2lzKGx0ciwgYmxv Y2tFZGdlLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgbGFzdFZpc2libGVMaW5lLT54KCkgKyBsYXN0VmlzaWJsZUxpbmUtPndpZHRoKCks CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICB0b3RhbFdpZHRoKSkKKyAgICAgICAgICAgICAgICBjb250aW51ZTsKKyAgICAgICAgICAgIAor ICAgICAgICAgICAgLy8gTGV0IHRoZSB0cnVuY2F0aW9uIGNvZGUga2ljayBpbi4KKyAgICAgICAg ICAgIGxhc3RWaXNpYmxlTGluZS0+cGxhY2VFbGxpcHNpcyhhbmNob3JCb3ggPyBlbGxpcHNpc0Fu ZFNwYWNlU3RyIDogZWxsaXBzaXNTdHIsIGx0ciwgYmxvY2tMZWZ0RWRnZSwgYmxvY2tSaWdodEVk Z2UsIHRvdGFsV2lkdGgsIGFuY2hvckJveCk7CisgICAgICAgICAgICBkZXN0QmxvY2stPnNldEhh c01hcmt1cFRydW5jYXRpb24odHJ1ZSk7CisgICAgICAgIH0KKyAgICB9Cit9CisKIHZvaWQgUmVu ZGVyRmxleGlibGVCb3g6OnBsYWNlQ2hpbGQoUmVuZGVyQm94KiBjaGlsZCwgaW50IHgsIGludCB5 KQogewogICAgIEludFJlY3Qgb2xkUmVjdChjaGlsZC0+eCgpLCBjaGlsZC0+eSgpICwgY2hpbGQt PndpZHRoKCksIGNoaWxkLT5oZWlnaHQoKSk7CkluZGV4OiBXZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJGbGV4aWJsZUJveC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZs ZXhpYmxlQm94LmgJKHJldmlzaW9uIDY3MTYxKQorKysgV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy RmxleGlibGVCb3guaAkod29ya2luZyBjb3B5KQpAQCAtMjcsNiArMjcsOCBAQAogCiBuYW1lc3Bh Y2UgV2ViQ29yZSB7CiAKK2NsYXNzIEZsZXhCb3hJdGVyYXRvcjsKKwogY2xhc3MgUmVuZGVyRmxl eGlibGVCb3ggOiBwdWJsaWMgUmVuZGVyQmxvY2sgewogcHVibGljOgogICAgIFJlbmRlckZsZXhp YmxlQm94KE5vZGUqKTsKQEAgLTU5LDYgKzYxLDkgQEAgcHJvdGVjdGVkOgogCiAgICAgYm9vbCBt X2ZsZXhpbmdDaGlsZHJlbiA6IDE7CiAgICAgYm9vbCBtX3N0cmV0Y2hpbmdDaGlsZHJlbiA6IDE7 CisKK3ByaXZhdGU6CisgICAgdm9pZCBhcHBseUxpbmVDbGFtcChGbGV4Qm94SXRlcmF0b3ImLCBi b29sIHJlbGF5b3V0Q2hpbGRyZW4pOwogfTsKIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQo=