122326 2013-10-04 07:31:43 -0700 Tighten markContainingBlocksForLayout 2013-10-04 12:21:48 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 koivisto webkit-unassigned kling oldest_to_newest 936192 0 koivisto 2013-10-04 07:31:43 -0700 Yes we can 936196 1 213364 koivisto 2013-10-04 07:41:22 -0700 Created attachment 213364 patch 936306 2 koivisto 2013-10-04 12:21:48 -0700 https://trac.webkit.org/r156904 213364 2013-10-04 07:41:22 -0700 2013-10-04 08:22:03 -0700 patch mark-containing-tighten.patch text/plain 8874 koivisto SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1Njg4OCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDEwIEBACisyMDEzLTEwLTA0ICBBbnR0aSBL b2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBUaWdodGVuIG1hcmtDb250YWlu aW5nQmxvY2tzRm9yTGF5b3V0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xMjIzMjYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KwogMjAxMy0xMC0wNCAgS3J6eXN6dG9mIFdvbGFuc2tpICA8ay53b2xhbnNraUBzYW1zdW5nLmNv bT4KIAogICAgICAgICBbRUZMXSBFbmFibGUgY29ycmVjdCBiZWhhdmlvdXIgZm9yIGRlbGV0aW5n IHJlZ2lvbmFsIGluZGljYXRvciBzeW1ib2xzCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wYWdlL0Zy YW1lVmlldy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcu Y3BwCShyZXZpc2lvbiAxNTY4NzYpCisrKyBTb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5j cHAJKHdvcmtpbmcgY29weSkKQEAgLTI0MDIsNyArMjQwMiw3IEBAIHN0YXRpYyBib29sIGlzT2Jq ZWN0QW5jZXN0b3JDb250YWluZXJPZigKICAgICByZXR1cm4gZmFsc2U7CiB9CiAKLXZvaWQgRnJh bWVWaWV3OjpzY2hlZHVsZVJlbGF5b3V0T2ZTdWJ0cmVlKFJlbmRlck9iamVjdCYgbmV3UmVsYXlv dXRSb290KQordm9pZCBGcmFtZVZpZXc6OnNjaGVkdWxlUmVsYXlvdXRPZlN1YnRyZWUoUmVuZGVy RWxlbWVudCYgbmV3UmVsYXlvdXRSb290KQogewogICAgIEFTU0VSVChyZW5kZXJWaWV3KCkpOwog ICAgIFJlbmRlclZpZXcmIHJlbmRlclZpZXcgPSAqdGhpcy0+cmVuZGVyVmlldygpOwpAQCAtMzM4 NSw3ICszMzg1LDcgQEAgYm9vbCBGcmFtZVZpZXc6OmRvTGF5b3V0V2l0aEZyYW1lRmxhdHRlbgog CiAgICAgcGFyZW50Vmlldy0+bGF5b3V0KGFsbG93U3VidHJlZSk7CiAKLSAgICBSZW5kZXJPYmpl Y3QqIHJvb3QgPSBtX2xheW91dFJvb3QgPyBtX2xheW91dFJvb3QgOiBmcmFtZSgpLmRvY3VtZW50 KCktPnJlbmRlclZpZXcoKTsKKyAgICBSZW5kZXJFbGVtZW50KiByb290ID0gbV9sYXlvdXRSb290 ID8gbV9sYXlvdXRSb290IDogZnJhbWUoKS5kb2N1bWVudCgpLT5yZW5kZXJWaWV3KCk7CiAgICAg QVNTRVJUX1VOVVNFRChyb290LCAhcm9vdC0+bmVlZHNMYXlvdXQoKSk7CiAKICAgICByZXR1cm4g dHJ1ZTsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmgKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuaAkocmV2aXNpb24gMTU2ODc1KQorKysg U291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuaAkod29ya2luZyBjb3B5KQpAQCAtMTA2LDcg KzEwNiw3IEBAIHB1YmxpYzoKICAgICBib29sIGRpZEZpcnN0TGF5b3V0KCkgY29uc3Q7CiAgICAg dm9pZCBsYXlvdXRUaW1lckZpcmVkKFRpbWVyPEZyYW1lVmlldz4qKTsKICAgICB2b2lkIHNjaGVk dWxlUmVsYXlvdXQoKTsKLSAgICB2b2lkIHNjaGVkdWxlUmVsYXlvdXRPZlN1YnRyZWUoUmVuZGVy T2JqZWN0Jik7CisgICAgdm9pZCBzY2hlZHVsZVJlbGF5b3V0T2ZTdWJ0cmVlKFJlbmRlckVsZW1l bnQmKTsKICAgICB2b2lkIHVuc2NoZWR1bGVSZWxheW91dCgpOwogICAgIGJvb2wgbGF5b3V0UGVu ZGluZygpIGNvbnN0OwogICAgIGJvb2wgaXNJbkxheW91dCgpIGNvbnN0IHsgcmV0dXJuIG1faW5M YXlvdXQ7IH0KQEAgLTU2Nyw3ICs1NjcsNyBAQCBwcml2YXRlOgogCiAgICAgVGltZXI8RnJhbWVW aWV3PiBtX2xheW91dFRpbWVyOwogICAgIGJvb2wgbV9kZWxheWVkTGF5b3V0OwotICAgIFJlbmRl ck9iamVjdCogbV9sYXlvdXRSb290OworICAgIFJlbmRlckVsZW1lbnQqIG1fbGF5b3V0Um9vdDsK ICAgICAKICAgICBib29sIG1fbGF5b3V0U2NoZWR1bGluZ0VuYWJsZWQ7CiAgICAgYm9vbCBtX2lu TGF5b3V0OwpJbmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck9iamVjdC5jcHAK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck9iamVjdC5jcHAJ KHJldmlzaW9uIDE1Njg3NikKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJPYmpl Y3QuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC01OTUsOSArNTk1LDEyIEBAIFJlbmRlckJsb2NrKiBS ZW5kZXJPYmplY3Q6OmZpcnN0TGluZUJsb2MKICAgICByZXR1cm4gMDsKIH0KIAotc3RhdGljIGlu bGluZSBib29sIG9iamVjdElzUmVsYXlvdXRCb3VuZGFyeShjb25zdCBSZW5kZXJPYmplY3QqIG9i amVjdCkKK3N0YXRpYyBpbmxpbmUgYm9vbCBvYmplY3RJc1JlbGF5b3V0Qm91bmRhcnkoY29uc3Qg UmVuZGVyRWxlbWVudCogb2JqZWN0KQogewogICAgIC8vIEZJWE1FOiBJbiBmdXR1cmUgaXQgbWF5 IGJlIHBvc3NpYmxlIHRvIGJyb2FkZW4gdGhlc2UgY29uZGl0aW9ucyBpbiBvcmRlciB0byBpbXBy b3ZlIHBlcmZvcm1hbmNlLgorICAgIGlmIChvYmplY3QtPmlzUmVuZGVyVmlldygpKQorICAgICAg ICByZXR1cm4gdHJ1ZTsKKwogICAgIGlmIChvYmplY3QtPmlzVGV4dENvbnRyb2woKSkKICAgICAg ICAgcmV0dXJuIHRydWU7CiAKQEAgLTYzNCw2MiArNjM3LDcyIEBAIHZvaWQgUmVuZGVyT2JqZWN0 OjpjbGVhck5lZWRzTGF5b3V0KCkKICNlbmRpZgogfQogCi12b2lkIFJlbmRlck9iamVjdDo6bWFy a0NvbnRhaW5pbmdCbG9ja3NGb3JMYXlvdXQoYm9vbCBzY2hlZHVsZVJlbGF5b3V0LCBSZW5kZXJP YmplY3QqIG5ld1Jvb3QpCitzdGF0aWMgdm9pZCBzY2hlZHVsZVJlbGF5b3V0Rm9yU3VidHJlZShS ZW5kZXJFbGVtZW50JiByZW5kZXJlcikKK3sKKyAgICBpZiAoIXJlbmRlcmVyLmlzUmVuZGVyVmll dygpKSB7CisgICAgICAgIGlmICghcmVuZGVyZXIuaXNSb290ZWQoKSkKKyAgICAgICAgICAgIHJl dHVybjsKKyAgICAgICAgcmVuZGVyZXIudmlldygpLmZyYW1lVmlldygpLnNjaGVkdWxlUmVsYXlv dXRPZlN1YnRyZWUocmVuZGVyZXIpOworICAgICAgICByZXR1cm47CisgICAgfQorICAgIHRvUmVu ZGVyVmlldyhyZW5kZXJlcikuZnJhbWVWaWV3KCkuc2NoZWR1bGVSZWxheW91dCgpOworfQorCit2 b2lkIFJlbmRlck9iamVjdDo6bWFya0NvbnRhaW5pbmdCbG9ja3NGb3JMYXlvdXQoYm9vbCBzY2hl ZHVsZVJlbGF5b3V0LCBSZW5kZXJFbGVtZW50KiBuZXdSb290KQogewogICAgIEFTU0VSVCghc2No ZWR1bGVSZWxheW91dCB8fCAhbmV3Um9vdCk7CiAgICAgQVNTRVJUKCFpc1NldE5lZWRzTGF5b3V0 Rm9yYmlkZGVuKCkpOwogCi0gICAgUmVuZGVyRWxlbWVudCogb2JqZWN0ID0gY29udGFpbmVyKCk7 Ci0gICAgUmVuZGVyT2JqZWN0KiBsYXN0ID0gdGhpczsKKyAgICBSZW5kZXJFbGVtZW50KiBhbmNl c3RvciA9IGNvbnRhaW5lcigpOwogCiAgICAgYm9vbCBzaW1wbGlmaWVkTm9ybWFsRmxvd0xheW91 dCA9IG5lZWRzU2ltcGxpZmllZE5vcm1hbEZsb3dMYXlvdXQoKSAmJiAhc2VsZk5lZWRzTGF5b3V0 KCkgJiYgIW5vcm1hbENoaWxkTmVlZHNMYXlvdXQoKTsKKyAgICBib29sIGhhc091dE9mRmxvd1Bv c2l0aW9uID0gIWlzVGV4dCgpICYmIHN0eWxlKCktPmhhc091dE9mRmxvd1Bvc2l0aW9uKCk7CiAK LSAgICB3aGlsZSAob2JqZWN0KSB7CisgICAgd2hpbGUgKGFuY2VzdG9yKSB7CiAjaWZuZGVmIE5E RUJVRwogICAgICAgICAvLyBGSVhNRTogUmVtb3ZlIHRoaXMgb25jZSB3ZSByZW1vdmUgdGhlIHNw ZWNpYWwgY2FzZXMgZm9yIGNvdW50ZXJzLCBxdW90ZXMgYW5kIG1hdGhtbAogICAgICAgICAvLyBj YWxsaW5nIHNldE5lZWRzTGF5b3V0IGR1cmluZyBwcmVmZXJyZWQgd2lkdGggY29tcHV0YXRpb24u Ci0gICAgICAgIFNldExheW91dE5lZWRlZEZvcmJpZGRlblNjb3BlIGxheW91dEZvcmJpZGRlblNj b3BlKG9iamVjdCwgaXNTZXROZWVkc0xheW91dEZvcmJpZGRlbigpKTsKKyAgICAgICAgU2V0TGF5 b3V0TmVlZGVkRm9yYmlkZGVuU2NvcGUgbGF5b3V0Rm9yYmlkZGVuU2NvcGUoYW5jZXN0b3IsIGlz U2V0TmVlZHNMYXlvdXRGb3JiaWRkZW4oKSk7CiAjZW5kaWYKICAgICAgICAgLy8gRG9uJ3QgbWFy ayB0aGUgb3V0ZXJtb3N0IG9iamVjdCBvZiBhbiB1bnJvb3RlZCBzdWJ0cmVlLiBUaGF0IG9iamVj dCB3aWxsIGJlCiAgICAgICAgIC8vIG1hcmtlZCB3aGVuIHRoZSBzdWJ0cmVlIGlzIGFkZGVkIHRv IHRoZSBkb2N1bWVudC4KLSAgICAgICAgUmVuZGVyRWxlbWVudCogY29udGFpbmVyID0gb2JqZWN0 LT5jb250YWluZXIoKTsKLSAgICAgICAgaWYgKCFjb250YWluZXIgJiYgIW9iamVjdC0+aXNSZW5k ZXJWaWV3KCkpCisgICAgICAgIFJlbmRlckVsZW1lbnQqIGNvbnRhaW5lciA9IGFuY2VzdG9yLT5j b250YWluZXIoKTsKKyAgICAgICAgaWYgKCFjb250YWluZXIgJiYgIWFuY2VzdG9yLT5pc1JlbmRl clZpZXcoKSkKICAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgaWYgKCFsYXN0LT5pc1RleHQo KSAmJiBsYXN0LT5zdHlsZSgpLT5oYXNPdXRPZkZsb3dQb3NpdGlvbigpKSB7Ci0gICAgICAgICAg ICBib29sIHdpbGxTa2lwUmVsYXRpdmVseVBvc2l0aW9uZWRJbmxpbmVzID0gIW9iamVjdC0+aXNS ZW5kZXJCbG9jaygpIHx8IG9iamVjdC0+aXNBbm9ueW1vdXNCbG9jaygpOworICAgICAgICBpZiAo aGFzT3V0T2ZGbG93UG9zaXRpb24pIHsKKyAgICAgICAgICAgIGJvb2wgd2lsbFNraXBSZWxhdGl2 ZWx5UG9zaXRpb25lZElubGluZXMgPSAhYW5jZXN0b3ItPmlzUmVuZGVyQmxvY2soKSB8fCBhbmNl c3Rvci0+aXNBbm9ueW1vdXNCbG9jaygpOwogICAgICAgICAgICAgLy8gU2tpcCByZWxhdGl2ZWx5 IHBvc2l0aW9uZWQgaW5saW5lcyBhbmQgYW5vbnltb3VzIGJsb2NrcyB0byBnZXQgdG8gdGhlIGVu Y2xvc2luZyBSZW5kZXJCbG9jay4KLSAgICAgICAgICAgIHdoaWxlIChvYmplY3QgJiYgKCFvYmpl Y3QtPmlzUmVuZGVyQmxvY2soKSB8fCBvYmplY3QtPmlzQW5vbnltb3VzQmxvY2soKSkpCi0gICAg ICAgICAgICAgICAgb2JqZWN0ID0gb2JqZWN0LT5jb250YWluZXIoKTsKLSAgICAgICAgICAgIGlm ICghb2JqZWN0IHx8IG9iamVjdC0+cG9zQ2hpbGROZWVkc0xheW91dCgpKQorICAgICAgICAgICAg d2hpbGUgKGFuY2VzdG9yICYmICghYW5jZXN0b3ItPmlzUmVuZGVyQmxvY2soKSB8fCBhbmNlc3Rv ci0+aXNBbm9ueW1vdXNCbG9jaygpKSkKKyAgICAgICAgICAgICAgICBhbmNlc3RvciA9IGFuY2Vz dG9yLT5jb250YWluZXIoKTsKKyAgICAgICAgICAgIGlmICghYW5jZXN0b3IgfHwgYW5jZXN0b3It PnBvc0NoaWxkTmVlZHNMYXlvdXQoKSkKICAgICAgICAgICAgICAgICByZXR1cm47CiAgICAgICAg ICAgICBpZiAod2lsbFNraXBSZWxhdGl2ZWx5UG9zaXRpb25lZElubGluZXMpCi0gICAgICAgICAg ICAgICAgY29udGFpbmVyID0gb2JqZWN0LT5jb250YWluZXIoKTsKLSAgICAgICAgICAgIG9iamVj dC0+c2V0UG9zQ2hpbGROZWVkc0xheW91dEJpdCh0cnVlKTsKKyAgICAgICAgICAgICAgICBjb250 YWluZXIgPSBhbmNlc3Rvci0+Y29udGFpbmVyKCk7CisgICAgICAgICAgICBhbmNlc3Rvci0+c2V0 UG9zQ2hpbGROZWVkc0xheW91dEJpdCh0cnVlKTsKICAgICAgICAgICAgIHNpbXBsaWZpZWROb3Jt YWxGbG93TGF5b3V0ID0gdHJ1ZTsKLSAgICAgICAgICAgIEFTU0VSVCghb2JqZWN0LT5pc1NldE5l ZWRzTGF5b3V0Rm9yYmlkZGVuKCkpOwogICAgICAgICB9IGVsc2UgaWYgKHNpbXBsaWZpZWROb3Jt YWxGbG93TGF5b3V0KSB7Ci0gICAgICAgICAgICBpZiAob2JqZWN0LT5uZWVkc1NpbXBsaWZpZWRO b3JtYWxGbG93TGF5b3V0KCkpCisgICAgICAgICAgICBpZiAoYW5jZXN0b3ItPm5lZWRzU2ltcGxp ZmllZE5vcm1hbEZsb3dMYXlvdXQoKSkKICAgICAgICAgICAgICAgICByZXR1cm47Ci0gICAgICAg ICAgICBvYmplY3QtPnNldE5lZWRzU2ltcGxpZmllZE5vcm1hbEZsb3dMYXlvdXRCaXQodHJ1ZSk7 Ci0gICAgICAgICAgICBBU1NFUlQoIW9iamVjdC0+aXNTZXROZWVkc0xheW91dEZvcmJpZGRlbigp KTsKKyAgICAgICAgICAgIGFuY2VzdG9yLT5zZXROZWVkc1NpbXBsaWZpZWROb3JtYWxGbG93TGF5 b3V0Qml0KHRydWUpOwogICAgICAgICB9IGVsc2UgewotICAgICAgICAgICAgaWYgKG9iamVjdC0+ bm9ybWFsQ2hpbGROZWVkc0xheW91dCgpKQorICAgICAgICAgICAgaWYgKGFuY2VzdG9yLT5ub3Jt YWxDaGlsZE5lZWRzTGF5b3V0KCkpCiAgICAgICAgICAgICAgICAgcmV0dXJuOwotICAgICAgICAg ICAgb2JqZWN0LT5zZXROb3JtYWxDaGlsZE5lZWRzTGF5b3V0Qml0KHRydWUpOwotICAgICAgICAg ICAgQVNTRVJUKCFvYmplY3QtPmlzU2V0TmVlZHNMYXlvdXRGb3JiaWRkZW4oKSk7CisgICAgICAg ICAgICBhbmNlc3Rvci0+c2V0Tm9ybWFsQ2hpbGROZWVkc0xheW91dEJpdCh0cnVlKTsKICAgICAg ICAgfQorICAgICAgICBBU1NFUlQoIWFuY2VzdG9yLT5pc1NldE5lZWRzTGF5b3V0Rm9yYmlkZGVu KCkpOwogCi0gICAgICAgIGlmIChvYmplY3QgPT0gbmV3Um9vdCkKKyAgICAgICAgaWYgKGFuY2Vz dG9yID09IG5ld1Jvb3QpCiAgICAgICAgICAgICByZXR1cm47CiAKLSAgICAgICAgbGFzdCA9IG9i amVjdDsKLSAgICAgICAgaWYgKHNjaGVkdWxlUmVsYXlvdXQgJiYgb2JqZWN0SXNSZWxheW91dEJv dW5kYXJ5KGxhc3QpKQorICAgICAgICBpZiAoc2NoZWR1bGVSZWxheW91dCAmJiBvYmplY3RJc1Jl bGF5b3V0Qm91bmRhcnkoYW5jZXN0b3IpKQogICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgIG9i amVjdCA9IGNvbnRhaW5lcjsKKworICAgICAgICBoYXNPdXRPZkZsb3dQb3NpdGlvbiA9IGFuY2Vz dG9yLT5zdHlsZSgpLT5oYXNPdXRPZkZsb3dQb3NpdGlvbigpOworICAgICAgICBhbmNlc3RvciA9 IGNvbnRhaW5lcjsKICAgICB9CiAKLSAgICBpZiAoc2NoZWR1bGVSZWxheW91dCkKLSAgICAgICAg bGFzdC0+c2NoZWR1bGVSZWxheW91dCgpOworICAgIGlmIChzY2hlZHVsZVJlbGF5b3V0ICYmIGFu Y2VzdG9yKQorICAgICAgICBzY2hlZHVsZVJlbGF5b3V0Rm9yU3VidHJlZSgqYW5jZXN0b3IpOwog fQogCiAjaWZuZGVmIE5ERUJVRwpAQCAtMjIwNCwxNiArMjIxNyw2IEBAIGJvb2wgUmVuZGVyT2Jq ZWN0Ojpub2RlQXRQb2ludChjb25zdCBIaXQKICAgICByZXR1cm4gZmFsc2U7CiB9CiAKLXZvaWQg UmVuZGVyT2JqZWN0OjpzY2hlZHVsZVJlbGF5b3V0KCkKLXsKLSAgICBpZiAoaXNSZW5kZXJWaWV3 KCkpCi0gICAgICAgIHRvUmVuZGVyVmlldygqdGhpcykuZnJhbWVWaWV3KCkuc2NoZWR1bGVSZWxh eW91dCgpOwotICAgIGVsc2UgewotICAgICAgICBpZiAoaXNSb290ZWQoKSkKLSAgICAgICAgICAg IHZpZXcoKS5mcmFtZVZpZXcoKS5zY2hlZHVsZVJlbGF5b3V0T2ZTdWJ0cmVlKCp0aGlzKTsKLSAg ICB9Ci19Ci0KIHZvaWQgUmVuZGVyT2JqZWN0OjpsYXlvdXQoKQogewogICAgIFN0YWNrU3RhdHM6 OkxheW91dENoZWNrUG9pbnQgbGF5b3V0Q2hlY2tQb2ludDsKSW5kZXg6IFNvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJPYmplY3QuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmgJKHJldmlzaW9uIDE1Njg3NikKKysrIFNvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJPYmplY3QuaAkod29ya2luZyBjb3B5KQpAQCAtNjE2LDcgKzYx Niw3IEBAIHB1YmxpYzoKIAogICAgIFJlbmRlckJveE1vZGVsT2JqZWN0KiBvZmZzZXRQYXJlbnQo KSBjb25zdDsKIAotICAgIHZvaWQgbWFya0NvbnRhaW5pbmdCbG9ja3NGb3JMYXlvdXQoYm9vbCBz Y2hlZHVsZVJlbGF5b3V0ID0gdHJ1ZSwgUmVuZGVyT2JqZWN0KiBuZXdSb290ID0gMCk7CisgICAg dm9pZCBtYXJrQ29udGFpbmluZ0Jsb2Nrc0ZvckxheW91dChib29sIHNjaGVkdWxlUmVsYXlvdXQg PSB0cnVlLCBSZW5kZXJFbGVtZW50KiBuZXdSb290ID0gMCk7CiAgICAgdm9pZCBzZXROZWVkc0xh eW91dChNYXJraW5nQmVoYXZpb3IgPSBNYXJrQ29udGFpbmluZ0Jsb2NrQ2hhaW4pOwogICAgIHZv aWQgY2xlYXJOZWVkc0xheW91dCgpOwogICAgIHZvaWQgc2V0UHJlZmVycmVkTG9naWNhbFdpZHRo c0RpcnR5KGJvb2wsIE1hcmtpbmdCZWhhdmlvciA9IE1hcmtDb250YWluaW5nQmxvY2tDaGFpbik7 CkBAIC02NTMsOCArNjUzLDYgQEAgcHVibGljOgogICAgIHZvaWQgc2V0SGFzVHJhbnNmb3JtKGJv b2wgYiA9IHRydWUpIHsgbV9iaXRmaWVsZHMuc2V0SGFzVHJhbnNmb3JtKGIpOyB9CiAgICAgdm9p ZCBzZXRIYXNSZWZsZWN0aW9uKGJvb2wgYiA9IHRydWUpIHsgbV9iaXRmaWVsZHMuc2V0SGFzUmVm bGVjdGlvbihiKTsgfQogCi0gICAgdm9pZCBzY2hlZHVsZVJlbGF5b3V0KCk7Ci0KICAgICB2aXJ0 dWFsIHZvaWQgcGFpbnQoUGFpbnRJbmZvJiwgY29uc3QgTGF5b3V0UG9pbnQmKTsKIAogICAgIC8v IFJlY3Vyc2l2ZSBmdW5jdGlvbiB0aGF0IGNvbXB1dGVzIHRoZSBzaXplIGFuZCBwb3NpdGlvbiBv ZiB0aGlzIG9iamVjdCBhbmQgYWxsIGl0cyBkZXNjZW5kYW50cy4K