Changeset 87248 in webkit

Timestamp:

May 24, 2011 6:26:53 PM (13 years ago)

Author:

leo.yang@torchmobile.com.cn

Message:

2011-05-24 Leo Yang <​leo.yang@torchmobile.com.cn>

Reviewed by Ryosuke Niwa.

[SVG] Assertion failure by dragging text between input fields inside <foreignObject>s
​https://bugs.webkit.org/show_bug.cgi?id=60692

Add NULL check of 'holder' in WebCore::ReplacementFragment::ReplacementFragment()
before call VisibleSelection::selectionFromContentsOfNode() to prevent crashing.

Test: editing/pasteboard/drag-drop-input-in-svg.svg

• editing/ReplaceSelectionCommand.cpp: (WebCore::ReplacementFragment::ReplacementFragment):

2011-05-24 Leo Yang <​leo.yang@torchmobile.com.cn>

Reviewed by Ryosuke Niwa.

[SVG] Assertion failure by dragging text between input fields inside <foreignObject>s
​https://bugs.webkit.org/show_bug.cgi?id=60692

Test case to verify dragging and dropping text between input fields
inside SVG <foreignObject>s. Test passes if no crash occurs in debug mode.

Drag and drop is not supported in Qt DRT, so skip this case on Qt platform.

• editing/pasteboard/drag-drop-input-in-svg-expected.txt: Added.
• editing/pasteboard/drag-drop-input-in-svg.svg: Added.
• platform/qt/Skipped:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/editing/pasteboard/drag-drop-input-in-svg-expected.txt (added)
• LayoutTests/editing/pasteboard/drag-drop-input-in-svg.svg (added)
• LayoutTests/platform/qt/Skipped (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/editing/ReplaceSelectionCommand.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-05-24  Leo Yang  <leo.yang@torchmobile.com.cn>
+
+        Reviewed by Ryosuke Niwa.
+
+        [SVG] Assertion failure by dragging text between input fields inside <foreignObject>s
+        https://bugs.webkit.org/show_bug.cgi?id=60692
+
+        Test case to verify dragging and dropping text between input fields
+        inside SVG <foreignObject>s. Test passes if no crash occurs in debug mode.
+
+        Drag and drop is not supported in Qt DRT, so skip this case on Qt platform.
+
+        * editing/pasteboard/drag-drop-input-in-svg-expected.txt: Added.
+        * editing/pasteboard/drag-drop-input-in-svg.svg: Added.
+        * platform/qt/Skipped:
+
 2011-05-24  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/LayoutTests/platform/qt/Skipped

@@ -145 +145 @@
 editing/pasteboard/drag-drop-dead-frame.html
 editing/pasteboard/drag-drop-input-textarea.html
+editing/pasteboard/drag-drop-input-in-svg.svg
 editing/pasteboard/drag-drop-iframe-refresh-crash.html
 editing/pasteboard/drag-drop-modifies-page.html

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-05-24  Leo Yang  <leo.yang@torchmobile.com.cn>
+
+        Reviewed by Ryosuke Niwa.
+
+        [SVG] Assertion failure by dragging text between input fields inside <foreignObject>s
+        https://bugs.webkit.org/show_bug.cgi?id=60692
+
+        Add NULL check of 'holder' in WebCore::ReplacementFragment::ReplacementFragment()
+        before call VisibleSelection::selectionFromContentsOfNode() to prevent crashing.
+
+        Test: editing/pasteboard/drag-drop-input-in-svg.svg
+
+        * editing/ReplaceSelectionCommand.cpp:
+        (WebCore::ReplacementFragment::ReplacementFragment):
+
 2011-05-24  Andy Estes  <aestes@apple.com>
 

trunk/Source/WebCore/editing/ReplaceSelectionCommand.cpp

@@ -157 +157 @@
     Node* styleNode = selection.base().deprecatedNode();
     RefPtr<StyledElement> holder = insertFragmentForTestRendering(styleNode);
+    if (!holder) {
+        removeInterchangeNodes(m_fragment.get());
+        return;
+    }
     
     RefPtr<Range> range = VisibleSelection::selectionFromContentsOfNode(holder.get()).toNormalizedRange();