Title: [243028] trunk/Source/WebKit
- Revision
- 243028
- Author
- timo...@apple.com
- Date
- 2019-03-15 16:50:42 -0700 (Fri, 15 Mar 2019)
Log Message
Unreviewed speculative build fix for non-Cocoa ports after r243012.
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::getContentsAsAttributedString):
* UIProcess/WebPageProxy.h:
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (243027 => 243028)
--- trunk/Source/WebKit/ChangeLog 2019-03-15 23:49:17 UTC (rev 243027)
+++ trunk/Source/WebKit/ChangeLog 2019-03-15 23:50:42 UTC (rev 243028)
@@ -1,3 +1,11 @@
+2019-03-15 Timothy Hatcher <timo...@apple.com>
+
+ Unreviewed speculative build fix for non-Cocoa ports after r243012.
+
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::getContentsAsAttributedString):
+ * UIProcess/WebPageProxy.h:
+
2019-03-15 Truitt Savell <tsav...@apple.com>
Unreviewed, rolling out r243008.
Modified: trunk/Source/WebKit/UIProcess/WebPageProxy.cpp (243027 => 243028)
--- trunk/Source/WebKit/UIProcess/WebPageProxy.cpp 2019-03-15 23:49:17 UTC (rev 243027)
+++ trunk/Source/WebKit/UIProcess/WebPageProxy.cpp 2019-03-15 23:50:42 UTC (rev 243028)
@@ -52,7 +52,6 @@
#include "APIUIClient.h"
#include "APIURLRequest.h"
#include "APIWebsitePolicies.h"
-#include "AttributedString.h"
#include "AuthenticationChallengeProxy.h"
#include "AuthenticationDecisionListener.h"
#include "DataReference.h"
@@ -188,6 +187,7 @@
#endif
#if PLATFORM(COCOA)
+#include "AttributedString.h"
#include "RemoteLayerTreeDrawingAreaProxy.h"
#include "RemoteLayerTreeScrollingPerformanceData.h"
#include "TouchBarMenuData.h"
@@ -3602,9 +3602,9 @@
m_process->send(Messages::WebPage::GetContentsAsString(callbackID), m_pageID);
}
+#if PLATFORM(COCOA)
void WebPageProxy::getContentsAsAttributedString(CompletionHandler<void(const AttributedString&)>&& completionHandler)
{
-#if PLATFORM(COCOA)
if (!isValid()) {
completionHandler(AttributedString());
return;
@@ -3611,11 +3611,8 @@
}
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)
{
Modified: trunk/Source/WebKit/UIProcess/WebPageProxy.h (243027 => 243028)
--- trunk/Source/WebKit/UIProcess/WebPageProxy.h 2019-03-15 23:49:17 UTC (rev 243027)
+++ trunk/Source/WebKit/UIProcess/WebPageProxy.h 2019-03-15 23:50:42 UTC (rev 243028)
@@ -973,7 +973,9 @@
void didFindStringMatches(const String&, const Vector<Vector<WebCore::IntRect>>& matchRects, int32_t firstIndexAfterSelection);
void getContentsAsString(WTF::Function<void (const String&, CallbackBase::Error)>&&);
+#if PLATFORM(COCOA)
void getContentsAsAttributedString(CompletionHandler<void(const AttributedString&)>&&);
+#endif
void getBytecodeProfile(WTF::Function<void (const String&, CallbackBase::Error)>&&);
void getSamplingProfilerOutput(WTF::Function<void (const String&, CallbackBase::Error)>&&);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
