35693 2010-03-03 11:08:09 -0800 Web Inspector: Remove sync access to resourceTrackingEnabled. 2010-03-04 10:46:47 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 pfeldman pfeldman bweinstein joepeck rik timothy oldest_to_newest 195674 0 pfeldman 2010-03-03 11:08:09 -0800 searchingForNode and pauseOnExceptionsState to go. 195677 1 49924 pfeldman 2010-03-03 11:12:49 -0800 Created attachment 49924 [PATCH] Proposed change. 196128 2 pfeldman 2010-03-04 10:46:47 -0800 Committing to http://svn.webkit.org/repository/webkit/trunk ... M WebCore/ChangeLog M WebCore/inspector/InspectorBackend.cpp M WebCore/inspector/InspectorBackend.h M WebCore/inspector/InspectorBackend.idl M WebCore/inspector/InspectorController.cpp M WebCore/inspector/front-end/AuditsPanel.js M WebCore/inspector/front-end/InspectorBackendStub.js M WebCore/inspector/front-end/ResourcesPanel.js M WebKit/chromium/ChangeLog M WebKit/chromium/src/WebDevToolsAgentImpl.cpp M WebKit/chromium/src/WebDevToolsAgentImpl.h M WebKit/chromium/src/js/DevTools.js Committed r55535 49924 2010-03-03 11:12:49 -0800 2010-03-04 07:39:01 -0800 [PATCH] Proposed change. resource_tracking text/plain 12076 pfeldman ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg NzE5ODljYy4uZjY1NTQwMiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwzOCBAQAorMjAxMC0wMy0wMyAgUGF2ZWwgRmVsZG1h biAgPHBmZWxkbWFuQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBSZW1vdmUgc3luYyBhY2Nlc3MgdG8g cmVzb3VyY2VUcmFja2luZ0VuYWJsZWQuCisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTM1NjkzCisKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9y QmFja2VuZC5jcHA6CisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvckJhY2tlbmQuaDoKKyAg ICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yQmFja2VuZC5pZGw6CisgICAgICAgICogaW5zcGVj dG9yL0luc3BlY3RvckNvbnRyb2xsZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9y Q29udHJvbGxlcjo6cG9wdWxhdGVTY3JpcHRPYmplY3RzKToKKyAgICAgICAgKiBpbnNwZWN0b3Iv ZnJvbnQtZW5kL0F1ZGl0c1BhbmVsLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkF1ZGl0c1Bh bmVsLnByb3RvdHlwZS5fcmVsb2FkUmVzb3VyY2VzKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5B dWRpdHNQYW5lbC5wcm90b3R5cGUuc2hvdyk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVu ZC9JbnNwZWN0b3JCYWNrZW5kU3R1Yi5qczoKKyAgICAgICAgKC5XZWJJbnNwZWN0b3IuSW5zcGVj dG9yQmFja2VuZFN0dWIpOgorICAgICAgICAoLldlYkluc3BlY3Rvci5JbnNwZWN0b3JCYWNrZW5k U3R1Yi5wcm90b3R5cGUuZW5hYmxlUmVzb3VyY2VUcmFja2luZyk6CisgICAgICAgICguV2ViSW5z cGVjdG9yLkluc3BlY3RvckJhY2tlbmRTdHViLnByb3RvdHlwZS5kaXNhYmxlUmVzb3VyY2VUcmFj a2luZyk6CisgICAgICAgICguV2ViSW5zcGVjdG9yLkluc3BlY3RvckJhY2tlbmRTdHViLnByb3Rv dHlwZS5lbmFibGVEZWJ1Z2dlcik6CisgICAgICAgICguV2ViSW5zcGVjdG9yLkluc3BlY3RvckJh Y2tlbmRTdHViLnByb3RvdHlwZS5kaXNhYmxlRGVidWdnZXIpOgorICAgICAgICAoLldlYkluc3Bl Y3Rvci5JbnNwZWN0b3JCYWNrZW5kU3R1Yi5wcm90b3R5cGUuZW5hYmxlUHJvZmlsZXIpOgorICAg ICAgICAoLldlYkluc3BlY3Rvci5JbnNwZWN0b3JCYWNrZW5kU3R1Yi5wcm90b3R5cGUuZGlzYWJs ZVByb2ZpbGVyKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlc1BhbmVs LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlJlc291cmNlc1BhbmVsKToKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5SZXNvdXJjZXNQYW5lbC5wcm90b3R5cGUuZ2V0IHJlc291cmNlVHJhY2tpbmdF bmFibGVkKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5SZXNvdXJjZXNQYW5lbC5wcm90b3R5cGUu Z2V0IHZpc2libGVWaWV3KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5SZXNvdXJjZXNQYW5lbC5w cm90b3R5cGUucmVzb3VyY2VUcmFja2luZ1dhc0VuYWJsZWQpOgorICAgICAgICAoV2ViSW5zcGVj dG9yLlJlc291cmNlc1BhbmVsLnByb3RvdHlwZS5yZXNvdXJjZVRyYWNraW5nV2FzRGlzYWJsZWQp OgorICAgICAgICAoV2ViSW5zcGVjdG9yLlJlc291cmNlc1BhbmVsLnByb3RvdHlwZS5yZXNldCk6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuUmVzb3VyY2VzUGFuZWwucHJvdG90eXBlLnNob3dSZXNv dXJjZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUmVzb3VyY2VzUGFuZWwucHJvdG90eXBlLl9l bmFibGVSZXNvdXJjZVRyYWNraW5nKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5SZXNvdXJjZXNQ YW5lbC5wcm90b3R5cGUuX3RvZ2dsZVJlc291cmNlVHJhY2tpbmcpOgorCiAyMDEwLTAzLTAzICBE YW4gQmVybnN0ZWluICA8bWl0ekBhcHBsZS5jb20+CiAKICAgICAgICAgQnVpbGQgZml4LgpkaWZm IC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQmFja2VuZC5jcHAgYi9XZWJDb3Jl L2luc3BlY3Rvci9JbnNwZWN0b3JCYWNrZW5kLmNwcAppbmRleCA0MzEzNTQyLi41NjkxZmRiIDEw MDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JCYWNrZW5kLmNwcAorKysgYi9X ZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JCYWNrZW5kLmNwcApAQCAtMTA0LDEzICsxMDQsNiBA QCBib29sIEluc3BlY3RvckJhY2tlbmQ6OnNlYXJjaGluZ0Zvck5vZGUoKQogICAgIHJldHVybiBm YWxzZTsKIH0KIAotYm9vbCBJbnNwZWN0b3JCYWNrZW5kOjpyZXNvdXJjZVRyYWNraW5nRW5hYmxl ZCgpIGNvbnN0Ci17Ci0gICAgaWYgKG1faW5zcGVjdG9yQ29udHJvbGxlcikKLSAgICAgICAgcmV0 dXJuIG1faW5zcGVjdG9yQ29udHJvbGxlci0+cmVzb3VyY2VUcmFja2luZ0VuYWJsZWQoKTsKLSAg ICByZXR1cm4gZmFsc2U7Ci19Ci0KIHZvaWQgSW5zcGVjdG9yQmFja2VuZDo6ZW5hYmxlUmVzb3Vy Y2VUcmFja2luZyhib29sIGFsd2F5cykKIHsKICAgICBpZiAobV9pbnNwZWN0b3JDb250cm9sbGVy KQpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQmFja2VuZC5oIGIvV2Vi Q29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQmFja2VuZC5oCmluZGV4IGI2Yjk4NGEuLjE2MjBlNTAg MTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckJhY2tlbmQuaAorKysgYi9X ZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JCYWNrZW5kLmgKQEAgLTY2LDcgKzY2LDYgQEAgcHVi bGljOgogCiAgICAgdm9pZCBlbmFibGVSZXNvdXJjZVRyYWNraW5nKGJvb2wgYWx3YXlzKTsKICAg ICB2b2lkIGRpc2FibGVSZXNvdXJjZVRyYWNraW5nKGJvb2wgYWx3YXlzKTsKLSAgICBib29sIHJl c291cmNlVHJhY2tpbmdFbmFibGVkKCkgY29uc3Q7CiAgICAgdm9pZCBnZXRSZXNvdXJjZUNvbnRl bnQobG9uZyBjYWxsSWQsIHVuc2lnbmVkIGxvbmcgaWRlbnRpZmllcik7CiAgICAgdm9pZCByZWxv YWRQYWdlKCk7CiAKZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckJhY2tl bmQuaWRsIGIvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQmFja2VuZC5pZGwKaW5kZXggNmEz NmQxYi4uNjMxYjdjYSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQmFj a2VuZC5pZGwKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQmFja2VuZC5pZGwKQEAg LTM5LDcgKzM5LDYgQEAgbW9kdWxlIGNvcmUgewogICAgICAgICB2b2lkIHRvZ2dsZU5vZGVTZWFy Y2goKTsKICAgICAgICAgYm9vbGVhbiBzZWFyY2hpbmdGb3JOb2RlKCk7CiAKLSAgICAgICAgYm9v bGVhbiByZXNvdXJjZVRyYWNraW5nRW5hYmxlZCgpOwogICAgICAgICB2b2lkIGVuYWJsZVJlc291 cmNlVHJhY2tpbmcoaW4gYm9vbGVhbiBhbHdheXMpOwogICAgICAgICB2b2lkIGRpc2FibGVSZXNv dXJjZVRyYWNraW5nKGluIGJvb2xlYW4gYWx3YXlzKTsKICAgICAgICAgdm9pZCBnZXRSZXNvdXJj ZUNvbnRlbnQoaW4gbG9uZyBjYWxsSWQsIGluIHVuc2lnbmVkIGxvbmcgaWRlbnRpZmllcik7CmRp ZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDb250cm9sbGVyLmNwcCBiL1dl YkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNvbnRyb2xsZXIuY3BwCmluZGV4IDBmMDM2MTAuLjZk ODU5ZWMgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNvbnRyb2xsZXIu Y3BwCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNvbnRyb2xsZXIuY3BwCkBAIC02 NjcsNiArNjY3LDExIEBAIHZvaWQgSW5zcGVjdG9yQ29udHJvbGxlcjo6cG9wdWxhdGVTY3JpcHRP YmplY3RzKCkKIAogICAgIG1fZnJvbnRlbmQtPnBvcHVsYXRlRnJvbnRlbmRTZXR0aW5ncyhzZXR0 aW5nKEZyb250ZW5kU2V0dGluZ3NTZXR0aW5nTmFtZSkpOwogCisgICAgaWYgKG1fcmVzb3VyY2VU cmFja2luZ0VuYWJsZWQpCisgICAgICAgIG1fZnJvbnRlbmQtPnJlc291cmNlVHJhY2tpbmdXYXNF bmFibGVkKCk7CisgICAgaWYgKG1fcHJvZmlsZXJFbmFibGVkKQorICAgICAgICBtX2Zyb250ZW5k LT5wcm9maWxlcldhc0VuYWJsZWQoKTsKKwogICAgIFJlc291cmNlc01hcDo6aXRlcmF0b3IgcmVz b3VyY2VzRW5kID0gbV9yZXNvdXJjZXMuZW5kKCk7CiAgICAgZm9yIChSZXNvdXJjZXNNYXA6Oml0 ZXJhdG9yIGl0ID0gbV9yZXNvdXJjZXMuYmVnaW4oKTsgaXQgIT0gcmVzb3VyY2VzRW5kOyArK2l0 KQogICAgICAgICBpdC0+c2Vjb25kLT51cGRhdGVTY3JpcHRPYmplY3QobV9mcm9udGVuZC5nZXQo KSk7CkBAIC02OTAsOSArNjk1LDYgQEAgdm9pZCBJbnNwZWN0b3JDb250cm9sbGVyOjpwb3B1bGF0 ZVNjcmlwdE9iamVjdHMoKQogICAgICAgICBpdC0+c2Vjb25kLT5iaW5kKG1fZnJvbnRlbmQuZ2V0 KCkpOwogI2VuZGlmCiAKLSAgICBpZiAobV9wcm9maWxlckVuYWJsZWQpCi0gICAgICAgIG1fZnJv bnRlbmQtPnByb2ZpbGVyV2FzRW5hYmxlZCgpOwotCiAgICAgbV9mcm9udGVuZC0+cG9wdWxhdGVJ bnRlcmZhY2UoKTsKIAogICAgIC8vIERpc3BhdGNoIHBlbmRpbmcgZnJvbnRlbmQgY29tbWFuZHMK ZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9BdWRpdHNQYW5lbC5qcyBi L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9BdWRpdHNQYW5lbC5qcwppbmRleCBmY2FkYjgy Li4yYTU2Nzk2IDEwMDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQXVkaXRz UGFuZWwuanMKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0F1ZGl0c1BhbmVsLmpz CkBAIC0xODgsNyArMTg4LDcgQEAgV2ViSW5zcGVjdG9yLkF1ZGl0c1BhbmVsLnByb3RvdHlwZSA9 IHsKICAgICB7CiAgICAgICAgIHRoaXMuX3Jlc291cmNlVHJhY2tpbmdDYWxsYmFjayA9IGNhbGxi YWNrOwogCi0gICAgICAgIGlmICghSW5zcGVjdG9yQmFja2VuZC5yZXNvdXJjZVRyYWNraW5nRW5h YmxlZCgpKSB7CisgICAgICAgIGlmICghV2ViSW5zcGVjdG9yLnBhbmVscy5yZXNvdXJjZXMucmVz b3VyY2VUcmFja2luZ0VuYWJsZWQpIHsKICAgICAgICAgICAgIEluc3BlY3RvckJhY2tlbmQuZW5h YmxlUmVzb3VyY2VUcmFja2luZyhmYWxzZSk7CiAgICAgICAgICAgICB0aGlzLl91cGRhdGVMYXVu Y2hlclZpZXdDb250cm9scyh0cnVlKTsKICAgICAgICAgfSBlbHNlCkBAIC0yMzgsNyArMjM4LDcg QEAgV2ViSW5zcGVjdG9yLkF1ZGl0c1BhbmVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgV2ViSW5z cGVjdG9yLlBhbmVsLnByb3RvdHlwZS5zaG93LmNhbGwodGhpcyk7CiAKICAgICAgICAgdGhpcy5z aG93VmlldygpOwotICAgICAgICB0aGlzLl91cGRhdGVMYXVuY2hlclZpZXdDb250cm9scyhJbnNw ZWN0b3JCYWNrZW5kLnJlc291cmNlVHJhY2tpbmdFbmFibGVkKCkpOworICAgICAgICB0aGlzLl91 cGRhdGVMYXVuY2hlclZpZXdDb250cm9scyhXZWJJbnNwZWN0b3IucGFuZWxzLnJlc291cmNlcy5y ZXNvdXJjZVRyYWNraW5nRW5hYmxlZCk7CiAgICAgfSwKIAogICAgIGF0dGFjaDogZnVuY3Rpb24o KQpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0luc3BlY3RvckJhY2tl bmRTdHViLmpzIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0luc3BlY3RvckJhY2tlbmRT dHViLmpzCmluZGV4IGQ0MjBjZWEuLjVjZWYwYjcgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9JbnNwZWN0b3JCYWNrZW5kU3R1Yi5qcworKysgYi9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvSW5zcGVjdG9yQmFja2VuZFN0dWIuanMKQEAgLTM0LDkgKzM0LDYgQEAg V2ViSW5zcGVjdG9yLkluc3BlY3RvckJhY2tlbmRTdHViID0gZnVuY3Rpb24oKQogewogICAgIHRo aXMuX3NlYXJjaGluZ0Zvck5vZGUgPSBmYWxzZTsKICAgICB0aGlzLl9hdHRhY2hlZFdpbmRvd0hl aWdodCA9IDA7Ci0gICAgdGhpcy5fZGVidWdnZXJFbmFibGVkID0gdHJ1ZTsKLSAgICB0aGlzLl9w cm9maWxlckVuYWJsZWQgPSB0cnVlOwotICAgIHRoaXMuX3Jlc291cmNlVHJhY2tpbmdFbmFibGVk ID0gZmFsc2U7CiAgICAgdGhpcy5fdGltZWxpbmVFbmFibGVkID0gZmFsc2U7CiB9CiAKQEAgLTEy Niw0MCArMTIzLDI4IEBAIFdlYkluc3BlY3Rvci5JbnNwZWN0b3JCYWNrZW5kU3R1Yi5wcm90b3R5 cGUgPSB7CiAgICAgICAgIHJldHVybiAiIjsKICAgICB9LAogCi0gICAgZGVidWdnZXJFbmFibGVk OiBmdW5jdGlvbigpCi0gICAgewotICAgICAgICByZXR1cm4gdGhpcy5fZGVidWdnZXJFbmFibGVk OwotICAgIH0sCi0KICAgICBlbmFibGVSZXNvdXJjZVRyYWNraW5nOiBmdW5jdGlvbigpCiAgICAg ewotICAgICAgICB0aGlzLl9yZXNvdXJjZVRyYWNraW5nRW5hYmxlZCA9IHRydWU7CiAgICAgICAg IFdlYkluc3BlY3Rvci5yZXNvdXJjZVRyYWNraW5nV2FzRW5hYmxlZCgpOwogICAgIH0sCiAKICAg ICBkaXNhYmxlUmVzb3VyY2VUcmFja2luZzogZnVuY3Rpb24oKQogICAgIHsKLSAgICAgICAgdGhp cy5fcmVzb3VyY2VUcmFja2luZ0VuYWJsZWQgPSBmYWxzZTsKICAgICAgICAgV2ViSW5zcGVjdG9y LnJlc291cmNlVHJhY2tpbmdXYXNEaXNhYmxlZCgpOwogICAgIH0sCiAKLSAgICByZXNvdXJjZVRy YWNraW5nRW5hYmxlZDogZnVuY3Rpb24oKQotICAgIHsKLSAgICAgICAgcmV0dXJuIHRoaXMuX3Jl c291cmNlVHJhY2tpbmdFbmFibGVkOwotICAgIH0sCi0KICAgICByZWxvYWRQYWdlOiBmdW5jdGlv bigpCiAgICAgewogICAgIH0sCiAKICAgICBlbmFibGVEZWJ1Z2dlcjogZnVuY3Rpb24oKQogICAg IHsKLSAgICAgICAgdGhpcy5fZGVidWdnZXJFbmFibGVkID0gdHJ1ZTsKKyAgICAgICAgV2ViSW5z cGVjdG9yLmRlYnVnZ2VyV2FzRW5hYmxlZCgpOwogICAgIH0sCiAKICAgICBkaXNhYmxlRGVidWdn ZXI6IGZ1bmN0aW9uKCkKICAgICB7Ci0gICAgICAgIHRoaXMuX2RlYnVnZ2VyRW5hYmxlZCA9IGZh bHNlOworICAgICAgICBXZWJJbnNwZWN0b3IuZGVidWdnZXJXYXNEaXNhYmxlZCgpOwogICAgIH0s CiAKICAgICBzZXRCcmVha3BvaW50OiBmdW5jdGlvbihzb3VyY2VJRCwgbGluZSwgZW5hYmxlZCwg Y29uZGl0aW9uKQpAQCAtMTk3LDE5ICsxODIsMTQgQEAgV2ViSW5zcGVjdG9yLkluc3BlY3RvckJh Y2tlbmRTdHViLnByb3RvdHlwZSA9IHsKICAgICB7CiAgICAgfSwKIAotICAgIHByb2ZpbGVyRW5h YmxlZDogZnVuY3Rpb24oKQotICAgIHsKLSAgICAgICAgcmV0dXJuIHRydWU7Ci0gICAgfSwKLQog ICAgIGVuYWJsZVByb2ZpbGVyOiBmdW5jdGlvbigpCiAgICAgewotICAgICAgICB0aGlzLl9wcm9m aWxlckVuYWJsZWQgPSB0cnVlOworICAgICAgICBXZWJJbnNwZWN0b3IucHJvZmlsZXJXYXNFbmFi bGVkKCk7CiAgICAgfSwKIAogICAgIGRpc2FibGVQcm9maWxlcjogZnVuY3Rpb24oKQogICAgIHsK LSAgICAgICAgdGhpcy5fcHJvZmlsZXJFbmFibGVkID0gZmFsc2U7CisgICAgICAgIFdlYkluc3Bl Y3Rvci5wcm9maWxlcldhc0Rpc2FibGVkKCk7CiAgICAgfSwKIAogICAgIHN0YXJ0UHJvZmlsaW5n OiBmdW5jdGlvbigpCmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVz b3VyY2VzUGFuZWwuanMgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VzUGFu ZWwuanMKaW5kZXggNzc0ZWQ2NC4uYzJmZmU1NiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL1Jlc291cmNlc1BhbmVsLmpzCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9SZXNvdXJjZXNQYW5lbC5qcwpAQCAtNDcsNiArNDcsNyBAQCBXZWJJbnNwZWN0b3Iu UmVzb3VyY2VzUGFuZWwgPSBmdW5jdGlvbigpCiAgICAgdGhpcy5yZXNldCgpOwogICAgIHRoaXMu ZmlsdGVyKHRoaXMuZmlsdGVyQWxsRWxlbWVudCwgZmFsc2UpOwogICAgIHRoaXMuZ3JhcGhzVHJl ZUVsZW1lbnQuY2hpbGRyZW5bMF0uc2VsZWN0KCk7CisgICAgdGhpcy5fcmVzb3VyY2VUcmFja2lu Z0VuYWJsZWQgPSBmYWxzZTsKIH0KIAogV2ViSW5zcGVjdG9yLlJlc291cmNlc1BhbmVsLnByb3Rv dHlwZSA9IHsKQEAgLTEyMyw2ICsxMjQsMTEgQEAgV2ViSW5zcGVjdG9yLlJlc291cmNlc1BhbmVs LnByb3RvdHlwZSA9IHsKICAgICAgICAgdGhpcy5pdGVtc1RyZWVFbGVtZW50LmV4cGFuZCgpOwog ICAgIH0sCiAKKyAgICBnZXQgcmVzb3VyY2VUcmFja2luZ0VuYWJsZWQoKQorICAgIHsKKyAgICAg ICAgcmV0dXJuIHRoaXMuX3Jlc291cmNlVHJhY2tpbmdFbmFibGVkOworICAgIH0sCisKICAgICBf Y3JlYXRlUGFuZWxFbmFibGVyOiBmdW5jdGlvbigpCiAgICAgewogICAgICAgICB2YXIgcGFuZWxF bmFibGVySGVhZGluZyA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygiWW91IG5lZWQgdG8gZW5hYmxl IHJlc291cmNlIHRyYWNraW5nIHRvIHVzZSB0aGlzIHBhbmVsLiIpOwpAQCAtMjc5LDcgKzI4NSw3 IEBAIFdlYkluc3BlY3Rvci5SZXNvdXJjZXNQYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgewogICAg ICAgICBpZiAodGhpcy52aXNpYmxlUmVzb3VyY2UpCiAgICAgICAgICAgICByZXR1cm4gdGhpcy52 aXNpYmxlUmVzb3VyY2UuX3Jlc291cmNlc1ZpZXc7Ci0gICAgICAgIHJldHVybiBJbnNwZWN0b3JC YWNrZW5kLnJlc291cmNlVHJhY2tpbmdFbmFibGVkKCkgPyBudWxsIDogdGhpcy5wYW5lbEVuYWJs ZXJWaWV3OworICAgICAgICByZXR1cm4gdGhpcy5fcmVzb3VyY2VUcmFja2luZ0VuYWJsZWQgPyBu dWxsIDogdGhpcy5wYW5lbEVuYWJsZXJWaWV3OwogICAgIH0sCiAKICAgICBnZXQgc29ydGluZ0Z1 bmN0aW9uKCkKQEAgLTMwOCwxMSArMzE0LDEzIEBAIFdlYkluc3BlY3Rvci5SZXNvdXJjZXNQYW5l bC5wcm90b3R5cGUgPSB7CiAKICAgICByZXNvdXJjZVRyYWNraW5nV2FzRW5hYmxlZDogZnVuY3Rp b24oKQogICAgIHsKKyAgICAgICAgdGhpcy5fcmVzb3VyY2VUcmFja2luZ0VuYWJsZWQgPSB0cnVl OwogICAgICAgICB0aGlzLnJlc2V0KCk7CiAgICAgfSwKIAogICAgIHJlc291cmNlVHJhY2tpbmdX YXNEaXNhYmxlZDogZnVuY3Rpb24oKQogICAgIHsKKyAgICAgICAgdGhpcy5fcmVzb3VyY2VUcmFj a2luZ0VuYWJsZWQgPSBmYWxzZTsKICAgICAgICAgdGhpcy5yZXNldCgpOwogICAgIH0sCiAKQEAg LTM0NCw3ICszNTIsNyBAQCBXZWJJbnNwZWN0b3IuUmVzb3VyY2VzUGFuZWwucHJvdG90eXBlID0g ewogCiAgICAgICAgIHRoaXMuc3VtbWFyeUJhci5yZXNldCgpOwogCi0gICAgICAgIGlmIChJbnNw ZWN0b3JCYWNrZW5kLnJlc291cmNlVHJhY2tpbmdFbmFibGVkKCkpIHsKKyAgICAgICAgaWYgKHRo aXMuX3Jlc291cmNlVHJhY2tpbmdFbmFibGVkKSB7CiAgICAgICAgICAgICB0aGlzLmVuYWJsZVRv Z2dsZUJ1dHRvbi50aXRsZSA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygiUmVzb3VyY2UgdHJhY2tp bmcgZW5hYmxlZC4gQ2xpY2sgdG8gZGlzYWJsZS4iKTsKICAgICAgICAgICAgIHRoaXMuZW5hYmxl VG9nZ2xlQnV0dG9uLnRvZ2dsZWQgPSB0cnVlOwogICAgICAgICAgICAgdGhpcy5sYXJnZXJSZXNv dXJjZXNCdXR0b24udmlzaWJsZSA9IHRydWU7CkBAIC02ODcsMTQgKzY5NSwxNCBAQCBXZWJJbnNw ZWN0b3IuUmVzb3VyY2VzUGFuZWwucHJvdG90eXBlID0gewogCiAgICAgX2VuYWJsZVJlc291cmNl VHJhY2tpbmc6IGZ1bmN0aW9uKCkKICAgICB7Ci0gICAgICAgIGlmIChJbnNwZWN0b3JCYWNrZW5k LnJlc291cmNlVHJhY2tpbmdFbmFibGVkKCkpCisgICAgICAgIGlmICh0aGlzLl9yZXNvdXJjZVRy YWNraW5nRW5hYmxlZCkKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgdGhpcy5fdG9nZ2xl UmVzb3VyY2VUcmFja2luZyh0aGlzLnBhbmVsRW5hYmxlclZpZXcuYWx3YXlzRW5hYmxlZCk7CiAg ICAgfSwKIAogICAgIF90b2dnbGVSZXNvdXJjZVRyYWNraW5nOiBmdW5jdGlvbihvcHRpb25hbEFs d2F5cykKICAgICB7Ci0gICAgICAgIGlmIChJbnNwZWN0b3JCYWNrZW5kLnJlc291cmNlVHJhY2tp bmdFbmFibGVkKCkpIHsKKyAgICAgICAgaWYgKHRoaXMuX3Jlc291cmNlVHJhY2tpbmdFbmFibGVk KSB7CiAgICAgICAgICAgICB0aGlzLmxhcmdlclJlc291cmNlc0J1dHRvbi52aXNpYmxlID0gZmFs c2U7CiAgICAgICAgICAgICB0aGlzLnNvcnRpbmdTZWxlY3RFbGVtZW50LnZpc2libGUgPSBmYWxz ZTsKICAgICAgICAgICAgIEluc3BlY3RvckJhY2tlbmQuZGlzYWJsZVJlc291cmNlVHJhY2tpbmco dHJ1ZSk7CmRpZmYgLS1naXQgYS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nIGIvV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZwppbmRleCA4ZWZmZjg2Li4zNjdlYzhmIDEwMDY0NAotLS0gYS9XZWJL aXQvY2hyb21pdW0vQ2hhbmdlTG9nCisrKyBiL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKQEAg LTEsMyArMSwxMyBAQAorMjAxMC0wMy0wMyAgUGF2ZWwgRmVsZG1hbiAgPHBmZWxkbWFuQGNocm9t aXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBXZWIgSW5zcGVjdG9yOiBSZW1vdmUgc3luYyBhY2Nlc3MgdG8gcmVzb3VyY2VUcmFja2luZ0Vu YWJsZWQuCisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTM1NjkzCisKKyAgICAgICAgKiBzcmMvanMvRGV2VG9vbHMuanM6CisKIDIwMTAtMDMtMDIgIFRv bnkgQ2hhbmcgIDx0b255QGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBEYXJp biBGaXNoZXIuCmRpZmYgLS1naXQgYS9XZWJLaXQvY2hyb21pdW0vc3JjL2pzL0RldlRvb2xzLmpz IGIvV2ViS2l0L2Nocm9taXVtL3NyYy9qcy9EZXZUb29scy5qcwppbmRleCA5Njk2NjgxLi4wMDkx MjgxIDEwMDY0NAotLS0gYS9XZWJLaXQvY2hyb21pdW0vc3JjL2pzL0RldlRvb2xzLmpzCisrKyBi L1dlYktpdC9jaHJvbWl1bS9zcmMvanMvRGV2VG9vbHMuanMKQEAgLTE1MSwxNyArMTUxLDYgQEAg ZGV2dG9vbHMuVG9vbHNBZ2VudC5wcm90b3R5cGUuZXZhbHVhdGUgPSBmdW5jdGlvbihleHByKQog CiAKIC8qKgotICogRW5hYmxlcyAvIGRpc2FibGVzIHJlc291cmNlcyBwYW5lbCBpbiB0aGUgdWku Ci0gKiBAcGFyYW0ge2Jvb2xlYW59IGVuYWJsZWQgTmV3IHBhbmVsIHN0YXR1cy4KLSAqLwotV2Vi SW5zcGVjdG9yLnNldFJlc291cmNlc1BhbmVsRW5hYmxlZCA9IGZ1bmN0aW9uKGVuYWJsZWQpCi17 Ci0gICAgSW5zcGVjdG9yQmFja2VuZC5fcmVzb3VyY2VUcmFja2luZ0VuYWJsZWQgPSBlbmFibGVk OwotICAgIFdlYkluc3BlY3Rvci5wYW5lbHMucmVzb3VyY2VzLnJlc2V0KCk7Ci19OwotCi0KLS8q KgogICogUHJpbnRzIHN0cmluZyAgdG8gdGhlIGluc3BlY3RvciBjb25zb2xlIG9yIHNob3dzIGFs ZXJ0IGlmIHRoZSBjb25zb2xlIGRvZXNuJ3QKICAqIGV4aXN0LgogICogQHBhcmFtIHtzdHJpbmd9 IHRleHQKQEAgLTM3NywxOCArMzY2LDYgQEAgSW5qZWN0ZWRTY3JpcHRBY2Nlc3MucHJvdG90eXBl LmV2YWx1YXRlSW5DYWxsRnJhbWUgPSBmdW5jdGlvbihjYWxsRnJhbWVJZCwgY29kZSwKIH0pKCk7 CiAKIAotV2ViSW5zcGVjdG9yLnJlc291cmNlVHJhY2tpbmdXYXNFbmFibGVkID0gZnVuY3Rpb24o KQotewotICAgICAgSW5zcGVjdG9yQmFja2VuZC5fcmVzb3VyY2VUcmFja2luZ0VuYWJsZWQgPSB0 cnVlOwotICAgICAgdGhpcy5wYW5lbHMucmVzb3VyY2VzLnJlc291cmNlVHJhY2tpbmdXYXNFbmFi bGVkKCk7Ci19OwotCi1XZWJJbnNwZWN0b3IucmVzb3VyY2VUcmFja2luZ1dhc0Rpc2FibGVkID0g ZnVuY3Rpb24oKQotewotICAgICAgSW5zcGVjdG9yQmFja2VuZC5fcmVzb3VyY2VUcmFja2luZ0Vu YWJsZWQgPSBmYWxzZTsKLSAgICAgIHRoaXMucGFuZWxzLnJlc291cmNlcy5yZXNvdXJjZVRyYWNr aW5nV2FzRGlzYWJsZWQoKTsKLX07Ci0KIChmdW5jdGlvbigpCiB7CiB2YXIgb3JpZyA9IFdlYklu c3BlY3Rvci5Db25zb2xlTWVzc2FnZS5wcm90b3R5cGUuc2V0TWVzc2FnZUJvZHk7Cg==