46497 2010-09-24 12:27:38 -0700 Rename containingBlockWidthForContent 2010-09-24 12:33:12 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 46123 1 hyatt hyatt oldest_to_newest 284621 0 hyatt 2010-09-24 12:27:38 -0700 Rename it to accurately reflect that the logical width is being obtained. 284622 1 68730 hyatt 2010-09-24 12:28:49 -0700 Created attachment 68730 Patch 284623 2 68730 sam 2010-09-24 12:30:24 -0700 Comment on attachment 68730 Patch Mr. Spock agrees. 284626 3 hyatt 2010-09-24 12:33:12 -0700 Fixed in r68283. 68730 2010-09-24 12:28:49 -0700 2010-09-24 12:30:24 -0700 Patch patch.txt text/plain 7464 hyatt SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2ODI4MikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjIgQEAKKzIwMTAtMDktMjQgIERhdmlkIEh5YXR0ICA8aHlhdHRAYXBwbGUuY29t PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00NjQ5NiwgcmVuYW1lIGNvbnRhaW5p bmdCbG9ja1dpZHRoRm9yQ29udGVudCB0bworICAgICAgICBjb250YWluaW5nQmxvY2tMb2dpY2Fs V2lkdGhGb3JDb250ZW50LgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJsb2NrLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJsb2NrOjpsb2NhbENhcmV0UmVjdCk6CisgICAgICAg ICogcmVuZGVyaW5nL1JlbmRlckJveC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCb3g6 OmNvbnRhaW5pbmdCbG9ja0xvZ2ljYWxXaWR0aEZvckNvbnRlbnQpOgorICAgICAgICAoV2ViQ29y ZTo6UmVuZGVyQm94Ojpjb21wdXRlTG9naWNhbFdpZHRoKToKKyAgICAgICAgKFdlYkNvcmU6OlJl bmRlckJveDo6Y29tcHV0ZVJlcGxhY2VkV2lkdGhVc2luZyk6CisgICAgICAgICogcmVuZGVyaW5n L1JlbmRlckJveC5oOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJCb3hNb2RlbE9iamVjdC5j cHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCb3hNb2RlbE9iamVjdDo6cmVsYXRpdmVQb3Np dGlvbk9mZnNldFgpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94TW9kZWxPYmplY3Q6OmNv bnRhaW5pbmdCbG9ja0xvZ2ljYWxXaWR0aEZvckNvbnRlbnQpOgorICAgICAgICAqIHJlbmRlcmlu Zy9SZW5kZXJCb3hNb2RlbE9iamVjdC5oOgorCiAyMDEwLTA5LTI0ICBEYXZpZCBIeWF0dCAgPGh5 YXR0QGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBTYW0gV2VpbmlnLgpJbmRleDog V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2suY3BwCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUv cmVuZGVyaW5nL1JlbmRlckJsb2NrLmNwcAkocmV2aXNpb24gNjgyODIpCisrKyBXZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJCbG9jay5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTU3ODEsNyArNTc4MSw3 IEBAIEludFJlY3QgUmVuZGVyQmxvY2s6OmxvY2FsQ2FyZXRSZWN0KElubGkKICAgICAgICAgICAg IC8vIEZJWE1FOiB3aHkgY2FsbCBsb2NhbFRvQWJzb2x1dGVGb3JDb250ZW50KCkgdHdpY2UgaGVy ZSwgdG9vPwogICAgICAgICAgICAgRmxvYXRQb2ludCBhYnNSaWdodFBvaW50ID0gbG9jYWxUb0Fi c29sdXRlKEZsb2F0UG9pbnQobXlSaWdodCwgMCkpOwogCi0gICAgICAgICAgICBpbnQgY29udGFp bmVyUmlnaHQgPSBjb250YWluaW5nQmxvY2soKS0+eCgpICsgY29udGFpbmluZ0Jsb2NrV2lkdGhG b3JDb250ZW50KCk7CisgICAgICAgICAgICBpbnQgY29udGFpbmVyUmlnaHQgPSBjb250YWluaW5n QmxvY2soKS0+eCgpICsgY29udGFpbmluZ0Jsb2NrTG9naWNhbFdpZHRoRm9yQ29udGVudCgpOwog ICAgICAgICAgICAgRmxvYXRQb2ludCBhYnNDb250YWluZXJQb2ludCA9IGxvY2FsVG9BYnNvbHV0 ZShGbG9hdFBvaW50KGNvbnRhaW5lclJpZ2h0LCAwKSk7CiAKICAgICAgICAgICAgICpleHRyYVdp ZHRoVG9FbmRPZkxpbmUgPSBhYnNDb250YWluZXJQb2ludC54KCkgLSBhYnNSaWdodFBvaW50Lngo KTsKSW5kZXg6IFdlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcAkocmV2aXNpb24gNjgyODIpCisrKyBXZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMDM1LDEyICsx MDM1LDEyIEBAIEludFJlY3QgUmVuZGVyQm94OjpjbGlwUmVjdChpbnQgdHgsIGludCAKICAgICBy ZXR1cm4gSW50UmVjdChjbGlwWCwgY2xpcFksIGNsaXBXaWR0aCwgY2xpcEhlaWdodCk7CiB9CiAK LWludCBSZW5kZXJCb3g6OmNvbnRhaW5pbmdCbG9ja1dpZHRoRm9yQ29udGVudCgpIGNvbnN0Citp bnQgUmVuZGVyQm94Ojpjb250YWluaW5nQmxvY2tMb2dpY2FsV2lkdGhGb3JDb250ZW50KCkgY29u c3QKIHsKICAgICBSZW5kZXJCbG9jayogY2IgPSBjb250YWluaW5nQmxvY2soKTsKICAgICBpZiAo c2hyaW5rVG9Bdm9pZEZsb2F0cygpKQogICAgICAgICByZXR1cm4gY2ItPmF2YWlsYWJsZUxvZ2lj YWxXaWR0aEZvckxpbmUoeSgpLCBmYWxzZSk7Ci0gICAgcmV0dXJuIGNiLT5hdmFpbGFibGVXaWR0 aCgpOworICAgIHJldHVybiBjYi0+YXZhaWxhYmxlTG9naWNhbFdpZHRoKCk7CiB9CiAKIHZvaWQg UmVuZGVyQm94OjptYXBMb2NhbFRvQ29udGFpbmVyKFJlbmRlckJveE1vZGVsT2JqZWN0KiByZXBh aW50Q29udGFpbmVyLCBib29sIGZpeGVkLCBib29sIHVzZVRyYW5zZm9ybXMsIFRyYW5zZm9ybVN0 YXRlJiB0cmFuc2Zvcm1TdGF0ZSkgY29uc3QKQEAgLTEzNjAsMTIgKzEzNjAsMTYgQEAgdm9pZCBS ZW5kZXJCb3g6OmNvbXB1dGVMb2dpY2FsV2lkdGgoKQogCiAgICAgLy8gVGhlIHBhcmVudCBib3gg aXMgZmxleGluZyB1cywgc28gaXQgaGFzIGluY3JlYXNlZCBvciBkZWNyZWFzZWQgb3VyCiAgICAg Ly8gd2lkdGguICBVc2UgdGhlIHdpZHRoIGZyb20gdGhlIHN0eWxlIGNvbnRleHQuCisgICAgLy8g RklYTUU6IEFjY291bnQgZm9yIGJsb2NrLWZsb3cgaW4gZmxleGlibGUgYm94ZXMuCisgICAgLy8g aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ2NDE4CiAgICAgaWYgKGhh c092ZXJyaWRlU2l6ZSgpICYmICBwYXJlbnQoKS0+c3R5bGUoKS0+Ym94T3JpZW50KCkgPT0gSE9S SVpPTlRBTAogICAgICAgICAgICAgJiYgcGFyZW50KCktPmlzRmxleGlibGVCb3goKSAmJiBwYXJl bnQoKS0+aXNGbGV4aW5nQ2hpbGRyZW4oKSkgewogICAgICAgICBzZXRXaWR0aChvdmVycmlkZVNp emUoKSk7CiAgICAgICAgIHJldHVybjsKICAgICB9CiAKKyAgICAvLyBGSVhNRTogQWNjb3VudCBm b3IgYmxvY2stZmxvdyBpbiBmbGV4aWJsZSBib3hlcy4KKyAgICAvLyBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDY0MTgKICAgICBib29sIGluVmVydGljYWxCb3ggPSBw YXJlbnQoKS0+aXNGbGV4aWJsZUJveCgpICYmIChwYXJlbnQoKS0+c3R5bGUoKS0+Ym94T3JpZW50 KCkgPT0gVkVSVElDQUwpOwogICAgIGJvb2wgc3RyZXRjaGluZyA9IChwYXJlbnQoKS0+c3R5bGUo KS0+Ym94QWxpZ24oKSA9PSBCU1RSRVRDSCk7CiAgICAgYm9vbCB0cmVhdEFzUmVwbGFjZWQgPSBz aG91bGRDb21wdXRlU2l6ZUFzUmVwbGFjZWQoKSAmJiAoIWluVmVydGljYWxCb3ggfHwgIXN0cmV0 Y2hpbmcpOwpAQCAtMTM3Myw3ICsxMzc3LDcgQEAgdm9pZCBSZW5kZXJCb3g6OmNvbXB1dGVMb2dp Y2FsV2lkdGgoKQogICAgIExlbmd0aCB3ID0gKHRyZWF0QXNSZXBsYWNlZCkgPyBMZW5ndGgoY29t cHV0ZVJlcGxhY2VkV2lkdGgoKSwgRml4ZWQpIDogc3R5bGUoKS0+d2lkdGgoKTsKIAogICAgIFJl bmRlckJsb2NrKiBjYiA9IGNvbnRhaW5pbmdCbG9jaygpOwotICAgIGludCBjb250YWluZXJXaWR0 aCA9IG1heCgwLCBjb250YWluaW5nQmxvY2tXaWR0aEZvckNvbnRlbnQoKSk7CisgICAgaW50IGNv bnRhaW5lcldpZHRoID0gbWF4KDAsIGNvbnRhaW5pbmdCbG9ja0xvZ2ljYWxXaWR0aEZvckNvbnRl bnQoKSk7CiAKICAgICBMZW5ndGggbWFyZ2luTGVmdCA9IHN0eWxlKCktPm1hcmdpbkxlZnQoKTsK ICAgICBMZW5ndGggbWFyZ2luUmlnaHQgPSBzdHlsZSgpLT5tYXJnaW5SaWdodCgpOwpAQCAtMTcy NCw3ICsxNzI4LDEwIEBAIGludCBSZW5kZXJCb3g6OmNvbXB1dGVSZXBsYWNlZFdpZHRoVXNpbmcK ICAgICAgICAgY2FzZSBGaXhlZDoKICAgICAgICAgICAgIHJldHVybiBjb21wdXRlQ29udGVudEJv eExvZ2ljYWxXaWR0aCh3aWR0aC52YWx1ZSgpKTsKICAgICAgICAgY2FzZSBQZXJjZW50OiB7Ci0g ICAgICAgICAgICBjb25zdCBpbnQgY3cgPSBpc1Bvc2l0aW9uZWQoKSA/IGNvbnRhaW5pbmdCbG9j a1dpZHRoRm9yUG9zaXRpb25lZCh0b1JlbmRlckJveE1vZGVsT2JqZWN0KGNvbnRhaW5lcigpKSkg OiBjb250YWluaW5nQmxvY2tXaWR0aEZvckNvbnRlbnQoKTsKKyAgICAgICAgICAgIC8vIEZJWE1F OiBjb250YWluaW5nQmxvY2tMb2dpY2FsV2lkdGhGb3JDb250ZW50KCkgaXMgd3JvbmcgaWYgdGhl IHJlcGxhY2VkIGVsZW1lbnQncyBibG9jay1mbG93IGlzIHBlcnBlbmRpY3VsYXIgdG8gdGhlCisg ICAgICAgICAgICAvLyBjb250YWluaW5nIGJsb2NrJ3MgYmxvY2stZmxvdy4KKyAgICAgICAgICAg IC8vIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00NjQ5NgorICAgICAg ICAgICAgY29uc3QgaW50IGN3ID0gaXNQb3NpdGlvbmVkKCkgPyBjb250YWluaW5nQmxvY2tXaWR0 aEZvclBvc2l0aW9uZWQodG9SZW5kZXJCb3hNb2RlbE9iamVjdChjb250YWluZXIoKSkpIDogY29u dGFpbmluZ0Jsb2NrTG9naWNhbFdpZHRoRm9yQ29udGVudCgpOwogICAgICAgICAgICAgaWYgKGN3 ID4gMCkKICAgICAgICAgICAgICAgICByZXR1cm4gY29tcHV0ZUNvbnRlbnRCb3hMb2dpY2FsV2lk dGgod2lkdGguY2FsY01pblZhbHVlKGN3KSk7CiAgICAgICAgIH0KSW5kZXg6IFdlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlckJveC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcmVuZGVyaW5nL1JlbmRl ckJveC5oCShyZXZpc2lvbiA2ODI3NikKKysrIFdlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5o CSh3b3JraW5nIGNvcHkpCkBAIC0yMTksNyArMjE5LDcgQEAgcHVibGljOgogCiAgICAgdmlydHVh bCB2b2lkIHJlcGFpbnREdXJpbmdMYXlvdXRJZk1vdmVkKGNvbnN0IEludFJlY3QmKTsKIAotICAg IHZpcnR1YWwgaW50IGNvbnRhaW5pbmdCbG9ja1dpZHRoRm9yQ29udGVudCgpIGNvbnN0OworICAg IHZpcnR1YWwgaW50IGNvbnRhaW5pbmdCbG9ja0xvZ2ljYWxXaWR0aEZvckNvbnRlbnQoKSBjb25z dDsKIAogICAgIHZpcnR1YWwgdm9pZCBjb21wdXRlTG9naWNhbFdpZHRoKCk7CiAgICAgdmlydHVh bCB2b2lkIGNvbXB1dGVMb2dpY2FsSGVpZ2h0KCk7CkluZGV4OiBXZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJCb3hNb2RlbE9iamVjdC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyQm94TW9kZWxPYmplY3QuY3BwCShyZXZpc2lvbiA2ODIwMCkKKysrIFdlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlckJveE1vZGVsT2JqZWN0LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzIwLDcg KzMyMCw3IEBAIGludCBSZW5kZXJCb3hNb2RlbE9iamVjdDo6cmVsYXRpdmVQb3NpdGkKIHsKICAg ICAvLyBPYmplY3RzIHRoYXQgc2hyaW5rIHRvIGF2b2lkIGZsb2F0cyBub3JtYWxseSB1c2UgYXZh aWxhYmxlIGxpbmUgd2lkdGggd2hlbiBjb21wdXRpbmcgY29udGFpbmluZyBibG9jayB3aWR0aC4g IEhvd2V2ZXIKICAgICAvLyBpbiB0aGUgY2FzZSBvZiByZWxhdGl2ZSBwb3NpdGlvbmluZyB1c2lu ZyBwZXJjZW50YWdlcywgd2UgY2FuJ3QgZG8gdGhpcy4gIFRoZSBvZmZzZXQgc2hvdWxkIGFsd2F5 cyBiZSByZXNvbHZlZCB1c2luZyB0aGUKLSAgICAvLyBhdmFpbGFibGUgd2lkdGggb2YgdGhlIGNv bnRhaW5pbmcgYmxvY2suICBUaGVyZWZvcmUgd2UgZG9uJ3QgdXNlIGNvbnRhaW5pbmdCbG9ja1dp ZHRoRm9yQ29udGVudCgpIGhlcmUsIGJ1dCBpbnN0ZWFkIGV4cGxpY2l0bHkKKyAgICAvLyBhdmFp bGFibGUgd2lkdGggb2YgdGhlIGNvbnRhaW5pbmcgYmxvY2suICBUaGVyZWZvcmUgd2UgZG9uJ3Qg dXNlIGNvbnRhaW5pbmdCbG9ja0xvZ2ljYWxXaWR0aEZvckNvbnRlbnQoKSBoZXJlLCBidXQgaW5z dGVhZCBleHBsaWNpdGx5CiAgICAgLy8gY2FsbCBhdmFpbGFibGVXaWR0aCBvbiBvdXIgY29udGFp bmluZyBibG9jay4KICAgICBpZiAoIXN0eWxlKCktPmxlZnQoKS5pc0F1dG8oKSkgewogICAgICAg ICBSZW5kZXJCbG9jayogY2IgPSBjb250YWluaW5nQmxvY2soKTsKQEAgLTE3ODEsOSArMTc4MSw5 IEBAIHZvaWQgUmVuZGVyQm94TW9kZWxPYmplY3Q6OnBhaW50Qm94U2hhZG8KICAgICB9CiB9CiAK LWludCBSZW5kZXJCb3hNb2RlbE9iamVjdDo6Y29udGFpbmluZ0Jsb2NrV2lkdGhGb3JDb250ZW50 KCkgY29uc3QKK2ludCBSZW5kZXJCb3hNb2RlbE9iamVjdDo6Y29udGFpbmluZ0Jsb2NrTG9naWNh bFdpZHRoRm9yQ29udGVudCgpIGNvbnN0CiB7Ci0gICAgcmV0dXJuIGNvbnRhaW5pbmdCbG9jaygp LT5hdmFpbGFibGVXaWR0aCgpOworICAgIHJldHVybiBjb250YWluaW5nQmxvY2soKS0+YXZhaWxh YmxlTG9naWNhbFdpZHRoKCk7CiB9CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKSW5kZXg6IFdl YkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveE1vZGVsT2JqZWN0LmgKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyQm94TW9kZWxPYmplY3QuaAkocmV2aXNpb24gNjgxNzQpCisr KyBXZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3hNb2RlbE9iamVjdC5oCSh3b3JraW5nIGNvcHkp CkBAIC0xMDEsNyArMTAxLDcgQEAgcHVibGljOgogICAgIGJvb2wgaGFzSG9yaXpvbnRhbEJvcmRl cnNQYWRkaW5nT3JNYXJnaW4oKSBjb25zdCB7IHJldHVybiBoYXNIb3Jpem9udGFsQm9yZGVyc09y UGFkZGluZygpIHx8IG1hcmdpbkxlZnQoKSAhPSAwIHx8IG1hcmdpblJpZ2h0KCkgIT0gMDsgfQog ICAgIGJvb2wgaGFzSG9yaXpvbnRhbEJvcmRlcnNPclBhZGRpbmcoKSBjb25zdCB7IHJldHVybiBi b3JkZXJMZWZ0KCkgIT0gMCB8fCBib3JkZXJSaWdodCgpICE9IDAgfHwgcGFkZGluZ0xlZnQoKSAh PSAwIHx8IHBhZGRpbmdSaWdodCgpICE9IDA7IH0KIAotICAgIHZpcnR1YWwgaW50IGNvbnRhaW5p bmdCbG9ja1dpZHRoRm9yQ29udGVudCgpIGNvbnN0OworICAgIHZpcnR1YWwgaW50IGNvbnRhaW5p bmdCbG9ja0xvZ2ljYWxXaWR0aEZvckNvbnRlbnQoKSBjb25zdDsKIAogICAgIHZpcnR1YWwgdm9p ZCBjaGlsZEJlY2FtZU5vbklubGluZShSZW5kZXJPYmplY3QqIC8qY2hpbGQqLykgeyB9CiAK