Changeset 20066 in webkit

Timestamp:

Mar 8, 2007 2:00:53 PM (17 years ago)

Author:

justing

Message:

LayoutTests:

Reviewed by harrison

<​http://bugs.webkit.org/show_bug.cgi?id=13000>
Range.createContextualFragment is not supported

• fast/dom/Range/13000-expected.txt: Added.
• fast/dom/Range/13000.html: Added.

WebCore:

Reviewed by harrison

<​http://bugs.webkit.org/show_bug.cgi?id=13000>
Range.createContextualFragment is not supported

• dom/Range.cpp: (WebCore::Range::createContextualFragment): The "startContainer" may not be a container, if the range starts inside text. In that case, look to the parent of the start node for an HTMLElement.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/dom/Range/13000-expected.txt (added)
• LayoutTests/fast/dom/Range/13000.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/dom/Range.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2007-03-08  Justin Garcia  <justin.garcia@apple.com>
+
+        Reviewed by harrison
+        
+        <http://bugs.webkit.org/show_bug.cgi?id=13000>
+        Range.createContextualFragment is not supported
+
+        * fast/dom/Range/13000-expected.txt: Added.
+        * fast/dom/Range/13000.html: Added.
+
 2007-03-08  Justin Garcia  <justin.garcia@apple.com>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-03-08  Justin Garcia  <justin.garcia@apple.com>
+
+        Reviewed by harrison
+        
+        <http://bugs.webkit.org/show_bug.cgi?id=13000>
+        Range.createContextualFragment is not supported
+
+        * dom/Range.cpp:
+        (WebCore::Range::createContextualFragment): The
+        "startContainer" may not be a container, if the
+        range starts inside text.  In that case, look
+        to the parent of the start node for an HTMLElement.
+
 2007-03-08  Justin Garcia  <justin.garcia@apple.com>
 

trunk/WebCore/dom/Range.cpp

@@ -1084 +1084 @@
     }
 
-    if (! m_startContainer->isHTMLElement()) {
+    Node* htmlElement = m_startContainer->isHTMLElement() ? m_startContainer.get() : m_startContainer->parentNode();
+    
+    if (!htmlElement->isHTMLElement()) {
         ec = NOT_SUPPORTED_ERR;
         return 0;
     }
 
-    RefPtr<DocumentFragment> fragment = static_cast<HTMLElement*>(m_startContainer.get())->createContextualFragment(html);
+    RefPtr<DocumentFragment> fragment = static_cast<HTMLElement*>(htmlElement)->createContextualFragment(html);
     if (!fragment) {
         ec = NOT_SUPPORTED_ERR;