116846 2013-05-27 14:38:00 -0700 Move isBlockFlowElement and related functions out of the Node class into editing code 2013-05-27 16:40:27 -0700 1 1 1 Unclassified WebKit HTML Editing 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 darin darin commit-queue kling koivisto oldest_to_newest 894163 0 darin 2013-05-27 14:38:00 -0700 Move isBlockFlowElement and related functions out of the Node class into editing code 894165 1 203012 darin 2013-05-27 14:43:51 -0700 Created attachment 203012 Patch 894176 2 203012 koivisto 2013-05-27 16:08:28 -0700 Comment on attachment 203012 Patch r=me 894187 3 203012 commit-queue 2013-05-27 16:40:26 -0700 Comment on attachment 203012 Patch Clearing flags on attachment: 203012 Committed r150782: <http://trac.webkit.org/changeset/150782> 894188 4 commit-queue 2013-05-27 16:40:27 -0700 All reviewed patches have been landed. Closing bug. 203012 2013-05-27 14:43:51 -0700 2013-05-27 16:40:25 -0700 Patch bug-116846-20130527144231.patch text/plain 15326 darin U3VidmVyc2lvbiBSZXZpc2lvbjogMTUwNzc1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzY5ZWM3NzE3MWI3NGU4 N2E3OWEzMzg2OWY0MThmMTE0NTgwMDMwNC4uZDdhYjFmMjBkNjk1ZjBlYmQ1ODAwNzQ1NDc0N2Y4 MTE3MGRiMWQ4YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQ4IEBACisyMDEzLTA1LTI3ICBEYXJp biBBZGxlciAgPGRhcmluQGFwcGxlLmNvbT4KKworICAgICAgICBNb3ZlIGlzQmxvY2tGbG93RWxl bWVudCBhbmQgcmVsYXRlZCBmdW5jdGlvbnMgb3V0IG9mIHRoZSBOb2RlIGNsYXNzIGludG8gZWRp dGluZyBjb2RlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xMTY4NDYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICAqIGRvbS9Ob2RlLmNwcDogUmVtb3ZlZCBpc0Jsb2NrRmxvd0VsZW1lbnQsIGVuY2xvc2luZ0Js b2NrRmxvd0VsZW1lbnQsIGFuZAorICAgICAgICBpblNhbWVDb250YWluaW5nQmxvY2tGbG93RWxl bWVudC4gVGhlc2UgYXJlIGFsbCBlZGl0aW5nIGZ1bmN0aW9ucyB0aGF0IGRvbid0CisgICAgICAg IGJlbG9uZyBpbiB0aGUgTm9kZSBjbGFzcywgYW5kIG1vc3RseS1kZXByZWNhdGVkIG9uZXMgdG8g Ym9vdC4KKyAgICAgICAgKiBkb20vTm9kZS5oOiBEaXR0by4KKworICAgICAgICAqIGRvbS9Qb3Np dGlvbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjppblNhbWVFbmNsb3NpbmdCbG9ja0Zsb3dFbGVt ZW50KTogQWRkZWQuIFRoaXMgZWRpdGluZy1zcGVjaWZpYyBmdW5jdGlvbgorICAgICAgICBpcyB1 c2VkIG9ubHkgaGVyZSwgc28gcHV0IGl0IGhlcmUuCisgICAgICAgIChXZWJDb3JlOjpQb3NpdGlv bjo6cmVuZGVyc0luRGlmZmVyZW50UG9zaXRpb24pOiBVcGRhdGVkIHRvIGNhbGwgbmV3IGZ1bmN0 aW9uIGFib3ZlLgorICAgICAgICAoV2ViQ29yZTo6UG9zaXRpb246OmxlYWRpbmdXaGl0ZXNwYWNl UG9zaXRpb24pOiBEaXR0by4KKworICAgICAgICAqIGVkaXRpbmcvSW5zZXJ0TGluZUJyZWFrQ29t bWFuZC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJbnNlcnRMaW5lQnJlYWtDb21tYW5kOjppbnNl cnROb2RlQWZ0ZXJQb3NpdGlvbik6IFVzZQorICAgICAgICBkZXByZWNhdGVkRW5jbG9zaW5nQmxv Y2tGbG93RWxlbWVudCBhdCBpdHMgbmV3IGxvY2F0aW9uLgorICAgICAgICAoV2ViQ29yZTo6SW5z ZXJ0TGluZUJyZWFrQ29tbWFuZDo6aW5zZXJ0Tm9kZUJlZm9yZVBvc2l0aW9uKTogRGl0dG8uCisK KyAgICAgICAgKiBlZGl0aW5nL0luc2VydExpc3RDb21tYW5kLmNwcDoKKyAgICAgICAgKFdlYkNv cmU6Okluc2VydExpc3RDb21tYW5kOjpkb0FwcGx5Rm9yU2luZ2xlUGFyYWdyYXBoKTogdXNlCisg ICAgICAgIGlzQmxvY2tGbG93RWxlbWVudCBhdCBpdHMgbmV3IGxvY2F0aW9uLgorICAgICAgICAq IGVkaXRpbmcvUmVwbGFjZVNlbGVjdGlvbkNvbW1hbmQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 ZW5jbG9zaW5nSW5saW5lKTogRGl0dG8uCisKKyAgICAgICAgKiBlZGl0aW5nL1Zpc2libGVQb3Np dGlvbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpWaXNpYmxlUG9zaXRpb246OmNhbm9uaWNhbFBv c2l0aW9uKTogVXNlIGRlcHJlY2F0ZWRFbmNsb3NpbmdCbG9ja0Zsb3dFbGVtZW50CisgICAgICAg IGF0IGl0cyBuZXcgbG9jYXRpb24uCisgICAgICAgIChXZWJDb3JlOjplbmNsb3NpbmdCbG9ja0Zs b3dFbGVtZW50KTogRGl0dG8uIEFsc28gYWRkZWQgRklYTUUuCisgICAgICAgICogZWRpdGluZy9W aXNpYmxlU2VsZWN0aW9uLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Om1ha2VTZWFyY2hSYW5nZSk6 IERpdHRvLgorCisgICAgICAgICogZWRpdGluZy9odG1sZWRpdGluZy5jcHA6CisgICAgICAgIChX ZWJDb3JlOjppc0Jsb2NrRmxvd0VsZW1lbnQpOiBBZGRlZC4gU2FtZSBhcyB0aGUgTm9kZTo6aXNC bG9ja0Zsb3dFbGVtZW50CisgICAgICAgIGZ1bmN0aW9uLCBidXQgaGVyZSBiZWNhdXNlIHRoaXMg aXMgYW4gZWRpdGluZyBmdW5jdGlvbiwgbm90IHN1aXRhYmxlIGFzIGEgTm9kZSBtZW1iZXIuCisg ICAgICAgIChXZWJDb3JlOjpkZXByZWNhdGVkRW5jbG9zaW5nQmxvY2tGbG93RWxlbWVudCk6IERp dHRvLiBBZGRlZCAiZGVwcmVjYXRlZCIgdG8gdGhlIG5hbWUKKyAgICAgICAgc2luY2UgdGhlIE5v ZGUgbWVtYmVyIGZ1bmN0aW9uIGhhZCBhIGNvbW1lbnQgc2F5aW5nIGl0IHdhcyBkZXByZWNhdGVk LiBBbHNvIGNoYW5nZWQgc28KKyAgICAgICAgaXQgdG9sZXJhdGVzIGEgMCBmb3IgYW4gYXJndW1l bnQsIHdoaWNoIG1hZGUgaXQgZWFzaWVyIGZvciBvbmUgY2FsbGVyLgorCisgICAgICAgICogZWRp dGluZy9odG1sZWRpdGluZy5oOiBBZGRlZCB0aGUgdHdvIG5ldyBmdW5jdGlvbnMuCisKIDIwMTMt MDUtMjcgIFphbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBkcm9wLXNo YWRvdyBmaWx0ZXIgd2l0aCBvdmVyZmxvdzpoaWRkZW4gY2hpbGQgbWlzYmVoYXZlcy4KZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9Ob2RlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9O b2RlLmNwcAppbmRleCA1MmFlMDg0YjcyMjFhMGU4OWVhMTVhYmYyNjVhYmJiYWZmYzIxNDkxLi5h MTE0YmU1MjBmNDkyNWYyZmNiNTY1YTFmMmY5YjQ4NDU3ZTgwNGM1IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9kb20vTm9kZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvZG9tL05vZGUuY3Bw CkBAIC0xMjY1LDI3ICsxMjY1LDYgQEAgYm9vbCBOb2RlOjpuZWVkc1NoYWRvd1RyZWVXYWxrZXJT bG93KCkgY29uc3QKICAgICByZXR1cm4gKGlzU2hhZG93Um9vdCgpIHx8IChpc0VsZW1lbnROb2Rl KCkgJiYgKGlzSW5zZXJ0aW9uUG9pbnQoKSB8fCBpc1BzZXVkb0VsZW1lbnQoKSB8fCB0b0VsZW1l bnQodGhpcyktPmhhc1BzZXVkb0VsZW1lbnRzKCkgfHwgdG9FbGVtZW50KHRoaXMpLT5zaGFkb3co KSkpKTsKIH0KIAotYm9vbCBOb2RlOjppc0Jsb2NrRmxvd0VsZW1lbnQoKSBjb25zdAotewotICAg IHJldHVybiBpc0VsZW1lbnROb2RlKCkgJiYgcmVuZGVyZXIoKSAmJiByZW5kZXJlcigpLT5pc0Js b2NrRmxvdygpOwotfQotCi1FbGVtZW50ICpOb2RlOjplbmNsb3NpbmdCbG9ja0Zsb3dFbGVtZW50 KCkgY29uc3QKLXsKLSAgICBOb2RlICpuID0gY29uc3RfY2FzdDxOb2RlICo+KHRoaXMpOwotICAg IGlmIChpc0Jsb2NrRmxvd0VsZW1lbnQoKSkKLSAgICAgICAgcmV0dXJuIHRvRWxlbWVudChuKTsK LQotICAgIHdoaWxlICgxKSB7Ci0gICAgICAgIG4gPSBuLT5wYXJlbnROb2RlKCk7Ci0gICAgICAg IGlmICghbikKLSAgICAgICAgICAgIGJyZWFrOwotICAgICAgICBpZiAobi0+aXNCbG9ja0Zsb3dF bGVtZW50KCkgfHwgbi0+aGFzVGFnTmFtZShib2R5VGFnKSkKLSAgICAgICAgICAgIHJldHVybiB0 b0VsZW1lbnQobik7Ci0gICAgfQotICAgIHJldHVybiAwOwotfQotCiBib29sIE5vZGU6OmlzUm9v dEVkaXRhYmxlRWxlbWVudCgpIGNvbnN0CiB7CiAgICAgcmV0dXJuIHJlbmRlcmVySXNFZGl0YWJs ZSgpICYmIGlzRWxlbWVudE5vZGUoKSAmJiAoIXBhcmVudE5vZGUoKSB8fCAhcGFyZW50Tm9kZSgp LT5yZW5kZXJlcklzRWRpdGFibGUoKQpAQCAtMTMxNCwxMSArMTI5Myw2IEBAIEVsZW1lbnQqIE5v ZGU6OnJvb3RFZGl0YWJsZUVsZW1lbnQoKSBjb25zdAogICAgIHJldHVybiByZXN1bHQ7CiB9CiAK LWJvb2wgTm9kZTo6aW5TYW1lQ29udGFpbmluZ0Jsb2NrRmxvd0VsZW1lbnQoTm9kZSAqbikKLXsK LSAgICByZXR1cm4gbiA/IGVuY2xvc2luZ0Jsb2NrRmxvd0VsZW1lbnQoKSA9PSBuLT5lbmNsb3Np bmdCbG9ja0Zsb3dFbGVtZW50KCkgOiBmYWxzZTsKLX0KLQogLy8gRklYTUU6IEVuZCBvZiBvYnZp b3VzbHkgbWlzcGxhY2VkIEhUTUwgZWRpdGluZyBmdW5jdGlvbnMuICBUcnkgdG8gbW92ZSB0aGVz ZSBvdXQgb2YgTm9kZS4KIAogUGFzc1JlZlB0cjxOb2RlTGlzdD4gTm9kZTo6Z2V0RWxlbWVudHNC eVRhZ05hbWUoY29uc3QgQXRvbWljU3RyaW5nJiBsb2NhbE5hbWUpCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9kb20vTm9kZS5oIGIvU291cmNlL1dlYkNvcmUvZG9tL05vZGUuaAppbmRleCAz YTFiZjAxNGI5YmUxOWJlZjk2ZjdkZjYyMjE0N2E5NGZmNGIwNmRjLi44MWVkYWY2NThhY2ZiNDAw ZWE2ZGM5NzY3MWQ3MmEyNzUwN2M0MmZmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20v Tm9kZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9Ob2RlLmgKQEAgLTMwNCw4ICszMDQsNiBA QCBwdWJsaWM6CiAgICAgLy8gUmV0dXJucyB0aGUgZW5jbG9zaW5nIGV2ZW50IHBhcmVudCBub2Rl IChvciBzZWxmKSB0aGF0LCB3aGVuIGNsaWNrZWQsIHdvdWxkIHRyaWdnZXIgYSBuYXZpZ2F0aW9u LgogICAgIE5vZGUqIGVuY2xvc2luZ0xpbmtFdmVudFBhcmVudE9yU2VsZigpOwogCi0gICAgYm9v bCBpc0Jsb2NrRmxvd0VsZW1lbnQoKSBjb25zdDsKLQogICAgIC8vIFRoZXNlIGxvdy1sZXZlbCBj YWxscyBnaXZlIHRoZSBjYWxsZXIgcmVzcG9uc2liaWxpdHkgZm9yIG1haW50YWluaW5nIHRoZSBp bnRlZ3JpdHkgb2YgdGhlIHRyZWUuCiAgICAgdm9pZCBzZXRQcmV2aW91c1NpYmxpbmcoTm9kZSog cHJldmlvdXMpIHsgbV9wcmV2aW91cyA9IHByZXZpb3VzOyB9CiAgICAgdm9pZCBzZXROZXh0U2li bGluZyhOb2RlKiBuZXh0KSB7IG1fbmV4dCA9IG5leHQ7IH0KQEAgLTMyOCwxNSArMzI2LDEwIEBA IHB1YmxpYzoKICAgICAvLyBvdXQgb2YgdGhlIE5vZGUgY2xhc3MgaW50byBhbiBlZGl0aW5nLXNw ZWNpZmljIHNvdXJjZSBmaWxlLgogICAgIE5vZGUqIHByZXZpb3VzTGVhZk5vZGUoKSBjb25zdDsK IAotICAgIC8vIGVuY2xvc2luZ0Jsb2NrRmxvd0VsZW1lbnQoKSBpcyBkZXByZWNhdGVkLiBVc2Ug ZW5jbG9zaW5nQmxvY2sgaW5zdGVhZC4KLSAgICBFbGVtZW50KiBlbmNsb3NpbmdCbG9ja0Zsb3dF bGVtZW50KCkgY29uc3Q7Ci0KICAgICBib29sIGlzUm9vdEVkaXRhYmxlRWxlbWVudCgpIGNvbnN0 OwogICAgIEVsZW1lbnQqIHJvb3RFZGl0YWJsZUVsZW1lbnQoKSBjb25zdDsKICAgICBFbGVtZW50 KiByb290RWRpdGFibGVFbGVtZW50KEVkaXRhYmxlVHlwZSkgY29uc3Q7CiAKLSAgICBib29sIGlu U2FtZUNvbnRhaW5pbmdCbG9ja0Zsb3dFbGVtZW50KE5vZGUqKTsKLQogICAgIC8vIENhbGxlZCBi eSB0aGUgcGFyc2VyIHdoZW4gdGhpcyBlbGVtZW50J3MgY2xvc2UgdGFnIGlzIHJlYWNoZWQsCiAg ICAgLy8gc2lnbmFsaW5nIHRoYXQgYWxsIGNoaWxkIHRhZ3MgaGF2ZSBiZWVuIHBhcnNlZCBhbmQg YWRkZWQuCiAgICAgLy8gVGhpcyBpcyBuZWVkZWQgZm9yIDxhcHBsZXQ+IGFuZCA8b2JqZWN0PiBl bGVtZW50cywgd2hpY2ggY2FuJ3QgbGF5IHRoZW1zZWx2ZXMgb3V0CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9kb20vUG9zaXRpb24uY3BwIGIvU291cmNlL1dlYkNvcmUvZG9tL1Bvc2l0aW9u LmNwcAppbmRleCA5YzI1MjA5NzdiMDZjZjU3ZTk5N2I0NTY3NDIzMWJhMzRjZmIwZWJmLi5hMTdl NTY4N2E5ZmExYzJhYWEyMGYyZWFhODlhNWQ3NzkyZWYwOTAzIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9kb20vUG9zaXRpb24uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9Qb3NpdGlv bi5jcHAKQEAgLTk5Myw2ICs5OTMsMTEgQEAgYm9vbCBQb3NpdGlvbjo6aXNSZW5kZXJlZENoYXJh Y3RlcigpIGNvbnN0CiAgICAgcmV0dXJuIGZhbHNlOwogfQogCitzdGF0aWMgYm9vbCBpblNhbWVF bmNsb3NpbmdCbG9ja0Zsb3dFbGVtZW50KE5vZGUqIGEsIE5vZGUqIGIpCit7CisgICAgcmV0dXJu IGEgJiYgYiAmJiBkZXByZWNhdGVkRW5jbG9zaW5nQmxvY2tGbG93RWxlbWVudChhKSA9PSBkZXBy ZWNhdGVkRW5jbG9zaW5nQmxvY2tGbG93RWxlbWVudChiKTsKK30KKwogYm9vbCBQb3NpdGlvbjo6 cmVuZGVyc0luRGlmZmVyZW50UG9zaXRpb24oY29uc3QgUG9zaXRpb24gJnBvcykgY29uc3QKIHsK ICAgICBpZiAoaXNOdWxsKCkgfHwgcG9zLmlzTnVsbCgpKQpAQCAtMTAyOSw3ICsxMDM0LDcgQEAg Ym9vbCBQb3NpdGlvbjo6cmVuZGVyc0luRGlmZmVyZW50UG9zaXRpb24oY29uc3QgUG9zaXRpb24g JnBvcykgY29uc3QKICAgICBpZiAocG9zLmRlcHJlY2F0ZWROb2RlKCktPmhhc1RhZ05hbWUoYnJU YWcpICYmIGlzQ2FuZGlkYXRlKCkpCiAgICAgICAgIHJldHVybiB0cnVlOwogICAgICAgICAgICAg ICAgIAotICAgIGlmIChkZXByZWNhdGVkTm9kZSgpLT5lbmNsb3NpbmdCbG9ja0Zsb3dFbGVtZW50 KCkgIT0gcG9zLmRlcHJlY2F0ZWROb2RlKCktPmVuY2xvc2luZ0Jsb2NrRmxvd0VsZW1lbnQoKSkK KyAgICBpZiAoIWluU2FtZUVuY2xvc2luZ0Jsb2NrRmxvd0VsZW1lbnQoZGVwcmVjYXRlZE5vZGUo KSwgcG9zLmRlcHJlY2F0ZWROb2RlKCkpKQogICAgICAgICByZXR1cm4gdHJ1ZTsKIAogICAgIGlm IChkZXByZWNhdGVkTm9kZSgpLT5pc1RleHROb2RlKCkgJiYgIWluUmVuZGVyZWRUZXh0KCkpCkBA IC0xMDkwLDcgKzEwOTUsNyBAQCBQb3NpdGlvbiBQb3NpdGlvbjo6bGVhZGluZ1doaXRlc3BhY2VQ b3NpdGlvbihFQWZmaW5pdHkgYWZmaW5pdHksIGJvb2wgY29uc2lkZXJObwogICAgICAgICByZXR1 cm4gUG9zaXRpb24oKTsKIAogICAgIFBvc2l0aW9uIHByZXYgPSBwcmV2aW91c0NoYXJhY3RlclBv c2l0aW9uKGFmZmluaXR5KTsKLSAgICBpZiAocHJldiAhPSAqdGhpcyAmJiBwcmV2LmRlcHJlY2F0 ZWROb2RlKCktPmluU2FtZUNvbnRhaW5pbmdCbG9ja0Zsb3dFbGVtZW50KGRlcHJlY2F0ZWROb2Rl KCkpICYmIHByZXYuZGVwcmVjYXRlZE5vZGUoKS0+aXNUZXh0Tm9kZSgpKSB7CisgICAgaWYgKHBy ZXYgIT0gKnRoaXMgJiYgaW5TYW1lRW5jbG9zaW5nQmxvY2tGbG93RWxlbWVudChkZXByZWNhdGVk Tm9kZSgpLCBwcmV2LmRlcHJlY2F0ZWROb2RlKCkpICYmIHByZXYuZGVwcmVjYXRlZE5vZGUoKS0+ aXNUZXh0Tm9kZSgpKSB7CiAgICAgICAgIFN0cmluZyBzdHJpbmcgPSB0b1RleHQocHJldi5kZXBy ZWNhdGVkTm9kZSgpKS0+ZGF0YSgpOwogICAgICAgICBVQ2hhciBjID0gc3RyaW5nW3ByZXYuZGVw cmVjYXRlZEVkaXRpbmdPZmZzZXQoKV07CiAgICAgICAgIGlmIChjb25zaWRlck5vbkNvbGxhcHNp YmxlV2hpdGVzcGFjZSA/IChpc1NwYWNlT3JOZXdsaW5lKGMpIHx8IGMgPT0gbm9CcmVha1NwYWNl KSA6IGlzQ29sbGFwc2libGVXaGl0ZXNwYWNlKGMpKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvZWRpdGluZy9JbnNlcnRMaW5lQnJlYWtDb21tYW5kLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2Vk aXRpbmcvSW5zZXJ0TGluZUJyZWFrQ29tbWFuZC5jcHAKaW5kZXggNDFkY2M0MGE3ZjQwNTg5NjY4 MjZmYTZmZDQwZjRmYTQxZmM0NDNjOS4uOTJiNGFkMjVkYWM4ZmUzNzcwMWZjMmQ4NGEwYTIzOGQz YTk4M2Q3MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZWRpdGluZy9JbnNlcnRMaW5lQnJl YWtDb21tYW5kLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0luc2VydExpbmVCcmVh a0NvbW1hbmQuY3BwCkBAIC01OCw3ICs1OCw3IEBAIHZvaWQgSW5zZXJ0TGluZUJyZWFrQ29tbWFu ZDo6aW5zZXJ0Tm9kZUFmdGVyUG9zaXRpb24oTm9kZSogbm9kZSwgY29uc3QgUG9zaXRpb24mCiAg ICAgLy8gSW5zZXJ0IHRoZSBCUiBhZnRlciB0aGUgY2FyZXQgcG9zaXRpb24uIEluIHRoZSBjYXNl IHRoZQogICAgIC8vIHBvc2l0aW9uIGlzIGEgYmxvY2ssIGRvIGFuIGFwcGVuZC4gV2UgZG9uJ3Qg d2FudCB0byBpbnNlcnQKICAgICAvLyB0aGUgQlIgKmFmdGVyKiB0aGUgYmxvY2suCi0gICAgRWxl bWVudCogY2IgPSBwb3MuZGVwcmVjYXRlZE5vZGUoKS0+ZW5jbG9zaW5nQmxvY2tGbG93RWxlbWVu dCgpOworICAgIEVsZW1lbnQqIGNiID0gZGVwcmVjYXRlZEVuY2xvc2luZ0Jsb2NrRmxvd0VsZW1l bnQocG9zLmRlcHJlY2F0ZWROb2RlKCkpOwogICAgIGlmIChjYiA9PSBwb3MuZGVwcmVjYXRlZE5v ZGUoKSkKICAgICAgICAgYXBwZW5kTm9kZShub2RlLCBjYik7CiAgICAgZWxzZQpAQCAtNzAsNyAr NzAsNyBAQCB2b2lkIEluc2VydExpbmVCcmVha0NvbW1hbmQ6Omluc2VydE5vZGVCZWZvcmVQb3Np dGlvbihOb2RlKiBub2RlLCBjb25zdCBQb3NpdGlvbgogICAgIC8vIEluc2VydCB0aGUgQlIgYWZ0 ZXIgdGhlIGNhcmV0IHBvc2l0aW9uLiBJbiB0aGUgY2FzZSB0aGUKICAgICAvLyBwb3NpdGlvbiBp cyBhIGJsb2NrLCBkbyBhbiBhcHBlbmQuIFdlIGRvbid0IHdhbnQgdG8gaW5zZXJ0CiAgICAgLy8g dGhlIEJSICpiZWZvcmUqIHRoZSBibG9jay4KLSAgICBFbGVtZW50KiBjYiA9IHBvcy5kZXByZWNh dGVkTm9kZSgpLT5lbmNsb3NpbmdCbG9ja0Zsb3dFbGVtZW50KCk7CisgICAgRWxlbWVudCogY2Ig PSBkZXByZWNhdGVkRW5jbG9zaW5nQmxvY2tGbG93RWxlbWVudChwb3MuZGVwcmVjYXRlZE5vZGUo KSk7CiAgICAgaWYgKGNiID09IHBvcy5kZXByZWNhdGVkTm9kZSgpKQogICAgICAgICBhcHBlbmRO b2RlKG5vZGUsIGNiKTsKICAgICBlbHNlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9lZGl0 aW5nL0luc2VydExpc3RDb21tYW5kLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvSW5zZXJ0 TGlzdENvbW1hbmQuY3BwCmluZGV4IGRlNmFiMjczZWZhZDBkYjJlYWQ5NmE2YTA4NGZkNzA1ZDg2 MGJiZTUuLmZkNWY3MTQxYmViNTQzNThhZGRmNzFiZTk1YTI5YTc5ZGQwMjkwMTAgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvSW5zZXJ0TGlzdENvbW1hbmQuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2VkaXRpbmcvSW5zZXJ0TGlzdENvbW1hbmQuY3BwCkBAIC0yMTksNyArMjE5 LDcgQEAgdm9pZCBJbnNlcnRMaXN0Q29tbWFuZDo6ZG9BcHBseUZvclNpbmdsZVBhcmFncmFwaChi b29sIGZvcmNlQ3JlYXRlTGlzdCwgY29uc3QgUXUKICAgICAgICAgICAgIGluc2VydE5vZGVCZWZv cmUobmV3TGlzdCwgbGlzdE5vZGUpOwogCiAgICAgICAgICAgICBOb2RlKiBmaXJzdENoaWxkSW5M aXN0ID0gZW5jbG9zaW5nTGlzdENoaWxkKFZpc2libGVQb3NpdGlvbihmaXJzdFBvc2l0aW9uSW5O b2RlKGxpc3ROb2RlLmdldCgpKSkuZGVlcEVxdWl2YWxlbnQoKS5kZXByZWNhdGVkTm9kZSgpLCBs aXN0Tm9kZS5nZXQoKSk7Ci0gICAgICAgICAgICBOb2RlKiBvdXRlckJsb2NrID0gZmlyc3RDaGls ZEluTGlzdC0+aXNCbG9ja0Zsb3dFbGVtZW50KCkgPyBmaXJzdENoaWxkSW5MaXN0IDogbGlzdE5v ZGUuZ2V0KCk7CisgICAgICAgICAgICBOb2RlKiBvdXRlckJsb2NrID0gaXNCbG9ja0Zsb3dFbGVt ZW50KGZpcnN0Q2hpbGRJbkxpc3QpID8gZmlyc3RDaGlsZEluTGlzdCA6IGxpc3ROb2RlLmdldCgp OwogICAgICAgICAgICAgCiAgICAgICAgICAgICBtb3ZlUGFyYWdyYXBoV2l0aENsb25lcyhmaXJz dFBvc2l0aW9uSW5Ob2RlKGxpc3ROb2RlLmdldCgpKSwgbGFzdFBvc2l0aW9uSW5Ob2RlKGxpc3RO b2RlLmdldCgpKSwgbmV3TGlzdC5nZXQoKSwgb3V0ZXJCbG9jayk7CiAKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2VkaXRpbmcvUmVwbGFjZVNlbGVjdGlvbkNvbW1hbmQuY3BwIGIvU291cmNl L1dlYkNvcmUvZWRpdGluZy9SZXBsYWNlU2VsZWN0aW9uQ29tbWFuZC5jcHAKaW5kZXggOGM4MzA1 ZDNhOTk4ZWZlMzVkODVjOTU0NDI2MjNlN2NhMGFjOTliZi4uNTc2MjVkY2Q4Y2FmY2VlNzQxMjRi ZDVlNTg4ZTY5YmI1MWI3NjIwNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZWRpdGluZy9S ZXBsYWNlU2VsZWN0aW9uQ29tbWFuZC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvZWRpdGluZy9S ZXBsYWNlU2VsZWN0aW9uQ29tbWFuZC5jcHAKQEAgLTg0MiwxMSArODQyLDExIEBAIHZvaWQgUmVw bGFjZVNlbGVjdGlvbkNvbW1hbmQ6Om1lcmdlRW5kSWZOZWVkZWQoKQogc3RhdGljIE5vZGUqIGVu Y2xvc2luZ0lubGluZShOb2RlKiBub2RlKQogewogICAgIHdoaWxlIChDb250YWluZXJOb2RlKiBw YXJlbnQgPSBub2RlLT5wYXJlbnROb2RlKCkpIHsKLSAgICAgICAgaWYgKHBhcmVudC0+aXNCbG9j a0Zsb3dFbGVtZW50KCkgfHwgcGFyZW50LT5oYXNUYWdOYW1lKGJvZHlUYWcpKQorICAgICAgICBp ZiAoaXNCbG9ja0Zsb3dFbGVtZW50KHBhcmVudCkgfHwgcGFyZW50LT5oYXNUYWdOYW1lKGJvZHlU YWcpKQogICAgICAgICAgICAgcmV0dXJuIG5vZGU7CiAgICAgICAgIC8vIFN0b3AgaWYgYW55IHBy ZXZpb3VzIHNpYmxpbmcgaXMgYSBibG9jay4KICAgICAgICAgZm9yIChOb2RlKiBzaWJsaW5nID0g bm9kZS0+cHJldmlvdXNTaWJsaW5nKCk7IHNpYmxpbmc7IHNpYmxpbmcgPSBzaWJsaW5nLT5wcmV2 aW91c1NpYmxpbmcoKSkgewotICAgICAgICAgICAgaWYgKHNpYmxpbmctPmlzQmxvY2tGbG93RWxl bWVudCgpKQorICAgICAgICAgICAgaWYgKGlzQmxvY2tGbG93RWxlbWVudChzaWJsaW5nKSkKICAg ICAgICAgICAgICAgICByZXR1cm4gbm9kZTsKICAgICAgICAgfQogICAgICAgICBub2RlID0gcGFy ZW50OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZWRpdGluZy9WaXNpYmxlUG9zaXRpb24u Y3BwIGIvU291cmNlL1dlYkNvcmUvZWRpdGluZy9WaXNpYmxlUG9zaXRpb24uY3BwCmluZGV4IDVm ZmVkMjJlYjVjNWQ2YThhZDVmNjg4NzlkYzRiMzFkZTM2ZDdkZDIuLjY5Nzg4NzQ5YzA4MmIyNTEz OGYzODViNDUzODRmYTNmYWZhMjQ1NzggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2VkaXRp bmcvVmlzaWJsZVBvc2l0aW9uLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL1Zpc2li bGVQb3NpdGlvbi5jcHAKQEAgLTU1OCw3ICs1NTgsNyBAQCBQb3NpdGlvbiBWaXNpYmxlUG9zaXRp b246OmNhbm9uaWNhbFBvc2l0aW9uKGNvbnN0IFBvc2l0aW9uJiBwYXNzZWRQb3NpdGlvbikKICAg ICAgICAgcmV0dXJuIFBvc2l0aW9uKCk7CiAKICAgICAvLyBUaGUgbmV3IHBvc2l0aW9uIHNob3Vs ZCBiZSBpbiB0aGUgc2FtZSBibG9jayBmbG93IGVsZW1lbnQuIEZhdm9yIHRoYXQuCi0gICAgTm9k ZSogb3JpZ2luYWxCbG9jayA9IG5vZGUgPyBub2RlLT5lbmNsb3NpbmdCbG9ja0Zsb3dFbGVtZW50 KCkgOiAwOworICAgIEVsZW1lbnQqIG9yaWdpbmFsQmxvY2sgPSBkZXByZWNhdGVkRW5jbG9zaW5n QmxvY2tGbG93RWxlbWVudChub2RlKTsKICAgICBib29sIG5leHRJc091dHNpZGVPcmlnaW5hbEJs b2NrID0gIW5leHROb2RlLT5pc0Rlc2NlbmRhbnRPZihvcmlnaW5hbEJsb2NrKSAmJiBuZXh0Tm9k ZSAhPSBvcmlnaW5hbEJsb2NrOwogICAgIGJvb2wgcHJldklzT3V0c2lkZU9yaWdpbmFsQmxvY2sg PSAhcHJldk5vZGUtPmlzRGVzY2VuZGFudE9mKG9yaWdpbmFsQmxvY2spICYmIHByZXZOb2RlICE9 IG9yaWdpbmFsQmxvY2s7CiAgICAgaWYgKG5leHRJc091dHNpZGVPcmlnaW5hbEJsb2NrICYmICFw cmV2SXNPdXRzaWRlT3JpZ2luYWxCbG9jaykKQEAgLTcxMSwxMiArNzExLDEzIEBAIGJvb2wgc2V0 RW5kKFJhbmdlICpyLCBjb25zdCBWaXNpYmxlUG9zaXRpb24gJnZpc2libGVQb3NpdGlvbikKICAg ICByZXR1cm4gY29kZSA9PSAwOwogfQogCi1FbGVtZW50KiBlbmNsb3NpbmdCbG9ja0Zsb3dFbGVt ZW50KGNvbnN0IFZpc2libGVQb3NpdGlvbiAmdmlzaWJsZVBvc2l0aW9uKQorLy8gRklYTUU6IE1h eWJlIHRoaXMgc2hvdWxkIGJlIGRlcHJlY2F0ZWQgdG9vLCBsaWtlIHRoZSB1bmRlcmx5aW5nIGZ1 bmN0aW9uPworRWxlbWVudCogZW5jbG9zaW5nQmxvY2tGbG93RWxlbWVudChjb25zdCBWaXNpYmxl UG9zaXRpb24mIHZpc2libGVQb3NpdGlvbikKIHsKICAgICBpZiAodmlzaWJsZVBvc2l0aW9uLmlz TnVsbCgpKQogICAgICAgICByZXR1cm4gTlVMTDsKIAotICAgIHJldHVybiB2aXNpYmxlUG9zaXRp b24uZGVlcEVxdWl2YWxlbnQoKS5kZXByZWNhdGVkTm9kZSgpLT5lbmNsb3NpbmdCbG9ja0Zsb3dF bGVtZW50KCk7CisgICAgcmV0dXJuIGRlcHJlY2F0ZWRFbmNsb3NpbmdCbG9ja0Zsb3dFbGVtZW50 KHZpc2libGVQb3NpdGlvbi5kZWVwRXF1aXZhbGVudCgpLmRlcHJlY2F0ZWROb2RlKCkpOwogfQog CiBib29sIGlzRmlyc3RWaXNpYmxlUG9zaXRpb25Jbk5vZGUoY29uc3QgVmlzaWJsZVBvc2l0aW9u ICZ2aXNpYmxlUG9zaXRpb24sIGNvbnN0IE5vZGUgKm5vZGUpCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9lZGl0aW5nL1Zpc2libGVTZWxlY3Rpb24uY3BwIGIvU291cmNlL1dlYkNvcmUvZWRp dGluZy9WaXNpYmxlU2VsZWN0aW9uLmNwcAppbmRleCAxYzg2MDA0ZGU4Nzk2ZTM2MDY4ZjllNDZj YjUzYWI2NDQyNDIxYWYwLi45MmUxYzE1MWJiNTIwOGMzMzFkNmRiYTM2ZDM4Y2ExODk4MzYzMmU5 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL1Zpc2libGVTZWxlY3Rpb24uY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvVmlzaWJsZVNlbGVjdGlvbi5jcHAKQEAgLTIw Nyw3ICsyMDcsNyBAQCBzdGF0aWMgUGFzc1JlZlB0cjxSYW5nZT4gbWFrZVNlYXJjaFJhbmdlKGNv bnN0IFBvc2l0aW9uJiBwb3MpCiAgICAgTm9kZSogZGUgPSBkLT5kb2N1bWVudEVsZW1lbnQoKTsK ICAgICBpZiAoIWRlKQogICAgICAgICByZXR1cm4gMDsKLSAgICBOb2RlKiBib3VuZGFyeSA9IG4t PmVuY2xvc2luZ0Jsb2NrRmxvd0VsZW1lbnQoKTsKKyAgICBFbGVtZW50KiBib3VuZGFyeSA9IGRl cHJlY2F0ZWRFbmNsb3NpbmdCbG9ja0Zsb3dFbGVtZW50KG4pOwogICAgIGlmICghYm91bmRhcnkp CiAgICAgICAgIHJldHVybiAwOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5n L2h0bWxlZGl0aW5nLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvaHRtbGVkaXRpbmcuY3Bw CmluZGV4IDZkMjQ1NmZlZTdmYTVjNTAyY2Q3ZWYzNDhlZDZlZTZmYmFmZDdmNTcuLmY3ZmFkNDBi ZDhlNTg2MWI3OTM5YTdhZTEyYjFlN2Q3OTg0N2Q1YTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2VkaXRpbmcvaHRtbGVkaXRpbmcuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcv aHRtbGVkaXRpbmcuY3BwCkBAIC0xMjA4LDQgKzEyMDgsMjYgQEAgUG9zaXRpb24gYWRqdXN0ZWRT ZWxlY3Rpb25TdGFydEZvclN0eWxlQ29tcHV0YXRpb24oY29uc3QgVmlzaWJsZVNlbGVjdGlvbiYg c2VsZWMKICAgICByZXR1cm4gdmlzaWJsZVBvc2l0aW9uLmRlZXBFcXVpdmFsZW50KCkuZG93bnN0 cmVhbSgpOwogfQogCisvLyBGSVhNRTogU2hvdWxkIHRoaXMgYmUgZGVwcmVjYXRlZCBsaWtlIGRl cHJlY2F0ZWRFbmNsb3NpbmdCbG9ja0Zsb3dFbGVtZW50IGlzPworYm9vbCBpc0Jsb2NrRmxvd0Vs ZW1lbnQoY29uc3QgTm9kZSogbm9kZSkKK3sKKyAgICBpZiAoIW5vZGUtPmlzRWxlbWVudE5vZGUo KSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOworICAgIFJlbmRlck9iamVjdCogcmVuZGVyZXIgPSBu b2RlLT5yZW5kZXJlcigpOworICAgIHJldHVybiByZW5kZXJlciAmJiByZW5kZXJlci0+aXNCbG9j a0Zsb3coKTsKK30KKworRWxlbWVudCogZGVwcmVjYXRlZEVuY2xvc2luZ0Jsb2NrRmxvd0VsZW1l bnQoTm9kZSogbm9kZSkKK3sKKyAgICBpZiAoIW5vZGUpCisgICAgICAgIHJldHVybiAwOworICAg IGlmIChpc0Jsb2NrRmxvd0VsZW1lbnQobm9kZSkpCisgICAgICAgIHJldHVybiB0b0VsZW1lbnQo bm9kZSk7CisgICAgd2hpbGUgKChub2RlID0gbm9kZS0+cGFyZW50Tm9kZSgpKSkgeworICAgICAg ICBpZiAoaXNCbG9ja0Zsb3dFbGVtZW50KG5vZGUpIHx8IG5vZGUtPmhhc1RhZ05hbWUoYm9keVRh ZykpCisgICAgICAgICAgICByZXR1cm4gdG9FbGVtZW50KG5vZGUpOworICAgIH0KKyAgICByZXR1 cm4gMDsKK30KKwogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvZWRpdGluZy9odG1sZWRpdGluZy5oIGIvU291cmNlL1dlYkNvcmUvZWRpdGluZy9odG1s ZWRpdGluZy5oCmluZGV4IDc1MmE5YzY5MmMxODcwNzZjNTQ3NDA5Y2NiNTJlMGI3NzhmMDE1OWIu LmUzZjgyYmZjNDA3NTUzYzQwNjAyYzNlNWMzYzY0MjRmYzI3ZWFjMjEgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2VkaXRpbmcvaHRtbGVkaXRpbmcuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9l ZGl0aW5nL2h0bWxlZGl0aW5nLmgKQEAgLTYxLDYgKzYxLDcgQEAgTm9kZSogaGlnaGVzdEVuY2xv c2luZ05vZGVPZlR5cGUoY29uc3QgUG9zaXRpb24mLCBib29sICgqbm9kZUlzT2ZUeXBlKShjb25z dCBOb2QKIE5vZGUqIGhpZ2hlc3ROb2RlVG9SZW1vdmVJblBydW5pbmcoTm9kZSopOwogTm9kZSog bG93ZXN0RWRpdGFibGVBbmNlc3RvcihOb2RlKik7CiAKK0VsZW1lbnQqIGRlcHJlY2F0ZWRFbmNs b3NpbmdCbG9ja0Zsb3dFbGVtZW50KE5vZGUqKTsgLy8gVXNlIGVuY2xvc2luZ0Jsb2NrIGluc3Rl YWQuCiBFbGVtZW50KiBlbmNsb3NpbmdCbG9jayhOb2RlKiwgRWRpdGluZ0JvdW5kYXJ5Q3Jvc3Np bmdSdWxlID0gQ2Fubm90Q3Jvc3NFZGl0aW5nQm91bmRhcnkpOwogTm9kZSogZW5jbG9zaW5nVGFi bGVDZWxsKGNvbnN0IFBvc2l0aW9uJik7CiBOb2RlKiBlbmNsb3NpbmdFbXB0eUxpc3RJdGVtKGNv bnN0IFZpc2libGVQb3NpdGlvbiYpOwpAQCAtOTcsNiArOTgsNyBAQCBpbmxpbmUgYm9vbCBjYW5I YXZlQ2hpbGRyZW5Gb3JFZGl0aW5nKGNvbnN0IE5vZGUqIG5vZGUpCiAKIGJvb2wgaXNBdG9taWNO b2RlKGNvbnN0IE5vZGUqKTsKIGJvb2wgaXNCbG9jayhjb25zdCBOb2RlKik7Citib29sIGlzQmxv Y2tGbG93RWxlbWVudChjb25zdCBOb2RlKik7CiBib29sIGlzSW5saW5lKGNvbnN0IE5vZGUqKTsK IGJvb2wgaXNTcGVjaWFsRWxlbWVudChjb25zdCBOb2RlKik7CiBib29sIGlzVGFiU3Bhbk5vZGUo Y29uc3QgTm9kZSopOwpAQCAtMTEzLDYgKzExNSw3IEBAIGJvb2wgaXNOb2RlVmlzaWJseUNvbnRh aW5lZFdpdGhpbihOb2RlKiwgY29uc3QgUmFuZ2UqKTsKIGJvb2wgaXNSZW5kZXJlZEFzTm9uSW5s aW5lVGFibGVJbWFnZU9ySFIoY29uc3QgTm9kZSopOwogYm9vbCBhcmVJZGVudGljYWxFbGVtZW50 cyhjb25zdCBOb2RlKiwgY29uc3QgTm9kZSopOwogYm9vbCBpc05vblRhYmxlQ2VsbEhUTUxCbG9j a0VsZW1lbnQoY29uc3QgTm9kZSopOworCiBUZXh0RGlyZWN0aW9uIGRpcmVjdGlvbk9mRW5jbG9z aW5nQmxvY2soY29uc3QgUG9zaXRpb24mKTsKIAogLy8gLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQo=