Diff
Modified: trunk/Source/WebCore/ChangeLog (270196 => 270197)
--- trunk/Source/WebCore/ChangeLog 2020-11-27 17:05:09 UTC (rev 270196)
+++ trunk/Source/WebCore/ChangeLog 2020-11-27 17:26:03 UTC (rev 270197)
@@ -1,3 +1,21 @@
+2020-11-27 Adrian Perez de Castro <[email protected]>
+
+ Non-unified build fixes, late November 2020 edition
+ https://bugs.webkit.org/show_bug.cgi?id=219306
+
+ Unreviewed non-unified build fixes.
+
+ * dom/SimpleRange.cpp: Add missing Frame.h header.
+ * html/canvas/CanvasRenderingContext2D.cpp: Removed fontStyleIsWithinRange() from here, as
+ it is not used in this source file.
+ * html/canvas/CanvasRenderingContext2DBase.cpp:
+ (WebCore::isSpaceThatNeedsReplacing): Moved here from CanvasRenderingContext2D.cpp
+ * inspector/InspectorNodeFinder.cpp: Add missing Frame.h header.
+ * page/FrameTree.h: Added missing wtf/Forward.h header
+ * style/StyleResolveForFontRaw.cpp: Add missing CSSToLengthConversionData.h,
+ FontCascade.h, and Settings.h headers.
+ * style/StyleResolveForFontRaw.h: Add forward declaration for FontCascadeDescription.
+
2020-11-27 Simon Fraser <[email protected]>
[LFC Display] Add support for painting box shadows
Modified: trunk/Source/WebCore/dom/SimpleRange.cpp (270196 => 270197)
--- trunk/Source/WebCore/dom/SimpleRange.cpp 2020-11-27 17:05:09 UTC (rev 270196)
+++ trunk/Source/WebCore/dom/SimpleRange.cpp 2020-11-27 17:26:03 UTC (rev 270197)
@@ -27,6 +27,7 @@
#include "SimpleRange.h"
#include "CharacterData.h"
+#include "Frame.h"
#include "HTMLFrameOwnerElement.h"
#include "NodeTraversal.h"
#include "ShadowRoot.h"
Modified: trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp (270196 => 270197)
--- trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp 2020-11-27 17:05:09 UTC (rev 270196)
+++ trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp 2020-11-27 17:26:03 UTC (rev 270197)
@@ -169,17 +169,6 @@
drawTextInternal(text, x, y, false, maxWidth);
}
-static inline bool isSpaceThatNeedsReplacing(UChar c)
-{
- // According to specification all space characters should be replaced with 0x0020 space character.
- // http://www.whatwg.org/specs/web-apps/current-work/multipage/the-canvas-element.html#text-preparation-algorithm
- // The space characters according to specification are : U+0020, U+0009, U+000A, U+000C, and U+000D.
- // http://www.whatwg.org/specs/web-apps/current-work/multipage/common-microsyntaxes.html#space-character
- // This function returns true for 0x000B also, so that this is backward compatible.
- // Otherwise, the test LayoutTests/canvas/philip/tests/2d.text.draw.space.collapse.space.html will fail
- return c == 0x0009 || c == 0x000A || c == 0x000B || c == 0x000C || c == 0x000D;
-}
-
Ref<TextMetrics> CanvasRenderingContext2D::measureText(const String& text)
{
if (RuntimeEnabledFeatures::sharedFeatures().webAPIStatisticsEnabled()) {
Modified: trunk/Source/WebCore/html/canvas/CanvasRenderingContext2DBase.cpp (270196 => 270197)
--- trunk/Source/WebCore/html/canvas/CanvasRenderingContext2DBase.cpp 2020-11-27 17:05:09 UTC (rev 270196)
+++ trunk/Source/WebCore/html/canvas/CanvasRenderingContext2DBase.cpp 2020-11-27 17:26:03 UTC (rev 270197)
@@ -2428,6 +2428,17 @@
return true;
}
+static inline bool isSpaceThatNeedsReplacing(UChar c)
+{
+ // According to specification all space characters should be replaced with 0x0020 space character.
+ // http://www.whatwg.org/specs/web-apps/current-work/multipage/the-canvas-element.html#text-preparation-algorithm
+ // The space characters according to specification are : U+0020, U+0009, U+000A, U+000C, and U+000D.
+ // http://www.whatwg.org/specs/web-apps/current-work/multipage/common-microsyntaxes.html#space-character
+ // This function returns true for 0x000B also, so that this is backward compatible.
+ // Otherwise, the test LayoutTests/canvas/philip/tests/2d.text.draw.space.collapse.space.html will fail
+ return c == 0x0009 || c == 0x000A || c == 0x000B || c == 0x000C || c == 0x000D;
+}
+
void CanvasRenderingContext2DBase::normalizeSpaces(String& text)
{
size_t i = text.find(isSpaceThatNeedsReplacing);
Modified: trunk/Source/WebCore/inspector/InspectorNodeFinder.cpp (270196 => 270197)
--- trunk/Source/WebCore/inspector/InspectorNodeFinder.cpp 2020-11-27 17:05:09 UTC (rev 270196)
+++ trunk/Source/WebCore/inspector/InspectorNodeFinder.cpp 2020-11-27 17:26:03 UTC (rev 270197)
@@ -35,6 +35,7 @@
#include "Attr.h"
#include "Document.h"
#include "Element.h"
+#include "Frame.h"
#include "HTMLFrameOwnerElement.h"
#include "NodeList.h"
#include "NodeTraversal.h"
Modified: trunk/Source/WebCore/page/FrameTree.h (270196 => 270197)
--- trunk/Source/WebCore/page/FrameTree.h 2020-11-27 17:05:09 UTC (rev 270196)
+++ trunk/Source/WebCore/page/FrameTree.h 2020-11-27 17:26:03 UTC (rev 270197)
@@ -19,6 +19,7 @@
#pragma once
+#include <wtf/Forward.h>
#include <wtf/WeakPtr.h>
#include <wtf/text/AtomString.h>
Modified: trunk/Source/WebCore/style/StyleResolveForFontRaw.cpp (270196 => 270197)
--- trunk/Source/WebCore/style/StyleResolveForFontRaw.cpp 2020-11-27 17:05:09 UTC (rev 270196)
+++ trunk/Source/WebCore/style/StyleResolveForFontRaw.cpp 2020-11-27 17:26:03 UTC (rev 270197)
@@ -33,9 +33,12 @@
#include "CSSFontSelector.h"
#include "CSSPropertyParserHelpers.h"
+#include "CSSToLengthConversionData.h"
#include "Document.h"
+#include "FontCascade.h"
#include "FontCascadeDescription.h"
#include "RenderStyle.h"
+#include "Settings.h"
#include "StyleFontSizeFunctions.h"
namespace WebCore {
Modified: trunk/Source/WebCore/style/StyleResolveForFontRaw.h (270196 => 270197)
--- trunk/Source/WebCore/style/StyleResolveForFontRaw.h 2020-11-27 17:05:09 UTC (rev 270196)
+++ trunk/Source/WebCore/style/StyleResolveForFontRaw.h 2020-11-27 17:26:03 UTC (rev 270197)
@@ -33,6 +33,7 @@
namespace WebCore {
class Document;
+class FontCascadeDescription;
class RenderStyle;
namespace CSSPropertyParserHelpers {
Modified: trunk/Source/WebKit/ChangeLog (270196 => 270197)
--- trunk/Source/WebKit/ChangeLog 2020-11-27 17:05:09 UTC (rev 270196)
+++ trunk/Source/WebKit/ChangeLog 2020-11-27 17:26:03 UTC (rev 270197)
@@ -1,3 +1,17 @@
+2020-11-27 Adrian Perez de Castro <[email protected]>
+
+ Non-unified build fixes, late November 2020 edition
+ https://bugs.webkit.org/show_bug.cgi?id=219306
+
+ Unreviewed non-unified build fixes.
+
+ * NetworkProcess/Classifier/ResourceLoadStatisticsDatabaseStore.cpp: Add missing
+ PrivateClickMeasurementManager.h header.
+ * NetworkProcess/PrivateClickMeasurementManager.cpp: Add missing NetworkSession.h header.
+ * UIProcess/SpeechRecognitionServer.cpp:
+ (WebKit::SpeechRecognitionServer::handleRequest): Add missing WebCore:: namespace to uses
+ of the WebCore::SpeechRecognizer and WebCore::SpeechRecognitionUpdateType types.
+
2020-11-27 Yoshiaki Jitsukawa <[email protected]>
[PlayStation] Define platform argument coders for Font
Modified: trunk/Source/WebKit/NetworkProcess/Classifier/ResourceLoadStatisticsDatabaseStore.cpp (270196 => 270197)
--- trunk/Source/WebKit/NetworkProcess/Classifier/ResourceLoadStatisticsDatabaseStore.cpp 2020-11-27 17:05:09 UTC (rev 270196)
+++ trunk/Source/WebKit/NetworkProcess/Classifier/ResourceLoadStatisticsDatabaseStore.cpp 2020-11-27 17:26:03 UTC (rev 270197)
@@ -32,6 +32,7 @@
#include "NetworkSession.h"
#include "PluginProcessManager.h"
#include "PluginProcessProxy.h"
+#include "PrivateClickMeasurementManager.h"
#include "ResourceLoadStatisticsMemoryStore.h"
#include "StorageAccessStatus.h"
#include "WebProcessProxy.h"
Modified: trunk/Source/WebKit/NetworkProcess/PrivateClickMeasurementManager.cpp (270196 => 270197)
--- trunk/Source/WebKit/NetworkProcess/PrivateClickMeasurementManager.cpp 2020-11-27 17:05:09 UTC (rev 270196)
+++ trunk/Source/WebKit/NetworkProcess/PrivateClickMeasurementManager.cpp 2020-11-27 17:26:03 UTC (rev 270197)
@@ -27,6 +27,7 @@
#include "PrivateClickMeasurementManager.h"
#include "Logging.h"
+#include "NetworkSession.h"
#include <_javascript_Core/ConsoleTypes.h>
#include <WebCore/FetchOptions.h>
#include <WebCore/FormData.h>
Modified: trunk/Source/WebKit/UIProcess/SpeechRecognitionServer.cpp (270196 => 270197)
--- trunk/Source/WebKit/UIProcess/SpeechRecognitionServer.cpp 2020-11-27 17:05:09 UTC (rev 270196)
+++ trunk/Source/WebKit/UIProcess/SpeechRecognitionServer.cpp 2020-11-27 17:26:03 UTC (rev 270197)
@@ -77,7 +77,7 @@
void SpeechRecognitionServer::handleRequest(WebCore::SpeechRecognitionConnectionClientIdentifier clientIdentifier)
{
if (!m_recognizer) {
- m_recognizer = makeUnique<SpeechRecognizer>([this, weakThis = makeWeakPtr(this)](auto& update) {
+ m_recognizer = makeUnique<WebCore::SpeechRecognizer>([this, weakThis = makeWeakPtr(this)](auto& update) {
if (!weakThis)
return;
@@ -86,7 +86,7 @@
return;
auto type = update.type();
- if (type == SpeechRecognitionUpdateType::Error || type == SpeechRecognitionUpdateType::End)
+ if (type == WebCore::SpeechRecognitionUpdateType::Error || type == WebCore::SpeechRecognitionUpdateType::End)
m_requests.remove(clientIdentifier);
sendUpdate(update);
