44601 2010-08-25 05:02:05 -0700 Web Inspector: support disabled and checked context menu items. 2010-08-25 06:50:49 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 pfeldman pfeldman bweinstein joepeck keishi pfeldman pmuellr rik timothy yurys oldest_to_newest 269163 0 pfeldman 2010-08-25 05:02:05 -0700 Patch to follow. 269165 1 65401 pfeldman 2010-08-25 05:06:40 -0700 Created attachment 65401 [PATCH] Proposed change. 269170 2 65401 yurys 2010-08-25 05:13:33 -0700 Comment on attachment 65401 [PATCH] Proposed change. WebCore/inspector/front-end/ContextMenu.js:52 + this._items.push({id: id, label: label, checked: checked, enabled: !!disabled}); !!disabled -> !disabled 269174 3 65403 pfeldman 2010-08-25 05:17:51 -0700 Created attachment 65403 [PATCH] Proposed change. 269176 4 65403 yurys 2010-08-25 05:19:32 -0700 Comment on attachment 65403 [PATCH] Proposed change. WebCore/inspector/front-end/ContextMenu.js:49 + appendItem: function(label, handler, checked, disabled) I'd rather pass explicit enabled parameter. 269198 5 65407 pfeldman 2010-08-25 06:13:37 -0700 Created attachment 65407 [PATCH] Proposed change. 269216 6 pfeldman 2010-08-25 06:50:49 -0700 Variation of patch landed. Committing to http://svn.webkit.org/repository/webkit/trunk ... M WebCore/ChangeLog M WebCore/English.lproj/localizedStrings.js M WebCore/bindings/js/JSInspectorFrontendHostCustom.cpp M WebCore/bindings/v8/custom/V8InspectorFrontendHostCustom.cpp M WebCore/inspector/front-end/ConsoleView.js M WebCore/inspector/front-end/ContextMenu.js Committed r66010 65401 2010-08-25 05:06:40 -0700 2010-08-25 05:17:51 -0700 [PATCH] Proposed change. context_menu text/plain 6090 pfeldman ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg NDY4OWVjOS4uMTNkNzhjZCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAxMC0wOC0yNSAgUGF2ZWwgRmVsZG1h biAgPHBmZWxkbWFuQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBzdXBwb3J0IGRpc2FibGVkIGFuZCBj aGVja2VkIGNvbnRleHQgbWVudSBpdGVtcy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTQ0NjAxCisKKyAgICAgICAgKiBiaW5kaW5ncy9qcy9KU0luc3Bl Y3RvckZyb250ZW5kSG9zdEN1c3RvbS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpKU0luc3BlY3Rv ckZyb250ZW5kSG9zdDo6c2hvd0NvbnRleHRNZW51KToKKyAgICAgICAgKiBiaW5kaW5ncy92OC9j dXN0b20vVjhJbnNwZWN0b3JGcm9udGVuZEhvc3RDdXN0b20uY3BwOgorICAgICAgICAoV2ViQ29y ZTo6VjhJbnNwZWN0b3JGcm9udGVuZEhvc3Q6OnNob3dDb250ZXh0TWVudUNhbGxiYWNrKToKKyAg ICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0NvbnRleHRNZW51LmpzOgorICAgICAgICAoV2Vi SW5zcGVjdG9yLkNvbnRleHRNZW51LnByb3RvdHlwZS5hcHBlbmRJdGVtKToKKwogMjAxMC0wOC0y NSAgS2VudCBUYW11cmEgIDx0a2VudEBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQg YnkgU2hpbmljaGlybyBIYW1hamkKZGlmZiAtLWdpdCBhL1dlYkNvcmUvYmluZGluZ3MvanMvSlNJ bnNwZWN0b3JGcm9udGVuZEhvc3RDdXN0b20uY3BwIGIvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0lu c3BlY3RvckZyb250ZW5kSG9zdEN1c3RvbS5jcHAKaW5kZXggYjcyNGY1MC4uY2FhZDFjOSAxMDA2 NDQKLS0tIGEvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0luc3BlY3RvckZyb250ZW5kSG9zdEN1c3Rv bS5jcHAKKysrIGIvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0luc3BlY3RvckZyb250ZW5kSG9zdEN1 c3RvbS5jcHAKQEAgLTkxLDEzICs5MSwyMCBAQCBKU1ZhbHVlIEpTSW5zcGVjdG9yRnJvbnRlbmRI b3N0OjpzaG93Q29udGV4dE1lbnUoRXhlY1N0YXRlKiBleGVjKQogICAgICAgICBKU09iamVjdCog aXRlbSA9IGFzT2JqZWN0KGFycmF5LT5nZXRJbmRleChpKSk7CiAgICAgICAgIEpTVmFsdWUgbGFi ZWwgPSBpdGVtLT5nZXQoZXhlYywgSWRlbnRpZmllcihleGVjLCAibGFiZWwiKSk7CiAgICAgICAg IEpTVmFsdWUgaWQgPSBpdGVtLT5nZXQoZXhlYywgSWRlbnRpZmllcihleGVjLCAiaWQiKSk7Cisg ICAgICAgIEpTVmFsdWUgZW5hYmxlZCA9IGl0ZW0tPmdldChleGVjLCBJZGVudGlmaWVyKGV4ZWMs ICJlbmFibGVkIikpOworICAgICAgICBKU1ZhbHVlIGNoZWNrZWQgPSBpdGVtLT5nZXQoZXhlYywg SWRlbnRpZmllcihleGVjLCAiY2hlY2tlZCIpKTsKICAgICAgICAgaWYgKGxhYmVsLmlzVW5kZWZp bmVkKCkgfHwgaWQuaXNVbmRlZmluZWQoKSkKICAgICAgICAgICAgIGl0ZW1zLmFwcGVuZChuZXcg Q29udGV4dE1lbnVJdGVtKFNlcGFyYXRvclR5cGUsCiAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBDb250ZXh0TWVudUl0ZW1DdXN0b21UYWdOb0FjdGlvbiwKICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFN0cmluZygpKSk7CiAg ICAgICAgIGVsc2UgewogICAgICAgICAgICAgQ29udGV4dE1lbnVBY3Rpb24gdHlwZWRJZCA9IHN0 YXRpY19jYXN0PENvbnRleHRNZW51QWN0aW9uPihDb250ZXh0TWVudUl0ZW1CYXNlQ3VzdG9tVGFn ICsgaWQudG9JbnQzMihleGVjKSk7Ci0gICAgICAgICAgICBpdGVtcy5hcHBlbmQobmV3IENvbnRl eHRNZW51SXRlbShBY3Rpb25UeXBlLCB0eXBlZElkLCB1c3RyaW5nVG9TdHJpbmcobGFiZWwudG9T dHJpbmcoZXhlYykpKSk7CisgICAgICAgICAgICBDb250ZXh0TWVudUl0ZW0qIGNvbnRleHRNZW51 SXRlbSA9IG5ldyBDb250ZXh0TWVudUl0ZW0oQWN0aW9uVHlwZSwgdHlwZWRJZCwgdXN0cmluZ1Rv U3RyaW5nKGxhYmVsLnRvU3RyaW5nKGV4ZWMpKSk7CisgICAgICAgICAgICBpZiAoIWVuYWJsZWQu aXNVbmRlZmluZWQoKSkKKyAgICAgICAgICAgICAgICBjb250ZXh0TWVudUl0ZW0tPnNldEVuYWJs ZWQoZW5hYmxlZC50b0Jvb2xlYW4oZXhlYykpOworICAgICAgICAgICAgaWYgKCFjaGVja2VkLmlz VW5kZWZpbmVkKCkpCisgICAgICAgICAgICAgICAgY29udGV4dE1lbnVJdGVtLT5zZXRDaGVja2Vk KGNoZWNrZWQudG9Cb29sZWFuKGV4ZWMpKTsKKyAgICAgICAgICAgIGl0ZW1zLmFwcGVuZChjb250 ZXh0TWVudUl0ZW0pOwogICAgICAgICB9CiAgICAgfQogCmRpZmYgLS1naXQgYS9XZWJDb3JlL2Jp bmRpbmdzL3Y4L2N1c3RvbS9WOEluc3BlY3RvckZyb250ZW5kSG9zdEN1c3RvbS5jcHAgYi9XZWJD b3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOEluc3BlY3RvckZyb250ZW5kSG9zdEN1c3RvbS5jcHAK aW5kZXggNzczM2E3MC4uY2I0ZWMxZSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9iaW5kaW5ncy92OC9j dXN0b20vVjhJbnNwZWN0b3JGcm9udGVuZEhvc3RDdXN0b20uY3BwCisrKyBiL1dlYkNvcmUvYmlu ZGluZ3MvdjgvY3VzdG9tL1Y4SW5zcGVjdG9yRnJvbnRlbmRIb3N0Q3VzdG9tLmNwcApAQCAtNzgs NiArNzgsOCBAQCB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4gVjhJbnNwZWN0b3JGcm9udGVuZEhvc3Q6 OnNob3dDb250ZXh0TWVudUNhbGxiYWNrKGNvbnN0IHY4OgogICAgICAgICB2ODo6TG9jYWw8djg6 Ok9iamVjdD4gaXRlbSA9IHY4OjpMb2NhbDx2ODo6T2JqZWN0Pjo6Q2FzdChhcnJheS0+R2V0KHY4 OjpJbnRlZ2VyOjpOZXcoaSkpKTsKICAgICAgICAgdjg6OkxvY2FsPHY4OjpWYWx1ZT4gbGFiZWwg PSBpdGVtLT5HZXQodjg6OlN0cmluZzo6TmV3KCJsYWJlbCIpKTsKICAgICAgICAgdjg6OkxvY2Fs PHY4OjpWYWx1ZT4gaWQgPSBpdGVtLT5HZXQodjg6OlN0cmluZzo6TmV3KCJpZCIpKTsKKyAgICAg ICAgdjg6OkxvY2FsPHY4OjpWYWx1ZT4gZW5hYmxlZCA9IGl0ZW0tPkdldCh2ODo6U3RyaW5nOjpO ZXcoImVuYWJsZWQiKSk7CisgICAgICAgIHY4OjpMb2NhbDx2ODo6VmFsdWU+IGNoZWNrZWQgPSBp dGVtLT5HZXQodjg6OlN0cmluZzo6TmV3KCJjaGVja2VkIikpOwogICAgICAgICBpZiAobGFiZWwt PklzVW5kZWZpbmVkKCkgfHwgaWQtPklzVW5kZWZpbmVkKCkpIHsKICAgICAgICAgICBpdGVtcy5h cHBlbmQobmV3IENvbnRleHRNZW51SXRlbShTZXBhcmF0b3JUeXBlLAogICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIENvbnRleHRNZW51SXRlbUN1c3RvbVRhZ05vQWN0 aW9uLApAQCAtODUsOSArODcsMTIgQEAgdjg6OkhhbmRsZTx2ODo6VmFsdWU+IFY4SW5zcGVjdG9y RnJvbnRlbmRIb3N0OjpzaG93Q29udGV4dE1lbnVDYWxsYmFjayhjb25zdCB2ODoKICAgICAgICAg fSBlbHNlIHsKICAgICAgICAgICBDb250ZXh0TWVudUFjdGlvbiB0eXBlZElkID0gc3RhdGljX2Nh c3Q8Q29udGV4dE1lbnVBY3Rpb24+KAogICAgICAgICAgICAgICBDb250ZXh0TWVudUl0ZW1CYXNl Q3VzdG9tVGFnICsgaWQtPlRvSW50MzIoKS0+VmFsdWUoKSk7Ci0gICAgICAgICAgaXRlbXMuYXBw ZW5kKG5ldyBDb250ZXh0TWVudUl0ZW0oQWN0aW9uVHlwZSwKLSAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICB0eXBlZElkLAotICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIHRvV2ViQ29yZVN0cmluZ1dpdGhOdWxsQ2hlY2sobGFiZWwpKSk7 CisgICAgICAgICAgQ29udGV4dE1lbnVJdGVtKiBtZW51SXRlbSA9IG5ldyBDb250ZXh0TWVudUl0 ZW0oQWN0aW9uVHlwZSwgdHlwZWRJZCwgdG9XZWJDb3JlU3RyaW5nV2l0aE51bGxDaGVjayhsYWJl bCkpOworICAgICAgICAgIGlmIChlbmFibGVkLT5Jc0Jvb2xlYW4oKSkKKyAgICAgICAgICAgICAg bWVudUl0ZW0tPnNldEVuYWJsZWQoZW5hYmxlZC0+VG9Cb29sZWFuKCktPlZhbHVlKCkpOworICAg ICAgICAgIGlmIChjaGVja2VkLT5Jc0Jvb2xlYW4oKSkKKyAgICAgICAgICAgICAgbWVudUl0ZW0t PnNldENoZWNrZWQoY2hlY2tlZC0+VG9Cb29sZWFuKCktPlZhbHVlKCkpOworICAgICAgICAgIGl0 ZW1zLmFwcGVuZChtZW51SXRlbSk7CiAgICAgICAgIH0KICAgICB9CiAKZGlmZiAtLWdpdCBhL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Db25zb2xlVmlldy5qcyBiL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9Db25zb2xlVmlldy5qcwppbmRleCA0NzRjMzYyLi5iYjIwOGNiIDEwMDY0 NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQ29uc29sZVZpZXcuanMKKysrIGIv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NvbnNvbGVWaWV3LmpzCkBAIC00MDEsOSArNDAx LDkgQEAgV2ViSW5zcGVjdG9yLkNvbnNvbGVWaWV3LnByb3RvdHlwZSA9IHsKIAogICAgICAgICB2 YXIgY29udGV4dE1lbnUgPSBuZXcgV2ViSW5zcGVjdG9yLkNvbnRleHRNZW51KCk7CiAgICAgICAg IGlmICghV2ViSW5zcGVjdG9yLm1vbml0b3JpbmdYSFJFbmFibGVkKQotICAgICAgICAgICAgY29u dGV4dE1lbnUuYXBwZW5kSXRlbShXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkVuYWJsZSBYTUxIdHRw UmVxdWVzdCBsb2dnaW5nIiksIEluc3BlY3RvckJhY2tlbmQuZW5hYmxlTW9uaXRvcmluZ1hIUi5i aW5kKEluc3BlY3RvckJhY2tlbmQpKTsKKyAgICAgICAgICAgIGNvbnRleHRNZW51LmFwcGVuZEl0 ZW0oV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJYTUxIdHRwUmVxdWVzdCBsb2dnaW5nIiksIEluc3Bl Y3RvckJhY2tlbmQuZW5hYmxlTW9uaXRvcmluZ1hIUi5iaW5kKEluc3BlY3RvckJhY2tlbmQpLCBm YWxzZSk7CiAgICAgICAgIGVsc2UKLSAgICAgICAgICAgIGNvbnRleHRNZW51LmFwcGVuZEl0ZW0o V2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJEaXNhYmxlIFhNTEh0dHBSZXF1ZXN0IGxvZ2dpbmciKSwg SW5zcGVjdG9yQmFja2VuZC5kaXNhYmxlTW9uaXRvcmluZ1hIUi5iaW5kKEluc3BlY3RvckJhY2tl bmQpKTsKKyAgICAgICAgICAgIGNvbnRleHRNZW51LmFwcGVuZEl0ZW0oV2ViSW5zcGVjdG9yLlVJ U3RyaW5nKCJYTUxIdHRwUmVxdWVzdCBsb2dnaW5nIiksIEluc3BlY3RvckJhY2tlbmQuZGlzYWJs ZU1vbml0b3JpbmdYSFIuYmluZChJbnNwZWN0b3JCYWNrZW5kKSwgdHJ1ZSk7CiAgICAgICAgIGNv bnRleHRNZW51LmFwcGVuZEl0ZW0oV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJDbGVhciBDb25zb2xl IiksIHRoaXMucmVxdWVzdENsZWFyTWVzc2FnZXMuYmluZCh0aGlzKSk7CiAgICAgICAgIGNvbnRl eHRNZW51LnNob3coZXZlbnQpOwogICAgIH0sCmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvQ29udGV4dE1lbnUuanMgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv Q29udGV4dE1lbnUuanMKaW5kZXggM2NkYjE1Mi4uODhiNWYwYSAxMDA2NDQKLS0tIGEvV2ViQ29y ZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NvbnRleHRNZW51LmpzCisrKyBiL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9Db250ZXh0TWVudS5qcwpAQCAtNDYsMTAgKzQ2LDEwIEBAIFdlYkluc3Bl Y3Rvci5Db250ZXh0TWVudS5wcm90b3R5cGUgPSB7CiAgICAgICAgIH0KICAgICB9LAogCi0gICAg YXBwZW5kSXRlbTogZnVuY3Rpb24obGFiZWwsIGhhbmRsZXIpCisgICAgYXBwZW5kSXRlbTogZnVu Y3Rpb24obGFiZWwsIGhhbmRsZXIsIGNoZWNrZWQsIGRpc2FibGVkKQogICAgIHsKICAgICAgICAg dmFyIGlkID0gdGhpcy5faXRlbXMubGVuZ3RoOwotICAgICAgICB0aGlzLl9pdGVtcy5wdXNoKHtp ZDogaWQsIGxhYmVsOiBsYWJlbH0pOworICAgICAgICB0aGlzLl9pdGVtcy5wdXNoKHtpZDogaWQs IGxhYmVsOiBsYWJlbCwgY2hlY2tlZDogY2hlY2tlZCwgZW5hYmxlZDogISFkaXNhYmxlZH0pOwog ICAgICAgICB0aGlzLl9oYW5kbGVyc1tpZF0gPSBoYW5kbGVyOwogICAgIH0sCiAK 65403 2010-08-25 05:17:51 -0700 2010-08-25 06:13:37 -0700 [PATCH] Proposed change. force_bool text/plain 6437 pfeldman ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg NDY4OWVjOS4uMTNkNzhjZCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAxMC0wOC0yNSAgUGF2ZWwgRmVsZG1h biAgPHBmZWxkbWFuQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBzdXBwb3J0IGRpc2FibGVkIGFuZCBj aGVja2VkIGNvbnRleHQgbWVudSBpdGVtcy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTQ0NjAxCisKKyAgICAgICAgKiBiaW5kaW5ncy9qcy9KU0luc3Bl Y3RvckZyb250ZW5kSG9zdEN1c3RvbS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpKU0luc3BlY3Rv ckZyb250ZW5kSG9zdDo6c2hvd0NvbnRleHRNZW51KToKKyAgICAgICAgKiBiaW5kaW5ncy92OC9j dXN0b20vVjhJbnNwZWN0b3JGcm9udGVuZEhvc3RDdXN0b20uY3BwOgorICAgICAgICAoV2ViQ29y ZTo6VjhJbnNwZWN0b3JGcm9udGVuZEhvc3Q6OnNob3dDb250ZXh0TWVudUNhbGxiYWNrKToKKyAg ICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0NvbnRleHRNZW51LmpzOgorICAgICAgICAoV2Vi SW5zcGVjdG9yLkNvbnRleHRNZW51LnByb3RvdHlwZS5hcHBlbmRJdGVtKToKKwogMjAxMC0wOC0y NSAgS2VudCBUYW11cmEgIDx0a2VudEBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQg YnkgU2hpbmljaGlybyBIYW1hamkKZGlmZiAtLWdpdCBhL1dlYkNvcmUvRW5nbGlzaC5scHJvai9s b2NhbGl6ZWRTdHJpbmdzLmpzIGIvV2ViQ29yZS9FbmdsaXNoLmxwcm9qL2xvY2FsaXplZFN0cmlu Z3MuanMKaW5kZXggMTZkODdhZWEyY2U5ZmNhODc3Zjg3NzllYzIwNjYzNTIwYWRjMDdlNy4uZGQ4 Yzc1MWZhYzFkNmNhZjgwNTFiMjUwZjRlZjgwZjZlY2NlYTcyMCAxMDA2NDQKR0lUIGJpbmFyeSBw YXRjaApkZWx0YSAyMgpnY21WK3gwT3xqLSReeilmMDxoMVhsaEwwcGxnbF4/dihjWW4xJmBlZXJ+ bSl9CgpkZWx0YSA1NAp5Y21hRUhmQCN3IXJWWiFrUDFkKklufHl3ciNwR0JwdHZDNmtwVF57ITFf RUhRbXRZeiF3bUVoX0ghQT9wTEt5PTkKCmRpZmYgLS1naXQgYS9XZWJDb3JlL2JpbmRpbmdzL2pz L0pTSW5zcGVjdG9yRnJvbnRlbmRIb3N0Q3VzdG9tLmNwcCBiL1dlYkNvcmUvYmluZGluZ3MvanMv SlNJbnNwZWN0b3JGcm9udGVuZEhvc3RDdXN0b20uY3BwCmluZGV4IGI3MjRmNTAuLmNhYWQxYzkg MTAwNjQ0Ci0tLSBhL1dlYkNvcmUvYmluZGluZ3MvanMvSlNJbnNwZWN0b3JGcm9udGVuZEhvc3RD dXN0b20uY3BwCisrKyBiL1dlYkNvcmUvYmluZGluZ3MvanMvSlNJbnNwZWN0b3JGcm9udGVuZEhv c3RDdXN0b20uY3BwCkBAIC05MSwxMyArOTEsMjAgQEAgSlNWYWx1ZSBKU0luc3BlY3RvckZyb250 ZW5kSG9zdDo6c2hvd0NvbnRleHRNZW51KEV4ZWNTdGF0ZSogZXhlYykKICAgICAgICAgSlNPYmpl Y3QqIGl0ZW0gPSBhc09iamVjdChhcnJheS0+Z2V0SW5kZXgoaSkpOwogICAgICAgICBKU1ZhbHVl IGxhYmVsID0gaXRlbS0+Z2V0KGV4ZWMsIElkZW50aWZpZXIoZXhlYywgImxhYmVsIikpOwogICAg ICAgICBKU1ZhbHVlIGlkID0gaXRlbS0+Z2V0KGV4ZWMsIElkZW50aWZpZXIoZXhlYywgImlkIikp OworICAgICAgICBKU1ZhbHVlIGVuYWJsZWQgPSBpdGVtLT5nZXQoZXhlYywgSWRlbnRpZmllcihl eGVjLCAiZW5hYmxlZCIpKTsKKyAgICAgICAgSlNWYWx1ZSBjaGVja2VkID0gaXRlbS0+Z2V0KGV4 ZWMsIElkZW50aWZpZXIoZXhlYywgImNoZWNrZWQiKSk7CiAgICAgICAgIGlmIChsYWJlbC5pc1Vu ZGVmaW5lZCgpIHx8IGlkLmlzVW5kZWZpbmVkKCkpCiAgICAgICAgICAgICBpdGVtcy5hcHBlbmQo bmV3IENvbnRleHRNZW51SXRlbShTZXBhcmF0b3JUeXBlLAogICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgQ29udGV4dE1lbnVJdGVtQ3VzdG9tVGFnTm9BY3Rpb24s CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBTdHJpbmcoKSkp OwogICAgICAgICBlbHNlIHsKICAgICAgICAgICAgIENvbnRleHRNZW51QWN0aW9uIHR5cGVkSWQg PSBzdGF0aWNfY2FzdDxDb250ZXh0TWVudUFjdGlvbj4oQ29udGV4dE1lbnVJdGVtQmFzZUN1c3Rv bVRhZyArIGlkLnRvSW50MzIoZXhlYykpOwotICAgICAgICAgICAgaXRlbXMuYXBwZW5kKG5ldyBD b250ZXh0TWVudUl0ZW0oQWN0aW9uVHlwZSwgdHlwZWRJZCwgdXN0cmluZ1RvU3RyaW5nKGxhYmVs LnRvU3RyaW5nKGV4ZWMpKSkpOworICAgICAgICAgICAgQ29udGV4dE1lbnVJdGVtKiBjb250ZXh0 TWVudUl0ZW0gPSBuZXcgQ29udGV4dE1lbnVJdGVtKEFjdGlvblR5cGUsIHR5cGVkSWQsIHVzdHJp bmdUb1N0cmluZyhsYWJlbC50b1N0cmluZyhleGVjKSkpOworICAgICAgICAgICAgaWYgKCFlbmFi bGVkLmlzVW5kZWZpbmVkKCkpCisgICAgICAgICAgICAgICAgY29udGV4dE1lbnVJdGVtLT5zZXRF bmFibGVkKGVuYWJsZWQudG9Cb29sZWFuKGV4ZWMpKTsKKyAgICAgICAgICAgIGlmICghY2hlY2tl ZC5pc1VuZGVmaW5lZCgpKQorICAgICAgICAgICAgICAgIGNvbnRleHRNZW51SXRlbS0+c2V0Q2hl Y2tlZChjaGVja2VkLnRvQm9vbGVhbihleGVjKSk7CisgICAgICAgICAgICBpdGVtcy5hcHBlbmQo Y29udGV4dE1lbnVJdGVtKTsKICAgICAgICAgfQogICAgIH0KIApkaWZmIC0tZ2l0IGEvV2ViQ29y ZS9iaW5kaW5ncy92OC9jdXN0b20vVjhJbnNwZWN0b3JGcm9udGVuZEhvc3RDdXN0b20uY3BwIGIv V2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhJbnNwZWN0b3JGcm9udGVuZEhvc3RDdXN0b20u Y3BwCmluZGV4IDc3MzNhNzAuLmNiNGVjMWUgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvYmluZGluZ3Mv djgvY3VzdG9tL1Y4SW5zcGVjdG9yRnJvbnRlbmRIb3N0Q3VzdG9tLmNwcAorKysgYi9XZWJDb3Jl L2JpbmRpbmdzL3Y4L2N1c3RvbS9WOEluc3BlY3RvckZyb250ZW5kSG9zdEN1c3RvbS5jcHAKQEAg LTc4LDYgKzc4LDggQEAgdjg6OkhhbmRsZTx2ODo6VmFsdWU+IFY4SW5zcGVjdG9yRnJvbnRlbmRI b3N0OjpzaG93Q29udGV4dE1lbnVDYWxsYmFjayhjb25zdCB2ODoKICAgICAgICAgdjg6OkxvY2Fs PHY4OjpPYmplY3Q+IGl0ZW0gPSB2ODo6TG9jYWw8djg6Ok9iamVjdD46OkNhc3QoYXJyYXktPkdl dCh2ODo6SW50ZWdlcjo6TmV3KGkpKSk7CiAgICAgICAgIHY4OjpMb2NhbDx2ODo6VmFsdWU+IGxh YmVsID0gaXRlbS0+R2V0KHY4OjpTdHJpbmc6Ok5ldygibGFiZWwiKSk7CiAgICAgICAgIHY4OjpM b2NhbDx2ODo6VmFsdWU+IGlkID0gaXRlbS0+R2V0KHY4OjpTdHJpbmc6Ok5ldygiaWQiKSk7Cisg ICAgICAgIHY4OjpMb2NhbDx2ODo6VmFsdWU+IGVuYWJsZWQgPSBpdGVtLT5HZXQodjg6OlN0cmlu Zzo6TmV3KCJlbmFibGVkIikpOworICAgICAgICB2ODo6TG9jYWw8djg6OlZhbHVlPiBjaGVja2Vk ID0gaXRlbS0+R2V0KHY4OjpTdHJpbmc6Ok5ldygiY2hlY2tlZCIpKTsKICAgICAgICAgaWYgKGxh YmVsLT5Jc1VuZGVmaW5lZCgpIHx8IGlkLT5Jc1VuZGVmaW5lZCgpKSB7CiAgICAgICAgICAgaXRl bXMuYXBwZW5kKG5ldyBDb250ZXh0TWVudUl0ZW0oU2VwYXJhdG9yVHlwZSwKICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBDb250ZXh0TWVudUl0ZW1DdXN0b21UYWdO b0FjdGlvbiwKQEAgLTg1LDkgKzg3LDEyIEBAIHY4OjpIYW5kbGU8djg6OlZhbHVlPiBWOEluc3Bl Y3RvckZyb250ZW5kSG9zdDo6c2hvd0NvbnRleHRNZW51Q2FsbGJhY2soY29uc3Qgdjg6CiAgICAg ICAgIH0gZWxzZSB7CiAgICAgICAgICAgQ29udGV4dE1lbnVBY3Rpb24gdHlwZWRJZCA9IHN0YXRp Y19jYXN0PENvbnRleHRNZW51QWN0aW9uPigKICAgICAgICAgICAgICAgQ29udGV4dE1lbnVJdGVt QmFzZUN1c3RvbVRhZyArIGlkLT5Ub0ludDMyKCktPlZhbHVlKCkpOwotICAgICAgICAgIGl0ZW1z LmFwcGVuZChuZXcgQ29udGV4dE1lbnVJdGVtKEFjdGlvblR5cGUsCi0gICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgdHlwZWRJZCwKLSAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICB0b1dlYkNvcmVTdHJpbmdXaXRoTnVsbENoZWNrKGxhYmVs KSkpOworICAgICAgICAgIENvbnRleHRNZW51SXRlbSogbWVudUl0ZW0gPSBuZXcgQ29udGV4dE1l bnVJdGVtKEFjdGlvblR5cGUsIHR5cGVkSWQsIHRvV2ViQ29yZVN0cmluZ1dpdGhOdWxsQ2hlY2so bGFiZWwpKTsKKyAgICAgICAgICBpZiAoZW5hYmxlZC0+SXNCb29sZWFuKCkpCisgICAgICAgICAg ICAgIG1lbnVJdGVtLT5zZXRFbmFibGVkKGVuYWJsZWQtPlRvQm9vbGVhbigpLT5WYWx1ZSgpKTsK KyAgICAgICAgICBpZiAoY2hlY2tlZC0+SXNCb29sZWFuKCkpCisgICAgICAgICAgICAgIG1lbnVJ dGVtLT5zZXRDaGVja2VkKGNoZWNrZWQtPlRvQm9vbGVhbigpLT5WYWx1ZSgpKTsKKyAgICAgICAg ICBpdGVtcy5hcHBlbmQobWVudUl0ZW0pOwogICAgICAgICB9CiAgICAgfQogCmRpZmYgLS1naXQg YS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQ29uc29sZVZpZXcuanMgYi9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvQ29uc29sZVZpZXcuanMKaW5kZXggNDc0YzM2Mi4uYmIyMDhjYiAx MDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NvbnNvbGVWaWV3LmpzCisr KyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Db25zb2xlVmlldy5qcwpAQCAtNDAxLDkg KzQwMSw5IEBAIFdlYkluc3BlY3Rvci5Db25zb2xlVmlldy5wcm90b3R5cGUgPSB7CiAKICAgICAg ICAgdmFyIGNvbnRleHRNZW51ID0gbmV3IFdlYkluc3BlY3Rvci5Db250ZXh0TWVudSgpOwogICAg ICAgICBpZiAoIVdlYkluc3BlY3Rvci5tb25pdG9yaW5nWEhSRW5hYmxlZCkKLSAgICAgICAgICAg IGNvbnRleHRNZW51LmFwcGVuZEl0ZW0oV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJFbmFibGUgWE1M SHR0cFJlcXVlc3QgbG9nZ2luZyIpLCBJbnNwZWN0b3JCYWNrZW5kLmVuYWJsZU1vbml0b3JpbmdY SFIuYmluZChJbnNwZWN0b3JCYWNrZW5kKSk7CisgICAgICAgICAgICBjb250ZXh0TWVudS5hcHBl bmRJdGVtKFdlYkluc3BlY3Rvci5VSVN0cmluZygiWE1MSHR0cFJlcXVlc3QgbG9nZ2luZyIpLCBJ bnNwZWN0b3JCYWNrZW5kLmVuYWJsZU1vbml0b3JpbmdYSFIuYmluZChJbnNwZWN0b3JCYWNrZW5k KSwgZmFsc2UpOwogICAgICAgICBlbHNlCi0gICAgICAgICAgICBjb250ZXh0TWVudS5hcHBlbmRJ dGVtKFdlYkluc3BlY3Rvci5VSVN0cmluZygiRGlzYWJsZSBYTUxIdHRwUmVxdWVzdCBsb2dnaW5n IiksIEluc3BlY3RvckJhY2tlbmQuZGlzYWJsZU1vbml0b3JpbmdYSFIuYmluZChJbnNwZWN0b3JC YWNrZW5kKSk7CisgICAgICAgICAgICBjb250ZXh0TWVudS5hcHBlbmRJdGVtKFdlYkluc3BlY3Rv ci5VSVN0cmluZygiWE1MSHR0cFJlcXVlc3QgbG9nZ2luZyIpLCBJbnNwZWN0b3JCYWNrZW5kLmRp c2FibGVNb25pdG9yaW5nWEhSLmJpbmQoSW5zcGVjdG9yQmFja2VuZCksIHRydWUpOwogICAgICAg ICBjb250ZXh0TWVudS5hcHBlbmRJdGVtKFdlYkluc3BlY3Rvci5VSVN0cmluZygiQ2xlYXIgQ29u c29sZSIpLCB0aGlzLnJlcXVlc3RDbGVhck1lc3NhZ2VzLmJpbmQodGhpcykpOwogICAgICAgICBj b250ZXh0TWVudS5zaG93KGV2ZW50KTsKICAgICB9LApkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL0NvbnRleHRNZW51LmpzIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL0NvbnRleHRNZW51LmpzCmluZGV4IDNjZGIxNTIuLjE4ODk3YWIgMTAwNjQ0Ci0tLSBhL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Db250ZXh0TWVudS5qcworKysgYi9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvQ29udGV4dE1lbnUuanMKQEAgLTQ2LDEwICs0NiwxMCBAQCBXZWJJ bnNwZWN0b3IuQ29udGV4dE1lbnUucHJvdG90eXBlID0gewogICAgICAgICB9CiAgICAgfSwKIAot ICAgIGFwcGVuZEl0ZW06IGZ1bmN0aW9uKGxhYmVsLCBoYW5kbGVyKQorICAgIGFwcGVuZEl0ZW06 IGZ1bmN0aW9uKGxhYmVsLCBoYW5kbGVyLCBjaGVja2VkLCBkaXNhYmxlZCkKICAgICB7CiAgICAg ICAgIHZhciBpZCA9IHRoaXMuX2l0ZW1zLmxlbmd0aDsKLSAgICAgICAgdGhpcy5faXRlbXMucHVz aCh7aWQ6IGlkLCBsYWJlbDogbGFiZWx9KTsKKyAgICAgICAgdGhpcy5faXRlbXMucHVzaCh7aWQ6 IGlkLCBsYWJlbDogbGFiZWwsIGNoZWNrZWQ6ICEhY2hlY2tlZCwgZW5hYmxlZDogIWRpc2FibGVk fSk7CiAgICAgICAgIHRoaXMuX2hhbmRsZXJzW2lkXSA9IGhhbmRsZXI7CiAgICAgfSwKIAo= 65407 2010-08-25 06:13:37 -0700 2010-08-25 06:13:37 -0700 [PATCH] Proposed change. context_menu text/plain 8564 pfeldman ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg NDY4OWVjOS4uMTNkNzhjZCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAxMC0wOC0yNSAgUGF2ZWwgRmVsZG1h biAgPHBmZWxkbWFuQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBzdXBwb3J0IGRpc2FibGVkIGFuZCBj aGVja2VkIGNvbnRleHQgbWVudSBpdGVtcy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTQ0NjAxCisKKyAgICAgICAgKiBiaW5kaW5ncy9qcy9KU0luc3Bl Y3RvckZyb250ZW5kSG9zdEN1c3RvbS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpKU0luc3BlY3Rv ckZyb250ZW5kSG9zdDo6c2hvd0NvbnRleHRNZW51KToKKyAgICAgICAgKiBiaW5kaW5ncy92OC9j dXN0b20vVjhJbnNwZWN0b3JGcm9udGVuZEhvc3RDdXN0b20uY3BwOgorICAgICAgICAoV2ViQ29y ZTo6VjhJbnNwZWN0b3JGcm9udGVuZEhvc3Q6OnNob3dDb250ZXh0TWVudUNhbGxiYWNrKToKKyAg ICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0NvbnRleHRNZW51LmpzOgorICAgICAgICAoV2Vi SW5zcGVjdG9yLkNvbnRleHRNZW51LnByb3RvdHlwZS5hcHBlbmRJdGVtKToKKwogMjAxMC0wOC0y NSAgS2VudCBUYW11cmEgIDx0a2VudEBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQg YnkgU2hpbmljaGlybyBIYW1hamkKZGlmZiAtLWdpdCBhL1dlYkNvcmUvRW5nbGlzaC5scHJvai9s b2NhbGl6ZWRTdHJpbmdzLmpzIGIvV2ViQ29yZS9FbmdsaXNoLmxwcm9qL2xvY2FsaXplZFN0cmlu Z3MuanMKaW5kZXggMTZkODdhZWEyY2U5ZmNhODc3Zjg3NzllYzIwNjYzNTIwYWRjMDdlNy4uZGQ4 Yzc1MWZhYzFkNmNhZjgwNTFiMjUwZjRlZjgwZjZlY2NlYTcyMCAxMDA2NDQKR0lUIGJpbmFyeSBw YXRjaApkZWx0YSAyMgpnY21WK3gwT3xqLSReeilmMDxoMVhsaEwwcGxnbF4/dihjWW4xJmBlZXJ+ bSl9CgpkZWx0YSA1NAp5Y21hRUhmQCN3IXJWWiFrUDFkKklufHl3ciNwR0JwdHZDNmtwVF57ITFf RUhRbXRZeiF3bUVoX0ghQT9wTEt5PTkKCmRpZmYgLS1naXQgYS9XZWJDb3JlL2JpbmRpbmdzL2pz L0pTSW5zcGVjdG9yRnJvbnRlbmRIb3N0Q3VzdG9tLmNwcCBiL1dlYkNvcmUvYmluZGluZ3MvanMv SlNJbnNwZWN0b3JGcm9udGVuZEhvc3RDdXN0b20uY3BwCmluZGV4IGI3MjRmNTAuLjI1NGJkMGIg MTAwNjQ0Ci0tLSBhL1dlYkNvcmUvYmluZGluZ3MvanMvSlNJbnNwZWN0b3JGcm9udGVuZEhvc3RD dXN0b20uY3BwCisrKyBiL1dlYkNvcmUvYmluZGluZ3MvanMvSlNJbnNwZWN0b3JGcm9udGVuZEhv c3RDdXN0b20uY3BwCkBAIC00MCw2ICs0MCw3IEBACiAjaW5jbHVkZSAiSW5zcGVjdG9yRnJvbnRl bmRIb3N0LmgiCiAjaW5jbHVkZSAiSlNFdmVudC5oIgogI2luY2x1ZGUgIk1vdXNlRXZlbnQuaCIK KyNpbmNsdWRlICJQbGF0Zm9ybVN0cmluZy5oIgogI2luY2x1ZGUgPHJ1bnRpbWUvSlNBcnJheS5o PgogI2luY2x1ZGUgPHJ1bnRpbWUvSlNMb2NrLmg+CiAjaW5jbHVkZSA8cnVudGltZS9KU09iamVj dC5oPgpAQCAtOTAsMTQgKzkxLDI2IEBAIEpTVmFsdWUgSlNJbnNwZWN0b3JGcm9udGVuZEhvc3Q6 OnNob3dDb250ZXh0TWVudShFeGVjU3RhdGUqIGV4ZWMpCiAgICAgZm9yIChzaXplX3QgaSA9IDA7 IGkgPCBhcnJheS0+bGVuZ3RoKCk7ICsraSkgewogICAgICAgICBKU09iamVjdCogaXRlbSA9IGFz T2JqZWN0KGFycmF5LT5nZXRJbmRleChpKSk7CiAgICAgICAgIEpTVmFsdWUgbGFiZWwgPSBpdGVt LT5nZXQoZXhlYywgSWRlbnRpZmllcihleGVjLCAibGFiZWwiKSk7CisgICAgICAgIEpTVmFsdWUg dHlwZSA9IGl0ZW0tPmdldChleGVjLCBJZGVudGlmaWVyKGV4ZWMsICJ0eXBlIikpOwogICAgICAg ICBKU1ZhbHVlIGlkID0gaXRlbS0+Z2V0KGV4ZWMsIElkZW50aWZpZXIoZXhlYywgImlkIikpOwot ICAgICAgICBpZiAobGFiZWwuaXNVbmRlZmluZWQoKSB8fCBpZC5pc1VuZGVmaW5lZCgpKQorICAg ICAgICBKU1ZhbHVlIGVuYWJsZWQgPSBpdGVtLT5nZXQoZXhlYywgSWRlbnRpZmllcihleGVjLCAi ZW5hYmxlZCIpKTsKKyAgICAgICAgSlNWYWx1ZSBjaGVja2VkID0gaXRlbS0+Z2V0KGV4ZWMsIElk ZW50aWZpZXIoZXhlYywgImNoZWNrZWQiKSk7CisgICAgICAgIGlmICghdHlwZS5pc1N0cmluZygp KQorICAgICAgICAgICAgY29udGludWU7CisKKyAgICAgICAgU3RyaW5nIHR5cGVTdHJpbmcgPSB1 c3RyaW5nVG9TdHJpbmcobGFiZWwudG9TdHJpbmcodHlwZSkpOworICAgICAgICBpZiAodHlwZVN0 cmluZyA9PSAic2VwYXJhdG9yIikgewogICAgICAgICAgICAgaXRlbXMuYXBwZW5kKG5ldyBDb250 ZXh0TWVudUl0ZW0oU2VwYXJhdG9yVHlwZSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIENvbnRleHRNZW51SXRlbUN1c3RvbVRhZ05vQWN0aW9uLAogICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgU3RyaW5nKCkpKTsKLSAgICAg ICAgZWxzZSB7Ci0gICAgICAgICAgICBDb250ZXh0TWVudUFjdGlvbiB0eXBlZElkID0gc3RhdGlj X2Nhc3Q8Q29udGV4dE1lbnVBY3Rpb24+KENvbnRleHRNZW51SXRlbUJhc2VDdXN0b21UYWcgKyBp ZC50b0ludDMyKGV4ZWMpKTsKLSAgICAgICAgICAgIGl0ZW1zLmFwcGVuZChuZXcgQ29udGV4dE1l bnVJdGVtKEFjdGlvblR5cGUsIHR5cGVkSWQsIHVzdHJpbmdUb1N0cmluZyhsYWJlbC50b1N0cmlu ZyhleGVjKSkpKTsKKyAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICAgIENvbnRleHRNZW51QWN0 aW9uIHR5cGVkSWQgPSBzdGF0aWNfY2FzdDxDb250ZXh0TWVudUFjdGlvbj4oQ29udGV4dE1lbnVJ dGVtQmFzZUN1c3RvbVRhZyArIGlkLT5Ub0ludDMyKCktPlZhbHVlKCkpOworICAgICAgICAgICAg Q29udGV4dE1lbnVJdGVtKiBtZW51SXRlbSA9IG5ldyBDb250ZXh0TWVudUl0ZW0oKHR5cGVTdHJp bmcgPT0gImNoZWNrYm94IiA/IENoZWNrYWJsZUFjdGlvblR5cGUgOiBBY3Rpb25UeXBlKSwgdHlw ZWRJZCwgdXN0cmluZ1RvU3RyaW5nKGxhYmVsLnRvU3RyaW5nKGV4ZWMpKSk7CisgICAgICAgICAg ICBpZiAoIWVuYWJsZWQuaXNVbmRlZmluZWQoKSkKKyAgICAgICAgICAgICAgICBjb250ZXh0TWVu dUl0ZW0tPnNldEVuYWJsZWQoZW5hYmxlZC50b0Jvb2xlYW4oZXhlYykpOworICAgICAgICAgICAg aWYgKCFjaGVja2VkLmlzVW5kZWZpbmVkKCkpCisgICAgICAgICAgICAgICAgY29udGV4dE1lbnVJ dGVtLT5zZXRDaGVja2VkKGNoZWNrZWQudG9Cb29sZWFuKGV4ZWMpKTsKKyAgICAgICAgICAgIGl0 ZW1zLmFwcGVuZChtZW51SXRlbSk7CiAgICAgICAgIH0KICAgICB9CiAKZGlmZiAtLWdpdCBhL1dl YkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4SW5zcGVjdG9yRnJvbnRlbmRIb3N0Q3VzdG9tLmNw cCBiL1dlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4SW5zcGVjdG9yRnJvbnRlbmRIb3N0Q3Vz dG9tLmNwcAppbmRleCA3NzMzYTcwLi4yNWI5MDEwIDEwMDY0NAotLS0gYS9XZWJDb3JlL2JpbmRp bmdzL3Y4L2N1c3RvbS9WOEluc3BlY3RvckZyb250ZW5kSG9zdEN1c3RvbS5jcHAKKysrIGIvV2Vi Q29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhJbnNwZWN0b3JGcm9udGVuZEhvc3RDdXN0b20uY3Bw CkBAIC0zMyw2ICszMyw3IEBACiAKICNpbmNsdWRlICJJbnNwZWN0b3JDb250cm9sbGVyLmgiCiAj aW5jbHVkZSAiSW5zcGVjdG9yRnJvbnRlbmRIb3N0LmgiCisjaW5jbHVkZSAiUGxhdGZvcm1TdHJp bmcuaCIKIAogI2luY2x1ZGUgIlY4QmluZGluZy5oIgogI2luY2x1ZGUgIlY4TW91c2VFdmVudC5o IgpAQCAtNzYsMTggKzc3LDI2IEBAIHY4OjpIYW5kbGU8djg6OlZhbHVlPiBWOEluc3BlY3RvckZy b250ZW5kSG9zdDo6c2hvd0NvbnRleHRNZW51Q2FsbGJhY2soY29uc3Qgdjg6CiAKICAgICBmb3Ig KHNpemVfdCBpID0gMDsgaSA8IGFycmF5LT5MZW5ndGgoKTsgKytpKSB7CiAgICAgICAgIHY4OjpM b2NhbDx2ODo6T2JqZWN0PiBpdGVtID0gdjg6OkxvY2FsPHY4OjpPYmplY3Q+OjpDYXN0KGFycmF5 LT5HZXQodjg6OkludGVnZXI6Ok5ldyhpKSkpOwotICAgICAgICB2ODo6TG9jYWw8djg6OlZhbHVl PiBsYWJlbCA9IGl0ZW0tPkdldCh2ODo6U3RyaW5nOjpOZXcoImxhYmVsIikpOworICAgICAgICB2 ODo6TG9jYWw8djg6OlZhbHVlPiB0eXBlID0gaXRlbS0+R2V0KHY4OjpTdHJpbmc6Ok5ldygidHlw ZSIpKTsKICAgICAgICAgdjg6OkxvY2FsPHY4OjpWYWx1ZT4gaWQgPSBpdGVtLT5HZXQodjg6OlN0 cmluZzo6TmV3KCJpZCIpKTsKLSAgICAgICAgaWYgKGxhYmVsLT5Jc1VuZGVmaW5lZCgpIHx8IGlk LT5Jc1VuZGVmaW5lZCgpKSB7Ci0gICAgICAgICAgaXRlbXMuYXBwZW5kKG5ldyBDb250ZXh0TWVu dUl0ZW0oU2VwYXJhdG9yVHlwZSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBDb250ZXh0TWVudUl0ZW1DdXN0b21UYWdOb0FjdGlvbiwKLSAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBTdHJpbmcoKSkpOworICAgICAgICB2ODo6TG9j YWw8djg6OlZhbHVlPiBsYWJlbCA9IGl0ZW0tPkdldCh2ODo6U3RyaW5nOjpOZXcoImxhYmVsIikp OworICAgICAgICB2ODo6TG9jYWw8djg6OlZhbHVlPiBlbmFibGVkID0gaXRlbS0+R2V0KHY4OjpT dHJpbmc6Ok5ldygiZW5hYmxlZCIpKTsKKyAgICAgICAgdjg6OkxvY2FsPHY4OjpWYWx1ZT4gY2hl Y2tlZCA9IGl0ZW0tPkdldCh2ODo6U3RyaW5nOjpOZXcoImNoZWNrZWQiKSk7CisgICAgICAgIGlm ICghdHlwZS0+SXNTdHJpbmcoKSkKKyAgICAgICAgICAgIGNvbnRpbnVlOworICAgICAgICBTdHJp bmcgdHlwZVN0cmluZyA9IHRvV2ViQ29yZVN0cmluZ1dpdGhOdWxsQ2hlY2sodHlwZSk7CisgICAg ICAgIGlmICh0eXBlU3RyaW5nID09ICJzZXBhcmF0b3IiKSB7CisgICAgICAgICAgICBpdGVtcy5h cHBlbmQobmV3IENvbnRleHRNZW51SXRlbShTZXBhcmF0b3JUeXBlLAorICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgQ29udGV4dE1lbnVJdGVtQ3VzdG9tVGFnTm9B Y3Rpb24sCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBTdHJp bmcoKSkpOwogICAgICAgICB9IGVsc2UgewotICAgICAgICAgIENvbnRleHRNZW51QWN0aW9uIHR5 cGVkSWQgPSBzdGF0aWNfY2FzdDxDb250ZXh0TWVudUFjdGlvbj4oCi0gICAgICAgICAgICAgIENv bnRleHRNZW51SXRlbUJhc2VDdXN0b21UYWcgKyBpZC0+VG9JbnQzMigpLT5WYWx1ZSgpKTsKLSAg ICAgICAgICBpdGVtcy5hcHBlbmQobmV3IENvbnRleHRNZW51SXRlbShBY3Rpb25UeXBlLAotICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHR5cGVkSWQsCi0gICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdG9XZWJDb3JlU3RyaW5nV2l0aE51 bGxDaGVjayhsYWJlbCkpKTsKKyAgICAgICAgICAgIENvbnRleHRNZW51QWN0aW9uIHR5cGVkSWQg PSBzdGF0aWNfY2FzdDxDb250ZXh0TWVudUFjdGlvbj4oQ29udGV4dE1lbnVJdGVtQmFzZUN1c3Rv bVRhZyArIGlkLT5Ub0ludDMyKCktPlZhbHVlKCkpOworICAgICAgICAgICAgQ29udGV4dE1lbnVJ dGVtKiBtZW51SXRlbSA9IG5ldyBDb250ZXh0TWVudUl0ZW0oKHR5cGVTdHJpbmcgPT0gImNoZWNr Ym94IiA/IENoZWNrYWJsZUFjdGlvblR5cGUgOiBBY3Rpb25UeXBlKSwgdHlwZWRJZCwgdG9XZWJD b3JlU3RyaW5nV2l0aE51bGxDaGVjayhsYWJlbCkpOworICAgICAgICAgICAgaWYgKGNoZWNrZWQt PklzQm9vbGVhbigpKQorICAgICAgICAgICAgICAgIG1lbnVJdGVtLT5zZXRDaGVja2VkKGNoZWNr ZWQtPlRvQm9vbGVhbigpLT5WYWx1ZSgpKTsKKyAgICAgICAgICAgIGlmIChlbmFibGVkLT5Jc0Jv b2xlYW4oKSkKKyAgICAgICAgICAgICAgICBtZW51SXRlbS0+c2V0RW5hYmxlZChlbmFibGVkLT5U b0Jvb2xlYW4oKS0+VmFsdWUoKSk7CisgICAgICAgICAgICBpdGVtcy5hcHBlbmQobWVudUl0ZW0p OwogICAgICAgICB9CiAgICAgfQogCmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvQ29uc29sZVZpZXcuanMgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQ29uc29s ZVZpZXcuanMKaW5kZXggNDc0YzM2Mi4uOTc4NWNkMCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL0NvbnNvbGVWaWV3LmpzCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9Db25zb2xlVmlldy5qcwpAQCAtNDAxLDkgKzQwMSw5IEBAIFdlYkluc3BlY3Rvci5D b25zb2xlVmlldy5wcm90b3R5cGUgPSB7CiAKICAgICAgICAgdmFyIGNvbnRleHRNZW51ID0gbmV3 IFdlYkluc3BlY3Rvci5Db250ZXh0TWVudSgpOwogICAgICAgICBpZiAoIVdlYkluc3BlY3Rvci5t b25pdG9yaW5nWEhSRW5hYmxlZCkKLSAgICAgICAgICAgIGNvbnRleHRNZW51LmFwcGVuZEl0ZW0o V2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJFbmFibGUgWE1MSHR0cFJlcXVlc3QgbG9nZ2luZyIpLCBJ bnNwZWN0b3JCYWNrZW5kLmVuYWJsZU1vbml0b3JpbmdYSFIuYmluZChJbnNwZWN0b3JCYWNrZW5k KSk7CisgICAgICAgICAgICBjb250ZXh0TWVudS5hcHBlbmRDaGVja2JveEl0ZW0oV2ViSW5zcGVj dG9yLlVJU3RyaW5nKCJYTUxIdHRwUmVxdWVzdCBsb2dnaW5nIiksIEluc3BlY3RvckJhY2tlbmQu ZW5hYmxlTW9uaXRvcmluZ1hIUi5iaW5kKEluc3BlY3RvckJhY2tlbmQpLCBmYWxzZSk7CiAgICAg ICAgIGVsc2UKLSAgICAgICAgICAgIGNvbnRleHRNZW51LmFwcGVuZEl0ZW0oV2ViSW5zcGVjdG9y LlVJU3RyaW5nKCJEaXNhYmxlIFhNTEh0dHBSZXF1ZXN0IGxvZ2dpbmciKSwgSW5zcGVjdG9yQmFj a2VuZC5kaXNhYmxlTW9uaXRvcmluZ1hIUi5iaW5kKEluc3BlY3RvckJhY2tlbmQpKTsKKyAgICAg ICAgICAgIGNvbnRleHRNZW51LmFwcGVuZENoZWNrYm94SXRlbShXZWJJbnNwZWN0b3IuVUlTdHJp bmcoIlhNTEh0dHBSZXF1ZXN0IGxvZ2dpbmciKSwgSW5zcGVjdG9yQmFja2VuZC5kaXNhYmxlTW9u aXRvcmluZ1hIUi5iaW5kKEluc3BlY3RvckJhY2tlbmQpLCB0cnVlKTsKICAgICAgICAgY29udGV4 dE1lbnUuYXBwZW5kSXRlbShXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkNsZWFyIENvbnNvbGUiKSwg dGhpcy5yZXF1ZXN0Q2xlYXJNZXNzYWdlcy5iaW5kKHRoaXMpKTsKICAgICAgICAgY29udGV4dE1l bnUuc2hvdyhldmVudCk7CiAgICAgfSwKZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9Db250ZXh0TWVudS5qcyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Db250 ZXh0TWVudS5qcwppbmRleCAzY2RiMTUyLi40NzA0NWEyIDEwMDY0NAotLS0gYS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvQ29udGV4dE1lbnUuanMKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL0NvbnRleHRNZW51LmpzCkBAIC00NiwxMCArNDYsMTcgQEAgV2ViSW5zcGVjdG9y LkNvbnRleHRNZW51LnByb3RvdHlwZSA9IHsKICAgICAgICAgfQogICAgIH0sCiAKLSAgICBhcHBl bmRJdGVtOiBmdW5jdGlvbihsYWJlbCwgaGFuZGxlcikKKyAgICBhcHBlbmRJdGVtOiBmdW5jdGlv bihsYWJlbCwgaGFuZGxlciwgZGlzYWJsZWQpCiAgICAgewogICAgICAgICB2YXIgaWQgPSB0aGlz Ll9pdGVtcy5sZW5ndGg7Ci0gICAgICAgIHRoaXMuX2l0ZW1zLnB1c2goe2lkOiBpZCwgbGFiZWw6 IGxhYmVsfSk7CisgICAgICAgIHRoaXMuX2l0ZW1zLnB1c2goe3R5cGU6ICJpdGVtIiwgaWQ6IGlk LCBsYWJlbDogbGFiZWwsIGVuYWJsZWQ6ICFkaXNhYmxlZH0pOworICAgICAgICB0aGlzLl9oYW5k bGVyc1tpZF0gPSBoYW5kbGVyOworICAgIH0sCisKKyAgICBhcHBlbmRDaGVja2JveEl0ZW06IGZ1 bmN0aW9uKGxhYmVsLCBoYW5kbGVyLCBjaGVja2VkLCBkaXNhYmxlZCkKKyAgICB7CisgICAgICAg IHZhciBpZCA9IHRoaXMuX2l0ZW1zLmxlbmd0aDsKKyAgICAgICAgdGhpcy5faXRlbXMucHVzaCh7 dHlwZTogImNoZWNrYm94IiwgaWQ6IGlkLCBsYWJlbDogbGFiZWwsIGNoZWNrZWQ6ICEhY2hlY2tl ZCwgZW5hYmxlZDogIWRpc2FibGVkfSk7CiAgICAgICAgIHRoaXMuX2hhbmRsZXJzW2lkXSA9IGhh bmRsZXI7CiAgICAgfSwKIApAQCAtNjAsNyArNjcsNyBAQCBXZWJJbnNwZWN0b3IuQ29udGV4dE1l bnUucHJvdG90eXBlID0gewogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICBpZiAoISgiaWQi IGluIHRoaXMuX2l0ZW1zW3RoaXMuX2l0ZW1zLmxlbmd0aCAtIDFdKSkKICAgICAgICAgICAgIHJl dHVybjsKLSAgICAgICAgdGhpcy5faXRlbXMucHVzaCh7fSk7CisgICAgICAgIHRoaXMuX2l0ZW1z LnB1c2goe3R5cGU6ICJzZXBhcmF0b3IifSk7CiAgICAgfSwKIAogICAgIF9pdGVtU2VsZWN0ZWQ6 IGZ1bmN0aW9uKGlkKQo=