100428 2012-10-25 15:38:25 -0700 Teach RenderTable how to use Vector::insert and Vector::append instead of its own custom memmove code 2012-11-01 10:43:48 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 100304 1 eric eric bdakin jchaffraix mjs webkit.review.bot oldest_to_newest 751288 0 eric 2012-10-25 15:38:25 -0700 Teach RenderTable how to use Vector::insert and Vector::append instead of its own custom memmove code 751290 1 170748 eric 2012-10-25 15:41:18 -0700 Created attachment 170748 Patch 751294 2 eric 2012-10-25 15:43:26 -0700 This is all part of me working myself up to adding caching of the RenderTableCol pointers in RenderTable to fix bug 100304. 751297 3 170751 eric 2012-10-25 15:46:18 -0700 Created attachment 170751 Patch 751298 4 170752 eric 2012-10-25 15:47:14 -0700 Created attachment 170752 Patch 751663 5 170752 jchaffraix 2012-10-26 01:04:35 -0700 Comment on attachment 170752 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=170752&action=review The direction is fine, not r+'ing due to the lost underflow ASSERT. > Source/WebCore/rendering/RenderTable.cpp:-702 > - ASSERT(oldSpan > firstSpan); I am not happy about losing this ASSERT. You are doing unsigned arithmetic and this would catch underflow in a way the new logic doesn't. Your new ASSERT was covered by the old one but is only a subset of what we were ASSERTing. > Source/WebCore/rendering/RenderTable.cpp:701 > + ASSERT(m_columns[position + 1].span > 0); // Every column must span at least 1! The comment doesn't add much here. > Source/WebCore/rendering/RenderTable.h:132 > + explicit ColumnStruct(unsigned initialSpan = 1) I don't see the interest of the default initialSpan as all call sites pass something. 752358 6 eric 2012-10-26 13:58:27 -0700 (In reply to comment #5) > (From update of attachment 170752 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=170752&action=review > > Source/WebCore/rendering/RenderTable.h:132 > > + explicit ColumnStruct(unsigned initialSpan = 1) > > I don't see the interest of the default initialSpan as all call sites pass something. Vector::resize() needs an argument-less constructor. 752642 7 171067 eric 2012-10-26 18:43:25 -0700 Created attachment 171067 Update per Julien's suggestions 754178 8 171067 jchaffraix 2012-10-30 03:53:35 -0700 Comment on attachment 171067 Update per Julien's suggestions View in context: https://bugs.webkit.org/attachment.cgi?id=171067&action=review > Source/WebCore/rendering/RenderTable.cpp:722 > + // Save off the index of the new column for use in notifying the sections of this new column. I don't think this comment adds much. > Source/WebCore/rendering/RenderTable.h:132 > + explicit ColumnStruct(unsigned initialSpan = 1) Too bad for the initial value but that's another battle. Thanks for explaining why it is needed. 754598 9 171505 eric 2012-10-30 12:45:40 -0700 Created attachment 171505 Patch for landing 754730 10 171505 webkit.review.bot 2012-10-30 15:38:17 -0700 Comment on attachment 171505 Patch for landing Clearing flags on attachment: 171505 Committed r132949: <http://trac.webkit.org/changeset/132949> 754731 11 webkit.review.bot 2012-10-30 15:38:21 -0700 All reviewed patches have been landed. Closing bug. 756372 12 171505 darin 2012-11-01 09:53:39 -0700 Comment on attachment 171505 Patch for landing View in context: https://bugs.webkit.org/attachment.cgi?id=171505&action=review > Source/WebCore/ChangeLog:13 > + insert, append and grow all use the same expandCapacity logic under the covers > + and Vector::insert uses TypeOperations::moveOverlapping which should use memmove > + by default for unknown types. I think this comment is not quite right. For truly arbitrary “unknown” types, Vector can’t use memmove. Vector can only use memmove as an optimization if it knows that is safe. I think it’s possible, maybe even likely, that it can figure this out for ColumnStruct without the RenderTable code having to do something explicitly because of the type traits machinery it uses, but I think the wording we are using here in the comment is misleading and doesn’t mention what it takes to make sure that Vector uses memmove. 756434 13 eric 2012-11-01 10:43:48 -0700 (In reply to comment #12) > (From update of attachment 171505 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=171505&action=review > > > Source/WebCore/ChangeLog:13 > > + insert, append and grow all use the same expandCapacity logic under the covers > > + and Vector::insert uses TypeOperations::moveOverlapping which should use memmove > > + by default for unknown types. > > I think this comment is not quite right. For truly arbitrary “unknown” types, Vector can’t use memmove. Vector can only use memmove as an optimization if it knows that is safe. I think it’s possible, maybe even likely, that it can figure this out for ColumnStruct without the RenderTable code having to do something explicitly because of the type traits machinery it uses, but I think the wording we are using here in the comment is misleading and doesn’t mention what it takes to make sure that Vector uses memmove. It's possible that I've misunderstood and regressed things. I have not seen this code show up in benchmarks, but I'll keep my eye out for it. 170748 2012-10-25 15:41:18 -0700 2012-10-25 15:46:16 -0700 Patch bug-100428-20121025153948.patch text/plain 4218 eric U3VidmVyc2lvbiBSZXZpc2lvbjogMTMyNTA0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYmY3NDUxODcwNzNhOWNh ZmIyNjFlOTg0M2MxOTEwM2Y3MTQzZjUzZi4uZTAwMmUyYjNhOWFhY2ZjNDFmMzYxYzBhZTQ1MjY0 ZDJhNzMyOWRkNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDEyLTEwLTI1ICBFcmlj IFNlaWRlbCAgPGVyaWNAd2Via2l0Lm9yZz4KKworICAgICAgICBUZWFjaCBSZW5kZXJUYWJsZSBo b3cgdG8gdXNlIFZlY3Rvcjo6aW5zZXJ0IGFuZCBWZWN0b3I6OmFwcGVuZCBpbnN0ZWFkIG9mIGl0 cyBvd24gY3VzdG9tIG1lbW1vdmUgY29kZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTAwNDI4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgTm8gdXNlci12aXNpYmxlIGNoYW5nZS4gVGhlIGV4YWN0IHJlc3Vs dGluZyBzaXplIG9mIHRoZSB2ZWN0b3JzIGFmdGVyIGFwcGVuZC9zcGxpdAorICAgICAgICBoYXMg Y2hhbmdlZCBzbGlnaHRseSBub3cgdGhhdCB3ZSdyZSB1c2luZyBWZWN0b3IncyBvd24gbG9naWMg Zm9yIGF2b2lkaW5nCisgICAgICAgIE8oTl4yKSBhcHBlbmQgcGVyZm9ybWFuY2UuICBJIHRoaW5r IHRoaXMgc2hvdWxkIGFjdHVhbGx5IGJlIGZhc3RlciwgYnV0IHdlIGRvbid0IGhhdmUKKyAgICAg ICAgYW55IHBlcmYgdGVzdHMgd2hpY2ggc3RyZXNzIHRoaXMgYW5kIGl0IGRvZXMgbm90IHNob3cg dXAgb24gcm9ib2hvcm5ldCdzIHJlc2l6ZUNvbCB0ZXN0LgorCisgICAgICAgIFRoZSBlbmQgcmVz dWx0IGlzIHRoYXQgUmVuZGVyVGFibGUgaXMgbm93IGxpa2UgYWxsIG90aGVyIGNsaWVudHMgb2Yg VmVjdG9yIGluc3RlYWQgb2YgYmVpbmcKKyAgICAgICAgbmVlZGxlc3NseSBkaWZmZXJlbnQuIDop CisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyVGFibGUuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6UmVuZGVyVGFibGU6OnNwbGl0Q29sdW1uKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRh YmxlOjphcHBlbmRDb2x1bW4pOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJUYWJsZS5oOgor ICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGFibGU6OkNvbHVtblN0cnVjdDo6Q29sdW1uU3RydWN0 KToKKwogMjAxMi0xMC0yNSAgU2ltb24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4K IAogICAgICAgICByMTMyNDI3IGNoYW5nZWQgdGhlIHRpbGluZyBiZWhhdmlvciBvZiB0aWxlZCBs YXllciBUaWxlQ2FjaGVzIGFzIHdlbGwgYXMgdGhlIHBhZ2UgdGlsZSBjYWNoZQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRhYmxlLmNwcCBiL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJUYWJsZS5jcHAKaW5kZXggODgyMGU2MTRjZjI0YzQ2ZGM3ZjJi NjA1MWI3YTc2ZjY3OTYzZTg4OS4uYjU0NzAyZDJiYzZhMDUzYjJhODdmYmFiODhkY2VkMmI1Yjc4 ZWJiZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRhYmxlLmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGFibGUuY3BwCkBAIC02OTUs MTQgKzY5NSwxMCBAQCBSZW5kZXJUYWJsZVNlY3Rpb24qIFJlbmRlclRhYmxlOjp0b3BOb25FbXB0 eVNlY3Rpb24oKSBjb25zdAogCiB2b2lkIFJlbmRlclRhYmxlOjpzcGxpdENvbHVtbih1bnNpZ25l ZCBwb3NpdGlvbiwgdW5zaWduZWQgZmlyc3RTcGFuKQogewotICAgIC8vIHdlIG5lZWQgdG8gYWRk IGEgbmV3IGNvbHVtblN0cnVjdAotICAgIHVuc2lnbmVkIG9sZFNpemUgPSBtX2NvbHVtbnMuc2l6 ZSgpOwotICAgIG1fY29sdW1ucy5ncm93KG9sZFNpemUgKyAxKTsKLSAgICB1bnNpZ25lZCBvbGRT cGFuID0gbV9jb2x1bW5zW3Bvc2l0aW9uXS5zcGFuOwotICAgIEFTU0VSVChvbGRTcGFuID4gZmly c3RTcGFuKTsKLSAgICBtX2NvbHVtbnNbcG9zaXRpb25dLnNwYW4gPSBmaXJzdFNwYW47Ci0gICAg bWVtbW92ZShtX2NvbHVtbnMuZGF0YSgpICsgcG9zaXRpb24gKyAxLCBtX2NvbHVtbnMuZGF0YSgp ICsgcG9zaXRpb24sIChvbGRTaXplIC0gcG9zaXRpb24pICogc2l6ZW9mKENvbHVtblN0cnVjdCkp OwotICAgIG1fY29sdW1uc1twb3NpdGlvbiArIDFdLnNwYW4gPSBvbGRTcGFuIC0gZmlyc3RTcGFu OworICAgIC8vIFdlIHNwbGl0IHRoZSBjb2x1bW4gYXQgInBvc2l0aW9uIiwgdGFraW5nICJmaXJz dFNwYW4iIGNlbGxzIGZyb20gdGhlIHNwYW4uCisgICAgbV9jb2x1bW5zLmluc2VydChwb3NpdGlv biwgQ29sdW1uU3RydWN0KGZpcnN0U3BhbikpOworICAgIG1fY29sdW1uc1twb3NpdGlvbiArIDFd LnNwYW4gLT0gZmlyc3RTcGFuOworICAgIEFTU0VSVChtX2NvbHVtbnNbcG9zaXRpb24gKyAxXS5z cGFuID4gMCk7IC8vIEV2ZXJ5IGNvbHVtbiBtdXN0IHNwYW4gYXQgbGVhc3QgMSEKIAogICAgIC8v IFByb3BhZ2F0ZSB0aGUgY2hhbmdlIGluIG91ciBjb2x1bW5zIHJlcHJlc2VudGF0aW9uIHRvIHRo ZSBzZWN0aW9ucyB0aGF0IGRvbid0IG5lZWQKICAgICAvLyBjZWxsIHJlY2FsYy4gSWYgdGhleSBk bywgdGhleSB3aWxsIGJlIHN5bmNlZCB1cCBkaXJlY3RseSB3aXRoIG1fY29sdW1ucyBsYXRlci4K QEAgLTcyMywxMCArNzE5LDkgQEAgdm9pZCBSZW5kZXJUYWJsZTo6c3BsaXRDb2x1bW4odW5zaWdu ZWQgcG9zaXRpb24sIHVuc2lnbmVkIGZpcnN0U3BhbikKIAogdm9pZCBSZW5kZXJUYWJsZTo6YXBw ZW5kQ29sdW1uKHVuc2lnbmVkIHNwYW4pCiB7Ci0gICAgdW5zaWduZWQgcG9zID0gbV9jb2x1bW5z LnNpemUoKTsKLSAgICB1bnNpZ25lZCBuZXdTaXplID0gcG9zICsgMTsKLSAgICBtX2NvbHVtbnMu Z3JvdyhuZXdTaXplKTsKLSAgICBtX2NvbHVtbnNbcG9zXS5zcGFuID0gc3BhbjsKKyAgICAvLyBT YXZlIG9mZiB0aGUgaW5kZXggb2YgdGhlIG5ldyBjb2x1bW4gZm9yIHVzZSBpbiBub3RpZnlpbmcg dGhlIHNlY3Rpb25zIG9mIHRoaXMgbmV3IGNvbHVtbi4KKyAgICB1bnNpZ25lZCBuZXdDb2x1bW5J bmRleCA9IG1fY29sdW1ucy5zaXplKCk7CisgICAgbV9jb2x1bW5zLmFwcGVuZChDb2x1bW5TdHJ1 Y3Qoc3BhbikpOwogCiAgICAgLy8gUHJvcGFnYXRlIHRoZSBjaGFuZ2UgaW4gb3VyIGNvbHVtbnMg cmVwcmVzZW50YXRpb24gdG8gdGhlIHNlY3Rpb25zIHRoYXQgZG9uJ3QgbmVlZAogICAgIC8vIGNl bGwgcmVjYWxjLiBJZiB0aGV5IGRvLCB0aGV5IHdpbGwgYmUgc3luY2VkIHVwIGRpcmVjdGx5IHdp dGggbV9jb2x1bW5zIGxhdGVyLgpAQCAtNzM4LDcgKzczMyw3IEBAIHZvaWQgUmVuZGVyVGFibGU6 OmFwcGVuZENvbHVtbih1bnNpZ25lZCBzcGFuKQogICAgICAgICBpZiAoc2VjdGlvbi0+bmVlZHND ZWxsUmVjYWxjKCkpCiAgICAgICAgICAgICBjb250aW51ZTsKIAotICAgICAgICBzZWN0aW9uLT5h cHBlbmRDb2x1bW4ocG9zKTsKKyAgICAgICAgc2VjdGlvbi0+YXBwZW5kQ29sdW1uKG5ld0NvbHVt bkluZGV4KTsKICAgICB9CiAKICAgICBtX2NvbHVtblBvcy5ncm93KG51bUVmZkNvbHMoKSArIDEp OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRhYmxlLmggYi9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGFibGUuaAppbmRleCAzOTBmMmIzNjdjNzlj ZGRiNjYyYTIzYTJkNTg1NmUxZmQwOWU2ZDc0Li5jYmY3MjBhODA3ODI3OTMxYmUyNTE2ZjNkOTRl MDQxNTUzM2Y0NDBmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy VGFibGUuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGFibGUuaApAQCAt MTI5LDggKzEyOSw4IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIHZvaWQgYWRkQ2hpbGQoUmVuZGVy T2JqZWN0KiBjaGlsZCwgUmVuZGVyT2JqZWN0KiBiZWZvcmVDaGlsZCA9IDApOwogCiAgICAgc3Ry dWN0IENvbHVtblN0cnVjdCB7Ci0gICAgICAgIENvbHVtblN0cnVjdCgpCi0gICAgICAgICAgICA6 IHNwYW4oMSkKKyAgICAgICAgQ29sdW1uU3RydWN0KHVuc2lnbmVkIGluaXRpYWxTcGFuID0gMSkK KyAgICAgICAgICAgIDogc3Bhbihpbml0aWFsU3BhbikKICAgICAgICAgewogICAgICAgICB9CiAK 170751 2012-10-25 15:46:18 -0700 2012-10-25 15:47:12 -0700 Patch bug-100428-20121025154448.patch text/plain 4043 eric U3VidmVyc2lvbiBSZXZpc2lvbjogMTMyNTA0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYmY3NDUxODcwNzNhOWNh ZmIyNjFlOTg0M2MxOTEwM2Y3MTQzZjUzZi4uZWZiOTBlYjBkM2JjZTZiMjg4ZjE3Yzc4YTg5MTIy MDE5MTRiNGQ3ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDEyLTEwLTI1ICBFcmlj IFNlaWRlbCAgPGVyaWNAd2Via2l0Lm9yZz4KKworICAgICAgICBUZWFjaCBSZW5kZXJUYWJsZSBo b3cgdG8gdXNlIFZlY3Rvcjo6aW5zZXJ0IGFuZCBWZWN0b3I6OmFwcGVuZCBpbnN0ZWFkIG9mIGl0 cyBvd24gY3VzdG9tIG1lbW1vdmUgY29kZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTAwNDI4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgUmVuZGVyVGFibGUgaXMgbm93IGxpa2UgYWxsIG90aGVyIGNsaWVu dHMgb2YgVmVjdG9yIGluc3RlYWQgb2YgYmVpbmcKKyAgICAgICAgbmVlZGxlc3NseSBkaWZmZXJl bnQuIDopCisKKyAgICAgICAgaW5zZXJ0LCBhcHBlbmQgYW5kIGdyb3cgYWxsIHVzZSB0aGUgc2Ft ZSBleHBhbmRDYXBhY2l0eSBsb2dpYyB1bmRlciB0aGUgY292ZXJzCisgICAgICAgIGFuZCBWZWN0 b3I6Omluc2VydCB1c2VzIFR5cGVPcGVyYXRpb25zOjptb3ZlT3ZlcmxhcHBpbmcgd2hpY2ggc2hv dWxkIHVzZSBtZW1jcHkKKyAgICAgICAgYnkgZGVmYXVsdCBmb3IgdW5rbm93biB0eXBlcy4KKwor ICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJUYWJsZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpS ZW5kZXJUYWJsZTo6c3BsaXRDb2x1bW4pOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGFibGU6 OmFwcGVuZENvbHVtbik6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlclRhYmxlLmg6CisgICAg ICAgIChXZWJDb3JlOjpSZW5kZXJUYWJsZTo6Q29sdW1uU3RydWN0OjpDb2x1bW5TdHJ1Y3QpOgor CiAyMDEyLTEwLTI1ICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCiAg ICAgICAgIHIxMzI0MjcgY2hhbmdlZCB0aGUgdGlsaW5nIGJlaGF2aW9yIG9mIHRpbGVkIGxheWVy IFRpbGVDYWNoZXMgYXMgd2VsbCBhcyB0aGUgcGFnZSB0aWxlIGNhY2hlCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGFibGUuY3BwIGIvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlclRhYmxlLmNwcAppbmRleCA4ODIwZTYxNGNmMjRjNDZkYzdmMmI2MDUx YjdhNzZmNjc5NjNlODg5Li5iNTQ3MDJkMmJjNmEwNTNiMmE4N2ZiYWI4OGRjZWQyYjViNzhlYmJl IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGFibGUuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUYWJsZS5jcHAKQEAgLTY5NSwxNCAr Njk1LDEwIEBAIFJlbmRlclRhYmxlU2VjdGlvbiogUmVuZGVyVGFibGU6OnRvcE5vbkVtcHR5U2Vj dGlvbigpIGNvbnN0CiAKIHZvaWQgUmVuZGVyVGFibGU6OnNwbGl0Q29sdW1uKHVuc2lnbmVkIHBv c2l0aW9uLCB1bnNpZ25lZCBmaXJzdFNwYW4pCiB7Ci0gICAgLy8gd2UgbmVlZCB0byBhZGQgYSBu ZXcgY29sdW1uU3RydWN0Ci0gICAgdW5zaWduZWQgb2xkU2l6ZSA9IG1fY29sdW1ucy5zaXplKCk7 Ci0gICAgbV9jb2x1bW5zLmdyb3cob2xkU2l6ZSArIDEpOwotICAgIHVuc2lnbmVkIG9sZFNwYW4g PSBtX2NvbHVtbnNbcG9zaXRpb25dLnNwYW47Ci0gICAgQVNTRVJUKG9sZFNwYW4gPiBmaXJzdFNw YW4pOwotICAgIG1fY29sdW1uc1twb3NpdGlvbl0uc3BhbiA9IGZpcnN0U3BhbjsKLSAgICBtZW1t b3ZlKG1fY29sdW1ucy5kYXRhKCkgKyBwb3NpdGlvbiArIDEsIG1fY29sdW1ucy5kYXRhKCkgKyBw b3NpdGlvbiwgKG9sZFNpemUgLSBwb3NpdGlvbikgKiBzaXplb2YoQ29sdW1uU3RydWN0KSk7Ci0g ICAgbV9jb2x1bW5zW3Bvc2l0aW9uICsgMV0uc3BhbiA9IG9sZFNwYW4gLSBmaXJzdFNwYW47Cisg ICAgLy8gV2Ugc3BsaXQgdGhlIGNvbHVtbiBhdCAicG9zaXRpb24iLCB0YWtpbmcgImZpcnN0U3Bh biIgY2VsbHMgZnJvbSB0aGUgc3Bhbi4KKyAgICBtX2NvbHVtbnMuaW5zZXJ0KHBvc2l0aW9uLCBD b2x1bW5TdHJ1Y3QoZmlyc3RTcGFuKSk7CisgICAgbV9jb2x1bW5zW3Bvc2l0aW9uICsgMV0uc3Bh biAtPSBmaXJzdFNwYW47CisgICAgQVNTRVJUKG1fY29sdW1uc1twb3NpdGlvbiArIDFdLnNwYW4g PiAwKTsgLy8gRXZlcnkgY29sdW1uIG11c3Qgc3BhbiBhdCBsZWFzdCAxIQogCiAgICAgLy8gUHJv cGFnYXRlIHRoZSBjaGFuZ2UgaW4gb3VyIGNvbHVtbnMgcmVwcmVzZW50YXRpb24gdG8gdGhlIHNl Y3Rpb25zIHRoYXQgZG9uJ3QgbmVlZAogICAgIC8vIGNlbGwgcmVjYWxjLiBJZiB0aGV5IGRvLCB0 aGV5IHdpbGwgYmUgc3luY2VkIHVwIGRpcmVjdGx5IHdpdGggbV9jb2x1bW5zIGxhdGVyLgpAQCAt NzIzLDEwICs3MTksOSBAQCB2b2lkIFJlbmRlclRhYmxlOjpzcGxpdENvbHVtbih1bnNpZ25lZCBw b3NpdGlvbiwgdW5zaWduZWQgZmlyc3RTcGFuKQogCiB2b2lkIFJlbmRlclRhYmxlOjphcHBlbmRD b2x1bW4odW5zaWduZWQgc3BhbikKIHsKLSAgICB1bnNpZ25lZCBwb3MgPSBtX2NvbHVtbnMuc2l6 ZSgpOwotICAgIHVuc2lnbmVkIG5ld1NpemUgPSBwb3MgKyAxOwotICAgIG1fY29sdW1ucy5ncm93 KG5ld1NpemUpOwotICAgIG1fY29sdW1uc1twb3NdLnNwYW4gPSBzcGFuOworICAgIC8vIFNhdmUg b2ZmIHRoZSBpbmRleCBvZiB0aGUgbmV3IGNvbHVtbiBmb3IgdXNlIGluIG5vdGlmeWluZyB0aGUg c2VjdGlvbnMgb2YgdGhpcyBuZXcgY29sdW1uLgorICAgIHVuc2lnbmVkIG5ld0NvbHVtbkluZGV4 ID0gbV9jb2x1bW5zLnNpemUoKTsKKyAgICBtX2NvbHVtbnMuYXBwZW5kKENvbHVtblN0cnVjdChz cGFuKSk7CiAKICAgICAvLyBQcm9wYWdhdGUgdGhlIGNoYW5nZSBpbiBvdXIgY29sdW1ucyByZXBy ZXNlbnRhdGlvbiB0byB0aGUgc2VjdGlvbnMgdGhhdCBkb24ndCBuZWVkCiAgICAgLy8gY2VsbCBy ZWNhbGMuIElmIHRoZXkgZG8sIHRoZXkgd2lsbCBiZSBzeW5jZWQgdXAgZGlyZWN0bHkgd2l0aCBt X2NvbHVtbnMgbGF0ZXIuCkBAIC03MzgsNyArNzMzLDcgQEAgdm9pZCBSZW5kZXJUYWJsZTo6YXBw ZW5kQ29sdW1uKHVuc2lnbmVkIHNwYW4pCiAgICAgICAgIGlmIChzZWN0aW9uLT5uZWVkc0NlbGxS ZWNhbGMoKSkKICAgICAgICAgICAgIGNvbnRpbnVlOwogCi0gICAgICAgIHNlY3Rpb24tPmFwcGVu ZENvbHVtbihwb3MpOworICAgICAgICBzZWN0aW9uLT5hcHBlbmRDb2x1bW4obmV3Q29sdW1uSW5k ZXgpOwogICAgIH0KIAogICAgIG1fY29sdW1uUG9zLmdyb3cobnVtRWZmQ29scygpICsgMSk7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGFibGUuaCBiL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUYWJsZS5oCmluZGV4IDM5MGYyYjM2N2M3OWNkZGI2 NjJhMjNhMmQ1ODU2ZTFmZDA5ZTZkNzQuLmNiZjcyMGE4MDc4Mjc5MzFiZTI1MTZmM2Q5NGUwNDE1 NTMzZjQ0MGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUYWJs ZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUYWJsZS5oCkBAIC0xMjks OCArMTI5LDggQEAgcHVibGljOgogICAgIHZpcnR1YWwgdm9pZCBhZGRDaGlsZChSZW5kZXJPYmpl Y3QqIGNoaWxkLCBSZW5kZXJPYmplY3QqIGJlZm9yZUNoaWxkID0gMCk7CiAKICAgICBzdHJ1Y3Qg Q29sdW1uU3RydWN0IHsKLSAgICAgICAgQ29sdW1uU3RydWN0KCkKLSAgICAgICAgICAgIDogc3Bh bigxKQorICAgICAgICBDb2x1bW5TdHJ1Y3QodW5zaWduZWQgaW5pdGlhbFNwYW4gPSAxKQorICAg ICAgICAgICAgOiBzcGFuKGluaXRpYWxTcGFuKQogICAgICAgICB7CiAgICAgICAgIH0KIAo= 170752 2012-10-25 15:47:14 -0700 2012-10-26 18:43:19 -0700 Patch bug-100428-20121025154544.patch text/plain 4052 eric U3VidmVyc2lvbiBSZXZpc2lvbjogMTMyNTA0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYmY3NDUxODcwNzNhOWNh ZmIyNjFlOTg0M2MxOTEwM2Y3MTQzZjUzZi4uZWZiOTBlYjBkM2JjZTZiMjg4ZjE3Yzc4YTg5MTIy MDE5MTRiNGQ3ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDEyLTEwLTI1ICBFcmlj IFNlaWRlbCAgPGVyaWNAd2Via2l0Lm9yZz4KKworICAgICAgICBUZWFjaCBSZW5kZXJUYWJsZSBo b3cgdG8gdXNlIFZlY3Rvcjo6aW5zZXJ0IGFuZCBWZWN0b3I6OmFwcGVuZCBpbnN0ZWFkIG9mIGl0 cyBvd24gY3VzdG9tIG1lbW1vdmUgY29kZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTAwNDI4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgUmVuZGVyVGFibGUgaXMgbm93IGxpa2UgYWxsIG90aGVyIGNsaWVu dHMgb2YgVmVjdG9yIGluc3RlYWQgb2YgYmVpbmcKKyAgICAgICAgbmVlZGxlc3NseSBkaWZmZXJl bnQuIDopCisKKyAgICAgICAgaW5zZXJ0LCBhcHBlbmQgYW5kIGdyb3cgYWxsIHVzZSB0aGUgc2Ft ZSBleHBhbmRDYXBhY2l0eSBsb2dpYyB1bmRlciB0aGUgY292ZXJzCisgICAgICAgIGFuZCBWZWN0 b3I6Omluc2VydCB1c2VzIFR5cGVPcGVyYXRpb25zOjptb3ZlT3ZlcmxhcHBpbmcgd2hpY2ggc2hv dWxkIHVzZSBtZW1jcHkKKyAgICAgICAgYnkgZGVmYXVsdCBmb3IgdW5rbm93biB0eXBlcy4KKwor ICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJUYWJsZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpS ZW5kZXJUYWJsZTo6c3BsaXRDb2x1bW4pOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGFibGU6 OmFwcGVuZENvbHVtbik6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlclRhYmxlLmg6CisgICAg ICAgIChXZWJDb3JlOjpSZW5kZXJUYWJsZTo6Q29sdW1uU3RydWN0OjpDb2x1bW5TdHJ1Y3QpOgor CiAyMDEyLTEwLTI1ICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCiAg ICAgICAgIHIxMzI0MjcgY2hhbmdlZCB0aGUgdGlsaW5nIGJlaGF2aW9yIG9mIHRpbGVkIGxheWVy IFRpbGVDYWNoZXMgYXMgd2VsbCBhcyB0aGUgcGFnZSB0aWxlIGNhY2hlCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGFibGUuY3BwIGIvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlclRhYmxlLmNwcAppbmRleCA4ODIwZTYxNGNmMjRjNDZkYzdmMmI2MDUx YjdhNzZmNjc5NjNlODg5Li5iNTQ3MDJkMmJjNmEwNTNiMmE4N2ZiYWI4OGRjZWQyYjViNzhlYmJl IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGFibGUuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUYWJsZS5jcHAKQEAgLTY5NSwxNCAr Njk1LDEwIEBAIFJlbmRlclRhYmxlU2VjdGlvbiogUmVuZGVyVGFibGU6OnRvcE5vbkVtcHR5U2Vj dGlvbigpIGNvbnN0CiAKIHZvaWQgUmVuZGVyVGFibGU6OnNwbGl0Q29sdW1uKHVuc2lnbmVkIHBv c2l0aW9uLCB1bnNpZ25lZCBmaXJzdFNwYW4pCiB7Ci0gICAgLy8gd2UgbmVlZCB0byBhZGQgYSBu ZXcgY29sdW1uU3RydWN0Ci0gICAgdW5zaWduZWQgb2xkU2l6ZSA9IG1fY29sdW1ucy5zaXplKCk7 Ci0gICAgbV9jb2x1bW5zLmdyb3cob2xkU2l6ZSArIDEpOwotICAgIHVuc2lnbmVkIG9sZFNwYW4g PSBtX2NvbHVtbnNbcG9zaXRpb25dLnNwYW47Ci0gICAgQVNTRVJUKG9sZFNwYW4gPiBmaXJzdFNw YW4pOwotICAgIG1fY29sdW1uc1twb3NpdGlvbl0uc3BhbiA9IGZpcnN0U3BhbjsKLSAgICBtZW1t b3ZlKG1fY29sdW1ucy5kYXRhKCkgKyBwb3NpdGlvbiArIDEsIG1fY29sdW1ucy5kYXRhKCkgKyBw b3NpdGlvbiwgKG9sZFNpemUgLSBwb3NpdGlvbikgKiBzaXplb2YoQ29sdW1uU3RydWN0KSk7Ci0g ICAgbV9jb2x1bW5zW3Bvc2l0aW9uICsgMV0uc3BhbiA9IG9sZFNwYW4gLSBmaXJzdFNwYW47Cisg ICAgLy8gV2Ugc3BsaXQgdGhlIGNvbHVtbiBhdCAicG9zaXRpb24iLCB0YWtpbmcgImZpcnN0U3Bh biIgY2VsbHMgZnJvbSB0aGUgc3Bhbi4KKyAgICBtX2NvbHVtbnMuaW5zZXJ0KHBvc2l0aW9uLCBD b2x1bW5TdHJ1Y3QoZmlyc3RTcGFuKSk7CisgICAgbV9jb2x1bW5zW3Bvc2l0aW9uICsgMV0uc3Bh biAtPSBmaXJzdFNwYW47CisgICAgQVNTRVJUKG1fY29sdW1uc1twb3NpdGlvbiArIDFdLnNwYW4g PiAwKTsgLy8gRXZlcnkgY29sdW1uIG11c3Qgc3BhbiBhdCBsZWFzdCAxIQogCiAgICAgLy8gUHJv cGFnYXRlIHRoZSBjaGFuZ2UgaW4gb3VyIGNvbHVtbnMgcmVwcmVzZW50YXRpb24gdG8gdGhlIHNl Y3Rpb25zIHRoYXQgZG9uJ3QgbmVlZAogICAgIC8vIGNlbGwgcmVjYWxjLiBJZiB0aGV5IGRvLCB0 aGV5IHdpbGwgYmUgc3luY2VkIHVwIGRpcmVjdGx5IHdpdGggbV9jb2x1bW5zIGxhdGVyLgpAQCAt NzIzLDEwICs3MTksOSBAQCB2b2lkIFJlbmRlclRhYmxlOjpzcGxpdENvbHVtbih1bnNpZ25lZCBw b3NpdGlvbiwgdW5zaWduZWQgZmlyc3RTcGFuKQogCiB2b2lkIFJlbmRlclRhYmxlOjphcHBlbmRD b2x1bW4odW5zaWduZWQgc3BhbikKIHsKLSAgICB1bnNpZ25lZCBwb3MgPSBtX2NvbHVtbnMuc2l6 ZSgpOwotICAgIHVuc2lnbmVkIG5ld1NpemUgPSBwb3MgKyAxOwotICAgIG1fY29sdW1ucy5ncm93 KG5ld1NpemUpOwotICAgIG1fY29sdW1uc1twb3NdLnNwYW4gPSBzcGFuOworICAgIC8vIFNhdmUg b2ZmIHRoZSBpbmRleCBvZiB0aGUgbmV3IGNvbHVtbiBmb3IgdXNlIGluIG5vdGlmeWluZyB0aGUg c2VjdGlvbnMgb2YgdGhpcyBuZXcgY29sdW1uLgorICAgIHVuc2lnbmVkIG5ld0NvbHVtbkluZGV4 ID0gbV9jb2x1bW5zLnNpemUoKTsKKyAgICBtX2NvbHVtbnMuYXBwZW5kKENvbHVtblN0cnVjdChz cGFuKSk7CiAKICAgICAvLyBQcm9wYWdhdGUgdGhlIGNoYW5nZSBpbiBvdXIgY29sdW1ucyByZXBy ZXNlbnRhdGlvbiB0byB0aGUgc2VjdGlvbnMgdGhhdCBkb24ndCBuZWVkCiAgICAgLy8gY2VsbCBy ZWNhbGMuIElmIHRoZXkgZG8sIHRoZXkgd2lsbCBiZSBzeW5jZWQgdXAgZGlyZWN0bHkgd2l0aCBt X2NvbHVtbnMgbGF0ZXIuCkBAIC03MzgsNyArNzMzLDcgQEAgdm9pZCBSZW5kZXJUYWJsZTo6YXBw ZW5kQ29sdW1uKHVuc2lnbmVkIHNwYW4pCiAgICAgICAgIGlmIChzZWN0aW9uLT5uZWVkc0NlbGxS ZWNhbGMoKSkKICAgICAgICAgICAgIGNvbnRpbnVlOwogCi0gICAgICAgIHNlY3Rpb24tPmFwcGVu ZENvbHVtbihwb3MpOworICAgICAgICBzZWN0aW9uLT5hcHBlbmRDb2x1bW4obmV3Q29sdW1uSW5k ZXgpOwogICAgIH0KIAogICAgIG1fY29sdW1uUG9zLmdyb3cobnVtRWZmQ29scygpICsgMSk7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGFibGUuaCBiL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUYWJsZS5oCmluZGV4IDM5MGYyYjM2N2M3OWNkZGI2 NjJhMjNhMmQ1ODU2ZTFmZDA5ZTZkNzQuLmE3YmUyZDU2OGU0M2U5NGVmYWM3YTllODY5OTAwMTc5 OGFhOThlNWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUYWJs ZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUYWJsZS5oCkBAIC0xMjks OCArMTI5LDggQEAgcHVibGljOgogICAgIHZpcnR1YWwgdm9pZCBhZGRDaGlsZChSZW5kZXJPYmpl Y3QqIGNoaWxkLCBSZW5kZXJPYmplY3QqIGJlZm9yZUNoaWxkID0gMCk7CiAKICAgICBzdHJ1Y3Qg Q29sdW1uU3RydWN0IHsKLSAgICAgICAgQ29sdW1uU3RydWN0KCkKLSAgICAgICAgICAgIDogc3Bh bigxKQorICAgICAgICBleHBsaWNpdCBDb2x1bW5TdHJ1Y3QodW5zaWduZWQgaW5pdGlhbFNwYW4g PSAxKQorICAgICAgICAgICAgOiBzcGFuKGluaXRpYWxTcGFuKQogICAgICAgICB7CiAgICAgICAg IH0KIAo= 171067 2012-10-26 18:43:25 -0700 2012-10-30 12:45:38 -0700 Update per Julien's suggestions bug-100428-20121026184158.patch text/plain 4019 eric U3VidmVyc2lvbiBSZXZpc2lvbjogMTMyNTA0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYmY3NDUxODcwNzNhOWNh ZmIyNjFlOTg0M2MxOTEwM2Y3MTQzZjUzZi4uMTFjNDk4NzJjYWEzYzE2NjI3NGRlZjM3MjRkMGI1 MmNkMDY2MDRjNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDEyLTEwLTI1ICBFcmlj IFNlaWRlbCAgPGVyaWNAd2Via2l0Lm9yZz4KKworICAgICAgICBUZWFjaCBSZW5kZXJUYWJsZSBo b3cgdG8gdXNlIFZlY3Rvcjo6aW5zZXJ0IGFuZCBWZWN0b3I6OmFwcGVuZCBpbnN0ZWFkIG9mIGl0 cyBvd24gY3VzdG9tIG1lbW1vdmUgY29kZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTAwNDI4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgUmVuZGVyVGFibGUgaXMgbm93IGxpa2UgYWxsIG90aGVyIGNsaWVu dHMgb2YgVmVjdG9yIGluc3RlYWQgb2YgYmVpbmcKKyAgICAgICAgbmVlZGxlc3NseSBkaWZmZXJl bnQuIDopCisKKyAgICAgICAgaW5zZXJ0LCBhcHBlbmQgYW5kIGdyb3cgYWxsIHVzZSB0aGUgc2Ft ZSBleHBhbmRDYXBhY2l0eSBsb2dpYyB1bmRlciB0aGUgY292ZXJzCisgICAgICAgIGFuZCBWZWN0 b3I6Omluc2VydCB1c2VzIFR5cGVPcGVyYXRpb25zOjptb3ZlT3ZlcmxhcHBpbmcgd2hpY2ggc2hv dWxkIHVzZSBtZW1tb3ZlCisgICAgICAgIGJ5IGRlZmF1bHQgZm9yIHVua25vd24gdHlwZXMuCisK KyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyVGFibGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 UmVuZGVyVGFibGU6OnNwbGl0Q29sdW1uKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRhYmxl OjphcHBlbmRDb2x1bW4pOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJUYWJsZS5oOgorICAg ICAgICAoV2ViQ29yZTo6UmVuZGVyVGFibGU6OkNvbHVtblN0cnVjdDo6Q29sdW1uU3RydWN0KToK KwogMjAxMi0xMC0yNSAgU2ltb24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KIAog ICAgICAgICByMTMyNDI3IGNoYW5nZWQgdGhlIHRpbGluZyBiZWhhdmlvciBvZiB0aWxlZCBsYXll ciBUaWxlQ2FjaGVzIGFzIHdlbGwgYXMgdGhlIHBhZ2UgdGlsZSBjYWNoZQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRhYmxlLmNwcCBiL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJUYWJsZS5jcHAKaW5kZXggODgyMGU2MTRjZjI0YzQ2ZGM3ZjJiNjA1 MWI3YTc2ZjY3OTYzZTg4OS4uYWM3MzI0YzIxZjNlZDA5MzVmZGRhMWFiZTY4ZmUwNTcwNTNlOTdi MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRhYmxlLmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGFibGUuY3BwCkBAIC02OTUsMTQg KzY5NSwxMCBAQCBSZW5kZXJUYWJsZVNlY3Rpb24qIFJlbmRlclRhYmxlOjp0b3BOb25FbXB0eVNl Y3Rpb24oKSBjb25zdAogCiB2b2lkIFJlbmRlclRhYmxlOjpzcGxpdENvbHVtbih1bnNpZ25lZCBw b3NpdGlvbiwgdW5zaWduZWQgZmlyc3RTcGFuKQogewotICAgIC8vIHdlIG5lZWQgdG8gYWRkIGEg bmV3IGNvbHVtblN0cnVjdAotICAgIHVuc2lnbmVkIG9sZFNpemUgPSBtX2NvbHVtbnMuc2l6ZSgp OwotICAgIG1fY29sdW1ucy5ncm93KG9sZFNpemUgKyAxKTsKLSAgICB1bnNpZ25lZCBvbGRTcGFu ID0gbV9jb2x1bW5zW3Bvc2l0aW9uXS5zcGFuOwotICAgIEFTU0VSVChvbGRTcGFuID4gZmlyc3RT cGFuKTsKLSAgICBtX2NvbHVtbnNbcG9zaXRpb25dLnNwYW4gPSBmaXJzdFNwYW47Ci0gICAgbWVt bW92ZShtX2NvbHVtbnMuZGF0YSgpICsgcG9zaXRpb24gKyAxLCBtX2NvbHVtbnMuZGF0YSgpICsg cG9zaXRpb24sIChvbGRTaXplIC0gcG9zaXRpb24pICogc2l6ZW9mKENvbHVtblN0cnVjdCkpOwot ICAgIG1fY29sdW1uc1twb3NpdGlvbiArIDFdLnNwYW4gPSBvbGRTcGFuIC0gZmlyc3RTcGFuOwor ICAgIC8vIFdlIHNwbGl0IHRoZSBjb2x1bW4gYXQgInBvc2l0aW9uIiwgdGFraW5nICJmaXJzdFNw YW4iIGNlbGxzIGZyb20gdGhlIHNwYW4uCisgICAgQVNTRVJUKG1fY29sdW1uc1twb3NpdGlvbl0u c3BhbiA+IGZpcnN0U3Bhbik7CisgICAgbV9jb2x1bW5zLmluc2VydChwb3NpdGlvbiwgQ29sdW1u U3RydWN0KGZpcnN0U3BhbikpOworICAgIG1fY29sdW1uc1twb3NpdGlvbiArIDFdLnNwYW4gLT0g Zmlyc3RTcGFuOwogCiAgICAgLy8gUHJvcGFnYXRlIHRoZSBjaGFuZ2UgaW4gb3VyIGNvbHVtbnMg cmVwcmVzZW50YXRpb24gdG8gdGhlIHNlY3Rpb25zIHRoYXQgZG9uJ3QgbmVlZAogICAgIC8vIGNl bGwgcmVjYWxjLiBJZiB0aGV5IGRvLCB0aGV5IHdpbGwgYmUgc3luY2VkIHVwIGRpcmVjdGx5IHdp dGggbV9jb2x1bW5zIGxhdGVyLgpAQCAtNzIzLDEwICs3MTksOSBAQCB2b2lkIFJlbmRlclRhYmxl OjpzcGxpdENvbHVtbih1bnNpZ25lZCBwb3NpdGlvbiwgdW5zaWduZWQgZmlyc3RTcGFuKQogCiB2 b2lkIFJlbmRlclRhYmxlOjphcHBlbmRDb2x1bW4odW5zaWduZWQgc3BhbikKIHsKLSAgICB1bnNp Z25lZCBwb3MgPSBtX2NvbHVtbnMuc2l6ZSgpOwotICAgIHVuc2lnbmVkIG5ld1NpemUgPSBwb3Mg KyAxOwotICAgIG1fY29sdW1ucy5ncm93KG5ld1NpemUpOwotICAgIG1fY29sdW1uc1twb3NdLnNw YW4gPSBzcGFuOworICAgIC8vIFNhdmUgb2ZmIHRoZSBpbmRleCBvZiB0aGUgbmV3IGNvbHVtbiBm b3IgdXNlIGluIG5vdGlmeWluZyB0aGUgc2VjdGlvbnMgb2YgdGhpcyBuZXcgY29sdW1uLgorICAg IHVuc2lnbmVkIG5ld0NvbHVtbkluZGV4ID0gbV9jb2x1bW5zLnNpemUoKTsKKyAgICBtX2NvbHVt bnMuYXBwZW5kKENvbHVtblN0cnVjdChzcGFuKSk7CiAKICAgICAvLyBQcm9wYWdhdGUgdGhlIGNo YW5nZSBpbiBvdXIgY29sdW1ucyByZXByZXNlbnRhdGlvbiB0byB0aGUgc2VjdGlvbnMgdGhhdCBk b24ndCBuZWVkCiAgICAgLy8gY2VsbCByZWNhbGMuIElmIHRoZXkgZG8sIHRoZXkgd2lsbCBiZSBz eW5jZWQgdXAgZGlyZWN0bHkgd2l0aCBtX2NvbHVtbnMgbGF0ZXIuCkBAIC03MzgsNyArNzMzLDcg QEAgdm9pZCBSZW5kZXJUYWJsZTo6YXBwZW5kQ29sdW1uKHVuc2lnbmVkIHNwYW4pCiAgICAgICAg IGlmIChzZWN0aW9uLT5uZWVkc0NlbGxSZWNhbGMoKSkKICAgICAgICAgICAgIGNvbnRpbnVlOwog Ci0gICAgICAgIHNlY3Rpb24tPmFwcGVuZENvbHVtbihwb3MpOworICAgICAgICBzZWN0aW9uLT5h cHBlbmRDb2x1bW4obmV3Q29sdW1uSW5kZXgpOwogICAgIH0KIAogICAgIG1fY29sdW1uUG9zLmdy b3cobnVtRWZmQ29scygpICsgMSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyVGFibGUuaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUYWJsZS5o CmluZGV4IDM5MGYyYjM2N2M3OWNkZGI2NjJhMjNhMmQ1ODU2ZTFmZDA5ZTZkNzQuLmE3YmUyZDU2 OGU0M2U5NGVmYWM3YTllODY5OTAwMTc5OGFhOThlNWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJUYWJsZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJUYWJsZS5oCkBAIC0xMjksOCArMTI5LDggQEAgcHVibGljOgogICAgIHZpcnR1YWwg dm9pZCBhZGRDaGlsZChSZW5kZXJPYmplY3QqIGNoaWxkLCBSZW5kZXJPYmplY3QqIGJlZm9yZUNo aWxkID0gMCk7CiAKICAgICBzdHJ1Y3QgQ29sdW1uU3RydWN0IHsKLSAgICAgICAgQ29sdW1uU3Ry dWN0KCkKLSAgICAgICAgICAgIDogc3BhbigxKQorICAgICAgICBleHBsaWNpdCBDb2x1bW5TdHJ1 Y3QodW5zaWduZWQgaW5pdGlhbFNwYW4gPSAxKQorICAgICAgICAgICAgOiBzcGFuKGluaXRpYWxT cGFuKQogICAgICAgICB7CiAgICAgICAgIH0KIAo= 171505 2012-10-30 12:45:40 -0700 2012-11-01 09:53:39 -0700 Patch for landing bug-100428-20121030124405.patch text/plain 3922 eric U3VidmVyc2lvbiBSZXZpc2lvbjogMTMyNTA0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYmY3NDUxODcwNzNhOWNh ZmIyNjFlOTg0M2MxOTEwM2Y3MTQzZjUzZi4uOWQ2YzFhMjVjNjdjMDg5NmJiYzhiNmRmOGMxMDA2 YTJiNjk3NmVhYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDEyLTEwLTI1ICBFcmlj IFNlaWRlbCAgPGVyaWNAd2Via2l0Lm9yZz4KKworICAgICAgICBUZWFjaCBSZW5kZXJUYWJsZSBo b3cgdG8gdXNlIFZlY3Rvcjo6aW5zZXJ0IGFuZCBWZWN0b3I6OmFwcGVuZCBpbnN0ZWFkIG9mIGl0 cyBvd24gY3VzdG9tIG1lbW1vdmUgY29kZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTAwNDI4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgSnVsaWVuIENo YWZmcmFpeC4KKworICAgICAgICBSZW5kZXJUYWJsZSBpcyBub3cgbGlrZSBhbGwgb3RoZXIgY2xp ZW50cyBvZiBWZWN0b3IgaW5zdGVhZCBvZiBiZWluZworICAgICAgICBuZWVkbGVzc2x5IGRpZmZl cmVudC4gOikKKworICAgICAgICBpbnNlcnQsIGFwcGVuZCBhbmQgZ3JvdyBhbGwgdXNlIHRoZSBz YW1lIGV4cGFuZENhcGFjaXR5IGxvZ2ljIHVuZGVyIHRoZSBjb3ZlcnMKKyAgICAgICAgYW5kIFZl Y3Rvcjo6aW5zZXJ0IHVzZXMgVHlwZU9wZXJhdGlvbnM6Om1vdmVPdmVybGFwcGluZyB3aGljaCBz aG91bGQgdXNlIG1lbW1vdmUKKyAgICAgICAgYnkgZGVmYXVsdCBmb3IgdW5rbm93biB0eXBlcy4K KworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJUYWJsZS5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpSZW5kZXJUYWJsZTo6c3BsaXRDb2x1bW4pOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGFi bGU6OmFwcGVuZENvbHVtbik6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlclRhYmxlLmg6Cisg ICAgICAgIChXZWJDb3JlOjpSZW5kZXJUYWJsZTo6Q29sdW1uU3RydWN0OjpDb2x1bW5TdHJ1Y3Qp OgorCiAyMDEyLTEwLTI1ICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgog CiAgICAgICAgIHIxMzI0MjcgY2hhbmdlZCB0aGUgdGlsaW5nIGJlaGF2aW9yIG9mIHRpbGVkIGxh eWVyIFRpbGVDYWNoZXMgYXMgd2VsbCBhcyB0aGUgcGFnZSB0aWxlIGNhY2hlCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGFibGUuY3BwIGIvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlclRhYmxlLmNwcAppbmRleCA4ODIwZTYxNGNmMjRjNDZkYzdmMmI2 MDUxYjdhNzZmNjc5NjNlODg5Li43NmY4ZmEzMjE0NjBhOGExOGYwYmY3MWEzZjQ1YzA1NmYzYjA3 NDgyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGFibGUuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUYWJsZS5jcHAKQEAgLTY5NSwx NCArNjk1LDEwIEBAIFJlbmRlclRhYmxlU2VjdGlvbiogUmVuZGVyVGFibGU6OnRvcE5vbkVtcHR5 U2VjdGlvbigpIGNvbnN0CiAKIHZvaWQgUmVuZGVyVGFibGU6OnNwbGl0Q29sdW1uKHVuc2lnbmVk IHBvc2l0aW9uLCB1bnNpZ25lZCBmaXJzdFNwYW4pCiB7Ci0gICAgLy8gd2UgbmVlZCB0byBhZGQg YSBuZXcgY29sdW1uU3RydWN0Ci0gICAgdW5zaWduZWQgb2xkU2l6ZSA9IG1fY29sdW1ucy5zaXpl KCk7Ci0gICAgbV9jb2x1bW5zLmdyb3cob2xkU2l6ZSArIDEpOwotICAgIHVuc2lnbmVkIG9sZFNw YW4gPSBtX2NvbHVtbnNbcG9zaXRpb25dLnNwYW47Ci0gICAgQVNTRVJUKG9sZFNwYW4gPiBmaXJz dFNwYW4pOwotICAgIG1fY29sdW1uc1twb3NpdGlvbl0uc3BhbiA9IGZpcnN0U3BhbjsKLSAgICBt ZW1tb3ZlKG1fY29sdW1ucy5kYXRhKCkgKyBwb3NpdGlvbiArIDEsIG1fY29sdW1ucy5kYXRhKCkg KyBwb3NpdGlvbiwgKG9sZFNpemUgLSBwb3NpdGlvbikgKiBzaXplb2YoQ29sdW1uU3RydWN0KSk7 Ci0gICAgbV9jb2x1bW5zW3Bvc2l0aW9uICsgMV0uc3BhbiA9IG9sZFNwYW4gLSBmaXJzdFNwYW47 CisgICAgLy8gV2Ugc3BsaXQgdGhlIGNvbHVtbiBhdCAicG9zaXRpb24iLCB0YWtpbmcgImZpcnN0 U3BhbiIgY2VsbHMgZnJvbSB0aGUgc3Bhbi4KKyAgICBBU1NFUlQobV9jb2x1bW5zW3Bvc2l0aW9u XS5zcGFuID4gZmlyc3RTcGFuKTsKKyAgICBtX2NvbHVtbnMuaW5zZXJ0KHBvc2l0aW9uLCBDb2x1 bW5TdHJ1Y3QoZmlyc3RTcGFuKSk7CisgICAgbV9jb2x1bW5zW3Bvc2l0aW9uICsgMV0uc3BhbiAt PSBmaXJzdFNwYW47CiAKICAgICAvLyBQcm9wYWdhdGUgdGhlIGNoYW5nZSBpbiBvdXIgY29sdW1u cyByZXByZXNlbnRhdGlvbiB0byB0aGUgc2VjdGlvbnMgdGhhdCBkb24ndCBuZWVkCiAgICAgLy8g Y2VsbCByZWNhbGMuIElmIHRoZXkgZG8sIHRoZXkgd2lsbCBiZSBzeW5jZWQgdXAgZGlyZWN0bHkg d2l0aCBtX2NvbHVtbnMgbGF0ZXIuCkBAIC03MjMsMTAgKzcxOSw4IEBAIHZvaWQgUmVuZGVyVGFi bGU6OnNwbGl0Q29sdW1uKHVuc2lnbmVkIHBvc2l0aW9uLCB1bnNpZ25lZCBmaXJzdFNwYW4pCiAK IHZvaWQgUmVuZGVyVGFibGU6OmFwcGVuZENvbHVtbih1bnNpZ25lZCBzcGFuKQogewotICAgIHVu c2lnbmVkIHBvcyA9IG1fY29sdW1ucy5zaXplKCk7Ci0gICAgdW5zaWduZWQgbmV3U2l6ZSA9IHBv cyArIDE7Ci0gICAgbV9jb2x1bW5zLmdyb3cobmV3U2l6ZSk7Ci0gICAgbV9jb2x1bW5zW3Bvc10u c3BhbiA9IHNwYW47CisgICAgdW5zaWduZWQgbmV3Q29sdW1uSW5kZXggPSBtX2NvbHVtbnMuc2l6 ZSgpOworICAgIG1fY29sdW1ucy5hcHBlbmQoQ29sdW1uU3RydWN0KHNwYW4pKTsKIAogICAgIC8v IFByb3BhZ2F0ZSB0aGUgY2hhbmdlIGluIG91ciBjb2x1bW5zIHJlcHJlc2VudGF0aW9uIHRvIHRo ZSBzZWN0aW9ucyB0aGF0IGRvbid0IG5lZWQKICAgICAvLyBjZWxsIHJlY2FsYy4gSWYgdGhleSBk bywgdGhleSB3aWxsIGJlIHN5bmNlZCB1cCBkaXJlY3RseSB3aXRoIG1fY29sdW1ucyBsYXRlci4K QEAgLTczOCw3ICs3MzIsNyBAQCB2b2lkIFJlbmRlclRhYmxlOjphcHBlbmRDb2x1bW4odW5zaWdu ZWQgc3BhbikKICAgICAgICAgaWYgKHNlY3Rpb24tPm5lZWRzQ2VsbFJlY2FsYygpKQogICAgICAg ICAgICAgY29udGludWU7CiAKLSAgICAgICAgc2VjdGlvbi0+YXBwZW5kQ29sdW1uKHBvcyk7Cisg ICAgICAgIHNlY3Rpb24tPmFwcGVuZENvbHVtbihuZXdDb2x1bW5JbmRleCk7CiAgICAgfQogCiAg ICAgbV9jb2x1bW5Qb3MuZ3JvdyhudW1FZmZDb2xzKCkgKyAxKTsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUYWJsZS5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlclRhYmxlLmgKaW5kZXggMzkwZjJiMzY3Yzc5Y2RkYjY2MmEyM2EyZDU4NTZlMWZk MDllNmQ3NC4uYTdiZTJkNTY4ZTQzZTk0ZWZhYzdhOWU4Njk5MDAxNzk4YWE5OGU1ZCAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRhYmxlLmgKKysrIGIvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRhYmxlLmgKQEAgLTEyOSw4ICsxMjksOCBAQCBwdWJs aWM6CiAgICAgdmlydHVhbCB2b2lkIGFkZENoaWxkKFJlbmRlck9iamVjdCogY2hpbGQsIFJlbmRl ck9iamVjdCogYmVmb3JlQ2hpbGQgPSAwKTsKIAogICAgIHN0cnVjdCBDb2x1bW5TdHJ1Y3Qgewot ICAgICAgICBDb2x1bW5TdHJ1Y3QoKQotICAgICAgICAgICAgOiBzcGFuKDEpCisgICAgICAgIGV4 cGxpY2l0IENvbHVtblN0cnVjdCh1bnNpZ25lZCBpbml0aWFsU3BhbiA9IDEpCisgICAgICAgICAg ICA6IHNwYW4oaW5pdGlhbFNwYW4pCiAgICAgICAgIHsKICAgICAgICAgfQogCg==