Modified: trunk/Source/WebCore/ChangeLog (269867 => 269868)
--- trunk/Source/WebCore/ChangeLog 2020-11-16 19:52:43 UTC (rev 269867)
+++ trunk/Source/WebCore/ChangeLog 2020-11-16 20:05:00 UTC (rev 269868)
@@ -1,3 +1,14 @@
+2020-11-16 Don Olmstead <[email protected]>
+
+ Non-unified build fixes, mid November 2020 edition
+ https://bugs.webkit.org/show_bug.cgi?id=218911
+
+ Unreviewed build fix.
+
+ * display/css/DisplayBoxFactory.h:
+ * page/Quirks.cpp:
+ * rendering/style/GridPosition.cpp:
+
2020-11-16 Megan Gardner <[email protected]>
Add menu support for app highlights for books
Modified: trunk/Source/WebCore/display/css/DisplayBoxFactory.h (269867 => 269868)
--- trunk/Source/WebCore/display/css/DisplayBoxFactory.h 2020-11-16 19:52:43 UTC (rev 269867)
+++ trunk/Source/WebCore/display/css/DisplayBoxFactory.h 2020-11-16 20:05:00 UTC (rev 269868)
@@ -32,6 +32,8 @@
namespace WebCore {
+class RenderStyle;
+
namespace Layout {
class Box;
class BoxGeometry;
@@ -46,6 +48,7 @@
class Box;
class BoxDecorationData;
class BoxModelBox;
+class Style;
enum class RootBackgroundPropagation : uint8_t {
None,
Modified: trunk/Source/WebCore/page/Quirks.cpp (269867 => 269868)
--- trunk/Source/WebCore/page/Quirks.cpp 2020-11-16 19:52:43 UTC (rev 269867)
+++ trunk/Source/WebCore/page/Quirks.cpp 2020-11-16 20:05:00 UTC (rev 269868)
@@ -43,6 +43,7 @@
#include "LayoutUnit.h"
#include "NamedNodeMap.h"
#include "NetworkStorageSession.h"
+#include "PlatformMouseEvent.h"
#include "ResourceLoadObserver.h"
#include "RuntimeEnabledFeatures.h"
#include "SVGPathElement.h"
Modified: trunk/Source/WebCore/rendering/style/GridPosition.cpp (269867 => 269868)
--- trunk/Source/WebCore/rendering/style/GridPosition.cpp 2020-11-16 19:52:43 UTC (rev 269867)
+++ trunk/Source/WebCore/rendering/style/GridPosition.cpp 2020-11-16 20:05:00 UTC (rev 269868)
@@ -31,6 +31,8 @@
#include "config.h"
#include "GridPosition.h"
+#include <wtf/text/TextStream.h>
+
namespace WebCore {
Optional<int> GridPosition::gMaxPositionForTesting;
Modified: trunk/Source/WebKit/ChangeLog (269867 => 269868)
--- trunk/Source/WebKit/ChangeLog 2020-11-16 19:52:43 UTC (rev 269867)
+++ trunk/Source/WebKit/ChangeLog 2020-11-16 20:05:00 UTC (rev 269868)
@@ -1,3 +1,15 @@
+2020-11-16 Don Olmstead <[email protected]>
+
+ Non-unified build fixes, mid November 2020 edition
+ https://bugs.webkit.org/show_bug.cgi?id=218911
+
+ Unreviewed build fix.
+
+ * UIProcess/SpeechRecognitionServer.cpp:
+ (WebKit::SpeechRecognitionServer::start):
+ (WebKit::SpeechRecognitionServer::requestPermissionForRequest):
+ (WebKit::SpeechRecognitionServer::sendUpdate):
+
2020-11-16 Per Arne Vollan <[email protected]>
[macOS] The WebContent sandbox does not apply for open source builds
Modified: trunk/Source/WebKit/UIProcess/SpeechRecognitionServer.cpp (269867 => 269868)
--- trunk/Source/WebKit/UIProcess/SpeechRecognitionServer.cpp 2020-11-16 19:52:43 UTC (rev 269867)
+++ trunk/Source/WebKit/UIProcess/SpeechRecognitionServer.cpp 2020-11-16 20:05:00 UTC (rev 269868)
@@ -26,8 +26,10 @@
#include "config.h"
#include "SpeechRecognitionServer.h"
+#include "SpeechRecognitionPermissionRequest.h"
#include "WebProcessProxy.h"
#include "WebSpeechRecognitionConnectionMessages.h"
+#include <WebCore/SpeechRecognitionRequestInfo.h>
#include <WebCore/SpeechRecognitionUpdate.h>
#define MESSAGE_CHECK(assertion) MESSAGE_CHECK_BASE(assertion, messageSenderConnection())
@@ -46,7 +48,7 @@
MESSAGE_CHECK(clientIdentifier);
ASSERT(!m_pendingRequests.contains(clientIdentifier));
ASSERT(!m_ongoingRequests.contains(clientIdentifier));
- auto requestInfo = SpeechRecognitionRequestInfo { clientIdentifier, WTFMove(lang), continuous, interimResults, maxAlternatives, WTFMove(origin) };
+ auto requestInfo = WebCore::SpeechRecognitionRequestInfo { clientIdentifier, WTFMove(lang), continuous, interimResults, maxAlternatives, WTFMove(origin) };
auto& pendingRequest = m_pendingRequests.add(clientIdentifier, makeUnique<WebCore::SpeechRecognitionRequest>(WTFMove(requestInfo))).iterator->value;
requestPermissionForRequest(*pendingRequest);
@@ -64,7 +66,7 @@
auto identifier = weakRequest->clientIdentifier();
auto takenRequest = m_pendingRequests.take(identifier);
if (decision == SpeechRecognitionPermissionDecision::Deny) {
- auto error = SpeechRecognitionError { SpeechRecognitionErrorType::NotAllowed, "Permission check failed"_s };
+ auto error = WebCore::SpeechRecognitionError { WebCore::SpeechRecognitionErrorType::NotAllowed, "Permission check failed"_s };
sendUpdate(identifier, WebCore::SpeechRecognitionUpdateType::Error, error);
return;
}
@@ -124,12 +126,12 @@
// TODO: stop capturing audio and recognition immediately without generating results.
}
-void SpeechRecognitionServer::sendUpdate(SpeechRecognitionConnectionClientIdentifier clientIdentifier, SpeechRecognitionUpdateType type, Optional<SpeechRecognitionError> error, Optional<Vector<SpeechRecognitionResultData>> result)
+void SpeechRecognitionServer::sendUpdate(WebCore::SpeechRecognitionConnectionClientIdentifier clientIdentifier, WebCore::SpeechRecognitionUpdateType type, Optional<WebCore::SpeechRecognitionError> error, Optional<Vector<WebCore::SpeechRecognitionResultData>> result)
{
auto update = WebCore::SpeechRecognitionUpdate::create(clientIdentifier, type);
- if (type == SpeechRecognitionUpdateType::Error)
+ if (type == WebCore::SpeechRecognitionUpdateType::Error)
update = WebCore::SpeechRecognitionUpdate::createError(clientIdentifier, *error);
- if (type == SpeechRecognitionUpdateType::Result)
+ if (type == WebCore::SpeechRecognitionUpdateType::Result)
update = WebCore::SpeechRecognitionUpdate::createResult(clientIdentifier, *result);
send(Messages::WebSpeechRecognitionConnection::DidReceiveUpdate(update), m_identifier);
}
