112669 2013-03-19 01:19:09 -0700 Web Inspector: Add Inspector.targetCrashed event to Inspector protocol 2013-03-19 04:45:51 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 kaznacheev kaznacheev abarth apavlov dglazkov fishd graouts jamesr joepeck keishi loislo pfeldman pmuellr timothy tkent+wkapi vsevik web-inspector-bugs webkit.review.bot yurys oldest_to_newest 858028 0 kaznacheev 2013-03-19 01:19:09 -0700 Currently there is no way for a client to know if the target has crashed. 858033 1 193752 kaznacheev 2013-03-19 01:24:13 -0700 Created attachment 193752 Patch 858040 2 kaznacheev 2013-03-19 01:33:48 -0700 This is required for https://chromiumcodereview.appspot.com/12906011/ 858042 3 webkit.review.bot 2013-03-19 01:36:07 -0700 Please wait for approval from abarth@webkit.org, dglazkov@chromium.org, fishd@chromium.org, jamesr@chromium.org or tkent@chromium.org before submitting, as this patch contains changes to the Chromium public API. See also https://trac.webkit.org/wiki/ChromiumWebKitAPI. 858066 4 193752 yurys 2013-03-19 02:05:46 -0700 Comment on attachment 193752 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=193752&action=review > Source/WebCore/ChangeLog:7 > + Please provide a description. > Source/WebCore/inspector/front-end/HelpScreen.js:134 > + WebInspector.HelpScreen.call(this, title); I think it's time to rename HelpScreen into OverlayScreen or something as it is not actually a help screen anymore. 858075 5 193766 kaznacheev 2013-03-19 02:14:47 -0700 Created attachment 193766 Patch 858090 6 193766 pfeldman 2013-03-19 02:45:01 -0700 Comment on attachment 193766 Patch We now have a dowstream handler for that. 858124 7 193776 kaznacheev 2013-03-19 03:46:37 -0700 Created attachment 193776 Patch 858126 8 193776 pfeldman 2013-03-19 03:49:01 -0700 Comment on attachment 193776 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=193776&action=review > Source/WebCore/inspector/Inspector.json:42 > + "parameters": [] This is optional. > Source/WebCore/inspector/front-end/HelpScreen.js:147 > + WebInspector.debuggerModel.removeEventListener(WebInspector.DebuggerModel.Events.GlobalObjectCleared, this.hide, this); I would not override this. Just call the bound function that closes and removes the listener. > Source/WebCore/inspector/front-end/inspector.js:985 > +WebInspector.targetCrashed = function() { { on the next line. > Source/WebCore/inspector/front-end/inspector.js:987 > + WebInspector.UIString("Target has crashed"), Please add these strings into localizedStrings. 858135 9 193783 kaznacheev 2013-03-19 03:58:29 -0700 Created attachment 193783 Patch 858137 10 193776 kaznacheev 2013-03-19 04:00:37 -0700 Comment on attachment 193776 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=193776&action=review >> Source/WebCore/inspector/Inspector.json:42 >> + "parameters": [] > > This is optional. Removed >> Source/WebCore/inspector/front-end/HelpScreen.js:147 >> + WebInspector.debuggerModel.removeEventListener(WebInspector.DebuggerModel.Events.GlobalObjectCleared, this.hide, this); > > I would not override this. Just call the bound function that closes and removes the listener. Discussed, agreed to do this in a separate refactoring patch (possibly disallowing manual closing of this dialog) >> Source/WebCore/inspector/front-end/inspector.js:985 >> +WebInspector.targetCrashed = function() { > > { on the next line. Done >> Source/WebCore/inspector/front-end/inspector.js:987 >> + WebInspector.UIString("Target has crashed"), > > Please add these strings into localizedStrings. Done 858154 11 193783 pfeldman 2013-03-19 04:18:35 -0700 Comment on attachment 193783 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=193783&action=review > Source/WebCore/inspector/front-end/HelpScreen.js:135 > + var p = this.contentElement.createChild("p"); "p help-section" 858166 12 193783 webkit.review.bot 2013-03-19 04:45:45 -0700 Comment on attachment 193783 Patch Clearing flags on attachment: 193783 Committed r146198: <http://trac.webkit.org/changeset/146198> 858168 13 webkit.review.bot 2013-03-19 04:45:51 -0700 All reviewed patches have been landed. Closing bug. 193752 2013-03-19 01:24:13 -0700 2013-03-19 02:14:42 -0700 Patch bug-112669-20130319122003.patch text/plain 6346 kaznacheev U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ2MTc4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDlmYzkyZmYwMjc4YTg1 MTQzM2FiYzIwMDU0YTg4OWMyNTQ1Y2E3NS4uZTQxZjc1YWRjOWM0YTE1M2FhOGZlMmE3ZGVlYzE2 NmNlNGQ5OGU0ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDEzLTAzLTE5ICBWbGFk aXNsYXYgS2F6bmFjaGVldiAgPGthem5hY2hlZXZAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdl YiBJbnNwZWN0b3I6IEFkZCBJbnNwZWN0b3IudGFyZ2V0Q3Jhc2hlZCBldmVudCB0byBJbnNwZWN0 b3IgcHJvdG9jb2wuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xMTI2NjkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3IuanNvbjoKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJv bnQtZW5kL0hlbHBTY3JlZW4uanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuSGVscFNjcmVlblVu dGlsUmVsb2FkKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5IZWxwU2NyZWVuVW50aWxSZWxvYWQu cHJvdG90eXBlLndpbGxIaWRlKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL2luc3Bl Y3Rvci5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci50YXJnZXRDcmFzaGVkKToKKwogMjAxMy0w My0xOCAgRGF2aWQgS2lsemVyICA8ZGRraWx6ZXJAYXBwbGUuY29tPgogCiAgICAgICAgIEJVSUxE IEZJWCAocjE0NjA4OCk6IFJlc291cmNlUmVxdWVzdDo6Y2ZVUkxSZXF1ZXN0KCkgaXMgZGVmaW5l ZCB0d2ljZSBvbiBpT1MKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdl TG9nIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKaW5kZXggMjc5YjhiN2I4MjYy ODBmMjk5Yjk1NzJhNGVlMjQ2YWJmZjg1MDVmNy4uMWQwYmZhYTllNmQ2NDM4MzBmNDdjOWFjNDQw ZjM3YWFmYjRjMzgyNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VM b2cKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBA QAorMjAxMy0wMy0xOSAgVmxhZGlzbGF2IEthem5hY2hlZXYgIDxrYXpuYWNoZWV2QGNocm9taXVt Lm9yZz4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBBZGQgSW5zcGVjdG9yLnRhcmdldENyYXNo ZWQgZXZlbnQgdG8gSW5zcGVjdG9yIHByb3RvY29sLgorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTEyNjY5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgKiBwdWJsaWMvV2ViRGV2VG9vbHNBZ2VudC5oOgorICAg ICAgICAoV2ViRGV2VG9vbHNBZ2VudCk6CisgICAgICAgICogc3JjL1dlYkRldlRvb2xzQWdlbnRJ bXBsLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViRGV2VG9vbHNBZ2VudDo6aW5zcGVjdG9yVGFy Z2V0Q3Jhc2hlZEV2ZW50KToKKyAgICAgICAgKFdlYktpdCk6CisKIDIwMTMtMDMtMTggIFcuIEph bWVzIE1hY0xlYW4gIDx3am1hY2xlYW5AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFtjaHJvbWl1 bV0gUmVtb3ZlIE5DQ0ggY29kZSB0aGF0IHJlbGllcyBvbiBib3VuZHNDb250YWluc1BhZ2VTY2Fs ZSgpLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvci5qc29u IGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvci5qc29uCmluZGV4IDk0ZDg1MTAz YzA5YjhmNjc4NmMwZmJjYzRiMjE5OTliMTIxMjRkMDIuLmRlMmNmYjNiOWY4YzhhMTk3YWUxZGQ0 NThhZGUyZTQwMzRjODQzNTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9J bnNwZWN0b3IuanNvbgorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yLmpz b24KQEAgLTM1LDYgKzM1LDExIEBACiAgICAgICAgICAgICAgICAgInBhcmFtZXRlcnMiOiBbCiAg ICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAicmVhc29uIiwgInR5cGUiOiAic3RyaW5nIiwg ImRlc2NyaXB0aW9uIjogIlRoZSByZWFzb24gd2h5IGNvbm5lY3Rpb24gaGFzIGJlZW4gdGVybWlu YXRlZC4iIH0KICAgICAgICAgICAgICAgICBdCisgICAgICAgICAgICB9LAorICAgICAgICAgICAg eworICAgICAgICAgICAgICAgICJuYW1lIjogInRhcmdldENyYXNoZWQiLAorICAgICAgICAgICAg ICAgICJkZXNjcmlwdGlvbiI6ICJGaXJlZCB3aGVuIGRlYnVnZ2luZyB0YXJnZXQgaGFzIGNyYXNo ZWQiLAorICAgICAgICAgICAgICAgICJwYXJhbWV0ZXJzIjogW10KICAgICAgICAgICAgIH0KICAg ICAgICAgXQogICAgIH0sCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL0hlbHBTY3JlZW4uanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L0hlbHBTY3JlZW4uanMKaW5kZXggNDg1MjVlNjY1YWFiMTVjZGIxNWY3OWFjNzMwZmM0M2FmZTI5 OTJjOS4uYjkyM2M1MmE2OTRjMzJhMjZjNDVhM2JlNzAyZDdmN2E2YWFmMmQxZiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9IZWxwU2NyZWVuLmpzCisrKyBi L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvSGVscFNjcmVlbi5qcwpAQCAtMTIy LDMgKzEyMiwzMiBAQCBXZWJJbnNwZWN0b3IuSGVscFNjcmVlbi5wcm90b3R5cGUgPSB7CiAKICAg ICBfX3Byb3RvX186IFdlYkluc3BlY3Rvci5WaWV3LnByb3RvdHlwZQogfQorCisvKioKKyAqIEBj b25zdHJ1Y3RvcgorICogQHBhcmFtIHtzdHJpbmc9fSB0aXRsZQorICogQHBhcmFtIHtzdHJpbmc9 fSBtZXNzYWdlCisgKiBAZXh0ZW5kcyB7V2ViSW5zcGVjdG9yLkhlbHBTY3JlZW59CisgKi8KK1dl Ykluc3BlY3Rvci5IZWxwU2NyZWVuVW50aWxSZWxvYWQgPSBmdW5jdGlvbih0aXRsZSwgbWVzc2Fn ZSkKK3sKKyAgICBXZWJJbnNwZWN0b3IuSGVscFNjcmVlbi5jYWxsKHRoaXMsIHRpdGxlKTsKKyAg ICB2YXIgcCA9IHRoaXMuY29udGVudEVsZW1lbnQuY3JlYXRlQ2hpbGQoInAiKTsKKyAgICBwLmFk ZFN0eWxlQ2xhc3MoImhlbHAtc2VjdGlvbiIpOworICAgIHAudGV4dENvbnRlbnQgPSBtZXNzYWdl OworICAgIFdlYkluc3BlY3Rvci5kZWJ1Z2dlck1vZGVsLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5z cGVjdG9yLkRlYnVnZ2VyTW9kZWwuRXZlbnRzLkdsb2JhbE9iamVjdENsZWFyZWQsIHRoaXMuaGlk ZSwgdGhpcyk7Cit9CisKK1dlYkluc3BlY3Rvci5IZWxwU2NyZWVuVW50aWxSZWxvYWQucHJvdG90 eXBlID0geworICAgIC8qKgorICAgICAqIEBvdmVycmlkZQorICAgICAqLworICAgIHdpbGxIaWRl OiBmdW5jdGlvbigpCisgICAgeworICAgICAgICBXZWJJbnNwZWN0b3IuZGVidWdnZXJNb2RlbC5y ZW1vdmVFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5EZWJ1Z2dlck1vZGVsLkV2ZW50cy5HbG9i YWxPYmplY3RDbGVhcmVkLCB0aGlzLmhpZGUsIHRoaXMpOworICAgICAgICBXZWJJbnNwZWN0b3Iu SGVscFNjcmVlbi5wcm90b3R5cGUud2lsbEhpZGUuY2FsbCh0aGlzKTsKKyAgICB9LAorCisgICAg X19wcm90b19fOiBXZWJJbnNwZWN0b3IuSGVscFNjcmVlbi5wcm90b3R5cGUKK30KKwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuanMgYi9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5qcwppbmRleCA5ODY4 NjMwYmMxMDI4MTU0MzkyYWRhNTljMmIxMjliMDczOGQ3M2FhLi5lYzdkYTc1MTE0N2M1ZjQ4ZGQ3 MzliYWY5MDZjZGE4MGYwOGNlNmVmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL2luc3BlY3Rvci5qcwpAQCAtOTgyLDYgKzk4MiwxMiBAQCBXZWJJbnNwZWN0b3Iu ZGV0YWNoZWQgPSBmdW5jdGlvbihyZWFzb24pCiAgICAgKG5ldyBXZWJJbnNwZWN0b3IuUmVtb3Rl RGVidWdnaW5nVGVybWluYXRlZFNjcmVlbihyZWFzb24pKS5zaG93TW9kYWwoKTsKIH0KIAorV2Vi SW5zcGVjdG9yLnRhcmdldENyYXNoZWQgPSBmdW5jdGlvbigpIHsKKyAgICAobmV3IFdlYkluc3Bl Y3Rvci5IZWxwU2NyZWVuVW50aWxSZWxvYWQoCisgICAgICAgIFdlYkluc3BlY3Rvci5VSVN0cmlu ZygiVGFyZ2V0IGhhcyBjcmFzaGVkIiksCisgICAgICAgIFdlYkluc3BlY3Rvci5VSVN0cmluZygi SW5zcGVjdGVkIHRhcmdldCBoYXMgY3Jhc2hlZC4gT25jZSBpdCByZWxvYWRzIHdlIHdpbGwgYXR0 YWNoIHRvIGl0IGF1dG9tYXRpY2FsbHkuIikpKS5zaG93TW9kYWwoKTsKK30KKwogV2ViSW5zcGVj dG9yLl91cGRhdGVGb2N1c2VkTm9kZSA9IGZ1bmN0aW9uKG5vZGVJZCkKIHsKICAgICBpZiAoV2Vi SW5zcGVjdG9yLl9ub2RlU2VhcmNoQnV0dG9uLnRvZ2dsZWQpIHsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYkRldlRvb2xzQWdlbnQuaCBiL1NvdXJjZS9XZWJL aXQvY2hyb21pdW0vcHVibGljL1dlYkRldlRvb2xzQWdlbnQuaAppbmRleCA2MGFkNTQwNDA5Mjhj ZjI5YWNiNWUxOGM5ZDQ4NzgxMTAzOWQwYTg0Li5hYTYwMzc2MDVjM2IwMjgyMjY0YjBhMjhmZWM0 ZjgwZDg0NGI0Mjk2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9X ZWJEZXZUb29sc0FnZW50LmgKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2Vi RGV2VG9vbHNBZ2VudC5oCkBAIC05OCw2ICs5OCw5IEBAIHB1YmxpYzoKICAgICAvLyBSZXR1cm5z IGFuIEluc3BlY3Rvci5kZXRhY2hlZCBldmVudCB0aGF0IGNhbiBiZSBkaXNwYXRjaGVkIG9uIHRo ZSBmcm9udC1lbmQgYnkgdGhlIGVtYmVkZGVyLgogICAgIFdFQktJVF9FWFBPUlQgc3RhdGljIFdl YlN0cmluZyBpbnNwZWN0b3JEZXRhY2hlZEV2ZW50KGNvbnN0IFdlYlN0cmluZyYgcmVhc29uKTsK IAorICAgIC8vIFJldHVybnMgYW4gSW5zcGVjdG9yLnRhcmdldENyYXNoZWQgZXZlbnQgdGhhdCBj YW4gYmUgZGlzcGF0Y2hlZCBvbiB0aGUgZnJvbnQtZW5kIGJ5IHRoZSBlbWJlZGRlci4KKyAgICBX RUJLSVRfRVhQT1JUIHN0YXRpYyBXZWJTdHJpbmcgaW5zcGVjdG9yVGFyZ2V0Q3Jhc2hlZEV2ZW50 KCk7CisKICAgICAvLyBSZXR1cm5zIGEgV29ya2VyLmRpc2Nvbm5lY3RlZEZyb21Xb3JrZXIgZXZl bnQgdGhhdCBjYW4gYmUgZGlzcGF0Y2hlZCBvbiB0aGUgZnJvbnQtZW5kCiAgICAgLy8gaW4gb3Jk ZXIgdG8gbGV0IGl0IGtub3cgdGhhdCBpdCBoYXMgZGlzY29ubmVjdGVkIGZyb20gdGhlIGFnZW50 LgogICAgIFdFQktJVF9FWFBPUlQgc3RhdGljIFdlYlN0cmluZyB3b3JrZXJEaXNjb25uZWN0ZWRG cm9tV29ya2VyRXZlbnQoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3Jj L1dlYkRldlRvb2xzQWdlbnRJbXBsLmNwcCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dl YkRldlRvb2xzQWdlbnRJbXBsLmNwcAppbmRleCA5ZjEyMDE4ZTVmZTFiMjI4ZWFmNDI3NDc1Yjgw ZTM3ODMwZTY2MzYxLi5lYjg3YzY2NDkwOWI1M2UwZWIzMGMzYTYxZGJkZDUyNjBlZTExZmY0IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJEZXZUb29sc0FnZW50SW1w bC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViRGV2VG9vbHNBZ2VudElt cGwuY3BwCkBAIC04MTIsNiArODEyLDE0IEBAIFdlYlN0cmluZyBXZWJEZXZUb29sc0FnZW50Ojpp bnNwZWN0b3JEZXRhY2hlZEV2ZW50KGNvbnN0IFdlYlN0cmluZyYgcmVhc29uKQogICAgIHJldHVy biBjaGFubmVsLm1fbWVzc2FnZTsKIH0KIAorV2ViU3RyaW5nIFdlYkRldlRvb2xzQWdlbnQ6Omlu c3BlY3RvclRhcmdldENyYXNoZWRFdmVudCgpCit7CisgICAgU2VyaWFsaXppbmdGcm9udGVuZENo YW5uZWwgY2hhbm5lbDsKKyAgICBJbnNwZWN0b3JGcm9udGVuZDo6SW5zcGVjdG9yIGluc3BlY3Rv cigmY2hhbm5lbCk7CisgICAgaW5zcGVjdG9yLnRhcmdldENyYXNoZWQoKTsKKyAgICByZXR1cm4g Y2hhbm5lbC5tX21lc3NhZ2U7Cit9CisKIFdlYlN0cmluZyBXZWJEZXZUb29sc0FnZW50Ojp3b3Jr ZXJEaXNjb25uZWN0ZWRGcm9tV29ya2VyRXZlbnQoKQogewogICAgIFNlcmlhbGl6aW5nRnJvbnRl bmRDaGFubmVsIGNoYW5uZWw7Cg== 193766 2013-03-19 02:14:47 -0700 2013-03-19 03:46:31 -0700 Patch bug-112669-20130319131037.patch text/plain 6594 kaznacheev U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ2MTc4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDlmYzkyZmYwMjc4YTg1 MTQzM2FiYzIwMDU0YTg4OWMyNTQ1Y2E3NS4uZDhjYzlkMDI1M2YwN2U2ZmVmMWJlOTZjOTQ1NTMz YmM4Yzg3YmUwYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDEzLTAzLTE5ICBWbGFk aXNsYXYgS2F6bmFjaGVldiAgPGthem5hY2hlZXZAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdl YiBJbnNwZWN0b3I6IEFkZCBJbnNwZWN0b3IudGFyZ2V0Q3Jhc2hlZCBldmVudCB0byBJbnNwZWN0 b3IgcHJvdG9jb2wuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xMTI2NjkKKworICAgICAgICBBZGRlZCBJbnNwZWN0b3IudGFyZ2V0Q3Jhc2hlZCBldmVu dCBhbmQgaGFuZGxlZCBpdCBvbiB0aGUgZnJvbnQgZW5kLgorICAgICAgICBTaG93aW5nIGEgbW9k YWwgZGlhbG9nIHNpbWlsYXIgdG8gdGhlIG9uZSBkaXNwbGF5ZWQgd2hlbiB0aGUgcmVtb3RlCisg ICAgICAgIGRlYnVnZ2luZyB0YXJnZXQgaXMgZGlzY29ubmVjdGVkLgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3Rvci5q c29uOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvSGVscFNjcmVlbi5qczoKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5IZWxwU2NyZWVuVW50aWxSZWxvYWQpOgorICAgICAgICAoV2ViSW5z cGVjdG9yLkhlbHBTY3JlZW5VbnRpbFJlbG9hZC5wcm90b3R5cGUud2lsbEhpZGUpOgorICAgICAg ICAqIGluc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmpzOgorICAgICAgICAoV2ViSW5zcGVj dG9yLnRhcmdldENyYXNoZWQpOgorCiAyMDEzLTAzLTE4ICBEYXZpZCBLaWx6ZXIgIDxkZGtpbHpl ckBhcHBsZS5jb20+CiAKICAgICAgICAgQlVJTEQgRklYIChyMTQ2MDg4KTogUmVzb3VyY2VSZXF1 ZXN0OjpjZlVSTFJlcXVlc3QoKSBpcyBkZWZpbmVkIHR3aWNlIG9uIGlPUwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVt L0NoYW5nZUxvZwppbmRleCAyNzliOGI3YjgyNjI4MGYyOTliOTU3MmE0ZWUyNDZhYmZmODUwNWY3 Li4wNTcyMDhmOWY2YmU4ZmY5OTlkNThkZWYzYzk5YzYxNjI1YjU4NzE0IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9t aXVtL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDEzLTAzLTE5ICBWbGFkaXNsYXYgS2F6 bmFjaGVldiAgPGthem5hY2hlZXZAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IEFkZCBJbnNwZWN0b3IudGFyZ2V0Q3Jhc2hlZCBldmVudCB0byBJbnNwZWN0b3IgcHJvdG9j b2wuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTI2 NjkKKworICAgICAgICBBZGRlZCBJbnNwZWN0b3IudGFyZ2V0Q3Jhc2hlZCBldmVudC4KKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHB1YmxpYy9XZWJE ZXZUb29sc0FnZW50Lmg6CisgICAgICAgIChXZWJEZXZUb29sc0FnZW50KToKKyAgICAgICAgKiBz cmMvV2ViRGV2VG9vbHNBZ2VudEltcGwuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJEZXZUb29s c0FnZW50OjppbnNwZWN0b3JUYXJnZXRDcmFzaGVkRXZlbnQpOgorICAgICAgICAoV2ViS2l0KToK KwogMjAxMy0wMy0xOCAgVy4gSmFtZXMgTWFjTGVhbiAgPHdqbWFjbGVhbkBjaHJvbWl1bS5vcmc+ CiAKICAgICAgICAgW2Nocm9taXVtXSBSZW1vdmUgTkNDSCBjb2RlIHRoYXQgcmVsaWVzIG9uIGJv dW5kc0NvbnRhaW5zUGFnZVNjYWxlKCkuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvSW5zcGVjdG9yLmpzb24gYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9y Lmpzb24KaW5kZXggOTRkODUxMDNjMDliOGY2Nzg2YzBmYmNjNGIyMTk5OWIxMjEyNGQwMi4uZGUy Y2ZiM2I5ZjhjOGExOTdhZTFkZDQ1OGFkZTJlNDAzNGM4NDM1NiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvci5qc29uCisrKyBiL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9JbnNwZWN0b3IuanNvbgpAQCAtMzUsNiArMzUsMTEgQEAKICAgICAgICAgICAgICAg ICAicGFyYW1ldGVycyI6IFsKICAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJyZWFzb24i LCAidHlwZSI6ICJzdHJpbmciLCAiZGVzY3JpcHRpb24iOiAiVGhlIHJlYXNvbiB3aHkgY29ubmVj dGlvbiBoYXMgYmVlbiB0ZXJtaW5hdGVkLiIgfQogICAgICAgICAgICAgICAgIF0KKyAgICAgICAg ICAgIH0sCisgICAgICAgICAgICB7CisgICAgICAgICAgICAgICAgIm5hbWUiOiAidGFyZ2V0Q3Jh c2hlZCIsCisgICAgICAgICAgICAgICAgImRlc2NyaXB0aW9uIjogIkZpcmVkIHdoZW4gZGVidWdn aW5nIHRhcmdldCBoYXMgY3Jhc2hlZCIsCisgICAgICAgICAgICAgICAgInBhcmFtZXRlcnMiOiBb XQogICAgICAgICAgICAgfQogICAgICAgICBdCiAgICAgfSwKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvSGVscFNjcmVlbi5qcyBiL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9mcm9udC1lbmQvSGVscFNjcmVlbi5qcwppbmRleCA0ODUyNWU2NjVhYWIxNWNk YjE1Zjc5YWM3MzBmYzQzYWZlMjk5MmM5Li5iOTIzYzUyYTY5NGMzMmEyNmM0NWEzYmU3MDJkN2Y3 YTZhYWYyZDFmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L0hlbHBTY3JlZW4uanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9I ZWxwU2NyZWVuLmpzCkBAIC0xMjIsMyArMTIyLDMyIEBAIFdlYkluc3BlY3Rvci5IZWxwU2NyZWVu LnByb3RvdHlwZSA9IHsKIAogICAgIF9fcHJvdG9fXzogV2ViSW5zcGVjdG9yLlZpZXcucHJvdG90 eXBlCiB9CisKKy8qKgorICogQGNvbnN0cnVjdG9yCisgKiBAcGFyYW0ge3N0cmluZz19IHRpdGxl CisgKiBAcGFyYW0ge3N0cmluZz19IG1lc3NhZ2UKKyAqIEBleHRlbmRzIHtXZWJJbnNwZWN0b3Iu SGVscFNjcmVlbn0KKyAqLworV2ViSW5zcGVjdG9yLkhlbHBTY3JlZW5VbnRpbFJlbG9hZCA9IGZ1 bmN0aW9uKHRpdGxlLCBtZXNzYWdlKQoreworICAgIFdlYkluc3BlY3Rvci5IZWxwU2NyZWVuLmNh bGwodGhpcywgdGl0bGUpOworICAgIHZhciBwID0gdGhpcy5jb250ZW50RWxlbWVudC5jcmVhdGVD aGlsZCgicCIpOworICAgIHAuYWRkU3R5bGVDbGFzcygiaGVscC1zZWN0aW9uIik7CisgICAgcC50 ZXh0Q29udGVudCA9IG1lc3NhZ2U7CisgICAgV2ViSW5zcGVjdG9yLmRlYnVnZ2VyTW9kZWwuYWRk RXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuRGVidWdnZXJNb2RlbC5FdmVudHMuR2xvYmFsT2Jq ZWN0Q2xlYXJlZCwgdGhpcy5oaWRlLCB0aGlzKTsKK30KKworV2ViSW5zcGVjdG9yLkhlbHBTY3Jl ZW5VbnRpbFJlbG9hZC5wcm90b3R5cGUgPSB7CisgICAgLyoqCisgICAgICogQG92ZXJyaWRlCisg ICAgICovCisgICAgd2lsbEhpZGU6IGZ1bmN0aW9uKCkKKyAgICB7CisgICAgICAgIFdlYkluc3Bl Y3Rvci5kZWJ1Z2dlck1vZGVsLnJlbW92ZUV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLkRlYnVn Z2VyTW9kZWwuRXZlbnRzLkdsb2JhbE9iamVjdENsZWFyZWQsIHRoaXMuaGlkZSwgdGhpcyk7Cisg ICAgICAgIFdlYkluc3BlY3Rvci5IZWxwU2NyZWVuLnByb3RvdHlwZS53aWxsSGlkZS5jYWxsKHRo aXMpOworICAgIH0sCisKKyAgICBfX3Byb3RvX186IFdlYkluc3BlY3Rvci5IZWxwU2NyZWVuLnBy b3RvdHlwZQorfQorCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL2luc3BlY3Rvci5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvaW5z cGVjdG9yLmpzCmluZGV4IDk4Njg2MzBiYzEwMjgxNTQzOTJhZGE1OWMyYjEyOWIwNzM4ZDczYWEu LmVjN2RhNzUxMTQ3YzVmNDhkZDczOWJhZjkwNmNkYTgwZjA4Y2U2ZWYgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmpzCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmpzCkBAIC05ODIsNiArOTgy LDEyIEBAIFdlYkluc3BlY3Rvci5kZXRhY2hlZCA9IGZ1bmN0aW9uKHJlYXNvbikKICAgICAobmV3 IFdlYkluc3BlY3Rvci5SZW1vdGVEZWJ1Z2dpbmdUZXJtaW5hdGVkU2NyZWVuKHJlYXNvbikpLnNo b3dNb2RhbCgpOwogfQogCitXZWJJbnNwZWN0b3IudGFyZ2V0Q3Jhc2hlZCA9IGZ1bmN0aW9uKCkg eworICAgIChuZXcgV2ViSW5zcGVjdG9yLkhlbHBTY3JlZW5VbnRpbFJlbG9hZCgKKyAgICAgICAg V2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJUYXJnZXQgaGFzIGNyYXNoZWQiKSwKKyAgICAgICAgV2Vi SW5zcGVjdG9yLlVJU3RyaW5nKCJJbnNwZWN0ZWQgdGFyZ2V0IGhhcyBjcmFzaGVkLiBPbmNlIGl0 IHJlbG9hZHMgd2Ugd2lsbCBhdHRhY2ggdG8gaXQgYXV0b21hdGljYWxseS4iKSkpLnNob3dNb2Rh bCgpOworfQorCiBXZWJJbnNwZWN0b3IuX3VwZGF0ZUZvY3VzZWROb2RlID0gZnVuY3Rpb24obm9k ZUlkKQogewogICAgIGlmIChXZWJJbnNwZWN0b3IuX25vZGVTZWFyY2hCdXR0b24udG9nZ2xlZCkg ewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViRGV2VG9vbHNB Z2VudC5oIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViRGV2VG9vbHNBZ2VudC5o CmluZGV4IDYwYWQ1NDA0MDkyOGNmMjlhY2I1ZTE4YzlkNDg3ODExMDM5ZDBhODQuLmFhNjAzNzYw NWMzYjAyODIyNjRiMGEyOGZlYzRmODBkODQ0YjQyOTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQvY2hyb21pdW0vcHVibGljL1dlYkRldlRvb2xzQWdlbnQuaAorKysgYi9Tb3VyY2UvV2ViS2l0 L2Nocm9taXVtL3B1YmxpYy9XZWJEZXZUb29sc0FnZW50LmgKQEAgLTk4LDYgKzk4LDkgQEAgcHVi bGljOgogICAgIC8vIFJldHVybnMgYW4gSW5zcGVjdG9yLmRldGFjaGVkIGV2ZW50IHRoYXQgY2Fu IGJlIGRpc3BhdGNoZWQgb24gdGhlIGZyb250LWVuZCBieSB0aGUgZW1iZWRkZXIuCiAgICAgV0VC S0lUX0VYUE9SVCBzdGF0aWMgV2ViU3RyaW5nIGluc3BlY3RvckRldGFjaGVkRXZlbnQoY29uc3Qg V2ViU3RyaW5nJiByZWFzb24pOwogCisgICAgLy8gUmV0dXJucyBhbiBJbnNwZWN0b3IudGFyZ2V0 Q3Jhc2hlZCBldmVudCB0aGF0IGNhbiBiZSBkaXNwYXRjaGVkIG9uIHRoZSBmcm9udC1lbmQgYnkg dGhlIGVtYmVkZGVyLgorICAgIFdFQktJVF9FWFBPUlQgc3RhdGljIFdlYlN0cmluZyBpbnNwZWN0 b3JUYXJnZXRDcmFzaGVkRXZlbnQoKTsKKwogICAgIC8vIFJldHVybnMgYSBXb3JrZXIuZGlzY29u bmVjdGVkRnJvbVdvcmtlciBldmVudCB0aGF0IGNhbiBiZSBkaXNwYXRjaGVkIG9uIHRoZSBmcm9u dC1lbmQKICAgICAvLyBpbiBvcmRlciB0byBsZXQgaXQga25vdyB0aGF0IGl0IGhhcyBkaXNjb25u ZWN0ZWQgZnJvbSB0aGUgYWdlbnQuCiAgICAgV0VCS0lUX0VYUE9SVCBzdGF0aWMgV2ViU3RyaW5n IHdvcmtlckRpc2Nvbm5lY3RlZEZyb21Xb3JrZXJFdmVudCgpOwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViRGV2VG9vbHNBZ2VudEltcGwuY3BwIGIvU291cmNlL1dl YktpdC9jaHJvbWl1bS9zcmMvV2ViRGV2VG9vbHNBZ2VudEltcGwuY3BwCmluZGV4IDlmMTIwMThl NWZlMWIyMjhlYWY0Mjc0NzViODBlMzc4MzBlNjYzNjEuLmViODdjNjY0OTA5YjUzZTBlYjMwYzNh NjFkYmRkNTI2MGVlMTFmZjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3Jj L1dlYkRldlRvb2xzQWdlbnRJbXBsLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Ny Yy9XZWJEZXZUb29sc0FnZW50SW1wbC5jcHAKQEAgLTgxMiw2ICs4MTIsMTQgQEAgV2ViU3RyaW5n IFdlYkRldlRvb2xzQWdlbnQ6Omluc3BlY3RvckRldGFjaGVkRXZlbnQoY29uc3QgV2ViU3RyaW5n JiByZWFzb24pCiAgICAgcmV0dXJuIGNoYW5uZWwubV9tZXNzYWdlOwogfQogCitXZWJTdHJpbmcg V2ViRGV2VG9vbHNBZ2VudDo6aW5zcGVjdG9yVGFyZ2V0Q3Jhc2hlZEV2ZW50KCkKK3sKKyAgICBT ZXJpYWxpemluZ0Zyb250ZW5kQ2hhbm5lbCBjaGFubmVsOworICAgIEluc3BlY3RvckZyb250ZW5k OjpJbnNwZWN0b3IgaW5zcGVjdG9yKCZjaGFubmVsKTsKKyAgICBpbnNwZWN0b3IudGFyZ2V0Q3Jh c2hlZCgpOworICAgIHJldHVybiBjaGFubmVsLm1fbWVzc2FnZTsKK30KKwogV2ViU3RyaW5nIFdl YkRldlRvb2xzQWdlbnQ6OndvcmtlckRpc2Nvbm5lY3RlZEZyb21Xb3JrZXJFdmVudCgpCiB7CiAg ICAgU2VyaWFsaXppbmdGcm9udGVuZENoYW5uZWwgY2hhbm5lbDsK 193776 2013-03-19 03:46:37 -0700 2013-03-19 04:00:37 -0700 Patch bug-112669-20130319144228.patch text/plain 3954 kaznacheev U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ2MTc4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDlmYzkyZmYwMjc4YTg1 MTQzM2FiYzIwMDU0YTg4OWMyNTQ1Y2E3NS4uZDhjYzlkMDI1M2YwN2U2ZmVmMWJlOTZjOTQ1NTMz YmM4Yzg3YmUwYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDEzLTAzLTE5ICBWbGFk aXNsYXYgS2F6bmFjaGVldiAgPGthem5hY2hlZXZAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdl YiBJbnNwZWN0b3I6IEFkZCBJbnNwZWN0b3IudGFyZ2V0Q3Jhc2hlZCBldmVudCB0byBJbnNwZWN0 b3IgcHJvdG9jb2wuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xMTI2NjkKKworICAgICAgICBBZGRlZCBJbnNwZWN0b3IudGFyZ2V0Q3Jhc2hlZCBldmVu dCBhbmQgaGFuZGxlZCBpdCBvbiB0aGUgZnJvbnQgZW5kLgorICAgICAgICBTaG93aW5nIGEgbW9k YWwgZGlhbG9nIHNpbWlsYXIgdG8gdGhlIG9uZSBkaXNwbGF5ZWQgd2hlbiB0aGUgcmVtb3RlCisg ICAgICAgIGRlYnVnZ2luZyB0YXJnZXQgaXMgZGlzY29ubmVjdGVkLgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3Rvci5q c29uOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvSGVscFNjcmVlbi5qczoKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5IZWxwU2NyZWVuVW50aWxSZWxvYWQpOgorICAgICAgICAoV2ViSW5z cGVjdG9yLkhlbHBTY3JlZW5VbnRpbFJlbG9hZC5wcm90b3R5cGUud2lsbEhpZGUpOgorICAgICAg ICAqIGluc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmpzOgorICAgICAgICAoV2ViSW5zcGVj dG9yLnRhcmdldENyYXNoZWQpOgorCiAyMDEzLTAzLTE4ICBEYXZpZCBLaWx6ZXIgIDxkZGtpbHpl ckBhcHBsZS5jb20+CiAKICAgICAgICAgQlVJTEQgRklYIChyMTQ2MDg4KTogUmVzb3VyY2VSZXF1 ZXN0OjpjZlVSTFJlcXVlc3QoKSBpcyBkZWZpbmVkIHR3aWNlIG9uIGlPUwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvci5qc29uIGIvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL0luc3BlY3Rvci5qc29uCmluZGV4IDk0ZDg1MTAzYzA5YjhmNjc4NmMwZmJjYzRi MjE5OTliMTIxMjRkMDIuLmRlMmNmYjNiOWY4YzhhMTk3YWUxZGQ0NThhZGUyZTQwMzRjODQzNTYg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3IuanNvbgorKysg Yi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yLmpzb24KQEAgLTM1LDYgKzM1LDEx IEBACiAgICAgICAgICAgICAgICAgInBhcmFtZXRlcnMiOiBbCiAgICAgICAgICAgICAgICAgICAg IHsgIm5hbWUiOiAicmVhc29uIiwgInR5cGUiOiAic3RyaW5nIiwgImRlc2NyaXB0aW9uIjogIlRo ZSByZWFzb24gd2h5IGNvbm5lY3Rpb24gaGFzIGJlZW4gdGVybWluYXRlZC4iIH0KICAgICAgICAg ICAgICAgICBdCisgICAgICAgICAgICB9LAorICAgICAgICAgICAgeworICAgICAgICAgICAgICAg ICJuYW1lIjogInRhcmdldENyYXNoZWQiLAorICAgICAgICAgICAgICAgICJkZXNjcmlwdGlvbiI6 ICJGaXJlZCB3aGVuIGRlYnVnZ2luZyB0YXJnZXQgaGFzIGNyYXNoZWQiLAorICAgICAgICAgICAg ICAgICJwYXJhbWV0ZXJzIjogW10KICAgICAgICAgICAgIH0KICAgICAgICAgXQogICAgIH0sCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0hlbHBTY3JlZW4u anMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0hlbHBTY3JlZW4uanMKaW5k ZXggNDg1MjVlNjY1YWFiMTVjZGIxNWY3OWFjNzMwZmM0M2FmZTI5OTJjOS4uYjkyM2M1MmE2OTRj MzJhMjZjNDVhM2JlNzAyZDdmN2E2YWFmMmQxZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9IZWxwU2NyZWVuLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvSGVscFNjcmVlbi5qcwpAQCAtMTIyLDMgKzEyMiwzMiBAQCBXZWJJ bnNwZWN0b3IuSGVscFNjcmVlbi5wcm90b3R5cGUgPSB7CiAKICAgICBfX3Byb3RvX186IFdlYklu c3BlY3Rvci5WaWV3LnByb3RvdHlwZQogfQorCisvKioKKyAqIEBjb25zdHJ1Y3RvcgorICogQHBh cmFtIHtzdHJpbmc9fSB0aXRsZQorICogQHBhcmFtIHtzdHJpbmc9fSBtZXNzYWdlCisgKiBAZXh0 ZW5kcyB7V2ViSW5zcGVjdG9yLkhlbHBTY3JlZW59CisgKi8KK1dlYkluc3BlY3Rvci5IZWxwU2Ny ZWVuVW50aWxSZWxvYWQgPSBmdW5jdGlvbih0aXRsZSwgbWVzc2FnZSkKK3sKKyAgICBXZWJJbnNw ZWN0b3IuSGVscFNjcmVlbi5jYWxsKHRoaXMsIHRpdGxlKTsKKyAgICB2YXIgcCA9IHRoaXMuY29u dGVudEVsZW1lbnQuY3JlYXRlQ2hpbGQoInAiKTsKKyAgICBwLmFkZFN0eWxlQ2xhc3MoImhlbHAt c2VjdGlvbiIpOworICAgIHAudGV4dENvbnRlbnQgPSBtZXNzYWdlOworICAgIFdlYkluc3BlY3Rv ci5kZWJ1Z2dlck1vZGVsLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLkRlYnVnZ2VyTW9k ZWwuRXZlbnRzLkdsb2JhbE9iamVjdENsZWFyZWQsIHRoaXMuaGlkZSwgdGhpcyk7Cit9CisKK1dl Ykluc3BlY3Rvci5IZWxwU2NyZWVuVW50aWxSZWxvYWQucHJvdG90eXBlID0geworICAgIC8qKgor ICAgICAqIEBvdmVycmlkZQorICAgICAqLworICAgIHdpbGxIaWRlOiBmdW5jdGlvbigpCisgICAg eworICAgICAgICBXZWJJbnNwZWN0b3IuZGVidWdnZXJNb2RlbC5yZW1vdmVFdmVudExpc3RlbmVy KFdlYkluc3BlY3Rvci5EZWJ1Z2dlck1vZGVsLkV2ZW50cy5HbG9iYWxPYmplY3RDbGVhcmVkLCB0 aGlzLmhpZGUsIHRoaXMpOworICAgICAgICBXZWJJbnNwZWN0b3IuSGVscFNjcmVlbi5wcm90b3R5 cGUud2lsbEhpZGUuY2FsbCh0aGlzKTsKKyAgICB9LAorCisgICAgX19wcm90b19fOiBXZWJJbnNw ZWN0b3IuSGVscFNjcmVlbi5wcm90b3R5cGUKK30KKwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5qcwppbmRleCA5ODY4NjMwYmMxMDI4MTU0MzkyYWRh NTljMmIxMjliMDczOGQ3M2FhLi5lYzdkYTc1MTE0N2M1ZjQ4ZGQ3MzliYWY5MDZjZGE4MGYwOGNl NmVmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2luc3Bl Y3Rvci5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rv ci5qcwpAQCAtOTgyLDYgKzk4MiwxMiBAQCBXZWJJbnNwZWN0b3IuZGV0YWNoZWQgPSBmdW5jdGlv bihyZWFzb24pCiAgICAgKG5ldyBXZWJJbnNwZWN0b3IuUmVtb3RlRGVidWdnaW5nVGVybWluYXRl ZFNjcmVlbihyZWFzb24pKS5zaG93TW9kYWwoKTsKIH0KIAorV2ViSW5zcGVjdG9yLnRhcmdldENy YXNoZWQgPSBmdW5jdGlvbigpIHsKKyAgICAobmV3IFdlYkluc3BlY3Rvci5IZWxwU2NyZWVuVW50 aWxSZWxvYWQoCisgICAgICAgIFdlYkluc3BlY3Rvci5VSVN0cmluZygiVGFyZ2V0IGhhcyBjcmFz aGVkIiksCisgICAgICAgIFdlYkluc3BlY3Rvci5VSVN0cmluZygiSW5zcGVjdGVkIHRhcmdldCBo YXMgY3Jhc2hlZC4gT25jZSBpdCByZWxvYWRzIHdlIHdpbGwgYXR0YWNoIHRvIGl0IGF1dG9tYXRp Y2FsbHkuIikpKS5zaG93TW9kYWwoKTsKK30KKwogV2ViSW5zcGVjdG9yLl91cGRhdGVGb2N1c2Vk Tm9kZSA9IGZ1bmN0aW9uKG5vZGVJZCkKIHsKICAgICBpZiAoV2ViSW5zcGVjdG9yLl9ub2RlU2Vh cmNoQnV0dG9uLnRvZ2dsZWQpIHsK 193783 2013-03-19 03:58:29 -0700 2013-03-19 04:45:45 -0700 Patch bug-112669-20130319145420.patch text/plain 5118 kaznacheev U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ2MTc4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDlmYzkyZmYwMjc4YTg1 MTQzM2FiYzIwMDU0YTg4OWMyNTQ1Y2E3NS4uOThmYzE3NTRhYjlhYTJiOTcyY2E2ODFiZGE0ZTYx NWY3ZjdkNGE3ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDEzLTAzLTE5ICBWbGFk aXNsYXYgS2F6bmFjaGVldiAgPGthem5hY2hlZXZAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdl YiBJbnNwZWN0b3I6IEFkZCBJbnNwZWN0b3IudGFyZ2V0Q3Jhc2hlZCBldmVudCB0byBJbnNwZWN0 b3IgcHJvdG9jb2wuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xMTI2NjkKKworICAgICAgICBBZGRlZCBJbnNwZWN0b3IudGFyZ2V0Q3Jhc2hlZCBldmVu dCBhbmQgaGFuZGxlZCBpdCBvbiB0aGUgZnJvbnQgZW5kLgorICAgICAgICBTaG93aW5nIGEgbW9k YWwgZGlhbG9nIHNpbWlsYXIgdG8gdGhlIG9uZSBkaXNwbGF5ZWQgd2hlbiB0aGUgcmVtb3RlCisg ICAgICAgIGRlYnVnZ2luZyB0YXJnZXQgaXMgZGlzY29ubmVjdGVkLgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogRW5nbGlzaC5scHJvai9sb2NhbGl6 ZWRTdHJpbmdzLmpzOgorICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3IuanNvbjoKKyAgICAg ICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0hlbHBTY3JlZW4uanM6CisgICAgICAgIChXZWJJbnNw ZWN0b3IuSGVscFNjcmVlblVudGlsUmVsb2FkKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5IZWxw U2NyZWVuVW50aWxSZWxvYWQucHJvdG90eXBlLndpbGxIaWRlKToKKyAgICAgICAgKiBpbnNwZWN0 b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci50YXJnZXRD cmFzaGVkKToKKwogMjAxMy0wMy0xOCAgRGF2aWQgS2lsemVyICA8ZGRraWx6ZXJAYXBwbGUuY29t PgogCiAgICAgICAgIEJVSUxEIEZJWCAocjE0NjA4OCk6IFJlc291cmNlUmVxdWVzdDo6Y2ZVUkxS ZXF1ZXN0KCkgaXMgZGVmaW5lZCB0d2ljZSBvbiBpT1MKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL0VuZ2xpc2gubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qcyBiL1NvdXJjZS9XZWJDb3JlL0Vu Z2xpc2gubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qcwppbmRleCBiOTRkOTFiYWJkMDhhYzJhNTI5 ZDEzNzQyMjdiNDhkMTkxNmEyYTllLi42Nzg5MGMzY2Q3ZGIzMmU2NDFlMDI2YjJiYzdkMTYyM2E4 MGYzMGYzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9FbmdsaXNoLmxwcm9qL2xvY2FsaXpl ZFN0cmluZ3MuanMKKysrIGIvU291cmNlL1dlYkNvcmUvRW5nbGlzaC5scHJvai9sb2NhbGl6ZWRT dHJpbmdzLmpzCkBAIC0yMzksNiArMjM5LDggQEAgbG9jYWxpemVkU3RyaW5nc1siSW5oZXJpdGVk IGZyb20iXSA9ICJJbmhlcml0ZWQgZnJvbSI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJJbml0aWF0b3Ii XSA9ICJJbml0aWF0b3IiOwogbG9jYWxpemVkU3RyaW5nc1siSW5zcGVjdGVkIHdvcmtlciB0ZXJt aW5hdGVkIl0gPSAiSW5zcGVjdGVkIHdvcmtlciB0ZXJtaW5hdGVkIjsKIGxvY2FsaXplZFN0cmlu Z3NbIkluc3BlY3RlZCB3b3JrZXIgaGFzIHRlcm1pbmF0ZWQuIE9uY2UgaXQgcmVzdGFydHMgd2Ug d2lsbCBhdHRhY2ggdG8gaXQgYXV0b21hdGljYWxseS4iXSA9ICJJbnNwZWN0ZWQgd29ya2VyIGhh cyB0ZXJtaW5hdGVkLiBPbmNlIGl0IHJlc3RhcnRzIHdlIHdpbGwgYXR0YWNoIHRvIGl0IGF1dG9t YXRpY2FsbHkuIjsKK2xvY2FsaXplZFN0cmluZ3NbIkluc3BlY3RlZCB0YXJnZXQgY3Jhc2hlZCJd ID0gIkluc3BlY3RlZCB0YXJnZXQgY3Jhc2hlZCI7Citsb2NhbGl6ZWRTdHJpbmdzWyJJbnNwZWN0 ZWQgdGFyZ2V0IGhhcyBjcmFzaGVkLiBPbmNlIGl0IHJlbG9hZHMgd2Ugd2lsbCBhdHRhY2ggdG8g aXQgYXV0b21hdGljYWxseS4iXSA9ICJJbnNwZWN0ZWQgdGFyZ2V0IGhhcyBjcmFzaGVkLiBPbmNl IGl0IHJlbG9hZHMgd2Ugd2lsbCBhdHRhY2ggdG8gaXQgYXV0b21hdGljYWxseS4iOwogbG9jYWxp emVkU3RyaW5nc1siSW5zdGFsbCBUaW1lciJdID0gIkluc3RhbGwgVGltZXIiOwogbG9jYWxpemVk U3RyaW5nc1siSW52YWxpZCBwcm9wZXJ0eSB2YWx1ZS4iXSA9ICJJbnZhbGlkIHByb3BlcnR5IHZh bHVlLiI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJLQiJdID0gIktCIjsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3IuanNvbiBiL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9JbnNwZWN0b3IuanNvbgppbmRleCA5NGQ4NTEwM2MwOWI4ZjY3ODZjMGZiY2M0YjIxOTk5 YjEyMTI0ZDAyLi44ZWYwOWU5ODA0Y2ZjZjJhYTQ3NjM5ZTcxZTY3ZDBmM2UxNzEzMjc2IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yLmpzb24KKysrIGIvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvci5qc29uCkBAIC0zNSw2ICszNSwxMCBAQAog ICAgICAgICAgICAgICAgICJwYXJhbWV0ZXJzIjogWwogICAgICAgICAgICAgICAgICAgICB7ICJu YW1lIjogInJlYXNvbiIsICJ0eXBlIjogInN0cmluZyIsICJkZXNjcmlwdGlvbiI6ICJUaGUgcmVh c29uIHdoeSBjb25uZWN0aW9uIGhhcyBiZWVuIHRlcm1pbmF0ZWQuIiB9CiAgICAgICAgICAgICAg ICAgXQorICAgICAgICAgICAgfSwKKyAgICAgICAgICAgIHsKKyAgICAgICAgICAgICAgICAibmFt ZSI6ICJ0YXJnZXRDcmFzaGVkIiwKKyAgICAgICAgICAgICAgICAiZGVzY3JpcHRpb24iOiAiRmly ZWQgd2hlbiBkZWJ1Z2dpbmcgdGFyZ2V0IGhhcyBjcmFzaGVkIgogICAgICAgICAgICAgfQogICAg ICAgICBdCiAgICAgfSwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvSGVscFNjcmVlbi5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv SGVscFNjcmVlbi5qcwppbmRleCA0ODUyNWU2NjVhYWIxNWNkYjE1Zjc5YWM3MzBmYzQzYWZlMjk5 MmM5Li5iOTIzYzUyYTY5NGMzMmEyNmM0NWEzYmU3MDJkN2Y3YTZhYWYyZDFmIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0hlbHBTY3JlZW4uanMKKysrIGIv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9IZWxwU2NyZWVuLmpzCkBAIC0xMjIs MyArMTIyLDMyIEBAIFdlYkluc3BlY3Rvci5IZWxwU2NyZWVuLnByb3RvdHlwZSA9IHsKIAogICAg IF9fcHJvdG9fXzogV2ViSW5zcGVjdG9yLlZpZXcucHJvdG90eXBlCiB9CisKKy8qKgorICogQGNv bnN0cnVjdG9yCisgKiBAcGFyYW0ge3N0cmluZz19IHRpdGxlCisgKiBAcGFyYW0ge3N0cmluZz19 IG1lc3NhZ2UKKyAqIEBleHRlbmRzIHtXZWJJbnNwZWN0b3IuSGVscFNjcmVlbn0KKyAqLworV2Vi SW5zcGVjdG9yLkhlbHBTY3JlZW5VbnRpbFJlbG9hZCA9IGZ1bmN0aW9uKHRpdGxlLCBtZXNzYWdl KQoreworICAgIFdlYkluc3BlY3Rvci5IZWxwU2NyZWVuLmNhbGwodGhpcywgdGl0bGUpOworICAg IHZhciBwID0gdGhpcy5jb250ZW50RWxlbWVudC5jcmVhdGVDaGlsZCgicCIpOworICAgIHAuYWRk U3R5bGVDbGFzcygiaGVscC1zZWN0aW9uIik7CisgICAgcC50ZXh0Q29udGVudCA9IG1lc3NhZ2U7 CisgICAgV2ViSW5zcGVjdG9yLmRlYnVnZ2VyTW9kZWwuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNw ZWN0b3IuRGVidWdnZXJNb2RlbC5FdmVudHMuR2xvYmFsT2JqZWN0Q2xlYXJlZCwgdGhpcy5oaWRl LCB0aGlzKTsKK30KKworV2ViSW5zcGVjdG9yLkhlbHBTY3JlZW5VbnRpbFJlbG9hZC5wcm90b3R5 cGUgPSB7CisgICAgLyoqCisgICAgICogQG92ZXJyaWRlCisgICAgICovCisgICAgd2lsbEhpZGU6 IGZ1bmN0aW9uKCkKKyAgICB7CisgICAgICAgIFdlYkluc3BlY3Rvci5kZWJ1Z2dlck1vZGVsLnJl bW92ZUV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLkRlYnVnZ2VyTW9kZWwuRXZlbnRzLkdsb2Jh bE9iamVjdENsZWFyZWQsIHRoaXMuaGlkZSwgdGhpcyk7CisgICAgICAgIFdlYkluc3BlY3Rvci5I ZWxwU2NyZWVuLnByb3RvdHlwZS53aWxsSGlkZS5jYWxsKHRoaXMpOworICAgIH0sCisKKyAgICBf X3Byb3RvX186IFdlYkluc3BlY3Rvci5IZWxwU2NyZWVuLnByb3RvdHlwZQorfQorCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5qcyBiL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmpzCmluZGV4IDk4Njg2 MzBiYzEwMjgxNTQzOTJhZGE1OWMyYjEyOWIwNzM4ZDczYWEuLjhlYjBkYWEzZjQxYmY5MTY3ZTNi ZGIwZGFmNjk2ZWVhOGFmZjNkZmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvaW5zcGVjdG9yLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvaW5zcGVjdG9yLmpzCkBAIC05ODIsNiArOTgyLDEzIEBAIFdlYkluc3BlY3Rvci5k ZXRhY2hlZCA9IGZ1bmN0aW9uKHJlYXNvbikKICAgICAobmV3IFdlYkluc3BlY3Rvci5SZW1vdGVE ZWJ1Z2dpbmdUZXJtaW5hdGVkU2NyZWVuKHJlYXNvbikpLnNob3dNb2RhbCgpOwogfQogCitXZWJJ bnNwZWN0b3IudGFyZ2V0Q3Jhc2hlZCA9IGZ1bmN0aW9uKCkKK3sKKyAgICAobmV3IFdlYkluc3Bl Y3Rvci5IZWxwU2NyZWVuVW50aWxSZWxvYWQoCisgICAgICAgIFdlYkluc3BlY3Rvci5VSVN0cmlu ZygiSW5zcGVjdGVkIHRhcmdldCBjcmFzaGVkIiksCisgICAgICAgIFdlYkluc3BlY3Rvci5VSVN0 cmluZygiSW5zcGVjdGVkIHRhcmdldCBoYXMgY3Jhc2hlZC4gT25jZSBpdCByZWxvYWRzIHdlIHdp bGwgYXR0YWNoIHRvIGl0IGF1dG9tYXRpY2FsbHkuIikpKS5zaG93TW9kYWwoKTsKK30KKwogV2Vi SW5zcGVjdG9yLl91cGRhdGVGb2N1c2VkTm9kZSA9IGZ1bmN0aW9uKG5vZGVJZCkKIHsKICAgICBp ZiAoV2ViSW5zcGVjdG9yLl9ub2RlU2VhcmNoQnV0dG9uLnRvZ2dsZWQpIHsK