58322 2011-04-12 08:18:37 -0700 Web Inspector: Web Page Performance auditing fails 2011-04-13 03:20:53 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 apavlov apavlov apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 384007 0 apavlov 2011-04-12 08:18:37 -0700 1. Navigate to cnn.com and open inspector 2. Go to Audits tab and click on Run What is the expected output? Auditing should finish and load the data What do you see instead? Auditing doesn't finish. If Web Page Performance is disabled, auditing is completed. Auditing on google.com and yahoo.com works fine though. Upstreaming Chromium issue http://code.google.com/p/chromium/issues/detail?id=78473 384026 1 89207 apavlov 2011-04-12 08:48:46 -0700 Created attachment 89207 [PATCH] Suggested fix 384144 2 89227 apavlov 2011-04-12 10:49:38 -0700 Created attachment 89227 [PATCH] DOMAgent.requestDocument() fixed (for pfeldman to have a look) 384742 3 89227 pfeldman 2011-04-13 02:00:58 -0700 Comment on attachment 89227 [PATCH] DOMAgent.requestDocument() fixed (for pfeldman to have a look) View in context: https://bugs.webkit.org/attachment.cgi?id=89227&action=review > Source/WebCore/inspector/front-end/AuditRules.js:362 > + WebInspector.domAgent.querySelector(document.id, selectors[i], queryCallback.bind(null, i === selectors.length - 1 ? selectorsCallback.bind(null, callback, styleSheets, testedSelectors) : null, selectors[i], styleSheets, testedSelectors)); You should requestDocument within DOMAgent.js::querySelector instead. I thought Andrey has fixed it already - he had a patch pending. Also I can't parse this string - you should extract variables for bound functions, etc. 384777 4 apavlov 2011-04-13 03:20:53 -0700 Committing to http://svn.webkit.org/repository/webkit/trunk ... M LayoutTests/ChangeLog M LayoutTests/inspector/audits/audits-panel-functional.html M Source/WebCore/ChangeLog M Source/WebCore/inspector/front-end/AuditRules.js Committed r83716 89207 2011-04-12 08:48:46 -0700 2011-04-12 10:52:36 -0700 [PATCH] Suggested fix fixaudits.patch text/plain 11153 apavlov Y29tbWl0IGRmYWZiMTJlZjBlZjUwNTMzYmEwYjgxNjNiNmU0NzA5NzA3MWZjZWQKQXV0aG9yOiBB bGV4YW5kZXIgUGF2bG92IDxhcGF2bG92QGNocm9taXVtLm9yZz4KRGF0ZTogICBUdWUgQXByIDEy IDE5OjQ1OjE3IDIwMTEgKzA0MDAKCiAgICBGaXgKCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9D aGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggMGFlYjczYS4uNWFjYTkyZSAx MDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5n ZUxvZwpAQCAtMSwzICsxLDEyIEBACisyMDExLTA0LTEyICBBbGV4YW5kZXIgUGF2bG92ICA8YXBh dmxvdkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogV2ViIFBhZ2UgUGVyZm9ybWFuY2UgYXVkaXRpbmcg ZmFpbHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTU4 MzIyCisKKyAgICAgICAgKiBpbnNwZWN0b3IvYXVkaXRzL2F1ZGl0cy1wYW5lbC1mdW5jdGlvbmFs Lmh0bWw6CisKIDIwMTEtMDQtMTEgIFBhdmVsIFBvZGl2aWxvdiAgPHBvZGl2aWxvdkBjaHJvbWl1 bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgUGF2ZWwgRmVsZG1hbi4KZGlmZiAtLWdpdCBh L0xheW91dFRlc3RzL2luc3BlY3Rvci9hdWRpdHMvYXVkaXRzLXBhbmVsLWZ1bmN0aW9uYWwuaHRt bCBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9hdWRpdHMvYXVkaXRzLXBhbmVsLWZ1bmN0aW9uYWwu aHRtbAppbmRleCA1MGRlYzJmLi5jNTA1ZDA2IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbnNw ZWN0b3IvYXVkaXRzL2F1ZGl0cy1wYW5lbC1mdW5jdGlvbmFsLmh0bWwKKysrIGIvTGF5b3V0VGVz dHMvaW5zcGVjdG9yL2F1ZGl0cy9hdWRpdHMtcGFuZWwtZnVuY3Rpb25hbC5odG1sCkBAIC02LDYg KzYsOSBAQAogICAgIGNvbG9yOiBncmVlbjsKIH0KIDwvc3R5bGU+Cis8c2NyaXB0PgorSlNPTiA9 IHt9OworPC9zY3JpcHQ+CiA8c2NyaXB0IHNyYz0iLi4vLi4vaHR0cC90ZXN0cy9pbnNwZWN0b3Iv aW5zcGVjdG9yLXRlc3QuanMiPjwvc2NyaXB0PgogPHNjcmlwdCBzcmM9ImF1ZGl0cy10ZXN0Lmpz Ij48L3NjcmlwdD4KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IDA2ZWEzZWYuLmU2ZWU3ZDAgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cK QEAgLTEsMyArMSwyMyBAQAorMjAxMS0wNC0xMiAgQWxleGFuZGVyIFBhdmxvdiAgPGFwYXZsb3ZA Y2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIFdlYiBJbnNwZWN0b3I6IFdlYiBQYWdlIFBlcmZvcm1hbmNlIGF1ZGl0aW5nIGZhaWxz CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01ODMyMgor CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9BdWRpdFJ1bGVzLmpzOgorICAgICAgICAo V2ViSW5zcGVjdG9yLkF1ZGl0UnVsZXMuVW51c2VkQ3NzUnVsZS5wcm90b3R5cGUuZG9SdW4uZXZh bENhbGxiYWNrKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5BdWRpdFJ1bGVzLlVudXNlZENzc1J1 bGUucHJvdG90eXBlLmRvUnVuLmV2YWxDYWxsYmFjay5kb2N1bWVudExvYWRlZCk6CisgICAgICAg IChXZWJJbnNwZWN0b3IuQXVkaXRSdWxlcy5JbWFnZURpbWVuc2lvbnNSdWxlLnByb3RvdHlwZS5k b1J1bik6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQXVkaXRSdWxlcy5Dc3NJbkhlYWRSdWxlLnBy b3RvdHlwZS5kb1J1bi5leHRlcm5hbFN0eWxlc2hlZXRzUmVjZWl2ZWQpOgorICAgICAgICAoV2Vi SW5zcGVjdG9yLkF1ZGl0UnVsZXMuQ3NzSW5IZWFkUnVsZS5wcm90b3R5cGUuZG9SdW4uaW5saW5l U3R5bGVzUmVjZWl2ZWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkF1ZGl0UnVsZXMuQ3NzSW5I ZWFkUnVsZS5wcm90b3R5cGUuZG9SdW4ub25Eb2N1bWVudEF2YWlsYWJsZSk6CisgICAgICAgIChX ZWJJbnNwZWN0b3IuQXVkaXRSdWxlcy5Dc3NJbkhlYWRSdWxlLnByb3RvdHlwZS5kb1J1bik6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuQXVkaXRSdWxlcy5TdHlsZXNTY3JpcHRzT3JkZXJSdWxlLnBy b3RvdHlwZS5kb1J1bi5jc3NCZWZvcmVJbmxpbmVSZWNlaXZlZCk6CisgICAgICAgIChXZWJJbnNw ZWN0b3IuQXVkaXRSdWxlcy5TdHlsZXNTY3JpcHRzT3JkZXJSdWxlLnByb3RvdHlwZS5kb1J1bi5s YXRlU3R5bGVzUmVjZWl2ZWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkF1ZGl0UnVsZXMuU3R5 bGVzU2NyaXB0c09yZGVyUnVsZS5wcm90b3R5cGUuZG9SdW4ub25Eb2N1bWVudEF2YWlsYWJsZSk6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuQXVkaXRSdWxlcy5TdHlsZXNTY3JpcHRzT3JkZXJSdWxl LnByb3RvdHlwZS5kb1J1bik6CisKIDIwMTEtMDQtMTIgIFNlcmdpbyBWaWxsYXIgU2VuaW4gIDxz dmlsbGFyQGlnYWxpYS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgTWFydGluIFJvYmluc29u LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9BdWRpdFJ1 bGVzLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9BdWRpdFJ1bGVzLmpz CmluZGV4IGZkMDNhYTEuLjE5YTJjMjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvQXVkaXRSdWxlcy5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL0F1ZGl0UnVsZXMuanMKQEAgLTYzLDE4ICs2Myw2IEBAIFdlYkluc3BlY3Rv ci5BdWRpdFJ1bGVzLmdldERvbWFpblRvUmVzb3VyY2VzTWFwID0gZnVuY3Rpb24ocmVzb3VyY2Vz LCB0eXBlcywgbmVlCiAgICAgcmV0dXJuIGRvbWFpblRvUmVzb3VyY2VzTWFwOwogfQogCi1XZWJJ bnNwZWN0b3IuQXVkaXRSdWxlcy5ldmFsdWF0ZUluVGFyZ2V0V2luZG93ID0gZnVuY3Rpb24oZnVu YywgYXJncywgY2FsbGJhY2spCi17Ci0gICAgZnVuY3Rpb24gbXljYWxsYmFjayhlcnJvciwgcmVz dWx0KQotICAgIHsKLSAgICAgICAgaWYgKCFlcnJvciAmJiByZXN1bHQpCi0gICAgICAgICAgICBj YWxsYmFjayhKU09OLnBhcnNlKHJlc3VsdC5kZXNjcmlwdGlvbikpOwotICAgICAgICBlbHNlCi0g ICAgICAgICAgICBjYWxsYmFjayhudWxsKTsKLSAgICB9Ci0gICAgUnVudGltZUFnZW50LmV2YWx1 YXRlKCJKU09OLnN0cmluZ2lmeSgoIiArIGZ1bmMgKyAiKSgiICsgSlNPTi5zdHJpbmdpZnkoYXJn cykgKyAiKSkiLCAiIiwgZmFsc2UsIG15Y2FsbGJhY2spOwotfQotCiBXZWJJbnNwZWN0b3IuQXVk aXRSdWxlcy5HemlwUnVsZSA9IGZ1bmN0aW9uKCkKIHsKICAgICBXZWJJbnNwZWN0b3IuQXVkaXRS dWxlLmNhbGwodGhpcywgIm5ldHdvcmstZ3ppcCIsICJFbmFibGUgZ3ppcCBjb21wcmVzc2lvbiIp OwpAQCAtMzYwLDIxICszNDgsMjEgQEAgV2ViSW5zcGVjdG9yLkF1ZGl0UnVsZXMuVW51c2VkQ3Nz UnVsZS5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICAgICAgY2FsbGJhY2socmVzdWx0KTsKICAg ICAgICAgICAgIH0KIAotICAgICAgICAgICAgZnVuY3Rpb24gcm91dGluZShzZWxlY3RvckFycmF5 KQorICAgICAgICAgICAgdmFyIGZvdW5kU2VsZWN0b3JzID0ge307CisgICAgICAgICAgICBmdW5j dGlvbiBxdWVyeUNhbGxiYWNrKGJvdW5kU2VsZWN0b3JzQ2FsbGJhY2ssIHNlbGVjdG9yLCBzdHls ZVNoZWV0cywgdGVzdGVkU2VsZWN0b3JzLCBub2RlSWQpCiAgICAgICAgICAgICB7Ci0gICAgICAg ICAgICAgICAgdmFyIHJlc3VsdCA9IHt9OwotICAgICAgICAgICAgICAgIGZvciAodmFyIGkgPSAw OyBpIDwgc2VsZWN0b3JBcnJheS5sZW5ndGg7ICsraSkgewotICAgICAgICAgICAgICAgICAgICB0 cnkgewotICAgICAgICAgICAgICAgICAgICAgICAgaWYgKGRvY3VtZW50LnF1ZXJ5U2VsZWN0b3Io c2VsZWN0b3JBcnJheVtpXSkpCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgcmVzdWx0W3Nl bGVjdG9yQXJyYXlbaV1dID0gdHJ1ZTsKLSAgICAgICAgICAgICAgICAgICAgfSBjYXRjaChlKSB7 Ci0gICAgICAgICAgICAgICAgICAgICAgICAvLyBJZ25vcmUgYW5kIG1hcmsgYXMgdW51c2VkLgot ICAgICAgICAgICAgICAgICAgICB9Ci0gICAgICAgICAgICAgICAgfQotICAgICAgICAgICAgICAg IHJldHVybiByZXN1bHQ7CisgICAgICAgICAgICAgICAgaWYgKG5vZGVJZCkKKyAgICAgICAgICAg ICAgICAgICAgZm91bmRTZWxlY3RvcnNbc2VsZWN0b3JdID0gdHJ1ZTsKKyAgICAgICAgICAgICAg ICBpZiAoYm91bmRTZWxlY3RvcnNDYWxsYmFjaykKKyAgICAgICAgICAgICAgICAgICAgYm91bmRT ZWxlY3RvcnNDYWxsYmFjayhmb3VuZFNlbGVjdG9ycyk7CisgICAgICAgICAgICB9CisKKyAgICAg ICAgICAgIGZ1bmN0aW9uIGRvY3VtZW50TG9hZGVkKHNlbGVjdG9ycywgZG9jdW1lbnQpIHsKKyAg ICAgICAgICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IHNlbGVjdG9ycy5sZW5ndGg7ICsraSkK KyAgICAgICAgICAgICAgICAgICAgV2ViSW5zcGVjdG9yLmRvbUFnZW50LnF1ZXJ5U2VsZWN0b3Io ZG9jdW1lbnQuaWQsIHNlbGVjdG9yc1tpXSwgcXVlcnlDYWxsYmFjay5iaW5kKG51bGwsIGkgPT09 IHNlbGVjdG9ycy5sZW5ndGggLSAxID8gc2VsZWN0b3JzQ2FsbGJhY2suYmluZChudWxsLCBjYWxs YmFjaywgc3R5bGVTaGVldHMsIHRlc3RlZFNlbGVjdG9ycykgOiBudWxsLCBzZWxlY3RvcnNbaV0s IHN0eWxlU2hlZXRzLCB0ZXN0ZWRTZWxlY3RvcnMpKTsKICAgICAgICAgICAgIH0KIAotICAgICAg ICAgICAgV2ViSW5zcGVjdG9yLkF1ZGl0UnVsZXMuZXZhbHVhdGVJblRhcmdldFdpbmRvdyhyb3V0 aW5lLCBbc2VsZWN0b3JzXSwgc2VsZWN0b3JzQ2FsbGJhY2suYmluZChudWxsLCBjYWxsYmFjaywg c3R5bGVTaGVldHMsIHRlc3RlZFNlbGVjdG9ycykpOworICAgICAgICAgICAgV2ViSW5zcGVjdG9y LmRvbUFnZW50LnJlcXVlc3REb2N1bWVudChkb2N1bWVudExvYWRlZC5iaW5kKG51bGwsIHNlbGVj dG9ycykpOwogICAgICAgICB9CiAKICAgICAgICAgZnVuY3Rpb24gc3R5bGVTaGVldENhbGxiYWNr KHN0eWxlU2hlZXRzLCBzb3VyY2VVUkwsIGNvbnRpbnVhdGlvbiwgc3R5bGVTaGVldCkKQEAgLTcz MCwxMiArNzE4LDEzIEBAIFdlYkluc3BlY3Rvci5BdWRpdFJ1bGVzLkltYWdlRGltZW5zaW9uc1J1 bGUucHJvdG90eXBlID0gewogICAgICAgICAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCBub2RlSWRz Lmxlbmd0aDsgKytpKQogICAgICAgICAgICAgICAgIFdlYkluc3BlY3Rvci5jc3NNb2RlbC5nZXRT dHlsZXNBc3luYyhub2RlSWRzW2ldLCBpbWFnZVN0eWxlc1JlYWR5LmJpbmQodGhpcywgbm9kZUlk c1tpXSwgaSA9PT0gbm9kZUlkcy5sZW5ndGggLSAxKSk7CiAgICAgICAgIH0KKwogICAgICAgICBm dW5jdGlvbiBvbkRvY3VtZW50QXZhaWxhYmxlKHJvb3QpCiAgICAgICAgIHsKICAgICAgICAgICAg IFdlYkluc3BlY3Rvci5kb21BZ2VudC5xdWVyeVNlbGVjdG9yQWxsKHJvb3QuaWQsICJpbWdbc3Jj XSIsIGdldFN0eWxlcyk7CiAgICAgICAgIH0KLSAgICAgICAgV2ViSW5zcGVjdG9yLmRvbUFnZW50 LnJlcXVlc3REb2N1bWVudChvbkRvY3VtZW50QXZhaWxhYmxlKTsKIAorICAgICAgICBXZWJJbnNw ZWN0b3IuZG9tQWdlbnQucmVxdWVzdERvY3VtZW50KG9uRG9jdW1lbnRBdmFpbGFibGUpOwogICAg IH0KIH0KIApAQCAtNzcyLDQ2ICs3NjEsMzUgQEAgV2ViSW5zcGVjdG9yLkF1ZGl0UnVsZXMuQ3Nz SW5IZWFkUnVsZS5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICBjYWxsYmFjayhyZXN1bHQpOwog ICAgICAgICB9CiAKLSAgICAgICAgZnVuY3Rpb24gcm91dGluZSgpCisgICAgICAgIGZ1bmN0aW9u IGV4dGVybmFsU3R5bGVzaGVldHNSZWNlaXZlZChyb290LCBpbmxpbmVTdHlsZU5vZGVJZHMsIG5v ZGVJZHMpCiAgICAgICAgIHsKLSAgICAgICAgICAgIGZ1bmN0aW9uIGFsbFZpZXdzKCkgewotICAg ICAgICAgICAgICAgIHZhciB2aWV3cyA9IFtkb2N1bWVudC5kZWZhdWx0Vmlld107Ci0gICAgICAg ICAgICAgICAgdmFyIGN1clZpZXcgPSAwOwotICAgICAgICAgICAgICAgIHdoaWxlIChjdXJWaWV3 IDwgdmlld3MubGVuZ3RoKSB7Ci0gICAgICAgICAgICAgICAgICAgIHZhciB2aWV3ID0gdmlld3Nb Y3VyVmlld107Ci0gICAgICAgICAgICAgICAgICAgIHZhciBmcmFtZXMgPSB2aWV3LmZyYW1lczsK LSAgICAgICAgICAgICAgICAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCBmcmFtZXMubGVuZ3RoOyAr K2kpIHsKLSAgICAgICAgICAgICAgICAgICAgICAgIGlmIChmcmFtZXNbaV0gIT09IHZpZXcpCi0g ICAgICAgICAgICAgICAgICAgICAgICAgICAgdmlld3MucHVzaChmcmFtZXNbaV0pOwotICAgICAg ICAgICAgICAgICAgICB9Ci0gICAgICAgICAgICAgICAgICAgICsrY3VyVmlldzsKKyAgICAgICAg ICAgIHZhciBleHRlcm5hbFN0eWxlc2hlZXROb2RlSWRzID0gbm9kZUlkczsKKyAgICAgICAgICAg IHZhciByZXN1bHQgPSBudWxsOworICAgICAgICAgICAgaWYgKGlubGluZVN0eWxlTm9kZUlkcy5s ZW5ndGggfHwgZXh0ZXJuYWxTdHlsZXNoZWV0Tm9kZUlkcy5sZW5ndGgpIHsKKyAgICAgICAgICAg ICAgICB2YXIgdXJsVG9WaW9sYXRpb25zQXJyYXkgPSB7fTsKKyAgICAgICAgICAgICAgICB2YXIg ZXh0ZXJuYWxTdHlsZXNoZWV0SHJlZnMgPSBbXTsKKyAgICAgICAgICAgICAgICBmb3IgKHZhciBq ID0gMDsgaiA8IGV4dGVybmFsU3R5bGVzaGVldE5vZGVJZHMubGVuZ3RoOyArK2opIHsKKyAgICAg ICAgICAgICAgICAgICAgdmFyIGxpbmtOb2RlID0gV2ViSW5zcGVjdG9yLmRvbUFnZW50Lm5vZGVG b3JJZChleHRlcm5hbFN0eWxlc2hlZXROb2RlSWRzW2pdKTsKKyAgICAgICAgICAgICAgICAgICAg dmFyIGNvbXBsZXRlSHJlZiA9IFdlYkluc3BlY3Rvci5jb21wbGV0ZVVSTChsaW5rTm9kZS5vd25l ckRvY3VtZW50LmRvY3VtZW50VVJMLCBsaW5rTm9kZS5nZXRBdHRyaWJ1dGUoImhyZWYiKSk7Cisg ICAgICAgICAgICAgICAgICAgIGV4dGVybmFsU3R5bGVzaGVldEhyZWZzLnB1c2goY29tcGxldGVI cmVmIHx8ICI8ZW1wdHk+Iik7CiAgICAgICAgICAgICAgICAgfQotICAgICAgICAgICAgICAgIHJl dHVybiB2aWV3czsKKyAgICAgICAgICAgICAgICB1cmxUb1Zpb2xhdGlvbnNBcnJheVtyb290LmRv Y3VtZW50VVJMXSA9IFtpbmxpbmVTdHlsZU5vZGVJZHMubGVuZ3RoLCBleHRlcm5hbFN0eWxlc2hl ZXRIcmVmc107CisgICAgICAgICAgICAgICAgcmVzdWx0ID0gdXJsVG9WaW9sYXRpb25zQXJyYXk7 CiAgICAgICAgICAgICB9CisgICAgICAgICAgICBldmFsQ2FsbGJhY2socmVzdWx0KTsKKyAgICAg ICAgfQogCi0gICAgICAgICAgICB2YXIgdmlld3MgPSBhbGxWaWV3cygpOwotICAgICAgICAgICAg dmFyIHVybFRvVmlvbGF0aW9uc0FycmF5ID0ge307Ci0gICAgICAgICAgICB2YXIgZm91bmQgPSBm YWxzZTsKLSAgICAgICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgdmlld3MubGVuZ3RoOyArK2kp IHsKLSAgICAgICAgICAgICAgICB2YXIgdmlldyA9IHZpZXdzW2ldOwotICAgICAgICAgICAgICAg IGlmICghdmlldy5kb2N1bWVudCkKLSAgICAgICAgICAgICAgICAgICAgY29udGludWU7Ci0KLSAg ICAgICAgICAgICAgICB2YXIgaW5saW5lU3R5bGVzID0gdmlldy5kb2N1bWVudC5xdWVyeVNlbGVj dG9yQWxsKCJib2R5IHN0eWxlIik7Ci0gICAgICAgICAgICAgICAgdmFyIGlubGluZVN0eWxlc2hl ZXRzID0gdmlldy5kb2N1bWVudC5xdWVyeVNlbGVjdG9yQWxsKCJib2R5IGxpbmtbcmVsfj0nc3R5 bGVzaGVldCddW2hyZWZdIik7Ci0gICAgICAgICAgICAgICAgaWYgKCFpbmxpbmVTdHlsZXMubGVu Z3RoICYmICFpbmxpbmVTdHlsZXNoZWV0cy5sZW5ndGgpCi0gICAgICAgICAgICAgICAgICAgIGNv bnRpbnVlOworICAgICAgICBmdW5jdGlvbiBpbmxpbmVTdHlsZXNSZWNlaXZlZChyb290LCBub2Rl SWRzKQorICAgICAgICB7CisgICAgICAgICAgICBXZWJJbnNwZWN0b3IuZG9tQWdlbnQucXVlcnlT ZWxlY3RvckFsbChyb290LmlkLCAiYm9keSBsaW5rW3JlbH49J3N0eWxlc2hlZXQnXVtocmVmXSIs IGV4dGVybmFsU3R5bGVzaGVldHNSZWNlaXZlZC5iaW5kKG51bGwsIHJvb3QsIG5vZGVJZHMpKTsK KyAgICAgICAgfQogCi0gICAgICAgICAgICAgICAgZm91bmQgPSB0cnVlOwotICAgICAgICAgICAg ICAgIHZhciBpbmxpbmVTdHlsZXNoZWV0SHJlZnMgPSBbXTsKLSAgICAgICAgICAgICAgICBmb3Ig KHZhciBqID0gMDsgaiA8IGlubGluZVN0eWxlc2hlZXRzLmxlbmd0aDsgKytqKQotICAgICAgICAg ICAgICAgICAgICBpbmxpbmVTdHlsZXNoZWV0SHJlZnMucHVzaChpbmxpbmVTdHlsZXNoZWV0c1tq XS5ocmVmKTsKLSAgICAgICAgICAgICAgICB1cmxUb1Zpb2xhdGlvbnNBcnJheVt2aWV3LmxvY2F0 aW9uLmhyZWZdID0gW2lubGluZVN0eWxlcy5sZW5ndGgsIGlubGluZVN0eWxlc2hlZXRIcmVmc107 Ci0gICAgICAgICAgICB9Ci0gICAgICAgICAgICByZXR1cm4gZm91bmQgPyB1cmxUb1Zpb2xhdGlv bnNBcnJheSA6IG51bGw7CisgICAgICAgIGZ1bmN0aW9uIG9uRG9jdW1lbnRBdmFpbGFibGUocm9v dCkKKyAgICAgICAgeworICAgICAgICAgICAgV2ViSW5zcGVjdG9yLmRvbUFnZW50LnF1ZXJ5U2Vs ZWN0b3JBbGwocm9vdC5pZCwgImJvZHkgc3R5bGUiLCBpbmxpbmVTdHlsZXNSZWNlaXZlZC5iaW5k KG51bGwsIHJvb3QpKTsKICAgICAgICAgfQogCi0gICAgICAgIFdlYkluc3BlY3Rvci5BdWRpdFJ1 bGVzLmV2YWx1YXRlSW5UYXJnZXRXaW5kb3cocm91dGluZSwgW10sIGV2YWxDYWxsYmFjayk7Cisg ICAgICAgIFdlYkluc3BlY3Rvci5kb21BZ2VudC5yZXF1ZXN0RG9jdW1lbnQob25Eb2N1bWVudEF2 YWlsYWJsZSk7CiAgICAgfQogfQogCkBAIC04NDUsMjAgKzgyMywzNCBAQCBXZWJJbnNwZWN0b3Iu QXVkaXRSdWxlcy5TdHlsZXNTY3JpcHRzT3JkZXJSdWxlLnByb3RvdHlwZSA9IHsKICAgICAgICAg ICAgIGNhbGxiYWNrKHJlc3VsdCk7CiAgICAgICAgIH0KIAotICAgICAgICBmdW5jdGlvbiByb3V0 aW5lKCkKKyAgICAgICAgZnVuY3Rpb24gY3NzQmVmb3JlSW5saW5lUmVjZWl2ZWQobGF0ZVN0eWxl SWRzLCBub2RlSWRzKQogICAgICAgICB7Ci0gICAgICAgICAgICB2YXIgbGF0ZVN0eWxlcyA9IGRv Y3VtZW50LnF1ZXJ5U2VsZWN0b3JBbGwoImhlYWQgc2NyaXB0W3NyY10gfiBsaW5rW3JlbH49J3N0 eWxlc2hlZXQnXVtocmVmXSIpOwotICAgICAgICAgICAgdmFyIGNzc0JlZm9yZUlubGluZUNvdW50 ID0gZG9jdW1lbnQucXVlcnlTZWxlY3RvckFsbCgiaGVhZCBsaW5rW3JlbH49J3N0eWxlc2hlZXQn XVtocmVmXSB+IHNjcmlwdDpub3QoW3NyY10pIikubGVuZ3RoOwotICAgICAgICAgICAgaWYgKCFs YXRlU3R5bGVzLmxlbmd0aCAmJiAhY3NzQmVmb3JlSW5saW5lQ291bnQpCi0gICAgICAgICAgICAg ICAgcmV0dXJuIG51bGw7Ci0KLSAgICAgICAgICAgIHZhciBsYXRlU3R5bGVVcmxzID0gW107Ci0g ICAgICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IGxhdGVTdHlsZXMubGVuZ3RoOyArK2kpCi0g ICAgICAgICAgICAgICAgbGF0ZVN0eWxlVXJscy5wdXNoKGxhdGVTdHlsZXNbaV0uaHJlZik7Ci0g ICAgICAgICAgICByZXR1cm4gWyBsYXRlU3R5bGVVcmxzLCBjc3NCZWZvcmVJbmxpbmVDb3VudCBd OworICAgICAgICAgICAgdmFyIGNzc0JlZm9yZUlubGluZUNvdW50ID0gbm9kZUlkcy5sZW5ndGg7 CisgICAgICAgICAgICB2YXIgcmVzdWx0ID0gbnVsbDsKKyAgICAgICAgICAgIGlmIChsYXRlU3R5 bGVJZHMubGVuZ3RoIHx8IGNzc0JlZm9yZUlubGluZUNvdW50KSB7CisgICAgICAgICAgICAgICAg dmFyIGxhdGVTdHlsZVVybHMgPSBbXTsKKyAgICAgICAgICAgICAgICBmb3IgKHZhciBpID0gMDsg aSA8IGxhdGVTdHlsZUlkcy5sZW5ndGg7ICsraSkgeworICAgICAgICAgICAgICAgICAgICB2YXIg bGF0ZVN0eWxlTm9kZSA9IFdlYkluc3BlY3Rvci5kb21BZ2VudC5ub2RlRm9ySWQobGF0ZVN0eWxl SWRzW2ldKTsKKyAgICAgICAgICAgICAgICAgICAgdmFyIGNvbXBsZXRlSHJlZiA9IFdlYkluc3Bl Y3Rvci5jb21wbGV0ZVVSTChsYXRlU3R5bGVOb2RlLm93bmVyRG9jdW1lbnQuZG9jdW1lbnRVUkws IGxhdGVTdHlsZU5vZGUuZ2V0QXR0cmlidXRlKCJocmVmIikpOworICAgICAgICAgICAgICAgICAg ICBsYXRlU3R5bGVVcmxzLnB1c2goY29tcGxldGVIcmVmIHx8ICI8ZW1wdHk+Iik7CisgICAgICAg ICAgICAgICAgfQorICAgICAgICAgICAgICAgIHJlc3VsdCA9IFsgbGF0ZVN0eWxlVXJscywgY3Nz QmVmb3JlSW5saW5lQ291bnQgXTsKKyAgICAgICAgICAgIH0KKworICAgICAgICAgICAgZXZhbENh bGxiYWNrKHJlc3VsdCk7CiAgICAgICAgIH0KIAotICAgICAgICBXZWJJbnNwZWN0b3IuQXVkaXRS dWxlcy5ldmFsdWF0ZUluVGFyZ2V0V2luZG93KHJvdXRpbmUsIFtdLCBldmFsQ2FsbGJhY2suYmlu ZCh0aGlzKSk7CisgICAgICAgIGZ1bmN0aW9uIGxhdGVTdHlsZXNSZWNlaXZlZChyb290LCBub2Rl SWRzKQorICAgICAgICB7CisgICAgICAgICAgICBXZWJJbnNwZWN0b3IuZG9tQWdlbnQucXVlcnlT ZWxlY3RvckFsbChyb290LmlkLCAiaGVhZCBsaW5rW3JlbH49J3N0eWxlc2hlZXQnXVtocmVmXSB+ IHNjcmlwdDpub3QoW3NyY10pIiwgY3NzQmVmb3JlSW5saW5lUmVjZWl2ZWQuYmluZChudWxsLCBu b2RlSWRzKSk7CisgICAgICAgIH0KKworICAgICAgICBmdW5jdGlvbiBvbkRvY3VtZW50QXZhaWxh YmxlKHJvb3QpCisgICAgICAgIHsKKyAgICAgICAgICAgIFdlYkluc3BlY3Rvci5kb21BZ2VudC5x dWVyeVNlbGVjdG9yQWxsKHJvb3QuaWQsICJoZWFkIHNjcmlwdFtzcmNdIH4gbGlua1tyZWx+PSdz dHlsZXNoZWV0J11baHJlZl0iLCBsYXRlU3R5bGVzUmVjZWl2ZWQuYmluZChudWxsLCByb290KSk7 CisgICAgICAgIH0KKworICAgICAgICBXZWJJbnNwZWN0b3IuZG9tQWdlbnQucmVxdWVzdERvY3Vt ZW50KG9uRG9jdW1lbnRBdmFpbGFibGUpOwogICAgIH0KIH0KIAo= 89227 2011-04-12 10:49:38 -0700 2011-04-13 02:04:13 -0700 [PATCH] DOMAgent.requestDocument() fixed (for pfeldman to have a look) fixaudits.patch text/plain 12515 apavlov Y29tbWl0IGZkY2FiODM0MzRkYjQzNDE1M2RkMzRiMzQ4ODZlOTRjOTg2ZWY2NTQKQXV0aG9yOiBB bGV4YW5kZXIgUGF2bG92IDxhcGF2bG92QGNocm9taXVtLm9yZz4KRGF0ZTogICBUdWUgQXByIDEy IDE5OjQ1OjE3IDIwMTEgKzA0MDAKCiAgICBGaXgKCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9D aGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggMGFlYjczYS4uNWFjYTkyZSAx MDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5n ZUxvZwpAQCAtMSwzICsxLDEyIEBACisyMDExLTA0LTEyICBBbGV4YW5kZXIgUGF2bG92ICA8YXBh dmxvdkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogV2ViIFBhZ2UgUGVyZm9ybWFuY2UgYXVkaXRpbmcg ZmFpbHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTU4 MzIyCisKKyAgICAgICAgKiBpbnNwZWN0b3IvYXVkaXRzL2F1ZGl0cy1wYW5lbC1mdW5jdGlvbmFs Lmh0bWw6CisKIDIwMTEtMDQtMTEgIFBhdmVsIFBvZGl2aWxvdiAgPHBvZGl2aWxvdkBjaHJvbWl1 bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgUGF2ZWwgRmVsZG1hbi4KZGlmZiAtLWdpdCBh L0xheW91dFRlc3RzL2luc3BlY3Rvci9hdWRpdHMvYXVkaXRzLXBhbmVsLWZ1bmN0aW9uYWwuaHRt bCBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9hdWRpdHMvYXVkaXRzLXBhbmVsLWZ1bmN0aW9uYWwu aHRtbAppbmRleCA1MGRlYzJmLi5jNTA1ZDA2IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbnNw ZWN0b3IvYXVkaXRzL2F1ZGl0cy1wYW5lbC1mdW5jdGlvbmFsLmh0bWwKKysrIGIvTGF5b3V0VGVz dHMvaW5zcGVjdG9yL2F1ZGl0cy9hdWRpdHMtcGFuZWwtZnVuY3Rpb25hbC5odG1sCkBAIC02LDYg KzYsOSBAQAogICAgIGNvbG9yOiBncmVlbjsKIH0KIDwvc3R5bGU+Cis8c2NyaXB0PgorSlNPTiA9 IHt9OworPC9zY3JpcHQ+CiA8c2NyaXB0IHNyYz0iLi4vLi4vaHR0cC90ZXN0cy9pbnNwZWN0b3Iv aW5zcGVjdG9yLXRlc3QuanMiPjwvc2NyaXB0PgogPHNjcmlwdCBzcmM9ImF1ZGl0cy10ZXN0Lmpz Ij48L3NjcmlwdD4KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IDA2ZWEzZWYuLmFiY2RkYjMgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cK QEAgLTEsMyArMSwyNiBAQAorMjAxMS0wNC0xMiAgQWxleGFuZGVyIFBhdmxvdiAgPGFwYXZsb3ZA Y2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIFdlYiBJbnNwZWN0b3I6IFdlYiBQYWdlIFBlcmZvcm1hbmNlIGF1ZGl0aW5nIGZhaWxz CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01ODMyMgor CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9BdWRpdFJ1bGVzLmpzOgorICAgICAgICAo V2ViSW5zcGVjdG9yLkF1ZGl0UnVsZXMuVW51c2VkQ3NzUnVsZS5wcm90b3R5cGUuZG9SdW4uZXZh bENhbGxiYWNrKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5BdWRpdFJ1bGVzLlVudXNlZENzc1J1 bGUucHJvdG90eXBlLmRvUnVuLmV2YWxDYWxsYmFjay5kb2N1bWVudExvYWRlZCk6CisgICAgICAg IChXZWJJbnNwZWN0b3IuQXVkaXRSdWxlcy5JbWFnZURpbWVuc2lvbnNSdWxlLnByb3RvdHlwZS5k b1J1bik6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQXVkaXRSdWxlcy5Dc3NJbkhlYWRSdWxlLnBy b3RvdHlwZS5kb1J1bi5leHRlcm5hbFN0eWxlc2hlZXRzUmVjZWl2ZWQpOgorICAgICAgICAoV2Vi SW5zcGVjdG9yLkF1ZGl0UnVsZXMuQ3NzSW5IZWFkUnVsZS5wcm90b3R5cGUuZG9SdW4uaW5saW5l U3R5bGVzUmVjZWl2ZWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkF1ZGl0UnVsZXMuQ3NzSW5I ZWFkUnVsZS5wcm90b3R5cGUuZG9SdW4ub25Eb2N1bWVudEF2YWlsYWJsZSk6CisgICAgICAgIChX ZWJJbnNwZWN0b3IuQXVkaXRSdWxlcy5Dc3NJbkhlYWRSdWxlLnByb3RvdHlwZS5kb1J1bik6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuQXVkaXRSdWxlcy5TdHlsZXNTY3JpcHRzT3JkZXJSdWxlLnBy b3RvdHlwZS5kb1J1bi5jc3NCZWZvcmVJbmxpbmVSZWNlaXZlZCk6CisgICAgICAgIChXZWJJbnNw ZWN0b3IuQXVkaXRSdWxlcy5TdHlsZXNTY3JpcHRzT3JkZXJSdWxlLnByb3RvdHlwZS5kb1J1bi5s YXRlU3R5bGVzUmVjZWl2ZWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkF1ZGl0UnVsZXMuU3R5 bGVzU2NyaXB0c09yZGVyUnVsZS5wcm90b3R5cGUuZG9SdW4ub25Eb2N1bWVudEF2YWlsYWJsZSk6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuQXVkaXRSdWxlcy5TdHlsZXNTY3JpcHRzT3JkZXJSdWxl LnByb3RvdHlwZS5kb1J1bik6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9ET01BZ2Vu dC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5ET01BZ2VudC5wcm90b3R5cGUucmVxdWVzdERv Y3VtZW50Lm9uRG9jdW1lbnRBdmFpbGFibGUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRPTUFn ZW50LnByb3RvdHlwZS5yZXF1ZXN0RG9jdW1lbnQpOgorCiAyMDExLTA0LTEyICBTZXJnaW8gVmls bGFyIFNlbmluICA8c3ZpbGxhckBpZ2FsaWEuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IE1h cnRpbiBSb2JpbnNvbi4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvQXVkaXRSdWxlcy5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv QXVkaXRSdWxlcy5qcwppbmRleCBmZDAzYWExLi4xOWEyYzI0IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0F1ZGl0UnVsZXMuanMKKysrIGIvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9BdWRpdFJ1bGVzLmpzCkBAIC02MywxOCArNjMsNiBA QCBXZWJJbnNwZWN0b3IuQXVkaXRSdWxlcy5nZXREb21haW5Ub1Jlc291cmNlc01hcCA9IGZ1bmN0 aW9uKHJlc291cmNlcywgdHlwZXMsIG5lZQogICAgIHJldHVybiBkb21haW5Ub1Jlc291cmNlc01h cDsKIH0KIAotV2ViSW5zcGVjdG9yLkF1ZGl0UnVsZXMuZXZhbHVhdGVJblRhcmdldFdpbmRvdyA9 IGZ1bmN0aW9uKGZ1bmMsIGFyZ3MsIGNhbGxiYWNrKQotewotICAgIGZ1bmN0aW9uIG15Y2FsbGJh Y2soZXJyb3IsIHJlc3VsdCkKLSAgICB7Ci0gICAgICAgIGlmICghZXJyb3IgJiYgcmVzdWx0KQot ICAgICAgICAgICAgY2FsbGJhY2soSlNPTi5wYXJzZShyZXN1bHQuZGVzY3JpcHRpb24pKTsKLSAg ICAgICAgZWxzZQotICAgICAgICAgICAgY2FsbGJhY2sobnVsbCk7Ci0gICAgfQotICAgIFJ1bnRp bWVBZ2VudC5ldmFsdWF0ZSgiSlNPTi5zdHJpbmdpZnkoKCIgKyBmdW5jICsgIikoIiArIEpTT04u c3RyaW5naWZ5KGFyZ3MpICsgIikpIiwgIiIsIGZhbHNlLCBteWNhbGxiYWNrKTsKLX0KLQogV2Vi SW5zcGVjdG9yLkF1ZGl0UnVsZXMuR3ppcFJ1bGUgPSBmdW5jdGlvbigpCiB7CiAgICAgV2ViSW5z cGVjdG9yLkF1ZGl0UnVsZS5jYWxsKHRoaXMsICJuZXR3b3JrLWd6aXAiLCAiRW5hYmxlIGd6aXAg Y29tcHJlc3Npb24iKTsKQEAgLTM2MCwyMSArMzQ4LDIxIEBAIFdlYkluc3BlY3Rvci5BdWRpdFJ1 bGVzLlVudXNlZENzc1J1bGUucHJvdG90eXBlID0gewogICAgICAgICAgICAgICAgIGNhbGxiYWNr KHJlc3VsdCk7CiAgICAgICAgICAgICB9CiAKLSAgICAgICAgICAgIGZ1bmN0aW9uIHJvdXRpbmUo c2VsZWN0b3JBcnJheSkKKyAgICAgICAgICAgIHZhciBmb3VuZFNlbGVjdG9ycyA9IHt9OworICAg ICAgICAgICAgZnVuY3Rpb24gcXVlcnlDYWxsYmFjayhib3VuZFNlbGVjdG9yc0NhbGxiYWNrLCBz ZWxlY3Rvciwgc3R5bGVTaGVldHMsIHRlc3RlZFNlbGVjdG9ycywgbm9kZUlkKQogICAgICAgICAg ICAgewotICAgICAgICAgICAgICAgIHZhciByZXN1bHQgPSB7fTsKLSAgICAgICAgICAgICAgICBm b3IgKHZhciBpID0gMDsgaSA8IHNlbGVjdG9yQXJyYXkubGVuZ3RoOyArK2kpIHsKLSAgICAgICAg ICAgICAgICAgICAgdHJ5IHsKLSAgICAgICAgICAgICAgICAgICAgICAgIGlmIChkb2N1bWVudC5x dWVyeVNlbGVjdG9yKHNlbGVjdG9yQXJyYXlbaV0pKQotICAgICAgICAgICAgICAgICAgICAgICAg ICAgIHJlc3VsdFtzZWxlY3RvckFycmF5W2ldXSA9IHRydWU7Ci0gICAgICAgICAgICAgICAgICAg IH0gY2F0Y2goZSkgewotICAgICAgICAgICAgICAgICAgICAgICAgLy8gSWdub3JlIGFuZCBtYXJr IGFzIHVudXNlZC4KLSAgICAgICAgICAgICAgICAgICAgfQotICAgICAgICAgICAgICAgIH0KLSAg ICAgICAgICAgICAgICByZXR1cm4gcmVzdWx0OworICAgICAgICAgICAgICAgIGlmIChub2RlSWQp CisgICAgICAgICAgICAgICAgICAgIGZvdW5kU2VsZWN0b3JzW3NlbGVjdG9yXSA9IHRydWU7Cisg ICAgICAgICAgICAgICAgaWYgKGJvdW5kU2VsZWN0b3JzQ2FsbGJhY2spCisgICAgICAgICAgICAg ICAgICAgIGJvdW5kU2VsZWN0b3JzQ2FsbGJhY2soZm91bmRTZWxlY3RvcnMpOworICAgICAgICAg ICAgfQorCisgICAgICAgICAgICBmdW5jdGlvbiBkb2N1bWVudExvYWRlZChzZWxlY3RvcnMsIGRv Y3VtZW50KSB7CisgICAgICAgICAgICAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCBzZWxlY3RvcnMu bGVuZ3RoOyArK2kpCisgICAgICAgICAgICAgICAgICAgIFdlYkluc3BlY3Rvci5kb21BZ2VudC5x dWVyeVNlbGVjdG9yKGRvY3VtZW50LmlkLCBzZWxlY3RvcnNbaV0sIHF1ZXJ5Q2FsbGJhY2suYmlu ZChudWxsLCBpID09PSBzZWxlY3RvcnMubGVuZ3RoIC0gMSA/IHNlbGVjdG9yc0NhbGxiYWNrLmJp bmQobnVsbCwgY2FsbGJhY2ssIHN0eWxlU2hlZXRzLCB0ZXN0ZWRTZWxlY3RvcnMpIDogbnVsbCwg c2VsZWN0b3JzW2ldLCBzdHlsZVNoZWV0cywgdGVzdGVkU2VsZWN0b3JzKSk7CiAgICAgICAgICAg ICB9CiAKLSAgICAgICAgICAgIFdlYkluc3BlY3Rvci5BdWRpdFJ1bGVzLmV2YWx1YXRlSW5UYXJn ZXRXaW5kb3cocm91dGluZSwgW3NlbGVjdG9yc10sIHNlbGVjdG9yc0NhbGxiYWNrLmJpbmQobnVs bCwgY2FsbGJhY2ssIHN0eWxlU2hlZXRzLCB0ZXN0ZWRTZWxlY3RvcnMpKTsKKyAgICAgICAgICAg IFdlYkluc3BlY3Rvci5kb21BZ2VudC5yZXF1ZXN0RG9jdW1lbnQoZG9jdW1lbnRMb2FkZWQuYmlu ZChudWxsLCBzZWxlY3RvcnMpKTsKICAgICAgICAgfQogCiAgICAgICAgIGZ1bmN0aW9uIHN0eWxl U2hlZXRDYWxsYmFjayhzdHlsZVNoZWV0cywgc291cmNlVVJMLCBjb250aW51YXRpb24sIHN0eWxl U2hlZXQpCkBAIC03MzAsMTIgKzcxOCwxMyBAQCBXZWJJbnNwZWN0b3IuQXVkaXRSdWxlcy5JbWFn ZURpbWVuc2lvbnNSdWxlLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIGZvciAodmFyIGkgPSAw OyBpIDwgbm9kZUlkcy5sZW5ndGg7ICsraSkKICAgICAgICAgICAgICAgICBXZWJJbnNwZWN0b3Iu Y3NzTW9kZWwuZ2V0U3R5bGVzQXN5bmMobm9kZUlkc1tpXSwgaW1hZ2VTdHlsZXNSZWFkeS5iaW5k KHRoaXMsIG5vZGVJZHNbaV0sIGkgPT09IG5vZGVJZHMubGVuZ3RoIC0gMSkpOwogICAgICAgICB9 CisKICAgICAgICAgZnVuY3Rpb24gb25Eb2N1bWVudEF2YWlsYWJsZShyb290KQogICAgICAgICB7 CiAgICAgICAgICAgICBXZWJJbnNwZWN0b3IuZG9tQWdlbnQucXVlcnlTZWxlY3RvckFsbChyb290 LmlkLCAiaW1nW3NyY10iLCBnZXRTdHlsZXMpOwogICAgICAgICB9Ci0gICAgICAgIFdlYkluc3Bl Y3Rvci5kb21BZ2VudC5yZXF1ZXN0RG9jdW1lbnQob25Eb2N1bWVudEF2YWlsYWJsZSk7CiAKKyAg ICAgICAgV2ViSW5zcGVjdG9yLmRvbUFnZW50LnJlcXVlc3REb2N1bWVudChvbkRvY3VtZW50QXZh aWxhYmxlKTsKICAgICB9CiB9CiAKQEAgLTc3Miw0NiArNzYxLDM1IEBAIFdlYkluc3BlY3Rvci5B dWRpdFJ1bGVzLkNzc0luSGVhZFJ1bGUucHJvdG90eXBlID0gewogICAgICAgICAgICAgY2FsbGJh Y2socmVzdWx0KTsKICAgICAgICAgfQogCi0gICAgICAgIGZ1bmN0aW9uIHJvdXRpbmUoKQorICAg ICAgICBmdW5jdGlvbiBleHRlcm5hbFN0eWxlc2hlZXRzUmVjZWl2ZWQocm9vdCwgaW5saW5lU3R5 bGVOb2RlSWRzLCBub2RlSWRzKQogICAgICAgICB7Ci0gICAgICAgICAgICBmdW5jdGlvbiBhbGxW aWV3cygpIHsKLSAgICAgICAgICAgICAgICB2YXIgdmlld3MgPSBbZG9jdW1lbnQuZGVmYXVsdFZp ZXddOwotICAgICAgICAgICAgICAgIHZhciBjdXJWaWV3ID0gMDsKLSAgICAgICAgICAgICAgICB3 aGlsZSAoY3VyVmlldyA8IHZpZXdzLmxlbmd0aCkgewotICAgICAgICAgICAgICAgICAgICB2YXIg dmlldyA9IHZpZXdzW2N1clZpZXddOwotICAgICAgICAgICAgICAgICAgICB2YXIgZnJhbWVzID0g dmlldy5mcmFtZXM7Ci0gICAgICAgICAgICAgICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgZnJh bWVzLmxlbmd0aDsgKytpKSB7Ci0gICAgICAgICAgICAgICAgICAgICAgICBpZiAoZnJhbWVzW2ld ICE9PSB2aWV3KQotICAgICAgICAgICAgICAgICAgICAgICAgICAgIHZpZXdzLnB1c2goZnJhbWVz W2ldKTsKLSAgICAgICAgICAgICAgICAgICAgfQotICAgICAgICAgICAgICAgICAgICArK2N1clZp ZXc7CisgICAgICAgICAgICB2YXIgZXh0ZXJuYWxTdHlsZXNoZWV0Tm9kZUlkcyA9IG5vZGVJZHM7 CisgICAgICAgICAgICB2YXIgcmVzdWx0ID0gbnVsbDsKKyAgICAgICAgICAgIGlmIChpbmxpbmVT dHlsZU5vZGVJZHMubGVuZ3RoIHx8IGV4dGVybmFsU3R5bGVzaGVldE5vZGVJZHMubGVuZ3RoKSB7 CisgICAgICAgICAgICAgICAgdmFyIHVybFRvVmlvbGF0aW9uc0FycmF5ID0ge307CisgICAgICAg ICAgICAgICAgdmFyIGV4dGVybmFsU3R5bGVzaGVldEhyZWZzID0gW107CisgICAgICAgICAgICAg ICAgZm9yICh2YXIgaiA9IDA7IGogPCBleHRlcm5hbFN0eWxlc2hlZXROb2RlSWRzLmxlbmd0aDsg KytqKSB7CisgICAgICAgICAgICAgICAgICAgIHZhciBsaW5rTm9kZSA9IFdlYkluc3BlY3Rvci5k b21BZ2VudC5ub2RlRm9ySWQoZXh0ZXJuYWxTdHlsZXNoZWV0Tm9kZUlkc1tqXSk7CisgICAgICAg ICAgICAgICAgICAgIHZhciBjb21wbGV0ZUhyZWYgPSBXZWJJbnNwZWN0b3IuY29tcGxldGVVUkwo bGlua05vZGUub3duZXJEb2N1bWVudC5kb2N1bWVudFVSTCwgbGlua05vZGUuZ2V0QXR0cmlidXRl KCJocmVmIikpOworICAgICAgICAgICAgICAgICAgICBleHRlcm5hbFN0eWxlc2hlZXRIcmVmcy5w dXNoKGNvbXBsZXRlSHJlZiB8fCAiPGVtcHR5PiIpOwogICAgICAgICAgICAgICAgIH0KLSAgICAg ICAgICAgICAgICByZXR1cm4gdmlld3M7CisgICAgICAgICAgICAgICAgdXJsVG9WaW9sYXRpb25z QXJyYXlbcm9vdC5kb2N1bWVudFVSTF0gPSBbaW5saW5lU3R5bGVOb2RlSWRzLmxlbmd0aCwgZXh0 ZXJuYWxTdHlsZXNoZWV0SHJlZnNdOworICAgICAgICAgICAgICAgIHJlc3VsdCA9IHVybFRvVmlv bGF0aW9uc0FycmF5OwogICAgICAgICAgICAgfQorICAgICAgICAgICAgZXZhbENhbGxiYWNrKHJl c3VsdCk7CisgICAgICAgIH0KIAotICAgICAgICAgICAgdmFyIHZpZXdzID0gYWxsVmlld3MoKTsK LSAgICAgICAgICAgIHZhciB1cmxUb1Zpb2xhdGlvbnNBcnJheSA9IHt9OwotICAgICAgICAgICAg dmFyIGZvdW5kID0gZmFsc2U7Ci0gICAgICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IHZpZXdz Lmxlbmd0aDsgKytpKSB7Ci0gICAgICAgICAgICAgICAgdmFyIHZpZXcgPSB2aWV3c1tpXTsKLSAg ICAgICAgICAgICAgICBpZiAoIXZpZXcuZG9jdW1lbnQpCi0gICAgICAgICAgICAgICAgICAgIGNv bnRpbnVlOwotCi0gICAgICAgICAgICAgICAgdmFyIGlubGluZVN0eWxlcyA9IHZpZXcuZG9jdW1l bnQucXVlcnlTZWxlY3RvckFsbCgiYm9keSBzdHlsZSIpOwotICAgICAgICAgICAgICAgIHZhciBp bmxpbmVTdHlsZXNoZWV0cyA9IHZpZXcuZG9jdW1lbnQucXVlcnlTZWxlY3RvckFsbCgiYm9keSBs aW5rW3JlbH49J3N0eWxlc2hlZXQnXVtocmVmXSIpOwotICAgICAgICAgICAgICAgIGlmICghaW5s aW5lU3R5bGVzLmxlbmd0aCAmJiAhaW5saW5lU3R5bGVzaGVldHMubGVuZ3RoKQotICAgICAgICAg ICAgICAgICAgICBjb250aW51ZTsKKyAgICAgICAgZnVuY3Rpb24gaW5saW5lU3R5bGVzUmVjZWl2 ZWQocm9vdCwgbm9kZUlkcykKKyAgICAgICAgeworICAgICAgICAgICAgV2ViSW5zcGVjdG9yLmRv bUFnZW50LnF1ZXJ5U2VsZWN0b3JBbGwocm9vdC5pZCwgImJvZHkgbGlua1tyZWx+PSdzdHlsZXNo ZWV0J11baHJlZl0iLCBleHRlcm5hbFN0eWxlc2hlZXRzUmVjZWl2ZWQuYmluZChudWxsLCByb290 LCBub2RlSWRzKSk7CisgICAgICAgIH0KIAotICAgICAgICAgICAgICAgIGZvdW5kID0gdHJ1ZTsK LSAgICAgICAgICAgICAgICB2YXIgaW5saW5lU3R5bGVzaGVldEhyZWZzID0gW107Ci0gICAgICAg ICAgICAgICAgZm9yICh2YXIgaiA9IDA7IGogPCBpbmxpbmVTdHlsZXNoZWV0cy5sZW5ndGg7ICsr aikKLSAgICAgICAgICAgICAgICAgICAgaW5saW5lU3R5bGVzaGVldEhyZWZzLnB1c2goaW5saW5l U3R5bGVzaGVldHNbal0uaHJlZik7Ci0gICAgICAgICAgICAgICAgdXJsVG9WaW9sYXRpb25zQXJy YXlbdmlldy5sb2NhdGlvbi5ocmVmXSA9IFtpbmxpbmVTdHlsZXMubGVuZ3RoLCBpbmxpbmVTdHls ZXNoZWV0SHJlZnNdOwotICAgICAgICAgICAgfQotICAgICAgICAgICAgcmV0dXJuIGZvdW5kID8g dXJsVG9WaW9sYXRpb25zQXJyYXkgOiBudWxsOworICAgICAgICBmdW5jdGlvbiBvbkRvY3VtZW50 QXZhaWxhYmxlKHJvb3QpCisgICAgICAgIHsKKyAgICAgICAgICAgIFdlYkluc3BlY3Rvci5kb21B Z2VudC5xdWVyeVNlbGVjdG9yQWxsKHJvb3QuaWQsICJib2R5IHN0eWxlIiwgaW5saW5lU3R5bGVz UmVjZWl2ZWQuYmluZChudWxsLCByb290KSk7CiAgICAgICAgIH0KIAotICAgICAgICBXZWJJbnNw ZWN0b3IuQXVkaXRSdWxlcy5ldmFsdWF0ZUluVGFyZ2V0V2luZG93KHJvdXRpbmUsIFtdLCBldmFs Q2FsbGJhY2spOworICAgICAgICBXZWJJbnNwZWN0b3IuZG9tQWdlbnQucmVxdWVzdERvY3VtZW50 KG9uRG9jdW1lbnRBdmFpbGFibGUpOwogICAgIH0KIH0KIApAQCAtODQ1LDIwICs4MjMsMzQgQEAg V2ViSW5zcGVjdG9yLkF1ZGl0UnVsZXMuU3R5bGVzU2NyaXB0c09yZGVyUnVsZS5wcm90b3R5cGUg PSB7CiAgICAgICAgICAgICBjYWxsYmFjayhyZXN1bHQpOwogICAgICAgICB9CiAKLSAgICAgICAg ZnVuY3Rpb24gcm91dGluZSgpCisgICAgICAgIGZ1bmN0aW9uIGNzc0JlZm9yZUlubGluZVJlY2Vp dmVkKGxhdGVTdHlsZUlkcywgbm9kZUlkcykKICAgICAgICAgewotICAgICAgICAgICAgdmFyIGxh dGVTdHlsZXMgPSBkb2N1bWVudC5xdWVyeVNlbGVjdG9yQWxsKCJoZWFkIHNjcmlwdFtzcmNdIH4g bGlua1tyZWx+PSdzdHlsZXNoZWV0J11baHJlZl0iKTsKLSAgICAgICAgICAgIHZhciBjc3NCZWZv cmVJbmxpbmVDb3VudCA9IGRvY3VtZW50LnF1ZXJ5U2VsZWN0b3JBbGwoImhlYWQgbGlua1tyZWx+ PSdzdHlsZXNoZWV0J11baHJlZl0gfiBzY3JpcHQ6bm90KFtzcmNdKSIpLmxlbmd0aDsKLSAgICAg ICAgICAgIGlmICghbGF0ZVN0eWxlcy5sZW5ndGggJiYgIWNzc0JlZm9yZUlubGluZUNvdW50KQot ICAgICAgICAgICAgICAgIHJldHVybiBudWxsOwotCi0gICAgICAgICAgICB2YXIgbGF0ZVN0eWxl VXJscyA9IFtdOwotICAgICAgICAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCBsYXRlU3R5bGVzLmxl bmd0aDsgKytpKQotICAgICAgICAgICAgICAgIGxhdGVTdHlsZVVybHMucHVzaChsYXRlU3R5bGVz W2ldLmhyZWYpOwotICAgICAgICAgICAgcmV0dXJuIFsgbGF0ZVN0eWxlVXJscywgY3NzQmVmb3Jl SW5saW5lQ291bnQgXTsKKyAgICAgICAgICAgIHZhciBjc3NCZWZvcmVJbmxpbmVDb3VudCA9IG5v ZGVJZHMubGVuZ3RoOworICAgICAgICAgICAgdmFyIHJlc3VsdCA9IG51bGw7CisgICAgICAgICAg ICBpZiAobGF0ZVN0eWxlSWRzLmxlbmd0aCB8fCBjc3NCZWZvcmVJbmxpbmVDb3VudCkgeworICAg ICAgICAgICAgICAgIHZhciBsYXRlU3R5bGVVcmxzID0gW107CisgICAgICAgICAgICAgICAgZm9y ICh2YXIgaSA9IDA7IGkgPCBsYXRlU3R5bGVJZHMubGVuZ3RoOyArK2kpIHsKKyAgICAgICAgICAg ICAgICAgICAgdmFyIGxhdGVTdHlsZU5vZGUgPSBXZWJJbnNwZWN0b3IuZG9tQWdlbnQubm9kZUZv cklkKGxhdGVTdHlsZUlkc1tpXSk7CisgICAgICAgICAgICAgICAgICAgIHZhciBjb21wbGV0ZUhy ZWYgPSBXZWJJbnNwZWN0b3IuY29tcGxldGVVUkwobGF0ZVN0eWxlTm9kZS5vd25lckRvY3VtZW50 LmRvY3VtZW50VVJMLCBsYXRlU3R5bGVOb2RlLmdldEF0dHJpYnV0ZSgiaHJlZiIpKTsKKyAgICAg ICAgICAgICAgICAgICAgbGF0ZVN0eWxlVXJscy5wdXNoKGNvbXBsZXRlSHJlZiB8fCAiPGVtcHR5 PiIpOworICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgICAgICByZXN1bHQgPSBbIGxhdGVT dHlsZVVybHMsIGNzc0JlZm9yZUlubGluZUNvdW50IF07CisgICAgICAgICAgICB9CisKKyAgICAg ICAgICAgIGV2YWxDYWxsYmFjayhyZXN1bHQpOwogICAgICAgICB9CiAKLSAgICAgICAgV2ViSW5z cGVjdG9yLkF1ZGl0UnVsZXMuZXZhbHVhdGVJblRhcmdldFdpbmRvdyhyb3V0aW5lLCBbXSwgZXZh bENhbGxiYWNrLmJpbmQodGhpcykpOworICAgICAgICBmdW5jdGlvbiBsYXRlU3R5bGVzUmVjZWl2 ZWQocm9vdCwgbm9kZUlkcykKKyAgICAgICAgeworICAgICAgICAgICAgV2ViSW5zcGVjdG9yLmRv bUFnZW50LnF1ZXJ5U2VsZWN0b3JBbGwocm9vdC5pZCwgImhlYWQgbGlua1tyZWx+PSdzdHlsZXNo ZWV0J11baHJlZl0gfiBzY3JpcHQ6bm90KFtzcmNdKSIsIGNzc0JlZm9yZUlubGluZVJlY2VpdmVk LmJpbmQobnVsbCwgbm9kZUlkcykpOworICAgICAgICB9CisKKyAgICAgICAgZnVuY3Rpb24gb25E b2N1bWVudEF2YWlsYWJsZShyb290KQorICAgICAgICB7CisgICAgICAgICAgICBXZWJJbnNwZWN0 b3IuZG9tQWdlbnQucXVlcnlTZWxlY3RvckFsbChyb290LmlkLCAiaGVhZCBzY3JpcHRbc3JjXSB+ IGxpbmtbcmVsfj0nc3R5bGVzaGVldCddW2hyZWZdIiwgbGF0ZVN0eWxlc1JlY2VpdmVkLmJpbmQo bnVsbCwgcm9vdCkpOworICAgICAgICB9CisKKyAgICAgICAgV2ViSW5zcGVjdG9yLmRvbUFnZW50 LnJlcXVlc3REb2N1bWVudChvbkRvY3VtZW50QXZhaWxhYmxlKTsKICAgICB9CiB9CiAKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRE9NQWdlbnQuanMgYi9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RPTUFnZW50LmpzCmluZGV4IDg2NWMz NTIuLmViZjc3MzkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvRE9NQWdlbnQuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9E T01BZ2VudC5qcwpAQCAtMzU1LDEwICszNTUsMTkgQEAgV2ViSW5zcGVjdG9yLkRPTUFnZW50LnBy b3RvdHlwZSA9IHsKICAgICAgICAgICAgIGlmICghZXJyb3IpCiAgICAgICAgICAgICAgICAgdGhp cy5fc2V0RG9jdW1lbnQocm9vdCk7CiAKLSAgICAgICAgICAgIGlmIChjYWxsYmFjaykKLSAgICAg ICAgICAgICAgICBjYWxsYmFjayh0aGlzLl9kb2N1bWVudCk7CisgICAgICAgICAgICBpZiAodGhp cy5fcGVuZGluZ1JlcXVlc3REb2N1bWVudENhbGxiYWNrcykgeworICAgICAgICAgICAgICAgIGZv ciAodmFyIGkgPSAwLCBzaXplID0gdGhpcy5fcGVuZGluZ1JlcXVlc3REb2N1bWVudENhbGxiYWNr cy5sZW5ndGg7IGkgPCBzaXplOyArK2kpCisgICAgICAgICAgICAgICAgICAgIHRoaXMuX3BlbmRp bmdSZXF1ZXN0RG9jdW1lbnRDYWxsYmFja3NbaV0odGhpcy5fZG9jdW1lbnQpOworICAgICAgICAg ICAgICAgIGRlbGV0ZSB0aGlzLl9wZW5kaW5nUmVxdWVzdERvY3VtZW50Q2FsbGJhY2tzOworICAg ICAgICAgICAgfQorICAgICAgICB9CisKKyAgICAgICAgaWYgKCF0aGlzLl9wZW5kaW5nUmVxdWVz dERvY3VtZW50Q2FsbGJhY2tzKSB7CisgICAgICAgICAgICB0aGlzLl9wZW5kaW5nUmVxdWVzdERv Y3VtZW50Q2FsbGJhY2tzID0gW107CisgICAgICAgICAgICBET01BZ2VudC5nZXREb2N1bWVudChv bkRvY3VtZW50QXZhaWxhYmxlLmJpbmQodGhpcykpOwogICAgICAgICB9Ci0gICAgICAgIERPTUFn ZW50LmdldERvY3VtZW50KG9uRG9jdW1lbnRBdmFpbGFibGUuYmluZCh0aGlzKSk7CisgICAgICAg IGlmIChjYWxsYmFjaykKKyAgICAgICAgICAgIHRoaXMuX3BlbmRpbmdSZXF1ZXN0RG9jdW1lbnRD YWxsYmFja3MucHVzaChjYWxsYmFjayk7CiAgICAgfSwKIAogICAgIHB1c2hOb2RlVG9Gcm9udGVu ZDogZnVuY3Rpb24ob2JqZWN0SWQsIGNhbGxiYWNrKQo=