92545 2012-07-27 13:54:37 -0700 Web Inspector: rename WorkerAgent.setWorkerInspectionEnabled to WorkerAgent.enable and make it return error 2012-08-07 00:18:10 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 pfeldman yurys apavlov bweinstein joepeck keishi kpiascik loislo ossy pfeldman pmuellr rik timothy vivekgalatage webkit.review.bot yurys oldest_to_newest 681055 0 pfeldman 2012-07-27 13:54:37 -0700 WorkerAgent.enable should return error for the backends that don't support workers. There should be no Preference.exposeWorkersInspection since inspection only depends on the backend capabilities. 681768 1 yurys 2012-07-30 01:26:01 -0700 I think this bug mixes two problems that should be addressed separately: 1) WorkerAgent.setWorkerInspectionEnabled should be split into WorkerAgent.enable/disable to be aligned with the naming scheme used in other domains. 2) Preference.exposeWorkersInspection is used to check if the front-end on the given platform supports worker inspection. At the moment we cannot create worker inspector front-end window on Mac e.g. Which mechanism should be used to handle this? 681974 2 pfeldman 2012-07-30 06:44:02 -0700 (In reply to comment #1) > I think this bug mixes two problems that should be addressed separately: > 1) WorkerAgent.setWorkerInspectionEnabled should be split into WorkerAgent.enable/disable to be aligned with the naming scheme used in other domains. > 2) Preference.exposeWorkersInspection is used to check if the front-end on the given platform supports worker inspection. At the moment we cannot create worker inspector front-end window on Mac e.g. Which mechanism should be used to handle this? It should then be a part of the InspectorFrontendHost. I.e. host tells front-end whether it is capable of opening new windows. I agree that these are two changes, but the first one looks minor. 688049 3 156671 yurys 2012-08-06 05:42:33 -0700 Created attachment 156671 Patch 688093 4 yurys 2012-08-06 06:52:07 -0700 Committed r124765: <http://trac.webkit.org/changeset/124765> 688258 5 ossy 2012-08-06 10:38:47 -0700 (In reply to comment #4) > Committed r124765: <http://trac.webkit.org/changeset/124765> It broke an inspector test: http/tests/inspector-enabled/dedicated-workers-list.html --- /Volumes/Data/slave/lion-release-tests-wk1/build/layout-test-results/http/tests/inspector-enabled/dedicated-workers-list-expected.txt +++ /Volumes/Data/slave/lion-release-tests-wk1/build/layout-test-results/http/tests/inspector-enabled/dedicated-workers-list-actual.txt @@ -2,8 +2,5 @@ CONSOLE MESSAGE: line 20: Received message from worker 2 Tests that dedicated workers created before worker inspection was enabled will be reported to the front-end. Bug 72020 -Worker inspection enabled -Added worker: 1 -Added worker: 2 -Done. +error: Exception during test execution: TypeError: 'undefined' is not a function (evaluating 'WorkerAgent.setWorkerInspectionEnabled(false, didDisableWorkerInspection)') ------ It seems it was a trivial bug, I landed the fix in https://trac.webkit.org/changeset/124781 688904 6 yurys 2012-08-07 00:18:10 -0700 (In reply to comment #5) > (In reply to comment #4) > > Committed r124765: <http://trac.webkit.org/changeset/124765> > ------ > > It seems it was a trivial bug, I landed the fix in https://trac.webkit.org/changeset/124781 Thanks for fixing that! 156671 2012-08-06 05:42:33 -0700 2012-08-06 10:39:20 -0700 Patch bug-92545-20120806164208.patch text/plain 13631 yurys U3VidmVyc2lvbiBSZXZpc2lvbjogMTI0NzUzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTI2NjBhNTRmOWRhMjlh ZTM2ZjI1OWY0ZWM5MGJkZmZkYTg2OWNjOS4uNzFiMmI3YzdjNzM0MDllMGIyZWI0ZmI1NzIwNDA5 NDliZTA2NTlkMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM4IEBACisyMDEyLTA4LTA2ICBZdXJ5 IFNlbWlraGF0c2t5ICA8eXVyeXNAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IHJlbmFtZSBXb3JrZXJBZ2VudC5zZXRXb3JrZXJJbnNwZWN0aW9uRW5hYmxlZCB0byBXb3Jr ZXJBZ2VudC5lbmFibGUgYW5kIG1ha2UgaXQgcmV0dXJuIGVycm9yCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05MjU0NQorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIC0gUmVwbGFjZWQgV29ya2VyQWdlbnQuc2V0 V29ya2VySW5zcGVjdGlvbkVuYWJsZWQgd2l0aCBXb3JrZXJBZ2VudC5lbmFibGUvZGlzYWJsZQor ICAgICAgICAtIFJlcGxhY2VkIFByZWZlcmVuY2VzLmV4cG9zZVdvcmtlcnNJbnNwZWN0aW9uIHdp dGggSW5zcGVjdG9yRnJvbnRlbmRIb3N0LmNhbkluc3BlY3RXb3JrZXJzKCkKKyAgICAgICAgICB0 aGF0IHRlbGxzIGlmIGluc3BlY3RvciBmcm9udC1lbmQgb24gdGhlIGdpdmVuIHBsYXRmb3JtIGNh biBsYXVuY2ggZGVkaWNhdGVkIHdvcmtlcgorICAgICAgICAgIGZyb250LWVuZC4KKworICAgICAg ICAqIGluc3BlY3Rvci9JbnNwZWN0b3IuanNvbjoKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVj dG9yRnJvbnRlbmRDbGllbnQuaDoKKyAgICAgICAgKEluc3BlY3RvckZyb250ZW5kQ2xpZW50KToK KyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yRnJvbnRlbmRDbGllbnRMb2NhbC5oOgorICAg ICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yRnJvbnRlbmRDbGllbnRMb2NhbDo6Y2FuSW5zcGVjdFdv cmtlcnMpOgorICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JGcm9udGVuZEhvc3QuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yRnJvbnRlbmRIb3N0OjpjYW5JbnNwZWN0V29ya2Vy cyk6CisgICAgICAgIChXZWJDb3JlKToKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yRnJv bnRlbmRIb3N0Lmg6CisgICAgICAgIChJbnNwZWN0b3JGcm9udGVuZEhvc3QpOgorICAgICAgICAq IGluc3BlY3Rvci9JbnNwZWN0b3JGcm9udGVuZEhvc3QuaWRsOgorICAgICAgICAqIGluc3BlY3Rv ci9JbnNwZWN0b3JXb3JrZXJBZ2VudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JX b3JrZXJBZ2VudDo6ZW5hYmxlKToKKyAgICAgICAgKFdlYkNvcmUpOgorICAgICAgICAoV2ViQ29y ZTo6SW5zcGVjdG9yV29ya2VyQWdlbnQ6OmRpc2FibGUpOgorICAgICAgICAqIGluc3BlY3Rvci9J bnNwZWN0b3JXb3JrZXJBZ2VudC5oOgorICAgICAgICAoSW5zcGVjdG9yV29ya2VyQWdlbnQpOgor ICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvSW5zcGVjdG9yRnJvbnRlbmRIb3N0U3R1Yi5q czoKKyAgICAgICAgKC5XZWJJbnNwZWN0b3IuSW5zcGVjdG9yRnJvbnRlbmRIb3N0U3R1Yi5wcm90 b3R5cGUuc2V0Wm9vbUZhY3Rvcik6CisgICAgICAgICguV2ViSW5zcGVjdG9yLkluc3BlY3RvckZy b250ZW5kSG9zdFN0dWIucHJvdG90eXBlLmNhbkluc3BlY3RXb3JrZXJzKToKKyAgICAgICAgKiBp bnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdHNQYW5lbC5qczoKKyAgICAgICAgKiBpbnNwZWN0b3Iv ZnJvbnQtZW5kL1NldHRpbmdzLmpzOgorCiAyMDEyLTA4LTA2ICBLZWlzaGkgSGF0dG9yaSAgPGtl aXNoaUB3ZWJraXQub3JnPgogCiAgICAgICAgIFJlbW92ZSBtaW5pbXVtIHdpbmRvdyBzaXplIGZv ciBQYWdlUG9wdXAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9n IGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKaW5kZXggNzk5MzRhYzY2MTI4YTg2 M2EyMjc5MGEzMGUwZGVjZjU1NDc2MTNkNi4uODEyNjM5MWE5YWRmNjc4OGQwYmI1Yzg2Y2I3Zjc4 NTQ2MDkxNDZlOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cK KysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMSBAQAor MjAxMi0wOC0wNiAgWXVyeSBTZW1pa2hhdHNreSAgPHl1cnlzQGNocm9taXVtLm9yZz4KKworICAg ICAgICBXZWIgSW5zcGVjdG9yOiByZW5hbWUgV29ya2VyQWdlbnQuc2V0V29ya2VySW5zcGVjdGlv bkVuYWJsZWQgdG8gV29ya2VyQWdlbnQuZW5hYmxlIGFuZCBtYWtlIGl0IHJldHVybiBlcnJvcgor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTI1NDUKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZXBsYWNlZCBQ cmVmZXJlbmNlcy5leHBvc2VXb3JrZXJzSW5zcGVjdGlvbiB3aXRoIEluc3BlY3RvckZyb250ZW5k SG9zdC5jYW5JbnNwZWN0V29ya2VycygpCisgICAgICAgIHRoYXQgdGVsbHMgaWYgaW5zcGVjdG9y IGZyb250LWVuZCBvbiB0aGUgZ2l2ZW4gcGxhdGZvcm0gY2FuIGxhdW5jaCBkZWRpY2F0ZWQgd29y a2VyCisgICAgICAgIGZyb250LWVuZC4KKworICAgICAgICAqIHNyYy9JbnNwZWN0b3JGcm9udGVu ZENsaWVudEltcGwuY3BwOgorICAgICAgICAoV2ViS2l0OjpJbnNwZWN0b3JGcm9udGVuZENsaWVu dEltcGw6OmNhbkluc3BlY3RXb3JrZXJzKToKKyAgICAgICAgKFdlYktpdCk6CisgICAgICAgICog c3JjL0luc3BlY3RvckZyb250ZW5kQ2xpZW50SW1wbC5oOgorICAgICAgICAoSW5zcGVjdG9yRnJv bnRlbmRDbGllbnRJbXBsKToKKyAgICAgICAgKiBzcmMvanMvRGV2VG9vbHMuanM6CisKIDIwMTIt MDgtMDYgIEtlaXNoaSBIYXR0b3JpICA8a2Vpc2hpQHdlYmtpdC5vcmc+CiAKICAgICAgICAgUmVt b3ZlIG1pbmltdW0gd2luZG93IHNpemUgZm9yIFBhZ2VQb3B1cApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvci5qc29uIGIvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL0luc3BlY3Rvci5qc29uCmluZGV4IGU2YTQxZmYzOGY2MzlhZDViODBhYzIwYjc3NTkyMzQ0 ZTY0MzY2NWUuLmRhNTdjYTk3MGIzZmVkOTUyMmZiNDY2YmQwNjc5N2NmYTIyMmJkODAgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3IuanNvbgorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yLmpzb24KQEAgLTI5OTcsMTAgKzI5OTcsMTAg QEAKICAgICAgICAgInR5cGVzIjogW10sCiAgICAgICAgICJjb21tYW5kcyI6IFsKICAgICAgICAg ICAgIHsKLSAgICAgICAgICAgICAgICAibmFtZSI6ICJzZXRXb3JrZXJJbnNwZWN0aW9uRW5hYmxl ZCIsCi0gICAgICAgICAgICAgICAgInBhcmFtZXRlcnMiOiBbCi0gICAgICAgICAgICAgICAgICAg IHsgIm5hbWUiOiAidmFsdWUiLCAidHlwZSI6ICJib29sZWFuIiB9Ci0gICAgICAgICAgICAgICAg XQorICAgICAgICAgICAgICAgICJuYW1lIjogImVuYWJsZSIKKyAgICAgICAgICAgIH0sCisgICAg ICAgICAgICB7CisgICAgICAgICAgICAgICAgIm5hbWUiOiAiZGlzYWJsZSIKICAgICAgICAgICAg IH0sCiAgICAgICAgICAgICB7CiAgICAgICAgICAgICAgICAgIm5hbWUiOiAic2VuZE1lc3NhZ2VU b1dvcmtlciIsCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9y RnJvbnRlbmRDbGllbnQuaCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JGcm9u dGVuZENsaWVudC5oCmluZGV4IDY1NWQ1OWYwZWRhZGUwNDgxY2FkNWRhMTcwYjQ4NDY0MzJhZjNk YWYuLmM0NjFmZDk5YzViYzEzMWI5ZTQxYzAzMmU3MDFjODkyOGE4ZmQwYzcgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JGcm9udGVuZENsaWVudC5oCisrKyBi L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JGcm9udGVuZENsaWVudC5oCkBAIC02 Miw2ICs2Miw3IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIGJvb2wgY2FuU2F2ZSgpID0gMDsKICAg ICB2aXJ0dWFsIHZvaWQgc2F2ZShjb25zdCBXVEY6OlN0cmluZyYgdXJsLCBjb25zdCBXVEY6OlN0 cmluZyYgY29udGVudCwgYm9vbCBmb3JjZVNhdmVBcykgPSAwOwogICAgIHZpcnR1YWwgdm9pZCBh cHBlbmQoY29uc3QgV1RGOjpTdHJpbmcmIHVybCwgY29uc3QgV1RGOjpTdHJpbmcmIGNvbnRlbnQp ID0gMDsKKyAgICB2aXJ0dWFsIGJvb2wgY2FuSW5zcGVjdFdvcmtlcnMoKSA9IDA7CiAKICAgICB2 aXJ0dWFsIHZvaWQgaW5zcGVjdGVkVVJMQ2hhbmdlZChjb25zdCBTdHJpbmcmKSA9IDA7CiAKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JGcm9udGVuZENsaWVu dExvY2FsLmggYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRnJvbnRlbmRDbGll bnRMb2NhbC5oCmluZGV4IGYzOTcxZmQ1NWFjZTI4NjFkYzUwYzJiMjI3MDFlNGJlYTliMWIzODku LjQwMjczOTdhY2Q2NDVjYjgyM2EyNWRmZTE2MzA0ZTU0YjdjODhkMTMgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JGcm9udGVuZENsaWVudExvY2FsLmgKKysr IGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckZyb250ZW5kQ2xpZW50TG9jYWwu aApAQCAtNzEsNiArNzEsNyBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCBib29sIGNhblNhdmUoKSB7 IHJldHVybiBmYWxzZTsgfQogICAgIHZpcnR1YWwgdm9pZCBzYXZlKGNvbnN0IFN0cmluZyYsIGNv bnN0IFN0cmluZyYsIGJvb2wpIHsgfQogICAgIHZpcnR1YWwgdm9pZCBhcHBlbmQoY29uc3QgU3Ry aW5nJiwgY29uc3QgU3RyaW5nJikgeyB9CisgICAgdmlydHVhbCBib29sIGNhbkluc3BlY3RXb3Jr ZXJzKCkgeyByZXR1cm4gZmFsc2U7IH0KIAogICAgIHZpcnR1YWwgdm9pZCBhdHRhY2hXaW5kb3co KSA9IDA7CiAgICAgdmlydHVhbCB2b2lkIGRldGFjaFdpbmRvdygpID0gMDsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JGcm9udGVuZEhvc3QuY3BwIGIvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckZyb250ZW5kSG9zdC5jcHAKaW5kZXggOTYz ZDliYTc1YzMxYjQxMjA5ZDdmZmY3MWZjZmNhNDQzYTE3NmU2ZC4uYzlmOWFjOTViZWNhYzIyMjA0 MDc4YTBlZjM1NGRmN2Y2OTVmNzliZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL0luc3BlY3RvckZyb250ZW5kSG9zdC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL0luc3BlY3RvckZyb250ZW5kSG9zdC5jcHAKQEAgLTI1MCw2ICsyNTAsMTcgQEAgdm9pZCBJ bnNwZWN0b3JGcm9udGVuZEhvc3Q6OmFwcGVuZChjb25zdCBTdHJpbmcmIHVybCwgY29uc3QgU3Ry aW5nJiBjb250ZW50KQogICAgICAgICBtX2NsaWVudC0+YXBwZW5kKHVybCwgY29udGVudCk7CiB9 CiAKK2Jvb2wgSW5zcGVjdG9yRnJvbnRlbmRIb3N0OjpjYW5JbnNwZWN0V29ya2VycygpCit7Cisj aWYgRU5BQkxFKFdPUktFUlMpCisgICAgaWYgKG1fY2xpZW50KQorICAgICAgICByZXR1cm4gbV9j bGllbnQtPmNhbkluc3BlY3RXb3JrZXJzKCk7CisgICAgcmV0dXJuIGZhbHNlOworI2Vsc2UKKyAg ICByZXR1cm4gZmFsc2U7CisjZW5kaWYKK30KKwogdm9pZCBJbnNwZWN0b3JGcm9udGVuZEhvc3Q6 OnNlbmRNZXNzYWdlVG9CYWNrZW5kKGNvbnN0IFN0cmluZyYgbWVzc2FnZSkKIHsKICAgICBpZiAo bV9jbGllbnQpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9y RnJvbnRlbmRIb3N0LmggYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRnJvbnRl bmRIb3N0LmgKaW5kZXggNjc0YTVhMmIzYTBkZTgwZDgzMWVkZjA2ODQ3MzA2MzNiZDM5ZmNlOS4u OTYzM2Q4Mjk2OTBjNjFmOWFhYmMxNTcxNjcyYjljZTFlZjhmMDhmYiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckZyb250ZW5kSG9zdC5oCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JGcm9udGVuZEhvc3QuaApAQCAtNzksNiArNzks OCBAQCBwdWJsaWM6CiAgICAgdm9pZCBzYXZlKGNvbnN0IFN0cmluZyYgdXJsLCBjb25zdCBTdHJp bmcmIGNvbnRlbnQsIGJvb2wgZm9yY2VTYXZlQXMpOwogICAgIHZvaWQgYXBwZW5kKGNvbnN0IFN0 cmluZyYgdXJsLCBjb25zdCBTdHJpbmcmIGNvbnRlbnQpOwogCisgICAgYm9vbCBjYW5JbnNwZWN0 V29ya2VycygpOworCiAgICAgLy8gQ2FsbGVkIGZyb20gW0N1c3RvbV0gaW1wbGVtZW50YXRpb25z LgogICAgIHZvaWQgc2hvd0NvbnRleHRNZW51KEV2ZW50KiwgY29uc3QgVmVjdG9yPENvbnRleHRN ZW51SXRlbT4mIGl0ZW1zKTsKICAgICB2b2lkIHNlbmRNZXNzYWdlVG9CYWNrZW5kKGNvbnN0IFN0 cmluZyYgbWVzc2FnZSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5z cGVjdG9yRnJvbnRlbmRIb3N0LmlkbCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0 b3JGcm9udGVuZEhvc3QuaWRsCmluZGV4IDJhMjAzNzBjZTliM2ZlMWU0YjRhNjIyZDhiOTM3MDA4 ZDUyNjM2MTEuLjlmNGI0MGQ4YjQyOGFhNDkyZWI0ODRiZmMzZjc3NWE2ZjhiNDY5ZTIgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JGcm9udGVuZEhvc3QuaWRs CisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JGcm9udGVuZEhvc3QuaWRs CkBAIC01Niw2ICs1Niw4IEBAIG1vZHVsZSBjb3JlIHsKICAgICAgICAgdm9pZCBzYXZlKGluIERP TVN0cmluZyB1cmwsIGluIERPTVN0cmluZyBjb250ZW50LCBpbiBib29sZWFuIGZvcmNlU2F2ZUFz KTsKICAgICAgICAgdm9pZCBhcHBlbmQoaW4gRE9NU3RyaW5nIHVybCwgaW4gRE9NU3RyaW5nIGNv bnRlbnQpOwogCisgICAgICAgIGJvb2xlYW4gY2FuSW5zcGVjdFdvcmtlcnMoKTsKKwogICAgICAg ICBbQ3VzdG9tXSBET01TdHJpbmcgcGxhdGZvcm0oKTsKICAgICAgICAgW0N1c3RvbV0gRE9NU3Ry aW5nIHBvcnQoKTsKICAgICAgICAgW0N1c3RvbV0gdm9pZCBzaG93Q29udGV4dE1lbnUoaW4gTW91 c2VFdmVudCBldmVudCwgaW4gRE9NT2JqZWN0IGl0ZW1zKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JXb3JrZXJBZ2VudC5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvSW5zcGVjdG9yV29ya2VyQWdlbnQuY3BwCmluZGV4IDFiMzg1OTU3MWNhZmMy M2U0YzU0MWQzNDljMjYwZGExZmU0ZjNiOTYuLjI0YmVlYjU3ZDA3N2YzMjA5NzI2MDQ3ODMxNzgy NTQwYmJjMTMyNzAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0 b3JXb3JrZXJBZ2VudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rv cldvcmtlckFnZW50LmNwcApAQCAtMTQwLDE1ICsxNDAsMjAgQEAgdm9pZCBJbnNwZWN0b3JXb3Jr ZXJBZ2VudDo6Y2xlYXJGcm9udGVuZCgpCiAgICAgZGVzdHJveVdvcmtlckZyb250ZW5kQ2hhbm5l bHMoKTsKIH0KIAotdm9pZCBJbnNwZWN0b3JXb3JrZXJBZ2VudDo6c2V0V29ya2VySW5zcGVjdGlv bkVuYWJsZWQoRXJyb3JTdHJpbmcqLCBib29sIHZhbHVlKQordm9pZCBJbnNwZWN0b3JXb3JrZXJB Z2VudDo6ZW5hYmxlKEVycm9yU3RyaW5nKikKIHsKLSAgICBtX3N0YXRlLT5zZXRCb29sZWFuKFdv cmtlckFnZW50U3RhdGU6Ondvcmtlckluc3BlY3Rpb25FbmFibGVkLCB2YWx1ZSk7CisgICAgbV9z dGF0ZS0+c2V0Qm9vbGVhbihXb3JrZXJBZ2VudFN0YXRlOjp3b3JrZXJJbnNwZWN0aW9uRW5hYmxl ZCwgdHJ1ZSk7CiAgICAgaWYgKCFtX2luc3BlY3RvckZyb250ZW5kKQogICAgICAgICByZXR1cm47 Ci0gICAgaWYgKHZhbHVlKQotICAgICAgICBjcmVhdGVXb3JrZXJGcm9udGVuZENoYW5uZWxzRm9y RXhpc3RpbmdXb3JrZXJzKCk7Ci0gICAgZWxzZQotICAgICAgICBkZXN0cm95V29ya2VyRnJvbnRl bmRDaGFubmVscygpOworICAgIGNyZWF0ZVdvcmtlckZyb250ZW5kQ2hhbm5lbHNGb3JFeGlzdGlu Z1dvcmtlcnMoKTsKK30KKwordm9pZCBJbnNwZWN0b3JXb3JrZXJBZ2VudDo6ZGlzYWJsZShFcnJv clN0cmluZyopCit7CisgICAgbV9zdGF0ZS0+c2V0Qm9vbGVhbihXb3JrZXJBZ2VudFN0YXRlOjp3 b3JrZXJJbnNwZWN0aW9uRW5hYmxlZCwgZmFsc2UpOworICAgIGlmICghbV9pbnNwZWN0b3JGcm9u dGVuZCkKKyAgICAgICAgcmV0dXJuOworICAgIGRlc3Ryb3lXb3JrZXJGcm9udGVuZENoYW5uZWxz KCk7CiB9CiAKIHZvaWQgSW5zcGVjdG9yV29ya2VyQWdlbnQ6OmNvbm5lY3RUb1dvcmtlcihFcnJv clN0cmluZyogZXJyb3IsIGludCB3b3JrZXJJZCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9JbnNwZWN0b3JXb3JrZXJBZ2VudC5oIGIvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL0luc3BlY3RvcldvcmtlckFnZW50LmgKaW5kZXggYmUzM2E1MDcxOTE5YzQxNmI5Y2UzNmNj M2YzNjZhODRkOGJjMzEyNy4uNmI0NGJjMjQxNjFiM2U3MTU1ZjczMmY0NjkyZTEzMTNhNjlmNTJl OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvcldvcmtlckFn ZW50LmgKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvcldvcmtlckFnZW50 LmgKQEAgLTYyLDcgKzYyLDggQEAgcHVibGljOgogICAgIHZvaWQgd29ya2VyQ29udGV4dFRlcm1p bmF0ZWQoV29ya2VyQ29udGV4dFByb3h5Kik7CiAKICAgICAvLyBDYWxsZWQgZnJvbSBJbnNwZWN0 b3JCYWNrZW5kRGlzcGF0Y2hlcgotICAgIHZpcnR1YWwgdm9pZCBzZXRXb3JrZXJJbnNwZWN0aW9u RW5hYmxlZChFcnJvclN0cmluZyosIGJvb2wgdmFsdWUpOworICAgIHZpcnR1YWwgdm9pZCBlbmFi bGUoRXJyb3JTdHJpbmcqKTsKKyAgICB2aXJ0dWFsIHZvaWQgZGlzYWJsZShFcnJvclN0cmluZyop OwogICAgIHZpcnR1YWwgdm9pZCBjb25uZWN0VG9Xb3JrZXIoRXJyb3JTdHJpbmcqLCBpbnQgd29y a2VySWQpOwogICAgIHZpcnR1YWwgdm9pZCBkaXNjb25uZWN0RnJvbVdvcmtlcihFcnJvclN0cmlu ZyosIGludCB3b3JrZXJJZCk7CiAgICAgdmlydHVhbCB2b2lkIHNlbmRNZXNzYWdlVG9Xb3JrZXIo RXJyb3JTdHJpbmcqLCBpbnQgd29ya2VySWQsIGNvbnN0IFJlZlB0cjxJbnNwZWN0b3JPYmplY3Q+ JiBtZXNzYWdlKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvSW5zcGVjdG9yRnJvbnRlbmRIb3N0U3R1Yi5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvSW5zcGVjdG9yRnJvbnRlbmRIb3N0U3R1Yi5qcwppbmRleCBhNmY5OGIyMTIy YWRhNjljNWMyOTFhNTQ3NGY3YjMwZmY1ZGU1YzAyLi4wYjRlYWE2MjE0MjUxMmU2M2QyZWI4Nzdm MjFkNzExZGJjMTM4ODZjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL0luc3BlY3RvckZyb250ZW5kSG9zdFN0dWIuanMKKysrIGIvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9JbnNwZWN0b3JGcm9udGVuZEhvc3RTdHViLmpzCkBAIC0xODQs NiArMTg0LDExIEBAIFdlYkluc3BlY3Rvci5JbnNwZWN0b3JGcm9udGVuZEhvc3RTdHViLnByb3Rv dHlwZSA9IHsKIAogICAgIHNldFpvb21GYWN0b3I6IGZ1bmN0aW9uKHpvb20pCiAgICAgeworICAg IH0sCisKKyAgICBjYW5JbnNwZWN0V29ya2VyczogZnVuY3Rpb24oKQorICAgIHsKKyAgICAgICAg cmV0dXJuIHRydWU7CiAgICAgfQogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL1NjcmlwdHNQYW5lbC5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvU2NyaXB0c1BhbmVsLmpzCmluZGV4IGZkMjllYzliMDFlMGIwZWZiNDYzZWRl MWVmNjEwZDQxZDE1ZDg4M2UuLmMwMDNmOWNmOGIyZWFlN2RiMjA2MzYxMmRiNDU2YjljMmYxNGU2 ZjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0 c1BhbmVsLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0 c1BhbmVsLmpzCkBAIC0xMDEsOCArMTAxLDggQEAgV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbCA9 IGZ1bmN0aW9uKHdvcmtzcGFjZUZvclRlc3QpCiAgICAgdGhpcy5zaWRlYmFyUGFuZXMueGhyQnJl YWtwb2ludHMgPSBuZXcgV2ViSW5zcGVjdG9yLlhIUkJyZWFrcG9pbnRzU2lkZWJhclBhbmUoKTsK ICAgICB0aGlzLnNpZGViYXJQYW5lcy5ldmVudExpc3RlbmVyQnJlYWtwb2ludHMgPSBuZXcgV2Vi SW5zcGVjdG9yLkV2ZW50TGlzdGVuZXJCcmVha3BvaW50c1NpZGViYXJQYW5lKCk7CiAKLSAgICBp ZiAoUHJlZmVyZW5jZXMuZXhwb3NlV29ya2Vyc0luc3BlY3Rpb24gJiYgIVdlYkluc3BlY3Rvci5X b3JrZXJNYW5hZ2VyLmlzV29ya2VyRnJvbnRlbmQoKSkgewotICAgICAgICBXb3JrZXJBZ2VudC5z ZXRXb3JrZXJJbnNwZWN0aW9uRW5hYmxlZCh0cnVlKTsKKyAgICBpZiAoSW5zcGVjdG9yRnJvbnRl bmRIb3N0LmNhbkluc3BlY3RXb3JrZXJzKCkgJiYgIVdlYkluc3BlY3Rvci5Xb3JrZXJNYW5hZ2Vy LmlzV29ya2VyRnJvbnRlbmQoKSkgeworICAgICAgICBXb3JrZXJBZ2VudC5lbmFibGUoKTsKICAg ICAgICAgdGhpcy5zaWRlYmFyUGFuZXMud29ya2VyTGlzdCA9IG5ldyBXZWJJbnNwZWN0b3IuV29y a2Vyc1NpZGViYXJQYW5lKFdlYkluc3BlY3Rvci53b3JrZXJNYW5hZ2VyKTsKICAgICB9CiAKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2V0dGluZ3MuanMg Yi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NldHRpbmdzLmpzCmluZGV4IDg3 ZTExZTZlYjY2YzFlZTBkMGI4ZWE2ZTQ5ZmY4YjE3YmYyNGMxMTcuLjFlYzJjNTQyY2FlYzYxOTU3 ZTA3MzI4OWMzYjlhY2E3OGUxYjMyNjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvU2V0dGluZ3MuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9TZXR0aW5ncy5qcwpAQCAtNDEsNyArNDEsNiBAQCB2YXIgUHJlZmVyZW5jZXMg PSB7CiAgICAgc2hhcmVkV29ya2Vyc0RlYnVnTm90ZTogdW5kZWZpbmVkLAogICAgIGxvY2FsaXpl VUk6IHRydWUsCiAgICAgZXhwb3NlRGlzYWJsZUNhY2hlOiBmYWxzZSwKLSAgICBleHBvc2VXb3Jr ZXJzSW5zcGVjdGlvbjogZmFsc2UsCiAgICAgYXBwbGljYXRpb25UaXRsZTogIldlYiBJbnNwZWN0 b3IgLSAlcyIsCiAgICAgc2hvd0hlYXBTbmFwc2hvdE9iamVjdHNIaWRkZW5Qcm9wZXJ0aWVzOiBm YWxzZSwKICAgICBzaG93RG9ja1RvUmlnaHQ6IGZhbHNlLApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdC9jaHJvbWl1bS9zcmMvSW5zcGVjdG9yRnJvbnRlbmRDbGllbnRJbXBsLmNwcCBiL1NvdXJj ZS9XZWJLaXQvY2hyb21pdW0vc3JjL0luc3BlY3RvckZyb250ZW5kQ2xpZW50SW1wbC5jcHAKaW5k ZXggZTNmN2YxMzE4Mjc5MmIyZGQxOTUwMmVjNzk1NTFiMTU5MjQ5ZDYxNC4uMDMzOGQzZjJkZWI5 M2ZhNWQ4ZWRhMTA4NzM5Njk1YmFmZWEwNTNlZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9j aHJvbWl1bS9zcmMvSW5zcGVjdG9yRnJvbnRlbmRDbGllbnRJbXBsLmNwcAorKysgYi9Tb3VyY2Uv V2ViS2l0L2Nocm9taXVtL3NyYy9JbnNwZWN0b3JGcm9udGVuZENsaWVudEltcGwuY3BwCkBAIC0x NDMsNiArMTQzLDExIEBAIHZvaWQgSW5zcGVjdG9yRnJvbnRlbmRDbGllbnRJbXBsOjphcHBlbmQo Y29uc3QgU3RyaW5nJiB1cmwsIGNvbnN0IFN0cmluZyYgY29udGVuCiAgICAgbV9jbGllbnQtPmFw cGVuZCh1cmwsIGNvbnRlbnQpOwogfQogCitib29sIEluc3BlY3RvckZyb250ZW5kQ2xpZW50SW1w bDo6Y2FuSW5zcGVjdFdvcmtlcnMoKQoreworICAgIHJldHVybiB0cnVlOworfQorCiB2b2lkIElu c3BlY3RvckZyb250ZW5kQ2xpZW50SW1wbDo6aW5zcGVjdGVkVVJMQ2hhbmdlZChjb25zdCBTdHJp bmcmIHVybCkKIHsKICAgICBtX2Zyb250ZW5kUGFnZS0+bWFpbkZyYW1lKCktPmRvY3VtZW50KCkt PnNldFRpdGxlKCJEZXZlbG9wZXIgVG9vbHMgLSAiICsgdXJsKTsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQvY2hyb21pdW0vc3JjL0luc3BlY3RvckZyb250ZW5kQ2xpZW50SW1wbC5oIGIvU291 cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvSW5zcGVjdG9yRnJvbnRlbmRDbGllbnRJbXBsLmgKaW5k ZXggNGY2NmUxYmNkOTNiN2JlMTk4MTRlMjVlYmVlN2RhZmYwNWRiYzY5NC4uNTVlNTdlNjk2ODc5 ZGM5ZmE5YmI2NWY0MTNlN2U4MGUyOWU1OTUzOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9j aHJvbWl1bS9zcmMvSW5zcGVjdG9yRnJvbnRlbmRDbGllbnRJbXBsLmgKKysrIGIvU291cmNlL1dl YktpdC9jaHJvbWl1bS9zcmMvSW5zcGVjdG9yRnJvbnRlbmRDbGllbnRJbXBsLmgKQEAgLTcyLDYg KzcyLDcgQEAgcHVibGljOgogICAgIHZpcnR1YWwgYm9vbCBjYW5TYXZlKCk7CiAgICAgdmlydHVh bCB2b2lkIHNhdmUoY29uc3QgV1RGOjpTdHJpbmcmIHVyaywgY29uc3QgV1RGOjpTdHJpbmcmIGNv bnRlbnQsIGJvb2wgZm9yY2VTYXZlQXMpOwogICAgIHZpcnR1YWwgdm9pZCBhcHBlbmQoY29uc3Qg V1RGOjpTdHJpbmcmIHVyaywgY29uc3QgV1RGOjpTdHJpbmcmIGNvbnRlbnQpOworICAgIHZpcnR1 YWwgYm9vbCBjYW5JbnNwZWN0V29ya2VycygpOwogCiAgICAgdmlydHVhbCB2b2lkIGluc3BlY3Rl ZFVSTENoYW5nZWQoY29uc3QgV1RGOjpTdHJpbmcmKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdC9jaHJvbWl1bS9zcmMvanMvRGV2VG9vbHMuanMgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVt L3NyYy9qcy9EZXZUb29scy5qcwppbmRleCAxMjI5M2Y1YjE4MWI2NGY4YmY0NDdlNzc0ODFmMmEz MDY4YWIyZWRhLi5mNTU1NDE5ZTllNmRkNjlkNjdmZDdkMzE1OGY5ZWQyMmRhNzM3ZTEzIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9qcy9EZXZUb29scy5qcworKysgYi9T b3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9qcy9EZXZUb29scy5qcwpAQCAtMzksNyArMzksNiBA QAogICAgIFByZWZlcmVuY2VzLmxvY2FsaXplVUkgPSBmYWxzZTsKICAgICBQcmVmZXJlbmNlcy5h cHBsaWNhdGlvblRpdGxlID0gIkRldmVsb3BlciBUb29scyAtICVzIjsKICAgICBQcmVmZXJlbmNl cy5leHBvc2VEaXNhYmxlQ2FjaGUgPSB0cnVlOwotICAgIFByZWZlcmVuY2VzLmV4cG9zZVdvcmtl cnNJbnNwZWN0aW9uID0gdHJ1ZTsKICAgICBQcmVmZXJlbmNlcy5zaG93RG9ja1RvUmlnaHQgPSB0 cnVlOwogICAgIFByZWZlcmVuY2VzLmV4cG9zZUZpbGVTeXN0ZW1JbnNwZWN0aW9uID0gdHJ1ZTsK IH0pKCk7fQo=