52895 2011-01-21 07:39:28 -0800 Web Inspector: move search functions from SourceView to SourceFrame 2011-01-24 00:44:49 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 podivilov podivilov apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 338050 0 podivilov 2011-01-21 07:39:28 -0800 Web Inspector: move search functions from SourceView to SourceFrame. This is the last step before eliminating SourceView and ScriptView. 338052 1 79737 podivilov 2011-01-21 07:41:56 -0800 Created attachment 79737 Patch. 338060 2 79737 pfeldman 2011-01-21 08:00:11 -0800 Comment on attachment 79737 Patch. View in context: https://bugs.webkit.org/attachment.cgi?id=79737&action=review > Source/WebCore/inspector/front-end/SourceFrame.js:-180 > - if (this._pendingMarkRange) { Where did this go? 338880 3 podivilov 2011-01-24 00:38:13 -0800 (In reply to comment #2) > (From update of attachment 79737 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=79737&action=review > > > Source/WebCore/inspector/front-end/SourceFrame.js:-180 > > - if (this._pendingMarkRange) { > > Where did this go? This is not needed anymore since search is implemented in SourceFrame. 338883 4 podivilov 2011-01-24 00:44:49 -0800 Committed r76488: <http://trac.webkit.org/changeset/76488> 79737 2011-01-21 07:41:56 -0800 2011-01-21 08:00:11 -0800 Patch. patch text/plain 11190 podivilov ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBhYzljNTJlLi5mZjhjOTY4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzkg QEAKKzIwMTEtMDEtMjEgIFBhdmVsIFBvZGl2aWxvdiAgPHBvZGl2aWxvdkBjaHJvbWl1bS5vcmc+ CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2ViIElu c3BlY3RvcjogbW92ZSBzZWFyY2ggZnVuY3Rpb25zIGZyb20gU291cmNlVmlldyB0byBTb3VyY2VG cmFtZS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTUy ODk1CisKKyAgICAgICAgVGhpcyBpcyB0aGUgbGFzdCBzdGVwIGJlZm9yZSBlbGltaW5hdGluZyBT b3VyY2VWaWV3IGFuZCBTY3JpcHRWaWV3IHNpbmNlCisgICAgICAgIHRoaXMgY2xhc3NlcyBqdXN0 IGRlbGVnYXRlIGV2ZXJ5dGhpbmcgdG8gU291cmNlRnJhbWUuCisKKyAgICAgICAgKiBpbnNwZWN0 b3IvZnJvbnQtZW5kL1NvdXJjZUZyYW1lLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNvdXJj ZUZyYW1lLnByb3RvdHlwZS5zZXQgdmlzaWJsZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU291 cmNlRnJhbWUucHJvdG90eXBlLl9jbGVhckxpbmVIaWdobGlnaHQpOgorICAgICAgICAoV2ViSW5z cGVjdG9yLlNvdXJjZUZyYW1lLnByb3RvdHlwZS5fY3JlYXRlVGV4dFZpZXdlcik6CisgICAgICAg IChXZWJJbnNwZWN0b3IuU291cmNlRnJhbWUucHJvdG90eXBlLnBlcmZvcm1TZWFyY2guZG9GaW5k U2VhcmNoTWF0Y2hlcyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU291cmNlRnJhbWUucHJvdG90 eXBlLnBlcmZvcm1TZWFyY2gpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lLnBy b3RvdHlwZS5zZWFyY2hDYW5jZWxlZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU291cmNlRnJh bWUucHJvdG90eXBlLmp1bXBUb0ZpcnN0U2VhcmNoUmVzdWx0KToKKyAgICAgICAgKFdlYkluc3Bl Y3Rvci5Tb3VyY2VGcmFtZS5wcm90b3R5cGUuanVtcFRvTGFzdFNlYXJjaFJlc3VsdCk6CisgICAg ICAgIChXZWJJbnNwZWN0b3IuU291cmNlRnJhbWUucHJvdG90eXBlLmp1bXBUb05leHRTZWFyY2hS ZXN1bHQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lLnByb3RvdHlwZS5qdW1w VG9QcmV2aW91c1NlYXJjaFJlc3VsdCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU291cmNlRnJh bWUucHJvdG90eXBlLnNob3dpbmdGaXJzdFNlYXJjaFJlc3VsdCk6CisgICAgICAgIChXZWJJbnNw ZWN0b3IuU291cmNlRnJhbWUucHJvdG90eXBlLnNob3dpbmdMYXN0U2VhcmNoUmVzdWx0KToKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZS5wcm90b3R5cGUuX2p1bXBUb1NlYXJjaFJl c3VsdCk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9Tb3VyY2VWaWV3LmpzOgorICAg ICAgICAoV2ViSW5zcGVjdG9yLlNvdXJjZVZpZXcucHJvdG90eXBlLmhpZGUpOgorICAgICAgICAo V2ViSW5zcGVjdG9yLlNvdXJjZVZpZXcucHJvdG90eXBlLnNlYXJjaENhbmNlbGVkKToKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5Tb3VyY2VWaWV3LnByb3RvdHlwZS5wZXJmb3JtU2VhcmNoKToKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5Tb3VyY2VWaWV3LnByb3RvdHlwZS5qdW1wVG9GaXJzdFNlYXJj aFJlc3VsdCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU291cmNlVmlldy5wcm90b3R5cGUuanVt cFRvTGFzdFNlYXJjaFJlc3VsdCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU291cmNlVmlldy5w cm90b3R5cGUuanVtcFRvTmV4dFNlYXJjaFJlc3VsdCk6CisgICAgICAgIChXZWJJbnNwZWN0b3Iu U291cmNlVmlldy5wcm90b3R5cGUuanVtcFRvUHJldmlvdXNTZWFyY2hSZXN1bHQpOgorICAgICAg ICAoV2ViSW5zcGVjdG9yLlNvdXJjZVZpZXcucHJvdG90eXBlLnNob3dpbmdGaXJzdFNlYXJjaFJl c3VsdCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU291cmNlVmlldy5wcm90b3R5cGUuc2hvd2lu Z0xhc3RTZWFyY2hSZXN1bHQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNvdXJjZVZpZXcucHJv dG90eXBlLmNsZWFyTWVzc2FnZXMpOgorCiAyMDExLTAxLTEyICBQYXZlbCBQb2Rpdmlsb3YgIDxw b2Rpdmlsb3ZAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Tb3Vy Y2VGcmFtZS5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU291cmNlRnJh bWUuanMKaW5kZXggZWI4OWYyNC4uOTMzZjU0OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9Tb3VyY2VGcmFtZS5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL1NvdXJjZUZyYW1lLmpzCkBAIC02NCw2ICs2NCw3IEBAIFdlYklu c3BlY3Rvci5Tb3VyY2VGcmFtZS5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICAgICAgdGhpcy5f dGV4dFZpZXdlci5yZXNpemUoKTsKICAgICAgICAgfSBlbHNlIHsKICAgICAgICAgICAgIHRoaXMu X2hpZGVQb3B1cCgpOworICAgICAgICAgICAgdGhpcy5fY2xlYXJMaW5lSGlnaGxpZ2h0KCk7CiAg ICAgICAgICAgICBpZiAodGhpcy5fdGV4dFZpZXdlcikgewogICAgICAgICAgICAgICAgIHRoaXMu X3Njcm9sbFRvcCA9IHRoaXMuX3RleHRWaWV3ZXIuZWxlbWVudC5zY3JvbGxUb3A7CiAgICAgICAg ICAgICAgICAgdGhpcy5fc2Nyb2xsTGVmdCA9IHRoaXMuX3RleHRWaWV3ZXIuZWxlbWVudC5zY3Jv bGxMZWZ0OwpAQCAtMTQ0LDcgKzE0NSw3IEBAIFdlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZS5wcm90 b3R5cGUgPSB7CiAgICAgICAgICAgICB0aGlzLl9saW5lVG9IaWdobGlnaHQgPSBsaW5lOwogICAg IH0sCiAKLSAgICBjbGVhckxpbmVIaWdobGlnaHQ6IGZ1bmN0aW9uKCkKKyAgICBfY2xlYXJMaW5l SGlnaGxpZ2h0OiBmdW5jdGlvbigpCiAgICAgewogICAgICAgICBpZiAodGhpcy5fdGV4dFZpZXdl cikKICAgICAgICAgICAgIHRoaXMuX3RleHRWaWV3ZXIuY2xlYXJMaW5lSGlnaGxpZ2h0KCk7CkBA IC0xNzcsMTIgKzE3OCw2IEBAIFdlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZS5wcm90b3R5cGUgPSB7 CiAgICAgICAgICAgICBkZWxldGUgdGhpcy5fbGluZU51bWJlclRvUmV2ZWFsOwogICAgICAgICB9 CiAKLSAgICAgICAgaWYgKHRoaXMuX3BlbmRpbmdNYXJrUmFuZ2UpIHsKLSAgICAgICAgICAgIHZh ciByYW5nZSA9IHRoaXMuX3BlbmRpbmdNYXJrUmFuZ2U7Ci0gICAgICAgICAgICB0aGlzLm1hcmtB bmRSZXZlYWxSYW5nZShyYW5nZSk7Ci0gICAgICAgICAgICBkZWxldGUgdGhpcy5fcGVuZGluZ01h cmtSYW5nZTsKLSAgICAgICAgfQotCiAgICAgICAgIGlmICh0aGlzLl9saW5lVG9IaWdobGlnaHQp IHsKICAgICAgICAgICAgIHRoaXMuaGlnaGxpZ2h0TGluZSh0aGlzLl9saW5lVG9IaWdobGlnaHQp OwogICAgICAgICAgICAgZGVsZXRlIHRoaXMuX2xpbmVUb0hpZ2hsaWdodDsKQEAgLTIyMywzNSAr MjE4LDg1IEBAIFdlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZS5wcm90b3R5cGUgPSB7CiAgICAgICAg IHRoaXMuX3RleHRWaWV3ZXIuZW5kVXBkYXRlcygpOwogICAgIH0sCiAKLSAgICBmaW5kU2VhcmNo TWF0Y2hlczogZnVuY3Rpb24ocXVlcnksIGZpbmlzaGVkQ2FsbGJhY2spCisgICAgcGVyZm9ybVNl YXJjaDogZnVuY3Rpb24ocXVlcnksIGNhbGxiYWNrKQogICAgIHsKLSAgICAgICAgZnVuY3Rpb24g ZG9GaW5kU2VhcmNoTWF0Y2hlcygpCisgICAgICAgIC8vIENhbGwgc2VhcmNoQ2FuY2VsZWQgc2lu Y2UgaXQgd2lsbCByZXNldCBldmVyeXRoaW5nIHdlIG5lZWQgYmVmb3JlIGRvaW5nIGEgbmV3IHNl YXJjaC4KKyAgICAgICAgdGhpcy5zZWFyY2hDYW5jZWxlZCgpOworCisgICAgICAgIGZ1bmN0aW9u IGRvRmluZFNlYXJjaE1hdGNoZXMocXVlcnkpCiAgICAgICAgIHsKLSAgICAgICAgICAgIHZhciBy YW5nZXMgPSBbXTsKKyAgICAgICAgICAgIHRoaXMuX2N1cnJlbnRTZWFyY2hSZXN1bHRJbmRleCA9 IC0xOworICAgICAgICAgICAgdGhpcy5fc2VhcmNoUmVzdWx0cyA9IFtdOwogCiAgICAgICAgICAg ICAvLyBGaXJzdCBkbyBjYXNlLWluc2Vuc2l0aXZlIHNlYXJjaC4KICAgICAgICAgICAgIHZhciBy ZWdleE9iamVjdCA9IGNyZWF0ZVNlYXJjaFJlZ2V4KHF1ZXJ5KTsKLSAgICAgICAgICAgIHRoaXMu X2NvbGxlY3RSZWdleE1hdGNoZXMocmVnZXhPYmplY3QsIHJhbmdlcyk7CisgICAgICAgICAgICB0 aGlzLl9jb2xsZWN0UmVnZXhNYXRjaGVzKHJlZ2V4T2JqZWN0LCB0aGlzLl9zZWFyY2hSZXN1bHRz KTsKIAogICAgICAgICAgICAgLy8gVGhlbiB0cnkgcmVnZXggc2VhcmNoIGlmIHVzZXIga25vd3Mg dGhlIC8gLyBoaW50LgogICAgICAgICAgICAgdHJ5IHsKICAgICAgICAgICAgICAgICBpZiAoL15c Ly4qXC8kLy50ZXN0KHF1ZXJ5KSkKLSAgICAgICAgICAgICAgICAgICAgdGhpcy5fY29sbGVjdFJl Z2V4TWF0Y2hlcyhuZXcgUmVnRXhwKHF1ZXJ5LnN1YnN0cmluZygxLCBxdWVyeS5sZW5ndGggLSAx KSksIHJhbmdlcyk7CisgICAgICAgICAgICAgICAgICAgIHRoaXMuX2NvbGxlY3RSZWdleE1hdGNo ZXMobmV3IFJlZ0V4cChxdWVyeS5zdWJzdHJpbmcoMSwgcXVlcnkubGVuZ3RoIC0gMSkpLCB0aGlz Ll9zZWFyY2hSZXN1bHRzKTsKICAgICAgICAgICAgIH0gY2F0Y2ggKGUpIHsKICAgICAgICAgICAg ICAgICAvLyBTaWxlbnQgY2F0Y2guCiAgICAgICAgICAgICB9Ci0gICAgICAgICAgICBmaW5pc2hl ZENhbGxiYWNrKHJhbmdlcyk7CisKKyAgICAgICAgICAgIGNhbGxiYWNrKHRoaXMuX3NlYXJjaFJl c3VsdHMubGVuZ3RoKTsKICAgICAgICAgfQogCiAgICAgICAgIGlmICh0aGlzLl90ZXh0Vmlld2Vy KQotICAgICAgICAgICAgZG9GaW5kU2VhcmNoTWF0Y2hlcy5jYWxsKHRoaXMpOworICAgICAgICAg ICAgZG9GaW5kU2VhcmNoTWF0Y2hlcy5jYWxsKHRoaXMsIHF1ZXJ5KTsKICAgICAgICAgZWxzZQot ICAgICAgICAgICAgdGhpcy5fZGVsYXllZEZpbmRTZWFyY2hNYXRjaGVzID0gZG9GaW5kU2VhcmNo TWF0Y2hlcy5iaW5kKHRoaXMpOworICAgICAgICAgICAgdGhpcy5fZGVsYXllZEZpbmRTZWFyY2hN YXRjaGVzID0gZG9GaW5kU2VhcmNoTWF0Y2hlcy5iaW5kKHRoaXMsIHF1ZXJ5KTsKKwogICAgIH0s CiAKLSAgICBjYW5jZWxGaW5kU2VhcmNoTWF0Y2hlczogZnVuY3Rpb24oKQorICAgIHNlYXJjaENh bmNlbGVkOiBmdW5jdGlvbigpCiAgICAgewogICAgICAgICBkZWxldGUgdGhpcy5fZGVsYXllZEZp bmRTZWFyY2hNYXRjaGVzOworICAgICAgICBpZiAoIXRoaXMuX3RleHRWaWV3ZXIpCisgICAgICAg ICAgICByZXR1cm47CisKKyAgICAgICAgdGhpcy5fY3VycmVudFNlYXJjaFJlc3VsdEluZGV4ID0g LTE7CisgICAgICAgIHRoaXMuX3NlYXJjaFJlc3VsdHMgPSBbXTsKKyAgICAgICAgdGhpcy5fdGV4 dFZpZXdlci5tYXJrQW5kUmV2ZWFsUmFuZ2UobnVsbCk7CisgICAgfSwKKworICAgIGp1bXBUb0Zp cnN0U2VhcmNoUmVzdWx0OiBmdW5jdGlvbigpCisgICAgeworICAgICAgICB0aGlzLl9qdW1wVG9T ZWFyY2hSZXN1bHQoMCk7CisgICAgfSwKKworICAgIGp1bXBUb0xhc3RTZWFyY2hSZXN1bHQ6IGZ1 bmN0aW9uKCkKKyAgICB7CisgICAgICAgIHRoaXMuX2p1bXBUb1NlYXJjaFJlc3VsdCh0aGlzLl9z ZWFyY2hSZXN1bHRzLmxlbmd0aCAtIDEpOworICAgIH0sCisKKyAgICBqdW1wVG9OZXh0U2VhcmNo UmVzdWx0OiBmdW5jdGlvbigpCisgICAgeworICAgICAgICB0aGlzLl9qdW1wVG9TZWFyY2hSZXN1 bHQodGhpcy5fY3VycmVudFNlYXJjaFJlc3VsdEluZGV4ICsgMSk7CisgICAgfSwKKworICAgIGp1 bXBUb1ByZXZpb3VzU2VhcmNoUmVzdWx0OiBmdW5jdGlvbigpCisgICAgeworICAgICAgICB0aGlz Ll9qdW1wVG9TZWFyY2hSZXN1bHQodGhpcy5fY3VycmVudFNlYXJjaFJlc3VsdEluZGV4IC0gMSk7 CisgICAgfSwKKworICAgIHNob3dpbmdGaXJzdFNlYXJjaFJlc3VsdDogZnVuY3Rpb24oKQorICAg IHsKKyAgICAgICAgcmV0dXJuIHRoaXMuX3NlYXJjaFJlc3VsdHMubGVuZ3RoICYmICB0aGlzLl9j dXJyZW50U2VhcmNoUmVzdWx0SW5kZXggPT09IDA7CisgICAgfSwKKworICAgIHNob3dpbmdMYXN0 U2VhcmNoUmVzdWx0OiBmdW5jdGlvbigpCisgICAgeworICAgICAgICByZXR1cm4gdGhpcy5fc2Vh cmNoUmVzdWx0cy5sZW5ndGggJiYgdGhpcy5fY3VycmVudFNlYXJjaFJlc3VsdEluZGV4ID09PSAo dGhpcy5fc2VhcmNoUmVzdWx0cy5sZW5ndGggLSAxKTsKKyAgICB9LAorCisgICAgX2p1bXBUb1Nl YXJjaFJlc3VsdDogZnVuY3Rpb24oaW5kZXgpCisgICAgeworICAgICAgICBpZiAoIXRoaXMuX3Rl eHRWaWV3ZXIgfHwgIXRoaXMuX3NlYXJjaFJlc3VsdHMubGVuZ3RoKQorICAgICAgICAgICAgcmV0 dXJuOworICAgICAgICB0aGlzLl9jdXJyZW50U2VhcmNoUmVzdWx0SW5kZXggPSAoaW5kZXggKyB0 aGlzLl9zZWFyY2hSZXN1bHRzLmxlbmd0aCkgJSB0aGlzLl9zZWFyY2hSZXN1bHRzLmxlbmd0aDsK KyAgICAgICAgdGhpcy5fdGV4dFZpZXdlci5tYXJrQW5kUmV2ZWFsUmFuZ2UodGhpcy5fc2VhcmNo UmVzdWx0c1t0aGlzLl9jdXJyZW50U2VhcmNoUmVzdWx0SW5kZXhdKTsKICAgICB9LAogCiAgICAg X2NvbGxlY3RSZWdleE1hdGNoZXM6IGZ1bmN0aW9uKHJlZ2V4T2JqZWN0LCByYW5nZXMpCkBAIC0y NzEsMjIgKzMxNiw2IEBAIFdlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZS5wcm90b3R5cGUgPSB7CiAg ICAgICAgIHJldHVybiByYW5nZXM7CiAgICAgfSwKIAotICAgIG1hcmtBbmRSZXZlYWxSYW5nZTog ZnVuY3Rpb24ocmFuZ2UpCi0gICAgewotICAgICAgICBpZiAodGhpcy5fdGV4dFZpZXdlcikKLSAg ICAgICAgICAgIHRoaXMuX3RleHRWaWV3ZXIubWFya0FuZFJldmVhbFJhbmdlKHJhbmdlKTsKLSAg ICAgICAgZWxzZQotICAgICAgICAgICAgdGhpcy5fcGVuZGluZ01hcmtSYW5nZSA9IHJhbmdlOwot ICAgIH0sCi0KLSAgICBjbGVhck1hcmtlZFJhbmdlOiBmdW5jdGlvbigpCi0gICAgewotICAgICAg ICBpZiAodGhpcy5fdGV4dFZpZXdlcikgewotICAgICAgICAgICAgdGhpcy5fdGV4dFZpZXdlci5t YXJrQW5kUmV2ZWFsUmFuZ2UobnVsbCk7Ci0gICAgICAgIH0gZWxzZQotICAgICAgICAgICAgZGVs ZXRlIHRoaXMuX3BlbmRpbmdNYXJrUmFuZ2U7Ci0gICAgfSwKLQogICAgIF9pbmNyZW1lbnRNZXNz YWdlUmVwZWF0Q291bnQ6IGZ1bmN0aW9uKG1zZywgcmVwZWF0RGVsdGEpCiAgICAgewogICAgICAg ICBpZiAoIW1zZy5fcmVzb3VyY2VNZXNzYWdlTGluZUVsZW1lbnQpCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NvdXJjZVZpZXcuanMgYi9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NvdXJjZVZpZXcuanMKaW5kZXggMzdjYWFiYi4uYTJl Nzk4MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Tb3Vy Y2VWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU291cmNl Vmlldy5qcwpAQCAtNDcsOSArNDcsNyBAQCBXZWJJbnNwZWN0b3IuU291cmNlVmlldy5wcm90b3R5 cGUgPSB7CiAgICAgaGlkZTogZnVuY3Rpb24oKQogICAgIHsKICAgICAgICAgdGhpcy5zb3VyY2VG cmFtZS52aXNpYmxlID0gZmFsc2U7Ci0gICAgICAgIHRoaXMuc291cmNlRnJhbWUuY2xlYXJMaW5l SGlnaGxpZ2h0KCk7CiAgICAgICAgIFdlYkluc3BlY3Rvci5WaWV3LnByb3RvdHlwZS5oaWRlLmNh bGwodGhpcyk7Ci0gICAgICAgIHRoaXMuX2N1cnJlbnRTZWFyY2hSZXN1bHRJbmRleCA9IC0xOwog ICAgIH0sCiAKICAgICByZXNpemU6IGZ1bmN0aW9uKCkKQEAgLTc3LDY4ICs3NSw0MiBAQCBXZWJJ bnNwZWN0b3IuU291cmNlVmlldy5wcm90b3R5cGUgPSB7CiAKICAgICBzZWFyY2hDYW5jZWxlZDog ZnVuY3Rpb24oKQogICAgIHsKLSAgICAgICAgdGhpcy5fY3VycmVudFNlYXJjaFJlc3VsdEluZGV4 ID0gLTE7Ci0gICAgICAgIHRoaXMuX3NlYXJjaFJlc3VsdHMgPSBbXTsKLSAgICAgICAgdGhpcy5z b3VyY2VGcmFtZS5jbGVhck1hcmtlZFJhbmdlKCk7Ci0gICAgICAgIHRoaXMuc291cmNlRnJhbWUu Y2FuY2VsRmluZFNlYXJjaE1hdGNoZXMoKTsKKyAgICAgICAgdGhpcy5zb3VyY2VGcmFtZS5zZWFy Y2hDYW5jZWxlZCgpOwogICAgIH0sCiAKICAgICBwZXJmb3JtU2VhcmNoOiBmdW5jdGlvbihxdWVy eSwgZmluaXNoZWRDYWxsYmFjaykKICAgICB7Ci0gICAgICAgIC8vIENhbGwgc2VhcmNoQ2FuY2Vs ZWQgc2luY2UgaXQgd2lsbCByZXNldCBldmVyeXRoaW5nIHdlIG5lZWQgYmVmb3JlIGRvaW5nIGEg bmV3IHNlYXJjaC4KLSAgICAgICAgdGhpcy5zZWFyY2hDYW5jZWxlZCgpOwotCi0gICAgICAgIGZ1 bmN0aW9uIGRpZEZpbmRTZWFyY2hNYXRjaGVzKHNlYXJjaFJlc3VsdHMpCi0gICAgICAgIHsKLSAg ICAgICAgICAgIHRoaXMuX3NlYXJjaFJlc3VsdHMgPSBzZWFyY2hSZXN1bHRzOwotICAgICAgICAg ICAgaWYgKHRoaXMuX3NlYXJjaFJlc3VsdHMpCi0gICAgICAgICAgICAgICAgZmluaXNoZWRDYWxs YmFjayh0aGlzLCB0aGlzLl9zZWFyY2hSZXN1bHRzLmxlbmd0aCk7Ci0gICAgICAgIH0KLSAgICAg ICAgdGhpcy5zb3VyY2VGcmFtZS5maW5kU2VhcmNoTWF0Y2hlcyhxdWVyeSwgZGlkRmluZFNlYXJj aE1hdGNoZXMuYmluZCh0aGlzKSk7CisgICAgICAgIHRoaXMuc291cmNlRnJhbWUucGVyZm9ybVNl YXJjaChxdWVyeSwgZmluaXNoZWRDYWxsYmFjay5iaW5kKG51bGwsIHRoaXMpKTsKICAgICB9LAog CiAgICAganVtcFRvRmlyc3RTZWFyY2hSZXN1bHQ6IGZ1bmN0aW9uKCkKICAgICB7Ci0gICAgICAg IGlmICghdGhpcy5fc2VhcmNoUmVzdWx0cyB8fCAhdGhpcy5fc2VhcmNoUmVzdWx0cy5sZW5ndGgp Ci0gICAgICAgICAgICByZXR1cm47Ci0gICAgICAgIHRoaXMuX2N1cnJlbnRTZWFyY2hSZXN1bHRJ bmRleCA9IDA7Ci0gICAgICAgIHRoaXMuX2p1bXBUb1NlYXJjaFJlc3VsdCh0aGlzLl9jdXJyZW50 U2VhcmNoUmVzdWx0SW5kZXgpOworICAgICAgICB0aGlzLnNvdXJjZUZyYW1lLmp1bXBUb0ZpcnN0 U2VhcmNoUmVzdWx0KCk7CiAgICAgfSwKIAogICAgIGp1bXBUb0xhc3RTZWFyY2hSZXN1bHQ6IGZ1 bmN0aW9uKCkKICAgICB7Ci0gICAgICAgIGlmICghdGhpcy5fc2VhcmNoUmVzdWx0cyB8fCAhdGhp cy5fc2VhcmNoUmVzdWx0cy5sZW5ndGgpCi0gICAgICAgICAgICByZXR1cm47Ci0gICAgICAgIHRo aXMuX2N1cnJlbnRTZWFyY2hSZXN1bHRJbmRleCA9ICh0aGlzLl9zZWFyY2hSZXN1bHRzLmxlbmd0 aCAtIDEpOwotICAgICAgICB0aGlzLl9qdW1wVG9TZWFyY2hSZXN1bHQodGhpcy5fY3VycmVudFNl YXJjaFJlc3VsdEluZGV4KTsKKyAgICAgICAgdGhpcy5zb3VyY2VGcmFtZS5qdW1wVG9MYXN0U2Vh cmNoUmVzdWx0KCk7CiAgICAgfSwKIAogICAgIGp1bXBUb05leHRTZWFyY2hSZXN1bHQ6IGZ1bmN0 aW9uKCkKICAgICB7Ci0gICAgICAgIGlmICghdGhpcy5fc2VhcmNoUmVzdWx0cyB8fCAhdGhpcy5f c2VhcmNoUmVzdWx0cy5sZW5ndGgpCi0gICAgICAgICAgICByZXR1cm47Ci0gICAgICAgIGlmICgr K3RoaXMuX2N1cnJlbnRTZWFyY2hSZXN1bHRJbmRleCA+PSB0aGlzLl9zZWFyY2hSZXN1bHRzLmxl bmd0aCkKLSAgICAgICAgICAgIHRoaXMuX2N1cnJlbnRTZWFyY2hSZXN1bHRJbmRleCA9IDA7Ci0g ICAgICAgIHRoaXMuX2p1bXBUb1NlYXJjaFJlc3VsdCh0aGlzLl9jdXJyZW50U2VhcmNoUmVzdWx0 SW5kZXgpOworICAgICAgICB0aGlzLnNvdXJjZUZyYW1lLmp1bXBUb05leHRTZWFyY2hSZXN1bHQo KTsKICAgICB9LAogCiAgICAganVtcFRvUHJldmlvdXNTZWFyY2hSZXN1bHQ6IGZ1bmN0aW9uKCkK ICAgICB7Ci0gICAgICAgIGlmICghdGhpcy5fc2VhcmNoUmVzdWx0cyB8fCAhdGhpcy5fc2VhcmNo UmVzdWx0cy5sZW5ndGgpCi0gICAgICAgICAgICByZXR1cm47Ci0gICAgICAgIGlmICgtLXRoaXMu X2N1cnJlbnRTZWFyY2hSZXN1bHRJbmRleCA8IDApCi0gICAgICAgICAgICB0aGlzLl9jdXJyZW50 U2VhcmNoUmVzdWx0SW5kZXggPSAodGhpcy5fc2VhcmNoUmVzdWx0cy5sZW5ndGggLSAxKTsKLSAg ICAgICAgdGhpcy5fanVtcFRvU2VhcmNoUmVzdWx0KHRoaXMuX2N1cnJlbnRTZWFyY2hSZXN1bHRJ bmRleCk7CisgICAgICAgIHRoaXMuc291cmNlRnJhbWUuanVtcFRvUHJldmlvdXNTZWFyY2hSZXN1 bHQoKTsKICAgICB9LAogCiAgICAgc2hvd2luZ0ZpcnN0U2VhcmNoUmVzdWx0OiBmdW5jdGlvbigp CiAgICAgewotICAgICAgICByZXR1cm4gKHRoaXMuX2N1cnJlbnRTZWFyY2hSZXN1bHRJbmRleCA9 PT0gMCk7CisgICAgICAgIHRoaXMuc291cmNlRnJhbWUuc2hvd2luZ0ZpcnN0U2VhcmNoUmVzdWx0 KCk7CiAgICAgfSwKIAogICAgIHNob3dpbmdMYXN0U2VhcmNoUmVzdWx0OiBmdW5jdGlvbigpCiAg ICAgewotICAgICAgICByZXR1cm4gKHRoaXMuX3NlYXJjaFJlc3VsdHMgJiYgdGhpcy5fY3VycmVu dFNlYXJjaFJlc3VsdEluZGV4ID09PSAodGhpcy5fc2VhcmNoUmVzdWx0cy5sZW5ndGggLSAxKSk7 CisgICAgICAgIHRoaXMuc291cmNlRnJhbWUuc2hvd2luZ0xhc3RTZWFyY2hSZXN1bHQoKTsKICAg ICB9LAogCiAgICAgcmV2ZWFsTGluZTogZnVuY3Rpb24obGluZU51bWJlcikKQEAgLTE1OSwxNSAr MTMxLDYgQEAgV2ViSW5zcGVjdG9yLlNvdXJjZVZpZXcucHJvdG90eXBlID0gewogICAgIGNsZWFy TWVzc2FnZXM6IGZ1bmN0aW9uKCkKICAgICB7CiAgICAgICAgIHRoaXMuc291cmNlRnJhbWUuY2xl YXJNZXNzYWdlcygpOwotICAgIH0sCi0KLSAgICBfanVtcFRvU2VhcmNoUmVzdWx0OiBmdW5jdGlv bihpbmRleCkKLSAgICB7Ci0gICAgICAgIHZhciBmb3VuZFJhbmdlID0gdGhpcy5fc2VhcmNoUmVz dWx0c1tpbmRleF07Ci0gICAgICAgIGlmICghZm91bmRSYW5nZSkKLSAgICAgICAgICAgIHJldHVy bjsKLQotICAgICAgICB0aGlzLnNvdXJjZUZyYW1lLm1hcmtBbmRSZXZlYWxSYW5nZShmb3VuZFJh bmdlKTsKICAgICB9CiB9CiAK