157609 2016-05-11 22:09:59 -0700 TextIteratorStopsOnFormControls is never used 2016-05-11 23:46:44 -0700 1 1 1 Unclassified WebKit HTML Editing WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 rniwa rniwa darin enrica kling koivisto oldest_to_newest 1192221 0 rniwa 2016-05-11 22:09:59 -0700 TextIteratorStopsOnFormControls is only used in SurroundingText.cpp but this file is not used in any port. This must be a left over from Chromium port. 1192222 1 278697 rniwa 2016-05-11 22:14:06 -0700 Created attachment 278697 Cleanup 1192237 2 278697 achristensen 2016-05-11 23:20:53 -0700 Comment on attachment 278697 Cleanup View in context: https://bugs.webkit.org/attachment.cgi?id=278697&action=review > Source/WebCore/editing/TextIterator.cpp:1189 > + : m_behavior(TextIteratorDefaultBehavior) m_behavior { TextIteratorDefaultBehavior } in the header. Same with a lot of these. 1192249 3 rniwa 2016-05-11 23:46:44 -0700 Committed r200744: <http://trac.webkit.org/changeset/200744> 278697 2016-05-11 22:14:06 -0700 2016-05-11 23:20:53 -0700 Cleanup bug-157609-20160511221456.patch text/plain 9276 rniwa SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIwMDcwMykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI0IEBACisyMDE2LTA1LTExICBSeW9zdWtl IE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgorCisgICAgICAgIFRleHRJdGVyYXRvclN0b3BzT25G b3JtQ29udHJvbHMgaXMgbmV2ZXIgdXNlZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTU3NjA5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgUmVtb3ZlZCBTdXJyb3VuZGluZ1RleHQuY3BwIGFuZCBUZXh0SXRl cmF0b3JTdG9wc09uRm9ybUNvbnRyb2xzIGZyb20gVGV4dEl0ZXJhdG9yIGFzIHRoZXkncmUgbm8g bG9uZ2VyIHVzZWQuCisKKyAgICAgICAgKiBlZGl0aW5nL1N1cnJvdW5kaW5nVGV4dC5jcHA6IFJl bW92ZWQuCisgICAgICAgICogZWRpdGluZy9UZXh0SXRlcmF0b3IuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6VGV4dEl0ZXJhdG9yOjphZHZhbmNlKToKKyAgICAgICAgKFdlYkNvcmU6OlRleHRJdGVy YXRvcjo6ZXhpdE5vZGUpOgorICAgICAgICAoV2ViQ29yZTo6U2ltcGxpZmllZEJhY2t3YXJkc1Rl eHRJdGVyYXRvcjo6U2ltcGxpZmllZEJhY2t3YXJkc1RleHRJdGVyYXRvcik6CisgICAgICAgIChX ZWJDb3JlOjpTaW1wbGlmaWVkQmFja3dhcmRzVGV4dEl0ZXJhdG9yOjphZHZhbmNlKToKKyAgICAg ICAgKFdlYkNvcmU6OmNoYXJhY3RlclN1YnJhbmdlKToKKyAgICAgICAgKFdlYkNvcmU6OkJhY2t3 YXJkc0NoYXJhY3Rlckl0ZXJhdG9yOjpCYWNrd2FyZHNDaGFyYWN0ZXJJdGVyYXRvcik6CisgICAg ICAgICogZWRpdGluZy9UZXh0SXRlcmF0b3IuaDoKKyAgICAgICAgKFdlYkNvcmU6OlNpbXBsaWZp ZWRCYWNrd2FyZHNUZXh0SXRlcmF0b3I6OmF0RW5kKToKKyAgICAgICAgKiBlZGl0aW5nL1RleHRJ dGVyYXRvckJlaGF2aW9yLmg6CisKIDIwMTYtMDUtMTEgIFJ5b3N1a2UgTml3YSAgPHJuaXdhQHdl YmtpdC5vcmc+CiAKICAgICAgICAgaU9TIGJ1aWxkIGZpeCBhdHRlbXB0IGFmdGVyIHIyMDA3MDAu CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9lZGl0aW5nL1N1cnJvdW5kaW5nVGV4dC5jcHAKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYkNvcmUvZWRpdGluZy9TdXJyb3VuZGluZ1RleHQuY3BwCShyZXZp c2lvbiAyMDA3MDMpCisrKyBTb3VyY2UvV2ViQ29yZS9lZGl0aW5nL1N1cnJvdW5kaW5nVGV4dC5j cHAJKHdvcmtpbmcgY29weSkKQEAgLTEsMTA5ICswLDAgQEAKLS8qCi0gKiBDb3B5cmlnaHQgKEMp IDIwMTIgR29vZ2xlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KLSAqCi0gKiBSZWRpc3RyaWJ1 dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQK LSAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dp bmcgY29uZGl0aW9ucyBhcmUKLSAqIG1ldDoKLSAqCi0gKiAgICAgKiBSZWRpc3RyaWJ1dGlvbnMg b2Ygc291cmNlIGNvZGUgbXVzdCByZXRhaW4gdGhlIGFib3ZlIGNvcHlyaWdodAotICogbm90aWNl LCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyLgot ICogICAgICogUmVkaXN0cmlidXRpb25zIGluIGJpbmFyeSBmb3JtIG11c3QgcmVwcm9kdWNlIHRo ZSBhYm92ZQotICogY29weXJpZ2h0IG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5k IHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lcgotICogaW4gdGhlIGRvY3VtZW50YXRpb24gYW5kL29y IG90aGVyIG1hdGVyaWFscyBwcm92aWRlZCB3aXRoIHRoZQotICogZGlzdHJpYnV0aW9uLgotICog ICAgICogTmVpdGhlciB0aGUgbmFtZSBvZiBHb29nbGUgSW5jLiBub3IgdGhlIG5hbWVzIG9mIGl0 cwotICogY29udHJpYnV0b3JzIG1heSBiZSB1c2VkIHRvIGVuZG9yc2Ugb3IgcHJvbW90ZSBwcm9k dWN0cyBkZXJpdmVkIGZyb20KLSAqIHRoaXMgc29mdHdhcmUgd2l0aG91dCBzcGVjaWZpYyBwcmlv ciB3cml0dGVuIHBlcm1pc3Npb24uCi0gKgotICogVEhJUyBTT0ZUV0FSRSBJUyBQUk9WSURFRCBC WSBUSEUgQ09QWVJJR0hUIEhPTERFUlMgQU5EIENPTlRSSUJVVE9SUwotICogIkFTIElTIiBBTkQg QU5ZIEVYUFJFU1MgT1IgSU1QTElFRCBXQVJSQU5USUVTLCBJTkNMVURJTkcsIEJVVCBOT1QKLSAq IExJTUlURUQgVE8sIFRIRSBJTVBMSUVEIFdBUlJBTlRJRVMgT0YgTUVSQ0hBTlRBQklMSVRZIEFO RCBGSVRORVNTIEZPUgotICogQSBQQVJUSUNVTEFSIFBVUlBPU0UgQVJFIERJU0NMQUlNRUQuIElO IE5PIEVWRU5UIFNIQUxMIFRIRSBDT1BZUklHSFQKLSAqIE9XTkVSIE9SIENPTlRSSUJVVE9SUyBC RSBMSUFCTEUgRk9SIEFOWSBESVJFQ1QsIElORElSRUNULCBJTkNJREVOVEFMLAotICogU1BFQ0lB TCwgRVhFTVBMQVJZLCBPUiBDT05TRVFVRU5USUFMIERBTUFHRVMgKElOQ0xVRElORywgQlVUIE5P VAotICogTElNSVRFRCBUTywgUFJPQ1VSRU1FTlQgT0YgU1VCU1RJVFVURSBHT09EUyBPUiBTRVJW SUNFUzsgTE9TUyBPRiBVU0UsCi0gKiBEQVRBLCBPUiBQUk9GSVRTOyBPUiBCVVNJTkVTUyBJTlRF UlJVUFRJT04pIEhPV0VWRVIgQ0FVU0VEIEFORCBPTiBBTlkKLSAqIFRIRU9SWSBPRiBMSUFCSUxJ VFksIFdIRVRIRVIgSU4gQ09OVFJBQ1QsIFNUUklDVCBMSUFCSUxJVFksIE9SIFRPUlQKLSAqIChJ TkNMVURJTkcgTkVHTElHRU5DRSBPUiBPVEhFUldJU0UpIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQg T0YgVEhFIFVTRQotICogT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GIFRIRSBQ T1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KLSAqLwotCi0jaW5jbHVkZSAiY29uZmlnLmgiCi0j aW5jbHVkZSAiU3Vycm91bmRpbmdUZXh0LmgiCi0KLSNpbmNsdWRlICJEb2N1bWVudC5oIgotI2lu Y2x1ZGUgIlRleHRJdGVyYXRvci5oIgotI2luY2x1ZGUgIlZpc2libGVTZWxlY3Rpb24uaCIKLSNp bmNsdWRlICJWaXNpYmxlVW5pdHMuaCIKLQotbmFtZXNwYWNlIFdlYkNvcmUgewotCi1TdXJyb3Vu ZGluZ1RleHQ6OlN1cnJvdW5kaW5nVGV4dChjb25zdCBWaXNpYmxlUG9zaXRpb24mIHZpc2libGVQ b3NpdGlvbiwgdW5zaWduZWQgbWF4TGVuZ3RoKQotICAgIDogbV9wb3NpdGlvbk9mZnNldEluQ29u dGVudCgwKQotewotICAgIGlmICh2aXNpYmxlUG9zaXRpb24uaXNOdWxsKCkpCi0gICAgICAgIHJl dHVybjsKLQotICAgIGNvbnN0IHVuc2lnbmVkIGhhbGZNYXhMZW5ndGggPSBtYXhMZW5ndGggLyAy OwotICAgIENoYXJhY3Rlckl0ZXJhdG9yIGZvcndhcmRJdGVyYXRvcihtYWtlUmFuZ2UodmlzaWJs ZVBvc2l0aW9uLCBlbmRPZkRvY3VtZW50KHZpc2libGVQb3NpdGlvbikpLmdldCgpLCBUZXh0SXRl cmF0b3JTdG9wc09uRm9ybUNvbnRyb2xzKTsKLSAgICBpZiAoIWZvcndhcmRJdGVyYXRvci5hdEVu ZCgpKQotICAgICAgICBmb3J3YXJkSXRlcmF0b3IuYWR2YW5jZShtYXhMZW5ndGggLSBoYWxmTWF4 TGVuZ3RoKTsKLQotICAgIFBvc2l0aW9uIHBvc2l0aW9uID0gdmlzaWJsZVBvc2l0aW9uLmRlZXBF cXVpdmFsZW50KCkucGFyZW50QW5jaG9yZWRFcXVpdmFsZW50KCk7Ci0gICAgRG9jdW1lbnQqIGRv Y3VtZW50ID0gcG9zaXRpb24uZG9jdW1lbnQoKTsKLSAgICBSZWZQdHI8UmFuZ2U+IGZvcndhcmRS YW5nZSA9IGZvcndhcmRJdGVyYXRvci5yYW5nZSgpOwotICAgIGlmICghZm9yd2FyZFJhbmdlIHx8 ICFSYW5nZTo6Y3JlYXRlKGRvY3VtZW50LCBwb3NpdGlvbiwgZm9yd2FyZFJhbmdlLT5zdGFydFBv c2l0aW9uKCkpLT50ZXh0KCkubGVuZ3RoKCkpIHsKLSAgICAgICAgQVNTRVJUKGZvcndhcmRSYW5n ZSk7Ci0gICAgICAgIHJldHVybjsKLSAgICB9Ci0KLSAgICBCYWNrd2FyZHNDaGFyYWN0ZXJJdGVy YXRvciBiYWNrd2FyZHNJdGVyYXRvcihtYWtlUmFuZ2Uoc3RhcnRPZkRvY3VtZW50KHZpc2libGVQ b3NpdGlvbiksIHZpc2libGVQb3NpdGlvbikuZ2V0KCksIFRleHRJdGVyYXRvclN0b3BzT25Gb3Jt Q29udHJvbHMpOwotICAgIGlmICghYmFja3dhcmRzSXRlcmF0b3IuYXRFbmQoKSkKLSAgICAgICAg YmFja3dhcmRzSXRlcmF0b3IuYWR2YW5jZShoYWxmTWF4TGVuZ3RoKTsKLQotICAgIFJlZlB0cjxS YW5nZT4gYmFja3dhcmRzUmFuZ2UgPSBiYWNrd2FyZHNJdGVyYXRvci5yYW5nZSgpOwotICAgIGlm ICghYmFja3dhcmRzUmFuZ2UpIHsKLSAgICAgICAgQVNTRVJUKGJhY2t3YXJkc1JhbmdlKTsKLSAg ICAgICAgcmV0dXJuOwotICAgIH0KLQotICAgIG1fcG9zaXRpb25PZmZzZXRJbkNvbnRlbnQgPSBS YW5nZTo6Y3JlYXRlKGRvY3VtZW50LCBiYWNrd2FyZHNSYW5nZS0+ZW5kUG9zaXRpb24oKSwgcG9z aXRpb24pLT50ZXh0KCkubGVuZ3RoKCk7Ci0gICAgbV9jb250ZW50UmFuZ2UgPSBSYW5nZTo6Y3Jl YXRlKGRvY3VtZW50LCBiYWNrd2FyZHNSYW5nZS0+ZW5kUG9zaXRpb24oKSwgZm9yd2FyZFJhbmdl LT5zdGFydFBvc2l0aW9uKCkpOwotICAgIEFTU0VSVChtX2NvbnRlbnRSYW5nZSk7Ci19Ci0KLVBh c3NSZWZQdHI8UmFuZ2U+IFN1cnJvdW5kaW5nVGV4dDo6cmFuZ2VGcm9tQ29udGVudE9mZnNldHMo dW5zaWduZWQgc3RhcnRPZmZzZXRJbkNvbnRlbnQsIHVuc2lnbmVkIGVuZE9mZnNldEluQ29udGVu dCkKLXsKLSAgICBpZiAoc3RhcnRPZmZzZXRJbkNvbnRlbnQgPj0gZW5kT2Zmc2V0SW5Db250ZW50 IHx8IGVuZE9mZnNldEluQ29udGVudCA+IGNvbnRlbnQoKS5sZW5ndGgoKSkKLSAgICAgICAgcmV0 dXJuIDA7Ci0KLSAgICBDaGFyYWN0ZXJJdGVyYXRvciBpdGVyYXRvcihtX2NvbnRlbnRSYW5nZS5n ZXQoKSk7Ci0KLSAgICBBU1NFUlQoIWl0ZXJhdG9yLmF0RW5kKCkpOwotICAgIGl0ZXJhdG9yLmFk dmFuY2Uoc3RhcnRPZmZzZXRJbkNvbnRlbnQpOwotCi0gICAgQVNTRVJUKGl0ZXJhdG9yLnJhbmdl KCkpOwotICAgIFBvc2l0aW9uIHN0YXJ0ID0gaXRlcmF0b3IucmFuZ2UoKS0+c3RhcnRQb3NpdGlv bigpOwotCi0gICAgQVNTRVJUKCFpdGVyYXRvci5hdEVuZCgpKTsKLSAgICBpdGVyYXRvci5hZHZh bmNlKGVuZE9mZnNldEluQ29udGVudCAtIHN0YXJ0T2Zmc2V0SW5Db250ZW50KTsKLQotICAgIEFT U0VSVChpdGVyYXRvci5yYW5nZSgpKTsKLSAgICBQb3NpdGlvbiBlbmQgPSBpdGVyYXRvci5yYW5n ZSgpLT5zdGFydFBvc2l0aW9uKCk7Ci0KLSAgICByZXR1cm4gUmFuZ2U6OmNyZWF0ZShzdGFydC5k b2N1bWVudCgpLCBzdGFydCwgZW5kKTsKLX0KLQotU3RyaW5nIFN1cnJvdW5kaW5nVGV4dDo6Y29u dGVudCgpIGNvbnN0Ci17Ci0gICAgaWYgKG1fY29udGVudFJhbmdlKQotICAgICAgICByZXR1cm4g bV9jb250ZW50UmFuZ2UtPnRleHQoKTsKLSAgICByZXR1cm4gU3RyaW5nKCk7Ci19Ci0KLXVuc2ln bmVkIFN1cnJvdW5kaW5nVGV4dDo6cG9zaXRpb25PZmZzZXRJbkNvbnRlbnQoKSBjb25zdAotewot ICAgIHJldHVybiBtX3Bvc2l0aW9uT2Zmc2V0SW5Db250ZW50OwotfQotCi19IC8vIG5hbWVzcGFj ZSBXZWJDb3JlCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9lZGl0aW5nL1RleHRJdGVyYXRvci5jcHAK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvZWRpdGluZy9UZXh0SXRlcmF0b3IuY3BwCShy ZXZpc2lvbiAyMDA3MDMpCisrKyBTb3VyY2UvV2ViQ29yZS9lZGl0aW5nL1RleHRJdGVyYXRvci5j cHAJKHdvcmtpbmcgY29weSkKQEAgLTQxNCw5ICs0MTQsNiBAQCB2b2lkIFRleHRJdGVyYXRvcjo6 YWR2YW5jZSgpCiAgICAgfQogCiAgICAgd2hpbGUgKG1fbm9kZSAmJiBtX25vZGUgIT0gbV9wYXN0 RW5kTm9kZSkgewotICAgICAgICBpZiAoKG1fYmVoYXZpb3IgJiBUZXh0SXRlcmF0b3JTdG9wc09u Rm9ybUNvbnRyb2xzKSAmJiBIVE1MRm9ybUNvbnRyb2xFbGVtZW50OjplbmNsb3NpbmdGb3JtQ29u dHJvbEVsZW1lbnQobV9ub2RlKSkKLSAgICAgICAgICAgIHJldHVybjsKLQogICAgICAgICAvLyBp ZiB0aGUgcmFuZ2UgZW5kcyBhdCBvZmZzZXQgMCBvZiBhbiBlbGVtZW50LCByZXByZXNlbnQgdGhl CiAgICAgICAgIC8vIHBvc2l0aW9uLCBidXQgbm90IHRoZSBjb250ZW50LCBvZiB0aGF0IGVsZW1l bnQgZS5nLiBpZiB0aGUKICAgICAgICAgLy8gbm9kZSBpcyBhIGJsb2NrZmxvdyBlbGVtZW50LCBl bWl0IGEgbmV3bGluZSB0aGF0CkBAIC0xMTg4LDggKzExODUsOCBAQCBOb2RlKiBUZXh0SXRlcmF0 b3I6Om5vZGUoKSBjb25zdAogCiAvLyAtLS0tLS0tLQogCi1TaW1wbGlmaWVkQmFja3dhcmRzVGV4 dEl0ZXJhdG9yOjpTaW1wbGlmaWVkQmFja3dhcmRzVGV4dEl0ZXJhdG9yKGNvbnN0IFJhbmdlJiBy YW5nZSwgVGV4dEl0ZXJhdG9yQmVoYXZpb3IgYmVoYXZpb3IpCi0gICAgOiBtX2JlaGF2aW9yKGJl aGF2aW9yKQorU2ltcGxpZmllZEJhY2t3YXJkc1RleHRJdGVyYXRvcjo6U2ltcGxpZmllZEJhY2t3 YXJkc1RleHRJdGVyYXRvcihjb25zdCBSYW5nZSYgcmFuZ2UpCisgICAgOiBtX2JlaGF2aW9yKFRl eHRJdGVyYXRvckRlZmF1bHRCZWhhdmlvcikKICAgICAsIG1fbm9kZShudWxscHRyKQogICAgICwg bV9vZmZzZXQoMCkKICAgICAsIG1faGFuZGxlZE5vZGUoZmFsc2UpCkBAIC0xMjA2LDggKzEyMDMs NiBAQCBTaW1wbGlmaWVkQmFja3dhcmRzVGV4dEl0ZXJhdG9yOjpTaW1wbGlmCiAgICAgLCBtX2hh dmVQYXNzZWRTdGFydENvbnRhaW5lcihmYWxzZSkKICAgICAsIG1fc2hvdWxkSGFuZGxlRmlyc3RM ZXR0ZXIoZmFsc2UpCiB7Ci0gICAgQVNTRVJUKGJlaGF2aW9yID09IFRleHRJdGVyYXRvckRlZmF1 bHRCZWhhdmlvciB8fCBiZWhhdmlvciA9PSBUZXh0SXRlcmF0b3JTdG9wc09uRm9ybUNvbnRyb2xz KTsKLQogICAgIHJhbmdlLm93bmVyRG9jdW1lbnQoKS51cGRhdGVMYXlvdXRJZ25vcmVQZW5kaW5n U3R5bGVzaGVldHMoKTsKIAogICAgIE5vZGUqIHN0YXJ0Tm9kZSA9ICZyYW5nZS5zdGFydENvbnRh aW5lcigpOwpAQCAtMTI2MCw5ICsxMjU1LDYgQEAgdm9pZCBTaW1wbGlmaWVkQmFja3dhcmRzVGV4 dEl0ZXJhdG9yOjphZAogICAgIG1fY29weWFibGVUZXh0LnJlc2V0KCk7CiAgICAgbV90ZXh0ID0g U3RyaW5nVmlldygpOwogCi0gICAgaWYgKChtX2JlaGF2aW9yICYgVGV4dEl0ZXJhdG9yU3RvcHNP bkZvcm1Db250cm9scykgJiYgSFRNTEZvcm1Db250cm9sRWxlbWVudDo6ZW5jbG9zaW5nRm9ybUNv bnRyb2xFbGVtZW50KG1fbm9kZSkpCi0gICAgICAgIHJldHVybjsKLQogICAgIHdoaWxlIChtX25v ZGUgJiYgIW1faGF2ZVBhc3NlZFN0YXJ0Q29udGFpbmVyKSB7CiAgICAgICAgIC8vIERvbid0IGhh bmRsZSBub2RlIGlmIHdlIHN0YXJ0IGl0ZXJhdGluZyBhdCBbbm9kZSwgMF0uCiAgICAgICAgIGlm ICghbV9oYW5kbGVkTm9kZSAmJiAhKG1fbm9kZSA9PSBtX2VuZENvbnRhaW5lciAmJiAhbV9lbmRP ZmZzZXQpKSB7CkBAIC0xNTU0LDcgKzE1NDYsNyBAQCBzdGF0aWMgUmVmPFJhbmdlPiBjaGFyYWN0 ZXJTdWJyYW5nZShEb2N1CiB9CiAKIEJhY2t3YXJkc0NoYXJhY3Rlckl0ZXJhdG9yOjpCYWNrd2Fy ZHNDaGFyYWN0ZXJJdGVyYXRvcihjb25zdCBSYW5nZSYgcmFuZ2UpCi0gICAgOiBtX3VuZGVybHlp bmdJdGVyYXRvcihyYW5nZSwgVGV4dEl0ZXJhdG9yRGVmYXVsdEJlaGF2aW9yKQorICAgIDogbV91 bmRlcmx5aW5nSXRlcmF0b3IocmFuZ2UpCiAgICAgLCBtX29mZnNldCgwKQogICAgICwgbV9ydW5P ZmZzZXQoMCkKICAgICAsIG1fYXRCcmVhayh0cnVlKQpJbmRleDogU291cmNlL1dlYkNvcmUvZWRp dGluZy9UZXh0SXRlcmF0b3IuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9lZGl0aW5n L1RleHRJdGVyYXRvci5oCShyZXZpc2lvbiAyMDA3MDMpCisrKyBTb3VyY2UvV2ViQ29yZS9lZGl0 aW5nL1RleHRJdGVyYXRvci5oCSh3b3JraW5nIGNvcHkpCkBAIC0xODgsNyArMTg4LDcgQEAgcHJp dmF0ZToKIC8vIGNodW5rcyBzbyBhcyB0byBvcHRpbWl6ZSBmb3IgcGVyZm9ybWFuY2Ugb2YgdGhl IGl0ZXJhdGlvbi4KIGNsYXNzIFNpbXBsaWZpZWRCYWNrd2FyZHNUZXh0SXRlcmF0b3IgewogcHVi bGljOgotICAgIGV4cGxpY2l0IFNpbXBsaWZpZWRCYWNrd2FyZHNUZXh0SXRlcmF0b3IoY29uc3Qg UmFuZ2UmLCBUZXh0SXRlcmF0b3JCZWhhdmlvciA9IFRleHRJdGVyYXRvckRlZmF1bHRCZWhhdmlv cik7CisgICAgZXhwbGljaXQgU2ltcGxpZmllZEJhY2t3YXJkc1RleHRJdGVyYXRvcihjb25zdCBS YW5nZSYpOwogCiAgICAgYm9vbCBhdEVuZCgpIGNvbnN0IHsgcmV0dXJuICFtX3Bvc2l0aW9uTm9k ZTsgfQogICAgIHZvaWQgYWR2YW5jZSgpOwpJbmRleDogU291cmNlL1dlYkNvcmUvZWRpdGluZy9U ZXh0SXRlcmF0b3JCZWhhdmlvci5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2VkaXRp bmcvVGV4dEl0ZXJhdG9yQmVoYXZpb3IuaAkocmV2aXNpb24gMjAwNzAzKQorKysgU291cmNlL1dl YkNvcmUvZWRpdGluZy9UZXh0SXRlcmF0b3JCZWhhdmlvci5oCSh3b3JraW5nIGNvcHkpCkBAIC01 MSwxMSArNTEsOSBAQCBlbnVtIFRleHRJdGVyYXRvckJlaGF2aW9yRmxhZyB7CiAgICAgLy8gVXNl ZCB3aGVuIHBhc3RpbmcgaW5zaWRlIHBhc3N3b3JkIGZpZWxkLgogICAgIFRleHRJdGVyYXRvckVt aXRzT3JpZ2luYWxUZXh0ID0gMSA8PCA1LAogCi0gICAgVGV4dEl0ZXJhdG9yU3RvcHNPbkZvcm1D b250cm9scyA9IDEgPDwgNiwKKyAgICBUZXh0SXRlcmF0b3JFbWl0c0ltYWdlQWx0VGV4dCA9IDEg PDwgNiwKIAotICAgIFRleHRJdGVyYXRvckVtaXRzSW1hZ2VBbHRUZXh0ID0gMSA8PCA3LAotCi0g ICAgVGV4dEl0ZXJhdG9yQmVoYXZlc0FzSWZOb2Rlc0ZvbGxvd2luZyA9IDEgPDwgOCwKKyAgICBU ZXh0SXRlcmF0b3JCZWhhdmVzQXNJZk5vZGVzRm9sbG93aW5nID0gMSA8PCA3LAogfTsKIAogdHlw ZWRlZiB1bnNpZ25lZCBzaG9ydCBUZXh0SXRlcmF0b3JCZWhhdmlvcjsK