Diff
Modified: trunk/Source/WebCore/ChangeLog (262620 => 262621)
--- trunk/Source/WebCore/ChangeLog 2020-06-05 15:27:33 UTC (rev 262620)
+++ trunk/Source/WebCore/ChangeLog 2020-06-05 15:47:41 UTC (rev 262621)
@@ -1,3 +1,23 @@
+2020-06-05 Adrian Perez de Castro <ape...@igalia.com>
+
+ Non-unified build fixes, early summer 2020 edition
+ https://bugs.webkit.org/show_bug.cgi?id=212819
+
+ Unreviewed build fix.
+
+ No new tests needed.
+
+ * animation/ElementAnimationRareData.cpp: Add missing RenderStyle.h header.
+ * animation/ElementAnimationRareData.h: Add forward declaration for RenderStyle.
+ * editing/TextManipulationController.cpp: Sprinkle missing HTMLNames:: prefixes.
+ (WebCore::shouldExtractValueForTextManipulation):
+ (WebCore::TextManipulationController::observeParagraphs):
+ (WebCore::makePositionTuple):
+ (WebCore::TextManipulationController::replace):
+ * platform/graphics/SimpleColor.h: Add missing ColorComponents.h and wtf/text/WTFString.h
+ headers.
+ * workers/service/context/ServiceWorkerThread.cpp: Add missing Logging.h header.
+
2020-06-05 Andy Estes <aes...@apple.com>
[Apple Pay] Remove conditionals for ENABLE_APPLE_PAY_SESSION_V(3|4)
Modified: trunk/Source/WebCore/animation/ElementAnimationRareData.cpp (262620 => 262621)
--- trunk/Source/WebCore/animation/ElementAnimationRareData.cpp 2020-06-05 15:27:33 UTC (rev 262620)
+++ trunk/Source/WebCore/animation/ElementAnimationRareData.cpp 2020-06-05 15:47:41 UTC (rev 262621)
@@ -29,6 +29,7 @@
#include "CSSAnimation.h"
#include "CSSTransition.h"
#include "KeyframeEffectStack.h"
+#include "RenderStyle.h"
namespace WebCore {
Modified: trunk/Source/WebCore/animation/ElementAnimationRareData.h (262620 => 262621)
--- trunk/Source/WebCore/animation/ElementAnimationRareData.h 2020-06-05 15:27:33 UTC (rev 262620)
+++ trunk/Source/WebCore/animation/ElementAnimationRareData.h 2020-06-05 15:47:41 UTC (rev 262621)
@@ -32,6 +32,7 @@
class CSSAnimation;
class CSSTransition;
+class RenderStyle;
class WebAnimation;
class ElementAnimationRareData {
Modified: trunk/Source/WebCore/editing/TextManipulationController.cpp (262620 => 262621)
--- trunk/Source/WebCore/editing/TextManipulationController.cpp 2020-06-05 15:27:33 UTC (rev 262620)
+++ trunk/Source/WebCore/editing/TextManipulationController.cpp 2020-06-05 15:47:41 UTC (rev 262621)
@@ -222,7 +222,7 @@
static bool shouldExtractValueForTextManipulation(const HTMLInputElement& input)
{
- if (input.isSearchField() || equalIgnoringASCIICase(input.attributeWithoutSynchronization(typeAttr), InputTypeNames::text()))
+ if (input.isSearchField() || equalIgnoringASCIICase(input.attributeWithoutSynchronization(HTMLNames::typeAttr), InputTypeNames::text()))
return !input.lastChangeWasUserEdit();
return input.isTextButton();
@@ -415,7 +415,7 @@
if (is<HTMLInputElement>(currentElement)) {
auto& input = downcast<HTMLInputElement>(currentElement);
if (shouldExtractValueForTextManipulation(input))
- addItem(ManipulationItemData { { }, { }, makeWeakPtr(currentElement), valueAttr, { ManipulationToken { m_tokenIdentifier.generate(), input.value(), tokenInfo(¤tElement) } } });
+ addItem(ManipulationItemData { { }, { }, makeWeakPtr(currentElement), HTMLNames::valueAttr, { ManipulationToken { m_tokenIdentifier.generate(), input.value(), tokenInfo(¤tElement) } } });
}
if (!enclosingItemBoundaryElement && isEnclosingItemBoundaryElement(currentElement))
@@ -465,7 +465,7 @@
using PositionTuple = std::tuple<RefPtr<Node>, unsigned, unsigned>;
static const PositionTuple makePositionTuple(const Position& position)
{
- return { position.anchorNode(), static_cast<unsigned>(position.anchorType()), position.anchorType() == Position::PositionIsOffsetInAnchor ? position.offsetInContainerNode() : 0 };
+ return { position.anchorNode(), static_cast<unsigned>(position.anchorType()), position.anchorType() == Position::PositionIsOffsetInAnchor ? position.offsetInContainerNode() : 0 };
}
static const std::pair<PositionTuple, PositionTuple> makeHashablePositionRange(const VisiblePosition& start, const VisiblePosition& end)
@@ -641,7 +641,7 @@
}
if (item.attributeName == nullQName())
element->setTextContent(newValue.toString());
- else if (item.attributeName == valueAttr && is<HTMLInputElement>(*element))
+ else if (item.attributeName == HTMLNames::valueAttr && is<HTMLInputElement>(*element))
downcast<HTMLInputElement>(*element).setValue(newValue.toString());
else
element->setAttribute(item.attributeName, newValue.toString());
Modified: trunk/Source/WebCore/platform/graphics/SimpleColor.h (262620 => 262621)
--- trunk/Source/WebCore/platform/graphics/SimpleColor.h 2020-06-05 15:27:33 UTC (rev 262620)
+++ trunk/Source/WebCore/platform/graphics/SimpleColor.h 2020-06-05 15:47:41 UTC (rev 262621)
@@ -25,7 +25,9 @@
#pragma once
+#include "ColorComponents.h"
#include "ColorUtilities.h"
+#include <wtf/text/WTFString.h>
namespace WebCore {
Modified: trunk/Source/WebCore/workers/service/context/ServiceWorkerThread.cpp (262620 => 262621)
--- trunk/Source/WebCore/workers/service/context/ServiceWorkerThread.cpp 2020-06-05 15:27:33 UTC (rev 262620)
+++ trunk/Source/WebCore/workers/service/context/ServiceWorkerThread.cpp 2020-06-05 15:47:41 UTC (rev 262621)
@@ -35,6 +35,7 @@
#include "ExtendableMessageEvent.h"
#include "JSDOMPromise.h"
#include "LoaderStrategy.h"
+#include "Logging.h"
#include "PlatformStrategies.h"
#include "SWContextManager.h"
#include "SecurityOrigin.h"
Modified: trunk/Source/WebKit/ChangeLog (262620 => 262621)
--- trunk/Source/WebKit/ChangeLog 2020-06-05 15:27:33 UTC (rev 262620)
+++ trunk/Source/WebKit/ChangeLog 2020-06-05 15:47:41 UTC (rev 262621)
@@ -1,3 +1,15 @@
+2020-06-05 Adrian Perez de Castro <ape...@igalia.com>
+
+ Non-unified build fixes, early summer 2020 edition
+ https://bugs.webkit.org/show_bug.cgi?id=212819
+
+ Unreviewed build fix.
+
+ * Shared/gtk/NativeWebMouseEventGtk.cpp:
+ (WebKit::NativeWebMouseEvent::NativeWebMouseEvent): Add missing WebCore:: namespace to
+ a couple of uses of WebCore::FloatSize.
+ * WebProcess/Storage/WebServiceWorkerFetchTaskClient.cpp: Add missing Logging.h header.
+
2020-06-05 Andy Estes <aes...@apple.com>
[Apple Pay] Remove conditionals for ENABLE_APPLE_PAY_SESSION_V(3|4)
Modified: trunk/Source/WebKit/Shared/gtk/NativeWebMouseEventGtk.cpp (262620 => 262621)
--- trunk/Source/WebKit/Shared/gtk/NativeWebMouseEventGtk.cpp 2020-06-05 15:27:33 UTC (rev 262620)
+++ trunk/Source/WebKit/Shared/gtk/NativeWebMouseEventGtk.cpp 2020-06-05 15:47:41 UTC (rev 262621)
@@ -49,7 +49,7 @@
}
NativeWebMouseEvent::NativeWebMouseEvent(Type type, Button button, unsigned short buttons, const WebCore::IntPoint& position, const WebCore::IntPoint& globalPosition, int clickCount, OptionSet<Modifier> modifiers, Optional<WebCore::FloatSize> delta)
- : WebMouseEvent(type, button, buttons, position, globalPosition, delta.valueOr(FloatSize()).width(), delta.valueOr(FloatSize()).height(), 0, clickCount, modifiers, WallTime::now())
+ : WebMouseEvent(type, button, buttons, position, globalPosition, delta.valueOr(WebCore::FloatSize()).width(), delta.valueOr(WebCore::FloatSize()).height(), 0, clickCount, modifiers, WallTime::now())
{
}
Modified: trunk/Source/WebKit/WebProcess/Storage/WebServiceWorkerFetchTaskClient.cpp (262620 => 262621)
--- trunk/Source/WebKit/WebProcess/Storage/WebServiceWorkerFetchTaskClient.cpp 2020-06-05 15:27:33 UTC (rev 262620)
+++ trunk/Source/WebKit/WebProcess/Storage/WebServiceWorkerFetchTaskClient.cpp 2020-06-05 15:47:41 UTC (rev 262621)
@@ -30,6 +30,7 @@
#include "DataReference.h"
#include "FormDataReference.h"
+#include "Logging.h"
#include "ServiceWorkerFetchTaskMessages.h"
#include "SharedBufferDataReference.h"
#include "WebCoreArgumentCoders.h"
