87656 2012-05-28 06:26:45 -0700 Web Inspector: Add trace() method to the WorkerConsole 2012-05-30 07:20:27 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 alph alph apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy webkit.review.bot yurys oldest_to_newest 635170 0 alph 2012-05-28 06:26:45 -0700 Add trace() method to the WorkerConsole. 635171 1 144346 alph 2012-05-28 06:30:33 -0700 Created attachment 144346 Patch 635182 2 144346 yurys 2012-05-28 06:49:32 -0700 Comment on attachment 144346 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=144346&action=review > Source/WebCore/inspector/front-end/HeapSnapshotWorker.js:70 > + Error.captureStackTrace(obj, this.trace); Doe this method work in JSC? 635186 3 144346 loislo 2012-05-28 06:54:00 -0700 Comment on attachment 144346 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=144346&action=review > Source/WebCore/inspector/front-end/HeapSnapshotProxy.js:71 > + if (message.method !== "log" && message.method !== "info" && message.method !== "error" && message.method !== "trace") { this line is not required 635233 4 144366 alph 2012-05-28 08:15:55 -0700 Created attachment 144366 Patch 635236 5 144346 alph 2012-05-28 08:17:10 -0700 Comment on attachment 144346 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=144346&action=review >> Source/WebCore/inspector/front-end/HeapSnapshotProxy.js:71 >> + if (message.method !== "log" && message.method !== "info" && message.method !== "error" && message.method !== "trace") { > > this line is not required yes, you're right! killed it. >> Source/WebCore/inspector/front-end/HeapSnapshotWorker.js:70 >> + Error.captureStackTrace(obj, this.trace); > > Doe this method work in JSC? I'm not sure, but I doubt it works. Does it have to? It is never called in JSC. 635243 6 yurys 2012-05-28 08:24:46 -0700 (In reply to comment #5) > >> Source/WebCore/inspector/front-end/HeapSnapshotWorker.js:70 > >> + Error.captureStackTrace(obj, this.trace); > > > > Doe this method work in JSC? > > I'm not sure, but I doubt it works. Does it have to? It is never called in JSC. Heap snapshot front-end should work with both engines even though there is no support for heap profiling on the backend running JSC so please check if JSC supports Error.captureStackTrace and if it doesn't use something more portable, probably new Error().stack 636178 7 144580 alph 2012-05-29 10:20:03 -0700 Created attachment 144580 Patch 636887 8 144580 yurys 2012-05-29 23:08:47 -0700 Comment on attachment 144580 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=144580&action=review Could you please reply to my previous comment to make it clear if JSC supports Error.captureStackTrace > Source/WebCore/inspector/front-end/HeapSnapshotWorker.js:75 > + for (var func = arguments.callee; func; func = func.caller) Why not new Error().stack? 637117 9 144783 alph 2012-05-30 05:07:07 -0700 Created attachment 144783 Patch 637118 10 alph 2012-05-30 05:09:00 -0700 (In reply to comment #8) > (From update of attachment 144580 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=144580&action=review > > Could you please reply to my previous comment to make it clear if JSC supports Error.captureStackTrace Looks like it is not. > > > Source/WebCore/inspector/front-end/HeapSnapshotWorker.js:75 > > + for (var func = arguments.callee; func; func = func.caller) > > Why not new Error().stack? Done it this way. 637190 11 144783 webkit.review.bot 2012-05-30 07:20:22 -0700 Comment on attachment 144783 Patch Clearing flags on attachment: 144783 Committed r118921: <http://trac.webkit.org/changeset/118921> 637191 12 webkit.review.bot 2012-05-30 07:20:27 -0700 All reviewed patches have been landed. Closing bug. 144346 2012-05-28 06:30:33 -0700 2012-05-28 08:17:10 -0700 Patch bug-87656-20120528173031.patch text/plain 3084 alph U3VidmVyc2lvbiBSZXZpc2lvbjogMTE4Njc3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNGViZDUwZDUyNjlmOTll MmU3ZWQ1ODVjZjBjODllYWRlNzU4ZDZmZS4uZDdiZjJjZTk0OTEzM2VkNmMzZDY1OTg5OGY0Njhh ZDQwOWE2ZGI5NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDEyLTA1LTI4ICBBbGV4 ZWkgRmlsaXBwb3YgIDxhbGV4ZWlmQGNocm9taXVtLm9yZz4KKworICAgICAgICBXZWIgSW5zcGVj dG9yOiBBZGQgdHJhY2UoKSBtZXRob2QgdG8gdGhlIFdvcmtlckNvbnNvbGUKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg3NjU2CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5k L0hlYXBTbmFwc2hvdFByb3h5LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkhlYXBTbmFwc2hv dFJlYWxXb3JrZXIucHJvdG90eXBlLl9tZXNzYWdlUmVjZWl2ZWQpOgorICAgICAgICAqIGluc3Bl Y3Rvci9mcm9udC1lbmQvSGVhcFNuYXBzaG90V29ya2VyLmpzOgorICAgICAgICAoV2ViSW5zcGVj dG9yLldvcmtlckNvbnNvbGUucHJvdG90eXBlLnRyYWNlKToKKwogMjAxMi0wNS0yOCAgS2Vpc2hp IEhhdHRvcmkgIDxrZWlzaGlAd2Via2l0Lm9yZz4KIAogICAgICAgICBFeHBvc2UgdmFsdWUgbG9j YWxpemF0aW9uIGZ1bmN0aW9uIG9mIEhUTUxJbnB1dEVsZW1lbnQKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvSGVhcFNuYXBzaG90UHJveHkuanMgYi9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0hlYXBTbmFwc2hvdFByb3h5LmpzCmluZGV4 IDc2NWJhZTRkYWNiNjMzMDc4MmZhMmVlNmZlOWJjMmQyMWEzZjhiZmEuLmQyMjAyYjA2ZDcyYzA5 ZWEwYjhlYjBjOTE0NTA3ZjkzMzViM2RkYzQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvSGVhcFNuYXBzaG90UHJveHkuanMKKysrIGIvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9IZWFwU25hcHNob3RQcm94eS5qcwpAQCAtNjUsMTEgKzY1 LDExIEBAIFdlYkluc3BlY3Rvci5IZWFwU25hcHNob3RSZWFsV29ya2VyLnByb3RvdHlwZSA9IHsK ICAgICAgICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKCJtZXNzYWdlIiwgbWVz c2FnZSk7CiAgICAgICAgIGVsc2UgewogICAgICAgICAgICAgaWYgKG1lc3NhZ2Uub2JqZWN0ICE9 PSAiY29uc29sZSIpIHsKLSAgICAgICAgICAgICAgICBjb25zb2xlLmxvZyhXZWJJbnNwZWN0b3Iu VUlTdHJpbmcoIldvcmtlciBhc2tzIHRvIGNhbGwgYSBtZXRob2QgJyVzJyBvbiB1bnN1cHBvcnRl ZCBvYmplY3QgJyVzJy4iLCBtZXNzYWdlLm1ldGhvZCwgbWVzc2FnZS5vYmplY3QpKTsKKyAgICAg ICAgICAgICAgICBjb25zb2xlLmxvZyhXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIldvcmtlciBhc2tz IHRvIGNhbGwgYSBtZXRob2QgJyVzJyBvbiBhbiB1bnN1cHBvcnRlZCBvYmplY3QgJyVzJy4iLCBt ZXNzYWdlLm1ldGhvZCwgbWVzc2FnZS5vYmplY3QpKTsKICAgICAgICAgICAgICAgICByZXR1cm47 CiAgICAgICAgICAgICB9Ci0gICAgICAgICAgICBpZiAobWVzc2FnZS5tZXRob2QgIT09ICJsb2ci ICYmIG1lc3NhZ2UubWV0aG9kICE9PSAiaW5mbyIgJiYgbWVzc2FnZS5tZXRob2QgIT09ICJlcnJv ciIpIHsKLSAgICAgICAgICAgICAgICBjb25zb2xlLmxvZyhXZWJJbnNwZWN0b3IuVUlTdHJpbmco IldvcmtlciBhc2tzIHRvIGNhbGwgdW5zdXBvcnRlZCBtZXRob2QgJyVzJyBvbiBjb25zb2xlIG9i amVjdC4iLCBtZXNzYWdlLm1ldGhvZCkpOworICAgICAgICAgICAgaWYgKG1lc3NhZ2UubWV0aG9k ICE9PSAibG9nIiAmJiBtZXNzYWdlLm1ldGhvZCAhPT0gImluZm8iICYmIG1lc3NhZ2UubWV0aG9k ICE9PSAiZXJyb3IiICYmIG1lc3NhZ2UubWV0aG9kICE9PSAidHJhY2UiKSB7CisgICAgICAgICAg ICAgICAgY29uc29sZS5sb2coV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJXb3JrZXIgYXNrcyB0byBj YWxsIGFuIHVuc3VwcG9ydGVkIG1ldGhvZCAnJXMnIG9uIHRoZSBjb25zb2xlIG9iamVjdC4iLCBt ZXNzYWdlLm1ldGhvZCkpOwogICAgICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgICAgIH0K ICAgICAgICAgICAgIGNvbnNvbGVbbWVzc2FnZS5tZXRob2RdLmFwcGx5KHdpbmRvd1ttZXNzYWdl Lm9iamVjdF0sIG1lc3NhZ2UuYXJndW1lbnRzKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9mcm9udC1lbmQvSGVhcFNuYXBzaG90V29ya2VyLmpzIGIvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9IZWFwU25hcHNob3RXb3JrZXIuanMKaW5kZXggY2U3NWVh YjJjMmEyZGUwNzUwMzFhYTY3MWNhNzA2NDRjMmU2MmQ2MS4uYjIzODkxZmZiYjVmZTU4NzVjZTU5 YzBjZTQxYWE5NjFiMmIyNWFjNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9IZWFwU25hcHNob3RXb3JrZXIuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9IZWFwU25hcHNob3RXb3JrZXIuanMKQEAgLTY0LDYgKzY0LDEzIEBA IFdlYkluc3BlY3Rvci5Xb3JrZXJDb25zb2xlLnByb3RvdHlwZSA9IHsKICAgICAgICAgdGhpcy5f cG9zdE1lc3NhZ2UoImluZm8iLCBBcnJheS5wcm90b3R5cGUuc2xpY2UuY2FsbChhcmd1bWVudHMp KTsKICAgICB9LAogCisgICAgdHJhY2U6IGZ1bmN0aW9uKCkKKyAgICB7CisgICAgICAgIHZhciBv YmogPSB7fTsKKyAgICAgICAgRXJyb3IuY2FwdHVyZVN0YWNrVHJhY2Uob2JqLCB0aGlzLnRyYWNl KTsKKyAgICAgICAgdGhpcy5sb2cob2JqLnN0YWNrKTsKKyAgICB9LAorCiAgICAgX3Bvc3RNZXNz YWdlOiBmdW5jdGlvbihtZXRob2QsIGFyZ3MpCiAgICAgewogICAgICAgICB2YXIgcmF3TWVzc2Fn ZSA9IHsK 144366 2012-05-28 08:15:55 -0700 2012-05-29 10:19:56 -0700 Patch bug-87656-20120528191553.patch text/plain 2956 alph U3VidmVyc2lvbiBSZXZpc2lvbjogMTE4NjgzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzJmMTM0Yjg3ZGRmMGEy NDE3YTFjNThlOGZhMDNmMmQwNzE5M2I5YS4uY2M0ZjhhNzg4YzEzMWExZTg2OTk1ODMxMTk0N2Nh YTVmNzQ3YjgxMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDEyLTA1LTI4ICBBbGV4 ZWkgRmlsaXBwb3YgIDxhbGV4ZWlmQGNocm9taXVtLm9yZz4KKworICAgICAgICBXZWIgSW5zcGVj dG9yOiBBZGQgdHJhY2UoKSBtZXRob2QgdG8gdGhlIFdvcmtlckNvbnNvbGUKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg3NjU2CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5k L0hlYXBTbmFwc2hvdFByb3h5LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkhlYXBTbmFwc2hv dFJlYWxXb3JrZXIucHJvdG90eXBlLl9tZXNzYWdlUmVjZWl2ZWQpOgorICAgICAgICAqIGluc3Bl Y3Rvci9mcm9udC1lbmQvSGVhcFNuYXBzaG90V29ya2VyLmpzOgorICAgICAgICAoV2ViSW5zcGVj dG9yLldvcmtlckNvbnNvbGUucHJvdG90eXBlLnRyYWNlKToKKwogMjAxMi0wNS0yOCAgQXJ2aWQg Tmlsc3NvbiAgPGFuaWxzc29uQHJpbS5jb20+CiAKICAgICAgICAgW0JsYWNrQmVycnldIEFkZCBh IGNvbnN0cnVjdG9yIHRvIGNyZWF0ZSBhIFBhdGggZnJvbSBhbiBTa1BhdGgKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvSGVhcFNuYXBzaG90UHJveHkuanMg Yi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0hlYXBTbmFwc2hvdFByb3h5Lmpz CmluZGV4IDc2NWJhZTRkYWNiNjMzMDc4MmZhMmVlNmZlOWJjMmQyMWEzZjhiZmEuLmYxYzhiNjc2 NjQzZDJlMmE1NmI2ZTIxNDdmODRiNmE3NjIwMzc4NTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9mcm9udC1lbmQvSGVhcFNuYXBzaG90UHJveHkuanMKKysrIGIvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9IZWFwU25hcHNob3RQcm94eS5qcwpAQCAtNjUs MTEgKzY1LDExIEBAIFdlYkluc3BlY3Rvci5IZWFwU25hcHNob3RSZWFsV29ya2VyLnByb3RvdHlw ZSA9IHsKICAgICAgICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKCJtZXNzYWdl IiwgbWVzc2FnZSk7CiAgICAgICAgIGVsc2UgewogICAgICAgICAgICAgaWYgKG1lc3NhZ2Uub2Jq ZWN0ICE9PSAiY29uc29sZSIpIHsKLSAgICAgICAgICAgICAgICBjb25zb2xlLmxvZyhXZWJJbnNw ZWN0b3IuVUlTdHJpbmcoIldvcmtlciBhc2tzIHRvIGNhbGwgYSBtZXRob2QgJyVzJyBvbiB1bnN1 cHBvcnRlZCBvYmplY3QgJyVzJy4iLCBtZXNzYWdlLm1ldGhvZCwgbWVzc2FnZS5vYmplY3QpKTsK KyAgICAgICAgICAgICAgICBjb25zb2xlLmxvZyhXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIldvcmtl ciBhc2tzIHRvIGNhbGwgYSBtZXRob2QgJyVzJyBvbiBhbiB1bnN1cHBvcnRlZCBvYmplY3QgJyVz Jy4iLCBtZXNzYWdlLm1ldGhvZCwgbWVzc2FnZS5vYmplY3QpKTsKICAgICAgICAgICAgICAgICBy ZXR1cm47CiAgICAgICAgICAgICB9CiAgICAgICAgICAgICBpZiAobWVzc2FnZS5tZXRob2QgIT09 ICJsb2ciICYmIG1lc3NhZ2UubWV0aG9kICE9PSAiaW5mbyIgJiYgbWVzc2FnZS5tZXRob2QgIT09 ICJlcnJvciIpIHsKLSAgICAgICAgICAgICAgICBjb25zb2xlLmxvZyhXZWJJbnNwZWN0b3IuVUlT dHJpbmcoIldvcmtlciBhc2tzIHRvIGNhbGwgdW5zdXBvcnRlZCBtZXRob2QgJyVzJyBvbiBjb25z b2xlIG9iamVjdC4iLCBtZXNzYWdlLm1ldGhvZCkpOworICAgICAgICAgICAgICAgIGNvbnNvbGUu bG9nKFdlYkluc3BlY3Rvci5VSVN0cmluZygiV29ya2VyIGFza3MgdG8gY2FsbCBhbiB1bnN1cHBv cnRlZCBtZXRob2QgJyVzJyBvbiB0aGUgY29uc29sZSBvYmplY3QuIiwgbWVzc2FnZS5tZXRob2Qp KTsKICAgICAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgICAgICB9CiAgICAgICAgICAgICBj b25zb2xlW21lc3NhZ2UubWV0aG9kXS5hcHBseSh3aW5kb3dbbWVzc2FnZS5vYmplY3RdLCBtZXNz YWdlLmFyZ3VtZW50cyk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL0hlYXBTbmFwc2hvdFdvcmtlci5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvSGVhcFNuYXBzaG90V29ya2VyLmpzCmluZGV4IGNlNzVlYWIyYzJhMmRlMDc1MDMx YWE2NzFjYTcwNjQ0YzJlNjJkNjEuLmIyMzg5MWZmYmI1ZmU1ODc1Y2U1OWMwY2U0MWFhOTYxYjJi MjVhYzQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvSGVh cFNuYXBzaG90V29ya2VyLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvSGVhcFNuYXBzaG90V29ya2VyLmpzCkBAIC02NCw2ICs2NCwxMyBAQCBXZWJJbnNwZWN0b3Iu V29ya2VyQ29uc29sZS5wcm90b3R5cGUgPSB7CiAgICAgICAgIHRoaXMuX3Bvc3RNZXNzYWdlKCJp bmZvIiwgQXJyYXkucHJvdG90eXBlLnNsaWNlLmNhbGwoYXJndW1lbnRzKSk7CiAgICAgfSwKIAor ICAgIHRyYWNlOiBmdW5jdGlvbigpCisgICAgeworICAgICAgICB2YXIgb2JqID0ge307CisgICAg ICAgIEVycm9yLmNhcHR1cmVTdGFja1RyYWNlKG9iaiwgdGhpcy50cmFjZSk7CisgICAgICAgIHRo aXMubG9nKG9iai5zdGFjayk7CisgICAgfSwKKwogICAgIF9wb3N0TWVzc2FnZTogZnVuY3Rpb24o bWV0aG9kLCBhcmdzKQogICAgIHsKICAgICAgICAgdmFyIHJhd01lc3NhZ2UgPSB7Cg== 144580 2012-05-29 10:20:03 -0700 2012-05-30 05:07:00 -0700 Patch bug-87656-20120529212001.patch text/plain 3270 alph U3VidmVyc2lvbiBSZXZpc2lvbjogMTE4Nzk4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOWYxZTZhNWNlM2FhM2Mz ZTcxOWVlZDExZmRlNzU0MGI1YmE4YTU3NC4uN2M1NmNkZGUwMjJjMDQxZWY1M2E0MTBiZGI4Njdl Y2FjNGY4MzFiZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDEyLTA1LTI4ICBBbGV4 ZWkgRmlsaXBwb3YgIDxhbGV4ZWlmQGNocm9taXVtLm9yZz4KKworICAgICAgICBXZWIgSW5zcGVj dG9yOiBBZGQgdHJhY2UoKSBtZXRob2QgdG8gdGhlIFdvcmtlckNvbnNvbGUKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg3NjU2CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5k L0hlYXBTbmFwc2hvdFByb3h5LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkhlYXBTbmFwc2hv dFJlYWxXb3JrZXIucHJvdG90eXBlLl9tZXNzYWdlUmVjZWl2ZWQpOgorICAgICAgICAqIGluc3Bl Y3Rvci9mcm9udC1lbmQvSGVhcFNuYXBzaG90V29ya2VyLmpzOgorICAgICAgICAoV2ViSW5zcGVj dG9yLldvcmtlckNvbnNvbGUucHJvdG90eXBlLnRyYWNlKToKKwogMjAxMi0wNS0yOSAgQWxleGV5 IFByb3NrdXJ5YWtvdiAgPGFwQGFwcGxlLmNvbT4KIAogICAgICAgICBbTWFjXSBNb3ZlIERlZmF1 bHRGb250cy5wbGlzdCB0byBDKysgY29kZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9IZWFwU25hcHNob3RQcm94eS5qcyBiL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvSGVhcFNuYXBzaG90UHJveHkuanMKaW5kZXggOTdhMzM3NTU3YWQ2 ODZhOTg0ZjMxOWExZjAzYzMxOGE2MmNiMTJkOC4uMTI3N2RhNTZiZWIyMjZkZGIyMjg5NWMyMGNh ODRkMGQ2ZWRlM2ViMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9IZWFwU25hcHNob3RQcm94eS5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL0hlYXBTbmFwc2hvdFByb3h5LmpzCkBAIC02NSwxMSArNjUsMTEgQEAgV2ViSW5z cGVjdG9yLkhlYXBTbmFwc2hvdFJlYWxXb3JrZXIucHJvdG90eXBlID0gewogICAgICAgICAgICAg dGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoIm1lc3NhZ2UiLCBtZXNzYWdlKTsKICAgICAg ICAgZWxzZSB7CiAgICAgICAgICAgICBpZiAobWVzc2FnZS5vYmplY3QgIT09ICJjb25zb2xlIikg ewotICAgICAgICAgICAgICAgIGNvbnNvbGUubG9nKFdlYkluc3BlY3Rvci5VSVN0cmluZygiV29y a2VyIGFza3MgdG8gY2FsbCBhIG1ldGhvZCAnJXMnIG9uIHVuc3VwcG9ydGVkIG9iamVjdCAnJXMn LiIsIG1lc3NhZ2UubWV0aG9kLCBtZXNzYWdlLm9iamVjdCkpOworICAgICAgICAgICAgICAgIGNv bnNvbGUubG9nKFdlYkluc3BlY3Rvci5VSVN0cmluZygiV29ya2VyIGFza3MgdG8gY2FsbCBhIG1l dGhvZCAnJXMnIG9uIGFuIHVuc3VwcG9ydGVkIG9iamVjdCAnJXMnLiIsIG1lc3NhZ2UubWV0aG9k LCBtZXNzYWdlLm9iamVjdCkpOwogICAgICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgICAg IH0KICAgICAgICAgICAgIGlmIChtZXNzYWdlLm1ldGhvZCAhPT0gImxvZyIgJiYgbWVzc2FnZS5t ZXRob2QgIT09ICJpbmZvIiAmJiBtZXNzYWdlLm1ldGhvZCAhPT0gImVycm9yIikgewotICAgICAg ICAgICAgICAgIGNvbnNvbGUubG9nKFdlYkluc3BlY3Rvci5VSVN0cmluZygiV29ya2VyIGFza3Mg dG8gY2FsbCB1bnN1cG9ydGVkIG1ldGhvZCAnJXMnIG9uIGNvbnNvbGUgb2JqZWN0LiIsIG1lc3Nh Z2UubWV0aG9kKSk7CisgICAgICAgICAgICAgICAgY29uc29sZS5sb2coV2ViSW5zcGVjdG9yLlVJ U3RyaW5nKCJXb3JrZXIgYXNrcyB0byBjYWxsIGFuIHVuc3VwcG9ydGVkIG1ldGhvZCAnJXMnIG9u IHRoZSBjb25zb2xlIG9iamVjdC4iLCBtZXNzYWdlLm1ldGhvZCkpOwogICAgICAgICAgICAgICAg IHJldHVybjsKICAgICAgICAgICAgIH0KICAgICAgICAgICAgIGNvbnNvbGVbbWVzc2FnZS5tZXRo b2RdLmFwcGx5KHdpbmRvd1ttZXNzYWdlLm9iamVjdF0sIG1lc3NhZ2UuYXJndW1lbnRzKTsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvSGVhcFNuYXBzaG90 V29ya2VyLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9IZWFwU25hcHNo b3RXb3JrZXIuanMKaW5kZXggY2U3NWVhYjJjMmEyZGUwNzUwMzFhYTY3MWNhNzA2NDRjMmU2MmQ2 MS4uNjc4ZGNiNmY4YTE5NWJmNzdlN2ZjZDYzYjNjOTY4N2E1MmFkOWI3MyAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9IZWFwU25hcHNob3RXb3JrZXIuanMK KysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9IZWFwU25hcHNob3RXb3Jr ZXIuanMKQEAgLTY0LDYgKzY0LDE5IEBAIFdlYkluc3BlY3Rvci5Xb3JrZXJDb25zb2xlLnByb3Rv dHlwZSA9IHsKICAgICAgICAgdGhpcy5fcG9zdE1lc3NhZ2UoImluZm8iLCBBcnJheS5wcm90b3R5 cGUuc2xpY2UuY2FsbChhcmd1bWVudHMpKTsKICAgICB9LAogCisgICAgdHJhY2U6IGZ1bmN0aW9u KCkKKyAgICB7CisgICAgICAgIGlmICh0eXBlb2YgRXJyb3IuY2FwdHVyZVN0YWNrVHJhY2UgPT09 ICJmdW5jdGlvbiIpIHsKKyAgICAgICAgICAgIHZhciBvYmogPSB7fTsKKyAgICAgICAgICAgIEVy cm9yLmNhcHR1cmVTdGFja1RyYWNlKG9iaiwgdGhpcy50cmFjZSk7CisgICAgICAgICAgICB0aGlz LmxvZyhvYmouc3RhY2spOworICAgICAgICB9IGVsc2UgeworICAgICAgICAgICAgdGhpcy5sb2co IlN0YWNrIHRyYWNlOiIpOworICAgICAgICAgICAgZm9yICh2YXIgZnVuYyA9IGFyZ3VtZW50cy5j YWxsZWU7IGZ1bmM7IGZ1bmMgPSBmdW5jLmNhbGxlcikKKyAgICAgICAgICAgICAgICB0aGlzLmxv ZygiICBhdCAiICsgZnVuYy5uYW1lICsgIigiICsgQXJyYXkucHJvdG90eXBlLnNsaWNlLmNhbGwo ZnVuYy5hcmd1bWVudHMsIDApLmpvaW4oIiwiKSArICIpIik7CisgICAgICAgIH0KKyAgICB9LAor CiAgICAgX3Bvc3RNZXNzYWdlOiBmdW5jdGlvbihtZXRob2QsIGFyZ3MpCiAgICAgewogICAgICAg ICB2YXIgcmF3TWVzc2FnZSA9IHsK 144783 2012-05-30 05:07:07 -0700 2012-05-30 07:20:22 -0700 Patch bug-87656-20120530160705.patch text/plain 2875 alph U3VidmVyc2lvbiBSZXZpc2lvbjogMTE4OTEyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMGQ0YTdiODlmNGQzZTQx YjY0ZjViYzU1ZDk0MTBjNzQ1OGRjOTgzYS4uNzA0ZDUwNWU4MTA0NTc5Yjg4OTFhMjg5OGQ2NWM0 ZDZiYzFjN2RkOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDEyLTA1LTI4ICBBbGV4 ZWkgRmlsaXBwb3YgIDxhbGV4ZWlmQGNocm9taXVtLm9yZz4KKworICAgICAgICBXZWIgSW5zcGVj dG9yOiBBZGQgdHJhY2UoKSBtZXRob2QgdG8gdGhlIFdvcmtlckNvbnNvbGUKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg3NjU2CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5k L0hlYXBTbmFwc2hvdFByb3h5LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkhlYXBTbmFwc2hv dFJlYWxXb3JrZXIucHJvdG90eXBlLl9tZXNzYWdlUmVjZWl2ZWQpOgorICAgICAgICAqIGluc3Bl Y3Rvci9mcm9udC1lbmQvSGVhcFNuYXBzaG90V29ya2VyLmpzOgorICAgICAgICAoV2ViSW5zcGVj dG9yLldvcmtlckNvbnNvbGUucHJvdG90eXBlLnRyYWNlKToKKwogMjAxMi0wNS0zMCAgRXVnZW5l IEtseXVjaG5pa292ICA8ZXVzdGFzLmJ1Z0BnbWFpbC5jb20+CiAKICAgICAgICAgV2ViIEluc3Bl Y3RvcjogRml4IEpTIGNvbXBpbGVyIHdhcm5pbmcKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9mcm9udC1lbmQvSGVhcFNuYXBzaG90UHJveHkuanMgYi9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0hlYXBTbmFwc2hvdFByb3h5LmpzCmluZGV4IDk3YTMzNzU1 N2FkNjg2YTk4NGYzMTlhMWYwM2MzMThhNjJjYjEyZDguLjEyNzdkYTU2YmViMjI2ZGRiMjI4OTVj MjBjYTg0ZDBkNmVkZTNlYjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvSGVhcFNuYXBzaG90UHJveHkuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9IZWFwU25hcHNob3RQcm94eS5qcwpAQCAtNjUsMTEgKzY1LDExIEBAIFdl Ykluc3BlY3Rvci5IZWFwU25hcHNob3RSZWFsV29ya2VyLnByb3RvdHlwZSA9IHsKICAgICAgICAg ICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKCJtZXNzYWdlIiwgbWVzc2FnZSk7CiAg ICAgICAgIGVsc2UgewogICAgICAgICAgICAgaWYgKG1lc3NhZ2Uub2JqZWN0ICE9PSAiY29uc29s ZSIpIHsKLSAgICAgICAgICAgICAgICBjb25zb2xlLmxvZyhXZWJJbnNwZWN0b3IuVUlTdHJpbmco IldvcmtlciBhc2tzIHRvIGNhbGwgYSBtZXRob2QgJyVzJyBvbiB1bnN1cHBvcnRlZCBvYmplY3Qg JyVzJy4iLCBtZXNzYWdlLm1ldGhvZCwgbWVzc2FnZS5vYmplY3QpKTsKKyAgICAgICAgICAgICAg ICBjb25zb2xlLmxvZyhXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIldvcmtlciBhc2tzIHRvIGNhbGwg YSBtZXRob2QgJyVzJyBvbiBhbiB1bnN1cHBvcnRlZCBvYmplY3QgJyVzJy4iLCBtZXNzYWdlLm1l dGhvZCwgbWVzc2FnZS5vYmplY3QpKTsKICAgICAgICAgICAgICAgICByZXR1cm47CiAgICAgICAg ICAgICB9CiAgICAgICAgICAgICBpZiAobWVzc2FnZS5tZXRob2QgIT09ICJsb2ciICYmIG1lc3Nh Z2UubWV0aG9kICE9PSAiaW5mbyIgJiYgbWVzc2FnZS5tZXRob2QgIT09ICJlcnJvciIpIHsKLSAg ICAgICAgICAgICAgICBjb25zb2xlLmxvZyhXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIldvcmtlciBh c2tzIHRvIGNhbGwgdW5zdXBvcnRlZCBtZXRob2QgJyVzJyBvbiBjb25zb2xlIG9iamVjdC4iLCBt ZXNzYWdlLm1ldGhvZCkpOworICAgICAgICAgICAgICAgIGNvbnNvbGUubG9nKFdlYkluc3BlY3Rv ci5VSVN0cmluZygiV29ya2VyIGFza3MgdG8gY2FsbCBhbiB1bnN1cHBvcnRlZCBtZXRob2QgJyVz JyBvbiB0aGUgY29uc29sZSBvYmplY3QuIiwgbWVzc2FnZS5tZXRob2QpKTsKICAgICAgICAgICAg ICAgICByZXR1cm47CiAgICAgICAgICAgICB9CiAgICAgICAgICAgICBjb25zb2xlW21lc3NhZ2Uu bWV0aG9kXS5hcHBseSh3aW5kb3dbbWVzc2FnZS5vYmplY3RdLCBtZXNzYWdlLmFyZ3VtZW50cyk7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0hlYXBTbmFw c2hvdFdvcmtlci5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvSGVhcFNu YXBzaG90V29ya2VyLmpzCmluZGV4IGNlNzVlYWIyYzJhMmRlMDc1MDMxYWE2NzFjYTcwNjQ0YzJl NjJkNjEuLmNjZGI1YzM5YjJmZjUxY2NmNWI2M2YxODZmZjk3ZTJhYzc2NTQ4MjIgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvSGVhcFNuYXBzaG90V29ya2Vy LmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvSGVhcFNuYXBzaG90 V29ya2VyLmpzCkBAIC02NCw2ICs2NCwxMSBAQCBXZWJJbnNwZWN0b3IuV29ya2VyQ29uc29sZS5w cm90b3R5cGUgPSB7CiAgICAgICAgIHRoaXMuX3Bvc3RNZXNzYWdlKCJpbmZvIiwgQXJyYXkucHJv dG90eXBlLnNsaWNlLmNhbGwoYXJndW1lbnRzKSk7CiAgICAgfSwKIAorICAgIHRyYWNlOiBmdW5j dGlvbigpCisgICAgeworICAgICAgICB0aGlzLmxvZyhuZXcgRXJyb3IoKS5zdGFjayk7CisgICAg fSwKKwogICAgIF9wb3N0TWVzc2FnZTogZnVuY3Rpb24obWV0aG9kLCBhcmdzKQogICAgIHsKICAg ICAgICAgdmFyIHJhd01lc3NhZ2UgPSB7Cg==