Title: [238497] trunk/Source/WebKit
- Revision
- 238497
- Author
- wenson_hs...@apple.com
- Date
- 2018-11-26 09:11:48 -0800 (Mon, 26 Nov 2018)
Log Message
Unreviewed, fix the internal 32-bit macOS 10.13 build after r238471
r238471 added an `#include WebPageMessages.h` in `WebPage.h`, which causes the 32-bit macOS build using an
internal macOS SDK ≤ 10.13 to fail. To address this, move the `#include` back under `PLATFORM(IOS_FAMILY)` by
changing the parameters of `WebPage::removeDataDetectedLinks` and `WebPage::detectDataInAllFrames` to completion
handlers rather than async IPC replies.
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::removeDataDetectedLinks):
(WebKit::WebPage::detectDataInAllFrames):
* WebProcess/WebPage/WebPage.h:
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (238496 => 238497)
--- trunk/Source/WebKit/ChangeLog 2018-11-26 16:49:55 UTC (rev 238496)
+++ trunk/Source/WebKit/ChangeLog 2018-11-26 17:11:48 UTC (rev 238497)
@@ -1,3 +1,17 @@
+2018-11-26 Wenson Hsieh <wenson_hs...@apple.com>
+
+ Unreviewed, fix the internal 32-bit macOS 10.13 build after r238471
+
+ r238471 added an `#include WebPageMessages.h` in `WebPage.h`, which causes the 32-bit macOS build using an
+ internal macOS SDK ≤ 10.13 to fail. To address this, move the `#include` back under `PLATFORM(IOS_FAMILY)` by
+ changing the parameters of `WebPage::removeDataDetectedLinks` and `WebPage::detectDataInAllFrames` to completion
+ handlers rather than async IPC replies.
+
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::removeDataDetectedLinks):
+ (WebKit::WebPage::detectDataInAllFrames):
+ * WebProcess/WebPage/WebPage.h:
+
2018-11-26 Antti Koivisto <an...@apple.com>
Clean up layer tree freezing logic in WebPage
Modified: trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp (238496 => 238497)
--- trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp 2018-11-26 16:49:55 UTC (rev 238496)
+++ trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp 2018-11-26 17:11:48 UTC (rev 238497)
@@ -3403,7 +3403,7 @@
send(Messages::WebPageProxy::SetDataDetectionResult(dataDetectionResult));
}
-void WebPage::removeDataDetectedLinks(Messages::WebPage::RemoveDataDetectedLinks::AsyncReply&& reply)
+void WebPage::removeDataDetectedLinks(CompletionHandler<void(const DataDetectionResult&)>&& completionHandler)
{
for (auto frame = makeRefPtr(&m_page->mainFrame()); frame; frame = frame->tree().traverseNext()) {
auto document = makeRefPtr(frame->document());
@@ -3413,10 +3413,10 @@
DataDetection::removeDataDetectedLinksInDocument(*document);
frame->setDataDetectionResults(nullptr);
}
- reply({ m_page->mainFrame().dataDetectionResults() });
+ completionHandler({ m_page->mainFrame().dataDetectionResults() });
}
-void WebPage::detectDataInAllFrames(uint64_t types, Messages::WebPage::DetectDataInAllFrames::AsyncReply&& reply)
+void WebPage::detectDataInAllFrames(uint64_t types, CompletionHandler<void(const DataDetectionResult&)>&& completionHandler)
{
auto dataDetectorTypes = static_cast<WebCore::DataDetectorTypes>(types);
for (auto frame = makeRefPtr(&m_page->mainFrame()); frame; frame = frame->tree().traverseNext()) {
@@ -3427,7 +3427,7 @@
RefPtr<Range> range = Range::create(*document, Position { document.get(), Position::PositionIsBeforeChildren }, Position { document.get(), Position::PositionIsAfterChildren });
frame->setDataDetectionResults(DataDetection::detectContentInRange(range, dataDetectorTypes, m_dataDetectionContext.get()));
}
- reply({ m_page->mainFrame().dataDetectionResults() });
+ completionHandler({ m_page->mainFrame().dataDetectionResults() });
}
#endif // ENABLE(DATA_DETECTION)
Modified: trunk/Source/WebKit/WebProcess/WebPage/WebPage.h (238496 => 238497)
--- trunk/Source/WebKit/WebProcess/WebPage/WebPage.h 2018-11-26 16:49:55 UTC (rev 238496)
+++ trunk/Source/WebKit/WebProcess/WebPage/WebPage.h 2018-11-26 17:11:48 UTC (rev 238497)
@@ -48,7 +48,6 @@
#include "SharedMemory.h"
#include "UserData.h"
#include "WebBackForwardListProxy.h"
-#include "WebPageMessages.h"
#include "WebURLSchemeHandler.h"
#include "WebUserContentController.h"
#include <_javascript_Core/InspectorFrontendChannel.h>
@@ -93,6 +92,7 @@
#if PLATFORM(IOS_FAMILY)
#include "GestureTypes.h"
+#include "WebPageMessages.h"
#include <WebCore/IntPointHash.h>
#include <WebCore/ViewportConfiguration.h>
#endif
@@ -240,6 +240,7 @@
struct AssistedNodeInformation;
struct AttributedString;
+struct DataDetectionResult;
struct BackForwardListItemState;
struct EditorState;
struct InteractionInformationAtPosition;
@@ -1006,8 +1007,8 @@
#if ENABLE(DATA_DETECTION)
void setDataDetectionResults(NSArray *);
- void detectDataInAllFrames(uint64_t, Messages::WebPage::DetectDataInAllFrames::AsyncReply&&);
- void removeDataDetectedLinks(Messages::WebPage::RemoveDataDetectedLinks::AsyncReply&&);
+ void detectDataInAllFrames(uint64_t, CompletionHandler<void(const DataDetectionResult&)>&&);
+ void removeDataDetectedLinks(CompletionHandler<void(const DataDetectionResult&)>&&);
#endif
unsigned extendIncrementalRenderingSuppression();
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
