45887 2010-09-16 06:57:21 -0700 Web Inspector: move resourceTracking flag under control of BackendSettings 2011-02-08 11:02:55 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED WONTFIX P2 Normal --- 45308 1 loislo loislo bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy webkit.review.bot yurys oldest_to_newest 280060 0 loislo 2010-09-16 06:57:21 -0700 Four Inspector API methods about resourceTracking flag were removed. Actual state of the flag will be transfered as response for setResourceTracking. Initial state of the flag on the frontend side will be obtained from settings.backend. 280068 1 67794 loislo 2010-09-16 07:08:31 -0700 Created attachment 67794 [patch] initial version. 280069 2 webkit.review.bot 2010-09-16 07:10:22 -0700 Attachment 67794 did not pass style-queue: Failed to run "['WebKitTools/Scripts/check-webkit-style']" exit_code: 1 WebCore/inspector/InspectorController.cpp:1115: Missing space before ( in if( [whitespace/parens] [5] WebCore/inspector/InspectorController.cpp:1119: An else should appear on the same line as the preceding } [whitespace/newline] [4] Total errors found: 2 in 15 files If any of these errors are false positives, please file a bug against check-webkit-style. 280075 3 67794 yurys 2010-09-16 07:25:09 -0700 Comment on attachment 67794 [patch] initial version. View in context: https://bugs.webkit.org/attachment.cgi?id=67794&action=prettypatch > LayoutTests/http/tests/inspector/inspector-test2.js:103 > + WebInspector.panels.resources._toggleResourceTracking(); Please check that current state is "enabled" > LayoutTests/http/tests/inspector/resource-parameters.html:-36 > - InspectorBackend.enableResourceTracking(false); This test should be refactored to use inspector-test2.js It can be done in a separate change though. > WebCore/inspector/InspectorController.cpp:1128 > + if (m_resourceTrackingEnabled == enable) I think we may safely remove this if. > WebKit/chromium/src/WebDevToolsAgentImpl.cpp:261 > + ic->setResourceTracking(value == "true" ? true : false); May be just value == "true" 280260 4 loislo 2010-09-16 12:15:18 -0700 Comments addressed. Committed r67647 M WebKit/chromium/ChangeLog M WebKit/chromium/src/WebDevToolsAgentImpl.cpp M WebCore/ChangeLog M WebCore/inspector/InspectorController.cpp M WebCore/inspector/Inspector.idl M WebCore/inspector/front-end/ResourcesPanel.js M WebCore/inspector/front-end/Settings.js M WebCore/inspector/front-end/inspector.js M WebCore/inspector/InspectorController.h M LayoutTests/http/tests/inspector/inspector-test2.js M LayoutTests/http/tests/inspector/resource-parameters.html M LayoutTests/inspector/report-API-errors-expected.txt M LayoutTests/inspector/styles-source-offsets.html M LayoutTests/inspector/report-API-errors.html M LayoutTests/inspector/audits-panel-functional.html M LayoutTests/ChangeLog r67647 = d230d0b077360e0c3991f9db1d7bd97df6f12bae (refs/remotes/trunk) 280275 5 67794 pfeldman 2010-09-16 12:30:58 -0700 Comment on attachment 67794 [patch] initial version. View in context: https://bugs.webkit.org/attachment.cgi?id=67794&action=prettypatch > WebCore/inspector/InspectorController.cpp:1102 > +void InspectorController::setResourceTracking(bool enable, bool always, bool* newState) setResourceTrackingEnabled > WebCore/inspector/InspectorController.h:173 > + void setResourceTracking(bool enable); setResourceTrackingEnabled > WebCore/inspector/front-end/ResourcesPanel.js:758 > + WebInspector.panels.resources.resourceTrackingWasEnabled(); No need to access this via WebInspector.panels.resources. Just bing the function. > WebCore/inspector/front-end/Settings.js:90 > + if (settings.resourceTrackingEnabled) Settings should not be resources aware. I'd r- for this. 347534 6 pfeldman 2011-02-08 11:02:55 -0800 There is no resource tracking any more. 67794 2010-09-16 07:08:31 -0700 2010-09-16 12:30:58 -0700 [patch] initial version. patch text/plain 18378 loislo ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBhNDRmOTdkLi40MWM4MDQ4IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjQgQEAKKzIwMTAtMDkt MTYgIElseWEgVGlraG9ub3Zza3kgIDxsb2lzbG9AY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IG1vdmUg cmVzb3VyY2VUcmFja2luZyBmbGFnIHVuZGVyIGNvbnRyb2wgb2YgQmFja2VuZFNldHRpbmdzLgor CisgICAgICAgIEZvdXIgSW5zcGVjdG9yIEFQSSBtZXRob2RzIGFib3V0IHJlc291cmNlVHJhY2tp bmcgZmxhZyB3ZXJlIHJlbW92ZWQuCisgICAgICAgIEFjdHVhbCBzdGF0ZSBvZiB0aGUgZmxhZyBp cyB0cmFuc2ZlcmVkIGFzIHRoZSByZXNwb25zZSBvZiBzZXRSZXNvdXJjZVRyYWNraW5nIHJlcXVl c3QuCisgICAgICAgIEluaXRpYWwgc3RhdGUgb2YgdGhlIGZsYWcgb24gdGhlIGZyb250ZW5kIHNp ZGUgaXMgb2J0YWluZWQgZnJvbSBzZXR0aW5ncy5iYWNrZW5kLgorCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00NTg4NworCisgICAgICAgICogaHR0cC90 ZXN0cy9pbnNwZWN0b3IvaW5zcGVjdG9yLXRlc3QyLmpzOgorICAgICAgICAoaW5pdGlhbGl6ZV9J bnNwZWN0b3JUZXN0Lkluc3BlY3RvclRlc3QuZW5hYmxlUmVzb3VyY2VUcmFja2luZyk6CisgICAg ICAgIChpbml0aWFsaXplX0luc3BlY3RvclRlc3QuSW5zcGVjdG9yVGVzdC5kaXNhYmxlUmVzb3Vy Y2VUcmFja2luZyk6CisgICAgICAgICogaHR0cC90ZXN0cy9pbnNwZWN0b3IvcmVzb3VyY2UtcGFy YW1ldGVycy5odG1sOgorICAgICAgICAqIGluc3BlY3Rvci9hdWRpdHMtcGFuZWwtZnVuY3Rpb25h bC5odG1sOgorICAgICAgICAqIGluc3BlY3Rvci9yZXBvcnQtQVBJLWVycm9ycy1leHBlY3RlZC50 eHQ6CisgICAgICAgICogaW5zcGVjdG9yL3JlcG9ydC1BUEktZXJyb3JzLmh0bWw6CisgICAgICAg ICogaW5zcGVjdG9yL3N0eWxlcy1zb3VyY2Utb2Zmc2V0cy5odG1sOgorCiAyMDEwLTA5LTE2ICBT YXRpc2ggU2FtcGF0aCAgPHNhdGlzaEBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQg YnkgSmVyZW15IE9ybG93LgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9pbnNw ZWN0b3IvaW5zcGVjdG9yLXRlc3QyLmpzIGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9pbnNwZWN0 b3IvaW5zcGVjdG9yLXRlc3QyLmpzCmluZGV4IGVhMmMyYzAuLjEyOGVjYzIgMTAwNjQ0Ci0tLSBh L0xheW91dFRlc3RzL2h0dHAvdGVzdHMvaW5zcGVjdG9yL2luc3BlY3Rvci10ZXN0Mi5qcworKysg Yi9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL2luc3BlY3Rvci9pbnNwZWN0b3ItdGVzdDIuanMKQEAg LTk0LDEzICs5NCwxMyBAQCBJbnNwZWN0b3JUZXN0LmVuYWJsZVJlc291cmNlVHJhY2tpbmcgPSBm dW5jdGlvbihjYWxsYmFjaykKICAgICAgICAgY2FsbGJhY2soKTsKICAgICBlbHNlIHsKICAgICAg ICAgSW5zcGVjdG9yVGVzdC5fcmVsb2FkUGFnZUNhbGxiYWNrID0gY2FsbGJhY2s7Ci0gICAgICAg IEluc3BlY3RvckJhY2tlbmQuZW5hYmxlUmVzb3VyY2VUcmFja2luZyhmYWxzZSk7CisgICAgICAg IFdlYkluc3BlY3Rvci5wYW5lbHMucmVzb3VyY2VzLl90b2dnbGVSZXNvdXJjZVRyYWNraW5nKCk7 CiAgICAgfQogfTsKIAogSW5zcGVjdG9yVGVzdC5kaXNhYmxlUmVzb3VyY2VUcmFja2luZyA9IGZ1 bmN0aW9uKCkKIHsKLSAgICBJbnNwZWN0b3JCYWNrZW5kLmRpc2FibGVSZXNvdXJjZVRyYWNraW5n KGZhbHNlKTsKKyAgICBXZWJJbnNwZWN0b3IucGFuZWxzLnJlc291cmNlcy5fdG9nZ2xlUmVzb3Vy Y2VUcmFja2luZygpOwogfTsKIAogSW5zcGVjdG9yVGVzdC5maW5kRE9NTm9kZSA9IGZ1bmN0aW9u KHJvb3QsIGZpbHRlciwgY2FsbGJhY2spCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9odHRwL3Rl c3RzL2luc3BlY3Rvci9yZXNvdXJjZS1wYXJhbWV0ZXJzLmh0bWwgYi9MYXlvdXRUZXN0cy9odHRw L3Rlc3RzL2luc3BlY3Rvci9yZXNvdXJjZS1wYXJhbWV0ZXJzLmh0bWwKaW5kZXggMzFmYmQ4OC4u MWIyOGJmMiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9pbnNwZWN0b3IvcmVz b3VyY2UtcGFyYW1ldGVycy5odG1sCisrKyBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvaW5zcGVj dG9yL3Jlc291cmNlLXBhcmFtZXRlcnMuaHRtbApAQCAtMzMsNyArMzMsNyBAQCBmdW5jdGlvbiBv bklmcmFtZUxvYWQoKQogZnVuY3Rpb24gZnJvbnRlbmRfZW5hYmxlUmVzb3VyY2VUcmFja2luZyh0 ZXN0Q29udHJvbGxlcikKIHsKICAgICBpZiAoIVdlYkluc3BlY3Rvci5wYW5lbHMucmVzb3VyY2Vz LnJlc291cmNlVHJhY2tpbmdFbmFibGVkKSB7Ci0gICAgICAgIEluc3BlY3RvckJhY2tlbmQuZW5h YmxlUmVzb3VyY2VUcmFja2luZyhmYWxzZSk7CisgICAgICAgIFdlYkluc3BlY3Rvci5wYW5lbHMu cmVzb3VyY2VzLl90b2dnbGVSZXNvdXJjZVRyYWNraW5nKCk7CiAgICAgICAgIHJldHVybiAiZW5h YmxpbmciOwogICAgIH0KICAgICByZXR1cm4gImVuYWJsZWQiOwpAQCAtNDMsNyArNDMsNyBAQCBm dW5jdGlvbiBmcm9udGVuZF9kdW1wRm9ybURhdGEodGVzdENvbnRyb2xsZXIpCiB7CiAgICAgdmFy IHJlc291cmNlID0gV2ViSW5zcGVjdG9yLnJlc291cmNlVVJMTWFwWyJodHRwOi8vbG9jYWxob3N0 OjgwMDAvaW5zcGVjdG9yL3Jlc291cmNlcy9wb3N0LXRhcmdldC5jZ2k/cXVlcnlQYXJhbTE9cXVl cnlWYWx1ZTEmcXVlcnlQYXJhbTI9Il07CiAKLSAgICBJbnNwZWN0b3JCYWNrZW5kLmRpc2FibGVS ZXNvdXJjZVRyYWNraW5nKGZhbHNlKTsKKyAgICBXZWJJbnNwZWN0b3IucGFuZWxzLnJlc291cmNl cy5fdG9nZ2xlUmVzb3VyY2VUcmFja2luZygpOwogCiAgICAgaWYgKCFyZXNvdXJjZSkgewogICAg ICAgICB0ZXN0Q29udHJvbGxlci5ub3RpZnlEb25lKCJObyByZXNvdXJjZSBmb3VuZCIpOwpkaWZm IC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2F1ZGl0cy1wYW5lbC1mdW5jdGlvbmFsLmh0 bWwgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvYXVkaXRzLXBhbmVsLWZ1bmN0aW9uYWwuaHRtbApp bmRleCBlN2EyODA0Li4yM2ZhNDkxIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3Iv YXVkaXRzLXBhbmVsLWZ1bmN0aW9uYWwuaHRtbAorKysgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3Iv YXVkaXRzLXBhbmVsLWZ1bmN0aW9uYWwuaHRtbApAQCAtMzQsNyArMzQsNyBAQCBmdW5jdGlvbiBk b2l0KCkKIGZ1bmN0aW9uIGZyb250ZW5kX3J1bkF1ZGl0cyh0ZXN0Q29udHJvbGxlcikKIHsKICAg ICBpZiAoIVdlYkluc3BlY3Rvci5wYW5lbHMucmVzb3VyY2VzLnJlc291cmNlVHJhY2tpbmdFbmFi bGVkKSB7Ci0gICAgICAgIEluc3BlY3RvckJhY2tlbmQuZW5hYmxlUmVzb3VyY2VUcmFja2luZyhm YWxzZSk7CisgICAgICAgIFdlYkluc3BlY3Rvci5wYW5lbHMucmVzb3VyY2VzLl90b2dnbGVSZXNv dXJjZVRyYWNraW5nKCk7CiAgICAgICAgIHJldHVybiAicmVmcmVzaGluZyI7CiAgICAgfQogCkBA IC01Miw3ICs1Miw3IEBAIGZ1bmN0aW9uIGZyb250ZW5kX3J1bkF1ZGl0cyh0ZXN0Q29udHJvbGxl cikKICAgICAgICAgICAgIC8vIEF1ZGl0cyBhcmUgZG9uZSwgY2hlY2sgcmVzdWx0cy4KICAgICAg ICAgICAgIHZhciBvdXRwdXQgPSBmcm9udGVuZF9jb2xsZWN0QXVkaXRSZXN1bHRzKCk7CiAgICAg ICAgICAgICAvLyBBdm9pZCBpbmZsdWVuY2luZyB0ZXN0cyB0aGF0IHJlcXVpcmUgcmVzb3VyY2Ug dHJhY2tpbmcgdG8gYmUgZGlzYWJsZWQuCi0gICAgICAgICAgICBJbnNwZWN0b3JCYWNrZW5kLmRp c2FibGVSZXNvdXJjZVRyYWNraW5nKGZhbHNlKTsKKyAgICAgICAgICAgIFdlYkluc3BlY3Rvci5w YW5lbHMucmVzb3VyY2VzLl90b2dnbGVSZXNvdXJjZVRyYWNraW5nKCk7CiAgICAgICAgICAgICB0 ZXN0Q29udHJvbGxlci5ydW5BZnRlclBlbmRpbmdEaXNwYXRjaGVzKGZ1bmN0aW9uKCkgewogICAg ICAgICAgICAgICAgIHRlc3RDb250cm9sbGVyLm5vdGlmeURvbmUob3V0cHV0LmpvaW4oIlxuIikp OwogICAgICAgICAgICAgfSk7CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvcmVw b3J0LUFQSS1lcnJvcnMtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL3JlcG9y dC1BUEktZXJyb3JzLWV4cGVjdGVkLnR4dAppbmRleCBkM2U1MDcyLi5hMmM1MDQzIDEwMDY0NAot LS0gYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvcmVwb3J0LUFQSS1lcnJvcnMtZXhwZWN0ZWQudHh0 CisrKyBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9yZXBvcnQtQVBJLWVycm9ycy1leHBlY3RlZC50 eHQKQEAgLTEsNyArMSw3IEBACiBUZXN0cyB0aGF0IEluc3BlY3RvckJhY2tlbmRTdHViIGlzIGNh dGNoaW5nIGluY29ycmVjdCBhcmd1bWVudHMuCiAKLVByb3RvY29sIEVycm9yOiBJbnZhbGlkIHR5 cGUgb2YgYXJndW1lbnQgJ2Fsd2F5cycgZm9yICdJbnNwZWN0b3JCYWNrZW5kLmVuYWJsZVJlc291 cmNlVHJhY2tpbmcnIGNhbGwuIEl0IHNob3VsZCBiZSAnYm9vbGVhbicgYnV0IGl0IGlzICdudW1i ZXInLgotUHJvdG9jb2wgRXJyb3I6IEludmFsaWQgbnVtYmVyIG9mIGFyZ3VtZW50cyBmb3IgJ0lu c3BlY3RvckJhY2tlbmQuZW5hYmxlUmVzb3VyY2VUcmFja2luZycgY2FsbC4gSXQgc2hvdWxkIGhh dmUgdGhlIG5leHQgYXJndW1lbnRzICd7ImFsd2F5cyI6ImJvb2xlYW4ifScuCi1Qcm90b2NvbCBF cnJvcjogT3B0aW9uYWwgY2FsbGJhY2sgYXJndW1lbnQgZm9yICdJbnNwZWN0b3JCYWNrZW5kLmVu YWJsZVJlc291cmNlVHJhY2tpbmcnIGNhbGwgc2hvdWxkIGJlIGEgZnVuY3Rpb24gYnV0IGl0cyB0 eXBlIGlzICdzdHJpbmcnLgorUHJvdG9jb2wgRXJyb3I6IEludmFsaWQgdHlwZSBvZiBhcmd1bWVu dCAnZW5hYmxlJyBmb3IgJ0luc3BlY3RvckJhY2tlbmQuc2V0TW9uaXRvcmluZ1hIUicgY2FsbC4g SXQgc2hvdWxkIGJlICdib29sZWFuJyBidXQgaXQgaXMgJ251bWJlcicuCitQcm90b2NvbCBFcnJv cjogSW52YWxpZCBudW1iZXIgb2YgYXJndW1lbnRzIGZvciAnSW5zcGVjdG9yQmFja2VuZC5zZXRN b25pdG9yaW5nWEhSJyBjYWxsLiBJdCBzaG91bGQgaGF2ZSB0aGUgbmV4dCBhcmd1bWVudHMgJ3si ZW5hYmxlIjoiYm9vbGVhbiJ9Jy4KK1Byb3RvY29sIEVycm9yOiBPcHRpb25hbCBjYWxsYmFjayBh cmd1bWVudCBmb3IgJ0luc3BlY3RvckJhY2tlbmQuc2V0TW9uaXRvcmluZ1hIUicgY2FsbCBzaG91 bGQgYmUgYSBmdW5jdGlvbiBidXQgaXRzIHR5cGUgaXMgJ3N0cmluZycuCiBQcm90b2NvbCBFcnJv cjogQXR0ZW1wdGVkIHRvIGRpc3BhdGNoIGFuIHVuaW1wbGVtZW50ZWQgV2ViSW5zcGVjdG9yIG1l dGhvZCAnc29tZXRoaW5nLXN0cmFuZ2UnCiAKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2luc3Bl Y3Rvci9yZXBvcnQtQVBJLWVycm9ycy5odG1sIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL3JlcG9y dC1BUEktZXJyb3JzLmh0bWwKaW5kZXggYzVkY2YxYS4uZWRkMmRmZSAxMDA2NDQKLS0tIGEvTGF5 b3V0VGVzdHMvaW5zcGVjdG9yL3JlcG9ydC1BUEktZXJyb3JzLmh0bWwKKysrIGIvTGF5b3V0VGVz dHMvaW5zcGVjdG9yL3JlcG9ydC1BUEktZXJyb3JzLmh0bWwKQEAgLTExLDkgKzExLDkgQEAgZnVu Y3Rpb24gdGVzdCgpCiAgICAgICAgIEluc3BlY3RvclRlc3QuYWRkUmVzdWx0KFN0cmluZy5zcHJp bnRmLmFwcGx5KHRoaXMsIGFyZ3VtZW50cykpOwogICAgIH0KIAotICAgIEluc3BlY3RvckJhY2tl bmQuZW5hYmxlUmVzb3VyY2VUcmFja2luZygxKTsKLSAgICBJbnNwZWN0b3JCYWNrZW5kLmVuYWJs ZVJlc291cmNlVHJhY2tpbmcoKTsKLSAgICBJbnNwZWN0b3JCYWNrZW5kLmVuYWJsZVJlc291cmNl VHJhY2tpbmcodHJ1ZSwgIm5vdCBhIGZ1bmN0aW9uIik7CisgICAgSW5zcGVjdG9yQmFja2VuZC5z ZXRNb25pdG9yaW5nWEhSKDEpOworICAgIEluc3BlY3RvckJhY2tlbmQuc2V0TW9uaXRvcmluZ1hI UigpOworICAgIEluc3BlY3RvckJhY2tlbmQuc2V0TW9uaXRvcmluZ1hIUih0cnVlLCAibm90IGEg ZnVuY3Rpb24iKTsKICAgICBJbnNwZWN0b3JCYWNrZW5kLnNldE1vbml0b3JpbmdYSFIodHJ1ZSwg dW5kZWZpbmVkKTsKICAgICBJbnNwZWN0b3JCYWNrZW5kLnNldE1vbml0b3JpbmdYSFIoZmFsc2Us IHVuZGVmaW5lZCk7CiAgICAgV2ViSW5zcGVjdG9yX3N5bmNEaXNwYXRjaCgneyJ0eXBlIjogImV2 ZW50IiwgImRvbWFpbiI6ICJkb20iLCAiZXZlbnQiOiAic29tZXRoaW5nLXN0cmFuZ2UiLCAiZGF0 YSI6IHt9fScpOwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL3N0eWxlcy1zb3Vy Y2Utb2Zmc2V0cy5odG1sIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL3N0eWxlcy1zb3VyY2Utb2Zm c2V0cy5odG1sCmluZGV4IDA1MzM2MTEuLmQ4NDBmNDMgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3Rz L2luc3BlY3Rvci9zdHlsZXMtc291cmNlLW9mZnNldHMuaHRtbAorKysgYi9MYXlvdXRUZXN0cy9p bnNwZWN0b3Ivc3R5bGVzLXNvdXJjZS1vZmZzZXRzLmh0bWwKQEAgLTI1LDcgKzI1LDcgQEAgZnVu Y3Rpb24gZG9pdCgpCiBmdW5jdGlvbiBmcm9udGVuZF9ydW5UZXN0KHRlc3RDb250cm9sbGVyKQog ewogICAgIGlmICghV2ViSW5zcGVjdG9yLnBhbmVscy5yZXNvdXJjZXMucmVzb3VyY2VUcmFja2lu Z0VuYWJsZWQpIHsKLSAgICAgICAgSW5zcGVjdG9yQmFja2VuZC5lbmFibGVSZXNvdXJjZVRyYWNr aW5nKGZhbHNlKTsKKyAgICAgICAgV2ViSW5zcGVjdG9yLnBhbmVscy5yZXNvdXJjZXMuX3RvZ2ds ZVJlc291cmNlVHJhY2tpbmcoKTsKICAgICAgICAgcmV0dXJuICJyZWZyZXNoaW5nIjsKICAgICB9 CiAKZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5k ZXggYzc2ZjMzYS4uOTAzYjY1MCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIv V2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyOCBAQAorMjAxMC0wOS0xNiAgSWx5YSBUaWto b25vdnNreSAgPGxvaXNsb0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogbW92ZSByZXNvdXJjZVRyYWNr aW5nIGZsYWcgdW5kZXIgY29udHJvbCBvZiBCYWNrZW5kU2V0dGluZ3MuCisKKyAgICAgICAgRm91 ciBJbnNwZWN0b3IgQVBJIG1ldGhvZHMgYWJvdXQgcmVzb3VyY2VUcmFja2luZyBmbGFnIHdlcmUg cmVtb3ZlZC4KKyAgICAgICAgQWN0dWFsIHN0YXRlIG9mIHRoZSBmbGFnIGlzIHRyYW5zZmVyZWQg YXMgdGhlIHJlc3BvbnNlIG9mIHNldFJlc291cmNlVHJhY2tpbmcgcmVxdWVzdC4KKyAgICAgICAg SW5pdGlhbCBzdGF0ZSBvZiB0aGUgZmxhZyBvbiB0aGUgZnJvbnRlbmQgc2lkZSBpcyBvYnRhaW5l ZCBmcm9tIHNldHRpbmdzLmJhY2tlbmQuCisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTQ1ODg3CisKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9y LmlkbDoKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxlci5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpJbnNwZWN0b3JDb250cm9sbGVyOjpnZXRCYWNrZW5kU2V0dGluZ3MpOgor ICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yQ29udHJvbGxlcjo6cG9wdWxhdGVTY3JpcHRPYmpl Y3RzKToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckNvbnRyb2xsZXI6OnNldFJlc291cmNl VHJhY2tpbmcpOgorICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JDb250cm9sbGVyLmg6Cisg ICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZXNQYW5lbC5qczoKKyAgICAgICAg KFdlYkluc3BlY3Rvci5SZXNvdXJjZXNQYW5lbC5wcm90b3R5cGUuX3RvZ2dsZVJlc291cmNlVHJh Y2tpbmcpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvU2V0dGluZ3MuanM6CisgICAg ICAgIChXZWJJbnNwZWN0b3IuU2V0dGluZ3MuaW5pdGlhbGl6ZS5wb3B1bGF0ZUJhY2tlbmRTZXR0 aW5ncyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2V0dGluZ3MuaW5pdGlhbGl6ZSk6CisgICAg ICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuanM6CisKIDIwMTAtMDktMTYgIEFu ZHJleSBLb3N5YWtvdiAgPGNhc2VxQGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBi eSBQYXZlbCBGZWxkbWFuLgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9y LmlkbCBiL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvci5pZGwKaW5kZXggMjZmMjY1My4uMDVj NTNhZCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yLmlkbAorKysgYi9X ZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3IuaWRsCkBAIC00Nyw4ICs0Nyw2IEBAIG1vZHVsZSBj b3JlIHsKICAgICAgICAgW25vdGlmeV0gdm9pZCByZW1vdmVSZXNvdXJjZShvdXQgdW5zaWduZWQg bG9uZyBpZGVudGlmaWVyKTsKICAgICAgICAgW25vdGlmeV0gdm9pZCByZXNldCgpOwogICAgICAg ICBbbm90aWZ5XSB2b2lkIHJlc2V0UHJvZmlsZXNQYW5lbCgpOwotICAgICAgICBbbm90aWZ5XSB2 b2lkIHJlc291cmNlVHJhY2tpbmdXYXNFbmFibGVkKCk7Ci0gICAgICAgIFtub3RpZnldIHZvaWQg cmVzb3VyY2VUcmFja2luZ1dhc0Rpc2FibGVkKCk7CiAgICAgICAgIFtub3RpZnldIHZvaWQgc2Vh cmNoaW5nRm9yTm9kZVdhc0VuYWJsZWQoKTsKICAgICAgICAgW25vdGlmeV0gdm9pZCBzZWFyY2hp bmdGb3JOb2RlV2FzRGlzYWJsZWQoKTsKICAgICAgICAgW25vdGlmeV0gdm9pZCBzZXRDaGlsZE5v ZGVzKG91dCBsb25nIHBhcmVudElkLCBvdXQgQXJyYXkgbm9kZXMpOwpAQCAtMTEwLDggKzEwOCw3 IEBAIG1vZHVsZSBjb3JlIHsKIAogICAgICAgICBbaGFuZGxlcj1Db250cm9sbGVyXSB2b2lkIHNl dE1vbml0b3JpbmdYSFIoaW4gYm9vbGVhbiBlbmFibGUsIG91dCBib29sZWFuIG5ld1N0YXRlKTsK IAotICAgICAgICBbaGFuZGxlcj1Db250cm9sbGVyXSB2b2lkIGVuYWJsZVJlc291cmNlVHJhY2tp bmcoaW4gYm9vbGVhbiBhbHdheXMpOwotICAgICAgICBbaGFuZGxlcj1Db250cm9sbGVyXSB2b2lk IGRpc2FibGVSZXNvdXJjZVRyYWNraW5nKGluIGJvb2xlYW4gYWx3YXlzKTsKKyAgICAgICAgW2hh bmRsZXI9Q29udHJvbGxlcl0gdm9pZCBzZXRSZXNvdXJjZVRyYWNraW5nKGluIGJvb2xlYW4gZW5h YmxlLCBpbiBib29sZWFuIGFsd2F5cywgb3V0IGJvb2xlYW4gbmV3U3RhdGUpOwogICAgICAgICBb aGFuZGxlcj1Db250cm9sbGVyXSB2b2lkIGdldFJlc291cmNlQ29udGVudChpbiB1bnNpZ25lZCBs b25nIGlkZW50aWZpZXIsIG91dCBTdHJpbmcgY29udGVudCk7CiAgICAgICAgIFtoYW5kbGVyPUNv bnRyb2xsZXJdIHZvaWQgcmVsb2FkUGFnZSgpOwogCmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3Bl Y3Rvci9JbnNwZWN0b3JDb250cm9sbGVyLmNwcCBiL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rv ckNvbnRyb2xsZXIuY3BwCmluZGV4IDNlODgxNWUuLjQyZDdhMzMgMTAwNjQ0Ci0tLSBhL1dlYkNv cmUvaW5zcGVjdG9yL0luc3BlY3RvckNvbnRyb2xsZXIuY3BwCisrKyBiL1dlYkNvcmUvaW5zcGVj dG9yL0luc3BlY3RvckNvbnRyb2xsZXIuY3BwCkBAIC0yNTIsNiArMjUyLDcgQEAgU3RyaW5nIElu c3BlY3RvckNvbnRyb2xsZXI6OmdldEJhY2tlbmRTZXR0aW5ncygpCiB7CiAgICAgUmVmUHRyPElu c3BlY3Rvck9iamVjdD4gcnVudGltZVNldHRpbmdzID0gSW5zcGVjdG9yT2JqZWN0OjpjcmVhdGUo KTsKICAgICBydW50aW1lU2V0dGluZ3MtPnNldEJvb2xlYW4obW9uaXRvcmluZ1hIUlNldHRpbmdO YW1lLCBtX21vbml0b3JpbmdYSFIpOworICAgIHJ1bnRpbWVTZXR0aW5ncy0+c2V0Qm9vbGVhbihy ZXNvdXJjZVRyYWNraW5nRW5hYmxlZFNldHRpbmdOYW1lLCBtX3Jlc291cmNlVHJhY2tpbmdFbmFi bGVkKTsKICAgICByZXR1cm4gcnVudGltZVNldHRpbmdzLT50b0pTT05TdHJpbmcoKTsKIH0KIApA QCAtNjEwLDkgKzYxMSw2IEBAIHZvaWQgSW5zcGVjdG9yQ29udHJvbGxlcjo6cG9wdWxhdGVTY3Jp cHRPYmplY3RzKCkKIAogICAgIHNob3dQYW5lbChtX3Nob3dBZnRlclZpc2libGUpOwogCi0gICAg aWYgKG1fcmVzb3VyY2VUcmFja2luZ0VuYWJsZWQpCi0gICAgICAgIG1fZnJvbnRlbmQtPnJlc291 cmNlVHJhY2tpbmdXYXNFbmFibGVkKCk7Ci0KICAgICBpZiAobV9zZWFyY2hpbmdGb3JOb2RlKQog ICAgICAgICBtX2Zyb250ZW5kLT5zZWFyY2hpbmdGb3JOb2RlV2FzRW5hYmxlZCgpOwogCkBAIC0x MTAxLDQwICsxMDk5LDM3IEBAIHZvaWQgSW5zcGVjdG9yQ29udHJvbGxlcjo6c2NyaXB0SW1wb3J0 ZWQodW5zaWduZWQgbG9uZyBpZGVudGlmaWVyLCBjb25zdCBTdHJpbmcmCiAgICAgICAgIHJlc291 cmNlLT51cGRhdGVTY3JpcHRPYmplY3QobV9mcm9udGVuZC5nZXQoKSk7CiB9CiAKLXZvaWQgSW5z cGVjdG9yQ29udHJvbGxlcjo6ZW5hYmxlUmVzb3VyY2VUcmFja2luZyhib29sIGFsd2F5cywgYm9v bCByZWxvYWQpCit2b2lkIEluc3BlY3RvckNvbnRyb2xsZXI6OnNldFJlc291cmNlVHJhY2tpbmco Ym9vbCBlbmFibGUsIGJvb2wgYWx3YXlzLCBib29sKiBuZXdTdGF0ZSkKIHsKLSAgICBpZiAoIWVu YWJsZWQoKSkKLSAgICAgICAgcmV0dXJuOworICAgICpuZXdTdGF0ZSA9IGVuYWJsZTsKIAogICAg IGlmIChhbHdheXMpCi0gICAgICAgIHNldFNldHRpbmcocmVzb3VyY2VUcmFja2luZ0VuYWJsZWRT ZXR0aW5nTmFtZSwgInRydWUiKTsKKyAgICAgICAgc2V0U2V0dGluZyhyZXNvdXJjZVRyYWNraW5n RW5hYmxlZFNldHRpbmdOYW1lLCBlbmFibGUgPyAidHJ1ZSIgOiAiZmFsc2UiKTsKIAotICAgIGlm IChtX3Jlc291cmNlVHJhY2tpbmdFbmFibGVkKQorICAgIGlmIChtX3Jlc291cmNlVHJhY2tpbmdF bmFibGVkID09IGVuYWJsZSkKICAgICAgICAgcmV0dXJuOwogCiAgICAgQVNTRVJUKG1faW5zcGVj dGVkUGFnZSk7Ci0gICAgbV9yZXNvdXJjZVRyYWNraW5nRW5hYmxlZCA9IHRydWU7Ci0gICAgaWYg KG1fZnJvbnRlbmQpCi0gICAgICAgIG1fZnJvbnRlbmQtPnJlc291cmNlVHJhY2tpbmdXYXNFbmFi bGVkKCk7Ci0gICAgbV9jbGllbnQtPnJlc291cmNlVHJhY2tpbmdXYXNFbmFibGVkKCk7CisgICAg bV9yZXNvdXJjZVRyYWNraW5nRW5hYmxlZCA9IGVuYWJsZTsKIAotICAgIGlmIChyZWxvYWQpCisg ICAgaWYoZW5hYmxlKSB7CisgICAgICAgIG1fY2xpZW50LT5yZXNvdXJjZVRyYWNraW5nV2FzRW5h YmxlZCgpOwogICAgICAgICBtX2luc3BlY3RlZFBhZ2UtPm1haW5GcmFtZSgpLT5yZWRpcmVjdFNj aGVkdWxlcigpLT5zY2hlZHVsZVJlZnJlc2godHJ1ZSk7CisgICAgfQorICAgIGVsc2UKKyAgICAg ICAgbV9jbGllbnQtPnJlc291cmNlVHJhY2tpbmdXYXNEaXNhYmxlZCgpOwogfQogCi12b2lkIElu c3BlY3RvckNvbnRyb2xsZXI6OmRpc2FibGVSZXNvdXJjZVRyYWNraW5nKGJvb2wgYWx3YXlzKQor dm9pZCBJbnNwZWN0b3JDb250cm9sbGVyOjpzZXRSZXNvdXJjZVRyYWNraW5nKGJvb2wgZW5hYmxl KQogewogICAgIGlmICghZW5hYmxlZCgpKQogICAgICAgICByZXR1cm47CiAKLSAgICBpZiAoYWx3 YXlzKQotICAgICAgICBzZXRTZXR0aW5nKHJlc291cmNlVHJhY2tpbmdFbmFibGVkU2V0dGluZ05h bWUsICJmYWxzZSIpOworICAgIGlmIChtX3Jlc291cmNlVHJhY2tpbmdFbmFibGVkID09IGVuYWJs ZSkKKyAgICAgICAgcmV0dXJuOwogCiAgICAgQVNTRVJUKG1faW5zcGVjdGVkUGFnZSk7Ci0gICAg bV9yZXNvdXJjZVRyYWNraW5nRW5hYmxlZCA9IGZhbHNlOwotICAgIGlmIChtX2Zyb250ZW5kKQot ICAgICAgICBtX2Zyb250ZW5kLT5yZXNvdXJjZVRyYWNraW5nV2FzRGlzYWJsZWQoKTsKLSAgICBt X2NsaWVudC0+cmVzb3VyY2VUcmFja2luZ1dhc0Rpc2FibGVkKCk7CisgICAgbV9yZXNvdXJjZVRy YWNraW5nRW5hYmxlZCA9IGVuYWJsZTsKIH0KIAogdm9pZCBJbnNwZWN0b3JDb250cm9sbGVyOjpl bnN1cmVTZXR0aW5nc0xvYWRlZCgpCmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9JbnNw ZWN0b3JDb250cm9sbGVyLmggYi9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDb250cm9sbGVy LmgKaW5kZXggODgwMTg0Ny4uMzc0NTdiMCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0b3Iv SW5zcGVjdG9yQ29udHJvbGxlci5oCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNv bnRyb2xsZXIuaApAQCAtMTcwLDggKzE3MCw4IEBAIHB1YmxpYzoKICAgICB2b2lkIHJlc291cmNl UmV0cmlldmVkQnlYTUxIdHRwUmVxdWVzdCh1bnNpZ25lZCBsb25nIGlkZW50aWZpZXIsIGNvbnN0 IFNjcmlwdFN0cmluZyYgc291cmNlU3RyaW5nLCBjb25zdCBTdHJpbmcmIHVybCwgY29uc3QgU3Ry aW5nJiBzZW5kVVJMLCB1bnNpZ25lZCBzZW5kTGluZU51bWJlcik7CiAgICAgdm9pZCBzY3JpcHRJ bXBvcnRlZCh1bnNpZ25lZCBsb25nIGlkZW50aWZpZXIsIGNvbnN0IFN0cmluZyYgc291cmNlU3Ry aW5nKTsKIAotICAgIHZvaWQgZW5hYmxlUmVzb3VyY2VUcmFja2luZyhib29sIGFsd2F5cyA9IGZh bHNlLCBib29sIHJlbG9hZCA9IHRydWUpOwotICAgIHZvaWQgZGlzYWJsZVJlc291cmNlVHJhY2tp bmcoYm9vbCBhbHdheXMgPSBmYWxzZSk7CisgICAgdm9pZCBzZXRSZXNvdXJjZVRyYWNraW5nKGJv b2wgZW5hYmxlKTsKKyAgICB2b2lkIHNldFJlc291cmNlVHJhY2tpbmcoYm9vbCBlbmFibGUsIGJv b2wgYWx3YXlzLCBib29sKiBuZXdTdGF0ZSk7CiAgICAgYm9vbCByZXNvdXJjZVRyYWNraW5nRW5h YmxlZCgpIGNvbnN0IHsgcmV0dXJuIG1fcmVzb3VyY2VUcmFja2luZ0VuYWJsZWQ7IH0KIAogICAg IHZvaWQgZW5zdXJlU2V0dGluZ3NMb2FkZWQoKTsKZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9SZXNvdXJjZXNQYW5lbC5qcyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9SZXNvdXJjZXNQYW5lbC5qcwppbmRleCBhZmNjM2U5Li4xMjJlMzFhIDEwMDY0NAotLS0g YS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VzUGFuZWwuanMKKysrIGIvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlc1BhbmVsLmpzCkBAIC03NTMsMTYgKzc1 MywyMyBAQCBXZWJJbnNwZWN0b3IuUmVzb3VyY2VzUGFuZWwucHJvdG90eXBlID0gewogCiAgICAg X3RvZ2dsZVJlc291cmNlVHJhY2tpbmc6IGZ1bmN0aW9uKG9wdGlvbmFsQWx3YXlzKQogICAgIHsK KyAgICAgICAgZnVuY3Rpb24gY2FsbGJhY2sobmV3U3RhdGUpIHsKKyAgICAgICAgICAgIGlmIChu ZXdTdGF0ZSkKKyAgICAgICAgICAgICAgICBXZWJJbnNwZWN0b3IucGFuZWxzLnJlc291cmNlcy5y ZXNvdXJjZVRyYWNraW5nV2FzRW5hYmxlZCgpOworICAgICAgICAgICAgZWxzZQorICAgICAgICAg ICAgICAgIFdlYkluc3BlY3Rvci5wYW5lbHMucmVzb3VyY2VzLnJlc291cmNlVHJhY2tpbmdXYXNE aXNhYmxlZCgpOworICAgICAgICB9CisKICAgICAgICAgaWYgKHRoaXMuX3Jlc291cmNlVHJhY2tp bmdFbmFibGVkKSB7CiAgICAgICAgICAgICB0aGlzLmxhcmdlclJlc291cmNlc0J1dHRvbi52aXNp YmxlID0gZmFsc2U7CiAgICAgICAgICAgICB0aGlzLnNvcnRpbmdTZWxlY3RFbGVtZW50LnZpc2li bGUgPSBmYWxzZTsKICAgICAgICAgICAgIFdlYkluc3BlY3Rvci5yZXNvdXJjZXMgPSB7fTsKICAg ICAgICAgICAgIFdlYkluc3BlY3Rvci5yZXNvdXJjZVVSTE1hcCA9IHt9OwotICAgICAgICAgICAg SW5zcGVjdG9yQmFja2VuZC5kaXNhYmxlUmVzb3VyY2VUcmFja2luZyh0cnVlKTsKKyAgICAgICAg ICAgIEluc3BlY3RvckJhY2tlbmQuc2V0UmVzb3VyY2VUcmFja2luZyhmYWxzZSwgdHJ1ZSwgY2Fs bGJhY2spOwogICAgICAgICB9IGVsc2UgewogICAgICAgICAgICAgdGhpcy5sYXJnZXJSZXNvdXJj ZXNCdXR0b24udmlzaWJsZSA9IHRydWU7CiAgICAgICAgICAgICB0aGlzLnNvcnRpbmdTZWxlY3RF bGVtZW50LnZpc2libGUgPSB0cnVlOwotICAgICAgICAgICAgSW5zcGVjdG9yQmFja2VuZC5lbmFi bGVSZXNvdXJjZVRyYWNraW5nKCEhb3B0aW9uYWxBbHdheXMpOworICAgICAgICAgICAgSW5zcGVj dG9yQmFja2VuZC5zZXRSZXNvdXJjZVRyYWNraW5nKHRydWUsICEhb3B0aW9uYWxBbHdheXMsIGNh bGxiYWNrKTsKICAgICAgICAgfQogICAgIH0sCiAKZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9TZXR0aW5ncy5qcyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9T ZXR0aW5ncy5qcwppbmRleCAwNWZkMjVlLi41MmE4YmQwIDEwMDY0NAotLS0gYS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvU2V0dGluZ3MuanMKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL1NldHRpbmdzLmpzCkBAIC04Nyw2ICs4NywxMCBAQCBXZWJJbnNwZWN0b3IuU2V0dGlu Z3MuaW5pdGlhbGl6ZSA9IGZ1bmN0aW9uKCkKICAgICAgICAgdmFyIHNldHRpbmdzID0gSlNPTi5w YXJzZShzZXR0aW5nc1N0cmluZyk7CiAKICAgICAgICAgV2ViSW5zcGVjdG9yLm1vbml0b3JpbmdY SFJFbmFibGVkID0gc2V0dGluZ3MubW9uaXRvcmluZ1hIUkVuYWJsZWQ7CisgICAgICAgIGlmIChz ZXR0aW5ncy5yZXNvdXJjZVRyYWNraW5nRW5hYmxlZCkKKyAgICAgICAgICAgIFdlYkluc3BlY3Rv ci5wYW5lbHMucmVzb3VyY2VzLnJlc291cmNlVHJhY2tpbmdXYXNFbmFibGVkKCk7CisgICAgICAg IGVsc2UKKyAgICAgICAgICAgIFdlYkluc3BlY3Rvci5wYW5lbHMucmVzb3VyY2VzLnJlc291cmNl VHJhY2tpbmdXYXNEaXNhYmxlZCgpOwogICAgIH0KIAogICAgIEluc3BlY3RvckJhY2tlbmQuZ2V0 U2V0dGluZ3MoZnVuY3Rpb24oc2V0dGluZ3MpIHsKZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuanMgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv aW5zcGVjdG9yLmpzCmluZGV4IGRhNzdkZTMuLjcwNGYxNmEgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuanMKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL2luc3BlY3Rvci5qcwpAQCAtMTM3MywxNiArMTM3Myw2IEBAIFdlYkluc3BlY3Rv ci51cGRhdGVOZXR3b3JrU3RhdGUgPSBmdW5jdGlvbihpc05vd09ubGluZSkKICAgICB0aGlzLnBh bmVscy5zdG9yYWdlLnVwZGF0ZU5ldHdvcmtTdGF0ZShpc05vd09ubGluZSk7CiB9CiAKLVdlYklu c3BlY3Rvci5yZXNvdXJjZVRyYWNraW5nV2FzRW5hYmxlZCA9IGZ1bmN0aW9uKCkKLXsKLSAgICB0 aGlzLnBhbmVscy5yZXNvdXJjZXMucmVzb3VyY2VUcmFja2luZ1dhc0VuYWJsZWQoKTsKLX0KLQot V2ViSW5zcGVjdG9yLnJlc291cmNlVHJhY2tpbmdXYXNEaXNhYmxlZCA9IGZ1bmN0aW9uKCkKLXsK LSAgICB0aGlzLnBhbmVscy5yZXNvdXJjZXMucmVzb3VyY2VUcmFja2luZ1dhc0Rpc2FibGVkKCk7 Ci19Ci0KIFdlYkluc3BlY3Rvci5zZWFyY2hpbmdGb3JOb2RlV2FzRW5hYmxlZCA9IGZ1bmN0aW9u KCkKIHsKICAgICB0aGlzLnBhbmVscy5lbGVtZW50cy5zZWFyY2hpbmdGb3JOb2RlV2FzRW5hYmxl ZCgpOwpkaWZmIC0tZ2l0IGEvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZyBiL1dlYktpdC9jaHJv bWl1bS9DaGFuZ2VMb2cKaW5kZXggYWExMzdlYS4uZDk0ZDhlMiAxMDA2NDQKLS0tIGEvV2ViS2l0 L2Nocm9taXVtL0NoYW5nZUxvZworKysgYi9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBAIC0x LDMgKzEsMTkgQEAKKzIwMTAtMDktMTYgIElseWEgVGlraG9ub3Zza3kgIDxsb2lzbG9AY2hyb21p dW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IFdlYiBJbnNwZWN0b3I6IG1vdmUgcmVzb3VyY2VUcmFja2luZyBmbGFnIHVuZGVyIGNvbnRyb2wg b2YgQmFja2VuZFNldHRpbmdzLgorCisgICAgICAgIEZvdXIgSW5zcGVjdG9yIEFQSSBtZXRob2Rz IGFib3V0IHJlc291cmNlVHJhY2tpbmcgZmxhZyB3ZXJlIHJlbW92ZWQuCisgICAgICAgIEFjdHVh bCBzdGF0ZSBvZiB0aGUgZmxhZyBpcyB0cmFuc2ZlcmVkIGFzIHRoZSByZXNwb25zZSBvZiBzZXRS ZXNvdXJjZVRyYWNraW5nIHJlcXVlc3QuCisgICAgICAgIEluaXRpYWwgc3RhdGUgb2YgdGhlIGZs YWcgb24gdGhlIGZyb250ZW5kIHNpZGUgaXMgb2J0YWluZWQgZnJvbSBzZXR0aW5ncy5iYWNrZW5k LgorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00NTg4 NworCisgICAgICAgICogc3JjL1dlYkRldlRvb2xzQWdlbnRJbXBsLmNwcDoKKyAgICAgICAgKFdl YktpdDo6V2ViRGV2VG9vbHNBZ2VudEltcGw6OnNldFJ1bnRpbWVQcm9wZXJ0eSk6CisgICAgICAg IChXZWJLaXQ6OldlYkRldlRvb2xzQWdlbnRJbXBsOjpzZXRBcHVBZ2VudEVuYWJsZWQpOgorCiAy MDEwLTA5LTE2ICBFcmljIFVocmhhbmUgIDxlcmljdUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAg UmV2aWV3ZWQgYnkgSmlhbiBMaS4KZGlmZiAtLWdpdCBhL1dlYktpdC9jaHJvbWl1bS9zcmMvV2Vi RGV2VG9vbHNBZ2VudEltcGwuY3BwIGIvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJEZXZUb29sc0Fn ZW50SW1wbC5jcHAKaW5kZXggODM0ZDM1Mi4uYmIwMDM0MCAxMDA2NDQKLS0tIGEvV2ViS2l0L2No cm9taXVtL3NyYy9XZWJEZXZUb29sc0FnZW50SW1wbC5jcHAKKysrIGIvV2ViS2l0L2Nocm9taXVt L3NyYy9XZWJEZXZUb29sc0FnZW50SW1wbC5jcHAKQEAgLTI1OCwxMCArMjU4LDcgQEAgdm9pZCBX ZWJEZXZUb29sc0FnZW50SW1wbDo6c2V0UnVudGltZVByb3BlcnR5KGNvbnN0IFdlYlN0cmluZyYg bmFtZSwgY29uc3QgV2ViU3QKICAgICAgICAgc2V0VGltZWxpbmVQcm9maWxpbmdFbmFibGVkKHZh bHVlID09ICJ0cnVlIik7CiAgICAgZWxzZSBpZiAobmFtZSA9PSBrUmVzb3VyY2VUcmFja2luZ0Zl YXR1cmVOYW1lKSB7CiAgICAgICAgIEluc3BlY3RvckNvbnRyb2xsZXIqIGljID0gaW5zcGVjdG9y Q29udHJvbGxlcigpOwotICAgICAgICBpZiAodmFsdWUgPT0gInRydWUiKQotICAgICAgICAgIGlj LT5lbmFibGVSZXNvdXJjZVRyYWNraW5nKGZhbHNlIC8qIG5vdCBzdGlja3kgKi8sIGZhbHNlIC8q IG5vIHJlbG9hZCAqLyk7Ci0gICAgICAgIGVsc2UKLSAgICAgICAgICBpYy0+ZGlzYWJsZVJlc291 cmNlVHJhY2tpbmcoZmFsc2UgLyogbm90IHN0aWNreSAqLyk7CisgICAgICAgIGljLT5zZXRSZXNv dXJjZVRyYWNraW5nKHZhbHVlID09ICJ0cnVlIiA/IHRydWUgOiBmYWxzZSk7CiAgICAgfSBlbHNl IGlmIChuYW1lID09IGtGcm9udGVuZENvbm5lY3RlZEZlYXR1cmVOYW1lICYmICFpbnNwZWN0b3JD b250cm9sbGVyKCktPmhhc0Zyb250ZW5kKCkpIHsKICAgICAgICAgaW5zcGVjdG9yQ29udHJvbGxl cigpLT5pbmplY3RlZFNjcmlwdEhvc3QoKS0+c2V0SW5qZWN0ZWRTY3JpcHRTb3VyY2UodmFsdWUp OwogICAgICAgICBmcm9udGVuZExvYWRlZCgpOwpAQCAtMjgwLDEzICsyNzcsMTMgQEAgdm9pZCBX ZWJEZXZUb29sc0FnZW50SW1wbDo6c2V0QXB1QWdlbnRFbmFibGVkKGJvb2wgZW5hYmxlZCkKICAg ICAgICAgaWYgKCFtX3Jlc291cmNlVHJhY2tpbmdXYXNFbmFibGVkKSB7CiAgICAgICAgICAgICAv LyBUT0RPKGtub3J0b24pOiBJbnRyb2R1Y2Ugc29tZSBraW5kIG9mIGFnZW50cyBkZXBlbmRlbmN5 IGhlcmUgc28gdGhhdAogICAgICAgICAgICAgLy8gdXNlciBjb3VsZCB0dXJuIG9mZiByZXNvdXJj ZSB0cmFja2luZyB3aGlsZSBhcHUgYWdlbnQgaXMgb24uCi0gICAgICAgICAgICBpYy0+ZW5hYmxl UmVzb3VyY2VUcmFja2luZyhmYWxzZSwgZmFsc2UpOworICAgICAgICAgICAgaWMtPnNldFJlc291 cmNlVHJhY2tpbmcodHJ1ZSk7CiAgICAgICAgIH0KICAgICAgICAgbV9kZWJ1Z2dlckFnZW50SW1w bC0+c2V0QXV0b0NvbnRpbnVlT25FeGNlcHRpb24odHJ1ZSk7CiAgICAgfSBlbHNlIHsKICAgICAg IGljLT5zdG9wVGltZWxpbmVQcm9maWxlcigpOwogICAgICAgaWYgKCFtX3Jlc291cmNlVHJhY2tp bmdXYXNFbmFibGVkKQotICAgICAgICAgIGljLT5kaXNhYmxlUmVzb3VyY2VUcmFja2luZyhmYWxz ZSk7CisgICAgICAgICAgaWMtPnNldFJlc291cmNlVHJhY2tpbmcoZmFsc2UpOwogICAgICAgbV9y ZXNvdXJjZVRyYWNraW5nV2FzRW5hYmxlZCA9IGZhbHNlOwogICAgIH0KICAgICBtX2NsaWVudC0+ cnVudGltZVByb3BlcnR5Q2hhbmdlZCgK