148942 2015-09-07 13:44:09 -0700 [CSS Grid Layout] Using {row, column}-axis terms in alignment related logic 2015-09-15 07:49:00 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 60731 1 jfernandez jfernandez commit-queue darin esprehn+autocc glenn hyatt jfernandez kondapallykalyan rego svillar oldest_to_newest 1124162 0 jfernandez 2015-09-07 13:44:09 -0700 Some of the function defined to implement the alignment logic are not clear enough. In order to improve its coherence, we will use the terms row-axis and column-axis to refer the direction the alignment logic is applied to. 1124163 1 260747 jfernandez 2015-09-07 13:52:13 -0700 Created attachment 260747 Patch 1124224 2 260747 svillar 2015-09-08 07:07:38 -0700 Comment on attachment 260747 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=260747&action=review > Source/WebCore/ChangeLog:3 > + [CSS Grid Layout] Using [row, column}-axis terms in alignment related logic Either use ] or } but do not mix them 1125944 3 261189 jfernandez 2015-09-15 06:40:13 -0700 Created attachment 261189 Patch 1125947 4 261191 jfernandez 2015-09-15 06:51:14 -0700 Created attachment 261191 Patch 1125954 5 261191 commit-queue 2015-09-15 07:48:55 -0700 Comment on attachment 261191 Patch Clearing flags on attachment: 261191 Committed r189806: <http://trac.webkit.org/changeset/189806> 1125955 6 commit-queue 2015-09-15 07:49:00 -0700 All reviewed patches have been landed. Closing bug. 260747 2015-09-07 13:52:13 -0700 2015-09-15 06:40:07 -0700 Patch bug-148942-20150907225207.patch text/plain 4771 jfernandez U3VidmVyc2lvbiBSZXZpc2lvbjogMTg5NDY0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZWUwZTRmMGUxNzE1MmM1 ZDExNmM0ODg1ZmIzZDc2MDhlZTZmZmUzNy4uMjIxZmFlOTBmYjJkZTIwZTljYTY0MjdjNjhhMjM5 YTg4NzY1MWEzZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDE1LTA5LTA3ICBKYXZp ZXIgRmVybmFuZGV6ICA8amZlcm5hbmRlekBpZ2FsaWEuY29tPgorCisgICAgICAgIFtDU1MgR3Jp ZCBMYXlvdXRdIFVzaW5nIFtyb3csIGNvbHVtbn0tYXhpcyB0ZXJtcyBpbiBhbGlnbm1lbnQgcmVs YXRlZCBsb2dpYworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTQ4OTQyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgVGhpcyBwYXRjaCBjaGFuZ2VzIHRoZSBuYW1lcyBvZiBzZXZlcmFsIGZ1bmN0aW9ucyBhbmQg dmFyaWFibGVzCisgICAgICAgIGRlZmluZWQgdG8gaW1wbGVtZW50IHRoZSBhbGlnbm1lbnQgbG9n aWMuIFdlIHdhbnQgdG8gdXNlIGZyb20gbm93CisgICAgICAgIG9uIHRoZSB0ZXJtcyByb3ctYXhp cyBhbmQgY29sdW1uLWF4aXMgd2hlbiByZWZlcnJpbmcgdG8gdGhlCisgICAgICAgIGFsaWdubWVu dCBkaXJlY3Rpb24gdGhlIGxvZ2ljIGlzIGFwcGxpZWQgdG8uCisKKyAgICAgICAgTm8gbmV3IHRl c3RzLCBubyBuZXcgZnVuY3Rpb25hbGl0eS4KKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJH cmlkLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckdyaWQ6OmNvbHVtbkF4aXNPZmZzZXRG b3JDaGlsZCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJHcmlkOjpyb3dBeGlzT2Zmc2V0Rm9y Q2hpbGQpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyR3JpZDo6ZmluZENoaWxkTG9naWNhbFBv c2l0aW9uKToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyR3JpZC5oOgorCiAyMDE1LTA5LTA2 ICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CiAKICAgICAgICAgZGlzcGF0Y2hFdmVu dCgpIHNob3VsZCB0aHJvdyBhbiBJbnZhbGlkU3RhdGVFcnJvciBpZiB0aGUgZXZlbnQncyBpbml0 aWFsaXplZCBmbGFnIGlzIG5vdCBzZXQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJHcmlkLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJHcmlk LmNwcAppbmRleCBjN2FiMDFlMGM3NmJiNjExYjkxZDI4OTg2ODBjOTllNGMyMWI2MDk5Li5kYmYz YWFlOTRiOGQ5Yjk0NDdjMGFmZWVjYTA3ZTE4ZmY1YTcwYWFjIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyR3JpZC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlckdyaWQuY3BwCkBAIC0xNTI2LDcgKzE1MjYsNyBAQCBHcmlkQXhpc1Bvc2l0 aW9uIFJlbmRlckdyaWQ6OnJvd0F4aXNQb3NpdGlvbkZvckNoaWxkKGNvbnN0IFJlbmRlckJveCYg Y2hpbGQpIGNvbgogICAgIHJldHVybiBHcmlkQXhpc1N0YXJ0OwogfQogCi1MYXlvdXRVbml0IFJl bmRlckdyaWQ6OnJvd1Bvc2l0aW9uRm9yQ2hpbGQoY29uc3QgUmVuZGVyQm94JiBjaGlsZCkgY29u c3QKK0xheW91dFVuaXQgUmVuZGVyR3JpZDo6Y29sdW1uQXhpc09mZnNldEZvckNoaWxkKGNvbnN0 IFJlbmRlckJveCYgY2hpbGQpIGNvbnN0CiB7CiAgICAgY29uc3QgR3JpZENvb3JkaW5hdGUmIGNv b3JkaW5hdGUgPSBjYWNoZWRHcmlkQ29vcmRpbmF0ZShjaGlsZCk7CiAgICAgTGF5b3V0VW5pdCBz dGFydE9mUm93ID0gbV9yb3dQb3NpdGlvbnNbY29vcmRpbmF0ZS5yb3dzLnJlc29sdmVkSW5pdGlh bFBvc2l0aW9uLnRvSW50KCldOwpAQCAtMTU1MCw3ICsxNTUwLDcgQEAgTGF5b3V0VW5pdCBSZW5k ZXJHcmlkOjpyb3dQb3NpdGlvbkZvckNoaWxkKGNvbnN0IFJlbmRlckJveCYgY2hpbGQpIGNvbnN0 CiB9CiAKIAotTGF5b3V0VW5pdCBSZW5kZXJHcmlkOjpjb2x1bW5Qb3NpdGlvbkZvckNoaWxkKGNv bnN0IFJlbmRlckJveCYgY2hpbGQpIGNvbnN0CitMYXlvdXRVbml0IFJlbmRlckdyaWQ6OnJvd0F4 aXNPZmZzZXRGb3JDaGlsZChjb25zdCBSZW5kZXJCb3gmIGNoaWxkKSBjb25zdAogewogICAgIGNv bnN0IEdyaWRDb29yZGluYXRlJiBjb29yZGluYXRlID0gY2FjaGVkR3JpZENvb3JkaW5hdGUoY2hp bGQpOwogICAgIExheW91dFVuaXQgc3RhcnRPZkNvbHVtbiA9IG1fY29sdW1uUG9zaXRpb25zW2Nv b3JkaW5hdGUuY29sdW1ucy5yZXNvbHZlZEluaXRpYWxQb3NpdGlvbi50b0ludCgpXTsKQEAgLTE1 NzUsMTQgKzE1NzUsMTcgQEAgTGF5b3V0VW5pdCBSZW5kZXJHcmlkOjpjb2x1bW5Qb3NpdGlvbkZv ckNoaWxkKGNvbnN0IFJlbmRlckJveCYgY2hpbGQpIGNvbnN0CiAKIExheW91dFBvaW50IFJlbmRl ckdyaWQ6OmZpbmRDaGlsZExvZ2ljYWxQb3NpdGlvbihjb25zdCBSZW5kZXJCb3gmIGNoaWxkKSBj b25zdAogewotICAgIExheW91dFVuaXQgY29sdW1uUG9zaXRpb24gPSBjb2x1bW5Qb3NpdGlvbkZv ckNoaWxkKGNoaWxkKTsKKyAgICBMYXlvdXRVbml0IHJvd0F4aXNPZmZzZXQgPSByb3dBeGlzT2Zm c2V0Rm9yQ2hpbGQoY2hpbGQpOwogICAgIC8vIFdlIHN0b3JlZCBtX2NvbHVtblBvc2l0aW9ucydz IGRhdGEgaWdub3JpbmcgdGhlIGRpcmVjdGlvbiwgaGVuY2Ugd2UgbWlnaHQgbmVlZCBub3cKICAg ICAvLyB0byB0cmFuc2xhdGUgcG9zaXRpb25zIGZyb20gUlRMIHRvIExUUiwgYXMgaXQncyBtb3Jl IGNvbnZlbmllbnQgZm9yIHBhaW50aW5nLgotICAgIGlmICghc3R5bGUoKS5pc0xlZnRUb1JpZ2h0 RGlyZWN0aW9uKCkpCi0gICAgICAgIGNvbHVtblBvc2l0aW9uID0gKG1fY29sdW1uUG9zaXRpb25z W21fY29sdW1uUG9zaXRpb25zLnNpemUoKSAtIDFdICsgYm9yZGVyQW5kUGFkZGluZ0xvZ2ljYWxM ZWZ0KCkpIC0gY29sdW1uUG9zaXRpb24gIC0gY2hpbGQubG9naWNhbFdpZHRoKCk7CisgICAgaWYg KCFzdHlsZSgpLmlzTGVmdFRvUmlnaHREaXJlY3Rpb24oKSkgeworICAgICAgICBMYXlvdXRVbml0 IGFsaWdubWVudE9mZnNldCA9ICBtX2NvbHVtblBvc2l0aW9uc1swXSAtIGJvcmRlckFuZFBhZGRp bmdTdGFydCgpOworICAgICAgICBMYXlvdXRVbml0IHJpZ2h0R3JpZEVkZ2VQb3NpdGlvbiA9IG1f Y29sdW1uUG9zaXRpb25zW21fY29sdW1uUG9zaXRpb25zLnNpemUoKSAtIDFdICsgYWxpZ25tZW50 T2Zmc2V0ICsgYm9yZGVyQW5kUGFkZGluZ0xvZ2ljYWxMZWZ0KCk7CisgICAgICAgIHJvd0F4aXNP ZmZzZXQgPSByaWdodEdyaWRFZGdlUG9zaXRpb24gLSAocm93QXhpc09mZnNldCArIGNoaWxkLmxv Z2ljYWxXaWR0aCgpKTsKKyAgICB9CiAKICAgICAvLyBUaGUgZ3JpZCBpdGVtcyBzaG91bGQgYmUg aW5zaWRlIHRoZSBncmlkIGNvbnRhaW5lcidzIGJvcmRlciBib3gsIHRoYXQncyB3aHkgdGhleSBu ZWVkIHRvIGJlIHNoaWZ0ZWQuCi0gICAgcmV0dXJuIExheW91dFBvaW50KGNvbHVtblBvc2l0aW9u LCByb3dQb3NpdGlvbkZvckNoaWxkKGNoaWxkKSk7CisgICAgcmV0dXJuIExheW91dFBvaW50KHJv d0F4aXNPZmZzZXQsIGNvbHVtbkF4aXNPZmZzZXRGb3JDaGlsZChjaGlsZCkpOwogfQogCiB2b2lk IFJlbmRlckdyaWQ6OnBhaW50Q2hpbGRyZW4oUGFpbnRJbmZvJiBwYWludEluZm8sIGNvbnN0IExh eW91dFBvaW50JiBwYWludE9mZnNldCwgUGFpbnRJbmZvJiBmb3JDaGlsZCwgYm9vbCB1c2VQcmlu dFJlY3QpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyR3JpZC5o IGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckdyaWQuaAppbmRleCAzNGFkMjZhNTNi MDFiMThiZDYyZGI3ZGQyZDEyMGUzMTNhZGFmYjMzLi4yYjQwNWI1ZGU1YTQ5MGVjZWEzMzMyMTJl YWE5YmY4NDhiMTg2MjhhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyR3JpZC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJHcmlkLmgKQEAg LTEyMCw4ICsxMjAsOCBAQCBwcml2YXRlOgogICAgIExheW91dFVuaXQgbWF4Q29udGVudEZvckNo aWxkKFJlbmRlckJveCYsIEdyaWRUcmFja1NpemluZ0RpcmVjdGlvbiwgVmVjdG9yPEdyaWRUcmFj az4mIGNvbHVtblRyYWNrcyk7CiAgICAgR3JpZEF4aXNQb3NpdGlvbiBjb2x1bW5BeGlzUG9zaXRp b25Gb3JDaGlsZChjb25zdCBSZW5kZXJCb3gmKSBjb25zdDsKICAgICBHcmlkQXhpc1Bvc2l0aW9u IHJvd0F4aXNQb3NpdGlvbkZvckNoaWxkKGNvbnN0IFJlbmRlckJveCYpIGNvbnN0OwotICAgIExh eW91dFVuaXQgcm93UG9zaXRpb25Gb3JDaGlsZChjb25zdCBSZW5kZXJCb3gmKSBjb25zdDsKLSAg ICBMYXlvdXRVbml0IGNvbHVtblBvc2l0aW9uRm9yQ2hpbGQoY29uc3QgUmVuZGVyQm94JikgY29u c3Q7CisgICAgTGF5b3V0VW5pdCBjb2x1bW5BeGlzT2Zmc2V0Rm9yQ2hpbGQoY29uc3QgUmVuZGVy Qm94JikgY29uc3Q7CisgICAgTGF5b3V0VW5pdCByb3dBeGlzT2Zmc2V0Rm9yQ2hpbGQoY29uc3Qg UmVuZGVyQm94JikgY29uc3Q7CiAgICAgTGF5b3V0UG9pbnQgZmluZENoaWxkTG9naWNhbFBvc2l0 aW9uKGNvbnN0IFJlbmRlckJveCYpIGNvbnN0OwogICAgIEdyaWRDb29yZGluYXRlIGNhY2hlZEdy aWRDb29yZGluYXRlKGNvbnN0IFJlbmRlckJveCYpIGNvbnN0OwogCg== 261189 2015-09-15 06:40:13 -0700 2015-09-15 06:51:08 -0700 Patch bug-148942-20150915154002.patch text/plain 4776 jfernandez U3VidmVyc2lvbiBSZXZpc2lvbjogMTg5NDY0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZWUwZTRmMGUxNzE1MmM1 ZDExNmM0ODg1ZmIzZDc2MDhlZTZmZmUzNy4uOGQzMWU1ZGFmM2YyYTJiZGI4MTg0MDE1YjZmY2Y2 ZmY4ZDk4MTMyMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDE1LTA5LTA3ICBKYXZp ZXIgRmVybmFuZGV6ICA8amZlcm5hbmRlekBpZ2FsaWEuY29tPgorCisgICAgICAgIFtDU1MgR3Jp ZCBMYXlvdXRdIFVzaW5nIFtyb3csIGNvbHVtbl0tYXhpcyB0ZXJtcyBpbiBhbGlnbm1lbnQgcmVs YXRlZCBsb2dpYworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTQ4OTQyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgU2VyZ2lvIFZpbGxhciBTZW5pbi4KKwor ICAgICAgICBUaGlzIHBhdGNoIGNoYW5nZXMgdGhlIG5hbWVzIG9mIHNldmVyYWwgZnVuY3Rpb25z IGFuZCB2YXJpYWJsZXMKKyAgICAgICAgZGVmaW5lZCB0byBpbXBsZW1lbnQgdGhlIGFsaWdubWVu dCBsb2dpYy4gV2Ugd2FudCB0byB1c2UgZnJvbSBub3cKKyAgICAgICAgb24gdGhlIHRlcm1zIHJv dy1heGlzIGFuZCBjb2x1bW4tYXhpcyB3aGVuIHJlZmVycmluZyB0byB0aGUKKyAgICAgICAgYWxp Z25tZW50IGRpcmVjdGlvbiB0aGUgbG9naWMgaXMgYXBwbGllZCB0by4KKworICAgICAgICBObyBu ZXcgdGVzdHMsIG5vIG5ldyBmdW5jdGlvbmFsaXR5LgorCisgICAgICAgICogcmVuZGVyaW5nL1Jl bmRlckdyaWQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyR3JpZDo6Y29sdW1uQXhpc09m ZnNldEZvckNoaWxkKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckdyaWQ6OnJvd0F4aXNPZmZz ZXRGb3JDaGlsZCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJHcmlkOjpmaW5kQ2hpbGRMb2dp Y2FsUG9zaXRpb24pOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJHcmlkLmg6CisKIDIwMTUt MDktMDYgIENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KIAogICAgICAgICBkaXNwYXRj aEV2ZW50KCkgc2hvdWxkIHRocm93IGFuIEludmFsaWRTdGF0ZUVycm9yIGlmIHRoZSBldmVudCdz IGluaXRpYWxpemVkIGZsYWcgaXMgbm90IHNldApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlckdyaWQuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl ckdyaWQuY3BwCmluZGV4IGM3YWIwMWUwYzc2YmI2MTFiOTFkMjg5ODY4MGM5OWU0YzIxYjYwOTku LmRiZjNhYWU5NGI4ZDliOTQ0N2MwYWZlZWNhMDdlMThmZjVhNzBhYWMgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJHcmlkLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyR3JpZC5jcHAKQEAgLTE1MjYsNyArMTUyNiw3IEBAIEdyaWRBeGlz UG9zaXRpb24gUmVuZGVyR3JpZDo6cm93QXhpc1Bvc2l0aW9uRm9yQ2hpbGQoY29uc3QgUmVuZGVy Qm94JiBjaGlsZCkgY29uCiAgICAgcmV0dXJuIEdyaWRBeGlzU3RhcnQ7CiB9CiAKLUxheW91dFVu aXQgUmVuZGVyR3JpZDo6cm93UG9zaXRpb25Gb3JDaGlsZChjb25zdCBSZW5kZXJCb3gmIGNoaWxk KSBjb25zdAorTGF5b3V0VW5pdCBSZW5kZXJHcmlkOjpjb2x1bW5BeGlzT2Zmc2V0Rm9yQ2hpbGQo Y29uc3QgUmVuZGVyQm94JiBjaGlsZCkgY29uc3QKIHsKICAgICBjb25zdCBHcmlkQ29vcmRpbmF0 ZSYgY29vcmRpbmF0ZSA9IGNhY2hlZEdyaWRDb29yZGluYXRlKGNoaWxkKTsKICAgICBMYXlvdXRV bml0IHN0YXJ0T2ZSb3cgPSBtX3Jvd1Bvc2l0aW9uc1tjb29yZGluYXRlLnJvd3MucmVzb2x2ZWRJ bml0aWFsUG9zaXRpb24udG9JbnQoKV07CkBAIC0xNTUwLDcgKzE1NTAsNyBAQCBMYXlvdXRVbml0 IFJlbmRlckdyaWQ6OnJvd1Bvc2l0aW9uRm9yQ2hpbGQoY29uc3QgUmVuZGVyQm94JiBjaGlsZCkg Y29uc3QKIH0KIAogCi1MYXlvdXRVbml0IFJlbmRlckdyaWQ6OmNvbHVtblBvc2l0aW9uRm9yQ2hp bGQoY29uc3QgUmVuZGVyQm94JiBjaGlsZCkgY29uc3QKK0xheW91dFVuaXQgUmVuZGVyR3JpZDo6 cm93QXhpc09mZnNldEZvckNoaWxkKGNvbnN0IFJlbmRlckJveCYgY2hpbGQpIGNvbnN0CiB7CiAg ICAgY29uc3QgR3JpZENvb3JkaW5hdGUmIGNvb3JkaW5hdGUgPSBjYWNoZWRHcmlkQ29vcmRpbmF0 ZShjaGlsZCk7CiAgICAgTGF5b3V0VW5pdCBzdGFydE9mQ29sdW1uID0gbV9jb2x1bW5Qb3NpdGlv bnNbY29vcmRpbmF0ZS5jb2x1bW5zLnJlc29sdmVkSW5pdGlhbFBvc2l0aW9uLnRvSW50KCldOwpA QCAtMTU3NSwxNCArMTU3NSwxNyBAQCBMYXlvdXRVbml0IFJlbmRlckdyaWQ6OmNvbHVtblBvc2l0 aW9uRm9yQ2hpbGQoY29uc3QgUmVuZGVyQm94JiBjaGlsZCkgY29uc3QKIAogTGF5b3V0UG9pbnQg UmVuZGVyR3JpZDo6ZmluZENoaWxkTG9naWNhbFBvc2l0aW9uKGNvbnN0IFJlbmRlckJveCYgY2hp bGQpIGNvbnN0CiB7Ci0gICAgTGF5b3V0VW5pdCBjb2x1bW5Qb3NpdGlvbiA9IGNvbHVtblBvc2l0 aW9uRm9yQ2hpbGQoY2hpbGQpOworICAgIExheW91dFVuaXQgcm93QXhpc09mZnNldCA9IHJvd0F4 aXNPZmZzZXRGb3JDaGlsZChjaGlsZCk7CiAgICAgLy8gV2Ugc3RvcmVkIG1fY29sdW1uUG9zaXRp b25zJ3MgZGF0YSBpZ25vcmluZyB0aGUgZGlyZWN0aW9uLCBoZW5jZSB3ZSBtaWdodCBuZWVkIG5v dwogICAgIC8vIHRvIHRyYW5zbGF0ZSBwb3NpdGlvbnMgZnJvbSBSVEwgdG8gTFRSLCBhcyBpdCdz IG1vcmUgY29udmVuaWVudCBmb3IgcGFpbnRpbmcuCi0gICAgaWYgKCFzdHlsZSgpLmlzTGVmdFRv UmlnaHREaXJlY3Rpb24oKSkKLSAgICAgICAgY29sdW1uUG9zaXRpb24gPSAobV9jb2x1bW5Qb3Np dGlvbnNbbV9jb2x1bW5Qb3NpdGlvbnMuc2l6ZSgpIC0gMV0gKyBib3JkZXJBbmRQYWRkaW5nTG9n aWNhbExlZnQoKSkgLSBjb2x1bW5Qb3NpdGlvbiAgLSBjaGlsZC5sb2dpY2FsV2lkdGgoKTsKKyAg ICBpZiAoIXN0eWxlKCkuaXNMZWZ0VG9SaWdodERpcmVjdGlvbigpKSB7CisgICAgICAgIExheW91 dFVuaXQgYWxpZ25tZW50T2Zmc2V0ID0gIG1fY29sdW1uUG9zaXRpb25zWzBdIC0gYm9yZGVyQW5k UGFkZGluZ1N0YXJ0KCk7CisgICAgICAgIExheW91dFVuaXQgcmlnaHRHcmlkRWRnZVBvc2l0aW9u ID0gbV9jb2x1bW5Qb3NpdGlvbnNbbV9jb2x1bW5Qb3NpdGlvbnMuc2l6ZSgpIC0gMV0gKyBhbGln bm1lbnRPZmZzZXQgKyBib3JkZXJBbmRQYWRkaW5nTG9naWNhbExlZnQoKTsKKyAgICAgICAgcm93 QXhpc09mZnNldCA9IHJpZ2h0R3JpZEVkZ2VQb3NpdGlvbiAtIChyb3dBeGlzT2Zmc2V0ICsgY2hp bGQubG9naWNhbFdpZHRoKCkpOworICAgIH0KIAogICAgIC8vIFRoZSBncmlkIGl0ZW1zIHNob3Vs ZCBiZSBpbnNpZGUgdGhlIGdyaWQgY29udGFpbmVyJ3MgYm9yZGVyIGJveCwgdGhhdCdzIHdoeSB0 aGV5IG5lZWQgdG8gYmUgc2hpZnRlZC4KLSAgICByZXR1cm4gTGF5b3V0UG9pbnQoY29sdW1uUG9z aXRpb24sIHJvd1Bvc2l0aW9uRm9yQ2hpbGQoY2hpbGQpKTsKKyAgICByZXR1cm4gTGF5b3V0UG9p bnQocm93QXhpc09mZnNldCwgY29sdW1uQXhpc09mZnNldEZvckNoaWxkKGNoaWxkKSk7CiB9CiAK IHZvaWQgUmVuZGVyR3JpZDo6cGFpbnRDaGlsZHJlbihQYWludEluZm8mIHBhaW50SW5mbywgY29u c3QgTGF5b3V0UG9pbnQmIHBhaW50T2Zmc2V0LCBQYWludEluZm8mIGZvckNoaWxkLCBib29sIHVz ZVByaW50UmVjdCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJH cmlkLmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyR3JpZC5oCmluZGV4IDM0YWQy NmE1M2IwMWIxOGJkNjJkYjdkZDJkMTIwZTMxM2FkYWZiMzMuLjJiNDA1YjVkZTVhNDkwZWNlYTMz MzIxMmVhYTliZjg0OGIxODYyOGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJHcmlkLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckdyaWQu aApAQCAtMTIwLDggKzEyMCw4IEBAIHByaXZhdGU6CiAgICAgTGF5b3V0VW5pdCBtYXhDb250ZW50 Rm9yQ2hpbGQoUmVuZGVyQm94JiwgR3JpZFRyYWNrU2l6aW5nRGlyZWN0aW9uLCBWZWN0b3I8R3Jp ZFRyYWNrPiYgY29sdW1uVHJhY2tzKTsKICAgICBHcmlkQXhpc1Bvc2l0aW9uIGNvbHVtbkF4aXNQ b3NpdGlvbkZvckNoaWxkKGNvbnN0IFJlbmRlckJveCYpIGNvbnN0OwogICAgIEdyaWRBeGlzUG9z aXRpb24gcm93QXhpc1Bvc2l0aW9uRm9yQ2hpbGQoY29uc3QgUmVuZGVyQm94JikgY29uc3Q7Ci0g ICAgTGF5b3V0VW5pdCByb3dQb3NpdGlvbkZvckNoaWxkKGNvbnN0IFJlbmRlckJveCYpIGNvbnN0 OwotICAgIExheW91dFVuaXQgY29sdW1uUG9zaXRpb25Gb3JDaGlsZChjb25zdCBSZW5kZXJCb3gm KSBjb25zdDsKKyAgICBMYXlvdXRVbml0IGNvbHVtbkF4aXNPZmZzZXRGb3JDaGlsZChjb25zdCBS ZW5kZXJCb3gmKSBjb25zdDsKKyAgICBMYXlvdXRVbml0IHJvd0F4aXNPZmZzZXRGb3JDaGlsZChj b25zdCBSZW5kZXJCb3gmKSBjb25zdDsKICAgICBMYXlvdXRQb2ludCBmaW5kQ2hpbGRMb2dpY2Fs UG9zaXRpb24oY29uc3QgUmVuZGVyQm94JikgY29uc3Q7CiAgICAgR3JpZENvb3JkaW5hdGUgY2Fj aGVkR3JpZENvb3JkaW5hdGUoY29uc3QgUmVuZGVyQm94JikgY29uc3Q7CiAK 261191 2015-09-15 06:51:14 -0700 2015-09-15 07:48:55 -0700 Patch bug-148942-20150915155103.patch text/plain 4776 jfernandez U3VidmVyc2lvbiBSZXZpc2lvbjogMTg5NDY0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZWUwZTRmMGUxNzE1MmM1 ZDExNmM0ODg1ZmIzZDc2MDhlZTZmZmUzNy4uNzQyYWNhNzI4MGVlMDdhM2JiMWM3YjIzMjk1ZDYx NmI2MGVkNDY3OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDE1LTA5LTA3ICBKYXZp ZXIgRmVybmFuZGV6ICA8amZlcm5hbmRlekBpZ2FsaWEuY29tPgorCisgICAgICAgIFtDU1MgR3Jp ZCBMYXlvdXRdIFVzaW5nIHtyb3csIGNvbHVtbn0tYXhpcyB0ZXJtcyBpbiBhbGlnbm1lbnQgcmVs YXRlZCBsb2dpYworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTQ4OTQyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgU2VyZ2lvIFZpbGxhciBTZW5pbi4KKwor ICAgICAgICBUaGlzIHBhdGNoIGNoYW5nZXMgdGhlIG5hbWVzIG9mIHNldmVyYWwgZnVuY3Rpb25z IGFuZCB2YXJpYWJsZXMKKyAgICAgICAgZGVmaW5lZCB0byBpbXBsZW1lbnQgdGhlIGFsaWdubWVu dCBsb2dpYy4gV2Ugd2FudCB0byB1c2UgZnJvbSBub3cKKyAgICAgICAgb24gdGhlIHRlcm1zIHJv dy1heGlzIGFuZCBjb2x1bW4tYXhpcyB3aGVuIHJlZmVycmluZyB0byB0aGUKKyAgICAgICAgYWxp Z25tZW50IGRpcmVjdGlvbiB0aGUgbG9naWMgaXMgYXBwbGllZCB0by4KKworICAgICAgICBObyBu ZXcgdGVzdHMsIG5vIG5ldyBmdW5jdGlvbmFsaXR5LgorCisgICAgICAgICogcmVuZGVyaW5nL1Jl bmRlckdyaWQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyR3JpZDo6Y29sdW1uQXhpc09m ZnNldEZvckNoaWxkKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckdyaWQ6OnJvd0F4aXNPZmZz ZXRGb3JDaGlsZCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJHcmlkOjpmaW5kQ2hpbGRMb2dp Y2FsUG9zaXRpb24pOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJHcmlkLmg6CisKIDIwMTUt MDktMDYgIENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KIAogICAgICAgICBkaXNwYXRj aEV2ZW50KCkgc2hvdWxkIHRocm93IGFuIEludmFsaWRTdGF0ZUVycm9yIGlmIHRoZSBldmVudCdz IGluaXRpYWxpemVkIGZsYWcgaXMgbm90IHNldApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlckdyaWQuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl ckdyaWQuY3BwCmluZGV4IGM3YWIwMWUwYzc2YmI2MTFiOTFkMjg5ODY4MGM5OWU0YzIxYjYwOTku LmRiZjNhYWU5NGI4ZDliOTQ0N2MwYWZlZWNhMDdlMThmZjVhNzBhYWMgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJHcmlkLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyR3JpZC5jcHAKQEAgLTE1MjYsNyArMTUyNiw3IEBAIEdyaWRBeGlz UG9zaXRpb24gUmVuZGVyR3JpZDo6cm93QXhpc1Bvc2l0aW9uRm9yQ2hpbGQoY29uc3QgUmVuZGVy Qm94JiBjaGlsZCkgY29uCiAgICAgcmV0dXJuIEdyaWRBeGlzU3RhcnQ7CiB9CiAKLUxheW91dFVu aXQgUmVuZGVyR3JpZDo6cm93UG9zaXRpb25Gb3JDaGlsZChjb25zdCBSZW5kZXJCb3gmIGNoaWxk KSBjb25zdAorTGF5b3V0VW5pdCBSZW5kZXJHcmlkOjpjb2x1bW5BeGlzT2Zmc2V0Rm9yQ2hpbGQo Y29uc3QgUmVuZGVyQm94JiBjaGlsZCkgY29uc3QKIHsKICAgICBjb25zdCBHcmlkQ29vcmRpbmF0 ZSYgY29vcmRpbmF0ZSA9IGNhY2hlZEdyaWRDb29yZGluYXRlKGNoaWxkKTsKICAgICBMYXlvdXRV bml0IHN0YXJ0T2ZSb3cgPSBtX3Jvd1Bvc2l0aW9uc1tjb29yZGluYXRlLnJvd3MucmVzb2x2ZWRJ bml0aWFsUG9zaXRpb24udG9JbnQoKV07CkBAIC0xNTUwLDcgKzE1NTAsNyBAQCBMYXlvdXRVbml0 IFJlbmRlckdyaWQ6OnJvd1Bvc2l0aW9uRm9yQ2hpbGQoY29uc3QgUmVuZGVyQm94JiBjaGlsZCkg Y29uc3QKIH0KIAogCi1MYXlvdXRVbml0IFJlbmRlckdyaWQ6OmNvbHVtblBvc2l0aW9uRm9yQ2hp bGQoY29uc3QgUmVuZGVyQm94JiBjaGlsZCkgY29uc3QKK0xheW91dFVuaXQgUmVuZGVyR3JpZDo6 cm93QXhpc09mZnNldEZvckNoaWxkKGNvbnN0IFJlbmRlckJveCYgY2hpbGQpIGNvbnN0CiB7CiAg ICAgY29uc3QgR3JpZENvb3JkaW5hdGUmIGNvb3JkaW5hdGUgPSBjYWNoZWRHcmlkQ29vcmRpbmF0 ZShjaGlsZCk7CiAgICAgTGF5b3V0VW5pdCBzdGFydE9mQ29sdW1uID0gbV9jb2x1bW5Qb3NpdGlv bnNbY29vcmRpbmF0ZS5jb2x1bW5zLnJlc29sdmVkSW5pdGlhbFBvc2l0aW9uLnRvSW50KCldOwpA QCAtMTU3NSwxNCArMTU3NSwxNyBAQCBMYXlvdXRVbml0IFJlbmRlckdyaWQ6OmNvbHVtblBvc2l0 aW9uRm9yQ2hpbGQoY29uc3QgUmVuZGVyQm94JiBjaGlsZCkgY29uc3QKIAogTGF5b3V0UG9pbnQg UmVuZGVyR3JpZDo6ZmluZENoaWxkTG9naWNhbFBvc2l0aW9uKGNvbnN0IFJlbmRlckJveCYgY2hp bGQpIGNvbnN0CiB7Ci0gICAgTGF5b3V0VW5pdCBjb2x1bW5Qb3NpdGlvbiA9IGNvbHVtblBvc2l0 aW9uRm9yQ2hpbGQoY2hpbGQpOworICAgIExheW91dFVuaXQgcm93QXhpc09mZnNldCA9IHJvd0F4 aXNPZmZzZXRGb3JDaGlsZChjaGlsZCk7CiAgICAgLy8gV2Ugc3RvcmVkIG1fY29sdW1uUG9zaXRp b25zJ3MgZGF0YSBpZ25vcmluZyB0aGUgZGlyZWN0aW9uLCBoZW5jZSB3ZSBtaWdodCBuZWVkIG5v dwogICAgIC8vIHRvIHRyYW5zbGF0ZSBwb3NpdGlvbnMgZnJvbSBSVEwgdG8gTFRSLCBhcyBpdCdz IG1vcmUgY29udmVuaWVudCBmb3IgcGFpbnRpbmcuCi0gICAgaWYgKCFzdHlsZSgpLmlzTGVmdFRv UmlnaHREaXJlY3Rpb24oKSkKLSAgICAgICAgY29sdW1uUG9zaXRpb24gPSAobV9jb2x1bW5Qb3Np dGlvbnNbbV9jb2x1bW5Qb3NpdGlvbnMuc2l6ZSgpIC0gMV0gKyBib3JkZXJBbmRQYWRkaW5nTG9n aWNhbExlZnQoKSkgLSBjb2x1bW5Qb3NpdGlvbiAgLSBjaGlsZC5sb2dpY2FsV2lkdGgoKTsKKyAg ICBpZiAoIXN0eWxlKCkuaXNMZWZ0VG9SaWdodERpcmVjdGlvbigpKSB7CisgICAgICAgIExheW91 dFVuaXQgYWxpZ25tZW50T2Zmc2V0ID0gIG1fY29sdW1uUG9zaXRpb25zWzBdIC0gYm9yZGVyQW5k UGFkZGluZ1N0YXJ0KCk7CisgICAgICAgIExheW91dFVuaXQgcmlnaHRHcmlkRWRnZVBvc2l0aW9u ID0gbV9jb2x1bW5Qb3NpdGlvbnNbbV9jb2x1bW5Qb3NpdGlvbnMuc2l6ZSgpIC0gMV0gKyBhbGln bm1lbnRPZmZzZXQgKyBib3JkZXJBbmRQYWRkaW5nTG9naWNhbExlZnQoKTsKKyAgICAgICAgcm93 QXhpc09mZnNldCA9IHJpZ2h0R3JpZEVkZ2VQb3NpdGlvbiAtIChyb3dBeGlzT2Zmc2V0ICsgY2hp bGQubG9naWNhbFdpZHRoKCkpOworICAgIH0KIAogICAgIC8vIFRoZSBncmlkIGl0ZW1zIHNob3Vs ZCBiZSBpbnNpZGUgdGhlIGdyaWQgY29udGFpbmVyJ3MgYm9yZGVyIGJveCwgdGhhdCdzIHdoeSB0 aGV5IG5lZWQgdG8gYmUgc2hpZnRlZC4KLSAgICByZXR1cm4gTGF5b3V0UG9pbnQoY29sdW1uUG9z aXRpb24sIHJvd1Bvc2l0aW9uRm9yQ2hpbGQoY2hpbGQpKTsKKyAgICByZXR1cm4gTGF5b3V0UG9p bnQocm93QXhpc09mZnNldCwgY29sdW1uQXhpc09mZnNldEZvckNoaWxkKGNoaWxkKSk7CiB9CiAK IHZvaWQgUmVuZGVyR3JpZDo6cGFpbnRDaGlsZHJlbihQYWludEluZm8mIHBhaW50SW5mbywgY29u c3QgTGF5b3V0UG9pbnQmIHBhaW50T2Zmc2V0LCBQYWludEluZm8mIGZvckNoaWxkLCBib29sIHVz ZVByaW50UmVjdCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJH cmlkLmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyR3JpZC5oCmluZGV4IDM0YWQy NmE1M2IwMWIxOGJkNjJkYjdkZDJkMTIwZTMxM2FkYWZiMzMuLjJiNDA1YjVkZTVhNDkwZWNlYTMz MzIxMmVhYTliZjg0OGIxODYyOGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJHcmlkLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckdyaWQu aApAQCAtMTIwLDggKzEyMCw4IEBAIHByaXZhdGU6CiAgICAgTGF5b3V0VW5pdCBtYXhDb250ZW50 Rm9yQ2hpbGQoUmVuZGVyQm94JiwgR3JpZFRyYWNrU2l6aW5nRGlyZWN0aW9uLCBWZWN0b3I8R3Jp ZFRyYWNrPiYgY29sdW1uVHJhY2tzKTsKICAgICBHcmlkQXhpc1Bvc2l0aW9uIGNvbHVtbkF4aXNQ b3NpdGlvbkZvckNoaWxkKGNvbnN0IFJlbmRlckJveCYpIGNvbnN0OwogICAgIEdyaWRBeGlzUG9z aXRpb24gcm93QXhpc1Bvc2l0aW9uRm9yQ2hpbGQoY29uc3QgUmVuZGVyQm94JikgY29uc3Q7Ci0g ICAgTGF5b3V0VW5pdCByb3dQb3NpdGlvbkZvckNoaWxkKGNvbnN0IFJlbmRlckJveCYpIGNvbnN0 OwotICAgIExheW91dFVuaXQgY29sdW1uUG9zaXRpb25Gb3JDaGlsZChjb25zdCBSZW5kZXJCb3gm KSBjb25zdDsKKyAgICBMYXlvdXRVbml0IGNvbHVtbkF4aXNPZmZzZXRGb3JDaGlsZChjb25zdCBS ZW5kZXJCb3gmKSBjb25zdDsKKyAgICBMYXlvdXRVbml0IHJvd0F4aXNPZmZzZXRGb3JDaGlsZChj b25zdCBSZW5kZXJCb3gmKSBjb25zdDsKICAgICBMYXlvdXRQb2ludCBmaW5kQ2hpbGRMb2dpY2Fs UG9zaXRpb24oY29uc3QgUmVuZGVyQm94JikgY29uc3Q7CiAgICAgR3JpZENvb3JkaW5hdGUgY2Fj aGVkR3JpZENvb3JkaW5hdGUoY29uc3QgUmVuZGVyQm94JikgY29uc3Q7CiAK