<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[288361] trunk</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/288361">288361</a></dd>
<dt>Author</dt> <dd>lmoura@igalia.com</dd>
<dt>Date</dt> <dd>2022-01-21 05:11:33 -0800 (Fri, 21 Jan 2022)</dd>
</dl>

<h3>Log Message</h3>
<pre>[CMake] Cannot link libTestRunnerInjectedBundle.so in non unified build
https://bugs.webkit.org/show_bug.cgi?id=226088

Reviewed by Adrian Perez de Castro.

Source/JavaScriptCore:

* wasm/js/JSWebAssemblyModule.h: Add missing header

Source/WebCore:

Covered by existing tests.

* inspector/InspectorController.cpp:
(WebCore::InspectorController::isUnderTest const): Defining  it.
* inspector/InspectorController.h: Export isUnderTest().
* loader/SubresourceIntegrity.h: Add missing header.
* platform/gtk/ValidationBubbleGtk.cpp: Ditto.
* svg/graphics/filters/SVGFEImage.h: Ditto.
* testing/Internals.cpp:
(WebCore::Internals::mediaSessionState): Cast new enum to the WebCore
one.
* testing/Internals.h: Redefine MediaSessionState as a new enum
instead of aliasing to avoid redefinitions of
convertEnumerationToString in non-unified builds.
* workers/WorkerConsoleClient.h:

Tools:

