52759 2011-01-19 15:40:37 -0800 Stop instantiating legacy editing positions in VisibleSelection, visible_units.cpp, Frame, and RenderBlock 2011-01-22 02:51:57 -0800 1 1 1 Unclassified WebKit HTML Editing 528+ (Nightly build) All All RESOLVED FIXED P2 Enhancement --- 52099 1 rniwa rniwa darin eric ojan tony oldest_to_newest 336881 0 rniwa 2011-01-19 15:40:37 -0800 This is a cleanup. 336885 1 79507 rniwa 2011-01-19 15:46:48 -0800 Created attachment 79507 cleanup 337054 2 79507 eric 2011-01-19 19:17:52 -0800 Comment on attachment 79507 cleanup OK. 338552 3 rniwa 2011-01-22 02:51:57 -0800 Committed r76438: <http://trac.webkit.org/changeset/76438> 79507 2011-01-19 15:46:48 -0800 2011-01-19 19:17:52 -0800 cleanup bug-52759-20110119154646.patch text/plain 9135 rniwa ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBjMjc0NTQ1OTk1NDAzNGM4ZGIwZGU3ZmRlODEyNjMwNTUxYzgzYzNiLi4y NTBiMWZkM2M0OTkwODM1MjUyNGQzMDIxZTVkOWZmMzE2ZGY0ZWNiIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0x LDMgKzEsMjQgQEAKKzIwMTEtMDEtMTkgIFJ5b3N1a2UgTml3YSAgPHJuaXdhQHdlYmtpdC5vcmc+ CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgU3RvcCBp bnN0YW50aWF0aW5nIGxlZ2FjeSBlZGl0aW5nIHBvc2l0aW9ucyBpbiBWaXNpYmxlU2VsZWN0aW9u LCB2aXNpYmxlX3VuaXRzLmNwcCwgRnJhbWUsIGFuZCBSZW5kZXJCbG9jaworICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTI3NTkKKworICAgICAgICBTdG9w cGVkIGluc3RhbnRpYXRpbmcgbGVnYWN5IGVkaXRpbmcgcG9zaXRpb25zIGluIHRoZSBmb2xsb3dp bmcgZmlsZXMuCisKKyAgICAgICAgKiBlZGl0aW5nL1Zpc2libGVTZWxlY3Rpb24uY3BwOgorICAg ICAgICAoV2ViQ29yZTo6VmlzaWJsZVNlbGVjdGlvbjo6YWRqdXN0U2VsZWN0aW9uVG9Bdm9pZENy b3NzaW5nRWRpdGluZ0JvdW5kYXJpZXMpOgorICAgICAgICAqIGVkaXRpbmcvdmlzaWJsZV91bml0 cy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpwcmV2aW91c0JvdW5kYXJ5KToKKyAgICAgICAgKFdl YkNvcmU6OnByZXZpb3VzTGluZVBvc2l0aW9uKToKKyAgICAgICAgKFdlYkNvcmU6Om5leHRMaW5l UG9zaXRpb24pOgorICAgICAgICAoV2ViQ29yZTo6c3RhcnRPZkJsb2NrKToKKyAgICAgICAgKiBw YWdlL0ZyYW1lLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lOjp2aXNpYmxlUG9zaXRpb25G b3JQb2ludCk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJsb2NrLmNwcDogUmVtb3ZlZCBS ZW5kZXJCbG9jazo6cG9zaXRpb25Gb3JSZW5kZXJlciBiZWNhdXNlIGl0IHdhcyBub3QgY2FsbGVk IGFueXdoZXJlLgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJCbG9jay5oOiBEaXR0by4KKwog MjAxMS0wMS0xOCAgQWRhbSBSb2JlbiAgPGFyb2JlbkBhcHBsZS5jb20+CiAKICAgICAgICAgQ2Fs bCBhbHRlcm5hdGUgQ0ZIVFRQQ29va2llIGZ1bmN0aW9ucyBpZiBhdmFpbGFibGUKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvVmlzaWJsZVNlbGVjdGlvbi5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9lZGl0aW5nL1Zpc2libGVTZWxlY3Rpb24uY3BwCmluZGV4IDQwMzc2NzA5ZTdmNTBj ZjEyYWU5YjUwZmQyNWE5ZTcyNWU5NzM5MjUuLjEzN2I1NjBhMGJiZDEzYjk5NjM3N2QyYWRhMTEz N2I1ZTc2ZDJjMTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvVmlzaWJsZVNl bGVjdGlvbi5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvZWRpdGluZy9WaXNpYmxlU2VsZWN0aW9u LmNwcApAQCAtNTI2LDEzICs1MjYsMTMgQEAgdm9pZCBWaXNpYmxlU2VsZWN0aW9uOjphZGp1c3RT ZWxlY3Rpb25Ub0F2b2lkQ3Jvc3NpbmdFZGl0aW5nQm91bmRhcmllcygpCiAgICAgICAgICAgICBQ b3NpdGlvbiBwID0gbmV4dFZpc3VhbGx5RGlzdGluY3RDYW5kaWRhdGUobV9zdGFydCk7CiAgICAg ICAgICAgICBOb2RlKiBzaGFkb3dBbmNlc3RvciA9IHN0YXJ0Um9vdCA/IHN0YXJ0Um9vdC0+c2hh ZG93QW5jZXN0b3JOb2RlKCkgOiAwOwogICAgICAgICAgICAgaWYgKHAuaXNOdWxsKCkgJiYgc3Rh cnRSb290ICYmIChzaGFkb3dBbmNlc3RvciAhPSBzdGFydFJvb3QpKQotICAgICAgICAgICAgICAg IHAgPSBQb3NpdGlvbihzaGFkb3dBbmNlc3RvciwgMCk7CisgICAgICAgICAgICAgICAgcCA9IHBv c2l0aW9uQmVmb3JlTm9kZShzaGFkb3dBbmNlc3Rvcik7CiAgICAgICAgICAgICB3aGlsZSAocC5p c05vdE51bGwoKSAmJiAhKGxvd2VzdEVkaXRhYmxlQW5jZXN0b3IocC5ub2RlKCkpID09IGJhc2VF ZGl0YWJsZUFuY2VzdG9yICYmICFpc0VkaXRhYmxlUG9zaXRpb24ocCkpKSB7CiAgICAgICAgICAg ICAgICAgTm9kZSogcm9vdCA9IGVkaXRhYmxlUm9vdEZvclBvc2l0aW9uKHApOwogICAgICAgICAg ICAgICAgIHNoYWRvd0FuY2VzdG9yID0gcm9vdCA/IHJvb3QtPnNoYWRvd0FuY2VzdG9yTm9kZSgp IDogMDsKICAgICAgICAgICAgICAgICBwID0gaXNBdG9taWNOb2RlKHAubm9kZSgpKSA/IHBvc2l0 aW9uSW5QYXJlbnRBZnRlck5vZGUocC5ub2RlKCkpIDogbmV4dFZpc3VhbGx5RGlzdGluY3RDYW5k aWRhdGUocCk7CiAgICAgICAgICAgICAgICAgaWYgKHAuaXNOdWxsKCkgJiYgKHNoYWRvd0FuY2Vz dG9yICE9IHJvb3QpKQotICAgICAgICAgICAgICAgICAgICBwID0gUG9zaXRpb24oc2hhZG93QW5j ZXN0b3IsIDApOworICAgICAgICAgICAgICAgICAgICBwID0gcG9zaXRpb25CZWZvcmVOb2RlKHNo YWRvd0FuY2VzdG9yKTsKICAgICAgICAgICAgIH0KICAgICAgICAgICAgIFZpc2libGVQb3NpdGlv biBuZXh0KHApOwogICAgICAgICAgICAgCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9lZGl0 aW5nL3Zpc2libGVfdW5pdHMuY3BwIGIvU291cmNlL1dlYkNvcmUvZWRpdGluZy92aXNpYmxlX3Vu aXRzLmNwcAppbmRleCA3YmIxNTE1NzM2ZmRjZjNlMWUzMDUwZTdiZjdiM2YzNDZiZDczNzJiLi44 YmRhZTc2NDNlOWU0YjczMWJmZDYyOTI3OWU4MGE1MGQ3NWE4YmNjIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9lZGl0aW5nL3Zpc2libGVfdW5pdHMuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2VkaXRpbmcvdmlzaWJsZV91bml0cy5jcHAKQEAgLTU3LDcgKzU3LDcgQEAgc3RhdGljIFZpc2li bGVQb3NpdGlvbiBwcmV2aW91c0JvdW5kYXJ5KGNvbnN0IFZpc2libGVQb3NpdGlvbiYgYywgQm91 bmRhcnlTZWFyY2gKICAgICAgICAgcmV0dXJuIFZpc2libGVQb3NpdGlvbigpOwogCiAgICAgRG9j dW1lbnQqIGQgPSBib3VuZGFyeS0+ZG9jdW1lbnQoKTsKLSAgICBQb3NpdGlvbiBzdGFydCA9IHJh bmdlQ29tcGxpYW50RXF1aXZhbGVudChQb3NpdGlvbihib3VuZGFyeSwgMCkpOworICAgIFBvc2l0 aW9uIHN0YXJ0ID0gcmFuZ2VDb21wbGlhbnRFcXVpdmFsZW50KGZpcnN0UG9zaXRpb25Jbk9yQmVm b3JlTm9kZShib3VuZGFyeSkpOwogICAgIFBvc2l0aW9uIGVuZCA9IHJhbmdlQ29tcGxpYW50RXF1 aXZhbGVudChwb3MpOwogICAgIFJlZlB0cjxSYW5nZT4gc2VhcmNoUmFuZ2UgPSBSYW5nZTo6Y3Jl YXRlKGQpOwogICAgIApAQCAtMTIxLDcgKzEyMSw3IEBAIHN0YXRpYyBWaXNpYmxlUG9zaXRpb24g cHJldmlvdXNCb3VuZGFyeShjb25zdCBWaXNpYmxlUG9zaXRpb24mIGMsIEJvdW5kYXJ5U2VhcmNo CiAgICAgICAgIE5vZGUgKm5vZGUgPSBpdC5yYW5nZSgpLT5zdGFydENvbnRhaW5lcihlYyk7CiAg ICAgICAgIGlmICgobm9kZS0+aXNUZXh0Tm9kZSgpICYmIHN0YXRpY19jYXN0PGludD4obmV4dCkg PD0gbm9kZS0+bWF4Q2hhcmFjdGVyT2Zmc2V0KCkpIHx8IChub2RlLT5yZW5kZXJlcigpICYmIG5v ZGUtPnJlbmRlcmVyKCktPmlzQlIoKSAmJiAhbmV4dCkpCiAgICAgICAgICAgICAvLyBUaGUgbmV4 dCB2YXJpYWJsZSBjb250YWlucyBhIHVzYWJsZSBpbmRleCBpbnRvIGEgdGV4dCBub2RlCi0gICAg ICAgICAgICBwb3MgPSBQb3NpdGlvbihub2RlLCBuZXh0KTsKKyAgICAgICAgICAgIHBvcyA9IFBv c2l0aW9uKG5vZGUsIG5leHQsIFBvc2l0aW9uOjpQb3NpdGlvbklzT2Zmc2V0SW5BbmNob3IpOwog ICAgICAgICBlbHNlIHsKICAgICAgICAgICAgIC8vIFVzZSB0aGUgY2hhcmFjdGVyIGl0ZXJhdG9y IHRvIHRyYW5zbGF0ZSB0aGUgbmV4dCB2YWx1ZSBpbnRvIGEgRE9NIHBvc2l0aW9uLgogICAgICAg ICAgICAgQmFja3dhcmRzQ2hhcmFjdGVySXRlcmF0b3IgY2hhckl0KHNlYXJjaFJhbmdlLmdldCgp LCBUZXh0SXRlcmF0b3JFbmRzQXRFZGl0aW5nQm91bmRhcnkpOwpAQCAtNTQwLDcgKzU0MCw3IEBA IFZpc2libGVQb3NpdGlvbiBwcmV2aW91c0xpbmVQb3NpdGlvbihjb25zdCBWaXNpYmxlUG9zaXRp b24gJnZpc2libGVQb3NpdGlvbiwgaW50CiAgICAgICAgIHdoaWxlIChuICYmIHN0YXJ0QmxvY2sg PT0gZW5jbG9zaW5nTm9kZVdpdGhOb25JbmxpbmVSZW5kZXJlcihuKSkKICAgICAgICAgICAgIG4g PSBwcmV2aW91c0xlYWZXaXRoU2FtZUVkaXRhYmlsaXR5KG4pOwogICAgICAgICB3aGlsZSAobikg ewotICAgICAgICAgICAgaWYgKGhpZ2hlc3RFZGl0YWJsZVJvb3QoUG9zaXRpb24obiwgMCkpICE9 IGhpZ2hlc3RSb290KQorICAgICAgICAgICAgaWYgKGhpZ2hlc3RFZGl0YWJsZVJvb3QoZmlyc3RQ b3NpdGlvbkluT3JCZWZvcmVOb2RlKG4pKSAhPSBoaWdoZXN0Um9vdCkKICAgICAgICAgICAgICAg ICBicmVhazsKICAgICAgICAgICAgIFBvc2l0aW9uIHBvcyhuLCBjYXJldE1pbk9mZnNldChuKSk7 CiAgICAgICAgICAgICBpZiAocG9zLmlzQ2FuZGlkYXRlKCkpIHsKQEAgLTU3MSw3ICs1NzEsNyBA QCBWaXNpYmxlUG9zaXRpb24gcHJldmlvdXNMaW5lUG9zaXRpb24oY29uc3QgVmlzaWJsZVBvc2l0 aW9uICZ2aXNpYmxlUG9zaXRpb24sIGludAogICAgICAgICBSZW5kZXJPYmplY3QqIHJlbmRlcmVy ID0gcm9vdC0+Y2xvc2VzdExlYWZDaGlsZEZvckxvZ2ljYWxMZWZ0UG9zaXRpb24oeCAtIGFic1Bv cy54KCksIGlzRWRpdGFibGVQb3NpdGlvbihwKSktPnJlbmRlcmVyKCk7CiAgICAgICAgIE5vZGUq IG5vZGUgPSByZW5kZXJlci0+bm9kZSgpOwogICAgICAgICBpZiAobm9kZSAmJiBlZGl0aW5nSWdu b3Jlc0NvbnRlbnQobm9kZSkpCi0gICAgICAgICAgICByZXR1cm4gUG9zaXRpb24obm9kZS0+cGFy ZW50Tm9kZSgpLCBub2RlLT5ub2RlSW5kZXgoKSk7CisgICAgICAgICAgICByZXR1cm4gcG9zaXRp b25JblBhcmVudEJlZm9yZU5vZGUobm9kZSk7CiAgICAgICAgIHJldHVybiByZW5kZXJlci0+cG9z aXRpb25Gb3JQb2ludChJbnRQb2ludCh4IC0gYWJzUG9zLngoKSwgcm9vdC0+bGluZVRvcCgpKSk7 CiAgICAgfQogICAgIApAQCAtNjQ5LDcgKzY0OSw3IEBAIFZpc2libGVQb3NpdGlvbiBuZXh0TGlu ZVBvc2l0aW9uKGNvbnN0IFZpc2libGVQb3NpdGlvbiAmdmlzaWJsZVBvc2l0aW9uLCBpbnQgeCkK ICAgICAgICAgd2hpbGUgKG4gJiYgc3RhcnRCbG9jayA9PSBlbmNsb3NpbmdOb2RlV2l0aE5vbklu bGluZVJlbmRlcmVyKG4pKQogICAgICAgICAgICAgbiA9IG5leHRMZWFmV2l0aFNhbWVFZGl0YWJp bGl0eShuKTsKICAgICAgICAgd2hpbGUgKG4pIHsKLSAgICAgICAgICAgIGlmIChoaWdoZXN0RWRp dGFibGVSb290KFBvc2l0aW9uKG4sIDApKSAhPSBoaWdoZXN0Um9vdCkKKyAgICAgICAgICAgIGlm IChoaWdoZXN0RWRpdGFibGVSb290KGZpcnN0UG9zaXRpb25Jbk9yQmVmb3JlTm9kZShuKSkgIT0g aGlnaGVzdFJvb3QpCiAgICAgICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgICAgICBQb3NpdGlv biBwb3MobiwgY2FyZXRNaW5PZmZzZXQobikpOwogICAgICAgICAgICAgaWYgKHBvcy5pc0NhbmRp ZGF0ZSgpKSB7CkBAIC02NzYsNyArNjc2LDcgQEAgVmlzaWJsZVBvc2l0aW9uIG5leHRMaW5lUG9z aXRpb24oY29uc3QgVmlzaWJsZVBvc2l0aW9uICZ2aXNpYmxlUG9zaXRpb24sIGludCB4KQogICAg ICAgICBSZW5kZXJPYmplY3QqIHJlbmRlcmVyID0gcm9vdC0+Y2xvc2VzdExlYWZDaGlsZEZvckxv Z2ljYWxMZWZ0UG9zaXRpb24oeCAtIGFic1Bvcy54KCksIGlzRWRpdGFibGVQb3NpdGlvbihwKSkt PnJlbmRlcmVyKCk7CiAgICAgICAgIE5vZGUqIG5vZGUgPSByZW5kZXJlci0+bm9kZSgpOwogICAg ICAgICBpZiAobm9kZSAmJiBlZGl0aW5nSWdub3Jlc0NvbnRlbnQobm9kZSkpCi0gICAgICAgICAg ICByZXR1cm4gUG9zaXRpb24obm9kZS0+cGFyZW50Tm9kZSgpLCBub2RlLT5ub2RlSW5kZXgoKSk7 CisgICAgICAgICAgICByZXR1cm4gcG9zaXRpb25JblBhcmVudEJlZm9yZU5vZGUobm9kZSk7CiAg ICAgICAgIHJldHVybiByZW5kZXJlci0+cG9zaXRpb25Gb3JQb2ludChJbnRQb2ludCh4IC0gYWJz UG9zLngoKSwgcm9vdC0+bGluZVRvcCgpKSk7CiAgICAgfSAgICAKIApAQCAtOTE3LDcgKzkxNyw3 IEBAIFZpc2libGVQb3NpdGlvbiBzdGFydE9mQmxvY2soY29uc3QgVmlzaWJsZVBvc2l0aW9uICZj KQogICAgIE5vZGUgKnN0YXJ0Tm9kZSA9IHAubm9kZSgpOwogICAgIGlmICghc3RhcnROb2RlKQog ICAgICAgICByZXR1cm4gVmlzaWJsZVBvc2l0aW9uKCk7Ci0gICAgcmV0dXJuIFZpc2libGVQb3Np dGlvbihQb3NpdGlvbihzdGFydE5vZGUtPmVuY2xvc2luZ0Jsb2NrRmxvd0VsZW1lbnQoKSwgMCks IERPV05TVFJFQU0pOworICAgIHJldHVybiBWaXNpYmxlUG9zaXRpb24oZmlyc3RQb3NpdGlvbklu Tm9kZShzdGFydE5vZGUtPmVuY2xvc2luZ0Jsb2NrRmxvd0VsZW1lbnQoKSksIERPV05TVFJFQU0p OwogfQogCiBWaXNpYmxlUG9zaXRpb24gZW5kT2ZCbG9jayhjb25zdCBWaXNpYmxlUG9zaXRpb24g JmMpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lLmNwcCBiL1NvdXJjZS9X ZWJDb3JlL3BhZ2UvRnJhbWUuY3BwCmluZGV4IDU0NWZiOTk1ZGYzZjYxZDVkN2U1NzA0MTI1ZTdj MWUxODQ3ZWQwYTEuLjBjMWEyZGMyY2FiYTk1YzZmZjcxYzIwNTViMjY5MmE2ZWU2Mjc3MjEgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWUuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL3BhZ2UvRnJhbWUuY3BwCkBAIC03ODUsNyArNzg1LDcgQEAgVmlzaWJsZVBvc2l0aW9uIEZy YW1lOjp2aXNpYmxlUG9zaXRpb25Gb3JQb2ludChjb25zdCBJbnRQb2ludCYgZnJhbWVQb2ludCkK ICAgICAgICAgcmV0dXJuIFZpc2libGVQb3NpdGlvbigpOwogICAgIFZpc2libGVQb3NpdGlvbiB2 aXNpYmxlUG9zID0gcmVuZGVyZXItPnBvc2l0aW9uRm9yUG9pbnQocmVzdWx0LmxvY2FsUG9pbnQo KSk7CiAgICAgaWYgKHZpc2libGVQb3MuaXNOdWxsKCkpCi0gICAgICAgIHZpc2libGVQb3MgPSBW aXNpYmxlUG9zaXRpb24oUG9zaXRpb24obm9kZSwgMCkpOworICAgICAgICB2aXNpYmxlUG9zID0g Zmlyc3RQb3NpdGlvbkluT3JCZWZvcmVOb2RlKG5vZGUpOwogICAgIHJldHVybiB2aXNpYmxlUG9z OwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2su Y3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmNwcAppbmRleCAzZGZm ZmY2Y2RlZDdlMzljODVlMzM0ZmI5NzFkMGI2ODY1Zjg1ZmQ3Li5lNTQwZWY3MDY4Y2RiODI0MGVl MDFkYWQ2ZWQwNThmNTg4NDk1MGI1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyQmxvY2suY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJC bG9jay5jcHAKQEAgLTM5MzEsMjUgKzM5MzEsNiBAQCBQb3NpdGlvbiBSZW5kZXJCbG9jazo6cG9z aXRpb25Gb3JCb3goSW5saW5lQm94ICpib3gsIGJvb2wgc3RhcnQpIGNvbnN0CiAgICAgcmV0dXJu IFBvc2l0aW9uKGJveC0+cmVuZGVyZXIoKS0+bm9kZSgpLCBzdGFydCA/IHRleHRCb3gtPnN0YXJ0 KCkgOiB0ZXh0Qm94LT5zdGFydCgpICsgdGV4dEJveC0+bGVuKCkpOwogfQogCi1Qb3NpdGlvbiBS ZW5kZXJCbG9jazo6cG9zaXRpb25Gb3JSZW5kZXJlcihSZW5kZXJPYmplY3QqIHJlbmRlcmVyLCBi b29sIHN0YXJ0KSBjb25zdAotewotICAgIGlmICghcmVuZGVyZXIpCi0gICAgICAgIHJldHVybiBQ b3NpdGlvbihub2RlKCksIDApOwotCi0gICAgTm9kZSogbiA9IHJlbmRlcmVyLT5ub2RlKCkgPyBy ZW5kZXJlci0+bm9kZSgpIDogbm9kZSgpOwotICAgIGlmICghbikKLSAgICAgICAgcmV0dXJuIFBv c2l0aW9uKCk7Ci0KLSAgICBBU1NFUlQocmVuZGVyZXIgPT0gbi0+cmVuZGVyZXIoKSk7Ci0KLSAg ICBpbnQgb2Zmc2V0ID0gc3RhcnQgPyByZW5kZXJlci0+Y2FyZXRNaW5PZmZzZXQoKSA6IHJlbmRl cmVyLT5jYXJldE1heE9mZnNldCgpOwotCi0gICAgLy8gRklYTUU6IFRoaXMgd2FzIGEgcnVudGlt ZSBjaGVjayB0aGF0IHNlZW1pbmdseSBjb3VsZG4ndCBmYWlsOyBjaGFuZ2VkIGl0IHRvIGFuIGFz c2VydGlvbiBmb3Igbm93LgotICAgIEFTU0VSVCghbi0+aXNDaGFyYWN0ZXJEYXRhTm9kZSgpIHx8 IHJlbmRlcmVyLT5pc1RleHQoKSk7Ci0KLSAgICByZXR1cm4gUG9zaXRpb24obiwgb2Zmc2V0KTsK LX0KLQogLy8gRklYTUU6IFRoaXMgZnVuY3Rpb24gc2hvdWxkIGdvIG9uIFJlbmRlck9iamVjdCBh cyBhbiBpbnN0YW5jZSBtZXRob2QuIFRoZW4KIC8vIGFsbCBjYXNlcyBpbiB3aGljaCBwb3NpdGlv bkZvclBvaW50IHJlY3VycyBjb3VsZCBjYWxsIHRoaXMgaW5zdGVhZCB0bwogLy8gcHJldmVudCBj cm9zc2luZyBlZGl0YWJsZSBib3VuZGFyaWVzLiBUaGlzIHdvdWxkIHJlcXVpcmUgbWFueSB0ZXN0 cy4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5oIGIv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmgKaW5kZXggOTUyOWJkNjMwZWU3 ZjdiMWYxZjgyNGFkYmI1MDE2OTI1YmZmMzQ3ZS4uM2U0NTI3ZjNlMTU1ZTk2ZjUwMDQ3OTI2OGQ0 NmViZjA2NTExYjY0ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl ckJsb2NrLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmgKQEAg LTU2Niw3ICs1NjYsNiBAQCBwcml2YXRlOgogICAgIHZvaWQgbmV3TGluZShFQ2xlYXIpOwogCiAg ICAgUG9zaXRpb24gcG9zaXRpb25Gb3JCb3goSW5saW5lQm94KiwgYm9vbCBzdGFydCA9IHRydWUp IGNvbnN0OwotICAgIFBvc2l0aW9uIHBvc2l0aW9uRm9yUmVuZGVyZXIoUmVuZGVyT2JqZWN0Kiwg Ym9vbCBzdGFydCA9IHRydWUpIGNvbnN0OwogICAgIFZpc2libGVQb3NpdGlvbiBwb3NpdGlvbkZv clBvaW50V2l0aElubGluZUNoaWxkcmVuKGNvbnN0IEludFBvaW50Jik7CiAKICAgICAvLyBBZGp1 c3QgdHggYW5kIHR5IGZyb20gcGFpbnRpbmcgb2Zmc2V0cyB0byB0aGUgbG9jYWwgY29vcmRzIG9m IHRoaXMgcmVuZGVyZXIK