80446 2012-03-06 15:12:51 -0800 refactor method names in RenderFlexibleBox to make them more consistent 2012-03-06 20:40:15 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 tony tony ojan webkit.review.bot oldest_to_newest 572195 0 tony 2012-03-06 15:12:51 -0800 refactor method names in RenderFlexibleBox to make them more consistent 572198 1 130450 tony 2012-03-06 15:15:42 -0800 Created attachment 130450 Patch 572480 2 130450 webkit.review.bot 2012-03-06 20:40:11 -0800 Comment on attachment 130450 Patch Clearing flags on attachment: 130450 Committed r110007: <http://trac.webkit.org/changeset/110007> 572481 3 webkit.review.bot 2012-03-06 20:40:15 -0800 All reviewed patches have been landed. Closing bug. 130450 2012-03-06 15:15:42 -0800 2012-03-06 20:40:11 -0800 Patch bug-80446-20120306151546.patch text/plain 7144 tony U3VidmVyc2lvbiBSZXZpc2lvbjogMTA5OTM3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjU3MDg4NTA1OThhZjc1 NTVkYjZmMjY5N2UxNWVjMmNhMTMxMDU4Yi4uMjc1ZGI5YjhjNDE0ZTEzYWU5MjEyY2Y0YjFmZTY1 ZTFhMWYwYjBmOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDEyLTAzLTA2ICBUb255 IENoYW5nICA8dG9ueUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgcmVmYWN0b3IgbWV0aG9kIG5h bWVzIGluIFJlbmRlckZsZXhpYmxlQm94IHRvIG1ha2UgdGhlbSBtb3JlIGNvbnNpc3RlbnQKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTgwNDQ2CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTm8gbmV3IHRlc3Rz LCBqdXN0IHJlbmFtaW5nIGludGVybmFsIG1ldGhvZHMuCisKKyAgICAgICAgKiByZW5kZXJpbmcv UmVuZGVyRmxleGlibGVCb3guY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyRmxleGlibGVC b3g6OmZsb3dBd2FyZUJvcmRlckFmdGVyKTogTmV3LCB1c2VkIGJ5IGxheW91dEFuZFBsYWNlQ2hp bGRyZW4KKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckZsZXhpYmxlQm94OjpmbG93QXdhcmVQYWRk aW5nQWZ0ZXIpOiBOZXcsIHVzZWQgYnkgbGF5b3V0QW5kUGxhY2VDaGlsZHJlbgorICAgICAgICAo V2ViQ29yZTo6UmVuZGVyRmxleGlibGVCb3g6Om1hcmdpbkJveEFzY2VudEZvckNoaWxkKTogQWRk IEZvckNoaWxkIGZvciBjb25zaXN0ZW5jeS4KKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckZsZXhp YmxlQm94OjpsYXlvdXRBbmRQbGFjZUNoaWxkcmVuKTogV2Ugd2VyZSBhZGRpbmcgdGhlIGJlZm9y ZSBwYWRkaW5nK2JvcmRlciB0d2ljZSAoaXQncyBpbiB0aGUgb2Zmc2V0IGFuZAorICAgICAgICBj cm9zc0F4aXNCb3JkZXJBbmRQYWRkaW5nRXh0ZW50KCkgYW5kIHN1YnRyYWN0aW5nIGl0IG9uY2Uu ICBJbnN0ZWFkLCBqdXN0IGFkZCB0aGUgYWZ0ZXIgcGFkZGluZytib3JkZXIuCisgICAgICAgIChX ZWJDb3JlOjpSZW5kZXJGbGV4aWJsZUJveDo6YWxpZ25DaGlsZHJlbik6CisgICAgICAgICogcmVu ZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94Lmg6CisgICAgICAgIChSZW5kZXJGbGV4aWJsZUJveCk6 IFJlb3JkZXIgbWV0aG9kcyB0byBtYXRjaCB0aGUgLmNwcCBmaWxlLgorCiAyMDEyLTAzLTA2ICBE YXZpZCBDb3J2b3lzaWVyICA8ZGF2aWQuY29ydm95c2llckBvcmFuZ2UuY29tPgogCiAgICAgICAg IFVucmVsZWFzZWQgZ3N0X29iamVjdF9yZWZlcmVuY2UgdG8gYXVkaW8gc2luayBpbiBNZWRpYVBs YXllclByaXZhdGVHU3RyZWFtZXIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJGbGV4aWJsZUJveC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy RmxleGlibGVCb3guY3BwCmluZGV4IGRiNDQwNWFjMmY4MTEyYjBhYmUxYjFhYmUwMGUxYWQzZGI5 NDY1MzUuLjdlMjcyZmIyMmNlODJkZWQ4ZDk1M2U0ODNiNjgyYTQxMmE1N2RjMDUgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmNwcApAQCAtMzgzLDkg KzM4MywyMCBAQCBMYXlvdXRVbml0IFJlbmRlckZsZXhpYmxlQm94OjpmbG93QXdhcmVCb3JkZXJC ZWZvcmUoKSBjb25zdAogICAgIHJldHVybiBib3JkZXJUb3AoKTsKIH0KIAotTGF5b3V0VW5pdCBS ZW5kZXJGbGV4aWJsZUJveDo6Y3Jvc3NBeGlzQm9yZGVyQW5kUGFkZGluZ0V4dGVudCgpIGNvbnN0 CitMYXlvdXRVbml0IFJlbmRlckZsZXhpYmxlQm94OjpmbG93QXdhcmVCb3JkZXJBZnRlcigpIGNv bnN0CiB7Ci0gICAgcmV0dXJuIGlzSG9yaXpvbnRhbEZsb3coKSA/IGJvcmRlckFuZFBhZGRpbmdI ZWlnaHQoKSA6IGJvcmRlckFuZFBhZGRpbmdXaWR0aCgpOworICAgIHN3aXRjaCAodHJhbnNmb3Jt ZWRXcml0aW5nTW9kZSgpKSB7CisgICAgY2FzZSBUb3BUb0JvdHRvbVdyaXRpbmdNb2RlOgorICAg ICAgICByZXR1cm4gYm9yZGVyQm90dG9tKCk7CisgICAgY2FzZSBCb3R0b21Ub1RvcFdyaXRpbmdN b2RlOgorICAgICAgICByZXR1cm4gYm9yZGVyVG9wKCk7CisgICAgY2FzZSBMZWZ0VG9SaWdodFdy aXRpbmdNb2RlOgorICAgICAgICByZXR1cm4gYm9yZGVyUmlnaHQoKTsKKyAgICBjYXNlIFJpZ2h0 VG9MZWZ0V3JpdGluZ01vZGU6CisgICAgICAgIHJldHVybiBib3JkZXJMZWZ0KCk7CisgICAgfQor ICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOworICAgIHJldHVybiBib3JkZXJUb3AoKTsKIH0KIAog TGF5b3V0VW5pdCBSZW5kZXJGbGV4aWJsZUJveDo6Zmxvd0F3YXJlUGFkZGluZ1N0YXJ0KCkgY29u c3QKQEAgLTQxOCw2ICs0MjksMjIgQEAgTGF5b3V0VW5pdCBSZW5kZXJGbGV4aWJsZUJveDo6Zmxv d0F3YXJlUGFkZGluZ0JlZm9yZSgpIGNvbnN0CiAgICAgcmV0dXJuIHBhZGRpbmdUb3AoKTsKIH0K IAorTGF5b3V0VW5pdCBSZW5kZXJGbGV4aWJsZUJveDo6Zmxvd0F3YXJlUGFkZGluZ0FmdGVyKCkg Y29uc3QKK3sKKyAgICBzd2l0Y2ggKHRyYW5zZm9ybWVkV3JpdGluZ01vZGUoKSkgeworICAgIGNh c2UgVG9wVG9Cb3R0b21Xcml0aW5nTW9kZToKKyAgICAgICAgcmV0dXJuIHBhZGRpbmdCb3R0b20o KTsKKyAgICBjYXNlIEJvdHRvbVRvVG9wV3JpdGluZ01vZGU6CisgICAgICAgIHJldHVybiBwYWRk aW5nVG9wKCk7CisgICAgY2FzZSBMZWZ0VG9SaWdodFdyaXRpbmdNb2RlOgorICAgICAgICByZXR1 cm4gcGFkZGluZ1JpZ2h0KCk7CisgICAgY2FzZSBSaWdodFRvTGVmdFdyaXRpbmdNb2RlOgorICAg ICAgICByZXR1cm4gcGFkZGluZ0xlZnQoKTsKKyAgICB9CisgICAgQVNTRVJUX05PVF9SRUFDSEVE KCk7CisgICAgcmV0dXJuIHBhZGRpbmdUb3AoKTsKK30KKwogTGF5b3V0VW5pdCBSZW5kZXJGbGV4 aWJsZUJveDo6Zmxvd0F3YXJlTWFyZ2luU3RhcnRGb3JDaGlsZChSZW5kZXJCb3gqIGNoaWxkKSBj b25zdAogewogICAgIGlmIChpc0hvcml6b250YWxGbG93KCkpCkBAIC01NTIsNyArNTc5LDcgQEAg TGF5b3V0VW5pdCBSZW5kZXJGbGV4aWJsZUJveDo6YXZhaWxhYmxlQWxpZ25tZW50U3BhY2VGb3JD aGlsZChMYXlvdXRVbml0IGxpbmVDcm8KICAgICByZXR1cm4gbGluZUNyb3NzQXhpc0V4dGVudCAt IGNoaWxkQ3Jvc3NFeHRlbnQ7CiB9CiAKLUxheW91dFVuaXQgUmVuZGVyRmxleGlibGVCb3g6Om1h cmdpbkJveEFzY2VudChSZW5kZXJCb3gqIGNoaWxkKQorTGF5b3V0VW5pdCBSZW5kZXJGbGV4aWJs ZUJveDo6bWFyZ2luQm94QXNjZW50Rm9yQ2hpbGQoUmVuZGVyQm94KiBjaGlsZCkKIHsKICAgICBM YXlvdXRVbml0IGFzY2VudCA9IGNoaWxkLT5maXJzdExpbmVCb3hCYXNlbGluZSgpOwogICAgIGlm IChhc2NlbnQgPT0gLTEpCkBAIC03NTYsNyArNzgzLDcgQEAgdm9pZCBSZW5kZXJGbGV4aWJsZUJv eDo6bGF5b3V0QW5kUGxhY2VDaGlsZHJlbihMYXlvdXRVbml0JiBjcm9zc0F4aXNPZmZzZXQsIGNv bnMKIAogICAgICAgICBMYXlvdXRVbml0IGNoaWxkQ3Jvc3NBeGlzRXh0ZW50OwogICAgICAgICBp ZiAoZmxleEFsaWduRm9yQ2hpbGQoY2hpbGQpID09IEFsaWduQmFzZWxpbmUpIHsKLSAgICAgICAg ICAgIExheW91dFVuaXQgYXNjZW50ID0gbWFyZ2luQm94QXNjZW50KGNoaWxkKTsKKyAgICAgICAg ICAgIExheW91dFVuaXQgYXNjZW50ID0gbWFyZ2luQm94QXNjZW50Rm9yQ2hpbGQoY2hpbGQpOwog ICAgICAgICAgICAgTGF5b3V0VW5pdCBkZXNjZW50ID0gKGNyb3NzQXhpc01hcmdpbkV4dGVudEZv ckNoaWxkKGNoaWxkKSArIGNyb3NzQXhpc0V4dGVudEZvckNoaWxkKGNoaWxkKSkgLSBhc2NlbnQ7 CiAKICAgICAgICAgICAgIG1heEFzY2VudCA9IHN0ZDo6bWF4KG1heEFzY2VudCwgYXNjZW50KTsK QEAgLTc2Niw3ICs3OTMsNyBAQCB2b2lkIFJlbmRlckZsZXhpYmxlQm94OjpsYXlvdXRBbmRQbGFj ZUNoaWxkcmVuKExheW91dFVuaXQmIGNyb3NzQXhpc09mZnNldCwgY29ucwogICAgICAgICB9IGVs c2UKICAgICAgICAgICAgIGNoaWxkQ3Jvc3NBeGlzRXh0ZW50ID0gIGNyb3NzQXhpc0V4dGVudEZv ckNoaWxkKGNoaWxkKTsKICAgICAgICAgaWYgKGNyb3NzQXhpc0xlbmd0aCgpLmlzQXV0bygpKQot ICAgICAgICAgICAgc2V0Q3Jvc3NBeGlzRXh0ZW50KHN0ZDo6bWF4KGNyb3NzQXhpc0V4dGVudCgp LCBjcm9zc0F4aXNPZmZzZXQgLSBmbG93QXdhcmVCb3JkZXJCZWZvcmUoKSAtIGZsb3dBd2FyZVBh ZGRpbmdCZWZvcmUoKSArIGNyb3NzQXhpc0JvcmRlckFuZFBhZGRpbmdFeHRlbnQoKSArIGNyb3Nz QXhpc01hcmdpbkV4dGVudEZvckNoaWxkKGNoaWxkKSArIGNoaWxkQ3Jvc3NBeGlzRXh0ZW50ICsg Y3Jvc3NBeGlzU2Nyb2xsYmFyRXh0ZW50KCkpKTsKKyAgICAgICAgICAgIHNldENyb3NzQXhpc0V4 dGVudChzdGQ6Om1heChjcm9zc0F4aXNFeHRlbnQoKSwgY3Jvc3NBeGlzT2Zmc2V0ICsgZmxvd0F3 YXJlQm9yZGVyQWZ0ZXIoKSArIGZsb3dBd2FyZVBhZGRpbmdBZnRlcigpICsgY3Jvc3NBeGlzTWFy Z2luRXh0ZW50Rm9yQ2hpbGQoY2hpbGQpICsgY2hpbGRDcm9zc0F4aXNFeHRlbnQgKyBjcm9zc0F4 aXNTY3JvbGxiYXJFeHRlbnQoKSkpOwogICAgICAgICBtYXhDaGlsZENyb3NzQXhpc0V4dGVudCA9 IHN0ZDo6bWF4KG1heENoaWxkQ3Jvc3NBeGlzRXh0ZW50LCBjaGlsZENyb3NzQXhpc0V4dGVudCAr IGNyb3NzQXhpc01hcmdpbkV4dGVudEZvckNoaWxkKGNoaWxkKSk7CiAKICAgICAgICAgbWFpbkF4 aXNPZmZzZXQgKz0gZmxvd0F3YXJlTWFyZ2luU3RhcnRGb3JDaGlsZChjaGlsZCk7CkBAIC04Nzgs NyArOTA1LDcgQEAgdm9pZCBSZW5kZXJGbGV4aWJsZUJveDo6YWxpZ25DaGlsZHJlbihjb25zdCBP cmRlcmVkRmxleEl0ZW1MaXN0JiBjaGlsZHJlbiwgTGF5b3UKICAgICAgICAgICAgIGFkanVzdEFs aWdubWVudEZvckNoaWxkKGNoaWxkLCBhdmFpbGFibGVBbGlnbm1lbnRTcGFjZUZvckNoaWxkKGxp bmVDcm9zc0F4aXNFeHRlbnQsIGNoaWxkKSAvIDIpOwogICAgICAgICAgICAgYnJlYWs7CiAgICAg ICAgIGNhc2UgQWxpZ25CYXNlbGluZTogewotICAgICAgICAgICAgTGF5b3V0VW5pdCBhc2NlbnQg PSBtYXJnaW5Cb3hBc2NlbnQoY2hpbGQpOworICAgICAgICAgICAgTGF5b3V0VW5pdCBhc2NlbnQg PSBtYXJnaW5Cb3hBc2NlbnRGb3JDaGlsZChjaGlsZCk7CiAgICAgICAgICAgICBhZGp1c3RBbGln bm1lbnRGb3JDaGlsZChjaGlsZCwgbWF4QXNjZW50IC0gYXNjZW50KTsKICAgICAgICAgICAgIGJy ZWFrOwogICAgICAgICB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyRmxleGlibGVCb3guaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJs ZUJveC5oCmluZGV4IDlmYjY3OGE5NDE5ZjQzNzQwNzhlZTNhYzAwNjM4ODM2OGQ5MjgyMTAuLjMy ZDMyNDc0YTQ5MWVkYzliYzRiY2FhMjY3ZTBhODEyODMwZTk5MzIgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5oCisrKyBiL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5oCkBAIC03MSwxMiArNzEsMTMgQEAgcHJp dmF0ZToKICAgICBMYXlvdXRVbml0IG1haW5BeGlzQ29udGVudEV4dGVudCgpIGNvbnN0OwogICAg IFdyaXRpbmdNb2RlIHRyYW5zZm9ybWVkV3JpdGluZ01vZGUoKSBjb25zdDsKICAgICBMYXlvdXRV bml0IGZsb3dBd2FyZUJvcmRlclN0YXJ0KCkgY29uc3Q7Ci0gICAgTGF5b3V0VW5pdCBmbG93QXdh cmVCb3JkZXJCZWZvcmUoKSBjb25zdDsKICAgICBMYXlvdXRVbml0IGZsb3dBd2FyZUJvcmRlckVu ZCgpIGNvbnN0OwotICAgIExheW91dFVuaXQgY3Jvc3NBeGlzQm9yZGVyQW5kUGFkZGluZ0V4dGVu dCgpIGNvbnN0OworICAgIExheW91dFVuaXQgZmxvd0F3YXJlQm9yZGVyQmVmb3JlKCkgY29uc3Q7 CisgICAgTGF5b3V0VW5pdCBmbG93QXdhcmVCb3JkZXJBZnRlcigpIGNvbnN0OwogICAgIExheW91 dFVuaXQgZmxvd0F3YXJlUGFkZGluZ1N0YXJ0KCkgY29uc3Q7Ci0gICAgTGF5b3V0VW5pdCBmbG93 QXdhcmVQYWRkaW5nQmVmb3JlKCkgY29uc3Q7CiAgICAgTGF5b3V0VW5pdCBmbG93QXdhcmVQYWRk aW5nRW5kKCkgY29uc3Q7CisgICAgTGF5b3V0VW5pdCBmbG93QXdhcmVQYWRkaW5nQmVmb3JlKCkg Y29uc3Q7CisgICAgTGF5b3V0VW5pdCBmbG93QXdhcmVQYWRkaW5nQWZ0ZXIoKSBjb25zdDsKICAg ICBMYXlvdXRVbml0IGZsb3dBd2FyZU1hcmdpblN0YXJ0Rm9yQ2hpbGQoUmVuZGVyQm94KiBjaGls ZCkgY29uc3Q7CiAgICAgTGF5b3V0VW5pdCBmbG93QXdhcmVNYXJnaW5FbmRGb3JDaGlsZChSZW5k ZXJCb3gqIGNoaWxkKSBjb25zdDsKICAgICBMYXlvdXRVbml0IGZsb3dBd2FyZU1hcmdpbkJlZm9y ZUZvckNoaWxkKFJlbmRlckJveCogY2hpbGQpIGNvbnN0OwpAQCAtOTcsNyArOTgsNyBAQCBwcml2 YXRlOgogICAgIGZsb2F0IG5lZ2F0aXZlRmxleEZvckNoaWxkKFJlbmRlckJveCogY2hpbGQpIGNv bnN0OwogCiAgICAgTGF5b3V0VW5pdCBhdmFpbGFibGVBbGlnbm1lbnRTcGFjZUZvckNoaWxkKExh eW91dFVuaXQgbGluZUNyb3NzQXhpc0V4dGVudCwgUmVuZGVyQm94Kik7Ci0gICAgTGF5b3V0VW5p dCBtYXJnaW5Cb3hBc2NlbnQoUmVuZGVyQm94Kik7CisgICAgTGF5b3V0VW5pdCBtYXJnaW5Cb3hB c2NlbnRGb3JDaGlsZChSZW5kZXJCb3gqKTsKIAogICAgIHZvaWQgY29tcHV0ZU1haW5BeGlzUHJl ZmVycmVkU2l6ZXMoYm9vbCByZWxheW91dENoaWxkcmVuLCBGbGV4T3JkZXJIYXNoU2V0Jik7CiAg ICAgYm9vbCBjb21wdXRlTmV4dEZsZXhMaW5lKEZsZXhPcmRlckl0ZXJhdG9yJiwgT3JkZXJlZEZs ZXhJdGVtTGlzdCYgb3JkZXJlZENoaWxkcmVuLCBMYXlvdXRVbml0JiBwcmVmZXJyZWRNYWluQXhp c0V4dGVudCwgZmxvYXQmIHRvdGFsUG9zaXRpdmVGbGV4aWJpbGl0eSwgZmxvYXQmIHRvdGFsTmVn YXRpdmVGbGV4aWJpbGl0eSk7Cg==