12490 2007-01-30 21:46:28 -0800 Clean up canPlaceOnLine logic in bidi.cpp 2007-01-31 05:22:08 -0800 1 1 1 Unclassified WebKit Layout and Rendering 420+ Mac OS X 10.4 RESOLVED FIXED P2 Normal --- 1 ddkilzer webkit-unassigned hyatt mitz oldest_to_newest 30066 0 ddkilzer 2007-01-30 21:46:28 -0800 The logic for calculating canPlaceOnLine in bidi.cpp may be simplified. This is a follow-up to Bug 12423 Comment #21. A true table for your edification: auto Wrap Was will Ever Fit True On auto On [0] [1] [2] Line Wrap Line --- --- --- ---- ---- ------- T T T T T T T T T T T T (F) T T T T F T T T T T F F F F F F T T F F F F T T (F) T F F F F T T T T F F F [0] bool canFitOnLine = willFitOnLine || !autoWrap; [1] bool canFitOnLine = willFitOnLine || !autoWrap; if (!willFitOnLine && !autoWrap && autoWrapWasEverTrueOnLine) canFitOneLine = false; [2] bool canFitOnLine = willFitOnLine || !willFitOnLine && !autoWrapWasEverTrueOnLine; 29996 1 12818 ddkilzer 2007-01-30 21:49:14 -0800 Created attachment 12818 Patch v1 Proposed change. 29994 2 ddkilzer 2007-01-30 21:50:13 -0800 (In reply to comment #0) > A true table for your edification: TRUTH table, even! 29922 3 12818 mitz 2007-01-30 23:10:33 -0800 Comment on attachment 12818 Patch v1 r=me 29861 4 ddkilzer 2007-01-31 05:11:32 -0800 Committed revision 19300. 29858 5 mitz 2007-01-31 05:15:26 -0800 (In reply to comment #4) > Committed revision 19300. Oops, I overlooked that the change log did not mention the bug URL. Dave, could you please add it? 29852 6 ddkilzer 2007-01-31 05:22:08 -0800 (In reply to comment #5) > Oops, I overlooked that the change log did not mention the bug URL. Dave, could > you please add it? Good catch! You know, something didn't look right when I committed it, but I couldn't figure out what it was. Committed r19301. 12818 2007-01-30 21:49:14 -0800 2007-01-30 23:10:33 -0800 Patch v1 bug-12490-v1.diff text/plain 1378 ddkilzer SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiAxOTI4OCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTIgQEAKKzIwMDctMDEtMzAgIERhdmlkIEtpbHplciAgPGRka2lsemVyQGtpbHpl ci5uZXQ+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg Tm8gdGVzdCBjYXNlcyBzaW5jZSB0aGVyZSBpcyBubyBjaGFuZ2UgaW4gZnVuY3Rpb25hbGl0eS4K KworICAgICAgICAqIHJlbmRlcmluZy9iaWRpLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRl ckJsb2NrOjpmaW5kTmV4dExpbmVCcmVhayk6IFNpbXBsaWZ5IGNhbkZpdE9uTGluZSBleHByZXNz aW9uLgorCiAyMDA3LTAxLTMwICBNYWNpZWogU3RhY2hvd2lhayAgPG1qc0BhcHBsZS5jb20+CiAK ICAgICAgICAgUmV2aWV3ZWQgYnkgQW5kZXJzLgpJbmRleDogV2ViQ29yZS9yZW5kZXJpbmcvYmlk aS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9yZW5kZXJpbmcvYmlkaS5jcHAJKHJldmlzaW9u IDE5Mjg2KQorKysgV2ViQ29yZS9yZW5kZXJpbmcvYmlkaS5jcHAJKHdvcmtpbmcgY29weSkKQEAg LTI0MDAsOSArMjQwMCw3IEBAIEJpZGlJdGVyYXRvciBSZW5kZXJCbG9jazo6ZmluZE5leHRMaW5l QnIKICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjaGVja0ZvckJyZWFrID0gdHJ1ZTsKICAg ICAgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgICAgICAgICBib29sIHdpbGxGaXRPbkxp bmUgPSAodyArIHRtcFcgPD0gd2lkdGgpOwotICAgICAgICAgICAgICAgICAgICBib29sIGNhblBs YWNlT25MaW5lID0gd2lsbEZpdE9uTGluZSB8fCAhYXV0b1dyYXA7Ci0gICAgICAgICAgICAgICAg ICAgIGlmICghd2lsbEZpdE9uTGluZSAmJiAhYXV0b1dyYXAgJiYgYXV0b1dyYXBXYXNFdmVyVHJ1 ZU9uTGluZSkKLSAgICAgICAgICAgICAgICAgICAgICAgIGNhblBsYWNlT25MaW5lID0gZmFsc2U7 CisgICAgICAgICAgICAgICAgICAgIGJvb2wgY2FuUGxhY2VPbkxpbmUgPSB3aWxsRml0T25MaW5l IHx8ICF3aWxsRml0T25MaW5lICYmICFhdXRvV3JhcFdhc0V2ZXJUcnVlT25MaW5lOwogICAgICAg ICAgICAgICAgICAgICBpZiAoY2FuUGxhY2VPbkxpbmUgJiYgY2hlY2tGb3JCcmVhaykgewogICAg ICAgICAgICAgICAgICAgICAgICAgdyArPSB0bXBXOwogICAgICAgICAgICAgICAgICAgICAgICAg dG1wVyA9IDA7Cg==