158065 2016-05-25 04:14:46 -0700 [css-grid] Refactor populateGridPositions() 2016-05-25 04:46:53 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 60731 155197 1 svillar svillar commit-queue darin esprehn+autocc glenn jfernandez kling koivisto kondapallykalyan rego svillar oldest_to_newest 1196286 0 svillar 2016-05-25 04:14:46 -0700 [css-grid] Refactor populateGridPositions() 1196289 1 279757 svillar 2016-05-25 04:19:09 -0700 Created attachment 279757 Patch 1196293 2 svillar 2016-05-25 04:31:32 -0700 Committed r201379: <http://trac.webkit.org/changeset/201379> 279757 2016-05-25 04:19:09 -0700 2016-05-25 04:24:53 -0700 Patch bug-158065-20160525132015.patch text/plain 6612 svillar U3VidmVyc2lvbiBSZXZpc2lvbjogMjAxMjEyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjYxMWI5OWJlZjkwMmZm OGFiMmFjMzIyZWE2MTE0MWFlMDU2OTczNC4uZDE4NTdmZWNlYjUxNWUxMDEwMjY2YjdmMGNjZDdi OTA1ODU4ODcxZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDE2LTA1LTI1ICBTZXJn aW8gVmlsbGFyIFNlbmluICA8c3ZpbGxhckBpZ2FsaWEuY29tPgorCisgICAgICAgIFtjc3MtZ3Jp ZF0gUmVmYWN0b3IgcG9wdWxhdGVHcmlkUG9zaXRpb25zKCkKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1ODA2NQorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJlbmRlckdyaWQ6OnBvcHVsYXRlR3JpZFBvc2l0 aW9ucygpIHdhcyBkb2luZyBleGFjdGx5IHRoZSBzYW1lIHRoaW5nIGZvciBjb2x1bW5zIGFuZCBy b3dzCisgICAgICAgIGJ1dCB1c2luZyBkaWZmZXJlbnQgZGF0YSBzdHJ1Y3R1cmVzLiBUaGF0IGxl YWQgdG8gYSBsb3Qgb2YgZHVwbGljYXRlZCBjb2RlLiBJdCdzIGVhc3kgdG8KKyAgICAgICAgcmVm YWN0b3IgaXQgaW4gYSBuZXcgZnVuY3Rpb24gdGhhdCBwcm9wZXJseSBzZWxlY3QgdGhlIGRhdGEg c3RydWN0dXJlcyB0byBvcGVyYXRlIG9uIGJhc2VkCisgICAgICAgIG9uIHRoZSBkaXJlY3Rpb24u CisKKyAgICAgICAgTm8gbmV3IHRlc3RzIGFzIHRoZXJlIGlzIG5vIGNoYW5nZSBpbiBiZWhhdmlv dXIuCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyR3JpZC5jcHA6CisgICAgICAgIChXZWJD b3JlOjpSZW5kZXJHcmlkOjpsYXlvdXRHcmlkSXRlbXMpOgorICAgICAgICAoV2ViQ29yZTo6UmVu ZGVyR3JpZDo6cG9wdWxhdGVHcmlkUG9zaXRpb25zRm9yRGlyZWN0aW9uKTogUmVmYWN0b3JlZCBm cm9tCisgICAgICAgIHBvcHVsYXRlR3JpZFBvc2l0aW9ucygpLgorICAgICAgICAoV2ViQ29yZTo6 UmVuZGVyR3JpZDo6cG9wdWxhdGVHcmlkUG9zaXRpb25zKTogRGVsZXRlZC4KKyAgICAgICAgKiBy ZW5kZXJpbmcvUmVuZGVyR3JpZC5oOgorCiAyMDE2LTA1LTE5ICBUaW0gSG9ydG9uICA8dGltb3Ro eV9ob3J0b25AYXBwbGUuY29tPgogCiAgICAgICAgIFJFR1JFU1NJT04gKHIyMDA2MzgpOiAtW0RP TUhUTUxWaWRlb0VsZW1lbnQgcGxheV0gZGlzYXBwZWFyZWQgZnJvbSBPYmpDIGJpbmRpbmdzCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyR3JpZC5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyR3JpZC5jcHAKaW5kZXggZTVhY2U3NzY1ZWFiYmU1 ZDQ3NDg0OWI1N2ZmMmRlODYyZTY5NTM2ZS4uZWZhZDE0ZGY5YmIyMTJiYmI2NWVkNGI5OTYzZDQ3 Y2NhNzU0ZTA1MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckdy aWQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJHcmlkLmNwcApAQCAt MTU0NCw3ICsxNTQ0LDggQEAgdm9pZCBSZW5kZXJHcmlkOjphcHBseVN0cmV0Y2hBbGlnbm1lbnRU b1RyYWNrc0lmTmVlZGVkKEdyaWRUcmFja1NpemluZ0RpcmVjdGlvbgogCiB2b2lkIFJlbmRlckdy aWQ6OmxheW91dEdyaWRJdGVtcyhHcmlkU2l6aW5nRGF0YSYgc2l6aW5nRGF0YSkKIHsKLSAgICBw b3B1bGF0ZUdyaWRQb3NpdGlvbnMoc2l6aW5nRGF0YSk7CisgICAgcG9wdWxhdGVHcmlkUG9zaXRp b25zRm9yRGlyZWN0aW9uKHNpemluZ0RhdGEsIEZvckNvbHVtbnMpOworICAgIHBvcHVsYXRlR3Jp ZFBvc2l0aW9uc0ZvckRpcmVjdGlvbihzaXppbmdEYXRhLCBGb3JSb3dzKTsKIAogICAgIGZvciAo UmVuZGVyQm94KiBjaGlsZCA9IGZpcnN0Q2hpbGRCb3goKTsgY2hpbGQ7IGNoaWxkID0gY2hpbGQt Pm5leHRTaWJsaW5nQm94KCkpIHsKICAgICAgICAgaWYgKGNoaWxkLT5pc091dE9mRmxvd1Bvc2l0 aW9uZWQoKSkgewpAQCAtMTc0Niw3ICsxNzQ3LDcgQEAgTGF5b3V0VW5pdCBSZW5kZXJHcmlkOjpn cmlkQXJlYUJyZWFkdGhGb3JDaGlsZEluY2x1ZGluZ0FsaWdubWVudE9mZnNldHMoY29uc3QgUmUK ICAgICByZXR1cm4gZmluYWxUcmFja1Bvc2l0aW9uIC0gaW5pdGlhbFRyYWNrUG9zaXRpb24gKyB0 cmFja3Nbc3Bhbi5lbmRMaW5lKCkgLSAxXS5iYXNlU2l6ZSgpOwogfQogCi12b2lkIFJlbmRlckdy aWQ6OnBvcHVsYXRlR3JpZFBvc2l0aW9ucyhHcmlkU2l6aW5nRGF0YSYgc2l6aW5nRGF0YSkKK3Zv aWQgUmVuZGVyR3JpZDo6cG9wdWxhdGVHcmlkUG9zaXRpb25zRm9yRGlyZWN0aW9uKEdyaWRTaXpp bmdEYXRhJiBzaXppbmdEYXRhLCBHcmlkVHJhY2tTaXppbmdEaXJlY3Rpb24gZGlyZWN0aW9uKQog ewogICAgIC8vIFNpbmNlIHdlIGFkZCBhbGlnbm1lbnQgb2Zmc2V0cyBhbmQgdHJhY2sgZ3V0dGVy cywgZ3JpZCBsaW5lcyBhcmUgbm90IGFsd2F5cyBhZGphY2VudC4gSGVuY2Ugd2Ugd2lsbCBoYXZl IHRvCiAgICAgLy8gYXNzdW1lIGZyb20gbm93IG9uIHRoYXQgd2UganVzdCBzdG9yZSBwb3NpdGlv bnMgb2YgdGhlIGluaXRpYWwgZ3JpZCBsaW5lcyBvZiBlYWNoIHRyYWNrLApAQCAtMTc1NSwzMSAr MTc1NiwyMyBAQCB2b2lkIFJlbmRlckdyaWQ6OnBvcHVsYXRlR3JpZFBvc2l0aW9ucyhHcmlkU2l6 aW5nRGF0YSYgc2l6aW5nRGF0YSkKICAgICAvLyBUaGUgZ3JpZCBjb250YWluZXIncyBmcmFtZSBl bGVtZW50cyAoYm9yZGVyLCBwYWRkaW5nIGFuZCA8Y29udGVudC1wb3NpdGlvbj4gb2Zmc2V0KSBh cmUgc2Vuc2libGUgdG8gdGhlCiAgICAgLy8gaW5saW5lLWF4aXMgZmxvdyBkaXJlY3Rpb24uIEhv d2V2ZXIsIGNvbHVtbiBsaW5lcyBwb3NpdGlvbnMgYXJlICdkaXJlY3Rpb24nIHVuYXdhcmUuIFRo aXMgc2ltcGxpZmljYXRpb24KICAgICAvLyBhbGxvd3MgdXMgdG8gdXNlIHRoZSBzYW1lIGluZGV4 ZXMgdG8gaWRlbnRpZnkgdGhlIGNvbHVtbnMgaW5kZXBlbmRlbnRseSBvbiB0aGUgaW5saW5lLWF4 aXMgZGlyZWN0aW9uLgotICAgIHVuc2lnbmVkIG51bWJlck9mVHJhY2tzID0gc2l6aW5nRGF0YS5j b2x1bW5UcmFja3Muc2l6ZSgpOworICAgIGJvb2wgaXNSb3dBeGlzID0gZGlyZWN0aW9uID09IEZv ckNvbHVtbnM7CisgICAgYXV0byYgdHJhY2tzID0gaXNSb3dBeGlzID8gc2l6aW5nRGF0YS5jb2x1 bW5UcmFja3MgOiBzaXppbmdEYXRhLnJvd1RyYWNrczsKKyAgICB1bnNpZ25lZCBudW1iZXJPZlRy YWNrcyA9IHRyYWNrcy5zaXplKCk7CiAgICAgdW5zaWduZWQgbnVtYmVyT2ZMaW5lcyA9IG51bWJl ck9mVHJhY2tzICsgMTsKICAgICB1bnNpZ25lZCBsYXN0TGluZSA9IG51bWJlck9mTGluZXMgLSAx OwogICAgIHVuc2lnbmVkIG5leHRUb0xhc3RMaW5lID0gbnVtYmVyT2ZMaW5lcyAtIDI7Ci0gICAg Q29udGVudEFsaWdubWVudERhdGEgb2Zmc2V0ID0gY29tcHV0ZUNvbnRlbnRQb3NpdGlvbkFuZERp c3RyaWJ1dGlvbk9mZnNldChGb3JDb2x1bW5zLCBzaXppbmdEYXRhLmZyZWVTcGFjZUZvckRpcmVj dGlvbihGb3JDb2x1bW5zKS52YWx1ZSgpLCBudW1iZXJPZlRyYWNrcyk7Ci0gICAgTGF5b3V0VW5p dCB0cmFja0dhcCA9IGd1dHRlcnNTaXplKEZvckNvbHVtbnMsIDIpOwotICAgIG1fY29sdW1uUG9z aXRpb25zLnJlc2l6ZShudW1iZXJPZkxpbmVzKTsKLSAgICBtX2NvbHVtblBvc2l0aW9uc1swXSA9 IGJvcmRlckFuZFBhZGRpbmdMb2dpY2FsTGVmdCgpICsgb2Zmc2V0LnBvc2l0aW9uT2Zmc2V0Owot ICAgIGZvciAodW5zaWduZWQgaSA9IDA7IGkgPCBuZXh0VG9MYXN0TGluZTsgKytpKQotICAgICAg ICBtX2NvbHVtblBvc2l0aW9uc1tpICsgMV0gPSBtX2NvbHVtblBvc2l0aW9uc1tpXSArIG9mZnNl dC5kaXN0cmlidXRpb25PZmZzZXQgKyBzaXppbmdEYXRhLmNvbHVtblRyYWNrc1tpXS5iYXNlU2l6 ZSgpICsgdHJhY2tHYXA7Ci0gICAgbV9jb2x1bW5Qb3NpdGlvbnNbbGFzdExpbmVdID0gbV9jb2x1 bW5Qb3NpdGlvbnNbbmV4dFRvTGFzdExpbmVdICsgc2l6aW5nRGF0YS5jb2x1bW5UcmFja3NbbmV4 dFRvTGFzdExpbmVdLmJhc2VTaXplKCk7Ci0gICAgbV9vZmZzZXRCZXR3ZWVuQ29sdW1ucyA9IG9m ZnNldC5kaXN0cmlidXRpb25PZmZzZXQ7Ci0KLSAgICBudW1iZXJPZlRyYWNrcyA9IHNpemluZ0Rh dGEucm93VHJhY2tzLnNpemUoKTsKLSAgICBudW1iZXJPZkxpbmVzID0gbnVtYmVyT2ZUcmFja3Mg KyAxOwotICAgIGxhc3RMaW5lID0gbnVtYmVyT2ZMaW5lcyAtIDE7Ci0gICAgbmV4dFRvTGFzdExp bmUgPSBudW1iZXJPZkxpbmVzIC0gMjsKLSAgICBvZmZzZXQgPSBjb21wdXRlQ29udGVudFBvc2l0 aW9uQW5kRGlzdHJpYnV0aW9uT2Zmc2V0KEZvclJvd3MsIHNpemluZ0RhdGEuZnJlZVNwYWNlRm9y RGlyZWN0aW9uKEZvclJvd3MpLnZhbHVlKCksIG51bWJlck9mVHJhY2tzKTsKLSAgICB0cmFja0dh cCA9IGd1dHRlcnNTaXplKEZvclJvd3MsIDIpOwotICAgIG1fcm93UG9zaXRpb25zLnJlc2l6ZShu dW1iZXJPZkxpbmVzKTsKLSAgICBtX3Jvd1Bvc2l0aW9uc1swXSA9IGJvcmRlckFuZFBhZGRpbmdC ZWZvcmUoKSArIG9mZnNldC5wb3NpdGlvbk9mZnNldDsKKyAgICBDb250ZW50QWxpZ25tZW50RGF0 YSBvZmZzZXQgPSBjb21wdXRlQ29udGVudFBvc2l0aW9uQW5kRGlzdHJpYnV0aW9uT2Zmc2V0KGRp cmVjdGlvbiwgc2l6aW5nRGF0YS5mcmVlU3BhY2VGb3JEaXJlY3Rpb24oZGlyZWN0aW9uKS52YWx1 ZSgpLCBudW1iZXJPZlRyYWNrcyk7CisgICAgTGF5b3V0VW5pdCB0cmFja0dhcCA9IGd1dHRlcnNT aXplKGRpcmVjdGlvbiwgMik7CisgICAgYXV0byYgcG9zaXRpb25zID0gaXNSb3dBeGlzID8gbV9j b2x1bW5Qb3NpdGlvbnMgOiBtX3Jvd1Bvc2l0aW9uczsKKyAgICBwb3NpdGlvbnMucmVzaXplKG51 bWJlck9mTGluZXMpOworICAgIGF1dG8gYm9yZGVyQW5kUGFkZGluZyA9IGlzUm93QXhpcyA/IGJv cmRlckFuZFBhZGRpbmdMb2dpY2FsTGVmdCgpIDogYm9yZGVyQW5kUGFkZGluZ0JlZm9yZSgpOwor ICAgIHBvc2l0aW9uc1swXSA9IGJvcmRlckFuZFBhZGRpbmcgKyBvZmZzZXQucG9zaXRpb25PZmZz ZXQ7CiAgICAgZm9yICh1bnNpZ25lZCBpID0gMDsgaSA8IG5leHRUb0xhc3RMaW5lOyArK2kpCi0g ICAgICAgIG1fcm93UG9zaXRpb25zW2kgKyAxXSA9IG1fcm93UG9zaXRpb25zW2ldICsgb2Zmc2V0 LmRpc3RyaWJ1dGlvbk9mZnNldCArIHNpemluZ0RhdGEucm93VHJhY2tzW2ldLmJhc2VTaXplKCkg KyB0cmFja0dhcDsKLSAgICBtX3Jvd1Bvc2l0aW9uc1tsYXN0TGluZV0gPSBtX3Jvd1Bvc2l0aW9u c1tuZXh0VG9MYXN0TGluZV0gKyBzaXppbmdEYXRhLnJvd1RyYWNrc1tuZXh0VG9MYXN0TGluZV0u YmFzZVNpemUoKTsKLSAgICBtX29mZnNldEJldHdlZW5Sb3dzID0gb2Zmc2V0LmRpc3RyaWJ1dGlv bk9mZnNldDsKKyAgICAgICAgcG9zaXRpb25zW2kgKyAxXSA9IHBvc2l0aW9uc1tpXSArIG9mZnNl dC5kaXN0cmlidXRpb25PZmZzZXQgKyB0cmFja3NbaV0uYmFzZVNpemUoKSArIHRyYWNrR2FwOwor ICAgIHBvc2l0aW9uc1tsYXN0TGluZV0gPSBwb3NpdGlvbnNbbmV4dFRvTGFzdExpbmVdICsgdHJh Y2tzW25leHRUb0xhc3RMaW5lXS5iYXNlU2l6ZSgpOworICAgIGF1dG8mIG9mZnNldEJldHdlZW5U cmFja3MgPSBpc1Jvd0F4aXMgPyBtX29mZnNldEJldHdlZW5Db2x1bW5zIDogbV9vZmZzZXRCZXR3 ZWVuUm93czsKKyAgICBvZmZzZXRCZXR3ZWVuVHJhY2tzID0gb2Zmc2V0LmRpc3RyaWJ1dGlvbk9m ZnNldDsKIH0KIAogc3RhdGljIGlubGluZSBMYXlvdXRVbml0IGNvbXB1dGVPdmVyZmxvd0FsaWdu bWVudE9mZnNldChPdmVyZmxvd0FsaWdubWVudCBvdmVyZmxvdywgTGF5b3V0VW5pdCB0cmFja0Jy ZWFkdGgsIExheW91dFVuaXQgY2hpbGRCcmVhZHRoKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlckdyaWQuaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJHcmlkLmgKaW5kZXggZGJkOTk0ODY3MjQwMzNjMDQ3OTZiMzY3ODQ4ZmU1ZDE3YzM2ZGE0Ni4u NDdhMDBhN2Q2ODdkNGI2MjZjYjMyMDk5ZTFjZTc0YTE4ZTM1NDdhZiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckdyaWQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyR3JpZC5oCkBAIC0xMDMsNyArMTAzLDcgQEAgcHJpdmF0ZToKICAgICB2 b2lkIGNvbXB1dGVUcmFja1NpemVzRm9yRGlyZWN0aW9uKEdyaWRUcmFja1NpemluZ0RpcmVjdGlv biwgR3JpZFNpemluZ0RhdGEmLCBMYXlvdXRVbml0IGZyZWVTcGFjZSk7CiAKICAgICB2b2lkIGxh eW91dEdyaWRJdGVtcyhHcmlkU2l6aW5nRGF0YSYpOwotICAgIHZvaWQgcG9wdWxhdGVHcmlkUG9z aXRpb25zKEdyaWRTaXppbmdEYXRhJik7CisgICAgdm9pZCBwb3B1bGF0ZUdyaWRQb3NpdGlvbnNG b3JEaXJlY3Rpb24oR3JpZFNpemluZ0RhdGEmLCBHcmlkVHJhY2tTaXppbmdEaXJlY3Rpb24pOwog ICAgIHZvaWQgY2xlYXJHcmlkKCk7CiAKICAgICBlbnVtIFRyYWNrU2l6ZVJlc3RyaWN0aW9uIHsK