- Revision
- 280973
- Author
- [email protected]
- Date
- 2021-08-12 11:58:47 -0700 (Thu, 12 Aug 2021)
Log Message
Fix some `NSAttributedString` inconsistencies between WK1 and WK2
https://bugs.webkit.org/show_bug.cgi?id=229013
<rdar://problem/81215696>
Reviewed by Timothy Hatcher.
Source/WebCore:
`NSAttributedString` now uses WK2, which has caused us to discover some inconsistencies (and bugs).
Tests: NSAttributedStringWebKitAdditions.DefaultFontSize
NSAttributedStringWebKitAdditions.MultipleParagraphs
* editing/cocoa/HTMLConverter.mm:
(HTMLConverter::_blockLevelElementForNode):
Check the given node before looking at the parent as it could already be a block. This
allows for sequental `<p>` to each have their own positioning instead of only the first one.
(HTMLConverter::computedAttributesForElement):
Fix typo that used `margin-right` instead of `margin-bottom` when setting `paragraphSpacing`.
Source/WebKit:
`NSAttributedString` now uses WK2, which has caused us to discover some inconsistencies (and bugs).
* UIProcess/API/Cocoa/NSAttributedString.mm:
(+[_WKAttributedStringWebViewCache configuration]):
Change the default font size to 12 to match WK1.
Tools:
* TestWebKitAPI/Tests/WebKitCocoa/NSAttributedStringWebKitAdditions.mm: Added.
(TEST.NSAttributedStringWebKitAdditions.DefaultFontSize):
(TEST.NSAttributedStringWebKitAdditions.MultipleParagraphs):
* TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj:
Modified Paths
Added Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (280972 => 280973)
--- trunk/Source/WebCore/ChangeLog 2021-08-12 17:13:11 UTC (rev 280972)
+++ trunk/Source/WebCore/ChangeLog 2021-08-12 18:58:47 UTC (rev 280973)
@@ -1,3 +1,23 @@
+2021-08-12 Devin Rousso <[email protected]>
+
+ Fix some `NSAttributedString` inconsistencies between WK1 and WK2
+ https://bugs.webkit.org/show_bug.cgi?id=229013
+ <rdar://problem/81215696>
+
+ Reviewed by Timothy Hatcher.
+
+ `NSAttributedString` now uses WK2, which has caused us to discover some inconsistencies (and bugs).
+
+ Tests: NSAttributedStringWebKitAdditions.DefaultFontSize
+ NSAttributedStringWebKitAdditions.MultipleParagraphs
+
+ * editing/cocoa/HTMLConverter.mm:
+ (HTMLConverter::_blockLevelElementForNode):
+ Check the given node before looking at the parent as it could already be a block. This
+ allows for sequental `<p>` to each have their own positioning instead of only the first one.
+ (HTMLConverter::computedAttributesForElement):
+ Fix typo that used `margin-right` instead of `margin-bottom` when setting `paragraphSpacing`.
+
2021-08-12 Youenn Fablet <[email protected]>
Adopt span in RTCRtpSFrameTransform
Modified: trunk/Source/WebCore/editing/cocoa/HTMLConverter.mm (280972 => 280973)
--- trunk/Source/WebCore/editing/cocoa/HTMLConverter.mm 2021-08-12 17:13:11 UTC (rev 280972)
+++ trunk/Source/WebCore/editing/cocoa/HTMLConverter.mm 2021-08-12 18:58:47 UTC (rev 280973)
@@ -836,7 +836,7 @@
Element* HTMLConverter::_blockLevelElementForNode(Node* node)
{
- Element* element = node->parentElement();
+ Element* element = is<Element>(node) ? downcast<Element>(node) : node->parentElement();
if (element && !_caches->isBlockElement(*element))
element = _blockLevelElementForNode(element->parentInComposedTree());
return element;
@@ -1128,7 +1128,7 @@
if (_caches->floatPropertyValueForNode(coreBlockElement, CSSPropertyMarginRight, marginRight) && marginRight > 0.0)
[paragraphStyle setTailIndent:-marginRight];
float marginBottom = 0.0;
- if (_caches->floatPropertyValueForNode(coreBlockElement, CSSPropertyMarginRight, marginBottom) && marginBottom > 0.0)
+ if (_caches->floatPropertyValueForNode(coreBlockElement, CSSPropertyMarginBottom, marginBottom) && marginBottom > 0.0)
[paragraphStyle setParagraphSpacing:marginBottom];
}
if ([_textLists count] > 0)
Modified: trunk/Source/WebKit/ChangeLog (280972 => 280973)
--- trunk/Source/WebKit/ChangeLog 2021-08-12 17:13:11 UTC (rev 280972)
+++ trunk/Source/WebKit/ChangeLog 2021-08-12 18:58:47 UTC (rev 280973)
@@ -1,3 +1,17 @@
+2021-08-12 Devin Rousso <[email protected]>
+
+ Fix some `NSAttributedString` inconsistencies between WK1 and WK2
+ https://bugs.webkit.org/show_bug.cgi?id=229013
+ <rdar://problem/81215696>
+
+ Reviewed by Timothy Hatcher.
+
+ `NSAttributedString` now uses WK2, which has caused us to discover some inconsistencies (and bugs).
+
+ * UIProcess/API/Cocoa/NSAttributedString.mm:
+ (+[_WKAttributedStringWebViewCache configuration]):
+ Change the default font size to 12 to match WK1.
+
2021-08-12 Carlos Garcia Campos <[email protected]>
[ATK] Critical warnings on children-changed::add signal emission
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/NSAttributedString.mm (280972 => 280973)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/NSAttributedString.mm 2021-08-12 17:13:11 UTC (rev 280972)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/NSAttributedString.mm 2021-08-12 18:58:47 UTC (rev 280973)
@@ -30,7 +30,7 @@
#import "WKErrorInternal.h"
#import <WebKit/WKNavigationActionPrivate.h>
#import <WebKit/WKNavigationDelegate.h>
-#import <WebKit/WKPreferences.h>
+#import <WebKit/WKPreferencesPrivate.h>
#import <WebKit/WKProcessPoolPrivate.h>
#import <WebKit/WKWebViewConfigurationPrivate.h>
#import <WebKit/WKWebViewPrivate.h>
@@ -151,6 +151,8 @@
[configuration setAllowsInlineMediaPlayback:NO];
[configuration _setClientNavigationsRunAtForegroundPriority:YES];
#endif
+
+ [configuration preferences]._defaultFontSize = 12;
}
return configuration.get();
Modified: trunk/Tools/ChangeLog (280972 => 280973)
--- trunk/Tools/ChangeLog 2021-08-12 17:13:11 UTC (rev 280972)
+++ trunk/Tools/ChangeLog 2021-08-12 18:58:47 UTC (rev 280973)
@@ -1,3 +1,17 @@
+2021-08-12 Devin Rousso <[email protected]>
+
+ Fix some `NSAttributedString` inconsistencies between WK1 and WK2
+ https://bugs.webkit.org/show_bug.cgi?id=229013
+ <rdar://problem/81215696>
+
+ Reviewed by Timothy Hatcher.
+
+ * TestWebKitAPI/Tests/WebKitCocoa/NSAttributedStringWebKitAdditions.mm: Added.
+ (TEST.NSAttributedStringWebKitAdditions.DefaultFontSize):
+ (TEST.NSAttributedStringWebKitAdditions.MultipleParagraphs):
+
+ * TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj:
+
2021-08-12 Youenn Fablet <[email protected]>
Adopt span in RTCRtpSFrameTransform
Modified: trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj (280972 => 280973)
--- trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj 2021-08-12 17:13:11 UTC (rev 280972)
+++ trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj 2021-08-12 18:58:47 UTC (rev 280973)
@@ -888,6 +888,7 @@
95095F20262FFFA50000D920 /* SampledPageTopColor.mm in Sources */ = {isa = PBXBuildFile; fileRef = 95095F1F262FFFA50000D920 /* SampledPageTopColor.mm */; };
950E4CC1252E75240071659F /* iOSStylusSupport.mm in Sources */ = {isa = PBXBuildFile; fileRef = 950E4CC0252E75230071659F /* iOSStylusSupport.mm */; };
953ABB3525C0D682004C8B73 /* WKWebViewUnderPageBackgroundColor.mm in Sources */ = {isa = PBXBuildFile; fileRef = 953ABB3425C0D681004C8B73 /* WKWebViewUnderPageBackgroundColor.mm */; };
+ 958B70E126C46EDC00B2022B /* NSAttributedStringWebKitAdditions.mm in Sources */ = {isa = PBXBuildFile; fileRef = 958B70E026C46EDC00B2022B /* NSAttributedStringWebKitAdditions.mm */; };
95A524952581A10D00461FE9 /* WKWebViewThemeColor.mm in Sources */ = {isa = PBXBuildFile; fileRef = 95A524942581A10D00461FE9 /* WKWebViewThemeColor.mm */; };
95B6B3B7251EBF2F00FC4382 /* MediaDocument.mm in Sources */ = {isa = PBXBuildFile; fileRef = 95B6B3B6251EBF2F00FC4382 /* MediaDocument.mm */; };
9984FACC1CFFAF60008D198C /* WKWebViewTextInput.mm in Sources */ = {isa = PBXBuildFile; fileRef = 9984FACA1CFFAEEE008D198C /* WKWebViewTextInput.mm */; };
@@ -2616,6 +2617,7 @@
95095F1F262FFFA50000D920 /* SampledPageTopColor.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = SampledPageTopColor.mm; sourceTree = "<group>"; };
950E4CC0252E75230071659F /* iOSStylusSupport.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = iOSStylusSupport.mm; sourceTree = "<group>"; };
953ABB3425C0D681004C8B73 /* WKWebViewUnderPageBackgroundColor.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKWebViewUnderPageBackgroundColor.mm; sourceTree = "<group>"; };
+ 958B70E026C46EDC00B2022B /* NSAttributedStringWebKitAdditions.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = NSAttributedStringWebKitAdditions.mm; sourceTree = "<group>"; };
95A524942581A10D00461FE9 /* WKWebViewThemeColor.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKWebViewThemeColor.mm; sourceTree = "<group>"; };
95B6B3B6251EBF2F00FC4382 /* MediaDocument.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MediaDocument.mm; sourceTree = "<group>"; };
9984FACA1CFFAEEE008D198C /* WKWebViewTextInput.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKWebViewTextInput.mm; sourceTree = "<group>"; };
@@ -3542,6 +3544,7 @@
46A80F25264C29D400EEF20D /* NotificationAPI.mm */,
CD2D0D19213465560018C784 /* NowPlaying.mm */,
2ECFF5541D9B12F800B55394 /* NowPlayingControlsTests.mm */,
+ 958B70E026C46EDC00B2022B /* NSAttributedStringWebKitAdditions.mm */,
A10F047C1E3AD29C00C95E19 /* NSFileManagerExtras.mm */,
F4EB4E8F2328AC3000574DAB /* NSItemProviderAdditions.h */,
F4EB4E902328AC3000574DAB /* NSItemProviderAdditions.mm */,
@@ -5679,6 +5682,7 @@
CD2D0D1A213465560018C784 /* NowPlaying.mm in Sources */,
2ECFF5551D9B12F800B55394 /* NowPlayingControlsTests.mm in Sources */,
5159F267260D43E300B2DA3C /* NowPlayingInfoTests.cpp in Sources */,
+ 958B70E126C46EDC00B2022B /* NSAttributedStringWebKitAdditions.mm in Sources */,
A10F047E1E3AD29C00C95E19 /* NSFileManagerExtras.mm in Sources */,
F442851D2140DF2900CCDA22 /* NSFontPanelTesting.mm in Sources */,
F4EB4E912328AC3000574DAB /* NSItemProviderAdditions.mm in Sources */,
Added: trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/NSAttributedStringWebKitAdditions.mm (0 => 280973)
--- trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/NSAttributedStringWebKitAdditions.mm (rev 0)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/NSAttributedStringWebKitAdditions.mm 2021-08-12 18:58:47 UTC (rev 280973)
@@ -0,0 +1,53 @@
+/*
+ * Copyright (C) 2021 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#import "config.h"
+
+#import "TestCocoa.h"
+#import <WebKit/NSAttributedString.h>
+#import <wtf/RetainPtr.h>
+
+TEST(NSAttributedStringWebKitAdditions, DefaultFontSize)
+{
+ __block bool done = false;
+ [NSAttributedString loadFromHTMLWithString:@"Hello World" options:@{ } completionHandler:^(NSAttributedString *attributedString, NSDictionary<NSAttributedStringDocumentAttributeKey, id> *attributes, NSError *error) {
+ EXPECT_EQ([[attributedString attribute:NSFontAttributeName atIndex:0 effectiveRange:nil] pointSize], 12.0);
+
+ done = true;
+ }];
+ TestWebKitAPI::Util::run(&done);
+}
+
+TEST(NSAttributedStringWebKitAdditions, MultipleParagraphs)
+{
+ __block bool done = false;
+ [NSAttributedString loadFromHTMLWithString:@"<p style='margin-bottom:1px'>Hello</p><p style='margin-bottom:2px'>World</p>" options:@{ } completionHandler:^(NSAttributedString *attributedString, NSDictionary<NSAttributedStringDocumentAttributeKey, id> *attributes, NSError *error) {
+ EXPECT_EQ([[attributedString attribute:NSParagraphStyleAttributeName atIndex:0 effectiveRange:nil] paragraphSpacing], 1.0);
+ EXPECT_EQ([[attributedString attribute:NSParagraphStyleAttributeName atIndex:6 effectiveRange:nil] paragraphSpacing], 2.0);
+
+ done = true;
+ }];
+ TestWebKitAPI::Util::run(&done);
+}
