Title: [130429] trunk
- Revision
- 130429
- Author
- [email protected]
- Date
- 2012-10-04 15:40:35 -0700 (Thu, 04 Oct 2012)
Log Message
Source/WebCore: Build fix after r130411. Add the right offset.
Also use RefPtr instead of a raw pointer for next and previous pointers.
* editing/ReplaceSelectionCommand.cpp:
(WebCore::ReplaceSelectionCommand::mergeTextNodesAroundPosition):
LayoutTests: Another rebaseline needed after r130411.
* platform/mac/editing/pasteboard/5006779-expected.txt:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (130428 => 130429)
--- trunk/LayoutTests/ChangeLog 2012-10-04 22:38:18 UTC (rev 130428)
+++ trunk/LayoutTests/ChangeLog 2012-10-04 22:40:35 UTC (rev 130429)
@@ -1,3 +1,9 @@
+2012-10-04 Ryosuke Niwa <[email protected]>
+
+ Another rebaseline needed after r130411.
+
+ * platform/mac/editing/pasteboard/5006779-expected.txt:
+
2012-10-04 Christophe Dumez <[email protected]>
[EFL] Add libxml 2.8.0 to jhbuild
Modified: trunk/LayoutTests/platform/mac/editing/pasteboard/5006779-expected.txt (130428 => 130429)
--- trunk/LayoutTests/platform/mac/editing/pasteboard/5006779-expected.txt 2012-10-04 22:38:18 UTC (rev 130428)
+++ trunk/LayoutTests/platform/mac/editing/pasteboard/5006779-expected.txt 2012-10-04 22:40:35 UTC (rev 130429)
@@ -21,4 +21,4 @@
RenderBlock {BLOCKQUOTE} at (0,72) size 784x18 [color=#0000FF] [border: none (2px solid #0000FF)]
RenderText {#text} at (12,0) size 83x18
text run at (12,0) width 83: "Hello World."
-caret: position 2 of child 0 {#text} of child 2 {DIV} of body
+caret: position 3 of child 0 {#text} of child 2 {DIV} of body
Modified: trunk/Source/WebCore/ChangeLog (130428 => 130429)
--- trunk/Source/WebCore/ChangeLog 2012-10-04 22:38:18 UTC (rev 130428)
+++ trunk/Source/WebCore/ChangeLog 2012-10-04 22:40:35 UTC (rev 130429)
@@ -1,3 +1,11 @@
+2012-10-04 Ryosuke Niwa <[email protected]>
+
+ Build fix after r130411. Add the right offset.
+ Also use RefPtr instead of a raw pointer for next and previous pointers.
+
+ * editing/ReplaceSelectionCommand.cpp:
+ (WebCore::ReplaceSelectionCommand::mergeTextNodesAroundPosition):
+
2012-10-04 Alec Flett <[email protected]>
IndexedDB: promote objectstore/index backend ids to the frontend
Modified: trunk/Source/WebCore/editing/ReplaceSelectionCommand.cpp (130428 => 130429)
--- trunk/Source/WebCore/editing/ReplaceSelectionCommand.cpp 2012-10-04 22:38:18 UTC (rev 130428)
+++ trunk/Source/WebCore/editing/ReplaceSelectionCommand.cpp 2012-10-04 22:40:35 UTC (rev 130429)
@@ -1253,35 +1253,35 @@
return;
if (text->previousSibling() && text->previousSibling()->isTextNode()) {
- Text* previous = toText(text->previousSibling());
+ RefPtr<Text> previous = toText(text->previousSibling());
insertTextIntoNode(text, 0, previous->data());
if (positionIsOffsetInAnchor)
position.moveToOffset(previous->length() + position.offsetInContainerNode());
else
- updatePositionForNodeRemoval(position, previous);
+ updatePositionForNodeRemoval(position, previous.get());
if (positionOnlyToBeUpdatedIsOffsetInAnchor) {
if (positionOnlyToBeUpdated.containerNode() == text)
- positionOnlyToBeUpdated.moveToOffset(previous->length() + position.offsetInContainerNode());
+ positionOnlyToBeUpdated.moveToOffset(previous->length() + positionOnlyToBeUpdated.offsetInContainerNode());
else if (positionOnlyToBeUpdated.containerNode() == previous)
positionOnlyToBeUpdated.moveToPosition(text, position.offsetInContainerNode());
} else
- updatePositionForNodeRemoval(positionOnlyToBeUpdated, previous);
+ updatePositionForNodeRemoval(positionOnlyToBeUpdated, previous.get());
removeNode(previous);
}
if (text->nextSibling() && text->nextSibling()->isTextNode()) {
- Text* next = toText(text->nextSibling());
+ RefPtr<Text> next = toText(text->nextSibling());
insertTextIntoNode(text, text->length(), next->data());
if (!positionIsOffsetInAnchor)
- updatePositionForNodeRemoval(position, next);
+ updatePositionForNodeRemoval(position, next.get());
if (positionOnlyToBeUpdatedIsOffsetInAnchor && positionOnlyToBeUpdated.containerNode() == next)
positionOnlyToBeUpdated.moveToPosition(text, text->length() + position.offsetInContainerNode());
else
- updatePositionForNodeRemoval(positionOnlyToBeUpdated, next);
+ updatePositionForNodeRemoval(positionOnlyToBeUpdated, next.get());
removeNode(next);
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
