Diff
Modified: trunk/ChangeLog (277659 => 277660)
--- trunk/ChangeLog 2021-05-18 17:32:22 UTC (rev 277659)
+++ trunk/ChangeLog 2021-05-18 17:33:17 UTC (rev 277660)
@@ -1,3 +1,17 @@
+2021-05-18 Yoshiaki Jitsukawa <yoshiaki.jitsuk...@sony.com>
+
+ [PlayStation] Fix PlayStation port
+ https://bugs.webkit.org/show_bug.cgi?id=225913
+
+ Reviewed by Don Olmstead.
+
+ Fix PlayStation port
+
+ * Source/cmake/OptionsPlayStation.cmake: Rename
+ PLAYSTATION_COPY_SHARED_LIBRARIES to PLAYSTATION_COPY_REQUIREMENTS and
+ let it copy more general files.
+ Touch ebootparam.ini by the playstation_tools_copy custom_target.
+
2021-05-15 Sam Weinig <wei...@apple.com>
Allow conditionally enabling OffscreenCanvas only for non-worker contexts
Modified: trunk/Source/_javascript_Core/ChangeLog (277659 => 277660)
--- trunk/Source/_javascript_Core/ChangeLog 2021-05-18 17:32:22 UTC (rev 277659)
+++ trunk/Source/_javascript_Core/ChangeLog 2021-05-18 17:33:17 UTC (rev 277660)
@@ -1,3 +1,14 @@
+2021-05-18 Yoshiaki Jitsukawa <yoshiaki.jitsuk...@sony.com>
+
+ [PlayStation] Fix PlayStation port
+ https://bugs.webkit.org/show_bug.cgi?id=225913
+
+ Reviewed by Don Olmstead.
+
+ Fix PlayStation port
+
+ * jsc.cpp: Include LinkBuffer.h.
+
2021-05-18 Adrian Perez de Castro <ape...@igalia.com>
[JSCOnly] Non unified build fixes
Modified: trunk/Source/_javascript_Core/jsc.cpp (277659 => 277660)
--- trunk/Source/_javascript_Core/jsc.cpp 2021-05-18 17:32:22 UTC (rev 277659)
+++ trunk/Source/_javascript_Core/jsc.cpp 2021-05-18 17:33:17 UTC (rev 277660)
@@ -57,6 +57,7 @@
#include "JSWebAssemblyInstance.h"
#include "JSWebAssemblyMemory.h"
#include "LLIntThunks.h"
+#include "LinkBuffer.h"
#include "ObjectConstructor.h"
#include "ParserError.h"
#include "ProfilerDatabase.h"
Modified: trunk/Source/WTF/ChangeLog (277659 => 277660)
--- trunk/Source/WTF/ChangeLog 2021-05-18 17:32:22 UTC (rev 277659)
+++ trunk/Source/WTF/ChangeLog 2021-05-18 17:33:17 UTC (rev 277660)
@@ -1,3 +1,15 @@
+2021-05-18 Yoshiaki Jitsukawa <yoshiaki.jitsuk...@sony.com>
+
+ [PlayStation] Fix PlayStation port
+ https://bugs.webkit.org/show_bug.cgi?id=225913
+
+ Reviewed by Don Olmstead.
+
+ Fix PlayStation port
+
+ * wtf/PlatformPlayStation.cmake: Rename
+ PLAYSTATION_COPY_SHARED_LIBRARIES to PLAYSTATION_COPY_REQUIREMENTS.
+
2021-05-17 Saam Barati <sbar...@apple.com>
Enable JS to emit sign posts and trace points under Options::exposeProfilersOnGlobalObject
Modified: trunk/Source/WTF/wtf/PlatformPlayStation.cmake (277659 => 277660)
--- trunk/Source/WTF/wtf/PlatformPlayStation.cmake 2021-05-18 17:32:22 UTC (rev 277659)
+++ trunk/Source/WTF/wtf/PlatformPlayStation.cmake 2021-05-18 17:33:17 UTC (rev 277660)
@@ -22,7 +22,7 @@
Threads::Threads
)
-PLAYSTATION_COPY_SHARED_LIBRARIES(WTF_CopySharedLibs
+PLAYSTATION_COPY_REQUIREMENTS(WTF_CopySharedLibs
FILES
${ICU_LIBRARIES}
)
Modified: trunk/Source/WebCore/ChangeLog (277659 => 277660)
--- trunk/Source/WebCore/ChangeLog 2021-05-18 17:32:22 UTC (rev 277659)
+++ trunk/Source/WebCore/ChangeLog 2021-05-18 17:33:17 UTC (rev 277660)
@@ -1,3 +1,18 @@
+2021-05-18 Yoshiaki Jitsukawa <yoshiaki.jitsuk...@sony.com>
+
+ [PlayStation] Fix PlayStation port
+ https://bugs.webkit.org/show_bug.cgi?id=225913
+
+ Reviewed by Don Olmstead.
+
+ Fix PlayStation port
+
+ * PlatformPlayStation.cmake: Rename
+ PLAYSTATION_COPY_SHARED_LIBRARIES to PLAYSTATION_COPY_REQUIREMENTS.
+ * accessibility/AccessibilityMenuList.cpp:
+ (WebCore::AccessibilityMenuList::didUpdateActiveOption):
+ * platform/graphics/PixelBufferFormat.h: Include wtf/Optional.h.
+
2021-05-18 Kenneth Russell <k...@chromium.org>
Clean up code distinguishing between webgl/webgl2 contexts
Modified: trunk/Source/WebCore/PlatformPlayStation.cmake (277659 => 277660)
--- trunk/Source/WebCore/PlatformPlayStation.cmake 2021-05-18 17:32:22 UTC (rev 277659)
+++ trunk/Source/WebCore/PlatformPlayStation.cmake 2021-05-18 17:33:17 UTC (rev 277660)
@@ -82,11 +82,21 @@
WPE::libwpe
)
-PLAYSTATION_COPY_SHARED_LIBRARIES(WebCore_CopySharedLibs
+# Find the extras needed to copy for EGL besides the libraries
+set(EGL_EXTRAS)
+foreach (EGL_EXTRA_NAME ${EGL_EXTRA_NAMES})
+ find_file(${EGL_EXTRA_NAME}_FOUND ${EGL_EXTRA_NAME} PATH_SUFFIXES bin)
+ if (${EGL_EXTRA_NAME}_FOUND)
+ list(APPEND EGL_EXTRAS ${${EGL_EXTRA_NAME}_FOUND})
+ endif ()
+endforeach ()
+
+PLAYSTATION_COPY_REQUIREMENTS(WebCore_CopySharedLibs
FILES
${CURL_LIBRARIES}
${Cairo_LIBRARIES}
${EGL_LIBRARIES}
+ ${EGL_EXTRAS}
${FREETYPE_LIBRARIES}
${Fontconfig_LIBRARIES}
${HarfBuzz_LIBRARIES}
Modified: trunk/Source/WebCore/accessibility/AccessibilityMenuList.cpp (277659 => 277660)
--- trunk/Source/WebCore/accessibility/AccessibilityMenuList.cpp 2021-05-18 17:32:22 UTC (rev 277659)
+++ trunk/Source/WebCore/accessibility/AccessibilityMenuList.cpp 2021-05-18 17:33:17 UTC (rev 277660)
@@ -135,8 +135,10 @@
downcast<AccessibilityMenuListPopup>(*childObjects[0]).didUpdateActiveOption(optionIndex);
}
+#if ENABLE(ACCESSIBILITY)
if (auto* cache = document->axObjectCache())
cache->deferMenuListValueChange(element());
+#endif
}
} // namespace WebCore
Modified: trunk/Source/WebCore/platform/graphics/PixelBufferFormat.h (277659 => 277660)
--- trunk/Source/WebCore/platform/graphics/PixelBufferFormat.h 2021-05-18 17:32:22 UTC (rev 277659)
+++ trunk/Source/WebCore/platform/graphics/PixelBufferFormat.h 2021-05-18 17:33:17 UTC (rev 277660)
@@ -29,6 +29,7 @@
#include "ColorSpace.h"
#include "PixelFormat.h"
#include <wtf/Forward.h>
+#include <wtf/Optional.h>
namespace WebCore {
Modified: trunk/Source/cmake/OptionsPlayStation.cmake (277659 => 277660)
--- trunk/Source/cmake/OptionsPlayStation.cmake 2021-05-18 17:32:22 UTC (rev 277659)
+++ trunk/Source/cmake/OptionsPlayStation.cmake 2021-05-18 17:33:17 UTC (rev 277660)
@@ -206,6 +206,8 @@
COMMAND ${CMAKE_COMMAND} -E copy_directory
${WEBKIT_LIBRARIES_DIR}/tools/sce_sys/
${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/sce_sys/
+ COMMAND ${CMAKE_COMMAND} -E touch
+ ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/ebootparam.ini
)
macro(WEBKIT_EXECUTABLE _target)
@@ -223,7 +225,9 @@
add_dependencies(${_target} playstation_tools_copy)
endmacro()
-function(PLAYSTATION_COPY_SHARED_LIBRARIES target_name)
+set_property(GLOBAL PROPERTY playstation_copied_requirements)
+
+function(PLAYSTATION_COPY_REQUIREMENTS target_name)
set(oneValueArgs PREFIX DESTINATION)
set(multiValueArgs FILES)
cmake_parse_arguments(opt "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
@@ -238,35 +242,45 @@
set(destination ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
endif ()
- set(stub_libs)
+ set(files_to_copy)
list(REMOVE_DUPLICATES opt_FILES)
foreach (file IN LISTS opt_FILES)
- if (NOT ${file} MATCHES ".*_stub_weak.a")
+ if (NOT (${file} MATCHES ".*_stub_weak\.a" OR
+ ${file} MATCHES ".*\.sprx" OR
+ ${file} MATCHES ".*\.elf" OR
+ ${file} MATCHES ".*\.self"))
continue()
endif ()
file(RELATIVE_PATH _relative ${prefix} ${file})
if (NOT ${_relative} MATCHES "^\.\./.*")
get_filename_component(lib ${file} NAME)
- list(APPEND stub_libs ${lib})
+ list(APPEND files_to_copy ${lib})
endif ()
endforeach ()
- set(dst_shared_libs)
- foreach (lib IN LISTS stub_libs)
- string(REPLACE "_stub_weak.a" ".sprx" shared_lib ${lib})
- set(src_file "${prefix}/bin/${shared_lib}")
+ set(dst_requirements)
+ get_property(copied_requirements GLOBAL PROPERTY playstation_copied_requirements)
+ foreach (basefilename IN LISTS files_to_copy)
+ string(REPLACE "_stub_weak.a" ".sprx" filename ${basefilename})
+ set(src_file "${prefix}/bin/${filename}")
+ list(FIND copied_requirements ${src_file} found)
+ if (${found} GREATER_EQUAL 0)
+ continue()
+ endif ()
if (NOT EXISTS ${src_file})
continue()
endif ()
- set(dst_file "${destination}/${shared_lib}")
+ list(APPEND copied_requirements ${src_file})
+ set(dst_file "${destination}/${filename}")
add_custom_command(OUTPUT ${dst_file}
COMMAND ${CMAKE_COMMAND} -E copy ${src_file} ${dst_file}
MAIN_DEPENDENCY ${file}
VERBATIM
)
- list(APPEND dst_shared_libs ${dst_file})
+ list(APPEND dst_requirements ${dst_file})
endforeach ()
- add_custom_target(${target_name} ALL DEPENDS ${dst_shared_libs})
+ add_custom_target(${target_name} ALL DEPENDS ${dst_requirements})
+ set_property(GLOBAL PROPERTY playstation_copied_requirements ${copied_requirements} ${dst_requirements})
endfunction()
check_symbol_exists(memmem string.h HAVE_MEMMEM)
Modified: trunk/Tools/ChangeLog (277659 => 277660)
--- trunk/Tools/ChangeLog 2021-05-18 17:32:22 UTC (rev 277659)
+++ trunk/Tools/ChangeLog 2021-05-18 17:33:17 UTC (rev 277660)
@@ -1,3 +1,19 @@
+2021-05-18 Yoshiaki Jitsukawa <yoshiaki.jitsuk...@sony.com>
+
+ [PlayStation] Fix PlayStation port
+ https://bugs.webkit.org/show_bug.cgi?id=225913
+
+ Reviewed by Don Olmstead.
+
+ Fix PlayStation port
+
+ * MiniBrowser/playstation/CMakeLists.txt: Rename
+ PLAYSTATION_COPY_SHARED_LIBRARIES to PLAYSTATION_COPY_REQUIREMENTS.
+
+ * MiniBrowser/playstation/WebViewWindow.cpp:
+ (WebViewWindow::updateTitle): Add nullptr check.
+ (WebViewWindow::updateURL): Add nullptr check.
+
2021-05-17 Wenson Hsieh <wenson_hs...@apple.com>
[GPU Process] Object identifiers with the deleted value should cause MESSAGE_CHECKs
Modified: trunk/Tools/MiniBrowser/playstation/CMakeLists.txt (277659 => 277660)
--- trunk/Tools/MiniBrowser/playstation/CMakeLists.txt 2021-05-18 17:32:22 UTC (rev 277659)
+++ trunk/Tools/MiniBrowser/playstation/CMakeLists.txt 2021-05-18 17:33:17 UTC (rev 277660)
@@ -1,6 +1,6 @@
find_library(TOOLKIT_LIBRARY ToolKitten)
-PLAYSTATION_COPY_SHARED_LIBRARIES(MiniBrowser_CopySharedLibs
+PLAYSTATION_COPY_REQUIREMENTS(MiniBrowser_CopySharedLibs
FILES ${TOOLKIT_LIBRARY}
)
Modified: trunk/Tools/MiniBrowser/playstation/WebViewWindow.cpp (277659 => 277660)
--- trunk/Tools/MiniBrowser/playstation/WebViewWindow.cpp 2021-05-18 17:32:22 UTC (rev 277659)
+++ trunk/Tools/MiniBrowser/playstation/WebViewWindow.cpp 2021-05-18 17:33:17 UTC (rev 277660)
@@ -395,6 +395,9 @@
void WebViewWindow::updateTitle()
{
WKRetainPtr<WKStringRef> title = adoptWK(WKPageCopyTitle(page()));
+ if (!title)
+ return;
+
m_title = toUTF8String(title.get());
if (m_client.didUpdateTitle)
m_client.didUpdateTitle(this);
@@ -403,6 +406,9 @@
void WebViewWindow::updateURL()
{
WKRetainPtr<WKURLRef> url = ""
+ if (!url)
+ return;
+
WKRetainPtr<WKStringRef> urlStr = adoptWK(WKURLCopyString(url.get()));
m_url = toUTF8String(urlStr.get());
if (m_client.didUpdateURL)
