27704 2009-07-27 03:16:35 -0700 Refactor the first step of layout in RenderFlexibleBox.cpp 2009-07-29 01:10:04 -0700 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 hamaji levin levin oldest_to_newest 134879 0 hamaji 2009-07-27 03:16:35 -0700 The first steps of RenderFlexibleBox::layoutHorizontalBox and RenderFlexibleBox::layoutVerticalBox are identical. We may be able to factor the code out to reduce duplication. 134880 1 33529 hamaji 2009-07-27 03:18:24 -0700 Created attachment 33529 Patch v1 --- 2 files changed, 44 insertions(+), 41 deletions(-) 135272 2 33529 eric 2009-07-28 10:54:29 -0700 Comment on attachment 33529 Patch v1 It's difficult to read the diff, but this looks right. Looks like you're just sharing code between two functions which should have been shared long ago! 135507 3 levin 2009-07-29 00:22:23 -0700 Assigned to levin for landing. 135523 4 levin 2009-07-29 01:10:04 -0700 Committed as http://trac.webkit.org/changeset/46525 33529 2009-07-27 03:18:24 -0700 2009-07-28 10:54:29 -0700 Patch v1 bug-27704-20090727191823.patch text/plain 4743 hamaji ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg MmJmZWI2OC4uMzAxY2M1YSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAwOS0wNy0yNyAgU2hpbmljaGlybyBI YW1hamkgIDxoYW1hamlAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFJlZmFjdG9yIHRoZSBmaXJzdCBzdGVwIG9mIGxheW91dCBp biBSZW5kZXJGbGV4aWJsZUJveC5jcHAKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTI3NzA0CisKKyAgICAgICAgTm8gbmV3IHRlc3RzIGFzIHRoaXMgY2hh bmdlIGlzIGp1c3QgYSByZWZhY3RvcmluZy4KKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJG bGV4aWJsZUJveC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpnYXRoZXJGbGV4Q2hpbGRyZW5JbmZv KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckZsZXhpYmxlQm94OjpsYXlvdXRIb3Jpem9udGFs Qm94KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckZsZXhpYmxlQm94OjpsYXlvdXRWZXJ0aWNh bEJveCk6CisKIDIwMDktMDctMjcgIFBhdmVsIEZlbGRtYW4gIDxwZmVsZG1hbkBjaHJvbWl1bS5v cmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgVGltb3RoeSBIYXRjaGVyLgpkaWZmIC0tZ2l0IGEv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3BwIGIvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyRmxleGlibGVCb3guY3BwCmluZGV4IGU5ZmM3YWEuLjczMjY3NjggMTAwNjQ0Ci0t LSBhL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmNwcAorKysgYi9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHAKQEAgLTMwOCwyMyArMzA4LDEwIEBAIHZv aWQgUmVuZGVyRmxleGlibGVCb3g6OmxheW91dEJsb2NrKGJvb2wgcmVsYXlvdXRDaGlsZHJlbikK ICAgICBzZXROZWVkc0xheW91dChmYWxzZSk7CiB9CiAKLXZvaWQgUmVuZGVyRmxleGlibGVCb3g6 OmxheW91dEhvcml6b250YWxCb3goYm9vbCByZWxheW91dENoaWxkcmVuKQorLy8gVGhlIGZpcnN0 IHdhbGsgb3ZlciBvdXIga2lkcyBpcyB0byBmaW5kIG91dCBpZiB3ZSBoYXZlIGFueSBmbGV4aWJs ZSBjaGlsZHJlbi4KK3N0YXRpYyB2b2lkIGdhdGhlckZsZXhDaGlsZHJlbkluZm8oRmxleEJveEl0 ZXJhdG9yJiBpdGVyYXRvciwgYm9vbCByZWxheW91dENoaWxkcmVuLCB1bnNpZ25lZCBpbnQmIGhp Z2hlc3RGbGV4R3JvdXAsIHVuc2lnbmVkIGludCYgbG93ZXN0RmxleEdyb3VwLCBib29sJiBoYXZl RmxleCkKIHsKLSAgICBpbnQgdG9BZGQgPSBib3JkZXJCb3R0b20oKSArIHBhZGRpbmdCb3R0b20o KSArIGhvcml6b250YWxTY3JvbGxiYXJIZWlnaHQoKTsKLSAgICBpbnQgeVBvcyA9IGJvcmRlclRv cCgpICsgcGFkZGluZ1RvcCgpOwotICAgIGludCB4UG9zID0gYm9yZGVyTGVmdCgpICsgcGFkZGlu Z0xlZnQoKTsKLSAgICBib29sIGhlaWdodFNwZWNpZmllZCA9IGZhbHNlOwotICAgIGludCBvbGRI ZWlnaHQgPSAwOwotICAgIAotICAgIHVuc2lnbmVkIGludCBoaWdoZXN0RmxleEdyb3VwID0gMDsK LSAgICB1bnNpZ25lZCBpbnQgbG93ZXN0RmxleEdyb3VwID0gMDsKLSAgICBib29sIGhhdmVGbGV4 ID0gZmFsc2U7Ci0gICAgaW50IHJlbWFpbmluZ1NwYWNlID0gMDsKLSAgICBtX292ZXJmbG93SGVp Z2h0ID0gaGVpZ2h0KCk7Ci0KLSAgICAvLyBUaGUgZmlyc3Qgd2FsayBvdmVyIG91ciBraWRzIGlz IHRvIGZpbmQgb3V0IGlmIHdlIGhhdmUgYW55IGZsZXhpYmxlIGNoaWxkcmVuLgotICAgIEZsZXhC b3hJdGVyYXRvciBpdGVyYXRvcih0aGlzKTsKLSAgICBSZW5kZXJCb3gqIGNoaWxkID0gaXRlcmF0 b3IubmV4dCgpOworICAgIFJlbmRlckJveCogY2hpbGQgPSBpdGVyYXRvci5maXJzdCgpOwogICAg IHdoaWxlIChjaGlsZCkgewogICAgICAgICAvLyBDaGVjayB0byBzZWUgaWYgdGhpcyBjaGlsZCBm bGV4ZXMuCiAgICAgICAgIGlmICghY2hpbGQtPmlzUG9zaXRpb25lZCgpICYmIGNoaWxkLT5zdHls ZSgpLT5ib3hGbGV4KCkgPiAwLjBmKSB7CkBAIC0zNDQsNiArMzMxLDI2IEBAIHZvaWQgUmVuZGVy RmxleGlibGVCb3g6OmxheW91dEhvcml6b250YWxCb3goYm9vbCByZWxheW91dENoaWxkcmVuKQog ICAgICAgICB9CiAgICAgICAgIGNoaWxkID0gaXRlcmF0b3IubmV4dCgpOwogICAgIH0KK30KKwor dm9pZCBSZW5kZXJGbGV4aWJsZUJveDo6bGF5b3V0SG9yaXpvbnRhbEJveChib29sIHJlbGF5b3V0 Q2hpbGRyZW4pCit7CisgICAgaW50IHRvQWRkID0gYm9yZGVyQm90dG9tKCkgKyBwYWRkaW5nQm90 dG9tKCkgKyBob3Jpem9udGFsU2Nyb2xsYmFySGVpZ2h0KCk7CisgICAgaW50IHlQb3MgPSBib3Jk ZXJUb3AoKSArIHBhZGRpbmdUb3AoKTsKKyAgICBpbnQgeFBvcyA9IGJvcmRlckxlZnQoKSArIHBh ZGRpbmdMZWZ0KCk7CisgICAgYm9vbCBoZWlnaHRTcGVjaWZpZWQgPSBmYWxzZTsKKyAgICBpbnQg b2xkSGVpZ2h0ID0gMDsKKworICAgIGludCByZW1haW5pbmdTcGFjZSA9IDA7CisgICAgbV9vdmVy Zmxvd0hlaWdodCA9IGhlaWdodCgpOworCisgICAgRmxleEJveEl0ZXJhdG9yIGl0ZXJhdG9yKHRo aXMpOworICAgIHVuc2lnbmVkIGludCBoaWdoZXN0RmxleEdyb3VwID0gMDsKKyAgICB1bnNpZ25l ZCBpbnQgbG93ZXN0RmxleEdyb3VwID0gMDsKKyAgICBib29sIGhhdmVGbGV4ID0gZmFsc2U7Cisg ICAgZ2F0aGVyRmxleENoaWxkcmVuSW5mbyhpdGVyYXRvciwgcmVsYXlvdXRDaGlsZHJlbiwgaGln aGVzdEZsZXhHcm91cCwgbG93ZXN0RmxleEdyb3VwLCBoYXZlRmxleCk7CisKKyAgICBSZW5kZXJC b3gqIGNoaWxkOwogCiAgICAgUmVuZGVyQmxvY2s6OnN0YXJ0RGVsYXlVcGRhdGVTY3JvbGxJbmZv KCk7CiAKQEAgLTY2NSwzNCArNjcyLDE2IEBAIHZvaWQgUmVuZGVyRmxleGlibGVCb3g6OmxheW91 dFZlcnRpY2FsQm94KGJvb2wgcmVsYXlvdXRDaGlsZHJlbikKICAgICBpbnQgdG9BZGQgPSBib3Jk ZXJCb3R0b20oKSArIHBhZGRpbmdCb3R0b20oKSArIGhvcml6b250YWxTY3JvbGxiYXJIZWlnaHQo KTsKICAgICBib29sIGhlaWdodFNwZWNpZmllZCA9IGZhbHNlOwogICAgIGludCBvbGRIZWlnaHQg PSAwOwotICAgIAorCisgICAgaW50IHJlbWFpbmluZ1NwYWNlID0gMDsKKworICAgIEZsZXhCb3hJ dGVyYXRvciBpdGVyYXRvcih0aGlzKTsKICAgICB1bnNpZ25lZCBpbnQgaGlnaGVzdEZsZXhHcm91 cCA9IDA7CiAgICAgdW5zaWduZWQgaW50IGxvd2VzdEZsZXhHcm91cCA9IDA7CiAgICAgYm9vbCBo YXZlRmxleCA9IGZhbHNlOwotICAgIGludCByZW1haW5pbmdTcGFjZSA9IDA7Ci0gICAgCi0gICAg Ly8gVGhlIGZpcnN0IHdhbGsgb3ZlciBvdXIga2lkcyBpcyB0byBmaW5kIG91dCBpZiB3ZSBoYXZl IGFueSBmbGV4aWJsZSBjaGlsZHJlbi4KLSAgICBGbGV4Qm94SXRlcmF0b3IgaXRlcmF0b3IodGhp cyk7Ci0gICAgUmVuZGVyQm94KiBjaGlsZCA9IGl0ZXJhdG9yLm5leHQoKTsKLSAgICB3aGlsZSAo Y2hpbGQpIHsKLSAgICAgICAgLy8gQ2hlY2sgdG8gc2VlIGlmIHRoaXMgY2hpbGQgZmxleGVzLgot ICAgICAgICBpZiAoIWNoaWxkLT5pc1Bvc2l0aW9uZWQoKSAmJiBjaGlsZC0+c3R5bGUoKS0+Ym94 RmxleCgpID4gMC4wZikgewotICAgICAgICAgICAgLy8gV2UgYWx3YXlzIGhhdmUgdG8gbGF5IG91 dCBmbGV4aWJsZSBvYmplY3RzIGFnYWluLCBzaW5jZSB0aGUgZmxleCBkaXN0cmlidXRpb24KLSAg ICAgICAgICAgIC8vIG1heSBoYXZlIGNoYW5nZWQsIGFuZCB3ZSBuZWVkIHRvIHJlYWxsb2NhdGUg c3BhY2UuCi0gICAgICAgICAgICBjaGlsZC0+c2V0T3ZlcnJpZGVTaXplKC0xKTsKLSAgICAgICAg ICAgIGlmICghcmVsYXlvdXRDaGlsZHJlbikKLSAgICAgICAgICAgICAgICBjaGlsZC0+c2V0Q2hp bGROZWVkc0xheW91dCh0cnVlLCBmYWxzZSk7Ci0gICAgICAgICAgICBoYXZlRmxleCA9IHRydWU7 Ci0gICAgICAgICAgICB1bnNpZ25lZCBpbnQgZmxleEdyb3VwID0gY2hpbGQtPnN0eWxlKCktPmJv eEZsZXhHcm91cCgpOwotICAgICAgICAgICAgaWYgKGxvd2VzdEZsZXhHcm91cCA9PSAwKQotICAg ICAgICAgICAgICAgIGxvd2VzdEZsZXhHcm91cCA9IGZsZXhHcm91cDsKLSAgICAgICAgICAgIGlm IChmbGV4R3JvdXAgPCBsb3dlc3RGbGV4R3JvdXApCi0gICAgICAgICAgICAgICAgbG93ZXN0Rmxl eEdyb3VwID0gZmxleEdyb3VwOwotICAgICAgICAgICAgaWYgKGZsZXhHcm91cCA+IGhpZ2hlc3RG bGV4R3JvdXApCi0gICAgICAgICAgICAgICAgaGlnaGVzdEZsZXhHcm91cCA9IGZsZXhHcm91cDsK LSAgICAgICAgfQotICAgICAgICBjaGlsZCA9IGl0ZXJhdG9yLm5leHQoKTsKLSAgICB9CisgICAg Z2F0aGVyRmxleENoaWxkcmVuSW5mbyhpdGVyYXRvciwgcmVsYXlvdXRDaGlsZHJlbiwgaGlnaGVz dEZsZXhHcm91cCwgbG93ZXN0RmxleEdyb3VwLCBoYXZlRmxleCk7CisKKyAgICBSZW5kZXJCb3gq IGNoaWxkOwogCiAgICAgLy8gV2UgY29uZmluZSB0aGUgbGluZSBjbGFtcCB1Z2xpbmVzcyB0byB2 ZXJ0aWNhbCBmbGV4aWJsZSBib3hlcyAodGh1cyBrZWVwaW5nIGl0IG91dCBvZgogICAgIC8vIG1h aW5zdHJlYW0gYmxvY2sgbGF5b3V0KTsgdGhpcyBpcyBub3QgcmVhbGx5IHBhcnQgb2YgdGhlIFhV TCBib3ggbW9kZWwu