111399 2013-03-04 20:02:30 -0800 Inline min/maxInstrinsicLogicalWidth functions 2013-03-05 14:06:55 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 ojan ojan eae eric esprehn+autocc leviw ojan.autocc tony webkit.review.bot oldest_to_newest 847211 0 ojan 2013-03-04 20:02:30 -0800 Inline min/maxInstrinsicLogicalWidth functions 847895 1 191530 ojan 2013-03-05 12:03:42 -0800 Created attachment 191530 Patch 847934 2 191530 tony 2013-03-05 12:44:06 -0800 Comment on attachment 191530 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=191530&action=review > Source/WebCore/rendering/RenderBox.cpp:2116 > + RenderView* renderView = view(); > + LayoutUnit marginStart = minimumValueForLength(style()->marginStart(), availableLogicalWidth, renderView); > + LayoutUnit marginEnd = minimumValueForLength(style()->marginEnd(), availableLogicalWidth, renderView); Maybe you should pass in 2 additional args to fillAvailableMeasure that will return marginStart and marginEnd by reference? Maybe this should just be 2 separate methods. 848052 3 ojan 2013-03-05 14:06:55 -0800 Committed r144816: <http://trac.webkit.org/changeset/144816> 191530 2013-03-05 12:03:42 -0800 2013-03-05 12:44:06 -0800 Patch bug-111399-20130305195947.patch text/plain 7394 ojan U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ0NzkxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZWM1ZTYzZDZhNTFjMTY3 YmY5OTk2OGMxYjZjODFlZjA2ODViNmUwNi4uOTc4NGVjYWFmMGY1ZDAxOTk0NzIxN2NiODAzOWVk YTBhNGQyNTM5MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDEzLTAzLTA0ICBPamFu IFZhZmFpICA8b2phbkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgSW5saW5lIG1pbi9tYXhJbnN0 cmluc2ljTG9naWNhbFdpZHRoIGZ1bmN0aW9ucworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTExMzk5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgVHVybnMgb3V0IHRoZXNlIGZ1bmN0aW9ucyBkb24ndCBuZWVk IHRvIGJlIHB1YmxpYyBhbmQgb25seQorICAgICAgICBoYXZlIG9uZSBjYWxsZXIuIFRoaXMgcGF0 Y2ggaXMgaW4gcHJlcGFyYXRpb24gZm9yIHN1cHBvcnRpbmcKKyAgICAgICAgaW50cmluc2ljIHdp ZHRocyBvbiB0YWJsZXMsIHdoaWNoIHdpbGwgbmVlZCB0byBwYXNzIGluIHRoZQorICAgICAgICBi b3JkZXIgYW5kIHBhZGRpbmcgd2lkdGggYXMgYW4gYXJndW1lbnQuCisKKyAgICAgICAgKiByZW5k ZXJpbmcvUmVuZGVyQm94LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJveDo6ZmlsbEF2 YWlsYWJsZU1lYXN1cmUpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94Ojpjb21wdXRlSW50 cmluc2ljTG9naWNhbFdpZHRoVXNpbmcpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94Ojpj b21wdXRlTG9naWNhbFdpZHRoSW5SZWdpb25Vc2luZyk6CisgICAgICAgICogcmVuZGVyaW5nL1Jl bmRlckJveC5oOgorCiAyMDEzLTAzLTA1ICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBs ZS5jb20+CiAKICAgICAgICAgU2ltcGxpZnkgc3RvcmFnZSBldmVudCBkaXNwYXRjaCBzb21ld2hh dApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAgYi9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcAppbmRleCA0ZGQ5ZWIwN2JmMmI2 NTA3ZDBmYWI5MGI5OTNhMDAzMjM3ZDZjOTYxLi45NTMyMGFlNzVmMmE5ZmQ0ZTc5YmFkZGExYmU2 MWIzNmFmNDg4Mjk4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy Qm94LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcApAQCAt ODIwLDIyICs4MjAsNiBAQCB2b2lkIFJlbmRlckJveDo6YXBwbHlDYWNoZWRDbGlwQW5kU2Nyb2xs T2Zmc2V0Rm9yUmVwYWludChMYXlvdXRSZWN0JiBwYWludFJlY3QpCiAgICAgcGFpbnRSZWN0ID0g aW50ZXJzZWN0aW9uKHBhaW50UmVjdCwgY2xpcFJlY3QpOwogfQogCi1MYXlvdXRVbml0IFJlbmRl ckJveDo6bWluSW50cmluc2ljTG9naWNhbFdpZHRoKCkgY29uc3QKLXsKLSAgICBMYXlvdXRVbml0 IG1pbkxvZ2ljYWxXaWR0aCA9IDA7Ci0gICAgTGF5b3V0VW5pdCBtYXhMb2dpY2FsV2lkdGggPSAw OwotICAgIGNvbXB1dGVJbnRyaW5zaWNMb2dpY2FsV2lkdGhzKG1pbkxvZ2ljYWxXaWR0aCwgbWF4 TG9naWNhbFdpZHRoKTsKLSAgICByZXR1cm4gbWluTG9naWNhbFdpZHRoICsgYm9yZGVyQW5kUGFk ZGluZ0xvZ2ljYWxXaWR0aCgpOwotfQotCi1MYXlvdXRVbml0IFJlbmRlckJveDo6bWF4SW50cmlu c2ljTG9naWNhbFdpZHRoKCkgY29uc3QKLXsKLSAgICBMYXlvdXRVbml0IG1pbkxvZ2ljYWxXaWR0 aCA9IDA7Ci0gICAgTGF5b3V0VW5pdCBtYXhMb2dpY2FsV2lkdGggPSAwOwotICAgIGNvbXB1dGVJ bnRyaW5zaWNMb2dpY2FsV2lkdGhzKG1pbkxvZ2ljYWxXaWR0aCwgbWF4TG9naWNhbFdpZHRoKTsK LSAgICByZXR1cm4gbWF4TG9naWNhbFdpZHRoICsgYm9yZGVyQW5kUGFkZGluZ0xvZ2ljYWxXaWR0 aCgpOwotfQotCiB2b2lkIFJlbmRlckJveDo6Y29tcHV0ZUludHJpbnNpY0xvZ2ljYWxXaWR0aHMo TGF5b3V0VW5pdCYgbWluTG9naWNhbFdpZHRoLCBMYXlvdXRVbml0JiBtYXhMb2dpY2FsV2lkdGgp IGNvbnN0CiB7CiAgICAgbWluTG9naWNhbFdpZHRoID0gbWluUHJlZmVycmVkTG9naWNhbFdpZHRo KCkgLSBib3JkZXJBbmRQYWRkaW5nTG9naWNhbFdpZHRoKCk7CkBAIC0yMDY0LDI4ICsyMDQ4LDM3 IEBAIHZvaWQgUmVuZGVyQm94Ojpjb21wdXRlTG9naWNhbFdpZHRoSW5SZWdpb24oTG9naWNhbEV4 dGVudENvbXB1dGVkVmFsdWVzJiBjb21wdXRlCiAgICAgfQogfQogCi1MYXlvdXRVbml0IFJlbmRl ckJveDo6Y29tcHV0ZUludHJpbnNpY0xvZ2ljYWxXaWR0aFVzaW5nKExlbmd0aCBsb2dpY2FsV2lk dGhMZW5ndGgsIExheW91dFVuaXQgYXZhaWxhYmxlTG9naWNhbFdpZHRoKSBjb25zdAorTGF5b3V0 VW5pdCBSZW5kZXJCb3g6OmZpbGxBdmFpbGFibGVNZWFzdXJlKExheW91dFVuaXQgYXZhaWxhYmxl TG9naWNhbFdpZHRoKSBjb25zdAogewotICAgIGlmIChsb2dpY2FsV2lkdGhMZW5ndGgudHlwZSgp ID09IE1pbkNvbnRlbnQpCi0gICAgICAgIHJldHVybiBtaW5JbnRyaW5zaWNMb2dpY2FsV2lkdGgo KTsKLSAgICBpZiAobG9naWNhbFdpZHRoTGVuZ3RoLnR5cGUoKSA9PSBNYXhDb250ZW50KQotICAg ICAgICByZXR1cm4gbWF4SW50cmluc2ljTG9naWNhbFdpZHRoKCk7Ci0KICAgICBSZW5kZXJWaWV3 KiByZW5kZXJWaWV3ID0gdmlldygpOwogICAgIExheW91dFVuaXQgbWFyZ2luU3RhcnQgPSBtaW5p bXVtVmFsdWVGb3JMZW5ndGgoc3R5bGUoKS0+bWFyZ2luU3RhcnQoKSwgYXZhaWxhYmxlTG9naWNh bFdpZHRoLCByZW5kZXJWaWV3KTsKICAgICBMYXlvdXRVbml0IG1hcmdpbkVuZCA9IG1pbmltdW1W YWx1ZUZvckxlbmd0aChzdHlsZSgpLT5tYXJnaW5FbmQoKSwgYXZhaWxhYmxlTG9naWNhbFdpZHRo LCByZW5kZXJWaWV3KTsKLSAgICBMYXlvdXRVbml0IGZpbGxBdmFpbGFibGVNZWFzdXJlID0gYXZh aWxhYmxlTG9naWNhbFdpZHRoIC0gbWFyZ2luU3RhcnQgLSBtYXJnaW5FbmQ7CisgICAgcmV0dXJu IGF2YWlsYWJsZUxvZ2ljYWxXaWR0aCAtIG1hcmdpblN0YXJ0IC0gbWFyZ2luRW5kOworfQogCitM YXlvdXRVbml0IFJlbmRlckJveDo6Y29tcHV0ZUludHJpbnNpY0xvZ2ljYWxXaWR0aFVzaW5nKExl bmd0aCBsb2dpY2FsV2lkdGhMZW5ndGgsIExheW91dFVuaXQgYXZhaWxhYmxlTG9naWNhbFdpZHRo KSBjb25zdAorewogICAgIGlmIChsb2dpY2FsV2lkdGhMZW5ndGgudHlwZSgpID09IEZpbGxBdmFp bGFibGUpCi0gICAgICAgIHJldHVybiBmaWxsQXZhaWxhYmxlTWVhc3VyZTsKKyAgICAgICAgcmV0 dXJuIGZpbGxBdmFpbGFibGVNZWFzdXJlKGF2YWlsYWJsZUxvZ2ljYWxXaWR0aCk7CisKKyAgICBM YXlvdXRVbml0IG1pbkxvZ2ljYWxXaWR0aCA9IDA7CisgICAgTGF5b3V0VW5pdCBtYXhMb2dpY2Fs V2lkdGggPSAwOworICAgIGNvbXB1dGVJbnRyaW5zaWNMb2dpY2FsV2lkdGhzKG1pbkxvZ2ljYWxX aWR0aCwgbWF4TG9naWNhbFdpZHRoKTsKKworICAgIExheW91dFVuaXQgYm9yZGVyQW5kUGFkZGlu ZyA9IGJvcmRlckFuZFBhZGRpbmdMb2dpY2FsV2lkdGgoKTsKKworICAgIGlmIChsb2dpY2FsV2lk dGhMZW5ndGgudHlwZSgpID09IE1pbkNvbnRlbnQpCisgICAgICAgIHJldHVybiBtaW5Mb2dpY2Fs V2lkdGggKyBib3JkZXJBbmRQYWRkaW5nOworCisgICAgaWYgKGxvZ2ljYWxXaWR0aExlbmd0aC50 eXBlKCkgPT0gTWF4Q29udGVudCkKKyAgICAgICAgcmV0dXJuIG1heExvZ2ljYWxXaWR0aCArIGJv cmRlckFuZFBhZGRpbmc7CisKICAgICBpZiAobG9naWNhbFdpZHRoTGVuZ3RoLnR5cGUoKSA9PSBG aXRDb250ZW50KSB7Ci0gICAgICAgIExheW91dFVuaXQgbWluTG9naWNhbFdpZHRoID0gMDsKLSAg ICAgICAgTGF5b3V0VW5pdCBtYXhMb2dpY2FsV2lkdGggPSAwOwotICAgICAgICBjb21wdXRlSW50 cmluc2ljTG9naWNhbFdpZHRocyhtaW5Mb2dpY2FsV2lkdGgsIG1heExvZ2ljYWxXaWR0aCk7Ci0g ICAgICAgIG1pbkxvZ2ljYWxXaWR0aCArPSBib3JkZXJBbmRQYWRkaW5nTG9naWNhbFdpZHRoKCk7 Ci0gICAgICAgIG1heExvZ2ljYWxXaWR0aCArPSBib3JkZXJBbmRQYWRkaW5nTG9naWNhbFdpZHRo KCk7Ci0gICAgICAgIHJldHVybiBtYXgobWluTG9naWNhbFdpZHRoLCBtaW4obWF4TG9naWNhbFdp ZHRoLCBmaWxsQXZhaWxhYmxlTWVhc3VyZSkpOworICAgICAgICBtaW5Mb2dpY2FsV2lkdGggKz0g Ym9yZGVyQW5kUGFkZGluZzsKKyAgICAgICAgbWF4TG9naWNhbFdpZHRoICs9IGJvcmRlckFuZFBh ZGRpbmc7CisgICAgICAgIHJldHVybiBtYXgobWluTG9naWNhbFdpZHRoLCBtaW4obWF4TG9naWNh bFdpZHRoLCBmaWxsQXZhaWxhYmxlTWVhc3VyZShhdmFpbGFibGVMb2dpY2FsV2lkdGgpKSk7CiAg ICAgfQorCiAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CiAgICAgcmV0dXJuIDA7CiB9CkBAIC0y MTE1LDEzICsyMTA4LDE0IEBAIExheW91dFVuaXQgUmVuZGVyQm94Ojpjb21wdXRlTG9naWNhbFdp ZHRoSW5SZWdpb25Vc2luZyhTaXplVHlwZSB3aWR0aFR5cGUsIExheW91CiAgICAgaWYgKGxvZ2lj YWxXaWR0aC5pc0ludHJpbnNpYygpKQogICAgICAgICByZXR1cm4gY29tcHV0ZUludHJpbnNpY0xv Z2ljYWxXaWR0aFVzaW5nKGxvZ2ljYWxXaWR0aCwgYXZhaWxhYmxlTG9naWNhbFdpZHRoKTsKIAot ICAgIFJlbmRlclZpZXcqIHJlbmRlclZpZXcgPSB2aWV3KCk7Ci0gICAgTGF5b3V0VW5pdCBtYXJn aW5TdGFydCA9IG1pbmltdW1WYWx1ZUZvckxlbmd0aChzdHlsZVRvVXNlLT5tYXJnaW5TdGFydCgp LCBhdmFpbGFibGVMb2dpY2FsV2lkdGgsIHJlbmRlclZpZXcpOwotICAgIExheW91dFVuaXQgbWFy Z2luRW5kID0gbWluaW11bVZhbHVlRm9yTGVuZ3RoKHN0eWxlVG9Vc2UtPm1hcmdpbkVuZCgpLCBh dmFpbGFibGVMb2dpY2FsV2lkdGgsIHJlbmRlclZpZXcpOwotICAgIExheW91dFVuaXQgbG9naWNh bFdpZHRoUmVzdWx0ID0gYXZhaWxhYmxlTG9naWNhbFdpZHRoIC0gbWFyZ2luU3RhcnQgLSBtYXJn aW5FbmQ7CisgICAgTGF5b3V0VW5pdCBsb2dpY2FsV2lkdGhSZXN1bHQgPSBmaWxsQXZhaWxhYmxl TWVhc3VyZShhdmFpbGFibGVMb2dpY2FsV2lkdGgpOwogCi0gICAgaWYgKHNocmlua1RvQXZvaWRG bG9hdHMoKSAmJiBjYi0+Y29udGFpbnNGbG9hdHMoKSkKLSAgICAgICAgbG9naWNhbFdpZHRoUmVz dWx0ID0gbWluKGxvZ2ljYWxXaWR0aFJlc3VsdCwgc2hyaW5rTG9naWNhbFdpZHRoVG9Bdm9pZEZs b2F0cyhtYXJnaW5TdGFydCwgbWFyZ2luRW5kLCBjYiwgcmVnaW9uLCBvZmZzZXRGcm9tTG9naWNh bFRvcE9mRmlyc3RQYWdlKSk7CisgICAgaWYgKHNocmlua1RvQXZvaWRGbG9hdHMoKSAmJiBjYi0+ Y29udGFpbnNGbG9hdHMoKSkgeworICAgICAgICBSZW5kZXJWaWV3KiByZW5kZXJWaWV3ID0gdmll dygpOworICAgICAgICBMYXlvdXRVbml0IG1hcmdpblN0YXJ0ID0gbWluaW11bVZhbHVlRm9yTGVu Z3RoKHN0eWxlKCktPm1hcmdpblN0YXJ0KCksIGF2YWlsYWJsZUxvZ2ljYWxXaWR0aCwgcmVuZGVy Vmlldyk7CisgICAgICAgIExheW91dFVuaXQgbWFyZ2luRW5kID0gbWluaW11bVZhbHVlRm9yTGVu Z3RoKHN0eWxlKCktPm1hcmdpbkVuZCgpLCBhdmFpbGFibGVMb2dpY2FsV2lkdGgsIHJlbmRlclZp ZXcpOworICAgICAgICBsb2dpY2FsV2lkdGhSZXN1bHQgPSBtaW4obG9naWNhbFdpZHRoUmVzdWx0 LCBzaHJpbmtMb2dpY2FsV2lkdGhUb0F2b2lkRmxvYXRzKG1hcmdpblN0YXJ0LCBtYXJnaW5FbmQs IGNiLCByZWdpb24sIG9mZnNldEZyb21Mb2dpY2FsVG9wT2ZGaXJzdFBhZ2UpKTsgICAgICAgIAor ICAgIH0KIAogICAgIGlmICh3aWR0aFR5cGUgPT0gTWFpbk9yUHJlZmVycmVkU2l6ZSAmJiBzaXpl c0xvZ2ljYWxXaWR0aFRvRml0Q29udGVudCh3aWR0aFR5cGUpKQogICAgICAgICByZXR1cm4gbWF4 KG1pblByZWZlcnJlZExvZ2ljYWxXaWR0aCgpLCBtaW4obWF4UHJlZmVycmVkTG9naWNhbFdpZHRo KCksIGxvZ2ljYWxXaWR0aFJlc3VsdCkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlckJveC5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5o CmluZGV4IDcyNWZkYzdjNGY5MTRjNTUwNjFjY2I2NTczODEyZTRhMzA5NWU4YWEuLjc2M2M5NmVi OGM4NGU4YTI3Yzc5MTEwNzhjMzI5NTA4YjAwZWRkMWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJCb3guaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyQm94LmgKQEAgLTI5NCw5ICsyOTQsNiBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCB2b2lk IHBhaW50KFBhaW50SW5mbyYsIGNvbnN0IExheW91dFBvaW50Jik7CiAgICAgdmlydHVhbCBib29s IG5vZGVBdFBvaW50KGNvbnN0IEhpdFRlc3RSZXF1ZXN0JiwgSGl0VGVzdFJlc3VsdCYsIGNvbnN0 IEhpdFRlc3RMb2NhdGlvbiYgbG9jYXRpb25JbkNvbnRhaW5lciwgY29uc3QgTGF5b3V0UG9pbnQm IGFjY3VtdWxhdGVkT2Zmc2V0LCBIaXRUZXN0QWN0aW9uKSBPVkVSUklERTsKIAotICAgIExheW91 dFVuaXQgbWluSW50cmluc2ljTG9naWNhbFdpZHRoKCkgY29uc3Q7Ci0gICAgTGF5b3V0VW5pdCBt YXhJbnRyaW5zaWNMb2dpY2FsV2lkdGgoKSBjb25zdDsKLQogICAgIHZpcnR1YWwgTGF5b3V0VW5p dCBtaW5QcmVmZXJyZWRMb2dpY2FsV2lkdGgoKSBjb25zdDsKICAgICB2aXJ0dWFsIExheW91dFVu aXQgbWF4UHJlZmVycmVkTG9naWNhbFdpZHRoKCkgY29uc3Q7CiAKQEAgLTY1OCw2ICs2NTUsOCBA QCBwcml2YXRlOgogICAgIHZvaWQgY29tcHV0ZVBvc2l0aW9uZWRMb2dpY2FsSGVpZ2h0UmVwbGFj ZWQoTG9naWNhbEV4dGVudENvbXB1dGVkVmFsdWVzJikgY29uc3Q7CiAgICAgdm9pZCBjb21wdXRl UG9zaXRpb25lZExvZ2ljYWxXaWR0aFJlcGxhY2VkKExvZ2ljYWxFeHRlbnRDb21wdXRlZFZhbHVl cyYpIGNvbnN0OwogCisgICAgTGF5b3V0VW5pdCBmaWxsQXZhaWxhYmxlTWVhc3VyZShMYXlvdXRV bml0IGF2YWlsYWJsZUxvZ2ljYWxXaWR0aCkgY29uc3Q7CisKICAgICBMYXlvdXRVbml0IGNvbXB1 dGVJbnRyaW5zaWNMb2dpY2FsV2lkdGhVc2luZyhMZW5ndGggbG9naWNhbFdpZHRoTGVuZ3RoLCBM YXlvdXRVbml0IGF2YWlsYWJsZUxvZ2ljYWxXaWR0aCkgY29uc3Q7CiAKICAgICB2aXJ0dWFsIHZv aWQgY29tcHV0ZUludHJpbnNpY0xvZ2ljYWxXaWR0aHMoTGF5b3V0VW5pdCYgbWluTG9naWNhbFdp ZHRoLCBMYXlvdXRVbml0JiBtYXhMb2dpY2FsV2lkdGgpIGNvbnN0Owo=