* WebKitTestRunner/CMakeLists.txt: Pull WebCore as dependency for
WTR/WTRInjectedBundle</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCorewasmjsJSWebAssemblyModuleh">trunk/Source/JavaScriptCore/wasm/js/JSWebAssemblyModule.h</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorControllercpp">trunk/Source/WebCore/inspector/InspectorController.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorControllerh">trunk/Source/WebCore/inspector/InspectorController.h</a></li>
<li><a href="#trunkSourceWebCoreloaderSubresourceIntegrityh">trunk/Source/WebCore/loader/SubresourceIntegrity.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgtkValidationBubbleGtkcpp">trunk/Source/WebCore/platform/gtk/ValidationBubbleGtk.cpp</a></li>
<li><a href="#trunkSourceWebCoresvggraphicsfiltersSVGFEImageh">trunk/Source/WebCore/svg/graphics/filters/SVGFEImage.h</a></li>
<li><a href="#trunkSourceWebCoretestingInternalscpp">trunk/Source/WebCore/testing/Internals.cpp</a></li>
<li><a href="#trunkSourceWebCoretestingInternalsh">trunk/Source/WebCore/testing/Internals.h</a></li>
<li><a href="#trunkSourceWebCoreworkersWorkerConsoleClienth">trunk/Source/WebCore/workers/WorkerConsoleClient.h</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsWebKitTestRunnerCMakeListstxt">trunk/Tools/WebKitTestRunner/CMakeLists.txt</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (288360 => 288361)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog    2022-01-21 11:05:10 UTC (rev 288360)
+++ trunk/Source/JavaScriptCore/ChangeLog       2022-01-21 13:11:33 UTC (rev 288361)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2022-01-21  Lauro Moura  <lmoura@igalia.com>
+
+        [CMake] Cannot link libTestRunnerInjectedBundle.so in non unified build
+        https://bugs.webkit.org/show_bug.cgi?id=226088
+
+        Reviewed by Adrian Perez de Castro.
+
+        * wasm/js/JSWebAssemblyModule.h: Add missing header
+
</ins><span class="cx"> 2022-01-20  Pablo Saavedra  <psaavedra@igalia.com>
</span><span class="cx"> 
</span><span class="cx">         Non-unified build fails due to forward declaration in JavaScriptCore/jit/JITStubRoutine.h
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorewasmjsJSWebAssemblyModuleh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/wasm/js/JSWebAssemblyModule.h (288360 => 288361)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/wasm/js/JSWebAssemblyModule.h        2022-01-21 11:05:10 UTC (rev 288360)
+++ trunk/Source/JavaScriptCore/wasm/js/JSWebAssemblyModule.h   2022-01-21 13:11:33 UTC (rev 288361)
</span><span class="lines">@@ -27,6 +27,7 @@
</span><span class="cx"> 
</span><span class="cx"> #if ENABLE(WEBASSEMBLY)
</span><span class="cx"> 
</span><ins>+#include "CallLinkInfo.h"
</ins><span class="cx"> #include "JSDestructibleObject.h"
</span><span class="cx"> #include "JSObject.h"
</span><span class="cx"> #include "WasmMemoryMode.h"
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (288360 => 288361)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2022-01-21 11:05:10 UTC (rev 288360)
+++ trunk/Source/WebCore/ChangeLog      2022-01-21 13:11:33 UTC (rev 288361)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2022-01-21  Lauro Moura  <lmoura@igalia.com>
+
+        [CMake] Cannot link libTestRunnerInjectedBundle.so in non unified build
+        https://bugs.webkit.org/show_bug.cgi?id=226088
+
+        Reviewed by Adrian Perez de Castro.
+
+        Covered by existing tests.
+
+        * inspector/InspectorController.cpp:
+        (WebCore::InspectorController::isUnderTest const): Defining  it.
+        * inspector/InspectorController.h: Export isUnderTest().
+        * loader/SubresourceIntegrity.h: Add missing header.
+        * platform/gtk/ValidationBubbleGtk.cpp: Ditto.
+        * svg/graphics/filters/SVGFEImage.h: Ditto.
+        * testing/Internals.cpp:
+        (WebCore::Internals::mediaSessionState): Cast new enum to the WebCore
+        one.
+        * testing/Internals.h: Redefine MediaSessionState as a new enum
+        instead of aliasing to avoid redefinitions of
+        convertEnumerationToString in non-unified builds.
+        * workers/WorkerConsoleClient.h:
+
</ins><span class="cx"> 2022-01-21  Martin Robinson  <mrobinson@webkit.org>
</span><span class="cx"> 
</span><span class="cx">         element.scrollIntoView() sometimes doesn't scroll
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorController.cpp (288360 => 288361)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorController.cpp   2022-01-21 11:05:10 UTC (rev 288360)
+++ trunk/Source/WebCore/inspector/InspectorController.cpp      2022-01-21 13:11:33 UTC (rev 288361)
</span><span class="lines">@@ -359,6 +359,11 @@
</span><span class="cx">     m_overlay->getHighlight(highlight, coordinateSystem);
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+bool InspectorController::isUnderTest() const
+{
+    return m_isUnderTest;
+}
+
</ins><span class="cx"> unsigned InspectorController::gridOverlayCount() const
</span><span class="cx"> {
</span><span class="cx">     return m_overlay->gridOverlayCount();
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorController.h (288360 => 288361)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorController.h     2022-01-21 11:05:10 UTC (rev 288360)
+++ trunk/Source/WebCore/inspector/InspectorController.h        2022-01-21 13:11:33 UTC (rev 288361)
</span><span class="lines">@@ -102,7 +102,7 @@
</span><span class="cx">     WEBCORE_EXPORT void didComposite(Frame&);
</span><span class="cx"> 
</span><span class="cx">     // Testing support.
</span><del>-    bool isUnderTest() const { return m_isUnderTest; }
</del><ins>+    WEBCORE_EXPORT bool isUnderTest() const;
</ins><span class="cx">     void setIsUnderTest(bool isUnderTest) { m_isUnderTest = isUnderTest; }
</span><span class="cx">     WEBCORE_EXPORT void evaluateForTestInFrontend(const String& script);
</span><span class="cx">     WEBCORE_EXPORT unsigned gridOverlayCount() const;
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderSubresourceIntegrityh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/SubresourceIntegrity.h (288360 => 288361)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/SubresourceIntegrity.h       2022-01-21 11:05:10 UTC (rev 288360)
+++ trunk/Source/WebCore/loader/SubresourceIntegrity.h  2022-01-21 13:11:33 UTC (rev 288361)
</span><span class="lines">@@ -25,6 +25,8 @@
</span><span class="cx"> 
</span><span class="cx"> #pragma once
</span><span class="cx"> 
</span><ins>+#include "ResourceCryptographicDigest.h"
+
</ins><span class="cx"> #include <optional>
</span><span class="cx"> #include <wtf/Forward.h>
</span><span class="cx"> 
</span><span class="lines">@@ -31,7 +33,6 @@
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> 
</span><span class="cx"> class CachedResource;
</span><del>-struct EncodedResourceCryptographicDigest;
</del><span class="cx"> 
</span><span class="cx"> bool matchIntegrityMetadata(const CachedResource&, const String& integrityMetadata);
</span><span class="cx"> String integrityMismatchDescription(const CachedResource&, const String& integrityMetadata);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgtkValidationBubbleGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/gtk/ValidationBubbleGtk.cpp (288360 => 288361)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/gtk/ValidationBubbleGtk.cpp        2022-01-21 11:05:10 UTC (rev 288360)
+++ trunk/Source/WebCore/platform/gtk/ValidationBubbleGtk.cpp   2022-01-21 13:11:33 UTC (rev 288361)
</span><span class="lines">@@ -30,6 +30,7 @@
</span><span class="cx"> 
</span><span class="cx"> #include "GtkVersioning.h"
</span><span class="cx"> #include <glib.h>
</span><ins>+#include <gtk/gtk.h>
</ins><span class="cx"> #include <wtf/glib/GUniquePtr.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoresvggraphicsfiltersSVGFEImageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/graphics/filters/SVGFEImage.h (288360 => 288361)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/graphics/filters/SVGFEImage.h   2022-01-21 11:05:10 UTC (rev 288360)
+++ trunk/Source/WebCore/svg/graphics/filters/SVGFEImage.h      2022-01-21 13:11:33 UTC (rev 288361)
</span><span class="lines">@@ -25,6 +25,7 @@
</span><span class="cx"> 
</span><span class="cx"> #include "FilterEffect.h"
</span><span class="cx"> #include "Image.h"
</span><ins>+#include "ImageBuffer.h"
</ins><span class="cx"> #include "SVGPreserveAspectRatioValue.h"
</span><span class="cx"> 
</span><span class="cx"> namespace WebCore {
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.cpp (288360 => 288361)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.cpp       2022-01-21 11:05:10 UTC (rev 288360)
+++ trunk/Source/WebCore/testing/Internals.cpp  2022-01-21 13:11:33 UTC (rev 288361)
</span><span class="lines">@@ -4540,7 +4540,7 @@
</span><span class="cx"> 
</span><span class="cx"> Internals::MediaSessionState Internals::mediaSessionState(HTMLMediaElement& element)
</span><span class="cx"> {
</span><del>-    return element.mediaSession().state();
</del><ins>+    return static_cast<Internals::MediaSessionState>(element.mediaSession().state());
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.h (288360 => 288361)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.h 2022-01-21 11:05:10 UTC (rev 288360)
+++ trunk/Source/WebCore/testing/Internals.h    2022-01-21 13:11:33 UTC (rev 288361)
</span><span class="lines">@@ -1010,7 +1010,15 @@
</span><span class="cx">     using PlaybackControlsPurpose = MediaElementSession::PlaybackControlsPurpose;
</span><span class="cx">     RefPtr<HTMLMediaElement> bestMediaElementForRemoteControls(PlaybackControlsPurpose);
</span><span class="cx"> 
</span><del>-    using MediaSessionState = PlatformMediaSession::State;
</del><ins>+    // Same values as PlatformMediaSession::State, but re-declared to avoid redefinitions when linking
+    // directly with libWebCore (e.g. with non-unified builds)
+    enum MediaSessionState {
+        Idle,
+        Autoplaying,
+        Playing,
+        Paused,
+        Interrupted,
+    };
</ins><span class="cx">     MediaSessionState mediaSessionState(HTMLMediaElement&);
</span><span class="cx"> 
</span><span class="cx">     size_t mediaElementCount() const;
</span></span></pre></div>
<a id="trunkSourceWebCoreworkersWorkerConsoleClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/WorkerConsoleClient.h (288360 => 288361)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/WorkerConsoleClient.h       2022-01-21 11:05:10 UTC (rev 288360)
+++ trunk/Source/WebCore/workers/WorkerConsoleClient.h  2022-01-21 13:11:33 UTC (rev 288361)
</span><span class="lines">@@ -33,6 +33,8 @@
</span><span class="cx"> class CallFrame;
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+using JSC::MessageType;
+
</ins><span class="cx"> namespace WebCore {
</span><span class="cx"> 
</span><span class="cx"> class WorkerConsoleClient final : public JSC::ConsoleClient {
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (288360 => 288361)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog    2022-01-21 11:05:10 UTC (rev 288360)
+++ trunk/Tools/ChangeLog       2022-01-21 13:11:33 UTC (rev 288361)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2022-01-21  Lauro Moura  <lmoura@igalia.com>
+
+        [CMake] Cannot link libTestRunnerInjectedBundle.so in non unified build
+        https://bugs.webkit.org/show_bug.cgi?id=226088
+
+        Reviewed by Adrian Perez de Castro.
+
+        * WebKitTestRunner/CMakeLists.txt: Pull WebCore as dependency for
+        WTR/WTRInjectedBundle
+
</ins><span class="cx"> 2022-01-20  Lauro Moura  <lmoura@igalia.com>
</span><span class="cx"> 
</span><span class="cx">         [GTK] API test /webkit/WebKitWebsiteData/cache is flaky
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/CMakeLists.txt (288360 => 288361)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/CMakeLists.txt      2022-01-21 11:05:10 UTC (rev 288360)
+++ trunk/Tools/WebKitTestRunner/CMakeLists.txt 2022-01-21 13:11:33 UTC (rev 288361)
</span><span class="lines">@@ -24,6 +24,7 @@
</span><span class="cx"> )
</span><span class="cx"> set(WebKitTestRunner_FRAMEWORKS
</span><span class="cx">     JavaScriptCore
</span><ins>+    WebCore
</ins><span class="cx">     WebCoreTestSupport
</span><span class="cx"> )
</span><span class="cx"> 
</span><span class="lines">@@ -103,6 +104,7 @@
</span><span class="cx"> 
</span><span class="cx"> set(WebKitTestRunnerInjectedBundle_LIBRARIES
</span><span class="cx">     TestRunnerShared
</span><ins>+    WebKit::WebCore
</ins><span class="cx">     WebKit::WebCoreTestSupport
</span><span class="cx">     WebKit::WebKit
</span><span class="cx"> )
</span></span></pre>
</div>
</div>

</body>
</html>