Changeset 180785 in webkit

Timestamp:

Feb 27, 2015 3:07:03 PM (9 years ago)

Author:

enrica@apple.com

Message:

Adding support for serializing HTMLAttachment elements.
​https://bugs.webkit.org/show_bug.cgi?id=142026

Reviewed by Tim Horton.

Source/WebCore:

Test: editing/pasteboard/copy-paste-attachment.html

Adding support to serialize the attachment element
and properly handle it when converting a DOM range
to NSAttributedString.

• editing/cocoa/HTMLConverter.mm:

(HTMLConverter::_processElement):

• editing/markup.cpp:

(WebCore::StyledMarkupAccumulator::appendCustomAttributes): Create new attribute
for attachment element when serializating.
(WebCore::StyledMarkupAccumulator::appendElement):
(WebCore::createFragmentFromMarkup): Remove the attribute from the attachment element
when creating the fragment.

• html/HTMLAttachmentElement.cpp:

(WebCore::HTMLAttachmentElement::file): Added const to file() to
use it in appendCustonAttributes where the element is a const reference.

• html/HTMLAttachmentElement.h:
• html/HTMLAttributeNames.in:

LayoutTests:

• editing/pasteboard/copy-paste-attachment-expected.txt: Added.
• editing/pasteboard/copy-paste-attachment.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/editing/pasteboard/copy-paste-attachment-expected.txt (added)
• LayoutTests/editing/pasteboard/copy-paste-attachment.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/editing/cocoa/HTMLConverter.mm (modified) (2 diffs)
• Source/WebCore/editing/markup.cpp (modified) (5 diffs)
• Source/WebCore/html/HTMLAttachmentElement.cpp (modified) (1 diff)
• Source/WebCore/html/HTMLAttachmentElement.h (modified) (1 diff)
• Source/WebCore/html/HTMLAttributeNames.in (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2015-02-27  Enrica Casucci  <enrica@apple.com>
+
+        Adding support for serializing HTMLAttachment elements.
+        https://bugs.webkit.org/show_bug.cgi?id=142026
+
+        Reviewed by Tim Horton.
+
+        * editing/pasteboard/copy-paste-attachment-expected.txt: Added.
+        * editing/pasteboard/copy-paste-attachment.html: Added.
+
 2015-02-27  Brady Eidson  <beidson@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-02-27  Enrica Casucci  <enrica@apple.com>
+
+        Adding support for serializing HTMLAttachment elements.
+        https://bugs.webkit.org/show_bug.cgi?id=142026
+
+        Reviewed by Tim Horton.
+
+        Test: editing/pasteboard/copy-paste-attachment.html
+
+        Adding support to serialize the attachment element
+        and properly handle it when converting a DOM range
+        to NSAttributedString.
+
+        * editing/cocoa/HTMLConverter.mm:
+        (HTMLConverter::_processElement):
+        * editing/markup.cpp:
+        (WebCore::StyledMarkupAccumulator::appendCustomAttributes): Create new attribute
+        for attachment element when serializating.
+        (WebCore::StyledMarkupAccumulator::appendElement):
+        (WebCore::createFragmentFromMarkup): Remove the attribute from the attachment element
+        when creating the fragment.
+        * html/HTMLAttachmentElement.cpp:
+        (WebCore::HTMLAttachmentElement::file): Added const to file() to
+        use it in appendCustonAttributes where the element is a const reference.
+        * html/HTMLAttachmentElement.h:
+        * html/HTMLAttributeNames.in:
+
 2015-02-27  Timothy Horton  <timothy_horton@apple.com>
 

trunk/Source/WebCore/editing/cocoa/HTMLConverter.mm

@@ -38 +38 @@
 #import "Element.h"
 #import "ElementTraversal.h"
+#import "File.h"
 #import "FontCascade.h"
 #import "Frame.h"
 #import "FrameLoader.h"
+#import "HTMLAttachmentElement.h"
 #import "HTMLElement.h"
 #import "HTMLFrameElementBase.h"
@@ -1962 +1964 @@
             _addTableForElement(nil);
         _addTableCellForElement(&element);
+#if ENABLE(ATTACHMENT_ELEMENT)
+    } else if (is<HTMLAttachmentElement>(element)) {
+        HTMLAttachmentElement& attachment = downcast<HTMLAttachmentElement>(element);
+        if (attachment.file()) {
+            NSURL *url = [NSURL fileURLWithPath:attachment.file()->path()];
+            if (url)
+                _addAttachmentForElement(element, url, isBlockLevel, NO);
+        }
+        retval = NO;
+#endif
     } else if (element.hasTagName(imgTag)) {
         NSString *urlString = element.getAttribute(srcAttr);

trunk/Source/WebCore/editing/markup.cpp

@@ -42 +42 @@
 #include "ExceptionCode.h"
 #include "ExceptionCodePlaceholder.h"
+#include "File.h"
 #include "Frame.h"
+#include "HTMLAttachmentElement.h"
 #include "HTMLBodyElement.h"
 #include "HTMLDivElement.h"
@@ -52 +54 @@
 #include "URL.h"
 #include "MarkupAccumulator.h"
+#include "NodeList.h"
 #include "Range.h"
 #include "RenderBlock.h"
@@ -136 +139 @@
 
     void appendElement(StringBuilder& out, const Element&, bool addDisplayInline, RangeFullySelectsNode);
+    virtual void appendCustomAttributes(StringBuilder&, const Element&, Namespaces*) override;
 
     virtual void appendText(StringBuilder& out, const Text&) override;
@@ -293 +297 @@
 }
 
