63446 2011-06-27 06:14:12 -0700 Web Inspector: Change the inspector model API and backend to allow CSS pseudoclass inspection 2011-06-28 05:28:12 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 63461 1 apavlov apavlov apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy webkit.review.bot yurys oldest_to_newest 427882 0 apavlov 2011-06-27 06:14:12 -0700 Patch to follow 427948 1 98729 apavlov 2011-06-27 08:16:28 -0700 Created attachment 98729 [PATCH] Suggested solution 427949 2 webkit.review.bot 2011-06-27 08:19:43 -0700 Attachment 98729 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'LayoutTests/ChangeLog', u'LayoutTests/insp..." exit_code: 1 Source/WebCore/inspector/InspectorCSSAgent.cpp:214: The parameter type should use PassRefPtr instead of RefPtr. [readability/pass_ptr] [5] Source/WebCore/inspector/InspectorCSSAgent.h:64: The parameter type should use PassRefPtr instead of RefPtr. [readability/pass_ptr] [5] Total errors found: 2 in 11 files If any of these errors are false positives, please file a bug against check-webkit-style. 427959 3 apavlov 2011-06-27 08:36:01 -0700 Committing to http://svn.webkit.org/repository/webkit/trunk ... M LayoutTests/ChangeLog M LayoutTests/inspector/styles/get-set-stylesheet-text.html M LayoutTests/inspector/styles/styles-new-API.html M LayoutTests/inspector/styles/styles-source-offsets.html M Source/WebCore/ChangeLog M Source/WebCore/inspector/Inspector.json M Source/WebCore/inspector/InspectorCSSAgent.cpp M Source/WebCore/inspector/InspectorCSSAgent.h M Source/WebCore/inspector/front-end/AuditRules.js M Source/WebCore/inspector/front-end/CSSStyleModel.js M Source/WebCore/inspector/front-end/StylesSidebarPane.js Committed r89822 Manually committed with the style fixed: <http://trac.webkit.org/changeset/89822> 428712 4 apavlov 2011-06-28 01:21:19 -0700 Rolled out due to the builds breakage 428814 5 apavlov 2011-06-28 05:28:12 -0700 Committed r89922: <http://trac.webkit.org/changeset/89922> 98729 2011-06-27 08:16:28 -0700 2011-06-27 08:20:05 -0700 [PATCH] Suggested solution pseudobackend.patch text/plain 12323 apavlov Y29tbWl0IDA4YzljNWZmNGRlMDFmMjlmNmI4NDY3ZGU5YzZmOTI4OTk4ODJiODIKQXV0aG9yOiBB bGV4YW5kZXIgUGF2bG92IDxhcGF2bG92QGNocm9taXVtLm9yZz4KRGF0ZTogICBNb24gSnVuIDI3 IDE5OjExOjAzIDIwMTEgKzA0MDAKCiAgICBGaXgKCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9D aGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggNTljYzEzYS4uZjE2M2QwYiAx MDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5n ZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDExLTA2LTI3ICBBbGV4YW5kZXIgUGF2bG92ICA8YXBh dmxvdkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogQ2hhbmdlIHRoZSBpbnNwZWN0b3IgbW9kZWwgQVBJ IGFuZCBiYWNrZW5kIHRvIGFsbG93IENTUyBwc2V1ZG9jbGFzcyBpbnNwZWN0aW9uCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02MzQ0NgorCisgICAgICAg ICogaW5zcGVjdG9yL3N0eWxlcy9nZXQtc2V0LXN0eWxlc2hlZXQtdGV4dC5odG1sOgorICAgICAg ICAqIGluc3BlY3Rvci9zdHlsZXMvc3R5bGVzLW5ldy1BUEkuaHRtbDoKKyAgICAgICAgKiBpbnNw ZWN0b3Ivc3R5bGVzL3N0eWxlcy1zb3VyY2Utb2Zmc2V0cy5odG1sOgorCiAyMDExLTA2LTI3ICBD c2FiYSBPc3p0cm9nb27DoWMgIDxvc3N5QHdlYmtpdC5vcmc+CiAKICAgICAgICAgW1F0XVtNYWNd UkVHUkVTU0lPTj8ocjg5Mzk3KSBJdCBtYWRlIGZhc3QvY3NzL2N1c3RvbS1mb250LXhoZWlnaHQu aHRtbCBjcmFzaApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL3N0eWxlcy9nZXQt c2V0LXN0eWxlc2hlZXQtdGV4dC5odG1sIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL3N0eWxlcy9n ZXQtc2V0LXN0eWxlc2hlZXQtdGV4dC5odG1sCmluZGV4IDdkZjg5NTguLmQ2M2Q3NzUgMTAwNjQ0 Ci0tLSBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9zdHlsZXMvZ2V0LXNldC1zdHlsZXNoZWV0LXRl eHQuaHRtbAorKysgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3Ivc3R5bGVzL2dldC1zZXQtc3R5bGVz aGVldC10ZXh0Lmh0bWwKQEAgLTcwLDcgKzcwLDcgQEAgZnVuY3Rpb24gdGVzdCgpCiAKICAgICAg ICAgZnVuY3Rpb24gbm9kZUNhbGxiYWNrKG5vZGUpCiAgICAgICAgIHsKLSAgICAgICAgICAgIENT U0FnZW50LmdldFN0eWxlc0Zvck5vZGUobm9kZS5pZCwgY2FsbGJhY2spOworICAgICAgICAgICAg Q1NTQWdlbnQuZ2V0U3R5bGVzRm9yTm9kZShub2RlLmlkLCB1bmRlZmluZWQsIGNhbGxiYWNrKTsK ICAgICAgICAgfQogCiAgICAgICAgIEluc3BlY3RvclRlc3Quc2VsZWN0Tm9kZVdpdGhJZCgiaW5z cGVjdGVkIiwgbm9kZUNhbGxiYWNrKTsKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2luc3BlY3Rv ci9zdHlsZXMvc3R5bGVzLW5ldy1BUEkuaHRtbCBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9zdHls ZXMvc3R5bGVzLW5ldy1BUEkuaHRtbAppbmRleCA5YjMyMmVjLi43ODI4ZTY4IDEwMDY0NAotLS0g YS9MYXlvdXRUZXN0cy9pbnNwZWN0b3Ivc3R5bGVzL3N0eWxlcy1uZXctQVBJLmh0bWwKKysrIGIv TGF5b3V0VGVzdHMvaW5zcGVjdG9yL3N0eWxlcy9zdHlsZXMtbmV3LUFQSS5odG1sCkBAIC01NCw3 ICs1NCw3IEBAIGZ1bmN0aW9uIHRlc3QoKQogICAgICAgICBmdW5jdGlvbiBub2RlQ2FsbGJhY2so bm9kZSkKICAgICAgICAgewogICAgICAgICAgICAgYm9keUlkID0gbm9kZS5pZDsKLSAgICAgICAg ICAgIENTU0FnZW50LmdldFN0eWxlc0Zvck5vZGUoYm9keUlkLCBjYWxsYmFjayk7CisgICAgICAg ICAgICBDU1NBZ2VudC5nZXRTdHlsZXNGb3JOb2RlKGJvZHlJZCwgdW5kZWZpbmVkLCBjYWxsYmFj ayk7CiAgICAgICAgIH0KICAgICAgICAgSW5zcGVjdG9yVGVzdC5zZWxlY3ROb2RlV2l0aElkKCJt YWluQm9keSIsIG5vZGVDYWxsYmFjayk7CiAgICAgfQpAQCAtNzksNyArNzksNyBAQCBmdW5jdGlv biB0ZXN0KCkKIAogICAgICAgICBmdW5jdGlvbiBub2RlQ2FsbGJhY2sobm9kZSkKICAgICAgICAg ewotICAgICAgICAgICAgQ1NTQWdlbnQuZ2V0U3R5bGVzRm9yTm9kZShub2RlLmlkLCBjYWxsYmFj ayk7CisgICAgICAgICAgICBDU1NBZ2VudC5nZXRTdHlsZXNGb3JOb2RlKG5vZGUuaWQsIHVuZGVm aW5lZCwgY2FsbGJhY2spOwogICAgICAgICB9CiAgICAgICAgIEluc3BlY3RvclRlc3Qubm9kZVdp dGhJZCgidGhldGFibGUiLCBub2RlQ2FsbGJhY2spOwogICAgIH0KQEAgLTE3NCw3ICsxNzQsNyBA QCBmdW5jdGlvbiB0ZXN0KCkKICAgICAgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmFkZFJlc3Vs dCgiZXJyb3I6ICIgKyBlcnJvcik7CiAgICAgICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICAg ICAgfQotICAgICAgICAgICAgQ1NTQWdlbnQuZ2V0U3R5bGVzRm9yTm9kZShib2R5SWQsIGRpZEdl dFN0eWxlcyk7CisgICAgICAgICAgICBDU1NBZ2VudC5nZXRTdHlsZXNGb3JOb2RlKGJvZHlJZCwg dW5kZWZpbmVkLCBkaWRHZXRTdHlsZXMpOwogICAgICAgICB9CiAKICAgICAgICAgZnVuY3Rpb24g cnVsZUFkZGVkKGVycm9yLCBydWxlKQpAQCAtMjQyLDcgKzI0Miw3IEBAIGZ1bmN0aW9uIHRlc3Qo KQogCiAgICAgICAgIGZ1bmN0aW9uIG5vZGVDYWxsYmFjayhub2RlKQogICAgICAgICB7Ci0gICAg ICAgICAgICBDU1NBZ2VudC5nZXRTdHlsZXNGb3JOb2RlKG5vZGUuaWQsIHN0eWxlc0NhbGxiYWNr KTsKKyAgICAgICAgICAgIENTU0FnZW50LmdldFN0eWxlc0Zvck5vZGUobm9kZS5pZCwgdW5kZWZp bmVkLCBzdHlsZXNDYWxsYmFjayk7CiAgICAgICAgIH0KICAgICAgICAgSW5zcGVjdG9yVGVzdC5u b2RlV2l0aElkKCJ0b2dnbGUiLCBub2RlQ2FsbGJhY2spOwogICAgIH0KZGlmZiAtLWdpdCBhL0xh eW91dFRlc3RzL2luc3BlY3Rvci9zdHlsZXMvc3R5bGVzLXNvdXJjZS1vZmZzZXRzLmh0bWwgYi9M YXlvdXRUZXN0cy9pbnNwZWN0b3Ivc3R5bGVzL3N0eWxlcy1zb3VyY2Utb2Zmc2V0cy5odG1sCmlu ZGV4IGQ4YmM4ZTAuLjkwMDM4MDkgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9z dHlsZXMvc3R5bGVzLXNvdXJjZS1vZmZzZXRzLmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvaW5zcGVj dG9yL3N0eWxlcy9zdHlsZXMtc291cmNlLW9mZnNldHMuaHRtbApAQCAtMzcsNyArMzcsNyBAQCBm dW5jdGlvbiB0ZXN0KCkKIAogICAgIGZ1bmN0aW9uIHN0ZXAxKG5vZGUpCiAgICAgewotICAgICAg ICBDU1NBZ2VudC5nZXRTdHlsZXNGb3JOb2RlKG5vZGUuaWQsIHN0ZXAyKTsKKyAgICAgICAgQ1NT QWdlbnQuZ2V0U3R5bGVzRm9yTm9kZShub2RlLmlkLCB1bmRlZmluZWQsIHN0ZXAyKTsKICAgICB9 CiAKICAgICBmdW5jdGlvbiBzdGVwMihlcnJvciwgc3R5bGVzKQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IGMwMzMx YWUuLjMyYjA3MjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9T b3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMiBAQAorMjAxMS0wNi0yNyAgQWxl eGFuZGVyIFBhdmxvdiAgPGFwYXZsb3ZAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IENoYW5nZSB0aGUg aW5zcGVjdG9yIG1vZGVsIEFQSSBhbmQgYmFja2VuZCB0byBhbGxvdyBDU1MgcHNldWRvY2xhc3Mg aW5zcGVjdGlvbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9NjM0NDYKKworICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3IuanNvbjoKKyAgICAgICAg KiBpbnNwZWN0b3IvSW5zcGVjdG9yQ1NTQWdlbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Y29t cHV0ZVBzZXVkb0NsYXNzTWFzayk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JDU1NBZ2Vu dDo6Z2V0U3R5bGVzRm9yTm9kZSk6CisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvckNTU0Fn ZW50Lmg6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9BdWRpdFJ1bGVzLmpzOgorICAg ICAgICAoV2ViSW5zcGVjdG9yLkF1ZGl0UnVsZXMuSW1hZ2VEaW1lbnNpb25zUnVsZS5wcm90b3R5 cGUuZG9SdW4uZ2V0U3R5bGVzKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0NTU1N0 eWxlTW9kZWwuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQ1NTU3R5bGVNb2RlbC5wcm90b3R5 cGUuZ2V0U3R5bGVzQXN5bmMpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvU3R5bGVz U2lkZWJhclBhbmUuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU3R5bGVzU2lkZWJhclBhbmUu cHJvdG90eXBlLnVwZGF0ZSk6CisKIDIwMTEtMDYtMjcgIFBhdmVsIEZlbGRtYW4gIDxwZmVsZG1h bkBnb29nbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IFl1cnkgU2VtaWtoYXRza3kuCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yLmpzb24gYi9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yLmpzb24KaW5kZXggZGEzZGE0Yy4uNWE2MmU0 OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvci5qc29uCisr KyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3IuanNvbgpAQCAtMTIyMyw3ICsx MjIzLDggQEAKICAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgICAibmFtZSI6ICJnZXRTdHls ZXNGb3JOb2RlIiwKICAgICAgICAgICAgICAgICAicGFyYW1ldGVycyI6IFsKLSAgICAgICAgICAg ICAgICAgICAgeyAibmFtZSI6ICJub2RlSWQiLCAidHlwZSI6ICJpbnRlZ2VyIiB9CisgICAgICAg ICAgICAgICAgICAgIHsgIm5hbWUiOiAibm9kZUlkIiwgInR5cGUiOiAiaW50ZWdlciIgfSwKKyAg ICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJmb3JjZWRQc2V1ZG9DbGFzc2VzIiwgInR5cGUi OiAiYXJyYXkiLCAiaXRlbXMiOiB7ICJ0eXBlIjogInN0cmluZyIsICJlbnVtIjogWyJhY3RpdmUi LCAiZm9jdXMiLCAiaG92ZXIiLCAidmlzaXRlZCJdIH0sICJvcHRpb25hbCI6IHRydWUsICJkZXNj cmlwdGlvbiI6ICJFbGVtZW50IHBzZXVkbyBjbGFzc2VzIHRvIGZvcmNlIHdoZW4gY29tcHV0aW5n IGFwcGxpY2FibGUgc3R5bGUgcnVsZXMuIiB9CiAgICAgICAgICAgICAgICAgXSwKICAgICAgICAg ICAgICAgICAicmV0dXJucyI6IFsKICAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJzdHls ZXMiLCAiJHJlZiI6ICJDU1NOb2RlU3R5bGVzIiwgImRlc2NyaXB0aW9uIjogIkFsbCBzdHlsZXMg Zm9yIHRoZSBzcGVjaWZpZWQgRE9NIG5vZGUuIiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ1NTQWdlbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL0luc3BlY3RvckNTU0FnZW50LmNwcAppbmRleCA5ZTZlYjE0Li4xZDM2ZWQ1IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ1NTQWdlbnQuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDU1NBZ2VudC5jcHAKQEAgLTEzMCw2 ICsxMzAsMzUgQEAKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCitzdGF0aWMgdW5zaWduZWQgY29t cHV0ZVBzZXVkb0NsYXNzTWFzayhJbnNwZWN0b3JBcnJheSogcHNldWRvQ2xhc3NBcnJheSkKK3sK KyAgICBERUZJTkVfU1RBVElDX0xPQ0FMKFN0cmluZywgYWN0aXZlLCAoImFjdGl2ZSIpKTsKKyAg ICBERUZJTkVfU1RBVElDX0xPQ0FMKFN0cmluZywgaG92ZXIsICgiaG92ZXIiKSk7CisgICAgREVG SU5FX1NUQVRJQ19MT0NBTChTdHJpbmcsIGZvY3VzLCAoImZvY3VzIikpOworICAgIERFRklORV9T VEFUSUNfTE9DQUwoU3RyaW5nLCB2aXNpdGVkLCAoInZpc2l0ZWQiKSk7CisgICAgaWYgKCFwc2V1 ZG9DbGFzc0FycmF5IHx8ICFwc2V1ZG9DbGFzc0FycmF5LT5sZW5ndGgoKSkKKyAgICAgICAgcmV0 dXJuIENTU1N0eWxlU2VsZWN0b3I6OkRvTm90Rm9yY2VQc2V1ZG9DbGFzc01hc2s7CisKKyAgICB1 bnNpZ25lZCByZXN1bHQgPSBDU1NTdHlsZVNlbGVjdG9yOjpGb3JjZU5vbmU7CisgICAgZm9yIChz aXplX3QgaSA9IDA7IGkgPCBwc2V1ZG9DbGFzc0FycmF5LT5sZW5ndGgoKTsgKytpKSB7CisgICAg ICAgIFJlZlB0cjxJbnNwZWN0b3JWYWx1ZT4gcHNldWRvQ2xhc3NWYWx1ZSA9IHBzZXVkb0NsYXNz QXJyYXktPmdldChpKTsKKyAgICAgICAgU3RyaW5nIHBzZXVkb0NsYXNzOworICAgICAgICBib29s IHN1Y2Nlc3MgPSBwc2V1ZG9DbGFzc1ZhbHVlLT5hc1N0cmluZygmcHNldWRvQ2xhc3MpOworICAg ICAgICBpZiAoIXN1Y2Nlc3MpCisgICAgICAgICAgICBjb250aW51ZTsKKyAgICAgICAgaWYgKHBz ZXVkb0NsYXNzID09IGFjdGl2ZSkKKyAgICAgICAgICAgIHJlc3VsdCB8PSBDU1NTdHlsZVNlbGVj dG9yOjpGb3JjZUFjdGl2ZTsKKyAgICAgICAgZWxzZSBpZiAocHNldWRvQ2xhc3MgPT0gaG92ZXIp CisgICAgICAgICAgICByZXN1bHQgfD0gQ1NTU3R5bGVTZWxlY3Rvcjo6Rm9yY2VIb3ZlcjsKKyAg ICAgICAgZWxzZSBpZiAocHNldWRvQ2xhc3MgPT0gZm9jdXMpCisgICAgICAgICAgICByZXN1bHQg fD0gQ1NTU3R5bGVTZWxlY3Rvcjo6Rm9yY2VGb2N1czsKKyAgICAgICAgZWxzZSBpZiAocHNldWRv Q2xhc3MgPT0gdmlzaXRlZCkKKyAgICAgICAgICAgIHJlc3VsdCB8PSBDU1NTdHlsZVNlbGVjdG9y OjpGb3JjZVZpc2l0ZWQ7CisgICAgfQorCisgICAgcmV0dXJuIHJlc3VsdDsKK30KKwogLy8gc3Rh dGljCiBDU1NTdHlsZVNoZWV0KiBJbnNwZWN0b3JDU1NBZ2VudDo6cGFyZW50U3R5bGVTaGVldChT dHlsZUJhc2UqIHN0eWxlQmFzZSkKIHsKQEAgLTE4Miw3ICsyMTEsNyBAQCB2b2lkIEluc3BlY3Rv ckNTU0FnZW50OjpyZXNldCgpCiAgICAgbV9kb2N1bWVudFRvSW5zcGVjdG9yU3R5bGVTaGVldC5j bGVhcigpOwogfQogCi12b2lkIEluc3BlY3RvckNTU0FnZW50OjpnZXRTdHlsZXNGb3JOb2RlKEVy cm9yU3RyaW5nKiBlcnJvclN0cmluZywgaW50IG5vZGVJZCwgUmVmUHRyPEluc3BlY3Rvck9iamVj dD4qIHJlc3VsdCkKK3ZvaWQgSW5zcGVjdG9yQ1NTQWdlbnQ6OmdldFN0eWxlc0Zvck5vZGUoRXJy b3JTdHJpbmcqIGVycm9yU3RyaW5nLCBpbnQgbm9kZUlkLCBjb25zdCBSZWZQdHI8SW5zcGVjdG9y QXJyYXk+KiBmb3JjZWRQc2V1ZG9DbGFzc2VzLCBSZWZQdHI8SW5zcGVjdG9yT2JqZWN0PiogcmVz dWx0KQogewogICAgIEVsZW1lbnQqIGVsZW1lbnQgPSBlbGVtZW50Rm9ySWQoZXJyb3JTdHJpbmcs IG5vZGVJZCk7CiAgICAgaWYgKCFlbGVtZW50KQpAQCAtMTk4LDE1ICsyMjcsMTYgQEAgdm9pZCBJ bnNwZWN0b3JDU1NBZ2VudDo6Z2V0U3R5bGVzRm9yTm9kZShFcnJvclN0cmluZyogZXJyb3JTdHJp bmcsIGludCBub2RlSWQsIFIKICAgICBSZWZQdHI8SW5zcGVjdG9yU3R5bGU+IGNvbXB1dGVkSW5z cGVjdG9yU3R5bGUgPSBJbnNwZWN0b3JTdHlsZTo6Y3JlYXRlKEluc3BlY3RvckNTU0lkKCksIGNv bXB1dGVkU3R5bGVJbmZvLCAwKTsKICAgICByZXN1bHRPYmplY3QtPnNldE9iamVjdCgiY29tcHV0 ZWRTdHlsZSIsIGNvbXB1dGVkSW5zcGVjdG9yU3R5bGUtPmJ1aWxkT2JqZWN0Rm9yU3R5bGUoKSk7 CiAKKyAgICB1bnNpZ25lZCBmb3JjZVBzZXVkb0NsYXNzTWFzayA9IGNvbXB1dGVQc2V1ZG9DbGFz c01hc2soZm9yY2VkUHNldWRvQ2xhc3Nlcy0+Z2V0KCkpOwogICAgIENTU1N0eWxlU2VsZWN0b3Iq IHNlbGVjdG9yID0gZWxlbWVudC0+b3duZXJEb2N1bWVudCgpLT5zdHlsZVNlbGVjdG9yKCk7Ci0g ICAgUmVmUHRyPENTU1J1bGVMaXN0PiBtYXRjaGVkUnVsZXMgPSBzZWxlY3Rvci0+c3R5bGVSdWxl c0ZvckVsZW1lbnQoZWxlbWVudCwgQ1NTU3R5bGVTZWxlY3Rvcjo6QWxsQ1NTUnVsZXMpOworICAg IFJlZlB0cjxDU1NSdWxlTGlzdD4gbWF0Y2hlZFJ1bGVzID0gc2VsZWN0b3ItPnN0eWxlUnVsZXNG b3JFbGVtZW50KGVsZW1lbnQsIENTU1N0eWxlU2VsZWN0b3I6OkFsbENTU1J1bGVzLCBmb3JjZVBz ZXVkb0NsYXNzTWFzayk7CiAgICAgcmVzdWx0T2JqZWN0LT5zZXRBcnJheSgibWF0Y2hlZENTU1J1 bGVzIiwgYnVpbGRBcnJheUZvclJ1bGVMaXN0KG1hdGNoZWRSdWxlcy5nZXQoKSkpOwogCiAgICAg cmVzdWx0T2JqZWN0LT5zZXRBcnJheSgic3R5bGVBdHRyaWJ1dGVzIiwgYnVpbGRBcnJheUZvckF0 dHJpYnV0ZVN0eWxlcyhlbGVtZW50KSk7CiAKICAgICBSZWZQdHI8SW5zcGVjdG9yQXJyYXk+IHBz ZXVkb0VsZW1lbnRzID0gSW5zcGVjdG9yQXJyYXk6OmNyZWF0ZSgpOwogICAgIGZvciAoUHNldWRv SWQgcHNldWRvSWQgPSBGSVJTVF9QVUJMSUNfUFNFVURPSUQ7IHBzZXVkb0lkIDwgQUZURVJfTEFT VF9JTlRFUk5BTF9QU0VVRE9JRDsgcHNldWRvSWQgPSBzdGF0aWNfY2FzdDxQc2V1ZG9JZD4ocHNl dWRvSWQgKyAxKSkgewotICAgICAgICBSZWZQdHI8Q1NTUnVsZUxpc3Q+IG1hdGNoZWRSdWxlcyA9 IHNlbGVjdG9yLT5wc2V1ZG9TdHlsZVJ1bGVzRm9yRWxlbWVudChlbGVtZW50LCBwc2V1ZG9JZCwg Q1NTU3R5bGVTZWxlY3Rvcjo6QWxsQ1NTUnVsZXMpOworICAgICAgICBSZWZQdHI8Q1NTUnVsZUxp c3Q+IG1hdGNoZWRSdWxlcyA9IHNlbGVjdG9yLT5wc2V1ZG9TdHlsZVJ1bGVzRm9yRWxlbWVudChl bGVtZW50LCBwc2V1ZG9JZCwgQ1NTU3R5bGVTZWxlY3Rvcjo6QWxsQ1NTUnVsZXMsIGZvcmNlUHNl dWRvQ2xhc3NNYXNrKTsKICAgICAgICAgaWYgKG1hdGNoZWRSdWxlcyAmJiBtYXRjaGVkUnVsZXMt Pmxlbmd0aCgpKSB7CiAgICAgICAgICAgICBSZWZQdHI8SW5zcGVjdG9yT2JqZWN0PiBwc2V1ZG9T dHlsZXMgPSBJbnNwZWN0b3JPYmplY3Q6OmNyZWF0ZSgpOwogICAgICAgICAgICAgcHNldWRvU3R5 bGVzLT5zZXROdW1iZXIoInBzZXVkb0lkIiwgc3RhdGljX2Nhc3Q8aW50Pihwc2V1ZG9JZCkpOwpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNTU0FnZW50Lmgg Yi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ1NTQWdlbnQuaAppbmRleCAzMTFm OWUxLi40Zjg0YWZiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVj dG9yQ1NTQWdlbnQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ1NT QWdlbnQuaApAQCAtNjEsNyArNjEsNyBAQCBwdWJsaWM6CiAgICAgfkluc3BlY3RvckNTU0FnZW50 KCk7CiAKICAgICB2b2lkIHJlc2V0KCk7Ci0gICAgdm9pZCBnZXRTdHlsZXNGb3JOb2RlKEVycm9y U3RyaW5nKiwgaW50IG5vZGVJZCwgUmVmUHRyPEluc3BlY3Rvck9iamVjdD4qIHJlc3VsdCk7Cisg ICAgdm9pZCBnZXRTdHlsZXNGb3JOb2RlKEVycm9yU3RyaW5nKiwgaW50IG5vZGVJZCwgY29uc3Qg UmVmUHRyPEluc3BlY3RvckFycmF5PiogZm9yY2VkUHNldWRvQ2xhc3NlcywgUmVmUHRyPEluc3Bl Y3Rvck9iamVjdD4qIHJlc3VsdCk7CiAgICAgdm9pZCBnZXRJbmxpbmVTdHlsZUZvck5vZGUoRXJy b3JTdHJpbmcqLCBpbnQgbm9kZUlkLCBSZWZQdHI8SW5zcGVjdG9yT2JqZWN0Piogc3R5bGUpOwog ICAgIHZvaWQgZ2V0Q29tcHV0ZWRTdHlsZUZvck5vZGUoRXJyb3JTdHJpbmcqLCBpbnQgbm9kZUlk LCBSZWZQdHI8SW5zcGVjdG9yT2JqZWN0Piogc3R5bGUpOwogICAgIHZvaWQgZ2V0QWxsU3R5bGVT aGVldHMoRXJyb3JTdHJpbmcqLCBSZWZQdHI8SW5zcGVjdG9yQXJyYXk+KiBzdHlsZVNoZWV0SW5m b3MpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9BdWRp dFJ1bGVzLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9BdWRpdFJ1bGVz LmpzCmluZGV4IDlhZTVkZjguLjI1Y2Q2NGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvQXVkaXRSdWxlcy5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL0F1ZGl0UnVsZXMuanMKQEAgLTcxMiw3ICs3MTIsNyBAQCBXZWJJbnNw ZWN0b3IuQXVkaXRSdWxlcy5JbWFnZURpbWVuc2lvbnNSdWxlLnByb3RvdHlwZSA9IHsKICAgICAg ICAgZnVuY3Rpb24gZ2V0U3R5bGVzKG5vZGVJZHMpCiAgICAgICAgIHsKICAgICAgICAgICAgIGZv ciAodmFyIGkgPSAwOyBub2RlSWRzICYmIGkgPCBub2RlSWRzLmxlbmd0aDsgKytpKQotICAgICAg ICAgICAgICAgIFdlYkluc3BlY3Rvci5jc3NNb2RlbC5nZXRTdHlsZXNBc3luYyhub2RlSWRzW2ld LCBpbWFnZVN0eWxlc1JlYWR5LmJpbmQodGhpcywgbm9kZUlkc1tpXSwgaSA9PT0gbm9kZUlkcy5s ZW5ndGggLSAxKSk7CisgICAgICAgICAgICAgICAgV2ViSW5zcGVjdG9yLmNzc01vZGVsLmdldFN0 eWxlc0FzeW5jKG5vZGVJZHNbaV0sIHVuZGVmaW5lZCwgaW1hZ2VTdHlsZXNSZWFkeS5iaW5kKHRo aXMsIG5vZGVJZHNbaV0sIGkgPT09IG5vZGVJZHMubGVuZ3RoIC0gMSkpOwogICAgICAgICB9CiAK ICAgICAgICAgZnVuY3Rpb24gb25Eb2N1bWVudEF2YWlsYWJsZShyb290KQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9DU1NTdHlsZU1vZGVsLmpzIGIvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9DU1NTdHlsZU1vZGVsLmpzCmluZGV4IDI2 NzcxYjcuLmU0ZTg3MjMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvQ1NTU3R5bGVNb2RlbC5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL0NTU1N0eWxlTW9kZWwuanMKQEAgLTQ2LDcgKzQ2LDcgQEAgV2ViSW5zcGVjdG9yLkNT U1N0eWxlTW9kZWwuRXZlbnRzID0gewogfQogCiBXZWJJbnNwZWN0b3IuQ1NTU3R5bGVNb2RlbC5w cm90b3R5cGUgPSB7Ci0gICAgZ2V0U3R5bGVzQXN5bmM6IGZ1bmN0aW9uKG5vZGVJZCwgdXNlckNh bGxiYWNrKQorICAgIGdldFN0eWxlc0FzeW5jOiBmdW5jdGlvbihub2RlSWQsIGZvcmNlZFBzZXVk b0NsYXNzZXMsIHVzZXJDYWxsYmFjaykKICAgICB7CiAgICAgICAgIGZ1bmN0aW9uIGNhbGxiYWNr KHVzZXJDYWxsYmFjaywgZXJyb3IsIHBheWxvYWQpCiAgICAgICAgIHsKQEAgLTkxLDcgKzkxLDcg QEAgV2ViSW5zcGVjdG9yLkNTU1N0eWxlTW9kZWwucHJvdG90eXBlID0gewogICAgICAgICAgICAg ICAgIHVzZXJDYWxsYmFjayhyZXN1bHQpOwogICAgICAgICB9CiAKLSAgICAgICAgQ1NTQWdlbnQu Z2V0U3R5bGVzRm9yTm9kZShub2RlSWQsIGNhbGxiYWNrLmJpbmQobnVsbCwgdXNlckNhbGxiYWNr KSk7CisgICAgICAgIENTU0FnZW50LmdldFN0eWxlc0Zvck5vZGUobm9kZUlkLCBmb3JjZWRQc2V1 ZG9DbGFzc2VzIHx8IFtdLCBjYWxsYmFjay5iaW5kKG51bGwsIHVzZXJDYWxsYmFjaykpOwogICAg IH0sCiAKICAgICBnZXRDb21wdXRlZFN0eWxlQXN5bmM6IGZ1bmN0aW9uKG5vZGVJZCwgdXNlckNh bGxiYWNrKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9T dHlsZXNTaWRlYmFyUGFuZS5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv U3R5bGVzU2lkZWJhclBhbmUuanMKaW5kZXggNWFjOTc2ZS4uM2I2NDFkMyAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TdHlsZXNTaWRlYmFyUGFuZS5qcwor KysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1N0eWxlc1NpZGViYXJQYW5l LmpzCkBAIC0yNDQsNyArMjQ0LDcgQEAgV2ViSW5zcGVjdG9yLlN0eWxlc1NpZGViYXJQYW5lLnBy b3RvdHlwZSA9IHsKICAgICAgICAgaWYgKHJlZnJlc2gpCiAgICAgICAgICAgICBXZWJJbnNwZWN0 b3IuY3NzTW9kZWwuZ2V0Q29tcHV0ZWRTdHlsZUFzeW5jKG5vZGUuaWQsIGNvbXB1dGVkU3R5bGVD YWxsYmFjay5iaW5kKHRoaXMpKTsKICAgICAgICAgZWxzZQotICAgICAgICAgICAgV2ViSW5zcGVj dG9yLmNzc01vZGVsLmdldFN0eWxlc0FzeW5jKG5vZGUuaWQsIHN0eWxlc0NhbGxiYWNrLmJpbmQo dGhpcykpOworICAgICAgICAgICAgV2ViSW5zcGVjdG9yLmNzc01vZGVsLmdldFN0eWxlc0FzeW5j KG5vZGUuaWQsIHVuZGVmaW5lZCwgc3R5bGVzQ2FsbGJhY2suYmluZCh0aGlzKSk7CiAgICAgfSwK IAogICAgIF9yZWZyZXNoVXBkYXRlOiBmdW5jdGlvbihub2RlLCBjb21wdXRlZFN0eWxlLCBlZGl0 ZWRTZWN0aW9uKQo=