Changeset 12073 in webkit
- Timestamp:
- Jan 13, 2006, 8:39:05 AM (19 years ago)
- Location:
- trunk
- Files:
-
- 6 added
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r12039 r12073 1 2006-01-13 Mitz Pettel <opendarwin.org@mitzpettel.com> 2 3 Reviewed and landed by Darin. 4 5 - tests for http://bugzilla.opendarwin.org/show_bug.cgi?id=6418 6 Incorrect scrollbar when using overflow:auto and word-wrap:break-word; in some cases 7 8 * fast/replaced/inline-box-wrapper-handover.html: Updated test to not depend on the 9 edge case behavior. 10 * fast/replaced/inline-box-wrapper-handover-expected.checksum: Updated results. 11 * fast/replaced/inline-box-wrapper-handover-expected.png: Ditto. 12 * fast/replaced/inline-box-wrapper-handover-expected.txt: Ditto. 13 14 * fast/text/basic/015.html: Added. 15 * fast/text/basic/015-expected.checksum: Added. 16 * fast/text/basic/015-expected.png: Added. 17 * fast/text/basic/015-expected.txt: Added. 18 19 * fast/dom/css-rule-functions-expected.checksum: Added. 20 * fast/dom/css-rule-functions-expected.png: Added. 21 1 22 2006-01-12 Anders Carlsson <andersca@mac.com> 2 23 … … 1575 1596 Reviewed by Geoff. 1576 1597 1577 1578 1579 1580 1598 This test was failing because the results that were checked 1599 in said that the RenderText should be 16 pixels wide, when it 1600 should be 17. I went back in time to make sure that this 1601 is not a regression. (It isn't.) 1581 1602 1582 1603 * css2.1/t0905-c414-flt-00-d-expected.checksum: … … 1645 1666 Reviewed by Eric. 1646 1667 1647 1648 1668 - test case for 6396: Activation objects should not have __proto__ property 1669 http://bugzilla.opendarwin.org/show_bug.cgi?id=6395 1649 1670 1650 1671 * fast/js/activation-proto-expected.txt: Added. … … 2480 2501 - Update tests for http://bugzilla.opendarwin.org/show_bug.cgi?id=6297 2481 2502 XMLSerializer should use createMarkup 2482 2503 2483 2504 * fast/dom/XMLSerializer.html: 2484 2505 * fast/dom/XMLSerializer-expected.txt: 2485 2506 Create a document fragment and serialize it. 2486 2507 2487 2508 * fast/dom/dom-parse-serialize.html: 2488 2509 * fast/dom/dom-parse-serialize-expected.txt: … … 2508 2529 Reviewed by Darin, landed by Maciej. 2509 2530 2510 2511 2531 - land test case documenting wontfix status for certain overflow/table behavior 2532 http://bugzilla.opendarwin.org/show_bug.cgi?id=3505 2512 2533 2513 2534 * fast/overflow/overflow-auto-table-expected.checksum: Added. … … 2562 2583 No review. 2563 2584 2564 2565 2585 - updated test results for Number.toString() fixes: 2586 <http://bugzilla.opendarwin.org/show_bug.cgi?id=6259> 2566 2587 2567 2588 * fast/js/kde/Number-expected.txt: … … 2755 2776 Rubber stamped by Eric. 2756 2777 2757 2758 2759 2778 - proper length for Array concat function is 1, not 0; also add test 2779 for String concat. 2780 2760 2781 * fast/js/kde/function_length-expected.txt: 2761 2782 * fast/js/kde/resources/function_length.js: … … 2821 2842 No review, just a test harness change. 2822 2843 2823 2844 - avoid bombing out if a shouldBe test case unexpectedly throws an exception 2824 2845 2825 2846 * fast/js/kde/resources/base.js: 2826 2847 2827 2848 - this lets some of the tests get a bit further, so new results: 2828 2849 2829 2850 * fast/js/kde/Number-expected.txt: … … 2836 2857 Reviewed, tweaked and landed by Maciej. 2837 2858 2838 2839 2859 - test case for 4405: <button> not listed in form collections. 2860 http://bugzilla.opendarwin.org/show_bug.cgi?id=4405 2840 2861 2841 2862 * fast/forms/button-in-forms-collection-expected.txt: Added. … … 2846 2867 Reviewed, tweaked and landed by Maciej. 2847 2868 2848 2849 2869 - test case for 6234: Can delete array index property incorrectly. 2870 http://bugzilla.opendarwin.org/show_bug.cgi?id=6234 2850 2871 2851 2872 * fast/js/array-float-delete.html: Added. … … 2855 2876 Rubber stamped by Geoff. 2856 2877 2857 2878 - land JavaScript tests from the kde version of kjs 2858 2879 2859 2880 * fast/js/kde/Array-expected.txt: Added. … … 3055 3076 Reviewed by Eric. 3056 3077 3057 3078 - updated for WebCore changes to make XSLT params partially work 3058 3079 3059 3080 * fast/xsl/xslt-processer-expected.txt: … … 3403 3424 Reviewed by Eric. 3404 3425 3405 3406 3407 3408 3409 3410 3411 3426 This layout test is sort of for <rdar://problem/4374783> 10.4.4 3427 REGRESSION: caret disappears when typing at the bottom of a 3428 scrollable textarea. 3429 3430 It does not address the fundamental problem with that bug, 3431 but it does make sure we ignore negative line-height in 3432 textareas. 3412 3433 3413 3434 * fast/forms/negativeLineHeight-expected.checksum: Added. … … 3492 3513 2005-12-12 David Harrison <harrison@apple.com> 3493 3514 3494 3495 3496 3515 <rdar://problem/4026906> Paste of HTML table content can break table structure 3516 <rdar://problem/4027704> Paste of HTML list content can break list structure by dropping empty list items 3517 3497 3518 * editing/pasteboard/block-wrappers-necessary.html: 3498 3519 Removed empty p tag. 3499 3520 * editing/pasteboard/paste-list-001-expected.checksum: Added. 3500 3521 * editing/pasteboard/paste-list-001-expected.png: Added. … … 3910 3931 3911 3932 Layout test for <rdar://problem/4358898> TOT/GLENDALE REGRESSION: 3912 3933 Table layout issue occurs at http://www.pixar.com/shorts/index.html 3913 3934 3914 3935 * fast/table/colspanMinWidth-expected.checksum: Added. … … 4183 4204 Reviewed by Darin. Commited by Maciej. 4184 4205 4185 4186 4206 - test case for http://bugzilla.opendarwin.org/show_bug.cgi?id=5715 4207 (document.charset, document.defaultCharset, and document.characterSet are not supported) 4187 4208 4188 4209 * fast/dom/Document/document-charset-expected.txt: Added. … … 4218 4239 Reviewed by Darin. Committed by Maciej. 4219 4240 4220 4221 4241 - test case for Bidi algorithm: AN after L has incorrect resolved level 4242 (http://bugzilla.opendarwin.org/show_bug.cgi?id=5573) 4222 4243 4223 4244 * fast/text/international/bidi-AN-after-L-expected.txt: Added. … … 4584 4605 4585 4606 Layout test for <rdar://problem/3871165> text box in nested 4586 4587 4588 4589 4607 table disappears when you click on it (3452) (Safari PSOFT: 4608 US EDU PS8: Lead List searches) 4609 4610 This is a manual test. 4590 4611 4591 4612 * fast/table/spanOverlapRepaint-expected.checksum: Added. … … 4749 4770 4750 4771 Add test to make sure that importNode preserves element prefixes. 4751 4772 4752 4773 * fast/dom/importNode-prefix-expected.txt: Added. 4753 4774 * fast/dom/importNode-prefix.html: Added. … … 4756 4777 4757 4778 Forgot to add this image for fast/replaced/width100percent.html 4758 4779 oops! 4759 4780 4760 4781 * fast/replaced/resources/apple_m.jpg: Added. … … 4791 4812 - Add layout test for <http://bugzilla.opendarwin.org/show_bug.cgi?id=5725> 4792 4813 setAttributeNS with null namespace sets namespace to string containing 'null' 4793 4814 4794 4815 * fast/dom/setAttributeNS.html: Added. 4795 4816 … … 4798 4819 Reviewed by Hyatt. 4799 4820 4800 4801 4821 Layout test for <rdar://problem/3952698> Function buttons do not display 4822 properly with Telia Webmail (3488). 4802 4823 4803 4824 * fast/replaced/width100percent-expected.checksum: Added. … … 4883 4904 Reviewed by Eric, Geoff and Darin. 4884 4905 4885 4886 4887 4888 4889 4906 - added test cases for <rdar://problem/4118258> XML DOM trees freed prematurely unless reference held to document node (causes crash) 4907 4908 Also updated the GC tests to try a little harder to trigger GC, 4909 the old way might not work as well with the reworking of SimpleNumber. 4910 4890 4911 * fast/dom/gc-1.html: 4891 4912 * fast/dom/gc-2.html: … … 5111 5132 2005-10-27 Geoffrey Garen <ggaren@apple.com> 5112 5133 5113 5114 5115 5134 Layout test included with http://bugzilla.opendarwin.org/show_bug.cgi?id=5303 5135 TextInputController should support attributed strings 5136 5116 5137 * fast/forms/attributed-strings-expected.txt: Added. 5117 5138 * fast/forms/attributed-strings.html: Added. … … 5188 5209 5189 5210 Layout test for <rdar://problem/4148730> SureSec si#182 safari heap overflow 5190 5211 The fix is in WebCore. 5191 5212 5192 5213 * fast/table/giantRowspan-expected.checksum: Added. … … 5197 5218 2005-10-25 Vicki Murley <vicki@apple.com> 5198 5219 5199 5200 5220 - updated results for <rdar://problem/4288276> DOM tests expect hierarchy exception 5221 adding wrong types of nodes to parents (4568) 5201 5222 5202 5223 * dom/html/level1/core/hc_attrappendchild2-expected.txt: … … 6419 6440 Reviewed by Darin. Committed by beth. 6420 6441 6421 6422 6423 6442 Fix for http://bugzilla.opendarwin.org/show_bug.cgi?id=5384 6443 Soft hyphen displayed as hyphen when it is the first character 6444 in a line/run. 6424 6445 6425 6446 * fast/text/softHyphen-expected.checksum: Added. … … 6441 6462 6442 6463 Layout test for http://bugzilla.opendarwin.org/show_bug.cgi?id=5318 6443 6464 forced line break should not be allowed after a list marker 6444 6465 6445 6466 * fast/lists/li-br-expected.checksum: Added. … … 6556 6577 Reviewed by Hyatt 6557 6578 6558 6559 6560 6561 6562 6579 Layout test for fix to <rdar://problem/3947202> certain sequence of DOM 6580 method calls involving CSS outline and display crashes Safari 6581 (in repaint code). 6582 6583 The fix is in WebCore. 6563 6584 6564 6585 * fast/css/continuationCrash-expected.checksum: Added. … … 6571 6592 Reviewed by Eric, landed by Maciej. 6572 6593 6573 6594 - fixed xmlhttprequest test to not depend on property enumeration order 6574 6595 6575 6596 * fast/js/xmlhttprequest-get-expected.txt: … … 6593 6614 6594 6615 Layout test to go with fix for <rdar://problem/3847926> crash 6595 6596 6597 6598 6616 due to infinite layout regression in RenderLayer::updateScrollInfoAfterLayout 6617 (was at ourmedia.org) 6618 6619 Fix is in WebCore. 6599 6620 6600 6621 * fast/overflow/infiniteRecursion-expected.checksum: Added. … … 6662 6683 2005-10-12 Vicki Murley <vicki@apple.com> 6663 6684 6664 6665 6685 - update expected results for <rdar://problem/4288266> createElement does not validate 6686 names when called in an HTML document (4566) 6666 6687 6667 6688 * dom/html/level1/core/hc_documentinvalidcharacterexceptioncreateelement-expected.txt: … … 6671 6692 6672 6693 Added a layout test for <rdar://problem/4112378> CSS :hover:after crash 6673 6694 - khtml::inlineWidth. The fix is in WebCore. 6674 6695 6675 6696 * fast/dynamic/genContentDestroyChildren-expected.checksum: Added. … … 6861 6882 2005-10-06 Vicki Murley <vicki@apple.com> 6862 6883 6863 6864 6884 - updated layout tests for <rdar://problem/4288307> <form> element is 6885 created for <isindex> outside <form>; that's not correct (4828) 6865 6886 6866 6887 * dom/html/level2/html/HTMLIsIndexElement02-expected.txt: update this result, 6867 6888 since we now pass this test 6868 6889 6869 6890 * fast/dom/isindex-002-expected.checksum: Added. … … 6872 6893 * fast/dom/isindex-002.html: Added. 6873 6894 6874 6895 - renamed this test 6875 6896 * fast/dom/isindex-alone-expected.checksum: Removed. 6876 6897 * fast/dom/isindex-alone-expected.png: Removed. … … 6885 6906 6886 6907 Test cases for <rdar://problem/4145535> Crash in khtml::RenderBlock::addOverhangingFloats 6887 6908 with simple HTML test file. The fix is in WebCore. 6888 6909 6889 6910 * fast/block/float/4145535Crash-expected.checksum: Added. … … 6906 6927 2005-10-05 Vicki Murley <vicki@apple.com> 6907 6928 6908 6909 6910 6911 6929 Test cases for <rdar://problem/4288829> repro crash on isIndex tag with no attributes 6930 6931 This test case will have to be updated once <rdar://problem/4288839> (isindex tag alone in 6932 document doesn't end up in the DOM) is fixed 6912 6933 6913 6934 * fast/dom/isindex-alone-expected.checksum: Added. … … 6918 6939 2005-10-05 Maciej Stachowiak <mjs@apple.com> 6919 6940 6920 6941 Test cases for <rdar://problem/3798746> hang in JavaScript getting at URL from frame; isc.fraunhofer.de (works in IE and Firefox) 6921 6942 6922 6943 * ChangeLog: … … 6952 6973 Reviewed by NOBODY (OOPS!). 6953 6974 6954 6955 6975 Test case for: 6976 <rdar://problem/3798746> hang in JavaScript getting at URL from frame; isc.fraunhofer.de (works in IE and Firefox) 6956 6977 6957 6978 * fast/dom/early-frame-url.html … … 6965 6986 6966 6987 - test case for some fixes I made to for..in enumeration. object 6967 6968 6988 properties now come before prototype properties and duplicates 6989 between object and prototype are listed only once. 6969 6990 6970 6991 * fast/js/for-in-expected.txt: Added. … … 6985 7006 * dom/xhtml/level3/core/nodeissamenode06-expected.txt: 6986 7007 * dom/xhtml/level3/core/nodeissamenode10-expected.txt: 6987 7008 These tests pass now. 6988 7009 6989 7010 2005-10-04 Eric Seidel <eseidel@apple.com> … … 7001 7022 Reviewed by Darin. 7002 7023 7003 7004 7005 7006 7024 Test case for setting opacity on tiled images. Specifically for fix to: 7025 <rdar://problem/4285538> TOT fix for Denver Regression: Drawing glitch in 7026 the transparent dialog's cancel/ok button in the widget manager. The fix 7027 is in WebKit and WebKitSystemInterface. 7007 7028 7008 7029 * fast/css/button_center.png: Added. … … 7024 7045 Reviewed by Darin. 7025 7046 7026 7027 7028 7029 7047 Test cases for: 7048 7049 http://bugzilla.opendarwin.org/show_bug.cgi?id=5180 7050 event.stopPropagation() prevents the default action - it shouldn't 7030 7051 7031 7052 * fast/events/stopPropagation-checkbox-expected.txt: Added. … … 7038 7059 Reviewed by Darin. 7039 7060 7040 7041 7061 The new layout test for <rdar://problem/4235722> line-height 7062 style settings not reflected in textarea. 7042 7063 7043 7064 * fast/forms/textAreaLineHeight-expected.txt: Added. -
trunk/LayoutTests/fast/replaced/inline-box-wrapper-handover-expected.checksum
r11951 r12073 1 7d0309c5268efb781d2f755f3f8f76ce 2 \ No newline at end of file 1 b3c980ecd003a4589c448f87e673fba0 -
trunk/LayoutTests/fast/replaced/inline-box-wrapper-handover-expected.txt
r11951 r12073 28 28 RenderText {TEXT} at (6,32) size 16x18 29 29 text run at (6,32) width 16: "A " 30 RenderBlock {DIV} at (22,26) size 40x20 [bgcolor=#FF0000]30 RenderBlock {DIV} at (22,26) size 35x20 [bgcolor=#FF0000] 31 31 RenderText {TEXT} at (6,56) size 15x18 32 32 text run at (6,56) width 15: "B " … … 42 42 RenderText {TEXT} at (6,32) size 16x18 43 43 text run at (6,32) width 16: "A " 44 RenderBlock {DIV} at (22,26) size 40x20 [bgcolor=#FF0000]44 RenderBlock {DIV} at (22,26) size 35x20 [bgcolor=#FF0000] 45 45 RenderText {TEXT} at (6,56) size 15x18 46 46 text run at (6,56) width 15: "B " -
trunk/LayoutTests/fast/replaced/inline-box-wrapper-handover.html
r11995 r12073 16 16 17 17 document.body.offsetTop; 18 b.style.width = ' 40px';18 b.style.width = '35px'; 19 19 } 20 20 </script> … … 39 39 <div style="border: 1px black solid; width: 55px; padding: 5px;"> 40 40 <div class="ib" style="background: blue; width: 40px;"></div> A 41 <div class="ib" style="background: red; width: 40px;"></div> B41 <div class="ib" style="background: red; width: 35px;"></div> B 42 42 <div class="ib" style="background: green;"></div> C 43 43 </div> -
trunk/WebCore/ChangeLog
- Property allow-tabs deleted
r12072 r12073 1 2006-01-13 Mitz Pettel <opendarwin.org@mitzpettel.com> 2 3 Reviewed and landed by Darin. 4 5 - fix http://bugzilla.opendarwin.org/show_bug.cgi?id=6418 6 Incorrect scrollbar when using overflow:auto and word-wrap:break-word; in some cases 7 8 Test: fast/text/basic/015.html 9 10 * khtml/rendering/bidi.cpp: 11 (khtml::RenderBlock::findNextLineBreak): 12 Avoid inconsistent width measurement when breaking in the middle of a 13 word is allowed. Eliminate the relaxation by 1 of the width overflow 14 check that was supposed to compensate for the inconsistency but didn't 15 always work, and on the other hand sometimes resulted in allowing text 16 to overflow its container by one pixel. 17 Also applied start and end width correctly in the break-words case. 18 1 19 2006-01-12 Maciej Stachowiak <mjs@apple.com> 2 20 … … 182 200 2006-01-12 David Hyatt <hyatt@apple.com> 183 201 184 202 Get the misc directory compiling on Win32. 185 203 186 204 * ForwardingHeaders/kio/jobclasses.h: … … 194 212 2006-01-12 David Hyatt <hyatt@apple.com> 195 213 196 214 Make the ecma directory compile on Win32. 197 215 198 216 * ForwardingHeaders/kconfig.h: … … 323 341 2006-01-12 David Hyatt <hyatt@apple.com> 324 342 325 326 343 Make the editing directory compile on Win32. 344 327 345 * WebCore.vcproj/WebCore/WebCore.vcproj: 328 346 * khtml/editing/jsediting.cpp: … … 330 348 2006-01-12 David Hyatt <hyatt@apple.com> 331 349 332 333 350 Get the HTML, XML, and Rendering directories compiling on 351 Win32. Add the bash script for generated files as well. 334 352 335 353 * ForwardingHeaders/kio/job.h: … … 830 848 2006-01-11 David Hyatt <hyatt@apple.com> 831 849 832 833 834 850 Changes to get the XML directory nearly compiling on Win32. 851 Down to just the gperf of cssvalues.in and a need to replace 852 usleep. 835 853 836 854 Reviewed by darin … … 1162 1180 2006-01-10 David Hyatt <hyatt@apple.com> 1163 1181 1164 1165 1166 1182 #if Win32 the KWQMemArray overloads, since they're working around 1183 a Windows compiler bug. 1184 1167 1185 * kwq/KWQMemArray.h: 1168 1186 1169 1187 2006-01-10 David Hyatt <hyatt@apple.com> 1170 1188 1171 1189 Fix the broken ifdef in KWQString.h 1172 1190 1173 1191 * kwq/KWQString.h: … … 1175 1193 2006-01-10 hyatt@apple.com 1176 1194 1177 1178 1179 1195 Fix for bugzilla bug 6458, get rendering dir of WebCore 1196 compiling on Windows. 1197 1180 1198 Reviewed by darin 1181 1199 … … 3168 3186 (RenderSVGText::RenderSVGText): just call superclass constructor. 3169 3187 (RenderSVGText::translateTopToBaseline): helper to account for the fact that 3170 3171 3188 y coordinates for <text> give the baseline position, but the render tree expects 3189 current y to be the top. 3172 3190 (RenderSVGText::translateForAttributes): translate to account for x and y 3173 3191 attributes. 3174 3192 (RenderSVGText::paint): Apply appropriate CTM transform and then just let 3175 3193 RenderBlock paint. 3176 3194 * kcanvas/RenderSVGText.h: Added. 3177 3195 (RenderSVGText::renderName): … … 3182 3200 (SVGTextElementImpl::createRenderer): Create a RenderSVGText renderer. 3183 3201 (SVGTextElementImpl::childShouldCreateRenderer): Let child text nodes make 3184 3202 renderers, but nothing else (for now). 3185 3203 * ksvg2/svg/SVGTextElementImpl.h: 3186 3204 (KSVG::SVGTextElementImpl::rendererIsNeeded): It sure is! :-) … … 3384 3402 Reviewed by Darin. 3385 3403 3386 3387 3404 - move frame management and finding code from WebKit to WebCore 3405 http://bugzilla.opendarwin.org/show_bug.cgi?id=6368 3388 3406 3389 3407 * WebCore.exp: export WebCoreFrameNamespace … … 3406 3424 (-[WebCoreBridge findFrameNamed:]): ditto 3407 3425 (-[WebCoreBridge setName:]): don't call KHTMLPart setName directly, 3408 3426 the kwq version is fine 3409 3427 (-[WebCoreBridge _addFramePathToString:]): moved from WebFrame 3410 3428 (-[WebCoreBridge generateFrameName]): ditto … … 3487 3505 Reviewed by eseidel. 3488 3506 3489 3490 3507 Changed use of QRect to QRectF in the points where SVG can have 3508 fractional numbers 3491 3509 http://bugzilla.opendarwin.org/show_bug.cgi?id=4462 3492 3510 3493 3511 Added test cases: 3494 3495 3512 * svg/custom/fractional-rects.svg: copy of rounded-rects.svg with 3513 fractional coordinates. 3496 3514 3497 3515 * WebCore.xcodeproj/project.pbxproj: … … 3516 3534 * kcanvas/KCanvasFilters.h: 3517 3535 (KCanvasFilter::filterRect): 3518 (KCanvasFilter::setFilterRect): 3536 (KCanvasFilter::setFilterRect): QRect -> QRectF 3519 3537 (KCanvasFEConvolveMatrix::kernelSize): 3520 3538 (KCanvasFEConvolveMatrix::setKernelSize): … … 3591 3609 3592 3610 - moved frame traversal code across from bridge, also dropped the children 3593 3611 array 3594 3612 3595 3613 * kwq/WebCoreBridge.h: 3596 3614 * kwq/WebCoreBridge.mm: 3597 3615 (-[WebCoreBridge firstChild]): Moved from WebBridge. Use new _firstChild 3598 3616 pointer. 3599 3617 (-[WebCoreBridge lastChild]): Moved from WebBridge. Use new _lastChild pointer. 3600 3618 (-[WebCoreBridge childCount]): Moved from WebBridge. Use _childCount variable. … … 3604 3622 (-[WebCoreBridge traverseNextFrameStayWithin:]): ditto 3605 3623 (-[WebCoreBridge appendChild:]): Moved from WebBridge, maintain count and first/last 3606 3624 pointers. 3607 3625 (-[WebCoreBridge removeChild:]): Moved from WebBridge, maintain count and first/last 3608 3626 pointers. 3609 3627 3610 3628 2006-01-03 Justin Garcia <justin.garcia@apple.com> … … 3972 3990 2006-01-02 Maciej Stachowiak <mjs@apple.com> 3973 3991 3974 3992 Rubber stamped by Eric. 3975 3993 3976 3994 - remove the no longer used QIntDict … … 3995 4013 Reviewed by Maciej. 3996 4014 3997 3998 3999 4000 4001 4002 4003 4004 4015 - fix for <rdar://problem/4389622> *Pan EU2* iframe swallows events for overlapping elements (part 2) 4016 4017 We originally added a call to passSubframeEventToSubframe here to fix the hand cursor updating problem 4018 reported in <rdar://problem/4316201> REGRESSION: cursor and text in status bar is not updated when 4019 mousing over links in a frame (5509). However, when we return early after passSubframeEventToSubframe, 4020 we fail to fire onmouseout events. Since the call to passSubframeEventToSubframe was originally added 4021 to fix the hand cursor updating problem, remove the early return and make cursor updating conditional 4022 on passSubframeEventToSubframe. 4005 4023 4006 4024 * khtml/khtmlview.cpp: -
trunk/WebCore/khtml/rendering/bidi.cpp
- Property allow-tabs deleted
r12071 r12073 632 632 bidi.adjustEmbedding = false; 633 633 if (d == QChar::DirPDF) { 634 635 636 634 BidiContext *c = bidi.context->parent; 635 if (c) { 636 if (!emptyRun && bidi.eor != bidi.last) { 637 637 assert(bidi.status.eor != QChar::DirON); 638 638 // bidi.sor ... bidi.eor ... bidi.last eor; need to append the bidi.sor-bidi.eor run or extend it through bidi.last … … 656 656 bidi.eor = bidi.last; 657 657 } 658 659 658 appendRun(bidi); 659 emptyRun = true; 660 660 // sor for the new run is determined by the higher level (rule X10) 661 662 663 661 bidi.status.last = bidi.context->dir; 662 bidi.status.lastStrong = bidi.context->dir; 663 bidi.context = c; 664 664 bidi.status.eor = bidi.context->dir; 665 665 bidi.eor.obj = 0; 666 666 } 667 667 } else { 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 668 QChar::Direction runDir; 669 if (d == QChar::DirRLE || d == QChar::DirRLO) 670 runDir = QChar::DirR; 671 else 672 runDir = QChar::DirL; 673 bool override = d == QChar::DirLRO || d == QChar::DirRLO; 674 675 unsigned char level = bidi.context->level; 676 if (runDir == QChar::DirR) { 677 if (level%2) // we have an odd level 678 level += 2; 679 else 680 level++; 681 } else { 682 if (level%2) // we have an odd level 683 level++; 684 else 685 level += 2; 686 } 687 688 if (level < 61) { 689 if (!emptyRun && bidi.eor != bidi.last) { 690 690 assert(bidi.status.eor != QChar::DirON); 691 691 // bidi.sor ... bidi.eor ... bidi.last eor; need to append the bidi.sor-bidi.eor run or extend it through bidi.last … … 1335 1335 bidi.last = bidi.current; 1336 1336 1337 1338 1339 1340 1341 1342 1343 1344 1337 if (emptyRun && !(dirCurrent == QChar::DirRLE || dirCurrent == QChar::DirLRE || dirCurrent == QChar::DirRLO || dirCurrent == QChar::DirLRO || dirCurrent == QChar::DirPDF)) { 1338 bidi.sor = bidi.current; 1339 emptyRun = false; 1340 } 1341 1342 // this causes the operator ++ to open and close embedding levels as needed 1343 // for the CSS unicode-bidi property 1344 bidi.adjustEmbedding = true; 1345 1345 bidi.current.increment(bidi); 1346 1346 bidi.adjustEmbedding = false; 1347 1347 if (emptyRun && (dirCurrent == QChar::DirRLE || dirCurrent == QChar::DirLRE || dirCurrent == QChar::DirRLO || dirCurrent == QChar::DirLRO || dirCurrent == QChar::DirPDF)) { 1348 1348 // exclude the embedding char itself from the new run so that ATSUI will never see it … … 2122 2122 bool appliedStartWidth = pos > 0; // If the span originated on a previous line, 2123 2123 // then assume the start width has been applied. 2124 bool appliedEndWidth = false; 2125 2126 int wrapW = tmpW; 2124 int wrapW = tmpW + inlineWidth(o, !appliedStartWidth, true); 2127 2125 int nextBreakable = -1; 2128 2126 … … 2181 2179 if (breakWords) 2182 2180 wrapW += t->width(pos, 1, f, w+wrapW); 2183 2184 if (c == '\n' || (o->style()->whiteSpace() != PRE && isBreakable(str, pos, strlen, nextBreakable, breakNBSP)) || (breakWords && (w + wrapW > width))) { 2181 bool midWordBreak = breakWords && (w + wrapW > width); 2182 2183 if (c == '\n' || (o->style()->whiteSpace() != PRE && isBreakable(str, pos, strlen, nextBreakable, breakNBSP)) || midWordBreak) { 2185 2184 if (ignoringSpaces) { 2186 2185 if (!currentCharacterIsSpace) { … … 2200 2199 } 2201 2200 2202 tmpW += t->width(lastSpace, pos - lastSpace, f, w+tmpW) + lastSpaceWordSpacing; 2201 int additionalTmpW = t->width(lastSpace, pos - lastSpace, f, w+tmpW) + lastSpaceWordSpacing; 2202 tmpW += additionalTmpW; 2203 2203 if (!appliedStartWidth) { 2204 2204 tmpW += inlineWidth(o, true, false); … … 2245 2245 } 2246 2246 goto end; // Didn't fit. Jump to the end. 2247 } else if (pos > 0 && str[pos-1].unicode() == SOFT_HYPHEN) 2248 // Subtract the width of the soft hyphen out since we fit on a line. 2249 tmpW -= t->width(pos-1, 1, f, w+tmpW); 2247 } else { 2248 if (midWordBreak) 2249 tmpW -= additionalTmpW; 2250 if (pos > 0 && str[pos-1].unicode() == SOFT_HYPHEN) 2251 // Subtract the width of the soft hyphen out since we fit on a line. 2252 tmpW -= t->width(pos-1, 1, f, w+tmpW); 2253 } 2250 2254 } 2251 2255 … … 2263 2267 } 2264 2268 2265 lastSpaceWordSpacing = applyWordSpacing ? wordSpacing : 0; 2266 lastSpace = pos; 2269 if (midWordBreak) { 2270 // Remember this as a breakable position in case 2271 // adding the end width forces a break. 2272 lBreak.obj = o; 2273 lBreak.pos = pos; 2274 } else { 2275 lastSpaceWordSpacing = applyWordSpacing ? wordSpacing : 0; 2276 lastSpace = pos; 2277 } 2267 2278 2268 2279 if (!ignoringSpaces && o->style()->collapseWhiteSpace()) { … … 2315 2326 if (!appliedStartWidth) 2316 2327 tmpW += inlineWidth(o, true, false); 2317 if (!appliedEndWidth) 2318 tmpW += inlineWidth(o, false, true); 2328 tmpW += inlineWidth(o, false, true); 2319 2329 } else 2320 2330 KHTMLAssert( false ); … … 2323 2333 bool autoWrap = o->style()->autoWrap(); 2324 2334 bool checkForBreak = autoWrap; 2325 if (w && w + tmpW > width +1&& lBreak.obj && o->style()->whiteSpace() == NOWRAP)2335 if (w && w + tmpW > width && lBreak.obj && o->style()->whiteSpace() == NOWRAP) 2326 2336 checkForBreak = true; 2327 2337 else if (next && o->isText() && next->isText() && !next->isBR()) { … … 2341 2351 } 2342 2352 } 2343 bool canPlaceOnLine = (w + tmpW <= width +1) || !autoWrap;2353 bool canPlaceOnLine = (w + tmpW <= width) || !autoWrap; 2344 2354 if (canPlaceOnLine && checkForBreak) { 2345 2355 w += tmpW; … … 2352 2362 } 2353 2363 2354 if (checkForBreak && (w + tmpW > width +1)) {2364 if (checkForBreak && (w + tmpW > width)) { 2355 2365 // if we have floats, try to get below them. 2356 2366 if (currentCharacterIsSpace && !ignoringSpaces && o->style()->collapseWhiteSpace()) … … 2375 2385 // giving us more room), so we need to retest, and only jump to 2376 2386 // the end label if we still don't fit on the line. -dwh 2377 if (w + tmpW > width +1)2387 if (w + tmpW > width) 2378 2388 goto end; 2379 2389 } … … 2465 2475 // code. 2466 2476 if (lBreak.pos > 0) { 2467 2468 2477 lBreak.pos--; 2478 lBreak.increment(bidi); 2469 2479 } 2470 2480
Note:
See TracChangeset
for help on using the changeset viewer.