+void StyledMarkupAccumulator::appendCustomAttributes(StringBuilder& out, const Element&element, Namespaces* namespaces)
+{
+#if ENABLE(ATTACHMENT_ELEMENT)
+    if (!is<HTMLAttachmentElement>(element))
+        return;
+    
+    const HTMLAttachmentElement& attachment = downcast<HTMLAttachmentElement>(element);
+    if (attachment.file())
+        appendAttribute(out, element, Attribute(webkitattachmentpathAttr, attachment.file()->path()), namespaces);
+#else
+    UNUSED_PARAM(out);
+    UNUSED_PARAM(element);
+    UNUSED_PARAM(namespaces);
+#endif
+}
+
 void StyledMarkupAccumulator::appendElement(StringBuilder& out, const Element& element, bool addDisplayInline, RangeFullySelectsNode rangeFullySelectsNode)
 {
     const bool documentIsHTML = element.document().isHTMLDocument();
     appendOpenTag(out, element, 0);
+
+    appendCustomAttributes(out, element, nullptr);
 
     const bool shouldAnnotateOrForceInline = element.isHTMLElement() && (shouldAnnotate() || addDisplayInline);
@@ -659 +681 @@
     fragment->parseHTML(markup, fakeBody.get(), parserContentPolicy);
 
+#if ENABLE(ATTACHMENT_ELEMENT)
+    // When creating a fragment we must strip the webkit-attachment-path attribute after restoring the File object.
+    RefPtr<NodeList> nodes = fragment->getElementsByTagName("attachment");
+    for (size_t i = 0; i < nodes->length(); ++i) {
+        if (!is<HTMLAttachmentElement>(*nodes->item(i)))
+            continue;
+        HTMLAttachmentElement& element = downcast<HTMLAttachmentElement>(*nodes->item(i));
+        element.setFile(File::create(element.fastGetAttribute(webkitattachmentpathAttr)).ptr());
+        element.removeAttribute(webkitattachmentpathAttr);
+    }
+#endif
     if (!baseURL.isEmpty() && baseURL != blankURL() && baseURL != document.baseURL())
         completeURLs(fragment.get(), baseURL);

trunk/Source/WebCore/html/HTMLAttachmentElement.cpp

@@ -57 +57 @@
 }
 
-File* HTMLAttachmentElement::file()
+File* HTMLAttachmentElement::file() const
 {
     return m_file.get();

trunk/Source/WebCore/html/HTMLAttachmentElement.h

@@ -38 +38 @@
 public:
     static Ref<HTMLAttachmentElement> create(const QualifiedName&, Document&);
-
-    File* file();
+    virtual bool canContainRangeEndPoint() const override { return false; }
+    File* file() const;
     void setFile(File*);
 

trunk/Source/WebCore/html/HTMLAttributeNames.in

@@ -350 +350 @@
 vspace
 webkitallowfullscreen
+webkitattachmentpath
 width
 wrap