127769 2014-01-28 02:41:30 -0800 Renaming isTableElement() to isRenderedTable() as per the FIXME comment 2014-02-07 02:16:24 -0800 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED BlinkMergeCandidate P2 Normal --- 1 lvidacs.u-szeged webkit-unassigned andersca commit-queue joepeck kling ossy rniwa oldest_to_newest 972860 0 lvidacs.u-szeged 2014-01-28 02:41:30 -0800 Small refactoring in WebCore/editing, blink merge candidate from https://chromium.googlesource.com/chromium/blink/+/92189a9881a5ccdec4197fe086000a3af3939ec5 972893 1 222438 lvidacs.u-szeged 2014-01-28 06:42:45 -0800 Created attachment 222438 Patch 977761 2 222438 kling 2014-02-07 01:47:31 -0800 Comment on attachment 222438 Patch Sure, this seems like a slight improvement. 977772 3 222438 commit-queue 2014-02-07 02:16:22 -0800 Comment on attachment 222438 Patch Clearing flags on attachment: 222438 Committed r163617: <http://trac.webkit.org/changeset/163617> 977773 4 commit-queue 2014-02-07 02:16:24 -0800 All reviewed patches have been landed. Closing bug. 222438 2014-01-28 06:42:45 -0800 2014-02-07 02:16:22 -0800 Patch bug-127769-20140128154242.patch text/plain 13056 lvidacs.u-szeged U3VidmVyc2lvbiBSZXZpc2lvbjogMTYyOTI0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTU5ODhlZmE1OWI1MGU5 NGFlMjEzZjk3YjE1MDcyZTkwNDY1MzJhMy4uOTkyNDY5MGFmNjdmYjdlMzA4OWU2OTUzN2VlODQw ZjgwNWQyOTk0NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM1IEBACisyMDE0LTAxLTI4ICBMYXN6 bG8gVmlkYWNzICA8bHZpZGFjcy51LXN6ZWdlZEBwYXJ0bmVyLnNhbXN1bmcuY29tPgorCisgICAg ICAgIFJlbmFtaW5nIGlzVGFibGVFbGVtZW50KCkgdG8gaXNSZW5kZXJlZFRhYmxlKCkgYXMgcGVy IHRoZSBGSVhNRSBjb21tZW50CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xMjc3NjkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBSZW5hbWUgbWV0aG9kIGFuZCB1c2UgSXNUYWJsZSgpIGluc3RlYWQgb2YgbG9j YWwgdHlwZSBjaGVja2luZy4KKworICAgICAgICAqIGRvbS9Qb3NpdGlvbi5jcHA6CisgICAgICAg IChXZWJDb3JlOjpQb3NpdGlvbjo6cGFyZW50QW5jaG9yZWRFcXVpdmFsZW50KToKKyAgICAgICAg KFdlYkNvcmU6OlBvc2l0aW9uOjp1cHN0cmVhbSk6CisgICAgICAgIChXZWJDb3JlOjpQb3NpdGlv bjo6ZG93bnN0cmVhbSk6CisgICAgICAgIChXZWJDb3JlOjpQb3NpdGlvbjo6aXNDYW5kaWRhdGUp OgorICAgICAgICAqIGRvbS9Qb3NpdGlvbkl0ZXJhdG9yLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OlBvc2l0aW9uSXRlcmF0b3I6OmlzQ2FuZGlkYXRlKToKKyAgICAgICAgKiBlZGl0aW5nL0NvbXBv c2l0ZUVkaXRDb21tYW5kLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNvbXBvc2l0ZUVkaXRDb21t YW5kOjpjbG9uZVBhcmFncmFwaFVuZGVyTmV3RWxlbWVudCk6CisgICAgICAgIChXZWJDb3JlOjpD b21wb3NpdGVFZGl0Q29tbWFuZDo6bW92ZVBhcmFncmFwaFdpdGhDbG9uZXMpOgorICAgICAgICAq IGVkaXRpbmcvRnJhbWVTZWxlY3Rpb24uY3BwOgorICAgICAgICAoV2ViQ29yZTo6Y2FyZXRSZW5k ZXJzSW5zaWRlTm9kZSk6CisgICAgICAgICogZWRpdGluZy9WaXNpYmxlVW5pdHMuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6c3RhcnRPZlBhcmFncmFwaCk6CisgICAgICAgIChXZWJDb3JlOjplbmRP ZlBhcmFncmFwaCk6CisgICAgICAgICogZWRpdGluZy9odG1sZWRpdGluZy5jcHA6CisgICAgICAg IChXZWJDb3JlOjpmaXJzdEluU3BlY2lhbEVsZW1lbnQpOgorICAgICAgICAoV2ViQ29yZTo6bGFz dEluU3BlY2lhbEVsZW1lbnQpOgorICAgICAgICAoV2ViQ29yZTo6aXNSZW5kZXJlZFRhYmxlKToK KyAgICAgICAgKiBlZGl0aW5nL2h0bWxlZGl0aW5nLmg6CisgICAgICAgICogcmVuZGVyaW5nL1Jl bmRlckJveC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCb3g6OmxvY2FsQ2FyZXRSZWN0 KToKKwogMjAxNC0wMS0yOCAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5j b20+CiAKICAgICAgICAgW1NPVVBdIFJlbW92ZSBzb3VwVVJJVG9LVVJMCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9kb20vUG9zaXRpb24uY3BwIGIvU291cmNlL1dlYkNvcmUvZG9tL1Bvc2l0 aW9uLmNwcAppbmRleCAyODdiMzdiMmJmMGVlYmNlNWRmMTYyYzM3YTMzYzhmYTM2OGI4OTZhLi5m ZDA4YTNlN2U3NDM1ZWQ5NDVmZmU1ZTMzYjRiNmYzMjU2ZjliY2NjIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9kb20vUG9zaXRpb24uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9Qb3Np dGlvbi5jcHAKQEAgLTIzNiwxMyArMjM2LDEzIEBAIFBvc2l0aW9uIFBvc2l0aW9uOjpwYXJlbnRB bmNob3JlZEVxdWl2YWxlbnQoKSBjb25zdAogICAgIAogICAgIC8vIEZJWE1FOiBUaGlzIHNob3Vs ZCBvbmx5IGJlIG5lY2Vzc2FyeSBmb3IgbGVnYWN5IHBvc2l0aW9ucywgYnV0IGlzIGFsc28gbmVl ZGVkIGZvciBwb3NpdGlvbnMgYmVmb3JlIGFuZCBhZnRlciBUYWJsZXMKICAgICBpZiAobV9vZmZz ZXQgPD0gMCAmJiAobV9hbmNob3JUeXBlICE9IFBvc2l0aW9uSXNBZnRlckFuY2hvciAmJiBtX2Fu Y2hvclR5cGUgIT0gUG9zaXRpb25Jc0FmdGVyQ2hpbGRyZW4pKSB7Ci0gICAgICAgIGlmIChmaW5k UGFyZW50KG1fYW5jaG9yTm9kZS5nZXQoKSkgJiYgKGVkaXRpbmdJZ25vcmVzQ29udGVudChtX2Fu Y2hvck5vZGUuZ2V0KCkpIHx8IGlzVGFibGVFbGVtZW50KG1fYW5jaG9yTm9kZS5nZXQoKSkpKQor ICAgICAgICBpZiAoZmluZFBhcmVudChtX2FuY2hvck5vZGUuZ2V0KCkpICYmIChlZGl0aW5nSWdu b3Jlc0NvbnRlbnQobV9hbmNob3JOb2RlLmdldCgpKSB8fCBpc1JlbmRlcmVkVGFibGUobV9hbmNo b3JOb2RlLmdldCgpKSkpCiAgICAgICAgICAgICByZXR1cm4gcG9zaXRpb25JblBhcmVudEJlZm9y ZU5vZGUobV9hbmNob3JOb2RlLmdldCgpKTsKICAgICAgICAgcmV0dXJuIFBvc2l0aW9uKG1fYW5j aG9yTm9kZS5nZXQoKSwgMCwgUG9zaXRpb25Jc09mZnNldEluQW5jaG9yKTsKICAgICB9CiAgICAg aWYgKCFtX2FuY2hvck5vZGUtPm9mZnNldEluQ2hhcmFjdGVycygpCiAgICAgICAgICYmIChtX2Fu Y2hvclR5cGUgPT0gUG9zaXRpb25Jc0FmdGVyQW5jaG9yIHx8IG1fYW5jaG9yVHlwZSA9PSBQb3Np dGlvbklzQWZ0ZXJDaGlsZHJlbiB8fCBzdGF0aWNfY2FzdDx1bnNpZ25lZD4obV9vZmZzZXQpID09 IG1fYW5jaG9yTm9kZS0+Y2hpbGROb2RlQ291bnQoKSkKLSAgICAgICAgJiYgKGVkaXRpbmdJZ25v cmVzQ29udGVudChtX2FuY2hvck5vZGUuZ2V0KCkpIHx8IGlzVGFibGVFbGVtZW50KG1fYW5jaG9y Tm9kZS5nZXQoKSkpCisgICAgICAgICYmIChlZGl0aW5nSWdub3Jlc0NvbnRlbnQobV9hbmNob3JO b2RlLmdldCgpKSB8fCBpc1JlbmRlcmVkVGFibGUobV9hbmNob3JOb2RlLmdldCgpKSkKICAgICAg ICAgJiYgY29udGFpbmVyTm9kZSgpKSB7CiAgICAgICAgIHJldHVybiBwb3NpdGlvbkluUGFyZW50 QWZ0ZXJOb2RlKG1fYW5jaG9yTm9kZS5nZXQoKSk7CiAgICAgfQpAQCAtNjM0LDcgKzYzNCw3IEBA IFBvc2l0aW9uIFBvc2l0aW9uOjp1cHN0cmVhbShFZGl0aW5nQm91bmRhcnlDcm9zc2luZ1J1bGUg cnVsZSkgY29uc3QKICAgICAgICAgICAgIHJldHVybiBsYXN0VmlzaWJsZTsKIAogICAgICAgICAv LyBSZXR1cm4gcG9zaXRpb24gYWZ0ZXIgdGFibGVzIGFuZCBub2RlcyB3aGljaCBoYXZlIGNvbnRl bnQgdGhhdCBjYW4gYmUgaWdub3JlZC4KLSAgICAgICAgaWYgKGVkaXRpbmdJZ25vcmVzQ29udGVu dChjdXJyZW50Tm9kZSkgfHwgaXNUYWJsZUVsZW1lbnQoY3VycmVudE5vZGUpKSB7CisgICAgICAg IGlmIChlZGl0aW5nSWdub3Jlc0NvbnRlbnQoY3VycmVudE5vZGUpIHx8IGlzUmVuZGVyZWRUYWJs ZShjdXJyZW50Tm9kZSkpIHsKICAgICAgICAgICAgIGlmIChjdXJyZW50UG9zLmF0RW5kT2ZOb2Rl KCkpCiAgICAgICAgICAgICAgICAgcmV0dXJuIHBvc2l0aW9uQWZ0ZXJOb2RlKGN1cnJlbnROb2Rl KTsKICAgICAgICAgICAgIGNvbnRpbnVlOwpAQCAtNzY2LDcgKzc2Niw3IEBAIFBvc2l0aW9uIFBv c2l0aW9uOjpkb3duc3RyZWFtKEVkaXRpbmdCb3VuZGFyeUNyb3NzaW5nUnVsZSBydWxlKSBjb25z dAogICAgICAgICAgICAgbGFzdFZpc2libGUgPSBjdXJyZW50UG9zOwogCiAgICAgICAgIC8vIFJl dHVybiBwb3NpdGlvbiBiZWZvcmUgdGFibGVzIGFuZCBub2RlcyB3aGljaCBoYXZlIGNvbnRlbnQg dGhhdCBjYW4gYmUgaWdub3JlZC4KLSAgICAgICAgaWYgKGVkaXRpbmdJZ25vcmVzQ29udGVudChj dXJyZW50Tm9kZSkgfHwgaXNUYWJsZUVsZW1lbnQoY3VycmVudE5vZGUpKSB7CisgICAgICAgIGlm IChlZGl0aW5nSWdub3Jlc0NvbnRlbnQoY3VycmVudE5vZGUpIHx8IGlzUmVuZGVyZWRUYWJsZShj dXJyZW50Tm9kZSkpIHsKICAgICAgICAgICAgIGlmIChjdXJyZW50UG9zLm9mZnNldEluTGVhZk5v ZGUoKSA8PSByZW5kZXJlci0+Y2FyZXRNaW5PZmZzZXQoKSkKICAgICAgICAgICAgICAgICByZXR1 cm4gY3JlYXRlTGVnYWN5RWRpdGluZ1Bvc2l0aW9uKGN1cnJlbnROb2RlLCByZW5kZXJlci0+Y2Fy ZXRNaW5PZmZzZXQoKSk7CiAgICAgICAgICAgICBjb250aW51ZTsKQEAgLTkyOCw3ICs5MjgsNyBA QCBib29sIFBvc2l0aW9uOjppc0NhbmRpZGF0ZSgpIGNvbnN0CiAgICAgaWYgKHJlbmRlcmVyLT5p c1RleHQoKSkKICAgICAgICAgcmV0dXJuICFub2RlSXNVc2VyU2VsZWN0Tm9uZShkZXByZWNhdGVk Tm9kZSgpKSAmJiB0b1JlbmRlclRleHQocmVuZGVyZXIpLT5jb250YWluc0NhcmV0T2Zmc2V0KG1f b2Zmc2V0KTsKIAotICAgIGlmIChpc1RhYmxlRWxlbWVudChkZXByZWNhdGVkTm9kZSgpKSB8fCBl ZGl0aW5nSWdub3Jlc0NvbnRlbnQoZGVwcmVjYXRlZE5vZGUoKSkpCisgICAgaWYgKGlzUmVuZGVy ZWRUYWJsZShkZXByZWNhdGVkTm9kZSgpKSB8fCBlZGl0aW5nSWdub3Jlc0NvbnRlbnQoZGVwcmVj YXRlZE5vZGUoKSkpCiAgICAgICAgIHJldHVybiAoYXRGaXJzdEVkaXRpbmdQb3NpdGlvbkZvck5v ZGUoKSB8fCBhdExhc3RFZGl0aW5nUG9zaXRpb25Gb3JOb2RlKCkpICYmICFub2RlSXNVc2VyU2Vs ZWN0Tm9uZShkZXByZWNhdGVkTm9kZSgpLT5wYXJlbnROb2RlKCkpOwogCiAgICAgaWYgKG1fYW5j aG9yTm9kZS0+aGFzVGFnTmFtZShodG1sVGFnKSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2RvbS9Qb3NpdGlvbkl0ZXJhdG9yLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9Qb3NpdGlvbkl0 ZXJhdG9yLmNwcAppbmRleCA1ZTdmZjc1ZTBmNTk4NGYyNGYxOTRiNjBiM2Y0ZDlmYzlmZTdkZDQ2 Li4xOTFkNzdlMmZhOWRkY2ZjNDFlNTE1NTFhNTdkZGEzNDA0YWUzMDc2IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9kb20vUG9zaXRpb25JdGVyYXRvci5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvZG9tL1Bvc2l0aW9uSXRlcmF0b3IuY3BwCkBAIC0xNTcsNyArMTU3LDcgQEAgYm9vbCBQb3Np dGlvbkl0ZXJhdG9yOjppc0NhbmRpZGF0ZSgpIGNvbnN0CiAgICAgaWYgKHJlbmRlcmVyLT5pc1Rl eHQoKSkKICAgICAgICAgcmV0dXJuICFQb3NpdGlvbjo6bm9kZUlzVXNlclNlbGVjdE5vbmUobV9h bmNob3JOb2RlKSAmJiB0b1JlbmRlclRleHQocmVuZGVyZXIpLT5jb250YWluc0NhcmV0T2Zmc2V0 KG1fb2Zmc2V0SW5BbmNob3IpOwogCi0gICAgaWYgKGlzVGFibGVFbGVtZW50KG1fYW5jaG9yTm9k ZSkgfHwgZWRpdGluZ0lnbm9yZXNDb250ZW50KG1fYW5jaG9yTm9kZSkpCisgICAgaWYgKGlzUmVu ZGVyZWRUYWJsZShtX2FuY2hvck5vZGUpIHx8IGVkaXRpbmdJZ25vcmVzQ29udGVudChtX2FuY2hv ck5vZGUpKQogICAgICAgICByZXR1cm4gKGF0U3RhcnRPZk5vZGUoKSB8fCBhdEVuZE9mTm9kZSgp KSAmJiAhUG9zaXRpb246Om5vZGVJc1VzZXJTZWxlY3ROb25lKG1fYW5jaG9yTm9kZS0+cGFyZW50 Tm9kZSgpKTsKIAogICAgIGlmICghbV9hbmNob3JOb2RlLT5oYXNUYWdOYW1lKGh0bWxUYWcpICYm IHJlbmRlcmVyLT5pc1JlbmRlckJsb2NrRmxvdygpKSB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9lZGl0aW5nL0NvbXBvc2l0ZUVkaXRDb21tYW5kLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2Vk aXRpbmcvQ29tcG9zaXRlRWRpdENvbW1hbmQuY3BwCmluZGV4IGUyMTFkYmJjZjI3OWU3ZjU3MzEy ODI1MWNlMTQyMGU0NWVkYTkyZDQuLmU3Y2U1N2JlMmY3YzI1NWNmYjcwZDBlNTJlMDI0YWM1NWU4 YTAyYWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvQ29tcG9zaXRlRWRpdENv bW1hbmQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvQ29tcG9zaXRlRWRpdENvbW1h bmQuY3BwCkBAIC0xMDU3LDcgKzEwNTcsNyBAQCB2b2lkIENvbXBvc2l0ZUVkaXRDb21tYW5kOjpj bG9uZVBhcmFncmFwaFVuZGVyTmV3RWxlbWVudChQb3NpdGlvbiYgc3RhcnQsIFBvc2l0aQogICAg IGlmIChvdXRlck5vZGUtPmlzUm9vdEVkaXRhYmxlRWxlbWVudCgpKSB7CiAgICAgICAgIGxhc3RO b2RlID0gYmxvY2tFbGVtZW50OwogICAgIH0gZWxzZSB7Ci0gICAgICAgIGxhc3ROb2RlID0gb3V0 ZXJOb2RlLT5jbG9uZU5vZGUoaXNUYWJsZUVsZW1lbnQob3V0ZXJOb2RlLmdldCgpKSk7CisgICAg ICAgIGxhc3ROb2RlID0gb3V0ZXJOb2RlLT5jbG9uZU5vZGUoaXNSZW5kZXJlZFRhYmxlKG91dGVy Tm9kZS5nZXQoKSkpOwogICAgICAgICBhcHBlbmROb2RlKGxhc3ROb2RlLCBibG9ja0VsZW1lbnQp OwogICAgIH0KIApAQCAtMTA3Miw3ICsxMDcyLDcgQEAgdm9pZCBDb21wb3NpdGVFZGl0Q29tbWFu ZDo6Y2xvbmVQYXJhZ3JhcGhVbmRlck5ld0VsZW1lbnQoUG9zaXRpb24mIHN0YXJ0LCBQb3NpdGkK IAogICAgICAgICBmb3IgKHNpemVfdCBpID0gYW5jZXN0b3JzLnNpemUoKTsgaSAhPSAwOyAtLWkp IHsKICAgICAgICAgICAgIE5vZGUqIGl0ZW0gPSBhbmNlc3RvcnNbaSAtIDFdLmdldCgpOwotICAg ICAgICAgICAgUmVmUHRyPE5vZGU+IGNoaWxkID0gaXRlbS0+Y2xvbmVOb2RlKGlzVGFibGVFbGVt ZW50KGl0ZW0pKTsKKyAgICAgICAgICAgIFJlZlB0cjxOb2RlPiBjaGlsZCA9IGl0ZW0tPmNsb25l Tm9kZShpc1JlbmRlcmVkVGFibGUoaXRlbSkpOwogICAgICAgICAgICAgYXBwZW5kTm9kZShjaGls ZCwgdG9FbGVtZW50KGxhc3ROb2RlLmdldCgpKSk7CiAgICAgICAgICAgICBsYXN0Tm9kZSA9IGNo aWxkLnJlbGVhc2UoKTsKICAgICAgICAgfQpAQCAtMTE5MCw3ICsxMTkwLDcgQEAgdm9pZCBDb21w b3NpdGVFZGl0Q29tbWFuZDo6bW92ZVBhcmFncmFwaFdpdGhDbG9uZXMoY29uc3QgVmlzaWJsZVBv c2l0aW9uJiBzdGFydE8KICAgICBiZWZvcmVQYXJhZ3JhcGggPSBWaXNpYmxlUG9zaXRpb24oYmVm b3JlUGFyYWdyYXBoLmRlZXBFcXVpdmFsZW50KCkpOwogICAgIGFmdGVyUGFyYWdyYXBoID0gVmlz aWJsZVBvc2l0aW9uKGFmdGVyUGFyYWdyYXBoLmRlZXBFcXVpdmFsZW50KCkpOwogCi0gICAgaWYg KGJlZm9yZVBhcmFncmFwaC5pc05vdE51bGwoKSAmJiAhaXNUYWJsZUVsZW1lbnQoYmVmb3JlUGFy YWdyYXBoLmRlZXBFcXVpdmFsZW50KCkuZGVwcmVjYXRlZE5vZGUoKSkKKyAgICBpZiAoYmVmb3Jl UGFyYWdyYXBoLmlzTm90TnVsbCgpICYmICFpc1JlbmRlcmVkVGFibGUoYmVmb3JlUGFyYWdyYXBo LmRlZXBFcXVpdmFsZW50KCkuZGVwcmVjYXRlZE5vZGUoKSkKICAgICAgICAgJiYgKCghaXNFbmRP ZlBhcmFncmFwaChiZWZvcmVQYXJhZ3JhcGgpICYmICFpc1N0YXJ0T2ZQYXJhZ3JhcGgoYmVmb3Jl UGFyYWdyYXBoKSkgfHwgYmVmb3JlUGFyYWdyYXBoID09IGFmdGVyUGFyYWdyYXBoKSkgewogICAg ICAgICAvLyBGSVhNRTogVHJpbSB0ZXh0IGJldHdlZW4gYmVmb3JlUGFyYWdyYXBoIGFuZCBhZnRl clBhcmFncmFwaCBpZiB0aGV5IGFyZW4ndCBlcXVhbC4KICAgICAgICAgaW5zZXJ0Tm9kZUF0KGNy ZWF0ZUJyZWFrRWxlbWVudChkb2N1bWVudCgpKSwgYmVmb3JlUGFyYWdyYXBoLmRlZXBFcXVpdmFs ZW50KCkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZWRpdGluZy9GcmFtZVNlbGVjdGlv bi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0ZyYW1lU2VsZWN0aW9uLmNwcAppbmRleCBm Y2RmNjc3M2JkMDJkMjdhYjIyOGUxMDlmMmYyYjBiOTNmYzlhNDY0Li45NDVkZDg2NjU4YTBlMmM3 M2VjMWFhMWE4YjE4NjgwZTEwMmQ4NGI3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9lZGl0 aW5nL0ZyYW1lU2VsZWN0aW9uLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0ZyYW1l U2VsZWN0aW9uLmNwcApAQCAtMTI4OCw3ICsxMjg4LDcgQEAgdm9pZCBDYXJldEJhc2U6OmNsZWFy Q2FyZXRSZWN0KCkKIAogc3RhdGljIGlubGluZSBib29sIGNhcmV0UmVuZGVyc0luc2lkZU5vZGUo Tm9kZSogbm9kZSkKIHsKLSAgICByZXR1cm4gbm9kZSAmJiAhaXNUYWJsZUVsZW1lbnQobm9kZSkg JiYgIWVkaXRpbmdJZ25vcmVzQ29udGVudChub2RlKTsKKyAgICByZXR1cm4gbm9kZSAmJiAhaXNS ZW5kZXJlZFRhYmxlKG5vZGUpICYmICFlZGl0aW5nSWdub3Jlc0NvbnRlbnQobm9kZSk7CiB9CiAK IHN0YXRpYyBSZW5kZXJPYmplY3QqIGNhcmV0UmVuZGVyZXIoTm9kZSogbm9kZSkKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvVmlzaWJsZVVuaXRzLmNwcCBiL1NvdXJjZS9XZWJD b3JlL2VkaXRpbmcvVmlzaWJsZVVuaXRzLmNwcAppbmRleCBiMDgyYjNkYWMyN2RjZDY0NTE3Nzc2 YTZmMWUwNWZkYThkZThmNGI5Li5kODEzNTVhMjY0NWUyMWY1OTNhZmFiOTgxNzUyODllZmY5NTNk ZjYxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL1Zpc2libGVVbml0cy5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvZWRpdGluZy9WaXNpYmxlVW5pdHMuY3BwCkBAIC0xMTU5LDcg KzExNTksNyBAQCBWaXNpYmxlUG9zaXRpb24gc3RhcnRPZlBhcmFncmFwaChjb25zdCBWaXNpYmxl UG9zaXRpb24mIGMsIEVkaXRpbmdCb3VuZGFyeUNyb3NzaQogICAgICAgICAgICAgbm9kZSA9IG47 CiAgICAgICAgICAgICBvZmZzZXQgPSAwOwogICAgICAgICAgICAgbiA9IE5vZGVUcmF2ZXJzYWw6 OnByZXZpb3VzUG9zdE9yZGVyKG4sIHN0YXJ0QmxvY2spOwotICAgICAgICB9IGVsc2UgaWYgKGVk aXRpbmdJZ25vcmVzQ29udGVudChuKSB8fCBpc1RhYmxlRWxlbWVudChuKSkgeworICAgICAgICB9 IGVsc2UgaWYgKGVkaXRpbmdJZ25vcmVzQ29udGVudChuKSB8fCBpc1JlbmRlcmVkVGFibGUobikp IHsKICAgICAgICAgICAgIG5vZGUgPSBuOwogICAgICAgICAgICAgdHlwZSA9IFBvc2l0aW9uOjpQ b3NpdGlvbklzQmVmb3JlQW5jaG9yOwogICAgICAgICAgICAgbiA9IG4tPnByZXZpb3VzU2libGlu ZygpID8gbi0+cHJldmlvdXNTaWJsaW5nKCkgOiBOb2RlVHJhdmVyc2FsOjpwcmV2aW91c1Bvc3RP cmRlcihuLCBzdGFydEJsb2NrKTsKQEAgLTEyMzksNyArMTIzOSw3IEBAIFZpc2libGVQb3NpdGlv biBlbmRPZlBhcmFncmFwaChjb25zdCBWaXNpYmxlUG9zaXRpb24gJmMsIEVkaXRpbmdCb3VuZGFy eUNyb3NzaW5nCiAgICAgICAgICAgICBub2RlID0gbjsKICAgICAgICAgICAgIG9mZnNldCA9IHIt PmNhcmV0TWF4T2Zmc2V0KCk7CiAgICAgICAgICAgICBuID0gTm9kZVRyYXZlcnNhbDo6bmV4dChu LCBzdGF5SW5zaWRlQmxvY2spOwotICAgICAgICB9IGVsc2UgaWYgKGVkaXRpbmdJZ25vcmVzQ29u dGVudChuKSB8fCBpc1RhYmxlRWxlbWVudChuKSkgeworICAgICAgICB9IGVsc2UgaWYgKGVkaXRp bmdJZ25vcmVzQ29udGVudChuKSB8fCBpc1JlbmRlcmVkVGFibGUobikpIHsKICAgICAgICAgICAg IG5vZGUgPSBuOwogICAgICAgICAgICAgdHlwZSA9IFBvc2l0aW9uOjpQb3NpdGlvbklzQWZ0ZXJB bmNob3I7CiAgICAgICAgICAgICBuID0gTm9kZVRyYXZlcnNhbDo6bmV4dFNraXBwaW5nQ2hpbGRy ZW4obiwgc3RheUluc2lkZUJsb2NrKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2VkaXRp bmcvaHRtbGVkaXRpbmcuY3BwIGIvU291cmNlL1dlYkNvcmUvZWRpdGluZy9odG1sZWRpdGluZy5j cHAKaW5kZXggOWU3MjFjNmRhNWQ3NTNjY2UxNzdiZDk3OGNmMDAzYTVlNzhlY2MzMC4uZTMzZjVi ZDIyODQ2MDYwNGExYTZkMjk0YWFhZjhhZDgxZWM1Mzg1NyAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvZWRpdGluZy9odG1sZWRpdGluZy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvZWRpdGlu Zy9odG1sZWRpdGluZy5jcHAKQEAgLTQyMyw3ICs0MjMsNyBAQCBzdGF0aWMgTm9kZSogZmlyc3RJ blNwZWNpYWxFbGVtZW50KGNvbnN0IFBvc2l0aW9uJiBwb3MpCiAgICAgICAgIGlmIChpc1NwZWNp YWxFbGVtZW50KG4pKSB7CiAgICAgICAgICAgICBWaXNpYmxlUG9zaXRpb24gdlBvcyA9IFZpc2li bGVQb3NpdGlvbihwb3MsIERPV05TVFJFQU0pOwogICAgICAgICAgICAgVmlzaWJsZVBvc2l0aW9u IGZpcnN0SW5FbGVtZW50ID0gVmlzaWJsZVBvc2l0aW9uKGZpcnN0UG9zaXRpb25Jbk9yQmVmb3Jl Tm9kZShuKSwgRE9XTlNUUkVBTSk7Ci0gICAgICAgICAgICBpZiAoaXNUYWJsZUVsZW1lbnQobikg JiYgdlBvcyA9PSBmaXJzdEluRWxlbWVudC5uZXh0KCkpCisgICAgICAgICAgICBpZiAoaXNSZW5k ZXJlZFRhYmxlKG4pICYmIHZQb3MgPT0gZmlyc3RJbkVsZW1lbnQubmV4dCgpKQogICAgICAgICAg ICAgICAgIHJldHVybiBuOwogICAgICAgICAgICAgaWYgKHZQb3MgPT0gZmlyc3RJbkVsZW1lbnQp CiAgICAgICAgICAgICAgICAgcmV0dXJuIG47CkBAIC00MzgsNyArNDM4LDcgQEAgc3RhdGljIE5v ZGUqIGxhc3RJblNwZWNpYWxFbGVtZW50KGNvbnN0IFBvc2l0aW9uJiBwb3MpCiAgICAgICAgIGlm IChpc1NwZWNpYWxFbGVtZW50KG4pKSB7CiAgICAgICAgICAgICBWaXNpYmxlUG9zaXRpb24gdlBv cyA9IFZpc2libGVQb3NpdGlvbihwb3MsIERPV05TVFJFQU0pOwogICAgICAgICAgICAgVmlzaWJs ZVBvc2l0aW9uIGxhc3RJbkVsZW1lbnQgPSBWaXNpYmxlUG9zaXRpb24obGFzdFBvc2l0aW9uSW5P ckFmdGVyTm9kZShuKSwgRE9XTlNUUkVBTSk7Ci0gICAgICAgICAgICBpZiAoaXNUYWJsZUVsZW1l bnQobikgJiYgdlBvcyA9PSBsYXN0SW5FbGVtZW50LnByZXZpb3VzKCkpCisgICAgICAgICAgICBp ZiAoaXNSZW5kZXJlZFRhYmxlKG4pICYmIHZQb3MgPT0gbGFzdEluRWxlbWVudC5wcmV2aW91cygp KQogICAgICAgICAgICAgICAgIHJldHVybiBuOwogICAgICAgICAgICAgaWYgKHZQb3MgPT0gbGFz dEluRWxlbWVudCkKICAgICAgICAgICAgICAgICByZXR1cm4gbjsKQEAgLTgwNywxNCArODA3LDE0 IEBAIE5vZGUqIG5leHRMZWFmTm9kZShjb25zdCBOb2RlKiBub2RlKQogICAgIHJldHVybiAwOwog fQogCi0vLyBGSVhNRTogZG8gbm90IHJlcXVpcmUgcmVuZGVyZXIsIHNvIHRoYXQgdGhpcyBjYW4g YmUgdXNlZCB3aXRoaW4gZnJhZ21lbnRzLCBvciByZW5hbWUgdG8gaXNSZW5kZXJlZFRhYmxlKCkK LWJvb2wgaXNUYWJsZUVsZW1lbnQoTm9kZSogbikKKy8vIEZJWE1FOiBkbyBub3QgcmVxdWlyZSBy ZW5kZXJlciwgc28gdGhhdCB0aGlzIGNhbiBiZSB1c2VkIHdpdGhpbiBmcmFnbWVudHMKK2Jvb2wg aXNSZW5kZXJlZFRhYmxlKGNvbnN0IE5vZGUqIG4pCiB7CiAgICAgaWYgKCFuIHx8ICFuLT5pc0Vs ZW1lbnROb2RlKCkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAogICAgIFJlbmRlck9iamVjdCog cmVuZGVyZXIgPSBuLT5yZW5kZXJlcigpOwotICAgIHJldHVybiAocmVuZGVyZXIgJiYgKHJlbmRl cmVyLT5zdHlsZSgpLmRpc3BsYXkoKSA9PSBUQUJMRSB8fCByZW5kZXJlci0+c3R5bGUoKS5kaXNw bGF5KCkgPT0gSU5MSU5FX1RBQkxFKSk7CisgICAgcmV0dXJuIChyZW5kZXJlciAmJiByZW5kZXJl ci0+aXNUYWJsZSgpKTsKIH0KIAogYm9vbCBpc1RhYmxlQ2VsbChjb25zdCBOb2RlKiBub2RlKQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZWRpdGluZy9odG1sZWRpdGluZy5oIGIvU291cmNl L1dlYkNvcmUvZWRpdGluZy9odG1sZWRpdGluZy5oCmluZGV4IDk0ZTc0ZTM1MjlmM2ExNjI3MzE1 OWQyMjk5ZjI5OTMwYjA0NTI4MGMuLjYyZTVmMThhYzAxYzI4ZTZkY2FjYzU5OTMyOGQzNjdmYjM0 MTNiYzMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvaHRtbGVkaXRpbmcuaAor KysgYi9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL2h0bWxlZGl0aW5nLmgKQEAgLTEwOCw3ICsxMDgs NyBAQCBib29sIGlzU3BlY2lhbEVsZW1lbnQoY29uc3QgTm9kZSopOwogYm9vbCBpc1RhYlNwYW5O b2RlKGNvbnN0IE5vZGUqKTsKIGJvb2wgaXNUYWJTcGFuVGV4dE5vZGUoY29uc3QgTm9kZSopOwog Ym9vbCBpc01haWxCbG9ja3F1b3RlKGNvbnN0IE5vZGUqKTsKLWJvb2wgaXNUYWJsZUVsZW1lbnQo Tm9kZSopOworYm9vbCBpc1JlbmRlcmVkVGFibGUoY29uc3QgTm9kZSopOwogYm9vbCBpc1RhYmxl Q2VsbChjb25zdCBOb2RlKik7CiBib29sIGlzRW1wdHlUYWJsZUNlbGwoY29uc3QgTm9kZSopOwog Ym9vbCBpc1RhYmxlU3RydWN0dXJlTm9kZShjb25zdCBOb2RlKik7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJCb3guY3BwCmluZGV4IDc2ZWU2YTAwODlmZDQ3OWQxMGZlYTZhOWUwNDczNGI3 NzE1MWVjZjYuLjNmYWUzOGIyNTg4NDIzN2VmMTA4ZjU5Njk3ZDE4MmQ4ZmFiZjU1YjEgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCkBAIC00MTA1LDcgKzQxMDUsNyBAQCBM YXlvdXRSZWN0IFJlbmRlckJveDo6bG9jYWxDYXJldFJlY3QoSW5saW5lQm94KiBib3gsIGludCBj YXJldE9mZnNldCwgTGF5b3V0VW5pdAogICAgIC8vIEZJWE1FOiBCb3JkZXIvcGFkZGluZyBzaG91 bGQgYmUgYWRkZWQgZm9yIGFsbCBlbGVtZW50cyBidXQgdGhpcyB3b3JrYXJvdW5kCiAgICAgLy8g aXMgbmVlZGVkIGJlY2F1c2Ugd2UgdXNlIG9mZnNldHMgaW5zaWRlIGFuICJhdG9taWMiIGVsZW1l bnQgdG8gcmVwcmVzZW50CiAgICAgLy8gcG9zaXRpb25zIGJlZm9yZSBhbmQgYWZ0ZXIgdGhlIGVs ZW1lbnQgaW4gZGVwcmVjYXRlZCBlZGl0aW5nIG9mZnNldHMuCi0gICAgaWYgKGVsZW1lbnQoKSAm JiAhKGVkaXRpbmdJZ25vcmVzQ29udGVudChlbGVtZW50KCkpIHx8IGlzVGFibGVFbGVtZW50KGVs ZW1lbnQoKSkpKSB7CisgICAgaWYgKGVsZW1lbnQoKSAmJiAhKGVkaXRpbmdJZ25vcmVzQ29udGVu dChlbGVtZW50KCkpIHx8IGlzUmVuZGVyZWRUYWJsZShlbGVtZW50KCkpKSkgewogICAgICAgICBy ZWN0LnNldFgocmVjdC54KCkgKyBib3JkZXJMZWZ0KCkgKyBwYWRkaW5nTGVmdCgpKTsKICAgICAg ICAgcmVjdC5zZXRZKHJlY3QueSgpICsgcGFkZGluZ1RvcCgpICsgYm9yZGVyVG9wKCkpOwogICAg IH0K