Lines Matching full:merge
1479 * layout-tests/editing/deleting/delete-block-merge-contents-001-expected.txt:
1480 * layout-tests/editing/deleting/delete-block-merge-contents-002-expected.txt:
1481 * layout-tests/editing/deleting/delete-block-merge-contents-003-expected.txt:
1482 * layout-tests/editing/deleting/delete-block-merge-contents-004-expected.txt:
1483 * layout-tests/editing/deleting/delete-block-merge-contents-005-expected.txt:
1484 * layout-tests/editing/deleting/delete-block-merge-contents-006-expected.txt:
1485 * layout-tests/editing/deleting/delete-block-merge-contents-007-expected.txt:
1486 * layout-tests/editing/deleting/delete-block-merge-contents-008-expected.txt:
1487 * layout-tests/editing/deleting/delete-block-merge-contents-009-expected.txt:
1488 * layout-tests/editing/deleting/delete-block-merge-contents-010-expected.txt:
1489 * layout-tests/editing/deleting/delete-block-merge-contents-012-expected.txt:
1490 * layout-tests/editing/deleting/delete-block-merge-contents-013-expected.txt:
1491 * layout-tests/editing/deleting/delete-block-merge-contents-014-expected.txt:
1492 * layout-tests/editing/deleting/delete-block-merge-contents-015-expected.txt:
1493 * layout-tests/editing/deleting/delete-block-merge-contents-016-expected.txt:
1494 * layout-tests/editing/deleting/delete-block-merge-contents-017-expected.txt:
1495 * layout-tests/editing/deleting/delete-block-merge-contents-018-expected.txt:
1496 * layout-tests/editing/deleting/delete-block-merge-contents-019-expected.txt:
1497 * layout-tests/editing/deleting/delete-block-merge-contents-020-expected.txt:
1498 * layout-tests/editing/deleting/delete-block-merge-contents-021-expected.txt:
5225 if the render trees finally merge.
15115 only next() the insertion point if the special pre-insertion-merge actually occured.
15116 mergeStart used to be the correct check for the occurence of a pre-insertion-merge, but
15714 Merge of svn log -v -r 399829 svn://anonsvn.kde.org/home/kde
15757 Fix for bugzilla bug 3335, add support for the CSS3 indirect adjacent sibling selector. Patch merge
15789 Merge Allan Jensen's fix for 3236.
20913 (DOM::CSSMutableStyleDeclarationImpl::merge)
21346 The code to figure out which node to use to merge into an existing line did not drill into the first inline element
24469 up front. That way as we do the merge, we dont attempt to examine the lines in dirtyLinesForChangedChild.
25758 (khtml::ReplaceSelectionCommand::doApply): Add one more case where we merge content into the
26599 * layout-tests/editing/deleting/delete-block-merge-contents-002-expected.txt: New results, slightly different from former
26601 * layout-tests/editing/deleting/delete-block-merge-contents-007-expected.txt: Ditto.
26602 * layout-tests/editing/deleting/delete-block-merge-contents-018-expected.txt: Added.
26603 * layout-tests/editing/deleting/delete-block-merge-contents-018.html: Added.
26604 * layout-tests/editing/deleting/delete-block-merge-contents-019-expected.txt: Added.
26605 * layout-tests/editing/deleting/delete-block-merge-contents-019.html: Added.
26606 * layout-tests/editing/deleting/delete-block-merge-contents-020-expected.txt: Added.
26607 * layout-tests/editing/deleting/delete-block-merge-contents-020.html: Added.
26608 * layout-tests/editing/deleting/delete-block-merge-contents-021-expected.txt: Added.
26609 * layout-tests/editing/deleting/delete-block-merge-contents-021.html: Added.
26866 Merge the typing style with the computed style for the current position. Fixes both bugs.
27142 this operation work correctly, particularly in the logic to figure out whether to merge content, and
27192 (khtml::ReplaceSelectionCommand::doApply): For 3938935, add one more case to handle an empty document; merge
27984 merge a node under a descendent.
28413 Code to figuire out the end node to merge was missing the font tag in the second paragraph
30468 (DOM::CSSMutableStyleDeclarationImpl::merge): Update to use QValueList.
30704 Treat null case as meaning no post-move merge is needed.
30773 (CSSStyleDeclarationImpl::merge): Ditto.
32303 * layout-tests/editing/deleting/delete-block-merge-contents-016-expected.txt:
32304 * layout-tests/editing/deleting/delete-block-merge-contents-017-expected.txt:
32663 (CSSStyleDeclarationImpl::merge): A little cleanup. Also, make sure m_lstValues
32672 * layout-tests/editing/deleting/delete-block-merge-contents-002-expected.txt
34297 * layout-tests/editing/deleting/delete-block-merge-contents-012-expected.txt: Updated expected results.
34298 * layout-tests/editing/deleting/delete-block-merge-contents-017-expected.txt: Ditto.
34490 * layout-tests/editing/deleting/delete-block-merge-contents-001-expected.txt
34491 * layout-tests/editing/deleting/delete-block-merge-contents-008-expected.txt
34502 (khtml::RenderBlock::removeChild): Hyatt said this regression was caused by a bad merge.
35923 * layout-tests/editing/deleting/delete-block-merge-contents-012-expected.txt: Added.
35924 * layout-tests/editing/deleting/delete-block-merge-contents-012.html: Added.
35925 * layout-tests/editing/deleting/delete-block-merge-contents-013-expected.txt: Added.
35926 * layout-tests/editing/deleting/delete-block-merge-contents-013.html: Added.
35927 * layout-tests/editing/deleting/delete-block-merge-contents-014-expected.txt: Added.
35928 * layout-tests/editing/deleting/delete-block-merge-contents-014.html: Added.
35929 * layout-tests/editing/deleting/delete-block-merge-contents-015-expected.txt: Added.
35930 * layout-tests/editing/deleting/delete-block-merge-contents-015.html: Added.
35931 * layout-tests/editing/deleting/delete-block-merge-contents-016-expected.txt: Added.
35932 * layout-tests/editing/deleting/delete-block-merge-contents-016.html: Added.
35933 * layout-tests/editing/deleting/delete-block-merge-contents-017-expected.txt: Added.
35934 * layout-tests/editing/deleting/delete-block-merge-contents-017.html: Added.
37084 merge logic to handle more cases, like dealing with whitespace.
37090 * layout-tests/editing/deleting/delete-block-merge-contents-001-expected.txt:
37091 * layout-tests/editing/deleting/delete-block-merge-contents-001.html:
37092 * layout-tests/editing/deleting/delete-block-merge-contents-002-expected.txt: Added.
37093 * layout-tests/editing/deleting/delete-block-merge-contents-002.html: Added.
37094 * layout-tests/editing/deleting/delete-block-merge-contents-003-expected.txt: Added.
37095 * layout-tests/editing/deleting/delete-block-merge-contents-003.html: Added.
37096 * layout-tests/editing/deleting/delete-block-merge-contents-004-expected.txt: Added.
37097 * layout-tests/editing/deleting/delete-block-merge-contents-004.html: Added.
37098 * layout-tests/editing/deleting/delete-block-merge-contents-005-expected.txt: Added.
37099 * layout-tests/editing/deleting/delete-block-merge-contents-005.html: Added.
37100 * layout-tests/editing/deleting/delete-block-merge-contents-006-expected.txt: Added.
37101 * layout-tests/editing/deleting/delete-block-merge-contents-006.html: Added.
37102 * layout-tests/editing/deleting/delete-block-merge-contents-007-expected.txt: Added.
37103 * layout-tests/editing/deleting/delete-block-merge-contents-007.html: Added.
37104 * layout-tests/editing/deleting/delete-block-merge-contents-008-expected.txt: Added.
37105 * layout-tests/editing/deleting/delete-block-merge-contents-008.html: Added.
37106 * layout-tests/editing/deleting/delete-block-merge-contents-009-expected.txt: Added.
37107 * layout-tests/editing/deleting/delete-block-merge-contents-009.html: Added.
37108 * layout-tests/editing/deleting/delete-block-merge-contents-010-expected.txt: Added.
37109 * layout-tests/editing/deleting/delete-block-merge-contents-010.html: Added.
37110 * layout-tests/editing/deleting/delete-block-merge-contents-011-expected.txt: Added.
37111 * layout-tests/editing/deleting/delete-block-merge-contents-011.html: Added.
37252 * layout-tests/editing/deleting/delete-block-merge-contents-001-expected.txt: Added.
37253 * layout-tests/editing/deleting/delete-block-merge-contents-001.html: Added.
39730 (CSSStyleDeclarationImpl::merge): New helper that merges styles together. Helpful for
39751 (KHTMLPart::applyStyle): In the case where the current selection is a caret, merge the
40243 Merge @import fix for CSS1 test suite from Stephan Kulow.
42323 does not merge content with preceding block"
44126 (HTMLElementImpl::setOuterText): Replace node with text, merge neighboring text nodes.
52086 convert DOMString and UString to have the same underlying rep, then these classes could possibly re-merge.
