Diff
Modified: trunk/Source/WebKit/ChangeLog (243011 => 243012)
--- trunk/Source/WebKit/ChangeLog 2019-03-15 21:33:09 UTC (rev 243011)
+++ trunk/Source/WebKit/ChangeLog 2019-03-15 21:36:56 UTC (rev 243012)
@@ -1,3 +1,27 @@
+2019-03-15 Timothy Hatcher <timo...@apple.com>
+
+ Add support to WebPage for getting the contents as an attributed string.
+ https://bugs.webkit.org/show_bug.cgi?id=195636
+ rdar://problem/45055697
+
+ Reviewed by Tim Horton.
+
+ * Shared/mac/AttributedString.h:
+ (WebKit::AttributedString::AttributedString):
+ * Shared/mac/AttributedString.mm:
+ (IPC::ArgumentCoder<WebKit::AttributedString>::encode):
+ (IPC::ArgumentCoder<WebKit::AttributedString>::decode):
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView _getContentsAsAttributedStringWithCompletionHandler:]):
+ * UIProcess/API/Cocoa/WKWebViewPrivate.h:
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::getContentsAsAttributedString):
+ * UIProcess/WebPageProxy.h:
+ * WebProcess/WebPage/Cocoa/WebPageCocoa.mm:
+ (WebKit::WebPage::getContentsAsAttributedString):
+ * WebProcess/WebPage/WebPage.h:
+ * WebProcess/WebPage/WebPage.messages.in:
+
2019-03-15 Per Arne Vollan <pvol...@apple.com>
[iOS] Fix sandbox violation
Modified: trunk/Source/WebKit/Shared/mac/AttributedString.h (243011 => 243012)
--- trunk/Source/WebKit/Shared/mac/AttributedString.h 2019-03-15 21:33:09 UTC (rev 243011)
+++ trunk/Source/WebKit/Shared/mac/AttributedString.h 2019-03-15 21:36:56 UTC (rev 243012)
@@ -38,8 +38,9 @@
}
#if defined(__OBJC__)
- AttributedString(NSAttributedString *attributedString)
+ AttributedString(NSAttributedString *attributedString, NSDictionary *documentAttributes = nil)
: string(attributedString)
+ , documentAttributes(documentAttributes)
{
}
@@ -48,8 +49,9 @@
return string.get();
}
#endif
-
+
RetainPtr<NSAttributedString> string;
+ RetainPtr<NSDictionary> documentAttributes;
};
}
Modified: trunk/Source/WebKit/Shared/mac/AttributedString.mm (243011 => 243012)
--- trunk/Source/WebKit/Shared/mac/AttributedString.mm 2019-03-15 21:33:09 UTC (rev 243011)
+++ trunk/Source/WebKit/Shared/mac/AttributedString.mm 2019-03-15 21:36:56 UTC (rev 243012)
@@ -34,7 +34,7 @@
void ArgumentCoder<WebKit::AttributedString>::encode(Encoder& encoder, const WebKit::AttributedString& attributedString)
{
- encoder << attributedString.string;
+ encoder << attributedString.string << attributedString.documentAttributes;
}
Optional<WebKit::AttributedString> ArgumentCoder<WebKit::AttributedString>::decode(Decoder& decoder)
@@ -42,7 +42,10 @@
RetainPtr<NSAttributedString> attributedString;
if (!IPC::decode(decoder, attributedString))
return WTF::nullopt;
- return WebKit::AttributedString { attributedString.get() };
+ RetainPtr<NSDictionary> documentAttributes;
+ if (!IPC::decode(decoder, documentAttributes))
+ return WTF::nullopt;
+ return WebKit::AttributedString { attributedString.get(), documentAttributes.get() };
}
}
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm (243011 => 243012)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm 2019-03-15 21:33:09 UTC (rev 243011)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm 2019-03-15 21:36:56 UTC (rev 243012)
@@ -29,6 +29,7 @@
#import "APIFormClient.h"
#import "APIPageConfiguration.h"
#import "APISerializedScriptValue.h"
+#import "AttributedString.h"
#import "CompletionHandlerCallChecker.h"
#import "DiagnosticLoggingClient.h"
#import "DynamicViewportSizeUpdate.h"
@@ -5253,6 +5254,16 @@
});
}
+- (void)_getContentsAsAttributedStringWithCompletionHandler:(void (^)(NSAttributedString *, NSDictionary<NSAttributedStringDocumentAttributeKey, id> *, NSError *))completionHandler
+{
+ _page->getContentsAsAttributedString([handler = makeBlockPtr(completionHandler)](auto& attributedString) {
+ if (attributedString.string)
+ handler([[attributedString.string.get() retain] autorelease], [[attributedString.documentAttributes.get() retain] autorelease], nil);
+ else
+ handler(nil, nil, createNSError(WKErrorUnknown).get());
+ });
+}
+
- (void)_getApplicationManifestWithCompletionHandler:(void (^)(_WKApplicationManifest *))completionHandler
{
#if ENABLE(APPLICATION_MANIFEST)
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebViewPrivate.h (243011 => 243012)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebViewPrivate.h 2019-03-15 21:33:09 UTC (rev 243011)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebViewPrivate.h 2019-03-15 21:36:56 UTC (rev 243012)
@@ -364,6 +364,7 @@
- (void)_getMainResourceDataWithCompletionHandler:(void (^)(NSData *, NSError *))completionHandler;
- (void)_getWebArchiveDataWithCompletionHandler:(void (^)(NSData *, NSError *))completionHandler;
- (void)_getContentsAsStringWithCompletionHandler:(void (^)(NSString *, NSError *))completionHandler WK_API_AVAILABLE(macosx(10.13), ios(11.0));
+- (void)_getContentsAsAttributedStringWithCompletionHandler:(void (^)(NSAttributedString *, NSDictionary<NSAttributedStringDocumentAttributeKey, id> *, NSError *))completionHandler WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_MAC_TBA));
- (void)_getApplicationManifestWithCompletionHandler:(void (^)(_WKApplicationManifest *))completionHandler WK_API_AVAILABLE(macosx(10.13.4), ios(11.3));
Modified: trunk/Source/WebKit/UIProcess/WebPageProxy.cpp (243011 => 243012)
--- trunk/Source/WebKit/UIProcess/WebPageProxy.cpp 2019-03-15 21:33:09 UTC (rev 243011)
+++ trunk/Source/WebKit/UIProcess/WebPageProxy.cpp 2019-03-15 21:36:56 UTC (rev 243012)
@@ -52,6 +52,7 @@
#include "APIUIClient.h"
#include "APIURLRequest.h"
#include "APIWebsitePolicies.h"
+#include "AttributedString.h"
#include "AuthenticationChallengeProxy.h"
#include "AuthenticationDecisionListener.h"
#include "DataReference.h"
@@ -3601,6 +3602,21 @@
m_process->send(Messages::WebPage::GetContentsAsString(callbackID), m_pageID);
}
+void WebPageProxy::getContentsAsAttributedString(CompletionHandler<void(const AttributedString&)>&& completionHandler)
+{
+#if PLATFORM(COCOA)
+ if (!isValid()) {
+ completionHandler(AttributedString());
+ return;
+ }
+
+ m_process->connection()->sendWithAsyncReply(Messages::WebPage::GetContentsAsAttributedString(), WTFMove(completionHandler), m_pageID);
+#else
+ ASSERT_NOT_REACHED();
+ completionHandler(AttributedString());
+#endif
+}
+
void WebPageProxy::getBytecodeProfile(WTF::Function<void (const String&, CallbackBase::Error)>&& callbackFunction)
{
if (!isValid()) {
Modified: trunk/Source/WebKit/UIProcess/WebPageProxy.h (243011 => 243012)
--- trunk/Source/WebKit/UIProcess/WebPageProxy.h 2019-03-15 21:33:09 UTC (rev 243011)
+++ trunk/Source/WebKit/UIProcess/WebPageProxy.h 2019-03-15 21:36:56 UTC (rev 243012)
@@ -973,6 +973,7 @@
void didFindStringMatches(const String&, const Vector<Vector<WebCore::IntRect>>& matchRects, int32_t firstIndexAfterSelection);
void getContentsAsString(WTF::Function<void (const String&, CallbackBase::Error)>&&);
+ void getContentsAsAttributedString(CompletionHandler<void(const AttributedString&)>&&);
void getBytecodeProfile(WTF::Function<void (const String&, CallbackBase::Error)>&&);
void getSamplingProfilerOutput(WTF::Function<void (const String&, CallbackBase::Error)>&&);
Modified: trunk/Source/WebKit/WebProcess/WebPage/Cocoa/WebPageCocoa.mm (243011 => 243012)
--- trunk/Source/WebKit/WebProcess/WebPage/Cocoa/WebPageCocoa.mm 2019-03-15 21:33:09 UTC (rev 243011)
+++ trunk/Source/WebKit/WebProcess/WebPage/Cocoa/WebPageCocoa.mm 2019-03-15 21:36:56 UTC (rev 243012)
@@ -27,6 +27,7 @@
#import "WebPage.h"
+#import "AttributedString.h"
#import "LoadParameters.h"
#import "PluginView.h"
#import "WebPageProxyMessages.h"
@@ -42,6 +43,7 @@
#import <WebCore/PlatformMediaSessionManager.h>
#import <WebCore/RenderElement.h>
#import <WebCore/RenderObject.h>
+#import <WebCore/TextIterator.h>
#if PLATFORM(COCOA)
@@ -201,6 +203,21 @@
}
#endif
+void WebPage::getContentsAsAttributedString(CompletionHandler<void(const AttributedString&)>&& completionHandler)
+{
+ Frame& frame = m_page->mainFrame();
+
+ RefPtr<Range> range = TextIterator::rangeFromLocationAndLength(frame.document()->documentElement(), 0, INT_MAX);
+
+ NSDictionary* documentAttributes = nil;
+
+ AttributedString result;
+ result.string = attributedStringFromRange(*range, &documentAttributes);
+ result.documentAttributes = documentAttributes;
+
+ completionHandler({ result });
+}
+
} // namespace WebKit
#endif // PLATFORM(COCOA)
Modified: trunk/Source/WebKit/WebProcess/WebPage/WebPage.h (243011 => 243012)
--- trunk/Source/WebKit/WebProcess/WebPage/WebPage.h 2019-03-15 21:33:09 UTC (rev 243011)
+++ trunk/Source/WebKit/WebProcess/WebPage/WebPage.h 2019-03-15 21:36:56 UTC (rev 243012)
@@ -1315,6 +1315,9 @@
void viewWillEndLiveResize();
void getContentsAsString(CallbackID);
+#if PLATFORM(COCOA)
+ void getContentsAsAttributedString(CompletionHandler<void(const AttributedString&)>&&);
+#endif
#if ENABLE(MHTML)
void getContentsAsMHTMLData(CallbackID);
#endif
Modified: trunk/Source/WebKit/WebProcess/WebPage/WebPage.messages.in (243011 => 243012)
--- trunk/Source/WebKit/WebProcess/WebPage/WebPage.messages.in 2019-03-15 21:33:09 UTC (rev 243011)
+++ trunk/Source/WebKit/WebProcess/WebPage/WebPage.messages.in 2019-03-15 21:36:56 UTC (rev 243012)
@@ -182,6 +182,9 @@
# Callbacks.
GetContentsAsString(WebKit::CallbackID callbackID)
+#if PLATFORM(COCOA)
+ GetContentsAsAttributedString() -> (struct WebKit::AttributedString result) Async
+#endif
#if ENABLE(MHTML)
GetContentsAsMHTMLData(WebKit::CallbackID callbackID)
#endif
Modified: trunk/Tools/ChangeLog (243011 => 243012)
--- trunk/Tools/ChangeLog 2019-03-15 21:33:09 UTC (rev 243011)
+++ trunk/Tools/ChangeLog 2019-03-15 21:36:56 UTC (rev 243012)
@@ -1,3 +1,14 @@
+2019-03-15 Timothy Hatcher <timo...@apple.com>
+
+ Add support to WebPage for getting the contents as an attributed string.
+ https://bugs.webkit.org/show_bug.cgi?id=195636
+ rdar://problem/45055697
+
+ Reviewed by Tim Horton.
+
+ * TestWebKitAPI/Tests/WebKitCocoa/WKWebViewGetContents.mm:
+ (TEST(WKWebView, GetContentsShouldReturnAttributedString): Added.
+
2019-03-15 Chris Dumez <cdu...@apple.com>
[PSON] Make sure the WebProcessCache is leverage when relaunching a process after termination
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKWebViewGetContents.mm (243011 => 243012)
--- trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKWebViewGetContents.mm 2019-03-15 21:33:09 UTC (rev 243011)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKWebViewGetContents.mm 2019-03-15 21:36:56 UTC (rev 243012)
@@ -48,3 +48,48 @@
TestWebKitAPI::Util::run(&finished);
}
+
+TEST(WKWebView, GetContentsShouldReturnAttributedString)
+{
+ RetainPtr<TestWKWebView> webView = adoptNS([[TestWKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600)]);
+
+ [webView synchronouslyLoadHTMLString:@"<body bgcolor='red'>Hello <b>World!</b>"];
+
+ __block bool finished = false;
+
+#if USE(APPKIT)
+ using PlatformFont = NSFont;
+ using PlatformColor = NSColor;
+#else
+ using PlatformFont = UIFont;
+ using PlatformColor = UIColor;
+#endif
+
+ [webView _getContentsAsAttributedStringWithCompletionHandler:^(NSAttributedString *attributedString, NSDictionary<NSAttributedStringDocumentAttributeKey, id> *documentAttributes, NSError *error) {
+ EXPECT_NOT_NULL(attributedString);
+ EXPECT_NOT_NULL(documentAttributes);
+ EXPECT_NULL(error);
+
+ __block size_t i = 0;
+ [attributedString enumerateAttributesInRange:NSMakeRange(0, attributedString.length) options:0 usingBlock:^(NSDictionary *attributes, NSRange attributeRange, BOOL *stop) {
+ auto* substring = [attributedString attributedSubstringFromRange:attributeRange];
+
+ if (!i) {
+ EXPECT_WK_STREQ(@"Hello ", substring.string);
+ EXPECT_WK_STREQ(@"Times-Roman", dynamic_objc_cast<PlatformFont>(attributes[NSFontAttributeName]).fontName);
+ } else if (i == 1) {
+ EXPECT_WK_STREQ(@"World!", substring.string);
+ EXPECT_WK_STREQ(@"Times-Bold", dynamic_objc_cast<PlatformFont>(attributes[NSFontAttributeName]).fontName);
+ } else
+ ASSERT_NOT_REACHED();
+
+ ++i;
+ }];
+
+ EXPECT_WK_STREQ(@"sRGB IEC61966-2.1 colorspace 1 0 0 1", dynamic_objc_cast<PlatformColor>(documentAttributes[NSBackgroundColorDocumentAttribute]).description);
+
+ finished = true;
+ }];
+
+ TestWebKitAPI::Util::run(&finished);
+}
