Changeset 238497 in webkit

Timestamp:

Nov 26, 2018, 9:11:48 AM (8 years ago)

Author:

Wenson Hsieh

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:

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/WebPage/WebPage.cpp (modified) (3 diffs)
• WebProcess/WebPage/WebPage.h (modified) (4 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2018-11-26  Wenson Hsieh  <wenson_hsieh@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  <antti@apple.com>
 

trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp

@@ -3404 +3404 @@
 }
 
-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()) {
@@ -3414 +3414 @@
         frame->setDataDetectionResults(nullptr);
     }
-    reply({ m_page->mainFrame().dataDetectionResults() });
-}
-
-void WebPage::detectDataInAllFrames(uint64_t types, Messages::WebPage::DetectDataInAllFrames::AsyncReply&& reply)
+    completionHandler({ m_page->mainFrame().dataDetectionResults() });
+}
+
+void WebPage::detectDataInAllFrames(uint64_t types, CompletionHandler<void(const DataDetectionResult&)>&& completionHandler)
 {
     auto dataDetectorTypes = static_cast<WebCore::DataDetectorTypes>(types);
@@ -3428 +3428 @@
         frame->setDataDetectionResults(DataDetection::detectContentInRange(range, dataDetectorTypes, m_dataDetectionContext.get()));
     }
-    reply({ m_page->mainFrame().dataDetectionResults() });
+    completionHandler({ m_page->mainFrame().dataDetectionResults() });
 }
 

trunk/Source/WebKit/WebProcess/WebPage/WebPage.h

@@ -49 +49 @@
 #include "UserData.h"
 #include "WebBackForwardListProxy.h"
-#include "WebPageMessages.h"
 #include "WebURLSchemeHandler.h"
 #include "WebUserContentController.h"
@@ -94 +93 @@
 #if PLATFORM(IOS_FAMILY)
 #include "GestureTypes.h"
+#include "WebPageMessages.h"
 #include <WebCore/IntPointHash.h>
 #include <WebCore/ViewportConfiguration.h>
@@ -241 +241 @@
 struct AssistedNodeInformation;
 struct AttributedString;
+struct DataDetectionResult;
 struct BackForwardListItemState;
 struct EditorState;
@@ -1007 +1008 @@
 #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