<!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>[282295] 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/282295">282295</a></dd>
<dt>Author</dt> <dd>stephan.szabo@sony.com</dd>
<dt>Date</dt> <dd>2021-09-10 15:32:43 -0700 (Fri, 10 Sep 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>[PlayStation] Support running applications with ENABLE_STATIC_JSC=ON
https://bugs.webkit.org/show_bug.cgi?id=230170

Reviewed by Ross Kirsling.

Updating loading code to not load libJavaScriptCore shared library
Source/JavaScriptCore:

if we are using a static version.

* shell/playstation/Initializer.cpp:

Source/WebKit:

if we are using a static version.

* NetworkProcess/EntryPoint/playstation/NetworkProcessMain.cpp:
* WebProcess/EntryPoint/playstation/WebProcessMain.cpp:

Tools:

if we are using a static version. Fix platform bits for
TestJavaScriptCore to load libraries at all.

* MiniBrowser/playstation/main.cpp:
* TestWebKitAPI/PlatformPlayStation.cmake:
* TestWebKitAPI/playstation/main.cpp:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreshellplaystationInitializercpp">trunk/Source/JavaScriptCore/shell/playstation/Initializer.cpp</a></li>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitNetworkProcessEntryPointplaystationNetworkProcessMaincpp">trunk/Source/WebKit/NetworkProcess/EntryPoint/playstation/NetworkProcessMain.cpp</a></li>
<li><a href="#trunkSourceWebKitWebProcessEntryPointplaystationWebProcessMaincpp">trunk/Source/WebKit/WebProcess/EntryPoint/playstation/WebProcessMain.cpp</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsMiniBrowserplaystationmaincpp">trunk/Tools/MiniBrowser/playstation/main.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPIPlatformPlayStationcmake">trunk/Tools/TestWebKitAPI/PlatformPlayStation.cmake</a></li>
<li><a href="#trunkToolsTestWebKitAPIplaystationmaincpp">trunk/Tools/TestWebKitAPI/playstation/main.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (282294 => 282295)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog    2021-09-10 22:16:06 UTC (rev 282294)
+++ trunk/Source/JavaScriptCore/ChangeLog       2021-09-10 22:32:43 UTC (rev 282295)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2021-09-10  Stephan Szabo  <stephan.szabo@sony.com>
+
+        [PlayStation] Support running applications with ENABLE_STATIC_JSC=ON
+        https://bugs.webkit.org/show_bug.cgi?id=230170
+
+        Reviewed by Ross Kirsling.
+
+        Updating loading code to not load libJavaScriptCore shared library
+        if we are using a static version.
+
+        * shell/playstation/Initializer.cpp:
+
</ins><span class="cx"> 2021-09-09  Ross Kirsling  <ross.kirsling@sony.com>
</span><span class="cx"> 
</span><span class="cx">         [JSC] Clean up current state of Temporal API
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreshellplaystationInitializercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/shell/playstation/Initializer.cpp (282294 => 282295)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/shell/playstation/Initializer.cpp    2021-09-10 22:16:06 UTC (rev 282294)
+++ trunk/Source/JavaScriptCore/shell/playstation/Initializer.cpp       2021-09-10 22:32:43 UTC (rev 282295)
</span><span class="lines">@@ -43,6 +43,8 @@
</span><span class="cx">     loadLibraryOrExit("SystemServices");
</span><span class="cx">     loadLibraryOrExit("Perf");
</span><span class="cx">     loadLibraryOrExit("PosixWebKit");
</span><ins>+#if !ENABLE(STATIC_JSC)
</ins><span class="cx">     loadLibraryOrExit("libJavaScriptCore");
</span><ins>+#endif
</ins><span class="cx">     loadLibraryOrExit("libicu");
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (282294 => 282295)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog    2021-09-10 22:16:06 UTC (rev 282294)
+++ trunk/Source/WebKit/ChangeLog       2021-09-10 22:32:43 UTC (rev 282295)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2021-09-10  Stephan Szabo  <stephan.szabo@sony.com>
+
+        [PlayStation] Support running applications with ENABLE_STATIC_JSC=ON
+        https://bugs.webkit.org/show_bug.cgi?id=230170
+
+        Reviewed by Ross Kirsling.
+
+        Updating loading code to not load libJavaScriptCore shared library
+        if we are using a static version.
+
+        * NetworkProcess/EntryPoint/playstation/NetworkProcessMain.cpp:
+        * WebProcess/EntryPoint/playstation/WebProcessMain.cpp:
+
</ins><span class="cx"> 2021-09-10  Per Arne  <pvollan@apple.com>
</span><span class="cx"> 
</span><span class="cx">         [macOS] Close XPC connection before entering the WP sandbox
</span></span></pre></div>
<a id="trunkSourceWebKitNetworkProcessEntryPointplaystationNetworkProcessMaincpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/NetworkProcess/EntryPoint/playstation/NetworkProcessMain.cpp (282294 => 282295)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/NetworkProcess/EntryPoint/playstation/NetworkProcessMain.cpp 2021-09-10 22:16:06 UTC (rev 282294)
+++ trunk/Source/WebKit/NetworkProcess/EntryPoint/playstation/NetworkProcessMain.cpp    2021-09-10 22:32:43 UTC (rev 282295)
</span><span class="lines">@@ -54,7 +54,9 @@
</span><span class="cx">     loadLibraryOrExit("libcurl");
</span><span class="cx">     loadLibraryOrExit("libicu");
</span><span class="cx">     loadLibraryOrExit("libSceNKWebKitRequirements");
</span><ins>+#if !ENABLE(STATIC_JSC)
</ins><span class="cx">     loadLibraryOrExit("libJavaScriptCore");
</span><ins>+#endif
</ins><span class="cx">     loadLibraryOrExit("libWebKit");
</span><span class="cx"> 
</span><span class="cx">     char* coreProcessIdentifier = argv[1];
</span></span></pre></div>
<a id="trunkSourceWebKitWebProcessEntryPointplaystationWebProcessMaincpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebProcess/EntryPoint/playstation/WebProcessMain.cpp (282294 => 282295)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebProcess/EntryPoint/playstation/WebProcessMain.cpp 2021-09-10 22:16:06 UTC (rev 282294)
+++ trunk/Source/WebKit/WebProcess/EntryPoint/playstation/WebProcessMain.cpp    2021-09-10 22:32:43 UTC (rev 282295)
</span><span class="lines">@@ -54,7 +54,9 @@
</span><span class="cx">     loadLibraryOrExit("libharfbuzz");
</span><span class="cx">     loadLibraryOrExit("libcairo");
</span><span class="cx">     loadLibraryOrExit("libSceNKWebKitRequirements");
</span><ins>+#if !ENABLE(STATIC_JSC)
</ins><span class="cx">     loadLibraryOrExit("libJavaScriptCore");
</span><ins>+#endif
</ins><span class="cx">     loadLibraryOrExit("libWebKit");
</span><span class="cx"> 
</span><span class="cx">     char* coreProcessIdentifier = argv[1];
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (282294 => 282295)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog    2021-09-10 22:16:06 UTC (rev 282294)
+++ trunk/Tools/ChangeLog       2021-09-10 22:32:43 UTC (rev 282295)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2021-09-10  Stephan Szabo  <stephan.szabo@sony.com>
+
+        [PlayStation] Support running applications with ENABLE_STATIC_JSC=ON
+        https://bugs.webkit.org/show_bug.cgi?id=230170
+
+        Reviewed by Ross Kirsling.
+
+        Updating loading code to not load libJavaScriptCore shared library
+        if we are using a static version. Fix platform bits for
+        TestJavaScriptCore to load libraries at all.
+
+        * MiniBrowser/playstation/main.cpp:
+        * TestWebKitAPI/PlatformPlayStation.cmake:
+        * TestWebKitAPI/playstation/main.cpp:
+
</ins><span class="cx"> 2021-09-10  Jonathan Bedard  <jbedard@apple.com>
</span><span class="cx"> 
</span><span class="cx">         [webkitcorepy] AutoInstall occasionally raising SSL error
</span></span></pre></div>
<a id="trunkToolsMiniBrowserplaystationmaincpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/MiniBrowser/playstation/main.cpp (282294 => 282295)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/MiniBrowser/playstation/main.cpp     2021-09-10 22:16:06 UTC (rev 282294)
+++ trunk/Tools/MiniBrowser/playstation/main.cpp        2021-09-10 22:32:43 UTC (rev 282295)
</span><span class="lines">@@ -23,10 +23,12 @@
</span><span class="cx">  * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx">  */
</span><span class="cx"> 
</span><ins>+#include "config.h"
</ins><span class="cx"> #include "MainWindow.h"
</span><span class="cx"> #include <WebKit/WKRunLoop.h>
</span><span class="cx"> #include <dlfcn.h>
</span><span class="cx"> #include <toolkitten/Application.h>
</span><ins>+#include <wtf/Platform.h>
</ins><span class="cx"> 
</span><span class="cx"> using toolkitten::Widget;
</span><span class="cx"> using toolkitten::Application;
</span><span class="lines">@@ -53,7 +55,9 @@
</span><span class="cx">     loadLibraryOrExit("libcairo");
</span><span class="cx">     loadLibraryOrExit("libToolKitten");    
</span><span class="cx">     loadLibraryOrExit("libSceNKWebKitRequirements");
</span><ins>+#if !ENABLE(STATIC_JSC)
</ins><span class="cx">     loadLibraryOrExit("libJavaScriptCore");
</span><ins>+#endif
</ins><span class="cx">     loadLibraryOrExit("libWebKit");
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPIPlatformPlayStationcmake"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/PlatformPlayStation.cmake (282294 => 282295)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/PlatformPlayStation.cmake      2021-09-10 22:16:06 UTC (rev 282294)
+++ trunk/Tools/TestWebKitAPI/PlatformPlayStation.cmake 2021-09-10 22:32:43 UTC (rev 282295)
</span><span class="lines">@@ -10,6 +10,10 @@
</span><span class="cx">     generic/UtilitiesGeneric.cpp
</span><span class="cx"> )
</span><span class="cx"> 
</span><ins>+list(APPEND TestJavaScriptCore_SOURCES
+    ${test_main_SOURCES}
+)
+
</ins><span class="cx"> list(APPEND TestWebCore_SOURCES
</span><span class="cx">     ${test_main_SOURCES}
</span><span class="cx"> )
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPIplaystationmaincpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/playstation/main.cpp (282294 => 282295)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/playstation/main.cpp   2021-09-10 22:16:06 UTC (rev 282294)
+++ trunk/Tools/TestWebKitAPI/playstation/main.cpp      2021-09-10 22:32:43 UTC (rev 282295)
</span><span class="lines">@@ -46,8 +46,12 @@
</span><span class="cx">     loadLibraryOrExit("libharfbuzz");
</span><span class="cx">     loadLibraryOrExit("libcairo");
</span><span class="cx">     loadLibraryOrExit("libSceNKWebKitRequirements");
</span><ins>+#endif
+#if defined(BUILDING_TestWebCore) || defined(BUILDING_TestWebKit) || defined(BUILDING_TestJavaScriptCore)
+#if !ENABLE(STATIC_JSC)
</ins><span class="cx">     loadLibraryOrExit("libJavaScriptCore");
</span><span class="cx"> #endif
</span><ins>+#endif
</ins><span class="cx"> #if defined(BUILDING_TestWebKit)
</span><span class="cx">     if (!((dlopen("libcrypto", RTLD_NOW) && dlopen("libssl", RTLD_NOW)) || dlopen("LibreSSL", RTLD_NOW))) {
</span><span class="cx">         fprintf(stderr, "Failed to load SSL library.\n");
</span></span></pre>
</div>
</div>

</body>
</html>