30092 2009-10-05 13:18:47 -0700 Web Inspector: Get rid of Preferences.ignoreWhitespace. 2009-10-06 05:30:16 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 pfeldman pfeldman timothy oldest_to_newest 152426 0 pfeldman 2009-10-05 13:18:47 -0700 There is a number of utility methods that can be removed together with this option. 152427 1 40656 pfeldman 2009-10-05 13:19:47 -0700 Created attachment 40656 patch 152679 2 pfeldman 2009-10-06 05:30:16 -0700 Committing to http://svn.webkit.org/repository/webkit/trunk ... M WebCore/ChangeLog M WebCore/inspector/front-end/DOMAgent.js M WebCore/inspector/front-end/ElementsTreeOutline.js M WebCore/inspector/front-end/TextPrompt.js M WebCore/inspector/front-end/inspector.js M WebCore/inspector/front-end/utilities.js Committed r49174 40656 2009-10-05 13:19:47 -0700 2009-10-05 14:46:56 -0700 patch ignore_whitespace text/plain 12656 pfeldman ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg MTI4MTJmYS4uN2Q3NzM0MCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTIsNiArMiwzMiBAQAogCiAgICAgICAgIFJldmlld2VkIGJ5IFRp bW90aHkgSGF0Y2hlci4KIAorICAgICAgICBXZWIgSW5zcGVjdG9yOiBHZXQgcmlkIG9mIFByZWZl cmVuY2VzLmlnbm9yZVdoaXRlc3BhY2UuCisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTMwMDkyCisKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5k L0RPTUFnZW50LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRPTUFnZW50KToKKyAgICAgICAg KFdlYkluc3BlY3Rvci5ET01BZ2VudC5wcm90b3R5cGUuX2NoaWxkTm9kZUNvdW50VXBkYXRlZCk6 CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9FbGVtZW50c1RyZWVPdXRsaW5lLmpzOgor ICAgICAgICAoV2ViSW5zcGVjdG9yLkVsZW1lbnRzVHJlZU91dGxpbmUucHJvdG90eXBlLnVwZGF0 ZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRWxlbWVudHNUcmVlRWxlbWVudCk6CisgICAgICAg IChXZWJJbnNwZWN0b3IuRWxlbWVudHNUcmVlRWxlbWVudC5wcm90b3R5cGUub25wb3B1bGF0ZSk6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuRWxlbWVudHNUcmVlRWxlbWVudC5wcm90b3R5cGUuX3Vw ZGF0ZUNoaWxkcmVuLnVwZGF0ZUNoaWxkcmVuT2ZOb2RlKToKKyAgICAgICAgKFdlYkluc3BlY3Rv ci5FbGVtZW50c1RyZWVFbGVtZW50LnByb3RvdHlwZS5fdXBkYXRlQ2hpbGRyZW4pOgorICAgICAg ICAqIGluc3BlY3Rvci9mcm9udC1lbmQvVGV4dFByb21wdC5qczoKKyAgICAgICAgKFdlYkluc3Bl Y3Rvci5UZXh0UHJvbXB0LnByb3RvdHlwZS5pc0NhcmV0QXRFbmRPZlByb21wdCk6CisgICAgICAg ICogaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuanM6CisgICAgICAgICogaW5zcGVjdG9y L2Zyb250LWVuZC91dGlsaXRpZXMuanM6CisgICAgICAgIChOb2RlLnByb3RvdHlwZS5yYW5nZU9m V29yZCk6CisgICAgICAgICh0cmF2ZXJzZU5leHROb2RlKToKKyAgICAgICAgKHRyYXZlcnNlUHJl dmlvdXNOb2RlKToKKyAgICAgICAgKG9ubHlUZXh0Q2hpbGQpOgorCisyMDA5LTEwLTA1ICBQYXZl bCBGZWxkbWFuICA8cGZlbGRtYW5AY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5 IFRpbW90aHkgSGF0Y2hlci4KKwogICAgICAgICBXZWIgSW5zcGVjdG9yOiBEbyBub3QgY2FsbCBu b2RlVGl0bGVJbmZvIHR3aWNlICsKICAgICAgICAgZm9sbG93dXAgZml4ZXMgZm9yIHI0OTEwMS4K IApkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RPTUFnZW50LmpzIGIv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RPTUFnZW50LmpzCmluZGV4IGExNTFjMDUuLjM5 NWM4OGYgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9ET01BZ2VudC5q cworKysgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRE9NQWdlbnQuanMKQEAgLTMwNywx MyArMzA3LDYgQEAgV2ViSW5zcGVjdG9yLkRPTUFnZW50ID0gZnVuY3Rpb24oKSB7CiAgICAgdGhp cy5fd2luZG93ID0gbmV3IFdlYkluc3BlY3Rvci5ET01XaW5kb3codGhpcyk7CiAgICAgdGhpcy5f aWRUb0RPTU5vZGUgPSBudWxsOwogICAgIHRoaXMuZG9jdW1lbnQgPSBudWxsOwotCi0gICAgLy8g VE9ETzogdXBkYXRlIEVsZW1lbnRzUGFuZWwgdG8gbm90IHRyYWNrIGVtYmVkZGVkIGlmcmFtZXMg LSBpdCBpcyBhbHJlYWR5IGJlaW5nIGhhbmRsZWQKLSAgICAvLyBpbiB0aGUgYWdlbnQgYmFja2Vu ZC4KLQotICAgIC8vIFdoaXRlc3BhY2UgaXMgaWdub3JlZCBpbiBJbnNwZWN0b3JET01BZ2VudCBh bHJlYWR5IC0+IG5vIG5lZWQgdG8gZmlsdGVyLgotICAgIC8vIFRPRE86IEVpdGhlciByZW1vdmUg YWxsIG9mIGl0cyB1c2FnZXMgb3IgcHVzaCB2YWx1ZSBpbnRvIHRoZSBhZ2VudCBiYWNrZW5kLgot ICAgIFByZWZlcmVuY2VzLmlnbm9yZVdoaXRlc3BhY2UgPSBmYWxzZTsKIH0KIAogV2ViSW5zcGVj dG9yLkRPTUFnZW50LnByb3RvdHlwZSA9IHsKQEAgLTQxNywxMCArNDEwLDggQEAgV2ViSW5zcGVj dG9yLkRPTUFnZW50LnByb3RvdHlwZSA9IHsKICAgICAgICAgbm9kZS5fY2hpbGROb2RlQ291bnQg PSBuZXdWYWx1ZTsKICAgICAgICAgdmFyIG91dGxpbmUgPSBXZWJJbnNwZWN0b3IucGFuZWxzLmVs ZW1lbnRzLnRyZWVPdXRsaW5lOwogICAgICAgICB2YXIgdHJlZUVsZW1lbnQgPSBvdXRsaW5lLmZp bmRUcmVlRWxlbWVudChub2RlKTsKLSAgICAgICAgaWYgKHRyZWVFbGVtZW50KSB7CisgICAgICAg IGlmICh0cmVlRWxlbWVudCkKICAgICAgICAgICAgIHRyZWVFbGVtZW50Lmhhc0NoaWxkcmVuID0g bmV3VmFsdWU7Ci0gICAgICAgICAgICB0cmVlRWxlbWVudC53aGl0ZXNwYWNlSWdub3JlZCA9IFBy ZWZlcmVuY2VzLmlnbm9yZVdoaXRlc3BhY2U7Ci0gICAgICAgIH0KICAgICB9LAogCiAgICAgX2No aWxkTm9kZUluc2VydGVkOiBmdW5jdGlvbihwYXJlbnRJZCwgcHJldklkLCBwYXlsb2FkKQpkaWZm IC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0VsZW1lbnRzVHJlZU91dGxpbmUu anMgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRWxlbWVudHNUcmVlT3V0bGluZS5qcwpp bmRleCA3Y2VlZTY2Li45ZTEzNzczIDEwMDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvRWxlbWVudHNUcmVlT3V0bGluZS5qcworKysgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvRWxlbWVudHNUcmVlT3V0bGluZS5qcwpAQCAtMTE1LDEyICsxMTUsMTIgQEAgV2ViSW5z cGVjdG9yLkVsZW1lbnRzVHJlZU91dGxpbmUucHJvdG90eXBlID0gewogICAgICAgICAgICAgdGhp cy5hcHBlbmRDaGlsZCh0cmVlRWxlbWVudCk7CiAgICAgICAgIH0gZWxzZSB7CiAgICAgICAgICAg ICAvLyBGSVhNRTogdGhpcyBjb3VsZCB1c2UgZmluZFRyZWVFbGVtZW50IHRvIHJldXNlIGEgdHJl ZSBlbGVtZW50IGlmIGl0IGFscmVhZHkgZXhpc3RzCi0gICAgICAgICAgICB2YXIgbm9kZSA9IChQ cmVmZXJlbmNlcy5pZ25vcmVXaGl0ZXNwYWNlID8gZmlyc3RDaGlsZFNraXBwaW5nV2hpdGVzcGFj ZS5jYWxsKHRoaXMucm9vdERPTU5vZGUpIDogdGhpcy5yb290RE9NTm9kZS5maXJzdENoaWxkKTsK KyAgICAgICAgICAgIHZhciBub2RlID0gdGhpcy5yb290RE9NTm9kZS5maXJzdENoaWxkOwogICAg ICAgICAgICAgd2hpbGUgKG5vZGUpIHsKICAgICAgICAgICAgICAgICB0cmVlRWxlbWVudCA9IG5l dyBXZWJJbnNwZWN0b3IuRWxlbWVudHNUcmVlRWxlbWVudChub2RlKTsKICAgICAgICAgICAgICAg ICB0cmVlRWxlbWVudC5zZWxlY3RhYmxlID0gdGhpcy5zZWxlY3RFbmFibGVkOwogICAgICAgICAg ICAgICAgIHRoaXMuYXBwZW5kQ2hpbGQodHJlZUVsZW1lbnQpOwotICAgICAgICAgICAgICAgIG5v ZGUgPSBQcmVmZXJlbmNlcy5pZ25vcmVXaGl0ZXNwYWNlID8gbmV4dFNpYmxpbmdTa2lwcGluZ1do aXRlc3BhY2UuY2FsbChub2RlKSA6IG5vZGUubmV4dFNpYmxpbmc7CisgICAgICAgICAgICAgICAg bm9kZSA9IG5vZGUubmV4dFNpYmxpbmc7CiAgICAgICAgICAgICB9CiAgICAgICAgIH0KIApAQCAt MjMwLDExICsyMzAsNyBAQCBXZWJJbnNwZWN0b3IuRWxlbWVudHNUcmVlT3V0bGluZS5wcm90b3R5 cGUuX19wcm90b19fID0gVHJlZU91dGxpbmUucHJvdG90eXBlOwogCiBXZWJJbnNwZWN0b3IuRWxl bWVudHNUcmVlRWxlbWVudCA9IGZ1bmN0aW9uKG5vZGUpCiB7Ci0gICAgdmFyIGhhc0NoaWxkcmVu ID0gUHJlZmVyZW5jZXMuaWdub3JlV2hpdGVzcGFjZSA/IChmaXJzdENoaWxkU2tpcHBpbmdXaGl0 ZXNwYWNlLmNhbGwobm9kZSkgPyB0cnVlIDogZmFsc2UpIDogbm9kZS5oYXNDaGlsZE5vZGVzKCk7 Ci0gICAgdmFyIGhhc0NoaWxkcmVuT3ZlcnJpZGUgPSBoYXNDaGlsZHJlbiAmJiAhdGhpcy5fc2hv d0lubGluZVRleHQobm9kZSk7Ci0KLSAgICBpZiAoaGFzQ2hpbGRyZW5PdmVycmlkZSkKLSAgICAg ICAgdGhpcy53aGl0ZXNwYWNlSWdub3JlZCA9IFByZWZlcmVuY2VzLmlnbm9yZVdoaXRlc3BhY2U7 CisgICAgdmFyIGhhc0NoaWxkcmVuT3ZlcnJpZGUgPSBub2RlLmhhc0NoaWxkTm9kZXMoKSAmJiAh dGhpcy5fc2hvd0lubGluZVRleHQobm9kZSk7CiAKICAgICAvLyBUaGUgdGl0bGUgd2lsbCBiZSB1 cGRhdGVkIGluIG9uYXR0YWNoLgogICAgIFRyZWVFbGVtZW50LmNhbGwodGhpcywgIiIsIG5vZGUs IGhhc0NoaWxkcmVuT3ZlcnJpZGUpOwpAQCAtMzYyLDExICszNTgsOSBAQCBXZWJJbnNwZWN0b3Iu RWxlbWVudHNUcmVlRWxlbWVudC5wcm90b3R5cGUgPSB7CiAKICAgICBvbnBvcHVsYXRlOiBmdW5j dGlvbigpCiAgICAgewotICAgICAgICBpZiAodGhpcy5jaGlsZHJlbi5sZW5ndGggfHwgdGhpcy53 aGl0ZXNwYWNlSWdub3JlZCAhPT0gUHJlZmVyZW5jZXMuaWdub3JlV2hpdGVzcGFjZSkKKyAgICAg ICAgaWYgKHRoaXMuY2hpbGRyZW4ubGVuZ3RoIHx8IHRoaXMuX3Nob3dJbmxpbmVUZXh0KHRoaXMu cmVwcmVzZW50ZWRPYmplY3QpKQogICAgICAgICAgICAgcmV0dXJuOwogCi0gICAgICAgIHRoaXMu d2hpdGVzcGFjZUlnbm9yZWQgPSBQcmVmZXJlbmNlcy5pZ25vcmVXaGl0ZXNwYWNlOwotCiAgICAg ICAgIHRoaXMudXBkYXRlQ2hpbGRyZW4oKTsKICAgICB9LAogICAgIApAQCAtMzkwLDcgKzM4NCw3 IEBAIFdlYkluc3BlY3Rvci5FbGVtZW50c1RyZWVFbGVtZW50LnByb3RvdHlwZSA9IHsKICAgICAg ICAgZnVuY3Rpb24gdXBkYXRlQ2hpbGRyZW5PZk5vZGUobm9kZSkKICAgICAgICAgewogICAgICAg ICAgICAgdmFyIHRyZWVPdXRsaW5lID0gdHJlZUVsZW1lbnQudHJlZU91dGxpbmU7Ci0gICAgICAg ICAgICB2YXIgY2hpbGQgPSAoUHJlZmVyZW5jZXMuaWdub3JlV2hpdGVzcGFjZSA/IGZpcnN0Q2hp bGRTa2lwcGluZ1doaXRlc3BhY2UuY2FsbChub2RlKSA6IG5vZGUuZmlyc3RDaGlsZCk7CisgICAg ICAgICAgICB2YXIgY2hpbGQgPSBub2RlLmZpcnN0Q2hpbGQ7CiAgICAgICAgICAgICB3aGlsZSAo Y2hpbGQpIHsKICAgICAgICAgICAgICAgICB2YXIgY3VycmVudFRyZWVFbGVtZW50ID0gdHJlZUVs ZW1lbnQuY2hpbGRyZW5bdHJlZUNoaWxkSW5kZXhdOwogICAgICAgICAgICAgICAgIGlmICghY3Vy cmVudFRyZWVFbGVtZW50IHx8IGN1cnJlbnRUcmVlRWxlbWVudC5yZXByZXNlbnRlZE9iamVjdCAh PT0gY2hpbGQpIHsKQEAgLTQxOCw3ICs0MTIsNyBAQCBXZWJJbnNwZWN0b3IuRWxlbWVudHNUcmVl RWxlbWVudC5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAg ICAgICB9CiAKLSAgICAgICAgICAgICAgICBjaGlsZCA9IFByZWZlcmVuY2VzLmlnbm9yZVdoaXRl c3BhY2UgPyBuZXh0U2libGluZ1NraXBwaW5nV2hpdGVzcGFjZS5jYWxsKGNoaWxkKSA6IGNoaWxk Lm5leHRTaWJsaW5nOworICAgICAgICAgICAgICAgIGNoaWxkID0gY2hpbGQubmV4dFNpYmxpbmc7 CiAgICAgICAgICAgICAgICAgKyt0cmVlQ2hpbGRJbmRleDsKICAgICAgICAgICAgIH0KICAgICAg ICAgfQpAQCAtNzYyLDcgKzc1Niw3IEBAIFdlYkluc3BlY3Rvci5FbGVtZW50c1RyZWVFbGVtZW50 LnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgICAgICAvLyBqdXN0IHNob3cgdGhhdCB0ZXh0IGFu ZCB0aGUgY2xvc2luZyB0YWcgaW5saW5lIHJhdGhlciB0aGFuCiAgICAgICAgICAgICAgICAgLy8g Y3JlYXRlIGEgc3VidHJlZSBmb3IgdGhlbQogICAgICAgICAgICAgICAgIAotICAgICAgICAgICAg ICAgIHZhciB0ZXh0Q2hpbGQgPSBvbmx5VGV4dENoaWxkLmNhbGwobm9kZSwgUHJlZmVyZW5jZXMu aWdub3JlV2hpdGVzcGFjZSk7CisgICAgICAgICAgICAgICAgdmFyIHRleHRDaGlsZCA9IG9ubHlU ZXh0Q2hpbGQuY2FsbChub2RlKTsKICAgICAgICAgICAgICAgICB2YXIgc2hvd0lubGluZVRleHQg PSB0ZXh0Q2hpbGQgJiYgdGV4dENoaWxkLnRleHRDb250ZW50Lmxlbmd0aCA8IFByZWZlcmVuY2Vz Lm1heElubGluZVRleHRDaGlsZExlbmd0aDsKICAgICAgICAgICAgICAgICAKICAgICAgICAgICAg ICAgICBpZiAoc2hvd0lubGluZVRleHQpIHsKQEAgLTgyMyw3ICs4MTcsNyBAQCBXZWJJbnNwZWN0 b3IuRWxlbWVudHNUcmVlRWxlbWVudC5wcm90b3R5cGUgPSB7CiAgICAgX3Nob3dJbmxpbmVUZXh0 OiBmdW5jdGlvbihub2RlKQogICAgIHsKICAgICAgICAgaWYgKG5vZGUubm9kZVR5cGUgPT09IE5v ZGUuRUxFTUVOVF9OT0RFKSB7Ci0gICAgICAgICAgICB2YXIgdGV4dENoaWxkID0gb25seVRleHRD aGlsZC5jYWxsKG5vZGUsIFByZWZlcmVuY2VzLmlnbm9yZVdoaXRlc3BhY2UpOworICAgICAgICAg ICAgdmFyIHRleHRDaGlsZCA9IG9ubHlUZXh0Q2hpbGQuY2FsbChub2RlKTsKICAgICAgICAgICAg IGlmICh0ZXh0Q2hpbGQgJiYgdGV4dENoaWxkLnRleHRDb250ZW50Lmxlbmd0aCA8IFByZWZlcmVu Y2VzLm1heElubGluZVRleHRDaGlsZExlbmd0aCkKICAgICAgICAgICAgICAgICByZXR1cm4gdHJ1 ZTsKICAgICAgICAgfQpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Rl eHRQcm9tcHQuanMgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVGV4dFByb21wdC5qcwpp bmRleCA1ZmY3NzRmLi5mNzNhYjBkIDEwMDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvVGV4dFByb21wdC5qcworKysgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVGV4 dFByb21wdC5qcwpAQCAtMjUyLDcgKzI1Miw3IEBAIFdlYkluc3BlY3Rvci5UZXh0UHJvbXB0LnBy b3RvdHlwZSA9IHsKICAgICAgICAgICAgICAgICBmb3VuZE5leHRUZXh0ID0gdHJ1ZTsKICAgICAg ICAgICAgIH0KIAotICAgICAgICAgICAgbm9kZSA9IG5vZGUudHJhdmVyc2VOZXh0Tm9kZShmYWxz ZSwgdGhpcy5lbGVtZW50KTsKKyAgICAgICAgICAgIG5vZGUgPSBub2RlLnRyYXZlcnNlTmV4dE5v ZGUodGhpcy5lbGVtZW50KTsKICAgICAgICAgfQogCiAgICAgICAgIHJldHVybiB0cnVlOwpkaWZm IC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5qcyBiL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuanMKaW5kZXggNzc1MWM0Mi4uNDlmNjM5 OCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5qcwor KysgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmpzCkBAIC0yOSw3ICsy OSw2IEBACiAgKi8KIAogdmFyIFByZWZlcmVuY2VzID0gewotICAgIGlnbm9yZVdoaXRlc3BhY2U6 IHRydWUsCiAgICAgc2hvd1VzZXJBZ2VudFN0eWxlczogdHJ1ZSwKICAgICBtYXhJbmxpbmVUZXh0 Q2hpbGRMZW5ndGg6IDgwLAogICAgIG1pbkNvbnNvbGVIZWlnaHQ6IDc1LApkaWZmIC0tZ2l0IGEv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL3V0aWxpdGllcy5qcyBiL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC91dGlsaXRpZXMuanMKaW5kZXggOTdmOTM5YS4uNmRmMjNkZSAxMDA2NDQK LS0tIGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL3V0aWxpdGllcy5qcworKysgYi9XZWJD b3JlL2luc3BlY3Rvci9mcm9udC1lbmQvdXRpbGl0aWVzLmpzCkBAIC05MSw3ICs5MSw3IEBAIE5v ZGUucHJvdG90eXBlLnJhbmdlT2ZXb3JkID0gZnVuY3Rpb24ob2Zmc2V0LCBzdG9wQ2hhcmFjdGVy cywgc3RheVdpdGhpbk5vZGUsIGRpCiAgICAgICAgICAgICBpZiAoc3RhcnROb2RlKQogICAgICAg ICAgICAgICAgIGJyZWFrOwogCi0gICAgICAgICAgICBub2RlID0gbm9kZS50cmF2ZXJzZVByZXZp b3VzTm9kZShmYWxzZSwgc3RheVdpdGhpbk5vZGUpOworICAgICAgICAgICAgbm9kZSA9IG5vZGUu dHJhdmVyc2VQcmV2aW91c05vZGUoc3RheVdpdGhpbk5vZGUpOwogICAgICAgICB9CiAKICAgICAg ICAgaWYgKCFzdGFydE5vZGUpIHsKQEAgLTEyNiw3ICsxMjYsNyBAQCBOb2RlLnByb3RvdHlwZS5y YW5nZU9mV29yZCA9IGZ1bmN0aW9uKG9mZnNldCwgc3RvcENoYXJhY3RlcnMsIHN0YXlXaXRoaW5O b2RlLCBkaQogICAgICAgICAgICAgaWYgKGVuZE5vZGUpCiAgICAgICAgICAgICAgICAgYnJlYWs7 CiAKLSAgICAgICAgICAgIG5vZGUgPSBub2RlLnRyYXZlcnNlTmV4dE5vZGUoZmFsc2UsIHN0YXlX aXRoaW5Ob2RlKTsKKyAgICAgICAgICAgIG5vZGUgPSBub2RlLnRyYXZlcnNlTmV4dE5vZGUoc3Rh eVdpdGhpbk5vZGUpOwogICAgICAgICB9CiAKICAgICAgICAgaWYgKCFlbmROb2RlKSB7CkBAIC0y NjksOSArMjY5LDYgQEAgRWxlbWVudC5wcm90b3R5cGUub2Zmc2V0UmVsYXRpdmVUb1dpbmRvdyA9 IGZ1bmN0aW9uKHRhcmdldFdpbmRvdykKICAgICByZXR1cm4gZWxlbWVudE9mZnNldDsKIH0KIAot RWxlbWVudC5wcm90b3R5cGUuZmlyc3RDaGlsZFNraXBwaW5nV2hpdGVzcGFjZSA9IGZpcnN0Q2hp bGRTa2lwcGluZ1doaXRlc3BhY2U7Ci1FbGVtZW50LnByb3RvdHlwZS5sYXN0Q2hpbGRTa2lwcGlu Z1doaXRlc3BhY2UgPSBsYXN0Q2hpbGRTa2lwcGluZ1doaXRlc3BhY2U7Ci0KIE5vZGUucHJvdG90 eXBlLmlzV2hpdGVzcGFjZSA9IGlzTm9kZVdoaXRlc3BhY2U7CiBOb2RlLnByb3RvdHlwZS5kaXNw bGF5TmFtZSA9IG5vZGVEaXNwbGF5TmFtZTsKIE5vZGUucHJvdG90eXBlLmlzQW5jZXN0b3IgPSBm dW5jdGlvbihub2RlKQpAQCAtMjc5LDggKzI3Niw2IEBAIE5vZGUucHJvdG90eXBlLmlzQW5jZXN0 b3IgPSBmdW5jdGlvbihub2RlKQogICAgIHJldHVybiBpc0FuY2VzdG9yTm9kZSh0aGlzLCBub2Rl KTsKIH07CiBOb2RlLnByb3RvdHlwZS5pc0Rlc2NlbmRhbnQgPSBpc0Rlc2NlbmRhbnROb2RlOwot Tm9kZS5wcm90b3R5cGUubmV4dFNpYmxpbmdTa2lwcGluZ1doaXRlc3BhY2UgPSBuZXh0U2libGlu Z1NraXBwaW5nV2hpdGVzcGFjZTsKLU5vZGUucHJvdG90eXBlLnByZXZpb3VzU2libGluZ1NraXBw aW5nV2hpdGVzcGFjZSA9IHByZXZpb3VzU2libGluZ1NraXBwaW5nV2hpdGVzcGFjZTsKIE5vZGUu cHJvdG90eXBlLnRyYXZlcnNlTmV4dE5vZGUgPSB0cmF2ZXJzZU5leHROb2RlOwogTm9kZS5wcm90 b3R5cGUudHJhdmVyc2VQcmV2aW91c05vZGUgPSB0cmF2ZXJzZVByZXZpb3VzTm9kZTsKIE5vZGUu cHJvdG90eXBlLm9ubHlUZXh0Q2hpbGQgPSBvbmx5VGV4dENoaWxkOwpAQCAtNDU1LDk1ICs0NTAs NTUgQEAgZnVuY3Rpb24gaXNEZXNjZW5kYW50Tm9kZShkZXNjZW5kYW50KQogICAgIHJldHVybiBp c0FuY2VzdG9yTm9kZShkZXNjZW5kYW50LCB0aGlzKTsKIH0KIAotZnVuY3Rpb24gbmV4dFNpYmxp bmdTa2lwcGluZ1doaXRlc3BhY2UoKQotewotICAgIGlmICghdGhpcykKLSAgICAgICAgcmV0dXJu OwotICAgIHZhciBub2RlID0gdGhpcy5uZXh0U2libGluZzsKLSAgICB3aGlsZSAobm9kZSAmJiBu b2RlLm5vZGVUeXBlID09PSBOb2RlLlRFWFRfTk9ERSAmJiBpc05vZGVXaGl0ZXNwYWNlLmNhbGwo bm9kZSkpCi0gICAgICAgIG5vZGUgPSBub2RlLm5leHRTaWJsaW5nOwotICAgIHJldHVybiBub2Rl OwotfQotCi1mdW5jdGlvbiBwcmV2aW91c1NpYmxpbmdTa2lwcGluZ1doaXRlc3BhY2UoKQorZnVu Y3Rpb24gdHJhdmVyc2VOZXh0Tm9kZShzdGF5V2l0aGluKQogewogICAgIGlmICghdGhpcykKICAg ICAgICAgcmV0dXJuOwotICAgIHZhciBub2RlID0gdGhpcy5wcmV2aW91c1NpYmxpbmc7Ci0gICAg d2hpbGUgKG5vZGUgJiYgbm9kZS5ub2RlVHlwZSA9PT0gTm9kZS5URVhUX05PREUgJiYgaXNOb2Rl V2hpdGVzcGFjZS5jYWxsKG5vZGUpKQotICAgICAgICBub2RlID0gbm9kZS5wcmV2aW91c1NpYmxp bmc7Ci0gICAgcmV0dXJuIG5vZGU7Ci19CiAKLWZ1bmN0aW9uIGZpcnN0Q2hpbGRTa2lwcGluZ1do aXRlc3BhY2UoKQotewotICAgIGlmICghdGhpcykKLSAgICAgICAgcmV0dXJuOwogICAgIHZhciBu b2RlID0gdGhpcy5maXJzdENoaWxkOwotICAgIHdoaWxlIChub2RlICYmIG5vZGUubm9kZVR5cGUg PT09IE5vZGUuVEVYVF9OT0RFICYmIGlzTm9kZVdoaXRlc3BhY2UuY2FsbChub2RlKSkKLSAgICAg ICAgbm9kZSA9IG5leHRTaWJsaW5nU2tpcHBpbmdXaGl0ZXNwYWNlLmNhbGwobm9kZSk7Ci0gICAg cmV0dXJuIG5vZGU7Ci19Ci0KLWZ1bmN0aW9uIGxhc3RDaGlsZFNraXBwaW5nV2hpdGVzcGFjZSgp Ci17Ci0gICAgaWYgKCF0aGlzKQotICAgICAgICByZXR1cm47Ci0gICAgdmFyIG5vZGUgPSB0aGlz Lmxhc3RDaGlsZDsKLSAgICB3aGlsZSAobm9kZSAmJiBub2RlLm5vZGVUeXBlID09PSBOb2RlLlRF WFRfTk9ERSAmJiBpc05vZGVXaGl0ZXNwYWNlLmNhbGwobm9kZSkpCi0gICAgICAgIG5vZGUgPSBw cmV2aW91c1NpYmxpbmdTa2lwcGluZ1doaXRlc3BhY2UuY2FsbChub2RlKTsKLSAgICByZXR1cm4g bm9kZTsKLX0KLQotZnVuY3Rpb24gdHJhdmVyc2VOZXh0Tm9kZShza2lwV2hpdGVzcGFjZSwgc3Rh eVdpdGhpbikKLXsKLSAgICBpZiAoIXRoaXMpCi0gICAgICAgIHJldHVybjsKLQotICAgIHZhciBu b2RlID0gc2tpcFdoaXRlc3BhY2UgPyBmaXJzdENoaWxkU2tpcHBpbmdXaGl0ZXNwYWNlLmNhbGwo dGhpcykgOiB0aGlzLmZpcnN0Q2hpbGQ7CiAgICAgaWYgKG5vZGUpCiAgICAgICAgIHJldHVybiBu b2RlOwogCiAgICAgaWYgKHN0YXlXaXRoaW4gJiYgdGhpcyA9PT0gc3RheVdpdGhpbikKICAgICAg ICAgcmV0dXJuIG51bGw7CiAKLSAgICBub2RlID0gc2tpcFdoaXRlc3BhY2UgPyBuZXh0U2libGlu Z1NraXBwaW5nV2hpdGVzcGFjZS5jYWxsKHRoaXMpIDogdGhpcy5uZXh0U2libGluZzsKKyAgICBu b2RlID0gdGhpcy5uZXh0U2libGluZzsKICAgICBpZiAobm9kZSkKICAgICAgICAgcmV0dXJuIG5v ZGU7CiAKICAgICBub2RlID0gdGhpczsKLSAgICB3aGlsZSAobm9kZSAmJiAhKHNraXBXaGl0ZXNw YWNlID8gbmV4dFNpYmxpbmdTa2lwcGluZ1doaXRlc3BhY2UuY2FsbChub2RlKSA6IG5vZGUubmV4 dFNpYmxpbmcpICYmICghc3RheVdpdGhpbiB8fCAhbm9kZS5wYXJlbnROb2RlIHx8IG5vZGUucGFy ZW50Tm9kZSAhPT0gc3RheVdpdGhpbikpCisgICAgd2hpbGUgKG5vZGUgJiYgIW5vZGUubmV4dFNp YmxpbmcgJiYgKCFzdGF5V2l0aGluIHx8ICFub2RlLnBhcmVudE5vZGUgfHwgbm9kZS5wYXJlbnRO b2RlICE9PSBzdGF5V2l0aGluKSkKICAgICAgICAgbm9kZSA9IG5vZGUucGFyZW50Tm9kZTsKICAg ICBpZiAoIW5vZGUpCiAgICAgICAgIHJldHVybiBudWxsOwogCi0gICAgcmV0dXJuIHNraXBXaGl0 ZXNwYWNlID8gbmV4dFNpYmxpbmdTa2lwcGluZ1doaXRlc3BhY2UuY2FsbChub2RlKSA6IG5vZGUu bmV4dFNpYmxpbmc7CisgICAgcmV0dXJuIG5vZGUubmV4dFNpYmxpbmc7CiB9CiAKLWZ1bmN0aW9u IHRyYXZlcnNlUHJldmlvdXNOb2RlKHNraXBXaGl0ZXNwYWNlLCBzdGF5V2l0aGluKQorZnVuY3Rp b24gdHJhdmVyc2VQcmV2aW91c05vZGUoc3RheVdpdGhpbikKIHsKICAgICBpZiAoIXRoaXMpCiAg ICAgICAgIHJldHVybjsKICAgICBpZiAoc3RheVdpdGhpbiAmJiB0aGlzID09PSBzdGF5V2l0aGlu KQogICAgICAgICByZXR1cm4gbnVsbDsKLSAgICB2YXIgbm9kZSA9IHNraXBXaGl0ZXNwYWNlID8g cHJldmlvdXNTaWJsaW5nU2tpcHBpbmdXaGl0ZXNwYWNlLmNhbGwodGhpcykgOiB0aGlzLnByZXZp b3VzU2libGluZzsKLSAgICB3aGlsZSAobm9kZSAmJiAoc2tpcFdoaXRlc3BhY2UgPyBsYXN0Q2hp bGRTa2lwcGluZ1doaXRlc3BhY2UuY2FsbChub2RlKSA6IG5vZGUubGFzdENoaWxkKSApCi0gICAg ICAgIG5vZGUgPSBza2lwV2hpdGVzcGFjZSA/IGxhc3RDaGlsZFNraXBwaW5nV2hpdGVzcGFjZS5j YWxsKG5vZGUpIDogbm9kZS5sYXN0Q2hpbGQ7CisgICAgdmFyIG5vZGUgPSB0aGlzLnByZXZpb3Vz U2libGluZzsKKyAgICB3aGlsZSAobm9kZSAmJiBub2RlLmxhc3RDaGlsZCkKKyAgICAgICAgbm9k ZSA9IG5vZGUubGFzdENoaWxkOwogICAgIGlmIChub2RlKQogICAgICAgICByZXR1cm4gbm9kZTsK ICAgICByZXR1cm4gdGhpcy5wYXJlbnROb2RlOwogfQogCi1mdW5jdGlvbiBvbmx5VGV4dENoaWxk KGlnbm9yZVdoaXRlc3BhY2UpCitmdW5jdGlvbiBvbmx5VGV4dENoaWxkKCkKIHsKICAgICBpZiAo IXRoaXMpCiAgICAgICAgIHJldHVybiBudWxsOwogCi0gICAgdmFyIGZpcnN0Q2hpbGQgPSBpZ25v cmVXaGl0ZXNwYWNlID8gZmlyc3RDaGlsZFNraXBwaW5nV2hpdGVzcGFjZS5jYWxsKHRoaXMpIDog dGhpcy5maXJzdENoaWxkOworICAgIHZhciBmaXJzdENoaWxkID0gdGhpcy5maXJzdENoaWxkOwog ICAgIGlmICghZmlyc3RDaGlsZCB8fCBmaXJzdENoaWxkLm5vZGVUeXBlICE9PSBOb2RlLlRFWFRf Tk9ERSkKICAgICAgICAgcmV0dXJuIG51bGw7CiAKLSAgICB2YXIgc2libGluZyA9IGlnbm9yZVdo aXRlc3BhY2UgPyBuZXh0U2libGluZ1NraXBwaW5nV2hpdGVzcGFjZS5jYWxsKGZpcnN0Q2hpbGQp IDogZmlyc3RDaGlsZC5uZXh0U2libGluZzsKKyAgICB2YXIgc2libGluZyA9IGZpcnN0Q2hpbGQu bmV4dFNpYmxpbmc7CiAgICAgcmV0dXJuIHNpYmxpbmcgPyBudWxsIDogZmlyc3RDaGlsZDsKIH0K IAo=