Diff
Modified: trunk/Source/WebCore/ChangeLog (260817 => 260818)
--- trunk/Source/WebCore/ChangeLog 2020-04-28 11:50:39 UTC (rev 260817)
+++ trunk/Source/WebCore/ChangeLog 2020-04-28 11:57:47 UTC (rev 260818)
@@ -1,3 +1,23 @@
+2020-04-28 Adrian Perez de Castro <[email protected]>
+
+ Non-unified build fixes late April 2020 edition
+ https://bugs.webkit.org/show_bug.cgi?id=211099
+
+ Unreviewed build fix.
+
+ No new tests needed.
+
+ * Modules/cache/DOMCacheStorage.cpp: Sprinkle DOMCacheEngine:: namespace prefixes as needed.
+ (WebCore::DOMCacheStorage::findCacheOrCreate):
+ (WebCore::DOMCacheStorage::retrieveCaches):
+ (WebCore::DOMCacheStorage::doOpen):
+ (WebCore::DOMCacheStorage::doRemove):
+ * bindings/js/JSExecStateInstrumentation.h: Ditto for JSC:: namespace prefixes.
+ (WebCore::JSExecState::instrumentFunction):
+ * dom/ScriptedAnimationController.h: Add missing ReducedResolutionSeconds.h header.
+ * editing/TextCheckingHelper.h: Add missing forward declaration for Position.
+ * html/URLSearchParams.h: Add missing ExceptionOr.h header.
+
2020-04-28 Charlie Turner <[email protected]>
[EME][CDMProxy] Default initialize m_numDecryptorsWaitingForKey member
Modified: trunk/Source/WebCore/Modules/cache/DOMCacheStorage.cpp (260817 => 260818)
--- trunk/Source/WebCore/Modules/cache/DOMCacheStorage.cpp 2020-04-28 11:50:39 UTC (rev 260817)
+++ trunk/Source/WebCore/Modules/cache/DOMCacheStorage.cpp 2020-04-28 11:57:47 UTC (rev 260818)
@@ -133,7 +133,7 @@
});
}
-Ref<DOMCache> DOMCacheStorage::findCacheOrCreate(CacheInfo&& info)
+Ref<DOMCache> DOMCacheStorage::findCacheOrCreate(DOMCacheEngine::CacheInfo&& info)
{
auto position = m_caches.findMatching([&] (const auto& cache) { return info.identifier == cache->identifier(); });
if (position != notFound)
@@ -149,7 +149,7 @@
return;
}
- m_connection->retrieveCaches(*origin, m_updateCounter, [this, callback = WTFMove(callback), pendingActivity = makePendingActivity(*this)](CacheInfosOrError&& result) mutable {
+ m_connection->retrieveCaches(*origin, m_updateCounter, [this, callback = WTFMove(callback), pendingActivity = makePendingActivity(*this)](DOMCacheEngine::CacheInfosOrError&& result) mutable {
if (m_isStopped) {
callback(DOMCacheEngine::convertToException(DOMCacheEngine::Error::Stopped));
return;
@@ -164,7 +164,7 @@
if (m_updateCounter != cachesInfo.updateCounter) {
m_updateCounter = cachesInfo.updateCounter;
- m_caches = WTF::map(WTFMove(cachesInfo.infos), [this] (CacheInfo&& info) {
+ m_caches = WTF::map(WTFMove(cachesInfo.infos), [this] (DOMCacheEngine::CacheInfo&& info) {
return findCacheOrCreate(WTFMove(info));
});
}
@@ -199,7 +199,7 @@
return;
}
- m_connection->open(*origin(), name, [this, name, promise = WTFMove(promise), pendingActivity = makePendingActivity(*this)](const CacheIdentifierOrError& result) mutable {
+ m_connection->open(*origin(), name, [this, name, promise = WTFMove(promise), pendingActivity = makePendingActivity(*this)](const DOMCacheEngine::CacheIdentifierOrError& result) mutable {
if (!result.has_value())
promise.reject(DOMCacheEngine::convertToExceptionAndLog(scriptExecutionContext(), result.error()));
else {
@@ -232,7 +232,7 @@
return;
}
- m_connection->remove(m_caches[position]->identifier(), [this, name, promise = WTFMove(promise), pendingActivity = makePendingActivity(*this)](const CacheIdentifierOrError& result) mutable {
+ m_connection->remove(m_caches[position]->identifier(), [this, name, promise = WTFMove(promise), pendingActivity = makePendingActivity(*this)](const DOMCacheEngine::CacheIdentifierOrError& result) mutable {
if (!result.has_value())
promise.reject(DOMCacheEngine::convertToExceptionAndLog(scriptExecutionContext(), result.error()));
else {
Modified: trunk/Source/WebCore/bindings/js/JSExecStateInstrumentation.h (260817 => 260818)
--- trunk/Source/WebCore/bindings/js/JSExecStateInstrumentation.h 2020-04-28 11:50:39 UTC (rev 260817)
+++ trunk/Source/WebCore/bindings/js/JSExecStateInstrumentation.h 2020-04-28 11:57:47 UTC (rev 260818)
@@ -32,7 +32,7 @@
namespace WebCore {
-inline void JSExecState::instrumentFunction(ScriptExecutionContext* context, const CallData& callData)
+inline void JSExecState::instrumentFunction(ScriptExecutionContext* context, const JSC::CallData& callData)
{
if (!InspectorInstrumentation::timelineAgentTracking(context))
return;
@@ -40,7 +40,7 @@
String resourceName;
int lineNumber = 1;
int columnNumber = 1;
- if (callData.type == CallData::Type::JS) {
+ if (callData.type == JSC::CallData::Type::JS) {
resourceName = callData.js.functionExecutable->sourceURL();
lineNumber = callData.js.functionExecutable->firstLine();
columnNumber = callData.js.functionExecutable->startColumn();
Modified: trunk/Source/WebCore/dom/ScriptedAnimationController.h (260817 => 260818)
--- trunk/Source/WebCore/dom/ScriptedAnimationController.h 2020-04-28 11:50:39 UTC (rev 260817)
+++ trunk/Source/WebCore/dom/ScriptedAnimationController.h 2020-04-28 11:57:47 UTC (rev 260818)
@@ -26,6 +26,7 @@
#pragma once
#include "DOMHighResTimeStamp.h"
+#include "ReducedResolutionSeconds.h"
#include "Timer.h"
#include <wtf/OptionSet.h>
#include <wtf/RefCounted.h>
Modified: trunk/Source/WebCore/editing/TextCheckingHelper.h (260817 => 260818)
--- trunk/Source/WebCore/editing/TextCheckingHelper.h 2020-04-28 11:50:39 UTC (rev 260817)
+++ trunk/Source/WebCore/editing/TextCheckingHelper.h 2020-04-28 11:57:47 UTC (rev 260818)
@@ -27,6 +27,7 @@
namespace WebCore {
+class Position;
struct TextCheckingResult;
class TextCheckingParagraph {
Modified: trunk/Source/WebCore/html/URLSearchParams.h (260817 => 260818)
--- trunk/Source/WebCore/html/URLSearchParams.h 2020-04-28 11:50:39 UTC (rev 260817)
+++ trunk/Source/WebCore/html/URLSearchParams.h 2020-04-28 11:57:47 UTC (rev 260818)
@@ -24,6 +24,7 @@
#pragma once
+#include "ExceptionOr.h"
#include <wtf/Variant.h>
#include <wtf/Vector.h>
#include <wtf/text/WTFString.h>
Modified: trunk/Source/WebKit/ChangeLog (260817 => 260818)
--- trunk/Source/WebKit/ChangeLog 2020-04-28 11:50:39 UTC (rev 260817)
+++ trunk/Source/WebKit/ChangeLog 2020-04-28 11:57:47 UTC (rev 260818)
@@ -1,3 +1,15 @@
+2020-04-28 Adrian Perez de Castro <[email protected]>
+
+ Non-unified build fixes late April 2020 edition
+ https://bugs.webkit.org/show_bug.cgi?id=211099
+
+ Unreviewed build fix.
+
+ * NetworkProcess/NetworkLoad.cpp: Add mising WebCoreArgumentCoders.h header.
+ * WebProcess/Automation/WebAutomationDOMWindowObserver.cpp:
+ (WebKit::WebAutomationDOMWindowObserver::WebAutomationDOMWindowObserver): Add namespace to
+ WebCore::DOMWindow usage.
+
2020-04-26 Carlos Garcia Campos <[email protected]>
[GTK4] Add support for scroll events
Modified: trunk/Source/WebKit/NetworkProcess/NetworkLoad.cpp (260817 => 260818)
--- trunk/Source/WebKit/NetworkProcess/NetworkLoad.cpp 2020-04-28 11:50:39 UTC (rev 260817)
+++ trunk/Source/WebKit/NetworkProcess/NetworkLoad.cpp 2020-04-28 11:57:47 UTC (rev 260818)
@@ -32,6 +32,7 @@
#include "NetworkProcess.h"
#include "NetworkProcessProxyMessages.h"
#include "NetworkSession.h"
+#include "WebCoreArgumentCoders.h"
#include "WebErrors.h"
#include <WebCore/ResourceRequest.h>
#include <WebCore/SharedBuffer.h>
Modified: trunk/Source/WebKit/WebProcess/Automation/WebAutomationDOMWindowObserver.cpp (260817 => 260818)
--- trunk/Source/WebKit/WebProcess/Automation/WebAutomationDOMWindowObserver.cpp 2020-04-28 11:50:39 UTC (rev 260817)
+++ trunk/Source/WebKit/WebProcess/Automation/WebAutomationDOMWindowObserver.cpp 2020-04-28 11:57:47 UTC (rev 260818)
@@ -31,7 +31,7 @@
namespace WebKit {
-WebAutomationDOMWindowObserver::WebAutomationDOMWindowObserver(DOMWindow& window, WTF::Function<void(WebAutomationDOMWindowObserver&)>&& callback)
+WebAutomationDOMWindowObserver::WebAutomationDOMWindowObserver(WebCore::DOMWindow& window, WTF::Function<void(WebAutomationDOMWindowObserver&)>&& callback)
: m_window(makeWeakPtr(window))
, m_callback(WTFMove(callback))
{
