Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (255069 => 255070)
--- trunk/Source/_javascript_Core/ChangeLog 2020-01-24 15:14:04 UTC (rev 255069)
+++ trunk/Source/_javascript_Core/ChangeLog 2020-01-24 15:14:28 UTC (rev 255070)
@@ -1,3 +1,12 @@
+2020-01-24 Adrian Perez de Castro <[email protected]>
+
+ Fix various non-unified build issues introduced since r254751
+ https://bugs.webkit.org/show_bug.cgi?id=206736
+
+ Reviewed by Carlos Garcia Campos.
+
+ * tools/CompilerTimingScope.cpp: Add missing inclusions of wtf/Vector.h and wtf/text/WTFString.h
+
2020-01-24 Paulo Matos <[email protected]>
Fix number of callee saved register count on MIPS
Modified: trunk/Source/_javascript_Core/tools/CompilerTimingScope.cpp (255069 => 255070)
--- trunk/Source/_javascript_Core/tools/CompilerTimingScope.cpp 2020-01-24 15:14:04 UTC (rev 255069)
+++ trunk/Source/_javascript_Core/tools/CompilerTimingScope.cpp 2020-01-24 15:14:28 UTC (rev 255070)
@@ -30,6 +30,8 @@
#include <wtf/DataLog.h>
#include <wtf/HashMap.h>
#include <wtf/Lock.h>
+#include <wtf/Vector.h>
+#include <wtf/text/WTFString.h>
namespace JSC {
Modified: trunk/Source/WebCore/ChangeLog (255069 => 255070)
--- trunk/Source/WebCore/ChangeLog 2020-01-24 15:14:04 UTC (rev 255069)
+++ trunk/Source/WebCore/ChangeLog 2020-01-24 15:14:28 UTC (rev 255070)
@@ -1,3 +1,20 @@
+2020-01-24 Adrian Perez de Castro <[email protected]>
+
+ Fix various non-unified build issues introduced since r254751
+ https://bugs.webkit.org/show_bug.cgi?id=206736
+
+ Reviewed by Carlos Garcia Campos.
+
+ No new tests needed.
+
+ * Modules/cache/DOMCacheEngine.cpp: Move errorToException() function out from the file to
+ make it usable from DOMCacheStorage.cpp
+ * Modules/cache/DOMCacheEngine.h:
+ (WebCore::DOMCacheEngine::errorToException): Added.
+ * Modules/cache/DOMCacheStorage.cpp:
+ (WebCore::DOMCacheStorage::retrieveCaches): Adapt to use DOMCacheEngine::errorToException().
+ * platform/graphics/cairo/ImageBufferUtilitiesCairo.cpp: Add missing RefPtrCairo.h inclusion.
+
2020-01-24 Zalan Bujtas <[email protected]>
[LFC][Integration] LineLayout::paint should take advantage of the glyph display list cache
Modified: trunk/Source/WebCore/Modules/cache/DOMCacheEngine.cpp (255069 => 255070)
--- trunk/Source/WebCore/Modules/cache/DOMCacheEngine.cpp 2020-01-24 15:14:04 UTC (rev 255069)
+++ trunk/Source/WebCore/Modules/cache/DOMCacheEngine.cpp 2020-01-24 15:14:28 UTC (rev 255070)
@@ -35,27 +35,6 @@
namespace DOMCacheEngine {
-static inline Exception errorToException(Error error)
-{
- switch (error) {
- case Error::NotImplemented:
- return Exception { NotSupportedError, "Not implemented"_s };
- case Error::ReadDisk:
- return Exception { TypeError, "Failed reading data from the file system"_s };
- case Error::WriteDisk:
- return Exception { TypeError, "Failed writing data to the file system"_s };
- case Error::QuotaExceeded:
- return Exception { QuotaExceededError, "Quota exceeded"_s };
- case Error::Internal:
- return Exception { TypeError, "Internal error"_s };
- case Error::Stopped:
- return Exception { TypeError, "Context is stopped"_s };
- default:
- ASSERT_NOT_REACHED();
- return Exception { TypeError, "Connection stopped"_s };
- }
-}
-
Exception convertToExceptionAndLog(ScriptExecutionContext* context, Error error)
{
auto exception = errorToException(error);
Modified: trunk/Source/WebCore/Modules/cache/DOMCacheEngine.h (255069 => 255070)
--- trunk/Source/WebCore/Modules/cache/DOMCacheEngine.h 2020-01-24 15:14:04 UTC (rev 255069)
+++ trunk/Source/WebCore/Modules/cache/DOMCacheEngine.h 2020-01-24 15:14:28 UTC (rev 255070)
@@ -49,6 +49,27 @@
Stopped
};
+static inline Exception errorToException(Error error)
+{
+ switch (error) {
+ case Error::NotImplemented:
+ return Exception { NotSupportedError, "Not implemented"_s };
+ case Error::ReadDisk:
+ return Exception { TypeError, "Failed reading data from the file system"_s };
+ case Error::WriteDisk:
+ return Exception { TypeError, "Failed writing data to the file system"_s };
+ case Error::QuotaExceeded:
+ return Exception { QuotaExceededError, "Quota exceeded"_s };
+ case Error::Internal:
+ return Exception { TypeError, "Internal error"_s };
+ case Error::Stopped:
+ return Exception { TypeError, "Context is stopped"_s };
+ default:
+ ASSERT_NOT_REACHED();
+ return Exception { TypeError, "Connection stopped"_s };
+ }
+}
+
Exception convertToExceptionAndLog(ScriptExecutionContext*, Error);
WEBCORE_EXPORT bool queryCacheMatch(const ResourceRequest& request, const ResourceRequest& cachedRequest, const ResourceResponse&, const CacheQueryOptions&);
Modified: trunk/Source/WebCore/Modules/cache/DOMCacheStorage.cpp (255069 => 255070)
--- trunk/Source/WebCore/Modules/cache/DOMCacheStorage.cpp 2020-01-24 15:14:04 UTC (rev 255069)
+++ trunk/Source/WebCore/Modules/cache/DOMCacheStorage.cpp 2020-01-24 15:14:28 UTC (rev 255070)
@@ -151,7 +151,7 @@
m_connection->retrieveCaches(*origin, m_updateCounter, [this, callback = WTFMove(callback), pendingActivity = makePendingActivity(*this)](CacheInfosOrError&& result) mutable {
if (m_isStopped) {
- callback(errorToException(DOMCacheEngine::Error::Stopped));
+ callback(DOMCacheEngine::errorToException(DOMCacheEngine::Error::Stopped));
return;
}
if (!result.has_value()) {
Modified: trunk/Source/WebCore/platform/graphics/cairo/ImageBufferUtilitiesCairo.cpp (255069 => 255070)
--- trunk/Source/WebCore/platform/graphics/cairo/ImageBufferUtilitiesCairo.cpp 2020-01-24 15:14:04 UTC (rev 255069)
+++ trunk/Source/WebCore/platform/graphics/cairo/ImageBufferUtilitiesCairo.cpp 2020-01-24 15:14:28 UTC (rev 255070)
@@ -35,6 +35,7 @@
#include "CairoUtilities.h"
#include "MIMETypeRegistry.h"
+#include "RefPtrCairo.h"
#include <cairo.h>
#include <wtf/text/Base64.h>
#include <wtf/text/CString.h>
Modified: trunk/Source/WebKit/ChangeLog (255069 => 255070)
--- trunk/Source/WebKit/ChangeLog 2020-01-24 15:14:04 UTC (rev 255069)
+++ trunk/Source/WebKit/ChangeLog 2020-01-24 15:14:28 UTC (rev 255070)
@@ -1,3 +1,12 @@
+2020-01-24 Adrian Perez de Castro <[email protected]>
+
+ Fix various non-unified build issues introduced since r254751
+ https://bugs.webkit.org/show_bug.cgi?id=206736
+
+ Reviewed by Carlos Garcia Campos.
+
+ * WebProcess/WebPage/WebURLSchemeHandlerProxy.cpp: Add missing WebFrame.h inclusion.
+
2020-01-24 Don Olmstead <[email protected]>
Centralize AuxiliaryProcessMainBase implementations
Modified: trunk/Source/WebKit/WebProcess/WebPage/WebURLSchemeHandlerProxy.cpp (255069 => 255070)
--- trunk/Source/WebKit/WebProcess/WebPage/WebURLSchemeHandlerProxy.cpp 2020-01-24 15:14:04 UTC (rev 255069)
+++ trunk/Source/WebKit/WebProcess/WebPage/WebURLSchemeHandlerProxy.cpp 2020-01-24 15:14:28 UTC (rev 255070)
@@ -30,6 +30,7 @@
#include "URLSchemeTaskParameters.h"
#include "WebCoreArgumentCoders.h"
#include "WebErrors.h"
+#include "WebFrame.h"
#include "WebLoaderStrategy.h"
#include "WebPage.h"
#include "WebPageProxyMessages.h"
