124544 2013-11-18 15:47:43 -0800 Web Inspector: Update WebInspectorUI to use the new "nodeIds" parameter for DOM.performSearch 2013-11-18 17:11:20 -0800 1 1 1 Unclassified WebKit Web Inspector 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 achicu achicu commit-queue graouts joepeck timothy webkit-bug-importer oldest_to_newest 951847 0 achicu 2013-11-18 15:47:43 -0800 The search should be limited to just the view the user has open. In 124390 a new parameter has been added on the protocol to help with that. Make sure we are using the new parameter in the FrameDOMTreeContentView and ContentFlowDOMTreeContentView. This way the search results will be limited to just the elements visible in the current view. 951849 1 217245 achicu 2013-11-18 15:50:30 -0800 Created attachment 217245 Patch V1 951862 2 217245 joepeck 2013-11-18 16:28:07 -0800 Comment on attachment 217245 Patch V1 View in context: https://bugs.webkit.org/attachment.cgi?id=217245&action=review > Source/WebInspectorUI/UserInterface/DOMTreeContentView.js:215 > - DOMAgent.performSearch(query, searchResultsReady.bind(this)); > + function contextNodesReady(nodeIds) > + { > + DOMAgent.performSearch(query, nodeIds, searchResultsReady.bind(this)); > + } NOTE TO SELF: Adding an extra optional parameter like this does not break iOS 6 and 7 compatibility. So this is good. This might even be a good comment to throw into the ChangeLog. > Source/WebInspectorUI/UserInterface/DOMTreeContentView.js:224 > + callback(); Nit: I would prefer to see callback(undefined) to more explicitly show we're passing undefined to performSearch. 951875 3 217252 achicu 2013-11-18 16:39:31 -0800 Created attachment 217252 Patch for landing Thanks Joe! 951888 4 217252 commit-queue 2013-11-18 17:11:18 -0800 Comment on attachment 217252 Patch for landing Clearing flags on attachment: 217252 Committed r159475: <http://trac.webkit.org/changeset/159475> 951889 5 commit-queue 2013-11-18 17:11:20 -0800 All reviewed patches have been landed. Closing bug. 217245 2013-11-18 15:50:30 -0800 2013-11-18 16:39:31 -0800 Patch V1 bug124544.v1.patch text/plain 5688 achicu ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDcwMDY5YmEuLjRmNjlmMGIgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDEzLTExLTE4ICBBbGV4YW5kcnUgQ2hp Y3VsaXRhICA8YWNoaWN1QGFkb2JlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBVcGRh dGUgV2ViSW5zcGVjdG9yVUkgdG8gdXNlIHRoZSBuZXcgIm5vZGVJZHMiIHBhcmFtZXRlciBmb3Ig RE9NLnBlcmZvcm1TZWFyY2gKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTEyNDU0NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIEFkZGVkIHRoZSBuZXcgRE9NLnBlcmZvcm1TZWFyY2ggIm5vZGVJZHMiIHBhcmFt ZXRlciBhbmQgbWFkZSB0aGUgdHdvIGltcGxlbWVudGF0aW9ucworICAgICAgICBvZiBET01UcmVl Q29udGVudFZpZXcgcHJvdmlkZSB0aGUgcmlnaHQgY29udGV4dCBub2RlIGlkcy4KKworICAgICAg ICBET01UcmVlQ29udGVudFZpZXcgaXMganVzdCB1c2luZyB0aGUgaWQgb2YgdGhlIGRvY3VtZW50 IG5vZGUgd2hpbGUgQ29udGVudEZsb3dET01UcmVlQ29udGVudFZpZXcKKyAgICAgICAgaXMgcGFz c2luZyB0aGUgbGlzdCBvZiBjb250ZW50IG5vZGVzLgorCisgICAgICAgICogVXNlckludGVyZmFj ZS9Db250ZW50Rmxvd0RPTVRyZWVDb250ZW50Vmlldy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rv ci5Db250ZW50Rmxvd0RPTVRyZWVDb250ZW50Vmlldy5wcm90b3R5cGUuZ2V0U2VhcmNoQ29udGV4 dE5vZGVzKToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL0RPTVRyZWVDb250ZW50Vmlldy5qczoK KyAgICAgICAgKFdlYkluc3BlY3Rvci5ET01UcmVlQ29udGVudFZpZXcucHJvdG90eXBlLnBlcmZv cm1TZWFyY2guY29udGV4dE5vZGVzUmVhZHkpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRPTVRy ZWVDb250ZW50Vmlldy5wcm90b3R5cGUucGVyZm9ybVNlYXJjaCk6CisgICAgICAgIChXZWJJbnNw ZWN0b3IuRE9NVHJlZUNvbnRlbnRWaWV3LnByb3RvdHlwZS5nZXRTZWFyY2hDb250ZXh0Tm9kZXMp OgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvRnJhbWVET01UcmVlQ29udGVudFZpZXcuanM6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuRnJhbWVET01UcmVlQ29udGVudFZpZXcucHJvdG90eXBlLmdl dFNlYXJjaENvbnRleHROb2Rlcyk6CisgICAgICAgICogVXNlckludGVyZmFjZS9JbnNwZWN0b3JC YWNrZW5kQ29tbWFuZHMuanM6CisKIDIwMTMtMTEtMTUgIEFudG9pbmUgUXVpbnQgIDxncmFvdXRz QGFwcGxlLmNvbT4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBOZXcgY29sb3IgcGlja2VyCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Db250ZW50Rmxv d0RPTVRyZWVDb250ZW50Vmlldy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL0NvbnRlbnRGbG93RE9NVHJlZUNvbnRlbnRWaWV3LmpzCmluZGV4IDc3OWMzNzYuLjNkYzBh NmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRl bnRGbG93RE9NVHJlZUNvbnRlbnRWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL0NvbnRlbnRGbG93RE9NVHJlZUNvbnRlbnRWaWV3LmpzCkBAIC01Miw2ICs1 MiwxMyBAQCBXZWJJbnNwZWN0b3IuQ29udGVudEZsb3dET01UcmVlQ29udGVudFZpZXcucHJvdG90 eXBlID0gewogICAgICAgICBXZWJJbnNwZWN0b3IuRE9NVHJlZUNvbnRlbnRWaWV3LnByb3RvdHlw ZS5jbG9zZWQuY2FsbCh0aGlzKTsKICAgICB9LAogCisgICAgZ2V0U2VhcmNoQ29udGV4dE5vZGVz OiBmdW5jdGlvbihjYWxsYmFjaykKKyAgICB7CisgICAgICAgIGNhbGxiYWNrKHRoaXMuZG9tVHJl ZU91dGxpbmUuY2hpbGRyZW4ubWFwKGZ1bmN0aW9uKHRyZWVPdXRsaW5lKSB7CisgICAgICAgICAg ICByZXR1cm4gdHJlZU91dGxpbmUucmVwcmVzZW50ZWRPYmplY3QuaWQ7CisgICAgICAgIH0pKTsK KyAgICB9LAorCiAgICAgLy8gUHJpdmF0ZQogCiAgICAgX2NyZWF0ZUNvbnRlbnRUcmVlczogZnVu Y3Rpb24oKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv RE9NVHJlZUNvbnRlbnRWaWV3LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvRE9NVHJlZUNvbnRlbnRWaWV3LmpzCmluZGV4IDAwY2ZmN2EuLjRkMmYxYjkgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0RPTVRyZWVDb250ZW50Vmll dy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9ET01UcmVlQ29u dGVudFZpZXcuanMKQEAgLTIwOSw3ICsyMDksMTkgQEAgV2ViSW5zcGVjdG9yLkRPTVRyZWVDb250 ZW50Vmlldy5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICAgICAgdGhpcy5yZXZlYWxOZXh0U2Vh cmNoUmVzdWx0KCk7CiAgICAgICAgIH0KIAotICAgICAgICBET01BZ2VudC5wZXJmb3JtU2VhcmNo KHF1ZXJ5LCBzZWFyY2hSZXN1bHRzUmVhZHkuYmluZCh0aGlzKSk7CisgICAgICAgIGZ1bmN0aW9u IGNvbnRleHROb2Rlc1JlYWR5KG5vZGVJZHMpCisgICAgICAgIHsKKyAgICAgICAgICAgIERPTUFn ZW50LnBlcmZvcm1TZWFyY2gocXVlcnksIG5vZGVJZHMsIHNlYXJjaFJlc3VsdHNSZWFkeS5iaW5k KHRoaXMpKTsKKyAgICAgICAgfQorCisgICAgICAgIHRoaXMuZ2V0U2VhcmNoQ29udGV4dE5vZGVz KGNvbnRleHROb2Rlc1JlYWR5LmJpbmQodGhpcykpOworICAgIH0sCisKKyAgICBnZXRTZWFyY2hD b250ZXh0Tm9kZXM6IGZ1bmN0aW9uKGNhbGxiYWNrKQorICAgIHsKKyAgICAgICAgLy8gRGVmYXVs dCBpbXBsZW1lbnRhdGlvbiB3aWxsIHNlYXJjaCB0aHJvdWdoIGFsbCB0aGUgZG9jdW1lbnRzLgor ICAgICAgICAvLyBPdmVyd3JpdGUgdGhpcyB0byBsaW1pdCB0aGUgc2VhcmNoIHRvIGp1c3QgYSBz dWJ0cmVlLgorICAgICAgICBjYWxsYmFjaygpOwogICAgIH0sCiAKICAgICBzZWFyY2hDbGVhcmVk OiBmdW5jdGlvbigpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9GcmFtZURPTVRyZWVDb250ZW50Vmlldy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL0ZyYW1lRE9NVHJlZUNvbnRlbnRWaWV3LmpzCmluZGV4IDY1Mzg1MGMuLmE5 MjFiZTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Zy YW1lRE9NVHJlZUNvbnRlbnRWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL0ZyYW1lRE9NVHJlZUNvbnRlbnRWaWV3LmpzCkBAIC01Myw2ICs1MywxMyBAQCBX ZWJJbnNwZWN0b3IuRnJhbWVET01UcmVlQ29udGVudFZpZXcucHJvdG90eXBlID0gewogICAgICAg ICBXZWJJbnNwZWN0b3IuRE9NVHJlZUNvbnRlbnRWaWV3LnByb3RvdHlwZS5jbG9zZWQuY2FsbCh0 aGlzKTsKICAgICB9LAogCisgICAgZ2V0U2VhcmNoQ29udGV4dE5vZGVzOiBmdW5jdGlvbihjYWxs YmFjaykKKyAgICB7CisgICAgICAgIHRoaXMuX2RvbVRyZWUucmVxdWVzdFJvb3RET01Ob2RlKGZ1 bmN0aW9uKHJvb3RET01Ob2RlKSB7CisgICAgICAgICAgICBjYWxsYmFjayhbcm9vdERPTU5vZGUu aWRdKTsKKyAgICAgICAgfSk7CisgICAgfSwKKwogICAgIC8vIFByaXZhdGUKIAogICAgIF9yb290 RE9NTm9kZUF2YWlsYWJsZTogZnVuY3Rpb24ocm9vdERPTU5vZGUpCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9JbnNwZWN0b3JCYWNrZW5kQ29tbWFuZHMu anMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9JbnNwZWN0b3JCYWNrZW5k Q29tbWFuZHMuanMKaW5kZXggMmEyMGEwOC4uMTEyZTUyZSAxMDA2NDQKLS0tIGEvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvSW5zcGVjdG9yQmFja2VuZENvbW1hbmRzLmpzCisr KyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0luc3BlY3RvckJhY2tlbmRD b21tYW5kcy5qcwpAQCAtMTQ4LDcgKzE0OCw3IEBAIEluc3BlY3RvckJhY2tlbmQucmVnaXN0ZXJD b21tYW5kKCJET00ucmVtb3ZlQXR0cmlidXRlIiwgW3sibmFtZSI6ICJub2RlSWQiLCAidHlwCiBJ bnNwZWN0b3JCYWNrZW5kLnJlZ2lzdGVyQ29tbWFuZCgiRE9NLmdldEV2ZW50TGlzdGVuZXJzRm9y Tm9kZSIsIFt7Im5hbWUiOiAibm9kZUlkIiwgInR5cGUiOiAibnVtYmVyIiwgIm9wdGlvbmFsIjog ZmFsc2V9LCB7Im5hbWUiOiAib2JqZWN0R3JvdXAiLCAidHlwZSI6ICJzdHJpbmciLCAib3B0aW9u YWwiOiB0cnVlfV0sIFsibGlzdGVuZXJzIl0pOwogSW5zcGVjdG9yQmFja2VuZC5yZWdpc3RlckNv bW1hbmQoIkRPTS5nZXRPdXRlckhUTUwiLCBbeyJuYW1lIjogIm5vZGVJZCIsICJ0eXBlIjogIm51 bWJlciIsICJvcHRpb25hbCI6IGZhbHNlfV0sIFsib3V0ZXJIVE1MIl0pOwogSW5zcGVjdG9yQmFj a2VuZC5yZWdpc3RlckNvbW1hbmQoIkRPTS5zZXRPdXRlckhUTUwiLCBbeyJuYW1lIjogIm5vZGVJ ZCIsICJ0eXBlIjogIm51bWJlciIsICJvcHRpb25hbCI6IGZhbHNlfSwgeyJuYW1lIjogIm91dGVy SFRNTCIsICJ0eXBlIjogInN0cmluZyIsICJvcHRpb25hbCI6IGZhbHNlfV0sIFtdKTsKLUluc3Bl Y3RvckJhY2tlbmQucmVnaXN0ZXJDb21tYW5kKCJET00ucGVyZm9ybVNlYXJjaCIsIFt7Im5hbWUi OiAicXVlcnkiLCAidHlwZSI6ICJzdHJpbmciLCAib3B0aW9uYWwiOiBmYWxzZX1dLCBbInNlYXJj aElkIiwgInJlc3VsdENvdW50Il0pOworSW5zcGVjdG9yQmFja2VuZC5yZWdpc3RlckNvbW1hbmQo IkRPTS5wZXJmb3JtU2VhcmNoIiwgW3sibmFtZSI6ICJxdWVyeSIsICJ0eXBlIjogInN0cmluZyIs ICJvcHRpb25hbCI6IGZhbHNlfSwgeyJuYW1lIjogIm5vZGVJZHMiLCAidHlwZSI6ICJvYmplY3Qi LCAib3B0aW9uYWwiOiB0cnVlfV0sIFsic2VhcmNoSWQiLCAicmVzdWx0Q291bnQiXSk7CiBJbnNw ZWN0b3JCYWNrZW5kLnJlZ2lzdGVyQ29tbWFuZCgiRE9NLmdldFNlYXJjaFJlc3VsdHMiLCBbeyJu YW1lIjogInNlYXJjaElkIiwgInR5cGUiOiAic3RyaW5nIiwgIm9wdGlvbmFsIjogZmFsc2V9LCB7 Im5hbWUiOiAiZnJvbUluZGV4IiwgInR5cGUiOiAibnVtYmVyIiwgIm9wdGlvbmFsIjogZmFsc2V9 LCB7Im5hbWUiOiAidG9JbmRleCIsICJ0eXBlIjogIm51bWJlciIsICJvcHRpb25hbCI6IGZhbHNl fV0sIFsibm9kZUlkcyJdKTsKIEluc3BlY3RvckJhY2tlbmQucmVnaXN0ZXJDb21tYW5kKCJET00u ZGlzY2FyZFNlYXJjaFJlc3VsdHMiLCBbeyJuYW1lIjogInNlYXJjaElkIiwgInR5cGUiOiAic3Ry aW5nIiwgIm9wdGlvbmFsIjogZmFsc2V9XSwgW10pOwogSW5zcGVjdG9yQmFja2VuZC5yZWdpc3Rl ckNvbW1hbmQoIkRPTS5yZXF1ZXN0Tm9kZSIsIFt7Im5hbWUiOiAib2JqZWN0SWQiLCAidHlwZSI6 ICJzdHJpbmciLCAib3B0aW9uYWwiOiBmYWxzZX1dLCBbIm5vZGVJZCJdKTsK 217252 2013-11-18 16:39:31 -0800 2013-11-18 17:11:18 -0800 Patch for landing bug124544.v2.patch text/plain 5840 achicu ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDcwMDY5YmEuLmMwNDk1NzEgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDEzLTExLTE4ICBBbGV4YW5kcnUgQ2hp Y3VsaXRhICA8YWNoaWN1QGFkb2JlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBVcGRh dGUgV2ViSW5zcGVjdG9yVUkgdG8gdXNlIHRoZSBuZXcgIm5vZGVJZHMiIHBhcmFtZXRlciBmb3Ig RE9NLnBlcmZvcm1TZWFyY2gKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTEyNDU0NAorCisgICAgICAgIFJldmlld2VkIGJ5IEpvc2VwaCBQZWNvcmFyby4K KworICAgICAgICBBZGRlZCB0aGUgbmV3IERPTS5wZXJmb3JtU2VhcmNoICJub2RlSWRzIiBwYXJh bWV0ZXIgYW5kIG1hZGUgdGhlIHR3byBpbXBsZW1lbnRhdGlvbnMKKyAgICAgICAgb2YgRE9NVHJl ZUNvbnRlbnRWaWV3IHByb3ZpZGUgdGhlIHJpZ2h0IGNvbnRleHQgbm9kZSBpZHMuCisKKyAgICAg ICAgRE9NVHJlZUNvbnRlbnRWaWV3IGlzIGp1c3QgdXNpbmcgdGhlIGlkIG9mIHRoZSBkb2N1bWVu dCBub2RlIHdoaWxlIENvbnRlbnRGbG93RE9NVHJlZUNvbnRlbnRWaWV3CisgICAgICAgIGlzIHBh c3NpbmcgdGhlIGxpc3Qgb2YgY29udGVudCBub2Rlcy4KKworICAgICAgICBOb3RlIHRoYXQgYWRk aW5nIGFuIGV4dHJhIG9wdGlvbmFsIHBhcmFtZXRlciB0byBET00ucGVyZm9ybVNlYXJjaCBkb2Vz IG5vdCBicmVhayBpT1MgNiBhbmQgNyBjb21wYXRpYmlsaXR5LgorCisgICAgICAgICogVXNlcklu dGVyZmFjZS9Db250ZW50Rmxvd0RPTVRyZWVDb250ZW50Vmlldy5qczoKKyAgICAgICAgKFdlYklu c3BlY3Rvci5Db250ZW50Rmxvd0RPTVRyZWVDb250ZW50Vmlldy5wcm90b3R5cGUuZ2V0U2VhcmNo Q29udGV4dE5vZGVzKToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL0RPTVRyZWVDb250ZW50Vmll dy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5ET01UcmVlQ29udGVudFZpZXcucHJvdG90eXBl LnBlcmZvcm1TZWFyY2guY29udGV4dE5vZGVzUmVhZHkpOgorICAgICAgICAoV2ViSW5zcGVjdG9y LkRPTVRyZWVDb250ZW50Vmlldy5wcm90b3R5cGUucGVyZm9ybVNlYXJjaCk6CisgICAgICAgIChX ZWJJbnNwZWN0b3IuRE9NVHJlZUNvbnRlbnRWaWV3LnByb3RvdHlwZS5nZXRTZWFyY2hDb250ZXh0 Tm9kZXMpOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvRnJhbWVET01UcmVlQ29udGVudFZpZXcu anM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRnJhbWVET01UcmVlQ29udGVudFZpZXcucHJvdG90 eXBlLmdldFNlYXJjaENvbnRleHROb2Rlcyk6CisgICAgICAgICogVXNlckludGVyZmFjZS9JbnNw ZWN0b3JCYWNrZW5kQ29tbWFuZHMuanM6CisKIDIwMTMtMTEtMTUgIEFudG9pbmUgUXVpbnQgIDxn cmFvdXRzQGFwcGxlLmNvbT4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBOZXcgY29sb3IgcGlj a2VyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Db250 ZW50Rmxvd0RPTVRyZWVDb250ZW50Vmlldy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL0NvbnRlbnRGbG93RE9NVHJlZUNvbnRlbnRWaWV3LmpzCmluZGV4IDc3OWMzNzYu LjNkYzBhNmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L0NvbnRlbnRGbG93RE9NVHJlZUNvbnRlbnRWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRlbnRGbG93RE9NVHJlZUNvbnRlbnRWaWV3LmpzCkBAIC01 Miw2ICs1MiwxMyBAQCBXZWJJbnNwZWN0b3IuQ29udGVudEZsb3dET01UcmVlQ29udGVudFZpZXcu cHJvdG90eXBlID0gewogICAgICAgICBXZWJJbnNwZWN0b3IuRE9NVHJlZUNvbnRlbnRWaWV3LnBy b3RvdHlwZS5jbG9zZWQuY2FsbCh0aGlzKTsKICAgICB9LAogCisgICAgZ2V0U2VhcmNoQ29udGV4 dE5vZGVzOiBmdW5jdGlvbihjYWxsYmFjaykKKyAgICB7CisgICAgICAgIGNhbGxiYWNrKHRoaXMu ZG9tVHJlZU91dGxpbmUuY2hpbGRyZW4ubWFwKGZ1bmN0aW9uKHRyZWVPdXRsaW5lKSB7CisgICAg ICAgICAgICByZXR1cm4gdHJlZU91dGxpbmUucmVwcmVzZW50ZWRPYmplY3QuaWQ7CisgICAgICAg IH0pKTsKKyAgICB9LAorCiAgICAgLy8gUHJpdmF0ZQogCiAgICAgX2NyZWF0ZUNvbnRlbnRUcmVl czogZnVuY3Rpb24oKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvRE9NVHJlZUNvbnRlbnRWaWV3LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvRE9NVHJlZUNvbnRlbnRWaWV3LmpzCmluZGV4IDAwY2ZmN2EuLjZlZDdjMzYgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0RPTVRyZWVDb250 ZW50Vmlldy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9ET01U cmVlQ29udGVudFZpZXcuanMKQEAgLTIwOSw3ICsyMDksMTkgQEAgV2ViSW5zcGVjdG9yLkRPTVRy ZWVDb250ZW50Vmlldy5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICAgICAgdGhpcy5yZXZlYWxO ZXh0U2VhcmNoUmVzdWx0KCk7CiAgICAgICAgIH0KIAotICAgICAgICBET01BZ2VudC5wZXJmb3Jt U2VhcmNoKHF1ZXJ5LCBzZWFyY2hSZXN1bHRzUmVhZHkuYmluZCh0aGlzKSk7CisgICAgICAgIGZ1 bmN0aW9uIGNvbnRleHROb2Rlc1JlYWR5KG5vZGVJZHMpCisgICAgICAgIHsKKyAgICAgICAgICAg IERPTUFnZW50LnBlcmZvcm1TZWFyY2gocXVlcnksIG5vZGVJZHMsIHNlYXJjaFJlc3VsdHNSZWFk eS5iaW5kKHRoaXMpKTsKKyAgICAgICAgfQorCisgICAgICAgIHRoaXMuZ2V0U2VhcmNoQ29udGV4 dE5vZGVzKGNvbnRleHROb2Rlc1JlYWR5LmJpbmQodGhpcykpOworICAgIH0sCisKKyAgICBnZXRT ZWFyY2hDb250ZXh0Tm9kZXM6IGZ1bmN0aW9uKGNhbGxiYWNrKQorICAgIHsKKyAgICAgICAgLy8g T3ZlcndyaXRlIHRoaXMgdG8gbGltaXQgdGhlIHNlYXJjaCB0byBqdXN0IGEgc3VidHJlZS4KKyAg ICAgICAgLy8gUGFzc2luZyB1bmRlZmluZWQgd2lsbCBtYWtlIERPTUFnZW50LnBlcmZvcm1TZWFy Y2ggc2VhcmNoIHRocm91Z2ggYWxsIHRoZSBkb2N1bWVudHMuCisgICAgICAgIGNhbGxiYWNrKHVu ZGVmaW5lZCk7CiAgICAgfSwKIAogICAgIHNlYXJjaENsZWFyZWQ6IGZ1bmN0aW9uKCkKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0ZyYW1lRE9NVHJlZUNv bnRlbnRWaWV3LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvRnJhbWVE T01UcmVlQ29udGVudFZpZXcuanMKaW5kZXggNjUzODUwYy4uYTkyMWJlNyAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvRnJhbWVET01UcmVlQ29udGVudFZp ZXcuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvRnJhbWVET01U cmVlQ29udGVudFZpZXcuanMKQEAgLTUzLDYgKzUzLDEzIEBAIFdlYkluc3BlY3Rvci5GcmFtZURP TVRyZWVDb250ZW50Vmlldy5wcm90b3R5cGUgPSB7CiAgICAgICAgIFdlYkluc3BlY3Rvci5ET01U cmVlQ29udGVudFZpZXcucHJvdG90eXBlLmNsb3NlZC5jYWxsKHRoaXMpOwogICAgIH0sCiAKKyAg ICBnZXRTZWFyY2hDb250ZXh0Tm9kZXM6IGZ1bmN0aW9uKGNhbGxiYWNrKQorICAgIHsKKyAgICAg ICAgdGhpcy5fZG9tVHJlZS5yZXF1ZXN0Um9vdERPTU5vZGUoZnVuY3Rpb24ocm9vdERPTU5vZGUp IHsKKyAgICAgICAgICAgIGNhbGxiYWNrKFtyb290RE9NTm9kZS5pZF0pOworICAgICAgICB9KTsK KyAgICB9LAorCiAgICAgLy8gUHJpdmF0ZQogCiAgICAgX3Jvb3RET01Ob2RlQXZhaWxhYmxlOiBm dW5jdGlvbihyb290RE9NTm9kZSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL0luc3BlY3RvckJhY2tlbmRDb21tYW5kcy5qcyBiL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0luc3BlY3RvckJhY2tlbmRDb21tYW5kcy5qcwppbmRleCAy YTIwYTA4Li4xMTJlNTJlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9JbnNwZWN0b3JCYWNrZW5kQ29tbWFuZHMuanMKKysrIGIvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvSW5zcGVjdG9yQmFja2VuZENvbW1hbmRzLmpzCkBAIC0xNDgs NyArMTQ4LDcgQEAgSW5zcGVjdG9yQmFja2VuZC5yZWdpc3RlckNvbW1hbmQoIkRPTS5yZW1vdmVB dHRyaWJ1dGUiLCBbeyJuYW1lIjogIm5vZGVJZCIsICJ0eXAKIEluc3BlY3RvckJhY2tlbmQucmVn aXN0ZXJDb21tYW5kKCJET00uZ2V0RXZlbnRMaXN0ZW5lcnNGb3JOb2RlIiwgW3sibmFtZSI6ICJu b2RlSWQiLCAidHlwZSI6ICJudW1iZXIiLCAib3B0aW9uYWwiOiBmYWxzZX0sIHsibmFtZSI6ICJv YmplY3RHcm91cCIsICJ0eXBlIjogInN0cmluZyIsICJvcHRpb25hbCI6IHRydWV9XSwgWyJsaXN0 ZW5lcnMiXSk7CiBJbnNwZWN0b3JCYWNrZW5kLnJlZ2lzdGVyQ29tbWFuZCgiRE9NLmdldE91dGVy SFRNTCIsIFt7Im5hbWUiOiAibm9kZUlkIiwgInR5cGUiOiAibnVtYmVyIiwgIm9wdGlvbmFsIjog ZmFsc2V9XSwgWyJvdXRlckhUTUwiXSk7CiBJbnNwZWN0b3JCYWNrZW5kLnJlZ2lzdGVyQ29tbWFu ZCgiRE9NLnNldE91dGVySFRNTCIsIFt7Im5hbWUiOiAibm9kZUlkIiwgInR5cGUiOiAibnVtYmVy IiwgIm9wdGlvbmFsIjogZmFsc2V9LCB7Im5hbWUiOiAib3V0ZXJIVE1MIiwgInR5cGUiOiAic3Ry aW5nIiwgIm9wdGlvbmFsIjogZmFsc2V9XSwgW10pOwotSW5zcGVjdG9yQmFja2VuZC5yZWdpc3Rl ckNvbW1hbmQoIkRPTS5wZXJmb3JtU2VhcmNoIiwgW3sibmFtZSI6ICJxdWVyeSIsICJ0eXBlIjog InN0cmluZyIsICJvcHRpb25hbCI6IGZhbHNlfV0sIFsic2VhcmNoSWQiLCAicmVzdWx0Q291bnQi XSk7CitJbnNwZWN0b3JCYWNrZW5kLnJlZ2lzdGVyQ29tbWFuZCgiRE9NLnBlcmZvcm1TZWFyY2gi LCBbeyJuYW1lIjogInF1ZXJ5IiwgInR5cGUiOiAic3RyaW5nIiwgIm9wdGlvbmFsIjogZmFsc2V9 LCB7Im5hbWUiOiAibm9kZUlkcyIsICJ0eXBlIjogIm9iamVjdCIsICJvcHRpb25hbCI6IHRydWV9 XSwgWyJzZWFyY2hJZCIsICJyZXN1bHRDb3VudCJdKTsKIEluc3BlY3RvckJhY2tlbmQucmVnaXN0 ZXJDb21tYW5kKCJET00uZ2V0U2VhcmNoUmVzdWx0cyIsIFt7Im5hbWUiOiAic2VhcmNoSWQiLCAi dHlwZSI6ICJzdHJpbmciLCAib3B0aW9uYWwiOiBmYWxzZX0sIHsibmFtZSI6ICJmcm9tSW5kZXgi LCAidHlwZSI6ICJudW1iZXIiLCAib3B0aW9uYWwiOiBmYWxzZX0sIHsibmFtZSI6ICJ0b0luZGV4 IiwgInR5cGUiOiAibnVtYmVyIiwgIm9wdGlvbmFsIjogZmFsc2V9XSwgWyJub2RlSWRzIl0pOwog SW5zcGVjdG9yQmFja2VuZC5yZWdpc3RlckNvbW1hbmQoIkRPTS5kaXNjYXJkU2VhcmNoUmVzdWx0 cyIsIFt7Im5hbWUiOiAic2VhcmNoSWQiLCAidHlwZSI6ICJzdHJpbmciLCAib3B0aW9uYWwiOiBm YWxzZX1dLCBbXSk7CiBJbnNwZWN0b3JCYWNrZW5kLnJlZ2lzdGVyQ29tbWFuZCgiRE9NLnJlcXVl c3ROb2RlIiwgW3sibmFtZSI6ICJvYmplY3RJZCIsICJ0eXBlIjogInN0cmluZyIsICJvcHRpb25h bCI6IGZhbHNlfV0sIFsibm9kZUlkIl0pOwo=