62932 2011-06-18 11:13:23 -0700 FrameSelection::modify should take verticalDisplacement instead of verticalDistance 2011-06-20 11:33:51 -0700 1 1 1 Unclassified WebKit HTML Editing 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 rniwa rniwa darin enrica eric morrita ojan tkent tony webkit.review.bot oldest_to_newest 423131 0 rniwa 2011-06-18 11:13:23 -0700 A distance is the magnitude of a displacement. We shouldn't be using these terms interchangeably. 423720 1 97816 rniwa 2011-06-20 09:58:32 -0700 Created attachment 97816 renamed the argument 423722 2 97816 rniwa 2011-06-20 10:03:30 -0700 Comment on attachment 97816 renamed the argument On my second thought, it's probably cleaner to add VerticalDirection enum because callers compute distance and then pass distance or -distance depending. 423748 3 97822 rniwa 2011-06-20 10:31:49 -0700 Created attachment 97822 added VerticalDirection enum 423793 4 97822 webkit.review.bot 2011-06-20 11:29:01 -0700 Comment on attachment 97822 added VerticalDirection enum Clearing flags on attachment: 97822 Committed r89263: <http://trac.webkit.org/changeset/89263> 423794 5 webkit.review.bot 2011-06-20 11:29:06 -0700 All reviewed patches have been landed. Closing bug. 423801 6 rniwa 2011-06-20 11:33:51 -0700 Thanks for the review, Ojan. More bool shaving patches are coming! 97816 2011-06-20 09:58:32 -0700 2011-06-20 10:03:29 -0700 renamed the argument bug-62932-20110620095831.patch text/plain 3272 rniwa SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDg5MjUyKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTEtMDYtMjAgIFJ5b3N1a2Ug Tml3YSAgPHJuaXdhQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgRnJhbWVTZWxlY3Rpb246Om1vZGlmeSBzaG91bGQgdGFrZSB2ZXJ0 aWNhbERpc3BsYWNlbWVudCBpbnN0ZWFkIG9mIHZlcnRpY2FsRGlzdGFuY2UKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTYyOTMyCisKKyAgICAgICAgUmVu YW1lZCB2ZXJ0aWNhbERpc3RhbmNlIHRvIHZlcnRpY2FsRGlzcGxhY2VtZW50IHdoZXJlIGFwcHJv cHJpYXRlLgorCisgICAgICAgICogZWRpdGluZy9GcmFtZVNlbGVjdGlvbi5jcHA6CisgICAgICAg IChXZWJDb3JlOjpGcmFtZVNlbGVjdGlvbjo6bW9kaWZ5KToKKyAgICAgICAgKiBlZGl0aW5nL0Zy YW1lU2VsZWN0aW9uLmg6CisKIDIwMTEtMDYtMjAgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dh cmNpYUBpZ2FsaWEuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IFhhbiBMb3Blei4KSW5kZXg6 IFNvdXJjZS9XZWJDb3JlL2VkaXRpbmcvRnJhbWVTZWxlY3Rpb24uY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9XZWJDb3JlL2VkaXRpbmcvRnJhbWVTZWxlY3Rpb24uY3BwCShyZXZpc2lvbiA4OTIy NSkKKysrIFNvdXJjZS9XZWJDb3JlL2VkaXRpbmcvRnJhbWVTZWxlY3Rpb24uY3BwCSh3b3JraW5n IGNvcHkpCkBAIC04ODgsMjUgKzg4OCwyMyBAQCBzdGF0aWMgYm9vbCBhYnNvbHV0ZUNhcmV0WShj b25zdCBWaXNpYmxlCiAgICAgcmV0dXJuIHRydWU7CiB9CiAKLWJvb2wgRnJhbWVTZWxlY3Rpb246 Om1vZGlmeShFQWx0ZXJhdGlvbiBhbHRlciwgaW50IHZlcnRpY2FsRGlzdGFuY2UsIGJvb2wgdXNl clRyaWdnZXJlZCwgQ3Vyc29yQWxpZ25PblNjcm9sbCBhbGlnbikKK2Jvb2wgRnJhbWVTZWxlY3Rp b246Om1vZGlmeShFQWx0ZXJhdGlvbiBhbHRlciwgaW50IHZlcnRpY2FsRGlzcGxhY2VtZW50LCBi b29sIHVzZXJUcmlnZ2VyZWQsIEN1cnNvckFsaWduT25TY3JvbGwgYWxpZ24pCiB7Ci0gICAgaWYg KCF2ZXJ0aWNhbERpc3RhbmNlKQorICAgIGlmICghdmVydGljYWxEaXNwbGFjZW1lbnQpCiAgICAg ICAgIHJldHVybiBmYWxzZTsKIAogICAgIGlmICh1c2VyVHJpZ2dlcmVkKSB7CiAgICAgICAgIEZy YW1lU2VsZWN0aW9uIHRyaWFsRnJhbWVTZWxlY3Rpb247CiAgICAgICAgIHRyaWFsRnJhbWVTZWxl Y3Rpb24uc2V0U2VsZWN0aW9uKG1fc2VsZWN0aW9uKTsKICAgICAgICAgdHJpYWxGcmFtZVNlbGVj dGlvbi5zZXRJc0RpcmVjdGlvbmFsKG1faXNEaXJlY3Rpb25hbCk7Ci0gICAgICAgIHRyaWFsRnJh bWVTZWxlY3Rpb24ubW9kaWZ5KGFsdGVyLCB2ZXJ0aWNhbERpc3RhbmNlLCBmYWxzZSk7CisgICAg ICAgIHRyaWFsRnJhbWVTZWxlY3Rpb24ubW9kaWZ5KGFsdGVyLCB2ZXJ0aWNhbERpc3BsYWNlbWVu dCwgZmFsc2UpOwogCiAgICAgICAgIGJvb2wgY2hhbmdlID0gc2hvdWxkQ2hhbmdlU2VsZWN0aW9u KHRyaWFsRnJhbWVTZWxlY3Rpb24uc2VsZWN0aW9uKCkpOwogICAgICAgICBpZiAoIWNoYW5nZSkK ICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICB9CiAKLSAgICBib29sIHVwID0gdmVydGlj YWxEaXN0YW5jZSA8IDA7Ci0gICAgaWYgKHVwKQotICAgICAgICB2ZXJ0aWNhbERpc3RhbmNlID0g LXZlcnRpY2FsRGlzdGFuY2U7CisgICAgYm9vbCB1cCA9IHZlcnRpY2FsRGlzcGxhY2VtZW50IDwg MDsKIAogICAgIHdpbGxCZU1vZGlmaWVkKGFsdGVyLCB1cCA/IERpcmVjdGlvbkJhY2t3YXJkIDog RGlyZWN0aW9uRm9yd2FyZCk7CiAKQEAgLTkzNCw2ICs5MzIsNyBAQCBib29sIEZyYW1lU2VsZWN0 aW9uOjptb2RpZnkoRUFsdGVyYXRpb24gCiAKICAgICBWaXNpYmxlUG9zaXRpb24gcmVzdWx0Owog ICAgIFZpc2libGVQb3NpdGlvbiBuZXh0OworICAgIGludCB2ZXJ0aWNhbERpc3RhbmNlID0gdXAg PyAtdmVydGljYWxEaXNwbGFjZW1lbnQgOiB2ZXJ0aWNhbERpc3BsYWNlbWVudDsKICAgICBmb3Ig KFZpc2libGVQb3NpdGlvbiBwID0gcG9zOyA7IHAgPSBuZXh0KSB7CiAgICAgICAgIG5leHQgPSAo dXAgPyBwcmV2aW91c0xpbmVQb3NpdGlvbiA6IG5leHRMaW5lUG9zaXRpb24pKHAsIHhQb3MpOwog ICAgICAgICBpZiAobmV4dC5pc051bGwoKSB8fCBuZXh0ID09IHApCkluZGV4OiBTb3VyY2UvV2Vi Q29yZS9lZGl0aW5nL0ZyYW1lU2VsZWN0aW9uLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNv cmUvZWRpdGluZy9GcmFtZVNlbGVjdGlvbi5oCShyZXZpc2lvbiA4OTIyNSkKKysrIFNvdXJjZS9X ZWJDb3JlL2VkaXRpbmcvRnJhbWVTZWxlY3Rpb24uaAkod29ya2luZyBjb3B5KQpAQCAtMTQ2LDcg KzE0Niw3IEBAIHB1YmxpYzoKICAgICBFQWZmaW5pdHkgYWZmaW5pdHkoKSBjb25zdCB7IHJldHVy biBtX3NlbGVjdGlvbi5hZmZpbml0eSgpOyB9CiAKICAgICBib29sIG1vZGlmeShFQWx0ZXJhdGlv biwgU2VsZWN0aW9uRGlyZWN0aW9uLCBUZXh0R3JhbnVsYXJpdHksIGJvb2wgdXNlclRyaWdnZXJl ZCA9IGZhbHNlKTsKLSAgICBib29sIG1vZGlmeShFQWx0ZXJhdGlvbiwgaW50IHZlcnRpY2FsRGlz dGFuY2UsIGJvb2wgdXNlclRyaWdnZXJlZCA9IGZhbHNlLCBDdXJzb3JBbGlnbk9uU2Nyb2xsID0g QWxpZ25DdXJzb3JPblNjcm9sbElmTmVlZGVkKTsKKyAgICBib29sIG1vZGlmeShFQWx0ZXJhdGlv biwgaW50IHZlcnRpY2FsRGlzcGxhY2VtZW50LCBib29sIHVzZXJUcmlnZ2VyZWQgPSBmYWxzZSwg Q3Vyc29yQWxpZ25PblNjcm9sbCA9IEFsaWduQ3Vyc29yT25TY3JvbGxJZk5lZWRlZCk7CiAgICAg VGV4dEdyYW51bGFyaXR5IGdyYW51bGFyaXR5KCkgY29uc3QgeyByZXR1cm4gbV9ncmFudWxhcml0 eTsgfQogCiAgICAgdm9pZCBzZXRTdGFydChjb25zdCBWaXNpYmxlUG9zaXRpb24gJiwgYm9vbCB1 c2VyVHJpZ2dlcmVkID0gZmFsc2UpOwo= 97822 2011-06-20 10:31:49 -0700 2011-06-20 11:29:01 -0700 added VerticalDirection enum bug-62932-20110620103147.patch text/plain 9138 rniwa SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDg5MjUzKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjQgQEAKKzIwMTEtMDYtMjAgIFJ5b3N1a2Ug Tml3YSAgPHJuaXdhQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgRnJhbWVTZWxlY3Rpb246Om1vZGlmeSBzaG91bGQgdGFrZSB2ZXJ0 aWNhbERpc3BsYWNlbWVudCBpbnN0ZWFkIG9mIHZlcnRpY2FsRGlzdGFuY2UKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTYyOTMyCisKKyAgICAgICAgQWRk ZWQgbmV3IFZlcnRpY2FsRGlyZWN0aW9uIGVudW0gdG8gdGhlIGFyZ3VtZW50IGxpc3Qgb2YgRnJh bWVTZWxlY3Rpb246Om1vZGlmeSB0aGF0IHRha2VzCisgICAgICAgIHZlcnRpY2FsRGlzdGFuY2Uu ICBBbHNvIGNoYW5nZWQgdGhlIHR5cGUgb2YgdmVydGljYWxEaXN0YW5jZSBmcm9tIGludCB0byB1 bnNpZ25lZCBpbnQKKyAgICAgICAgdG8gYWNjaWRlbnRhbGx5IHBhc3MgYSBuZWdhdGl2ZSBkaXN0 YW5jZSBpbiB0aGUgZnV0dXJlLgorCisgICAgICAgICogZWRpdGluZy9FZGl0b3JDb21tYW5kLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OnZlcnRpY2FsU2Nyb2xsRGlzdGFuY2UpOiBSZXR1cm5zIHVu c2lnbmVkIGludCBpbnN0ZWFkIG9mIGludC4KKyAgICAgICAgKFdlYkNvcmU6OmV4ZWN1dGVNb3Zl UGFnZURvd24pOiBDYWxscyBGcmFtZVNlbGVjdGlvbjo6bW9kaWZ5LgorICAgICAgICAoV2ViQ29y ZTo6ZXhlY3V0ZU1vdmVQYWdlRG93bkFuZE1vZGlmeVNlbGVjdGlvbik6IERpdHRvLgorICAgICAg ICAoV2ViQ29yZTo6ZXhlY3V0ZU1vdmVQYWdlVXApOiBEaXR0by4KKyAgICAgICAgKFdlYkNvcmU6 OmV4ZWN1dGVNb3ZlUGFnZVVwQW5kTW9kaWZ5U2VsZWN0aW9uKTogRGl0dG8uCisgICAgICAgICog ZWRpdGluZy9GcmFtZVNlbGVjdGlvbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZVNlbGVj dGlvbjo6bW9kaWZ5KTogVGFrZXMgVmVydGljYWxEaXJlY3Rpb24gYXMgYW4gYXJndW1lbnQuCisg ICAgICAgICogZWRpdGluZy9GcmFtZVNlbGVjdGlvbi5oOgorCiAyMDExLTA2LTIwICBBbmRyYXMg QmVjc2kgIDxhYmVjc2lAd2Via2l0Lm9yZz4KIAogICAgICAgICBSdWJiZXItc3RhbXBlZCBieSBD c2FiYSBPc3p0cm9nb27DoWMuCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0VkaXRvckNv bW1hbmQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2VkaXRpbmcvRWRpdG9yQ29t bWFuZC5jcHAJKHJldmlzaW9uIDg5MjI1KQorKysgU291cmNlL1dlYkNvcmUvZWRpdGluZy9FZGl0 b3JDb21tYW5kLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjQ1LDcgKzI0NSw3IEBAIHN0YXRpYyBU cmlTdGF0ZSBzdGF0ZVRleHRXcml0aW5nRGlyZWN0aW8KICAgICByZXR1cm4gKHNlbGVjdGlvbkRp cmVjdGlvbiA9PSBkaXJlY3Rpb24gJiYgIWhhc05lc3RlZE9yTXVsdGlwbGVFbWJlZGRpbmdzKSA/ IFRydWVUcmlTdGF0ZSA6IEZhbHNlVHJpU3RhdGU7CiB9CiAKLXN0YXRpYyBpbnQgdmVydGljYWxT Y3JvbGxEaXN0YW5jZShGcmFtZSogZnJhbWUpCitzdGF0aWMgdW5zaWduZWQgdmVydGljYWxTY3Jv bGxEaXN0YW5jZShGcmFtZSogZnJhbWUpCiB7CiAgICAgTm9kZSogZm9jdXNlZE5vZGUgPSBmcmFt ZS0+ZG9jdW1lbnQoKS0+Zm9jdXNlZE5vZGUoKTsKICAgICBpZiAoIWZvY3VzZWROb2RlKQpAQCAt MjU4LDkgKzI1OCw4IEBAIHN0YXRpYyBpbnQgdmVydGljYWxTY3JvbGxEaXN0YW5jZShGcmFtZSoK ICAgICAgICAgcmV0dXJuIDA7CiAgICAgaWYgKCEoc3R5bGUtPm92ZXJmbG93WSgpID09IE9TQ1JP TEwgfHwgc3R5bGUtPm92ZXJmbG93WSgpID09IE9BVVRPIHx8IGZvY3VzZWROb2RlLT5yZW5kZXJl cklzRWRpdGFibGUoKSkpCiAgICAgICAgIHJldHVybiAwOwotICAgIGludCBoZWlnaHQgPSBzdGQ6 Om1pbjxpbnQ+KHRvUmVuZGVyQm94KHJlbmRlcmVyKS0+Y2xpZW50SGVpZ2h0KCksCi0gICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgZnJhbWUtPnZpZXcoKS0+dmlzaWJsZUhlaWdodCgpKTsK LSAgICByZXR1cm4gbWF4KG1heDxpbnQ+KGhlaWdodCAqIFNjcm9sbGJhcjo6bWluRnJhY3Rpb25U b1N0ZXBXaGVuUGFnaW5nKCksIGhlaWdodCAtIFNjcm9sbGJhcjo6bWF4T3ZlcmxhcEJldHdlZW5Q YWdlcygpKSwgMSk7CisgICAgaW50IGhlaWdodCA9IHN0ZDo6bWluPGludD4odG9SZW5kZXJCb3go cmVuZGVyZXIpLT5jbGllbnRIZWlnaHQoKSwgZnJhbWUtPnZpZXcoKS0+dmlzaWJsZUhlaWdodCgp KTsKKyAgICByZXR1cm4gc3RhdGljX2Nhc3Q8dW5zaWduZWQ+KG1heChtYXg8aW50PihoZWlnaHQg KiBTY3JvbGxiYXI6Om1pbkZyYWN0aW9uVG9TdGVwV2hlblBhZ2luZygpLCBoZWlnaHQgLSBTY3Jv bGxiYXI6Om1heE92ZXJsYXBCZXR3ZWVuUGFnZXMoKSksIDEpKTsKIH0KIAogc3RhdGljIFJlZlB0 cjxSYW5nZT4gdW5pb25ET01SYW5nZXMoUmFuZ2UqIGEsIFJhbmdlKiBiKQpAQCAtNjUzLDM0ICs2 NTIsMzQgQEAgc3RhdGljIGJvb2wgZXhlY3V0ZU1vdmVMZWZ0QW5kTW9kaWZ5U2VsZQogCiBzdGF0 aWMgYm9vbCBleGVjdXRlTW92ZVBhZ2VEb3duKEZyYW1lKiBmcmFtZSwgRXZlbnQqLCBFZGl0b3JD b21tYW5kU291cmNlLCBjb25zdCBTdHJpbmcmKQogewotICAgIGludCBkaXN0YW5jZSA9IHZlcnRp Y2FsU2Nyb2xsRGlzdGFuY2UoZnJhbWUpOworICAgIHVuc2lnbmVkIGRpc3RhbmNlID0gdmVydGlj YWxTY3JvbGxEaXN0YW5jZShmcmFtZSk7CiAgICAgaWYgKCFkaXN0YW5jZSkKICAgICAgICAgcmV0 dXJuIGZhbHNlOwotICAgIHJldHVybiBmcmFtZS0+c2VsZWN0aW9uKCktPm1vZGlmeShGcmFtZVNl bGVjdGlvbjo6QWx0ZXJhdGlvbk1vdmUsIGRpc3RhbmNlLCB0cnVlLCBGcmFtZVNlbGVjdGlvbjo6 QWxpZ25DdXJzb3JPblNjcm9sbEFsd2F5cyk7CisgICAgcmV0dXJuIGZyYW1lLT5zZWxlY3Rpb24o KS0+bW9kaWZ5KEZyYW1lU2VsZWN0aW9uOjpBbHRlcmF0aW9uTW92ZSwgZGlzdGFuY2UsIEZyYW1l U2VsZWN0aW9uOjpEaXJlY3Rpb25Eb3duLCB0cnVlLCBGcmFtZVNlbGVjdGlvbjo6QWxpZ25DdXJz b3JPblNjcm9sbEFsd2F5cyk7CiB9CiAKIHN0YXRpYyBib29sIGV4ZWN1dGVNb3ZlUGFnZURvd25B bmRNb2RpZnlTZWxlY3Rpb24oRnJhbWUqIGZyYW1lLCBFdmVudCosIEVkaXRvckNvbW1hbmRTb3Vy Y2UsIGNvbnN0IFN0cmluZyYpCiB7Ci0gICAgaW50IGRpc3RhbmNlID0gdmVydGljYWxTY3JvbGxE aXN0YW5jZShmcmFtZSk7CisgICAgdW5zaWduZWQgZGlzdGFuY2UgPSB2ZXJ0aWNhbFNjcm9sbERp c3RhbmNlKGZyYW1lKTsKICAgICBpZiAoIWRpc3RhbmNlKQogICAgICAgICByZXR1cm4gZmFsc2U7 Ci0gICAgcmV0dXJuIGZyYW1lLT5zZWxlY3Rpb24oKS0+bW9kaWZ5KEZyYW1lU2VsZWN0aW9uOjpB bHRlcmF0aW9uRXh0ZW5kLCBkaXN0YW5jZSwgdHJ1ZSwgRnJhbWVTZWxlY3Rpb246OkFsaWduQ3Vy c29yT25TY3JvbGxBbHdheXMpOworICAgIHJldHVybiBmcmFtZS0+c2VsZWN0aW9uKCktPm1vZGlm eShGcmFtZVNlbGVjdGlvbjo6QWx0ZXJhdGlvbkV4dGVuZCwgZGlzdGFuY2UsIEZyYW1lU2VsZWN0 aW9uOjpEaXJlY3Rpb25Eb3duLCB0cnVlLCBGcmFtZVNlbGVjdGlvbjo6QWxpZ25DdXJzb3JPblNj cm9sbEFsd2F5cyk7CiB9CiAKIHN0YXRpYyBib29sIGV4ZWN1dGVNb3ZlUGFnZVVwKEZyYW1lKiBm cmFtZSwgRXZlbnQqLCBFZGl0b3JDb21tYW5kU291cmNlLCBjb25zdCBTdHJpbmcmKQogewotICAg IGludCBkaXN0YW5jZSA9IHZlcnRpY2FsU2Nyb2xsRGlzdGFuY2UoZnJhbWUpOworICAgIHVuc2ln bmVkIGRpc3RhbmNlID0gdmVydGljYWxTY3JvbGxEaXN0YW5jZShmcmFtZSk7CiAgICAgaWYgKCFk aXN0YW5jZSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwotICAgIHJldHVybiBmcmFtZS0+c2VsZWN0 aW9uKCktPm1vZGlmeShGcmFtZVNlbGVjdGlvbjo6QWx0ZXJhdGlvbk1vdmUsIC1kaXN0YW5jZSwg dHJ1ZSwgRnJhbWVTZWxlY3Rpb246OkFsaWduQ3Vyc29yT25TY3JvbGxBbHdheXMpOworICAgIHJl dHVybiBmcmFtZS0+c2VsZWN0aW9uKCktPm1vZGlmeShGcmFtZVNlbGVjdGlvbjo6QWx0ZXJhdGlv bk1vdmUsIGRpc3RhbmNlLCBGcmFtZVNlbGVjdGlvbjo6RGlyZWN0aW9uVXAsIHRydWUsIEZyYW1l U2VsZWN0aW9uOjpBbGlnbkN1cnNvck9uU2Nyb2xsQWx3YXlzKTsKIH0KIAogc3RhdGljIGJvb2wg ZXhlY3V0ZU1vdmVQYWdlVXBBbmRNb2RpZnlTZWxlY3Rpb24oRnJhbWUqIGZyYW1lLCBFdmVudCos IEVkaXRvckNvbW1hbmRTb3VyY2UsIGNvbnN0IFN0cmluZyYpCiB7Ci0gICAgaW50IGRpc3RhbmNl ID0gdmVydGljYWxTY3JvbGxEaXN0YW5jZShmcmFtZSk7CisgICAgdW5zaWduZWQgZGlzdGFuY2Ug PSB2ZXJ0aWNhbFNjcm9sbERpc3RhbmNlKGZyYW1lKTsKICAgICBpZiAoIWRpc3RhbmNlKQogICAg ICAgICByZXR1cm4gZmFsc2U7Ci0gICAgcmV0dXJuIGZyYW1lLT5zZWxlY3Rpb24oKS0+bW9kaWZ5 KEZyYW1lU2VsZWN0aW9uOjpBbHRlcmF0aW9uRXh0ZW5kLCAtZGlzdGFuY2UsIHRydWUsIEZyYW1l U2VsZWN0aW9uOjpBbGlnbkN1cnNvck9uU2Nyb2xsQWx3YXlzKTsKKyAgICByZXR1cm4gZnJhbWUt PnNlbGVjdGlvbigpLT5tb2RpZnkoRnJhbWVTZWxlY3Rpb246OkFsdGVyYXRpb25FeHRlbmQsIGRp c3RhbmNlLCBGcmFtZVNlbGVjdGlvbjo6RGlyZWN0aW9uVXAsIHRydWUsIEZyYW1lU2VsZWN0aW9u OjpBbGlnbkN1cnNvck9uU2Nyb2xsQWx3YXlzKTsKIH0KIAogc3RhdGljIGJvb2wgZXhlY3V0ZU1v dmVSaWdodChGcmFtZSogZnJhbWUsIEV2ZW50KiwgRWRpdG9yQ29tbWFuZFNvdXJjZSwgY29uc3Qg U3RyaW5nJikKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2VkaXRpbmcvRnJhbWVTZWxlY3Rpb24uY3Bw Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2VkaXRpbmcvRnJhbWVTZWxlY3Rpb24uY3Bw CShyZXZpc2lvbiA4OTIyNSkKKysrIFNvdXJjZS9XZWJDb3JlL2VkaXRpbmcvRnJhbWVTZWxlY3Rp b24uY3BwCSh3b3JraW5nIGNvcHkpCkBAIC04ODgsNyArODg4LDcgQEAgc3RhdGljIGJvb2wgYWJz b2x1dGVDYXJldFkoY29uc3QgVmlzaWJsZQogICAgIHJldHVybiB0cnVlOwogfQogCi1ib29sIEZy YW1lU2VsZWN0aW9uOjptb2RpZnkoRUFsdGVyYXRpb24gYWx0ZXIsIGludCB2ZXJ0aWNhbERpc3Rh bmNlLCBib29sIHVzZXJUcmlnZ2VyZWQsIEN1cnNvckFsaWduT25TY3JvbGwgYWxpZ24pCitib29s IEZyYW1lU2VsZWN0aW9uOjptb2RpZnkoRUFsdGVyYXRpb24gYWx0ZXIsIHVuc2lnbmVkIHZlcnRp Y2FsRGlzdGFuY2UsIFZlcnRpY2FsRGlyZWN0aW9uIGRpcmVjdGlvbiwgYm9vbCB1c2VyVHJpZ2dl cmVkLCBDdXJzb3JBbGlnbk9uU2Nyb2xsIGFsaWduKQogewogICAgIGlmICghdmVydGljYWxEaXN0 YW5jZSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwpAQCAtODk3LDI2ICs4OTcsMjIgQEAgYm9vbCBG cmFtZVNlbGVjdGlvbjo6bW9kaWZ5KEVBbHRlcmF0aW9uIAogICAgICAgICBGcmFtZVNlbGVjdGlv biB0cmlhbEZyYW1lU2VsZWN0aW9uOwogICAgICAgICB0cmlhbEZyYW1lU2VsZWN0aW9uLnNldFNl bGVjdGlvbihtX3NlbGVjdGlvbik7CiAgICAgICAgIHRyaWFsRnJhbWVTZWxlY3Rpb24uc2V0SXNE aXJlY3Rpb25hbChtX2lzRGlyZWN0aW9uYWwpOwotICAgICAgICB0cmlhbEZyYW1lU2VsZWN0aW9u Lm1vZGlmeShhbHRlciwgdmVydGljYWxEaXN0YW5jZSwgZmFsc2UpOworICAgICAgICB0cmlhbEZy YW1lU2VsZWN0aW9uLm1vZGlmeShhbHRlciwgdmVydGljYWxEaXN0YW5jZSwgZGlyZWN0aW9uLCBm YWxzZSk7CiAKICAgICAgICAgYm9vbCBjaGFuZ2UgPSBzaG91bGRDaGFuZ2VTZWxlY3Rpb24odHJp YWxGcmFtZVNlbGVjdGlvbi5zZWxlY3Rpb24oKSk7CiAgICAgICAgIGlmICghY2hhbmdlKQogICAg ICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIH0KIAotICAgIGJvb2wgdXAgPSB2ZXJ0aWNhbERp c3RhbmNlIDwgMDsKLSAgICBpZiAodXApCi0gICAgICAgIHZlcnRpY2FsRGlzdGFuY2UgPSAtdmVy dGljYWxEaXN0YW5jZTsKLQotICAgIHdpbGxCZU1vZGlmaWVkKGFsdGVyLCB1cCA/IERpcmVjdGlv bkJhY2t3YXJkIDogRGlyZWN0aW9uRm9yd2FyZCk7CisgICAgd2lsbEJlTW9kaWZpZWQoYWx0ZXIs IGRpcmVjdGlvbiA9PSBEaXJlY3Rpb25VcCA/IERpcmVjdGlvbkJhY2t3YXJkIDogRGlyZWN0aW9u Rm9yd2FyZCk7CiAKICAgICBWaXNpYmxlUG9zaXRpb24gcG9zOwogICAgIGludCB4UG9zID0gMDsK ICAgICBzd2l0Y2ggKGFsdGVyKSB7CiAgICAgY2FzZSBBbHRlcmF0aW9uTW92ZToKLSAgICAgICAg cG9zID0gVmlzaWJsZVBvc2l0aW9uKHVwID8gbV9zZWxlY3Rpb24uc3RhcnQoKSA6IG1fc2VsZWN0 aW9uLmVuZCgpLCBtX3NlbGVjdGlvbi5hZmZpbml0eSgpKTsKLSAgICAgICAgeFBvcyA9IGxpbmVE aXJlY3Rpb25Qb2ludEZvckJsb2NrRGlyZWN0aW9uTmF2aWdhdGlvbih1cCA/IFNUQVJUIDogRU5E KTsKLSAgICAgICAgbV9zZWxlY3Rpb24uc2V0QWZmaW5pdHkodXAgPyBVUFNUUkVBTSA6IERPV05T VFJFQU0pOworICAgICAgICBwb3MgPSBWaXNpYmxlUG9zaXRpb24oZGlyZWN0aW9uID09IERpcmVj dGlvblVwID8gbV9zZWxlY3Rpb24uc3RhcnQoKSA6IG1fc2VsZWN0aW9uLmVuZCgpLCBtX3NlbGVj dGlvbi5hZmZpbml0eSgpKTsKKyAgICAgICAgeFBvcyA9IGxpbmVEaXJlY3Rpb25Qb2ludEZvckJs b2NrRGlyZWN0aW9uTmF2aWdhdGlvbihkaXJlY3Rpb24gPT0gRGlyZWN0aW9uVXAgPyBTVEFSVCA6 IEVORCk7CisgICAgICAgIG1fc2VsZWN0aW9uLnNldEFmZmluaXR5KGRpcmVjdGlvbiA9PSBEaXJl Y3Rpb25VcCA/IFVQU1RSRUFNIDogRE9XTlNUUkVBTSk7CiAgICAgICAgIGJyZWFrOwogICAgIGNh c2UgQWx0ZXJhdGlvbkV4dGVuZDoKICAgICAgICAgcG9zID0gVmlzaWJsZVBvc2l0aW9uKG1fc2Vs ZWN0aW9uLmV4dGVudCgpLCBtX3NlbGVjdGlvbi5hZmZpbml0eSgpKTsKQEAgLTkyOCwyMiArOTI0 LDIyIEBAIGJvb2wgRnJhbWVTZWxlY3Rpb246Om1vZGlmeShFQWx0ZXJhdGlvbiAKICAgICBpbnQg c3RhcnRZOwogICAgIGlmICghYWJzb2x1dGVDYXJldFkocG9zLCBzdGFydFkpKQogICAgICAgICBy ZXR1cm4gZmFsc2U7Ci0gICAgaWYgKHVwKQorICAgIGlmIChkaXJlY3Rpb24gPT0gRGlyZWN0aW9u VXApCiAgICAgICAgIHN0YXJ0WSA9IC1zdGFydFk7CiAgICAgaW50IGxhc3RZID0gc3RhcnRZOwog CiAgICAgVmlzaWJsZVBvc2l0aW9uIHJlc3VsdDsKICAgICBWaXNpYmxlUG9zaXRpb24gbmV4dDsK ICAgICBmb3IgKFZpc2libGVQb3NpdGlvbiBwID0gcG9zOyA7IHAgPSBuZXh0KSB7Ci0gICAgICAg IG5leHQgPSAodXAgPyBwcmV2aW91c0xpbmVQb3NpdGlvbiA6IG5leHRMaW5lUG9zaXRpb24pKHAs IHhQb3MpOworICAgICAgICBuZXh0ID0gKGRpcmVjdGlvbiA9PSBEaXJlY3Rpb25VcCA/IHByZXZp b3VzTGluZVBvc2l0aW9uIDogbmV4dExpbmVQb3NpdGlvbikocCwgeFBvcyk7CiAgICAgICAgIGlm IChuZXh0LmlzTnVsbCgpIHx8IG5leHQgPT0gcCkKICAgICAgICAgICAgIGJyZWFrOwogICAgICAg ICBpbnQgbmV4dFk7CiAgICAgICAgIGlmICghYWJzb2x1dGVDYXJldFkobmV4dCwgbmV4dFkpKQog ICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgIGlmICh1cCkKKyAgICAgICAgaWYgKGRpcmVjdGlv biA9PSBEaXJlY3Rpb25VcCkKICAgICAgICAgICAgIG5leHRZID0gLW5leHRZOwotICAgICAgICBp ZiAobmV4dFkgLSBzdGFydFkgPiB2ZXJ0aWNhbERpc3RhbmNlKQorICAgICAgICBpZiAobmV4dFkg LSBzdGFydFkgPiBzdGF0aWNfY2FzdDxpbnQ+KHZlcnRpY2FsRGlzdGFuY2UpKQogICAgICAgICAg ICAgYnJlYWs7CiAgICAgICAgIGlmIChuZXh0WSA+PSBsYXN0WSkgewogICAgICAgICAgICAgbGFz dFkgPSBuZXh0WTsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2VkaXRpbmcvRnJhbWVTZWxlY3Rpb24u aAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0ZyYW1lU2VsZWN0aW9uLmgJ KHJldmlzaW9uIDg5MjI1KQorKysgU291cmNlL1dlYkNvcmUvZWRpdGluZy9GcmFtZVNlbGVjdGlv bi5oCSh3b3JraW5nIGNvcHkpCkBAIC0xNDYsNyArMTQ2LDggQEAgcHVibGljOgogICAgIEVBZmZp bml0eSBhZmZpbml0eSgpIGNvbnN0IHsgcmV0dXJuIG1fc2VsZWN0aW9uLmFmZmluaXR5KCk7IH0K IAogICAgIGJvb2wgbW9kaWZ5KEVBbHRlcmF0aW9uLCBTZWxlY3Rpb25EaXJlY3Rpb24sIFRleHRH cmFudWxhcml0eSwgYm9vbCB1c2VyVHJpZ2dlcmVkID0gZmFsc2UpOwotICAgIGJvb2wgbW9kaWZ5 KEVBbHRlcmF0aW9uLCBpbnQgdmVydGljYWxEaXN0YW5jZSwgYm9vbCB1c2VyVHJpZ2dlcmVkID0g ZmFsc2UsIEN1cnNvckFsaWduT25TY3JvbGwgPSBBbGlnbkN1cnNvck9uU2Nyb2xsSWZOZWVkZWQp OworICAgIGVudW0gVmVydGljYWxEaXJlY3Rpb24geyBEaXJlY3Rpb25VcCwgRGlyZWN0aW9uRG93 biB9OworICAgIGJvb2wgbW9kaWZ5KEVBbHRlcmF0aW9uLCB1bnNpZ25lZCB2ZXJ0aWNhbERpc3Rh bmNlLCBWZXJ0aWNhbERpcmVjdGlvbiwgYm9vbCB1c2VyVHJpZ2dlcmVkID0gZmFsc2UsIEN1cnNv ckFsaWduT25TY3JvbGwgPSBBbGlnbkN1cnNvck9uU2Nyb2xsSWZOZWVkZWQpOwogICAgIFRleHRH cmFudWxhcml0eSBncmFudWxhcml0eSgpIGNvbnN0IHsgcmV0dXJuIG1fZ3JhbnVsYXJpdHk7IH0K IAogICAgIHZvaWQgc2V0U3RhcnQoY29uc3QgVmlzaWJsZVBvc2l0aW9uICYsIGJvb2wgdXNlclRy aWdnZXJlZCA9IGZhbHNlKTsK