113507 2013-03-28 08:25:07 -0700 Web Inspector: add memory instrumentation for StringBuffer 2013-04-01 02:39:54 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 yurys yurys apavlov benjamin buildbot cc-bugs cmarcelo jamesr keishi loislo ojan.autocc pfeldman pmuellr rniwa vsevik web-inspector-bugs webkit.review.bot yurys oldest_to_newest 865526 0 yurys 2013-03-28 08:25:07 -0700 We see quite big blocks allocated by StringBuffer, they should be instrumented. 865530 1 195572 yurys 2013-03-28 08:27:10 -0700 Created attachment 195572 Patch 865550 2 195572 loislo 2013-03-28 08:55:39 -0700 Comment on attachment 195572 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=195572&action=review > Source/WTF/wtf/MemoryInstrumentationString.h:77 > + MemoryClassInfo info(memoryObjectInfo, stringBuffer->characters(), 0, sizeof(CharType) * stringBuffer->length()); You have to report the address of stringBuffer and report characters() as the member. if it is a part of memory chunk of stringBuilder then you need to calculate the size for stringBuilder explicitly. See the instrumentation for String. 865556 3 195572 buildbot 2013-03-28 09:02:39 -0700 Comment on attachment 195572 Patch Attachment 195572 did not pass mac-wk2-ews (mac-wk2): Output: http://webkit-commit-queue.appspot.com/results/17358068 866101 4 195730 yurys 2013-03-29 05:47:06 -0700 Created attachment 195730 Patch 866102 5 yurys 2013-03-29 05:47:42 -0700 (In reply to comment #2) > (From update of attachment 195572 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=195572&action=review > > > Source/WTF/wtf/MemoryInstrumentationString.h:77 > > + MemoryClassInfo info(memoryObjectInfo, stringBuffer->characters(), 0, sizeof(CharType) * stringBuffer->length()); > > You have to report the address of stringBuffer and report characters() as the member. > if it is a part of memory chunk of stringBuilder then you need to calculate the size for stringBuilder explicitly. > See the instrumentation for String. You're right. Fixed. 866122 6 195730 loislo 2013-03-29 06:26:48 -0700 Comment on attachment 195730 Patch please extract libjpeg change into a separate patch 866132 7 195738 yurys 2013-03-29 06:52:43 -0700 Created attachment 195738 Patch 866134 8 195738 loislo 2013-03-29 06:54:04 -0700 Comment on attachment 195738 Patch LGTM 867000 9 195738 webkit.review.bot 2013-04-01 02:39:49 -0700 Comment on attachment 195738 Patch Clearing flags on attachment: 195738 Committed r147313: <http://trac.webkit.org/changeset/147313> 867001 10 webkit.review.bot 2013-04-01 02:39:54 -0700 All reviewed patches have been landed. Closing bug. 195572 2013-03-28 08:27:10 -0700 2013-03-29 05:47:02 -0700 Patch bug-113507-20130328192706.patch text/plain 4882 yurys U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ3MDczCmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IGQ4YTE2YThlZGI3NTIyNjRjOWNiZWVh MDIzZjQ1MTUzMDA0YzM5NTcuLjYzZTNlMDI3YTBmZDU4NmFmZTk5MTZhNDVkMGFmYWZjZWM4NDU1 OWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTMtMDMtMjggIFl1cnkgU2VtaWtoYXRza3kgIDx5 dXJ5c0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogYWRkIG1lbW9yeSBp bnN0cnVtZW50YXRpb24gZm9yIFN0cmluZ0J1ZmZlcgorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTEzNTA3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkZWQgbWVtb3J5IGluc3RydW1lbnRhdGlvbiBmb3Ig U3RyaW5nQnVmZmVyLgorCisgICAgICAgICogd3RmL01lbW9yeUluc3RydW1lbnRhdGlvblN0cmlu Zy5oOgorICAgICAgICAoV1RGKToKKyAgICAgICAgKFdURjo6cmVwb3J0TWVtb3J5VXNhZ2UpOgor CiAyMDEzLTAzLTI3ICBQYXRyaWNrIEdhbnN0ZXJlciAgPHBhcm9nYUB3ZWJraXQub3JnPgogCiAg ICAgICAgIFNldCBXVEZfQVJNX0FSQ0hfVkVSU0lPTiB0byBjb3JyZWN0IHZhbHVlIHdoZW4gdXNl ZCB3aXRoIE1TVkMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA2YTZhZmU4ZmMxMzg2OGM3NzZhNWY3YjE2NWUyNmM3 ZjM2NzE5OTNhLi5kMTFhYjc3MzZhMjhiMTlkZTBiZmVkMjM0NmYwODhkZjUzMTc3N2FlIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTMtMDMtMjggIFl1cnkgU2VtaWtoYXRza3kgIDx5 dXJ5c0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogYWRkIG1lbW9yeSBp bnN0cnVtZW50YXRpb24gZm9yIFN0cmluZ0J1ZmZlcgorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTEzNTA3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkZWQgbWVtb3J5IGluc3RydW1lbnRhdGlvbiBmb3Ig SlBFR0ltYWdlRGVjb2Rlci4KKworICAgICAgICAqIHBsYXRmb3JtL2ltYWdlLWRlY29kZXJzL2pw ZWcvSlBFR0ltYWdlRGVjb2Rlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpKUEVHSW1hZ2VSZWFk ZXI6OnJlcG9ydE1lbW9yeVVzYWdlKToKKyAgICAgICAgKEpQRUdJbWFnZVJlYWRlcik6CisgICAg ICAgIChXZWJDb3JlOjpKUEVHSW1hZ2VEZWNvZGVyOjpyZXBvcnRNZW1vcnlVc2FnZSk6CisgICAg ICAgIChXZWJDb3JlKToKKyAgICAgICAgKiBwbGF0Zm9ybS9pbWFnZS1kZWNvZGVycy9qcGVnL0pQ RUdJbWFnZURlY29kZXIuaDoKKyAgICAgICAgKEpQRUdJbWFnZURlY29kZXIpOgorCiAyMDEzLTAz LTI3ICBLZWlzaGkgSGF0dG9yaSAgPGtlaXNoaUB3ZWJraXQub3JnPgogCiAgICAgICAgIERyYWdn aW5nIHRvIGVkZ2Ugc2hvdWxkIGFsd2F5cyBzbmFwIHRvIG1pbi9tYXguCmRpZmYgLS1naXQgYS9T b3VyY2UvV1RGL3d0Zi9NZW1vcnlJbnN0cnVtZW50YXRpb25TdHJpbmcuaCBiL1NvdXJjZS9XVEYv d3RmL01lbW9yeUluc3RydW1lbnRhdGlvblN0cmluZy5oCmluZGV4IDFhMjkyN2VlOWZkZWJkZDkz OThkZTY0OGNhODRlN2NhMzYyMGJlOGMuLmUwOWY4MGE2NjY3ZjUxMGUwODYwMzUzOGJmNzk0YTg0 NjYyZGMwMjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvd3RmL01lbW9yeUluc3RydW1lbnRhdGlv blN0cmluZy5oCisrKyBiL1NvdXJjZS9XVEYvd3RmL01lbW9yeUluc3RydW1lbnRhdGlvblN0cmlu Zy5oCkBAIC03MCw2ICs3MCwxMyBAQCBpbmxpbmUgdm9pZCByZXBvcnRNZW1vcnlVc2FnZShjb25z dCBTdHJpbmcqIHN0cmluZywgTWVtb3J5T2JqZWN0SW5mbyogbWVtb3J5T2JqZQogICAgIGluZm8u YWRkTWVtYmVyKHN0cmluZy0+aW1wbCgpLCAic3RyaW5nSW1wbCIsIFJldGFpbmluZ1BvaW50ZXIp OwogfQogCit0ZW1wbGF0ZSA8dHlwZW5hbWUgQ2hhclR5cGU+IGNsYXNzIFN0cmluZ0J1ZmZlcjsK K3RlbXBsYXRlIDx0eXBlbmFtZSBDaGFyVHlwZT4KK2lubGluZSB2b2lkIHJlcG9ydE1lbW9yeVVz YWdlKGNvbnN0IFN0cmluZ0J1ZmZlcjxDaGFyVHlwZT4qIHN0cmluZ0J1ZmZlciwgTWVtb3J5T2Jq ZWN0SW5mbyogbWVtb3J5T2JqZWN0SW5mbykKK3sKKyAgICBNZW1vcnlDbGFzc0luZm8gaW5mbyht ZW1vcnlPYmplY3RJbmZvLCBzdHJpbmdCdWZmZXItPmNoYXJhY3RlcnMoKSwgMCwgc2l6ZW9mKENo YXJUeXBlKSAqIHN0cmluZ0J1ZmZlci0+bGVuZ3RoKCkpOworfQorCiBpbmxpbmUgdm9pZCByZXBv cnRNZW1vcnlVc2FnZShjb25zdCBBdG9taWNTdHJpbmcqIGF0b21pY1N0cmluZywgTWVtb3J5T2Jq ZWN0SW5mbyogbWVtb3J5T2JqZWN0SW5mbykKIHsKICAgICBNZW1vcnlDbGFzc0luZm8gaW5mbyht ZW1vcnlPYmplY3RJbmZvLCBhdG9taWNTdHJpbmcpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vaW1hZ2UtZGVjb2RlcnMvanBlZy9KUEVHSW1hZ2VEZWNvZGVyLmNwcCBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2ltYWdlLWRlY29kZXJzL2pwZWcvSlBFR0ltYWdlRGVjb2Rl ci5jcHAKaW5kZXggYTk3NzJmYzA4ZDk3OGNiMDI2YWI3ODhmMTRmZDM1MmQzZTA0ZDVkYy4uYTM3 NjUzYWRiNGQ2MzA4YjAzZGQzM2FmYjZmYWI0NmUzNWIwMWI4MSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vaW1hZ2UtZGVjb2RlcnMvanBlZy9KUEVHSW1hZ2VEZWNvZGVyLmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pbWFnZS1kZWNvZGVycy9qcGVnL0pQRUdJ bWFnZURlY29kZXIuY3BwCkBAIC00MCw2ICs0MCw3IEBACiAjaW5jbHVkZSAiY29uZmlnLmgiCiAj aW5jbHVkZSAiSlBFR0ltYWdlRGVjb2Rlci5oIgogI2luY2x1ZGUgIlBsYXRmb3JtSW5zdHJ1bWVu dGF0aW9uLmgiCisjaW5jbHVkZSAiUGxhdGZvcm1NZW1vcnlJbnN0cnVtZW50YXRpb24uaCIKICNp bmNsdWRlIDx3dGYvUGFzc093blB0ci5oPgogCiBleHRlcm4gIkMiIHsKQEAgLTU0MSw2ICs1NDIs MTIgQEAgcHVibGljOgogICAgIH0KICNlbmRpZgogCisgICAgdm9pZCByZXBvcnRNZW1vcnlVc2Fn ZShNZW1vcnlPYmplY3RJbmZvKiBtZW1vcnlPYmplY3RJbmZvKSBjb25zdAorICAgIHsKKyAgICAg ICAgTWVtb3J5Q2xhc3NJbmZvIGluZm8obWVtb3J5T2JqZWN0SW5mbywgdGhpcywgUGxhdGZvcm1N ZW1vcnlUeXBlczo6SW1hZ2UpOworICAgICAgICBpbmZvLmFkZFJhd0J1ZmZlcihtX2luZm8uY29t cF9pbmZvLCBtX2luZm8ubnVtX2NvbXBvbmVudHMgKiBzaXplb2YoanBlZ19jb21wb25lbnRfaW5m byksICJqcGVnX2NvbXBvbmVudF9pbmZvW10iLCAiY29tcF9pbmZvIik7CisgICAgfQorCiBwcml2 YXRlOgogICAgIEpQRUdJbWFnZURlY29kZXIqIG1fZGVjb2RlcjsKICAgICB1bnNpZ25lZCBtX2J1 ZmZlckxlbmd0aDsKQEAgLTc4OSw0ICs3OTYsMTEgQEAgdm9pZCBKUEVHSW1hZ2VEZWNvZGVyOjpk ZWNvZGUoYm9vbCBvbmx5U2l6ZSkKICAgICAgICAgbV9yZWFkZXIuY2xlYXIoKTsKIH0KIAordm9p ZCBKUEVHSW1hZ2VEZWNvZGVyOjpyZXBvcnRNZW1vcnlVc2FnZShNZW1vcnlPYmplY3RJbmZvKiBt ZW1vcnlPYmplY3RJbmZvKSBjb25zdAoreworICAgIE1lbW9yeUNsYXNzSW5mbyBpbmZvKG1lbW9y eU9iamVjdEluZm8sIHRoaXMsIFBsYXRmb3JtTWVtb3J5VHlwZXM6OkltYWdlKTsKKyAgICBJbWFn ZURlY29kZXI6OnJlcG9ydE1lbW9yeVVzYWdlKG1lbW9yeU9iamVjdEluZm8pOworICAgIGluZm8u YWRkTWVtYmVyKG1fcmVhZGVyLCAicmVhZGVyIik7Cit9CisKIH0KZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2ltYWdlLWRlY29kZXJzL2pwZWcvSlBFR0ltYWdlRGVjb2Rlci5o IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW1hZ2UtZGVjb2RlcnMvanBlZy9KUEVHSW1hZ2VE ZWNvZGVyLmgKaW5kZXggYjFmNjFhMTRkOWE1ZWQzOWMxZTAyNmI2NmYzOTY4MWRlMWM5NjA0Yi4u NjY0NjkwNTQzMmIzZGUyZjY5NGYxN2VkMGJjNTlmN2MwOTdkYjNjNSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW1hZ2UtZGVjb2RlcnMvanBlZy9KUEVHSW1hZ2VEZWNvZGVy LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW1hZ2UtZGVjb2RlcnMvanBlZy9KUEVH SW1hZ2VEZWNvZGVyLmgKQEAgLTc2LDYgKzc2LDggQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAg ICAgICB2b2lkIHNldENvbG9yUHJvZmlsZShjb25zdCBDb2xvclByb2ZpbGUmIGNvbG9yUHJvZmls ZSkgeyBtX2NvbG9yUHJvZmlsZSA9IGNvbG9yUHJvZmlsZTsgfQogICAgICAgICB2b2lkIHNldE9y aWVudGF0aW9uKEltYWdlT3JpZW50YXRpb24gb3JpZW50YXRpb24pIHsgbV9vcmllbnRhdGlvbiA9 IG9yaWVudGF0aW9uOyB9CiAKKyAgICAgICAgdmlydHVhbCB2b2lkIHJlcG9ydE1lbW9yeVVzYWdl KE1lbW9yeU9iamVjdEluZm8qKSBjb25zdCBPVkVSUklERTsKKwogICAgIHByaXZhdGU6CiAgICAg ICAgIC8vIERlY29kZXMgdGhlIGltYWdlLiAgSWYgfG9ubHlTaXplfCBpcyB0cnVlLCBzdG9wcyBk ZWNvZGluZyBhZnRlcgogICAgICAgICAvLyBjYWxjdWxhdGluZyB0aGUgaW1hZ2Ugc2l6ZS4gIElm IGRlY29kaW5nIGZhaWxzIGJ1dCB0aGVyZSBpcyBubyBtb3JlCg== 195730 2013-03-29 05:47:06 -0700 2013-03-29 06:52:38 -0700 Patch bug-113507-20130329164702.patch text/plain 7404 yurys U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ3MDczCmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IGQ4YTE2YThlZGI3NTIyNjRjOWNiZWVh MDIzZjQ1MTUzMDA0YzM5NTcuLjYzZTNlMDI3YTBmZDU4NmFmZTk5MTZhNDVkMGFmYWZjZWM4NDU1 OWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTMtMDMtMjggIFl1cnkgU2VtaWtoYXRza3kgIDx5 dXJ5c0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogYWRkIG1lbW9yeSBp bnN0cnVtZW50YXRpb24gZm9yIFN0cmluZ0J1ZmZlcgorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTEzNTA3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkZWQgbWVtb3J5IGluc3RydW1lbnRhdGlvbiBmb3Ig U3RyaW5nQnVmZmVyLgorCisgICAgICAgICogd3RmL01lbW9yeUluc3RydW1lbnRhdGlvblN0cmlu Zy5oOgorICAgICAgICAoV1RGKToKKyAgICAgICAgKFdURjo6cmVwb3J0TWVtb3J5VXNhZ2UpOgor CiAyMDEzLTAzLTI3ICBQYXRyaWNrIEdhbnN0ZXJlciAgPHBhcm9nYUB3ZWJraXQub3JnPgogCiAg ICAgICAgIFNldCBXVEZfQVJNX0FSQ0hfVkVSU0lPTiB0byBjb3JyZWN0IHZhbHVlIHdoZW4gdXNl ZCB3aXRoIE1TVkMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA2YTZhZmU4ZmMxMzg2OGM3NzZhNWY3YjE2NWUyNmM3 ZjM2NzE5OTNhLi5kMTFhYjc3MzZhMjhiMTlkZTBiZmVkMjM0NmYwODhkZjUzMTc3N2FlIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTMtMDMtMjggIFl1cnkgU2VtaWtoYXRza3kgIDx5 dXJ5c0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogYWRkIG1lbW9yeSBp bnN0cnVtZW50YXRpb24gZm9yIFN0cmluZ0J1ZmZlcgorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTEzNTA3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkZWQgbWVtb3J5IGluc3RydW1lbnRhdGlvbiBmb3Ig SlBFR0ltYWdlRGVjb2Rlci4KKworICAgICAgICAqIHBsYXRmb3JtL2ltYWdlLWRlY29kZXJzL2pw ZWcvSlBFR0ltYWdlRGVjb2Rlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpKUEVHSW1hZ2VSZWFk ZXI6OnJlcG9ydE1lbW9yeVVzYWdlKToKKyAgICAgICAgKEpQRUdJbWFnZVJlYWRlcik6CisgICAg ICAgIChXZWJDb3JlOjpKUEVHSW1hZ2VEZWNvZGVyOjpyZXBvcnRNZW1vcnlVc2FnZSk6CisgICAg ICAgIChXZWJDb3JlKToKKyAgICAgICAgKiBwbGF0Zm9ybS9pbWFnZS1kZWNvZGVycy9qcGVnL0pQ RUdJbWFnZURlY29kZXIuaDoKKyAgICAgICAgKEpQRUdJbWFnZURlY29kZXIpOgorCiAyMDEzLTAz LTI3ICBLZWlzaGkgSGF0dG9yaSAgPGtlaXNoaUB3ZWJraXQub3JnPgogCiAgICAgICAgIERyYWdn aW5nIHRvIGVkZ2Ugc2hvdWxkIGFsd2F5cyBzbmFwIHRvIG1pbi9tYXguCmRpZmYgLS1naXQgYS9T b3VyY2UvV1RGL3d0Zi9NZW1vcnlJbnN0cnVtZW50YXRpb25TdHJpbmcuaCBiL1NvdXJjZS9XVEYv d3RmL01lbW9yeUluc3RydW1lbnRhdGlvblN0cmluZy5oCmluZGV4IDFhMjkyN2VlOWZkZWJkZDkz OThkZTY0OGNhODRlN2NhMzYyMGJlOGMuLjExNzg3NzkzMzQ5MWNiNzY3Yzk5YmYwNTNkMzFjYWRi MTgzODBhMGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvd3RmL01lbW9yeUluc3RydW1lbnRhdGlv blN0cmluZy5oCisrKyBiL1NvdXJjZS9XVEYvd3RmL01lbW9yeUluc3RydW1lbnRhdGlvblN0cmlu Zy5oCkBAIC03MCw2ICs3MCwxNCBAQCBpbmxpbmUgdm9pZCByZXBvcnRNZW1vcnlVc2FnZShjb25z dCBTdHJpbmcqIHN0cmluZywgTWVtb3J5T2JqZWN0SW5mbyogbWVtb3J5T2JqZQogICAgIGluZm8u YWRkTWVtYmVyKHN0cmluZy0+aW1wbCgpLCAic3RyaW5nSW1wbCIsIFJldGFpbmluZ1BvaW50ZXIp OwogfQogCit0ZW1wbGF0ZSA8dHlwZW5hbWUgQ2hhclR5cGU+IGNsYXNzIFN0cmluZ0J1ZmZlcjsK K3RlbXBsYXRlIDx0eXBlbmFtZSBDaGFyVHlwZT4KK2lubGluZSB2b2lkIHJlcG9ydE1lbW9yeVVz YWdlKGNvbnN0IFN0cmluZ0J1ZmZlcjxDaGFyVHlwZT4qIHN0cmluZ0J1ZmZlciwgTWVtb3J5T2Jq ZWN0SW5mbyogbWVtb3J5T2JqZWN0SW5mbykKK3sKKyAgICBNZW1vcnlDbGFzc0luZm8gaW5mbyht ZW1vcnlPYmplY3RJbmZvLCBzdHJpbmdCdWZmZXIpOworICAgIGluZm8uYWRkUmF3QnVmZmVyKHN0 cmluZ0J1ZmZlci0+Y2hhcmFjdGVycygpLCBzaXplb2YoQ2hhclR5cGUpICogc3RyaW5nQnVmZmVy LT5sZW5ndGgoKSwgIkNoYXJUeXBlW10iLCAiZGF0YSIpOworfQorCiBpbmxpbmUgdm9pZCByZXBv cnRNZW1vcnlVc2FnZShjb25zdCBBdG9taWNTdHJpbmcqIGF0b21pY1N0cmluZywgTWVtb3J5T2Jq ZWN0SW5mbyogbWVtb3J5T2JqZWN0SW5mbykKIHsKICAgICBNZW1vcnlDbGFzc0luZm8gaW5mbyht ZW1vcnlPYmplY3RJbmZvLCBhdG9taWNTdHJpbmcpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvSW1hZ2VTb3VyY2UuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvSW1hZ2VTb3VyY2UuY3BwCmluZGV4IDkxNzQwMGVjNmRjZjNiOTY5MjYw MDYxODA4OWI1Y2Q3NDA1ZWMyNzAuLjMwZjRhNGU1ODU3NjZmMTQ3ZDFmOTNmMmI3Mzk3MGQ1MjI2 NmRhZjMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0ltYWdl U291cmNlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9JbWFnZVNv dXJjZS5jcHAKQEAgLTIxMCw3ICsyMTAsNyBAQCB1bnNpZ25lZCBJbWFnZVNvdXJjZTo6ZnJhbWVC eXRlc0F0SW5kZXgoc2l6ZV90IGluZGV4KSBjb25zdAogdm9pZCBJbWFnZVNvdXJjZTo6cmVwb3J0 TWVtb3J5VXNhZ2UoTWVtb3J5T2JqZWN0SW5mbyogbWVtb3J5T2JqZWN0SW5mbykgY29uc3QKIHsK ICAgICBNZW1vcnlDbGFzc0luZm8gaW5mbyhtZW1vcnlPYmplY3RJbmZvLCB0aGlzLCBQbGF0Zm9y bU1lbW9yeVR5cGVzOjpJbWFnZSk7Ci0gICAgaW5mby5hZGRNZW1iZXIobV9kZWNvZGVyLCAiZGVj b2RlciIpOworICAgIGluZm8uYWRkTWVtYmVyKG1fZGVjb2RlciwgImRlY29kZXIiLCBXVEY6OlJl dGFpbmluZ1BvaW50ZXIpOwogfQogCiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9EZWZlcnJlZEltYWdlRGVjb2Rlci5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9EZWZlcnJlZEltYWdlRGVjb2Rlci5j cHAKaW5kZXggYmYwM2Y5OTFiNjI5ODhlN2NmODUxNjczM2RlNDBhNTY2YTIxMmEyMi4uOWM2YWE0 NWM1ODBiY2I0NmJhMDhlYmMwYzI4MmY3M2U0YTg4NGZkMSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vRGVmZXJyZWRJbWFnZURlY29kZXIuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0RlZmVycmVk SW1hZ2VEZWNvZGVyLmNwcApAQCAtMjksNiArMjksNyBAQAogI2luY2x1ZGUgIkltYWdlRGVjb2Rp bmdTdG9yZS5oIgogI2luY2x1ZGUgIkltYWdlRnJhbWVHZW5lcmF0b3IuaCIKICNpbmNsdWRlICJM YXp5RGVjb2RpbmdQaXhlbFJlZi5oIgorI2luY2x1ZGUgIlBsYXRmb3JtTWVtb3J5SW5zdHJ1bWVu dGF0aW9uLmgiCiAjaW5jbHVkZSA8d3RmL1Bhc3NPd25QdHIuaD4KIAogbmFtZXNwYWNlIFdlYkNv cmUgewpAQCAtMjMyLDQgKzIzMywxMCBAQCBib29sIERlZmVycmVkSW1hZ2VEZWNvZGVyOjpob3RT cG90KEludFBvaW50JiBob3RTcG90KSBjb25zdAogICAgIHJldHVybiBtX2FjdHVhbERlY29kZXIg PyBtX2FjdHVhbERlY29kZXItPmhvdFNwb3QoaG90U3BvdCkgOiBmYWxzZTsKIH0KIAordm9pZCBE ZWZlcnJlZEltYWdlRGVjb2Rlcjo6cmVwb3J0TWVtb3J5VXNhZ2UoTWVtb3J5T2JqZWN0SW5mbyog bWVtb3J5T2JqZWN0SW5mbykgY29uc3QKK3sKKyAgICBNZW1vcnlDbGFzc0luZm8gaW5mbyhtZW1v cnlPYmplY3RJbmZvLCB0aGlzLCBQbGF0Zm9ybU1lbW9yeVR5cGVzOjpJbWFnZSk7CisgICAgaW5m by5hZGRNZW1iZXIobV9hY3R1YWxEZWNvZGVyLCAiYWN0dWFsRGVjb2RlciIpOworfQorCiB9IC8v IG5hbWVzcGFjZSBXZWJDb3JlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9jaHJvbWl1bS9EZWZlcnJlZEltYWdlRGVjb2Rlci5oIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vRGVmZXJyZWRJbWFnZURlY29kZXIuaAppbmRleCA1 ZGY5MjM1NGJkZGQwOWM4ZGIzYzExNmY2YTU3YmI5OTY3NGIxMDM3Li4xNzNlODM4Nzk1M2QwMTM3 M2M5ZmE1ZWZmY2YxNzUyMWQ0N2YxOTA5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9EZWZlcnJlZEltYWdlRGVjb2Rlci5oCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0RlZmVycmVkSW1hZ2VEZWNvZGVy LmgKQEAgLTY2LDYgKzY2LDggQEAgcHVibGljOgogICAgIEltYWdlT3JpZW50YXRpb24gb3JpZW50 YXRpb24oKSBjb25zdDsKICAgICBib29sIGhvdFNwb3QoSW50UG9pbnQmKSBjb25zdDsKIAorICAg IHZvaWQgcmVwb3J0TWVtb3J5VXNhZ2UoTWVtb3J5T2JqZWN0SW5mbyopIGNvbnN0OworCiBwcml2 YXRlOgogICAgIGV4cGxpY2l0IERlZmVycmVkSW1hZ2VEZWNvZGVyKEltYWdlRGVjb2RlciogYWN0 dWFsRGVjb2Rlcik7CiAgICAgU2tCaXRtYXAgY3JlYXRlTGF6eURlY29kaW5nQml0bWFwKCk7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pbWFnZS1kZWNvZGVycy9qcGVnL0pQ RUdJbWFnZURlY29kZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW1hZ2UtZGVjb2Rl cnMvanBlZy9KUEVHSW1hZ2VEZWNvZGVyLmNwcAppbmRleCBhOTc3MmZjMDhkOTc4Y2IwMjZhYjc4 OGYxNGZkMzUyZDNlMDRkNWRjLi5jOWQ4ZTNjZDhiODdhYzIyMjQ2MWE1YWRjMjNmYzQxY2U5MmE0 MmYzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pbWFnZS1kZWNvZGVycy9q cGVnL0pQRUdJbWFnZURlY29kZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2lt YWdlLWRlY29kZXJzL2pwZWcvSlBFR0ltYWdlRGVjb2Rlci5jcHAKQEAgLTQwLDYgKzQwLDcgQEAK ICNpbmNsdWRlICJjb25maWcuaCIKICNpbmNsdWRlICJKUEVHSW1hZ2VEZWNvZGVyLmgiCiAjaW5j bHVkZSAiUGxhdGZvcm1JbnN0cnVtZW50YXRpb24uaCIKKyNpbmNsdWRlICJQbGF0Zm9ybU1lbW9y eUluc3RydW1lbnRhdGlvbi5oIgogI2luY2x1ZGUgPHd0Zi9QYXNzT3duUHRyLmg+CiAKIGV4dGVy biAiQyIgewpAQCAtNTQxLDYgKzU0MiwxMyBAQCBwdWJsaWM6CiAgICAgfQogI2VuZGlmCiAKKyAg ICB2b2lkIHJlcG9ydE1lbW9yeVVzYWdlKE1lbW9yeU9iamVjdEluZm8qIG1lbW9yeU9iamVjdElu Zm8pIGNvbnN0CisgICAgeworICAgICAgICBNZW1vcnlDbGFzc0luZm8gaW5mbyhtZW1vcnlPYmpl Y3RJbmZvLCB0aGlzLCBQbGF0Zm9ybU1lbW9yeVR5cGVzOjpJbWFnZSk7CisgICAgICAgIC8vIFdl IGNhbm5vdCByZXBvcnQgYWRkcmVzc2VzIG9mIG9iamVjdHMgYWxsb2NhdGVkIGluIGpwZWdsaWIs IGFzIHRoZSBsaWJyYXJ5IHVzZXMgaXRzIG93biBtZW1vcnkgbWFuYWdlci4KKyAgICAgICAgaW5m by5hZGRQcml2YXRlQnVmZmVyKG1faW5mby5udW1fY29tcG9uZW50cyAqIHNpemVvZihqcGVnX2Nv bXBvbmVudF9pbmZvKSwgMCwgImpwZWdfY29tcG9uZW50X2luZm9bXSIsICJjb21wX2luZm8iKTsK KyAgICB9CisKIHByaXZhdGU6CiAgICAgSlBFR0ltYWdlRGVjb2RlciogbV9kZWNvZGVyOwogICAg IHVuc2lnbmVkIG1fYnVmZmVyTGVuZ3RoOwpAQCAtNzg5LDQgKzc5NywxMSBAQCB2b2lkIEpQRUdJ bWFnZURlY29kZXI6OmRlY29kZShib29sIG9ubHlTaXplKQogICAgICAgICBtX3JlYWRlci5jbGVh cigpOwogfQogCit2b2lkIEpQRUdJbWFnZURlY29kZXI6OnJlcG9ydE1lbW9yeVVzYWdlKE1lbW9y eU9iamVjdEluZm8qIG1lbW9yeU9iamVjdEluZm8pIGNvbnN0Cit7CisgICAgTWVtb3J5Q2xhc3NJ bmZvIGluZm8obWVtb3J5T2JqZWN0SW5mbywgdGhpcywgUGxhdGZvcm1NZW1vcnlUeXBlczo6SW1h Z2UpOworICAgIEltYWdlRGVjb2Rlcjo6cmVwb3J0TWVtb3J5VXNhZ2UobWVtb3J5T2JqZWN0SW5m byk7CisgICAgaW5mby5hZGRNZW1iZXIobV9yZWFkZXIsICJyZWFkZXIiKTsKK30KKwogfQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW1hZ2UtZGVjb2RlcnMvanBlZy9KUEVH SW1hZ2VEZWNvZGVyLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pbWFnZS1kZWNvZGVycy9q cGVnL0pQRUdJbWFnZURlY29kZXIuaAppbmRleCBiMWY2MWExNGQ5YTVlZDM5YzFlMDI2YjY2ZjM5 NjgxZGUxYzk2MDRiLi42NjQ2OTA1NDMyYjNkZTJmNjk0ZjE3ZWQwYmM1OWY3YzA5N2RiM2M1IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pbWFnZS1kZWNvZGVycy9qcGVnL0pQ RUdJbWFnZURlY29kZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pbWFnZS1kZWNv ZGVycy9qcGVnL0pQRUdJbWFnZURlY29kZXIuaApAQCAtNzYsNiArNzYsOCBAQCBuYW1lc3BhY2Ug V2ViQ29yZSB7CiAgICAgICAgIHZvaWQgc2V0Q29sb3JQcm9maWxlKGNvbnN0IENvbG9yUHJvZmls ZSYgY29sb3JQcm9maWxlKSB7IG1fY29sb3JQcm9maWxlID0gY29sb3JQcm9maWxlOyB9CiAgICAg ICAgIHZvaWQgc2V0T3JpZW50YXRpb24oSW1hZ2VPcmllbnRhdGlvbiBvcmllbnRhdGlvbikgeyBt X29yaWVudGF0aW9uID0gb3JpZW50YXRpb247IH0KIAorICAgICAgICB2aXJ0dWFsIHZvaWQgcmVw b3J0TWVtb3J5VXNhZ2UoTWVtb3J5T2JqZWN0SW5mbyopIGNvbnN0IE9WRVJSSURFOworCiAgICAg cHJpdmF0ZToKICAgICAgICAgLy8gRGVjb2RlcyB0aGUgaW1hZ2UuICBJZiB8b25seVNpemV8IGlz IHRydWUsIHN0b3BzIGRlY29kaW5nIGFmdGVyCiAgICAgICAgIC8vIGNhbGN1bGF0aW5nIHRoZSBp bWFnZSBzaXplLiAgSWYgZGVjb2RpbmcgZmFpbHMgYnV0IHRoZXJlIGlzIG5vIG1vcmUK 195738 2013-03-29 06:52:43 -0700 2013-04-01 02:39:49 -0700 Patch bug-113507-20130329175239.patch text/plain 1768 yurys U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ3MDczCmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IGQ4YTE2YThlZGI3NTIyNjRjOWNiZWVh MDIzZjQ1MTUzMDA0YzM5NTcuLjYzZTNlMDI3YTBmZDU4NmFmZTk5MTZhNDVkMGFmYWZjZWM4NDU1 OWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTMtMDMtMjggIFl1cnkgU2VtaWtoYXRza3kgIDx5 dXJ5c0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogYWRkIG1lbW9yeSBp bnN0cnVtZW50YXRpb24gZm9yIFN0cmluZ0J1ZmZlcgorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTEzNTA3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkZWQgbWVtb3J5IGluc3RydW1lbnRhdGlvbiBmb3Ig U3RyaW5nQnVmZmVyLgorCisgICAgICAgICogd3RmL01lbW9yeUluc3RydW1lbnRhdGlvblN0cmlu Zy5oOgorICAgICAgICAoV1RGKToKKyAgICAgICAgKFdURjo6cmVwb3J0TWVtb3J5VXNhZ2UpOgor CiAyMDEzLTAzLTI3ICBQYXRyaWNrIEdhbnN0ZXJlciAgPHBhcm9nYUB3ZWJraXQub3JnPgogCiAg ICAgICAgIFNldCBXVEZfQVJNX0FSQ0hfVkVSU0lPTiB0byBjb3JyZWN0IHZhbHVlIHdoZW4gdXNl ZCB3aXRoIE1TVkMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XVEYvd3RmL01lbW9yeUluc3RydW1lbnRh dGlvblN0cmluZy5oIGIvU291cmNlL1dURi93dGYvTWVtb3J5SW5zdHJ1bWVudGF0aW9uU3RyaW5n LmgKaW5kZXggMWEyOTI3ZWU5ZmRlYmRkOTM5OGRlNjQ4Y2E4NGU3Y2EzNjIwYmU4Yy4uMTE3ODc3 OTMzNDkxY2I3NjdjOTliZjA1M2QzMWNhZGIxODM4MGEwZiAxMDA2NDQKLS0tIGEvU291cmNlL1dU Ri93dGYvTWVtb3J5SW5zdHJ1bWVudGF0aW9uU3RyaW5nLmgKKysrIGIvU291cmNlL1dURi93dGYv TWVtb3J5SW5zdHJ1bWVudGF0aW9uU3RyaW5nLmgKQEAgLTcwLDYgKzcwLDE0IEBAIGlubGluZSB2 b2lkIHJlcG9ydE1lbW9yeVVzYWdlKGNvbnN0IFN0cmluZyogc3RyaW5nLCBNZW1vcnlPYmplY3RJ bmZvKiBtZW1vcnlPYmplCiAgICAgaW5mby5hZGRNZW1iZXIoc3RyaW5nLT5pbXBsKCksICJzdHJp bmdJbXBsIiwgUmV0YWluaW5nUG9pbnRlcik7CiB9CiAKK3RlbXBsYXRlIDx0eXBlbmFtZSBDaGFy VHlwZT4gY2xhc3MgU3RyaW5nQnVmZmVyOwordGVtcGxhdGUgPHR5cGVuYW1lIENoYXJUeXBlPgor aW5saW5lIHZvaWQgcmVwb3J0TWVtb3J5VXNhZ2UoY29uc3QgU3RyaW5nQnVmZmVyPENoYXJUeXBl Piogc3RyaW5nQnVmZmVyLCBNZW1vcnlPYmplY3RJbmZvKiBtZW1vcnlPYmplY3RJbmZvKQorewor ICAgIE1lbW9yeUNsYXNzSW5mbyBpbmZvKG1lbW9yeU9iamVjdEluZm8sIHN0cmluZ0J1ZmZlcik7 CisgICAgaW5mby5hZGRSYXdCdWZmZXIoc3RyaW5nQnVmZmVyLT5jaGFyYWN0ZXJzKCksIHNpemVv ZihDaGFyVHlwZSkgKiBzdHJpbmdCdWZmZXItPmxlbmd0aCgpLCAiQ2hhclR5cGVbXSIsICJkYXRh Iik7Cit9CisKIGlubGluZSB2b2lkIHJlcG9ydE1lbW9yeVVzYWdlKGNvbnN0IEF0b21pY1N0cmlu ZyogYXRvbWljU3RyaW5nLCBNZW1vcnlPYmplY3RJbmZvKiBtZW1vcnlPYmplY3RJbmZvKQogewog ICAgIE1lbW9yeUNsYXNzSW5mbyBpbmZvKG1lbW9yeU9iamVjdEluZm8sIGF0b21pY1N0cmluZyk7 Cg==