93019 2012-08-02 12:40:09 -0700 Web Inspector: WebInspector.linkifyStringAsFragment gives wrong typeof lineNumber 2012-08-06 12:04:51 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 johnjbarton webkit-unassigned apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy webkit.review.bot yurys oldest_to_newest 685684 0 johnjbarton 2012-08-02 12:40:09 -0700 User reported issue is upstream: Issue 135493: [DevTools] Links to source locations from stacktraces do not work. http://code.google.com/p/chromium/issues/detail?id=135493 The test case writes Error: The original error at triggerError (http://fiddle.jshell.net/Ad2Rr/4/show/:22:11) at HTMLButtonElement.onclick (http://fiddle.jshell.net/Ad2Rr/4/show/:36:121) into the console and the text goes through WebInspector.linkifyStringAsFragment. That calls WebInspector.linkifyStringAsFragmentWithCustomLinkifier() with a custom linkifier that is supposed to accept a string arg for lineNumber. However that linkifier function treats the lineNumber as a number. 685691 1 156144 johnjbarton 2012-08-02 12:53:21 -0700 Created attachment 156144 Patch 686300 2 156144 vsevik 2012-08-03 00:26:09 -0700 Comment on attachment 156144 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=156144&action=review > Source/WebCore/inspector/front-end/ResourceUtils.js:-251 > - urlNode.lineNumber = lineNumber; linkifier function is passed to linkifyStringAsFragmentWithCustomLinkifier as a parameter. I think we should fix linkifyStringAsFragmentWithCustomLinkifier instead to always pass the number to linkifier. > LayoutTests/inspector/debugger/linkifier.html:44 > + var linkifyMe = "at triggerError (http://fiddle.jshell.net/Ad2Rr/4/show/:22:11)"; nit: This real life url is distracting, I would use something like http://localhost/:22:11 instead. 686866 3 156403 johnjbarton 2012-08-03 09:53:06 -0700 Created attachment 156403 Patch 688072 4 156403 pfeldman 2012-08-06 06:20:23 -0700 Comment on attachment 156403 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=156403&action=review > Source/WebCore/inspector/front-end/ResourceUtils.js:210 > + lineNumber = parseInt(lineColumnMatch[1]); Nit: we explicitly say parseInt(foo, 10) to make closure compiler happy. 688304 5 156730 johnjbarton 2012-08-06 11:31:52 -0700 Created attachment 156730 Patch 688332 6 156730 webkit.review.bot 2012-08-06 12:04:47 -0700 Comment on attachment 156730 Patch Clearing flags on attachment: 156730 Committed r124792: <http://trac.webkit.org/changeset/124792> 688333 7 webkit.review.bot 2012-08-06 12:04:51 -0700 All reviewed patches have been landed. Closing bug. 156144 2012-08-02 12:53:21 -0700 2012-08-03 09:53:03 -0700 Patch bug-93019-20120802125302.patch text/plain 4650 johnjbarton U3VidmVyc2lvbiBSZXZpc2lvbjogMTI0MTg4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMGNlMjE4YjAyYzNjMmNh N2I5YTMzZDliMWM2MjFjZGE4NTFhMWU3MS4uMzk0YzYyMWFiZmM1NGM4ZjBhYmRjMzg5NGM0YzQw ZmQ2YzE1MzcwNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDEyLTA4LTAyICBKb2hu IEouIEJhcnRvbiAgPGpvaG5qYmFydG9uQGNocm9taXVtLm9yZz4KKworICAgICAgICBXZWIgSW5z cGVjdG9yOiBXZWJJbnNwZWN0b3IubGlua2lmeVN0cmluZ0FzRnJhZ21lbnQgZ2l2ZXMgd3Jvbmcg dHlwZW9mIGxpbmVOdW1iZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTkzMDE5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgQ29udmVydCB0aGUgYXJndW1lbnQgbGluZU51bWJlciB2aWEgcGFyc2VJbnQgaWZm IG5vdCBhIG51bWJlcgorICAgICAgICBOZXcgdGVzdCBjYXNlIGFkZGVkIHRvIGxpbmtpZnkuaHRt bAorCisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZVV0aWxzLmpzOgorICAg ICAgICAoV2ViSW5zcGVjdG9yLmxpbmtpZnlTdHJpbmdBc0ZyYWdtZW50KToKKwogMjAxMi0wNy0z MSAgUmF1bCBIdWRlYSAgPHJodWRlYUBhZG9iZS5jb20+CiAKICAgICAgICAgSW5zcGVjdG9yIGNy YXNoZXMgd2hlbiB0cnlpbmcgdG8gaW5zcGVjdCBhIHBhZ2Ugd2l0aCBDU1MgcmVnaW9uIHN0eWxp bmcKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3Vy Y2VVdGlscy5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VV dGlscy5qcwppbmRleCA1M2MxYWI2MjE1ZjU0MWYyMGQzNTE4YWY4YmE1YmExOTlhOWIzZWI0Li41 MGJkMjQ1MDBjMjVlODEwMGYzODZiNWI5YTAwNGQwNzIyMmZiMjUyIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlVXRpbHMuanMKKysrIGIvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZVV0aWxzLmpzCkBAIC0yMzcs NyArMjM3LDcgQEAgV2ViSW5zcGVjdG9yLmxpbmtpZnlTdHJpbmdBc0ZyYWdtZW50ID0gZnVuY3Rp b24oc3RyaW5nKQogICAgIC8qKgogICAgICAqIEBwYXJhbSB7c3RyaW5nfSB0aXRsZQogICAgICAq IEBwYXJhbSB7c3RyaW5nfSB1cmwKLSAgICAgKiBAcGFyYW0ge3N0cmluZz19IGxpbmVOdW1iZXIK KyAgICAgKiBAcGFyYW0ge3N0cmluZ3xudW1iZXI9fSBsaW5lTnVtYmVyCiAgICAgICogQHJldHVy biB7Tm9kZX0KICAgICAgKi8KICAgICBmdW5jdGlvbiBsaW5raWZpZXIodGl0bGUsIHVybCwgbGlu ZU51bWJlcikKQEAgLTI0OCw4ICsyNDgsMTIgQEAgV2ViSW5zcGVjdG9yLmxpbmtpZnlTdHJpbmdB c0ZyYWdtZW50ID0gZnVuY3Rpb24oc3RyaW5nKQogICAgICAgICB2YXIgaXNFeHRlcm5hbCA9ICFX ZWJJbnNwZWN0b3IucmVzb3VyY2VGb3JVUkwodXJsKTsKICAgICAgICAgdmFyIHVybE5vZGUgPSBX ZWJJbnNwZWN0b3IubGlua2lmeVVSTEFzTm9kZSh1cmwsIHRpdGxlLCB1bmRlZmluZWQsIGlzRXh0 ZXJuYWwpOwogICAgICAgICBpZiAodHlwZW9mKGxpbmVOdW1iZXIpICE9PSAidW5kZWZpbmVkIikg ewotICAgICAgICAgICAgdXJsTm9kZS5saW5lTnVtYmVyID0gbGluZU51bWJlcjsKLSAgICAgICAg ICAgIHVybE5vZGUucHJlZmVycmVkUGFuZWwgPSAic2NyaXB0cyI7CisgICAgICAgICAgICBpZiAo dHlwZW9mIGxpbmVOdW1iZXIgIT09ICJudW1iZXIiKSAKKyAgICAgICAgICAgICAgICBsaW5lTnVt YmVyID0gcGFyc2VJbnQobGluZU51bWJlcik7CisgICAgICAgICAgICBpZiAoIWlzTmFOKGxpbmVO dW1iZXIpKSB7CisgICAgICAgICAgICAgICAgdXJsTm9kZS5saW5lTnVtYmVyID0gbGluZU51bWJl cjsKKyAgICAgICAgICAgICAgICB1cmxOb2RlLnByZWZlcnJlZFBhbmVsID0gInNjcmlwdHMiOwor ICAgICAgICAgICAgfQogICAgICAgICB9CiAgICAgICAgIAogICAgICAgICByZXR1cm4gdXJsTm9k ZTsgCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFu Z2VMb2cKaW5kZXggYzEyMDBiOWRkY2Q2N2QyYzE5YTJiZGNjZWJlYzJkMjNmOTg5YmY1MC4uZTY3 MjEwZDU3N2VhOWFlZTBiNjM1OTFhZTg1OGQyNjZiYTJiODk3YiAxMDA2NDQKLS0tIGEvTGF5b3V0 VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0 IEBACisyMDEyLTA4LTAyICBKb2huIEouIEJhcnRvbiAgPGpvaG5qYmFydG9uQGNocm9taXVtLm9y Zz4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBXZWJJbnNwZWN0b3IubGlua2lmeVN0cmluZ0Fz RnJhZ21lbnQgZ2l2ZXMgd3JvbmcgdHlwZW9mIGxpbmVOdW1iZXIKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTkzMDE5CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkIHRlc3QgZm9yIFdlYkluc3BlY3Rvci5s aW5raWZ5U3RyaW5nQXNGcmFnbWVudCgpCisgICAgICAgICogaW5zcGVjdG9yL2RlYnVnZ2VyL2xp bmtpZmllci1leHBlY3RlZC50eHQ6CisgICAgICAgICogaW5zcGVjdG9yL2RlYnVnZ2VyL2xpbmtp Zmllci5odG1sOgorCiAyMDEyLTA3LTMxICBBbGV4YW5kZXIgUGF2bG92ICA8YXBhdmxvdkBjaHJv bWl1bS5vcmc+CiAKICAgICAgICAgW0Nocm9taXVtXSBVbnJldmlld2VkLCBoYW5kbGUgbW9yZSB0 ZXN0cyBmYWlsaW5nIGFmdGVyIHIxMjQwNTIuCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbnNw ZWN0b3IvZGVidWdnZXIvbGlua2lmaWVyLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2luc3Bl Y3Rvci9kZWJ1Z2dlci9saW5raWZpZXItZXhwZWN0ZWQudHh0CmluZGV4IGQ2MWE5ZDE5NDBjMWY0 OTE2OWZkYmYwN2M2OWU1MWZhMDA0YjBkNjcuLmFlNjBmNGU4Y2Q4MjY1M2FhNDRlNjQxZmVhYjc3 OWZlNjMxZDY3ZDUgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9kZWJ1Z2dlci9s aW5raWZpZXItZXhwZWN0ZWQudHh0CisrKyBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9kZWJ1Z2dl ci9saW5raWZpZXItZXhwZWN0ZWQudHh0CkBAIC0xLDYgKzEsOCBAQAogVGVzdHMgdGhhdCBMaW5r aWZpZXIgd29ya3MgY29ycmVjdGx5LgogCiBEZWJ1Z2dlciB3YXMgZW5hYmxlZC4KK1RoZSBzdHJp bmcgImF0IHRyaWdnZXJFcnJvciAoaHR0cDovL2ZpZGRsZS5qc2hlbGwubmV0L0FkMlJyLzQvc2hv dy86MjI6MTEpICIgbGlua2lmaWVzIHRvIHVybDogaHR0cDovL2ZpZGRsZS5qc2hlbGwubmV0L0Fk MlJyLzQvc2hvdy8KK1RoZSBsaW5lTnVtYmVyIGlzIDIyIHdpdGggdHlwZSBudW1iZXIKIGxpc3Rl bmVycyBhZGRlZCBvbiByYXcgc291cmNlIGNvZGU6IDEKIG9yaWdpbmFsIGxvY2F0aW9uOiBsaW5r aWZpZXIuaHRtbDo5CiBwcmV0dHkgcHJpbnRlZCBsb2NhdGlvbjogbGlua2lmaWVyLmh0bWw6MTIK ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9kZWJ1Z2dlci9saW5raWZpZXIuaHRt bCBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9kZWJ1Z2dlci9saW5raWZpZXIuaHRtbAppbmRleCAz MTQzYzBjMmNjN2UwMWJkZjE4ODA2MzhkMjJjZGQzODU3MDc2YTBkLi5mMTFiNjVlNDA4OWM4NDRh Nzk5M2YyZWY0N2NlOGRiYTI3MjVhZjJlIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbnNwZWN0 b3IvZGVidWdnZXIvbGlua2lmaWVyLmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2Rl YnVnZ2VyL2xpbmtpZmllci5odG1sCkBAIC00MSw2ICs0MSwxMiBAQCBmdW5jdGlvbiB0ZXN0KCkK ICAgICAgICAgICAgIH0KICAgICAgICAgfQogCisgICAgICAgIHZhciBsaW5raWZ5TWUgPSAiYXQg dHJpZ2dlckVycm9yIChodHRwOi8vZmlkZGxlLmpzaGVsbC5uZXQvQWQyUnIvNC9zaG93LzoyMjox MSkiOworICAgICAgICB2YXIgZnJhZ21lbnQgPSBXZWJJbnNwZWN0b3IubGlua2lmeVN0cmluZ0Fz RnJhZ21lbnQobGlua2lmeU1lKTsKKyAgICAgICAgdmFyIGFuY2hvciA9IGZyYWdtZW50LnF1ZXJ5 U2VsZWN0b3IoJ2EnKTsKKyAgICAgICAgSW5zcGVjdG9yVGVzdC5hZGRSZXN1bHQoIlRoZSBzdHJp bmcgXCIiICsgbGlua2lmeU1lICsgIiBcIiBsaW5raWZpZXMgdG8gdXJsOiAiICsgYW5jaG9yLmhy ZWYpOworICAgICAgICBJbnNwZWN0b3JUZXN0LmFkZFJlc3VsdCgiVGhlIGxpbmVOdW1iZXIgaXMg IiArIGFuY2hvci5saW5lTnVtYmVyICsgIiB3aXRoIHR5cGUgIiArICh0eXBlb2YgYW5jaG9yLmxp bmVOdW1iZXIpKTsKKwogICAgICAgICBsaW5raWZpZXIgPSBuZXcgV2ViSW5zcGVjdG9yLkxpbmtp ZmllcigpOwogICAgICAgICB2YXIgY291bnQxID0gbGl2ZUxvY2F0aW9uc0NvdW50KCk7CiAgICAg ICAgIGxpbmsgPSBsaW5raWZpZXIubGlua2lmeUxvY2F0aW9uKFdlYkluc3BlY3Rvci5pbnNwZWN0 ZWRQYWdlVVJMLCA4LCAwLCAiZHVtbXktY2xhc3MiKTsK 156403 2012-08-03 09:53:06 -0700 2012-08-06 11:31:48 -0700 Patch bug-93019-20120803095246.patch text/plain 5142 johnjbarton U3VidmVyc2lvbiBSZXZpc2lvbjogMTI0MTg4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMGNlMjE4YjAyYzNjMmNh N2I5YTMzZDliMWM2MjFjZGE4NTFhMWU3MS4uMTVmMmEzYzhhY2VjZWI5ZDk0OWY5YjEyN2E1MGU3 NTFhZTFkNmZlYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDEyLTA4LTAyICBKb2hu IEouIEJhcnRvbiAgPGpvaG5qYmFydG9uQGNocm9taXVtLm9yZz4KKworICAgICAgICBXZWIgSW5z cGVjdG9yOiBXZWJJbnNwZWN0b3IubGlua2lmeVN0cmluZ0FzRnJhZ21lbnQgZ2l2ZXMgd3Jvbmcg dHlwZW9mIGxpbmVOdW1iZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTkzMDE5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgcGFyc2VJbnQgdGhlIFJlZ0V4cCBtYXRjaCBmb3IgbGluZU51bWJlciAKKyAgICAg ICAgTmV3IHRlc3QgY2FzZSBhZGRlZCB0byBsaW5raWZ5Lmh0bWwKKworICAgICAgICAqIGluc3Bl Y3Rvci9mcm9udC1lbmQvUmVzb3VyY2VVdGlscy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5s aW5raWZ5U3RyaW5nQXNGcmFnbWVudCk6CisKIDIwMTItMDctMzEgIFJhdWwgSHVkZWEgIDxyaHVk ZWFAYWRvYmUuY29tPgogCiAgICAgICAgIEluc3BlY3RvciBjcmFzaGVzIHdoZW4gdHJ5aW5nIHRv IGluc3BlY3QgYSBwYWdlIHdpdGggQ1NTIHJlZ2lvbiBzdHlsaW5nCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlVXRpbHMuanMgYi9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlVXRpbHMuanMKaW5kZXggNTNjMWFi NjIxNWY1NDFmMjBkMzUxOGFmOGJhNWJhMTk5YTliM2ViNC4uZDlhOTkyNjIxZWRmZDcwNGViMDFi OTEzNDkzZTIyOTc4OTI0MjI3MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9SZXNvdXJjZVV0aWxzLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvUmVzb3VyY2VVdGlscy5qcwpAQCAtMTgyLDcgKzE4Miw3IEBAIFdlYkluc3Bl Y3Rvci5kaXNwbGF5TmFtZUZvclVSTCA9IGZ1bmN0aW9uKHVybCkKIAogLyoqCiAgKiBAcGFyYW0g e3N0cmluZ30gc3RyaW5nCi0gKiBAcGFyYW0ge2Z1bmN0aW9uKHN0cmluZyxzdHJpbmcsc3RyaW5n PSk6Tm9kZX0gbGlua2lmaWVyCisgKiBAcGFyYW0ge2Z1bmN0aW9uKHN0cmluZyxzdHJpbmcsbnVt YmVyPSk6Tm9kZX0gbGlua2lmaWVyCiAgKiBAcmV0dXJuIHtEb2N1bWVudEZyYWdtZW50fQogICov CiBXZWJJbnNwZWN0b3IubGlua2lmeVN0cmluZ0FzRnJhZ21lbnRXaXRoQ3VzdG9tTGlua2lmaWVy ID0gZnVuY3Rpb24oc3RyaW5nLCBsaW5raWZpZXIpCkBAIC0yMDQsMTAgKzIwNCwxNCBAQCBXZWJJ bnNwZWN0b3IubGlua2lmeVN0cmluZ0FzRnJhZ21lbnRXaXRoQ3VzdG9tTGlua2lmaWVyID0gZnVu Y3Rpb24oc3RyaW5nLCBsaW5raQogICAgICAgICB2YXIgdGl0bGUgPSBsaW5rU3RyaW5nOwogICAg ICAgICB2YXIgcmVhbFVSTCA9IChsaW5rU3RyaW5nLnN0YXJ0c1dpdGgoInd3dy4iKSA/ICJodHRw Oi8vIiArIGxpbmtTdHJpbmcgOiBsaW5rU3RyaW5nKTsKICAgICAgICAgdmFyIGxpbmVDb2x1bW5N YXRjaCA9IGxpbmVDb2x1bW5SZWdFeC5leGVjKHJlYWxVUkwpOwotICAgICAgICBpZiAobGluZUNv bHVtbk1hdGNoKQorICAgICAgICB2YXIgbGluZU51bWJlcjsKKyAgICAgICAgaWYgKGxpbmVDb2x1 bW5NYXRjaCkgewogICAgICAgICAgICAgcmVhbFVSTCA9IHJlYWxVUkwuc3Vic3RyaW5nKDAsIHJl YWxVUkwubGVuZ3RoIC0gbGluZUNvbHVtbk1hdGNoWzBdLmxlbmd0aCk7CisgICAgICAgICAgICBs aW5lTnVtYmVyID0gcGFyc2VJbnQobGluZUNvbHVtbk1hdGNoWzFdKTsKKyAgICAgICAgICAgIGxp bmVOdW1iZXIgPSBpc05hTihsaW5lTnVtYmVyKSA/IHVuZGVmaW5lZCA6IGxpbmVOdW1iZXI7Cisg ICAgICAgIH0KIAotICAgICAgICB2YXIgbGlua05vZGUgPSBsaW5raWZpZXIodGl0bGUsIHJlYWxV UkwsIGxpbmVDb2x1bW5NYXRjaCA/IGxpbmVDb2x1bW5NYXRjaFsxXSA6IHVuZGVmaW5lZCk7Cisg ICAgICAgIHZhciBsaW5rTm9kZSA9IGxpbmtpZmllcih0aXRsZSwgcmVhbFVSTCwgbGluZU51bWJl cik7CiAgICAgICAgIGNvbnRhaW5lci5hcHBlbmRDaGlsZChsaW5rTm9kZSk7CiAgICAgICAgIHN0 cmluZyA9IHN0cmluZy5zdWJzdHJpbmcobGlua0luZGV4ICsgbGlua1N0cmluZy5sZW5ndGgsIHN0 cmluZy5sZW5ndGgpOwogICAgIH0KQEAgLTIzNyw3ICsyNDEsNyBAQCBXZWJJbnNwZWN0b3IubGlu a2lmeVN0cmluZ0FzRnJhZ21lbnQgPSBmdW5jdGlvbihzdHJpbmcpCiAgICAgLyoqCiAgICAgICog QHBhcmFtIHtzdHJpbmd9IHRpdGxlCiAgICAgICogQHBhcmFtIHtzdHJpbmd9IHVybAotICAgICAq IEBwYXJhbSB7c3RyaW5nPX0gbGluZU51bWJlcgorICAgICAqIEBwYXJhbSB7bnVtYmVyPX0gbGlu ZU51bWJlcgogICAgICAqIEByZXR1cm4ge05vZGV9CiAgICAgICovCiAgICAgZnVuY3Rpb24gbGlu a2lmaWVyKHRpdGxlLCB1cmwsIGxpbmVOdW1iZXIpCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9D aGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggYzEyMDBiOWRkY2Q2N2QyYzE5 YTJiZGNjZWJlYzJkMjNmOTg5YmY1MC4uZTY3MjEwZDU3N2VhOWFlZTBiNjM1OTFhZTg1OGQyNjZi YTJiODk3YiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRl c3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDEyLTA4LTAyICBKb2huIEouIEJhcnRv biAgPGpvaG5qYmFydG9uQGNocm9taXVtLm9yZz4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBX ZWJJbnNwZWN0b3IubGlua2lmeVN0cmluZ0FzRnJhZ21lbnQgZ2l2ZXMgd3JvbmcgdHlwZW9mIGxp bmVOdW1iZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTkzMDE5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg QWRkIHRlc3QgZm9yIFdlYkluc3BlY3Rvci5saW5raWZ5U3RyaW5nQXNGcmFnbWVudCgpCisgICAg ICAgICogaW5zcGVjdG9yL2RlYnVnZ2VyL2xpbmtpZmllci1leHBlY3RlZC50eHQ6CisgICAgICAg ICogaW5zcGVjdG9yL2RlYnVnZ2VyL2xpbmtpZmllci5odG1sOgorCiAyMDEyLTA3LTMxICBBbGV4 YW5kZXIgUGF2bG92ICA8YXBhdmxvdkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgW0Nocm9taXVt XSBVbnJldmlld2VkLCBoYW5kbGUgbW9yZSB0ZXN0cyBmYWlsaW5nIGFmdGVyIHIxMjQwNTIuCmRp ZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZGVidWdnZXIvbGlua2lmaWVyLWV4cGVj dGVkLnR4dCBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9kZWJ1Z2dlci9saW5raWZpZXItZXhwZWN0 ZWQudHh0CmluZGV4IGQ2MWE5ZDE5NDBjMWY0OTE2OWZkYmYwN2M2OWU1MWZhMDA0YjBkNjcuLmRk ZTQzNzk3NWE4Y2U5YzYzZDMyMWQ0ODBiYTg3NjQ2ZjgzODU3MDggMTAwNjQ0Ci0tLSBhL0xheW91 dFRlc3RzL2luc3BlY3Rvci9kZWJ1Z2dlci9saW5raWZpZXItZXhwZWN0ZWQudHh0CisrKyBiL0xh eW91dFRlc3RzL2luc3BlY3Rvci9kZWJ1Z2dlci9saW5raWZpZXItZXhwZWN0ZWQudHh0CkBAIC0x LDYgKzEsOCBAQAogVGVzdHMgdGhhdCBMaW5raWZpZXIgd29ya3MgY29ycmVjdGx5LgogCiBEZWJ1 Z2dlciB3YXMgZW5hYmxlZC4KK1RoZSBzdHJpbmcgImF0IHRyaWdnZXJFcnJvciAoaHR0cDovL2xv Y2FsaG9zdC9zaG93LzoyMjoxMSkgIiBsaW5raWZpZXMgdG8gdXJsOiBodHRwOi8vbG9jYWxob3N0 L3Nob3cvCitUaGUgbGluZU51bWJlciBpcyAyMiB3aXRoIHR5cGUgbnVtYmVyCiBsaXN0ZW5lcnMg YWRkZWQgb24gcmF3IHNvdXJjZSBjb2RlOiAxCiBvcmlnaW5hbCBsb2NhdGlvbjogbGlua2lmaWVy Lmh0bWw6OQogcHJldHR5IHByaW50ZWQgbG9jYXRpb246IGxpbmtpZmllci5odG1sOjEyCmRpZmYg LS1naXQgYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZGVidWdnZXIvbGlua2lmaWVyLmh0bWwgYi9M YXlvdXRUZXN0cy9pbnNwZWN0b3IvZGVidWdnZXIvbGlua2lmaWVyLmh0bWwKaW5kZXggMzE0M2Mw YzJjYzdlMDFiZGYxODgwNjM4ZDIyY2RkMzg1NzA3NmEwZC4uNTZiNmNlM2FkZjY0OWE4OTAzM2Uy NjVmNThjNzRlMzcyMTM0NDAyMCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2Rl YnVnZ2VyL2xpbmtpZmllci5odG1sCisrKyBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9kZWJ1Z2dl ci9saW5raWZpZXIuaHRtbApAQCAtNDEsNiArNDEsMTIgQEAgZnVuY3Rpb24gdGVzdCgpCiAgICAg ICAgICAgICB9CiAgICAgICAgIH0KIAorICAgICAgICB2YXIgbGlua2lmeU1lID0gImF0IHRyaWdn ZXJFcnJvciAoaHR0cDovL2xvY2FsaG9zdC9zaG93LzoyMjoxMSkiOworICAgICAgICB2YXIgZnJh Z21lbnQgPSBXZWJJbnNwZWN0b3IubGlua2lmeVN0cmluZ0FzRnJhZ21lbnQobGlua2lmeU1lKTsK KyAgICAgICAgdmFyIGFuY2hvciA9IGZyYWdtZW50LnF1ZXJ5U2VsZWN0b3IoJ2EnKTsKKyAgICAg ICAgSW5zcGVjdG9yVGVzdC5hZGRSZXN1bHQoIlRoZSBzdHJpbmcgXCIiICsgbGlua2lmeU1lICsg IiBcIiBsaW5raWZpZXMgdG8gdXJsOiAiICsgYW5jaG9yLmhyZWYpOworICAgICAgICBJbnNwZWN0 b3JUZXN0LmFkZFJlc3VsdCgiVGhlIGxpbmVOdW1iZXIgaXMgIiArIGFuY2hvci5saW5lTnVtYmVy ICsgIiB3aXRoIHR5cGUgIiArICh0eXBlb2YgYW5jaG9yLmxpbmVOdW1iZXIpKTsKKwogICAgICAg ICBsaW5raWZpZXIgPSBuZXcgV2ViSW5zcGVjdG9yLkxpbmtpZmllcigpOwogICAgICAgICB2YXIg Y291bnQxID0gbGl2ZUxvY2F0aW9uc0NvdW50KCk7CiAgICAgICAgIGxpbmsgPSBsaW5raWZpZXIu bGlua2lmeUxvY2F0aW9uKFdlYkluc3BlY3Rvci5pbnNwZWN0ZWRQYWdlVVJMLCA4LCAwLCAiZHVt bXktY2xhc3MiKTsK 156730 2012-08-06 11:31:52 -0700 2012-08-06 12:04:47 -0700 Patch bug-93019-20120806113128.patch text/plain 5137 johnjbarton U3VidmVyc2lvbiBSZXZpc2lvbjogMTI0NzUyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZWY2NGZjZjEzMDBhYWRk ZTg4ODBjYjk1YmE4ZWZlZGFjNGFjNGQyYi4uMGFjMGEyOWEwYjBiZGVlYmRmNDc5MGFlMmYwMWMz MGE0NTFjZWFhZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDEyLTA4LTA2ICBKb2hu IEouIEJhcnRvbiAgPGpvaG5qYmFydG9uQGNocm9taXVtLm9yZz4KKworICAgICAgICBXZWIgSW5z cGVjdG9yOiBXZWJJbnNwZWN0b3IubGlua2lmeVN0cmluZ0FzRnJhZ21lbnQgZ2l2ZXMgd3Jvbmcg dHlwZW9mIGxpbmVOdW1iZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTkzMDE5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgQWRkIHRlc3QgZm9yIFdlYkluc3BlY3Rvci5saW5raWZ5U3RyaW5nQXNGcmFnbWVu dCgpCisKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlVXRpbHMuanM6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IubGlua2lmeVN0cmluZ0FzRnJhZ21lbnRXaXRoQ3VzdG9tTGlu a2lmaWVyKToKKwogMjAxMi0wOC0wNiAgQXJrbyBTYWhhICA8YXJrb0Btb3Rvcm9sYS5jb20+CiAK ICAgICAgICAgTWljcm9kYXRhOiBkb2N1bWVudC5nZXRJdGVtcygpIG11c3QgdHJlYXQgbm8gdG9r ZW4gYXMgbm8gcGFyYW1ldGVyLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9SZXNvdXJjZVV0aWxzLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9SZXNvdXJjZVV0aWxzLmpzCmluZGV4IDExYzgzZGVhNDg4YmUyOTgxZTU0Yzg1NzVk OWEyYTdmZTY3MmU1YTQuLjE0MTI4MTVhM2U2NDdlM2E3OGFjYjMzYmM1ODg4MmY1NDYyZTRjMWUg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VV dGlscy5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNl VXRpbHMuanMKQEAgLTE4Miw3ICsxODIsNyBAQCBXZWJJbnNwZWN0b3IuZGlzcGxheU5hbWVGb3JV UkwgPSBmdW5jdGlvbih1cmwpCiAKIC8qKgogICogQHBhcmFtIHtzdHJpbmd9IHN0cmluZwotICog QHBhcmFtIHtmdW5jdGlvbihzdHJpbmcsc3RyaW5nLHN0cmluZz0pOk5vZGV9IGxpbmtpZmllcgor ICogQHBhcmFtIHtmdW5jdGlvbihzdHJpbmcsc3RyaW5nLG51bWJlcj0pOk5vZGV9IGxpbmtpZmll cgogICogQHJldHVybiB7RG9jdW1lbnRGcmFnbWVudH0KICAqLwogV2ViSW5zcGVjdG9yLmxpbmtp ZnlTdHJpbmdBc0ZyYWdtZW50V2l0aEN1c3RvbUxpbmtpZmllciA9IGZ1bmN0aW9uKHN0cmluZywg bGlua2lmaWVyKQpAQCAtMjA0LDEwICsyMDQsMTQgQEAgV2ViSW5zcGVjdG9yLmxpbmtpZnlTdHJp bmdBc0ZyYWdtZW50V2l0aEN1c3RvbUxpbmtpZmllciA9IGZ1bmN0aW9uKHN0cmluZywgbGlua2kK ICAgICAgICAgdmFyIHRpdGxlID0gbGlua1N0cmluZzsKICAgICAgICAgdmFyIHJlYWxVUkwgPSAo bGlua1N0cmluZy5zdGFydHNXaXRoKCJ3d3cuIikgPyAiaHR0cDovLyIgKyBsaW5rU3RyaW5nIDog bGlua1N0cmluZyk7CiAgICAgICAgIHZhciBsaW5lQ29sdW1uTWF0Y2ggPSBsaW5lQ29sdW1uUmVn RXguZXhlYyhyZWFsVVJMKTsKLSAgICAgICAgaWYgKGxpbmVDb2x1bW5NYXRjaCkKKyAgICAgICAg dmFyIGxpbmVOdW1iZXI7CisgICAgICAgIGlmIChsaW5lQ29sdW1uTWF0Y2gpIHsKICAgICAgICAg ICAgIHJlYWxVUkwgPSByZWFsVVJMLnN1YnN0cmluZygwLCByZWFsVVJMLmxlbmd0aCAtIGxpbmVD b2x1bW5NYXRjaFswXS5sZW5ndGgpOworICAgICAgICAgICAgbGluZU51bWJlciA9IHBhcnNlSW50 KGxpbmVDb2x1bW5NYXRjaFsxXSwgMTApOworICAgICAgICAgICAgbGluZU51bWJlciA9IGlzTmFO KGxpbmVOdW1iZXIpID8gdW5kZWZpbmVkIDogbGluZU51bWJlcjsKKyAgICAgICAgfQogCi0gICAg ICAgIHZhciBsaW5rTm9kZSA9IGxpbmtpZmllcih0aXRsZSwgcmVhbFVSTCwgbGluZUNvbHVtbk1h dGNoID8gbGluZUNvbHVtbk1hdGNoWzFdIDogdW5kZWZpbmVkKTsKKyAgICAgICAgdmFyIGxpbmtO b2RlID0gbGlua2lmaWVyKHRpdGxlLCByZWFsVVJMLCBsaW5lTnVtYmVyKTsKICAgICAgICAgY29u dGFpbmVyLmFwcGVuZENoaWxkKGxpbmtOb2RlKTsKICAgICAgICAgc3RyaW5nID0gc3RyaW5nLnN1 YnN0cmluZyhsaW5rSW5kZXggKyBsaW5rU3RyaW5nLmxlbmd0aCwgc3RyaW5nLmxlbmd0aCk7CiAg ICAgfQpAQCAtMjM3LDcgKzI0MSw3IEBAIFdlYkluc3BlY3Rvci5saW5raWZ5U3RyaW5nQXNGcmFn bWVudCA9IGZ1bmN0aW9uKHN0cmluZykKICAgICAvKioKICAgICAgKiBAcGFyYW0ge3N0cmluZ30g dGl0bGUKICAgICAgKiBAcGFyYW0ge3N0cmluZ30gdXJsCi0gICAgICogQHBhcmFtIHtzdHJpbmc9 fSBsaW5lTnVtYmVyCisgICAgICogQHBhcmFtIHtudW1iZXI9fSBsaW5lTnVtYmVyCiAgICAgICog QHJldHVybiB7Tm9kZX0KICAgICAgKi8KICAgICBmdW5jdGlvbiBsaW5raWZpZXIodGl0bGUsIHVy bCwgbGluZU51bWJlcikKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91 dFRlc3RzL0NoYW5nZUxvZwppbmRleCA5MjE2MDM1ODNjM2Y1MDdlODIxY2RhMzkyNzM0Nzg0OTdm ZGJhNTQ1Li40NmVmMDBhNGM5Mjg5Mjc2NGRmYzhiYTg0NDc3N2IyMjU0MDE5MDI0IDEwMDY0NAot LS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMTYgQEAKKzIwMTItMDgtMDYgIEpvaG4gSi4gQmFydG9uICA8am9obmpiYXJ0b25A Y2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IFdlYkluc3BlY3Rvci5saW5r aWZ5U3RyaW5nQXNGcmFnbWVudCBnaXZlcyB3cm9uZyB0eXBlb2YgbGluZU51bWJlcgorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTMwMTkKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBwYXJzZUludCB0aGUgUmVn RXhwIG1hdGNoIGZvciBsaW5lTnVtYmVyIAorICAgICAgICBOZXcgdGVzdCBjYXNlIGFkZGVkIHRv IGxpbmtpZnkuaHRtbAorCisgICAgICAgICogaW5zcGVjdG9yL2RlYnVnZ2VyL2xpbmtpZmllci1l eHBlY3RlZC50eHQ6CisgICAgICAgICogaW5zcGVjdG9yL2RlYnVnZ2VyL2xpbmtpZmllci5odG1s OgorCiAyMDEyLTA4LTA2ICBUYWthc2hpIFRveW9zaGltYSAgPHRveW9zaGltQGNocm9taXVtLm9y Zz4KIAogICAgICAgICBVbnJldmlld2VkLCByZWJhc2VsaW5lIGZvciByMTI0NzQ1LgpkaWZmIC0t Z2l0IGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2RlYnVnZ2VyL2xpbmtpZmllci1leHBlY3RlZC50 eHQgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZGVidWdnZXIvbGlua2lmaWVyLWV4cGVjdGVkLnR4 dAppbmRleCBkNjFhOWQxOTQwYzFmNDkxNjlmZGJmMDdjNjllNTFmYTAwNGIwZDY3Li5kZGU0Mzc5 NzVhOGNlOWM2M2QzMjFkNDgwYmE4NzY0NmY4Mzg1NzA4IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0 cy9pbnNwZWN0b3IvZGVidWdnZXIvbGlua2lmaWVyLWV4cGVjdGVkLnR4dAorKysgYi9MYXlvdXRU ZXN0cy9pbnNwZWN0b3IvZGVidWdnZXIvbGlua2lmaWVyLWV4cGVjdGVkLnR4dApAQCAtMSw2ICsx LDggQEAKIFRlc3RzIHRoYXQgTGlua2lmaWVyIHdvcmtzIGNvcnJlY3RseS4KIAogRGVidWdnZXIg d2FzIGVuYWJsZWQuCitUaGUgc3RyaW5nICJhdCB0cmlnZ2VyRXJyb3IgKGh0dHA6Ly9sb2NhbGhv c3Qvc2hvdy86MjI6MTEpICIgbGlua2lmaWVzIHRvIHVybDogaHR0cDovL2xvY2FsaG9zdC9zaG93 LworVGhlIGxpbmVOdW1iZXIgaXMgMjIgd2l0aCB0eXBlIG51bWJlcgogbGlzdGVuZXJzIGFkZGVk IG9uIHJhdyBzb3VyY2UgY29kZTogMQogb3JpZ2luYWwgbG9jYXRpb246IGxpbmtpZmllci5odG1s OjkKIHByZXR0eSBwcmludGVkIGxvY2F0aW9uOiBsaW5raWZpZXIuaHRtbDoxMgpkaWZmIC0tZ2l0 IGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2RlYnVnZ2VyL2xpbmtpZmllci5odG1sIGIvTGF5b3V0 VGVzdHMvaW5zcGVjdG9yL2RlYnVnZ2VyL2xpbmtpZmllci5odG1sCmluZGV4IDMxNDNjMGMyY2M3 ZTAxYmRmMTg4MDYzOGQyMmNkZDM4NTcwNzZhMGQuLjU2YjZjZTNhZGY2NDlhODkwMzNlMjY1ZjU4 Yzc0ZTM3MjEzNDQwMjAgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9kZWJ1Z2dl ci9saW5raWZpZXIuaHRtbAorKysgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZGVidWdnZXIvbGlu a2lmaWVyLmh0bWwKQEAgLTQxLDYgKzQxLDEyIEBAIGZ1bmN0aW9uIHRlc3QoKQogICAgICAgICAg ICAgfQogICAgICAgICB9CiAKKyAgICAgICAgdmFyIGxpbmtpZnlNZSA9ICJhdCB0cmlnZ2VyRXJy b3IgKGh0dHA6Ly9sb2NhbGhvc3Qvc2hvdy86MjI6MTEpIjsKKyAgICAgICAgdmFyIGZyYWdtZW50 ID0gV2ViSW5zcGVjdG9yLmxpbmtpZnlTdHJpbmdBc0ZyYWdtZW50KGxpbmtpZnlNZSk7CisgICAg ICAgIHZhciBhbmNob3IgPSBmcmFnbWVudC5xdWVyeVNlbGVjdG9yKCdhJyk7CisgICAgICAgIElu c3BlY3RvclRlc3QuYWRkUmVzdWx0KCJUaGUgc3RyaW5nIFwiIiArIGxpbmtpZnlNZSArICIgXCIg bGlua2lmaWVzIHRvIHVybDogIiArIGFuY2hvci5ocmVmKTsKKyAgICAgICAgSW5zcGVjdG9yVGVz dC5hZGRSZXN1bHQoIlRoZSBsaW5lTnVtYmVyIGlzICIgKyBhbmNob3IubGluZU51bWJlciArICIg d2l0aCB0eXBlICIgKyAodHlwZW9mIGFuY2hvci5saW5lTnVtYmVyKSk7CisKICAgICAgICAgbGlu a2lmaWVyID0gbmV3IFdlYkluc3BlY3Rvci5MaW5raWZpZXIoKTsKICAgICAgICAgdmFyIGNvdW50 MSA9IGxpdmVMb2NhdGlvbnNDb3VudCgpOwogICAgICAgICBsaW5rID0gbGlua2lmaWVyLmxpbmtp ZnlMb2NhdGlvbihXZWJJbnNwZWN0b3IuaW5zcGVjdGVkUGFnZVVSTCwgOCwgMCwgImR1bW15LWNs YXNzIik7Cg==