107334 2013-01-18 15:31:26 -0800 [wk2] Intrinsic content size should report a flexible width if the content is not wider than the minimum layout width 2013-01-18 18:14:05 -0800 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 thorton thorton andersca sam simon.fraser oldest_to_newest 811102 0 thorton 2013-01-18 15:31:26 -0800 If the laid-out width of the content is <= the minimum layout width, that means that the content is flexible and we can inform autolayout of this. If it's > the minimum layout width, that means that the content has reached its own "intrinsic" minimum width and we need to inform autolayout that we need more space. <rdar://problem/12960009> 811114 1 183563 thorton 2013-01-18 15:46:26 -0800 Created attachment 183563 patch 811227 2 thorton 2013-01-18 18:14:05 -0800 http://trac.webkit.org/changeset/140228 183563 2013-01-18 15:46:26 -0800 2013-01-18 17:48:14 -0800 patch autowidth.diff text/plain 3995 thorton ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCBiYTRlYTg1Li44NTcxYjI3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTgg QEAKKzIwMTMtMDEtMTggIFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CisK KyAgICAgICAgW3drMl0gSW50cmluc2ljIGNvbnRlbnQgc2l6ZSBzaG91bGQgcmVwb3J0IGEgZmxl eGlibGUgd2lkdGggaWYgdGhlIGNvbnRlbnQgaXMgbm90IHdpZGVyIHRoYW4gdGhlIG1pbmltdW0g bGF5b3V0IHdpZHRoCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xMDczMzQKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzEyOTYwMDA5PgorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9t YWMvV0tWaWV3Lm1tOgorICAgICAgICAoLVtXS1ZpZXcgX3NldEludHJpbnNpY0NvbnRlbnRTaXpl Ol0pOiBJZiB0aGUgY29udGVudCBpcyBsYWlkLW91dCBhdCBvciBiZWxvdyB0aGUgbWluaW11bSBs YXlvdXQgd2lkdGgsIGl0J3MgZmxleGlibGU7IG90aGVyd2lzZSwgd2UgbmVlZCB0byBpbmZvcm0g YXV0b2xheW91dCB0aGF0IHdlIHJlcXVpcmUgbW9yZSBzcGFjZSB2aWEgb3VyIGludHJpbnNpYyBj b250ZW50IHNpemUuCisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFt ZUxvYWRlckNsaWVudC5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYkZyYW1lTG9hZGVyQ2xpZW50 Ojp0cmFuc2l0aW9uVG9Db21taXR0ZWRGb3JOZXdQYWdlKTogQWxsb3cgYXV0by1zaXppbmcgdG8g ZXhwYW5kIGl0cyB3aWR0aCBiZXlvbmQgdGhlIG1pbmltdW0gaWYgbmVlZGVkLgorICAgICAgICAq IFdlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFn ZTo6c2V0TWluaW11bUxheW91dFdpZHRoKTogQWxsb3cgYXV0by1zaXppbmcgdG8gZXhwYW5kIGl0 cyB3aWR0aCBiZXlvbmQgdGhlIG1pbmltdW0gaWYgbmVlZGVkLgorCiAyMDEzLTAxLTE4ICBIdWFu ZyBEb25nc3VuZyAgPGx1eHRlbGxhQGNvbXBhbnkxMDAubmV0PgogCiAgICAgICAgIENvb3JkaW5h dGVkIEdyYXBoaWNzOiBDb29yZGluYXRlZFRpbGU6OnVwZGF0ZUJhY2tCdWZmZXIoKSByZXR1cm5z IGEgZGlydHkgcmVjdC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkv bWFjL1dLVmlldy5tbSBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvbWFjL1dLVmlldy5t bQppbmRleCA3MDgyZjA2Li43OWMxMWExIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQVBJL21hYy9XS1ZpZXcubW0KKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQ SS9tYWMvV0tWaWV3Lm1tCkBAIC0yODU3LDcgKzI4NTcsMTUgQEAgc3RhdGljIE5TU3RyaW5nICpw YXRoV2l0aFVuaXF1ZUZpbGVuYW1lRm9yUGF0aChOU1N0cmluZyAqcGF0aCkKIAogLSAodm9pZClf c2V0SW50cmluc2ljQ29udGVudFNpemU6KE5TU2l6ZSlpbnRyaW5zaWNDb250ZW50U2l6ZQogewot ICAgIF9kYXRhLT5faW50cmluc2ljQ29udGVudFNpemUgPSBpbnRyaW5zaWNDb250ZW50U2l6ZTsK KyAgICAvLyBJZiB0aGUgaW50cmluc2ljIGNvbnRlbnQgc2l6ZSBpcyB0aGUgc2FtZSBhcyB0aGUg bWluaW11bSBsYXlvdXQgd2lkdGgsIHRoZSBjb250ZW50IGZsb3dlZCB0byBmaXQsCisgICAgLy8g c28gd2UgY2FuIHJlcG9ydCB0aGF0IHRoYXQgZGltZW5zaW9uIGlzIGZsZXhpYmxlLiBJZiBub3Qs IHdlIG5lZWQgdG8gcmVwb3J0IG91ciBncmVhdGVyIGludHJpbnNpYyB3aWR0aAorICAgIC8vIHNv IHRoYXQgYXV0b2xheW91dCB3aWxsIGtub3cgdG8gcHJvdmlkZSBzcGFjZSBmb3IgdXMuCisKKyAg ICBOU1NpemUgaW50cmluc2ljQ29udGVudFNpemVBY2tub3dsZWRnaW5nRmxleGlibGVXaWR0aCA9 IGludHJpbnNpY0NvbnRlbnRTaXplOworICAgIGlmIChpbnRyaW5zaWNDb250ZW50U2l6ZS53aWR0 aCA8PSBfZGF0YS0+X3BhZ2UtPm1pbmltdW1MYXlvdXRXaWR0aCgpKQorICAgICAgICBpbnRyaW5z aWNDb250ZW50U2l6ZUFja25vd2xlZGdpbmdGbGV4aWJsZVdpZHRoLndpZHRoID0gTlNWaWV3Tm9J bnN0cmluc2ljTWV0cmljOworCisgICAgX2RhdGEtPl9pbnRyaW5zaWNDb250ZW50U2l6ZSA9IGlu dHJpbnNpY0NvbnRlbnRTaXplQWNrbm93bGVkZ2luZ0ZsZXhpYmxlV2lkdGg7CiAgICAgW3NlbGYg aW52YWxpZGF0ZUludHJpbnNpY0NvbnRlbnRTaXplXTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5j cHAgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9h ZGVyQ2xpZW50LmNwcAppbmRleCAyY2MxYmExNy4uZjcyYzgwYiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5j cHAKKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFt ZUxvYWRlckNsaWVudC5jcHAKQEAgLTEyNDQsNyArMTI0NCw3IEBAIHZvaWQgV2ViRnJhbWVMb2Fk ZXJDbGllbnQ6OnRyYW5zaXRpb25Ub0NvbW1pdHRlZEZvck5ld1BhZ2UoKQogCiAgICAgaW50IG1p bmltdW1MYXlvdXRXaWR0aCA9IHdlYlBhZ2UtPm1pbmltdW1MYXlvdXRXaWR0aCgpOwogICAgIGlm IChtaW5pbXVtTGF5b3V0V2lkdGgpCi0gICAgICAgIG1fZnJhbWUtPmNvcmVGcmFtZSgpLT52aWV3 KCktPmVuYWJsZUF1dG9TaXplTW9kZSh0cnVlLCBJbnRTaXplKG1pbmltdW1MYXlvdXRXaWR0aCwg MSksIEludFNpemUobWluaW11bUxheW91dFdpZHRoLCBJTlRfTUFYKSk7CisgICAgICAgIG1fZnJh bWUtPmNvcmVGcmFtZSgpLT52aWV3KCktPmVuYWJsZUF1dG9TaXplTW9kZSh0cnVlLCBJbnRTaXpl KG1pbmltdW1MYXlvdXRXaWR0aCwgMSksIEludFNpemUoSU5UX01BWCwgSU5UX01BWCkpOwogCiAg ICAgbV9mcmFtZS0+Y29yZUZyYW1lKCktPnZpZXcoKS0+c2V0UHJvaGliaXRzU2Nyb2xsaW5nKHNo b3VsZERpc2FibGVTY3JvbGxpbmcpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQ cm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dl YlBhZ2UvV2ViUGFnZS5jcHAKaW5kZXggNjBiMWZiNi4uNmYzM2JmNSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCisrKyBiL1NvdXJjZS9X ZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcApAQCAtMzc4OSw3ICszNzg5LDcg QEAgdm9pZCBXZWJQYWdlOjpzZXRNaW5pbXVtTGF5b3V0V2lkdGgoZG91YmxlIG1pbmltdW1MYXlv dXRXaWR0aCkKICAgICBtX21pbmltdW1MYXlvdXRXaWR0aCA9IG1pbmltdW1MYXlvdXRXaWR0aDsK IAogICAgIGlmIChtaW5pbXVtTGF5b3V0V2lkdGggPiAwKQotICAgICAgICBjb3JlUGFnZSgpLT5t YWluRnJhbWUoKS0+dmlldygpLT5lbmFibGVBdXRvU2l6ZU1vZGUodHJ1ZSwgSW50U2l6ZShtaW5p bXVtTGF5b3V0V2lkdGgsIDEpLCBJbnRTaXplKG1pbmltdW1MYXlvdXRXaWR0aCwgSU5UX01BWCkp OworICAgICAgICBjb3JlUGFnZSgpLT5tYWluRnJhbWUoKS0+dmlldygpLT5lbmFibGVBdXRvU2l6 ZU1vZGUodHJ1ZSwgSW50U2l6ZShtaW5pbXVtTGF5b3V0V2lkdGgsIDEpLCBJbnRTaXplKElOVF9N QVgsIElOVF9NQVgpKTsKICAgICBlbHNlCiAgICAgICAgIGNvcmVQYWdlKCktPm1haW5GcmFtZSgp LT52aWV3KCktPmVuYWJsZUF1dG9TaXplTW9kZShmYWxzZSwgSW50U2l6ZSgpLCBJbnRTaXplKCkp OwogfQo=