Changeset 242831 in webkit

Timestamp:

Mar 12, 2019 3:42:49 PM (5 years ago)

Author:

timothy@apple.com

Message:

Expose document attributes and body background color through HTMLConverter.
​https://bugs.webkit.org/show_bug.cgi?id=195636
rdar://problem/45055697

Reviewed by Tim Horton.

Source/WebCore:

• editing/cocoa/HTMLConverter.h:
• editing/cocoa/HTMLConverter.mm:

(HTMLConverter::convert):
(WebCore::attributedStringFromRange):
(WebCore::attributedStringFromSelection):
(WebCore::attributedStringBetweenStartAndEnd):

Source/WebCore/PAL:

• pal/spi/cocoa/NSAttributedStringSPI.h:

(NSBackgroundColorDocumentAttribute): Added.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• PAL/ChangeLog (modified) (1 diff)
• PAL/pal/spi/cocoa/NSAttributedStringSPI.h (modified) (1 diff)
• editing/cocoa/HTMLConverter.h (modified) (1 diff)
• editing/cocoa/HTMLConverter.mm (modified) (5 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-03-12  Timothy Hatcher  <timothy@apple.com>
+
+        Expose document attributes and body background color through HTMLConverter.
+        https://bugs.webkit.org/show_bug.cgi?id=195636
+        rdar://problem/45055697
+
+        Reviewed by Tim Horton.
+
+        * editing/cocoa/HTMLConverter.h:
+        * editing/cocoa/HTMLConverter.mm:
+        (HTMLConverter::convert):
+        (WebCore::attributedStringFromRange):
+        (WebCore::attributedStringFromSelection):
+        (WebCore::attributedStringBetweenStartAndEnd):
+
 2019-03-12  Antti Koivisto  <antti@apple.com>
 

trunk/Source/WebCore/PAL/ChangeLog

@@ +1 @@
+2019-03-12  Timothy Hatcher  <timothy@apple.com>
+
+        Expose document attributes and body background color through HTMLConverter.
+        https://bugs.webkit.org/show_bug.cgi?id=195636
+        rdar://problem/45055697
+
+        Reviewed by Tim Horton.
+
+        * pal/spi/cocoa/NSAttributedStringSPI.h:
+        (NSBackgroundColorDocumentAttribute): Added.
+
 2019-03-12  Jennifer Moore  <jennifer.moore@apple.com>
 

trunk/Source/WebCore/PAL/pal/spi/cocoa/NSAttributedStringSPI.h

@@ -92 +92 @@
 SOFT_LINK_CONSTANT(UIFoundation, NSCocoaVersionDocumentAttribute, NSString *)
 #define NSCocoaVersionDocumentAttribute getNSCocoaVersionDocumentAttribute()
+SOFT_LINK_CONSTANT(UIFoundation, NSBackgroundColorDocumentAttribute, NSString *)
+#define NSBackgroundColorDocumentAttribute getNSBackgroundColorDocumentAttribute()
 
 // We don't softlink NSSuperscriptAttributeName because UIFoundation stopped exporting it.

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

@@ -36 +36 @@
 enum class IncludeImagesInAttributedString { Yes, No };
 
-NSAttributedString *attributedStringFromSelection(const VisibleSelection&);
+NSAttributedString *attributedStringFromSelection(const VisibleSelection&, NSDictionary** documentAttributes = nullptr);
 
 // For testing purpose only
-WEBCORE_EXPORT NSAttributedString *attributedStringBetweenStartAndEnd(const Position&, const Position&);
+WEBCORE_EXPORT NSAttributedString *attributedStringBetweenStartAndEnd(const Position&, const Position&, NSDictionary** documentAttributes = nullptr);
 
-WEBCORE_EXPORT NSAttributedString *attributedStringFromRange(Range&);
+WEBCORE_EXPORT NSAttributedString *attributedStringFromRange(Range&, NSDictionary** documentAttributes = nullptr);
 #if !PLATFORM(IOS_FAMILY)
 WEBCORE_EXPORT NSAttributedString *editingAttributedStringFromRange(Range&, IncludeImagesInAttributedString = IncludeImagesInAttributedString::Yes);

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

@@ -277 +277 @@
     HTMLConverter(const Position&, const Position&);
     ~HTMLConverter();
-    
-    NSAttributedString* convert();
-    
+
+    NSAttributedString* convert(NSDictionary** documentAttributes = nullptr);
+
 private:
     Position m_start;
@@ -397 +397 @@
 }
 
-NSAttributedString *HTMLConverter::convert()
+NSAttributedString *HTMLConverter::convert(NSDictionary** documentAttributes)
 {
     if (comparePositions(m_start, m_end) > 0)
@@ -408 +408 @@
     if (!m_dataSource)
         return nil;
+
+    Document& document = commonAncestorContainer->document();
+    if (auto* body = document.bodyOrFrameset()) {
+        if (PlatformColor *backgroundColor = _colorForElement(*body, CSSPropertyBackgroundColor))
+            [_documentAttrs setObject:backgroundColor forKey:NSBackgroundColorDocumentAttribute];
+    }
 
     _domRangeStartIndex = 0;
@@ -413 +419 @@
     if (_domRangeStartIndex > 0 && _domRangeStartIndex <= [_attrStr length])
         [_attrStr deleteCharactersInRange:NSMakeRange(0, _domRangeStartIndex)];
+
+    if (documentAttributes)
+        *documentAttributes = [[_documentAttrs retain] autorelease];
 
     return [[_attrStr retain] autorelease];
@@ -2376 +2385 @@
 
 namespace WebCore {
-    
+
 // This function supports more HTML features than the editing variant below, such as tables.
-NSAttributedString *attributedStringFromRange(Range& range)
-{
-    return HTMLConverter { range.startPosition(), range.endPosition() }.convert();
-}
-
-NSAttributedString *attributedStringFromSelection(const VisibleSelection& selection)
-{
-    return attributedStringBetweenStartAndEnd(selection.start(), selection.end());
-}
-
-NSAttributedString *attributedStringBetweenStartAndEnd(const Position& start, const Position& end)
-{
-    return HTMLConverter { start, end }.convert();
-}
-    
+NSAttributedString *attributedStringFromRange(Range& range, NSDictionary** documentAttributes)
+{
+    return HTMLConverter { range.startPosition(), range.endPosition() }.convert(documentAttributes);
+}
+
+NSAttributedString *attributedStringFromSelection(const VisibleSelection& selection, NSDictionary** documentAttributes)
+{
+    return attributedStringBetweenStartAndEnd(selection.start(), selection.end(), documentAttributes);
+}
+
+NSAttributedString *attributedStringBetweenStartAndEnd(const Position& start, const Position& end, NSDictionary** documentAttributes)
+{
+    return HTMLConverter { start, end }.convert(documentAttributes);
+}
+
 #if !PLATFORM(IOS_FAMILY)