Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
webkit2-gtk-devel: reconcile with webkit2-gtk
- Loading branch information
Showing
15 changed files
with
223 additions
and
127 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
10 changes: 0 additions & 10 deletions
10
www/webkit2-gtk-devel/files/NSApplicationActivationPolicy.mm
This file was deleted.
Oops, something went wrong.
37 changes: 37 additions & 0 deletions
37
www/webkit2-gtk-devel/files/patch-WTF-wtf-getVTablePointer.diff
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| diff --git Source/WTF/wtf/PointerPreparations.h Source/WTF/wtf/PointerPreparations.h | ||
| index ef20a5e48512..ef9495169ff4 100644 | ||
| --- Source/WTF/wtf/PointerPreparations.h | ||
| +++ Source/WTF/wtf/PointerPreparations.h | ||
| @@ -34,16 +34,16 @@ namespace WTF { | ||
| #if COMPILER_HAS_CLANG_BUILTIN(__builtin_get_vtable_pointer) | ||
|
|
||
| template<typename T> | ||
| -ALWAYS_INLINE void* getVTablePointer(T* o) { return __builtin_get_vtable_pointer(o); } | ||
| +ALWAYS_INLINE const void* getVTablePointer(T* o) { return __builtin_get_vtable_pointer(o); } | ||
|
|
||
| #else // not COMPILER_HAS_CLANG_BUILTIN(__builtin_get_vtable_pointer) | ||
|
|
||
| #if CPU(ARM64E) | ||
| template<typename T> | ||
| -ALWAYS_INLINE void* getVTablePointer(T* o) { return __builtin_ptrauth_auth(*(reinterpret_cast<void**>(o)), ptrauth_key_cxx_vtable_pointer, 0); } | ||
| +ALWAYS_INLINE const void* getVTablePointer(T* o) { return __builtin_ptrauth_auth(*(reinterpret_cast<void**>(o)), ptrauth_key_cxx_vtable_pointer, 0); } | ||
| #else // not CPU(ARM64E) | ||
| template<typename T> | ||
| -ALWAYS_INLINE void* getVTablePointer(T* o) { return (*(reinterpret_cast<void**>(o))); } | ||
| +ALWAYS_INLINE const void* getVTablePointer(T* o) { return (*(reinterpret_cast<void**>(o))); } | ||
| #endif // not CPU(ARM64E) | ||
|
|
||
| #endif // not COMPILER_HAS_CLANG_BUILTIN(__builtin_get_vtable_pointer) | ||
| diff --git Source/WebCore/bindings/scripts/CodeGeneratorJS.pm Source/WebCore/bindings/scripts/CodeGeneratorJS.pm | ||
| index 35db4d28ccd6..03dd9c161a83 100644 | ||
| --- Source/WebCore/bindings/scripts/CodeGeneratorJS.pm | ||
| +++ Source/WebCore/bindings/scripts/CodeGeneratorJS.pm | ||
| @@ -4881,7 +4881,7 @@ END | ||
| push(@implContent, <<END) if $vtableNameGnu; | ||
|
|
||
| #if ENABLE(BINDING_INTEGRITY) | ||
| - void* actualVTablePointer = getVTablePointer(impl.ptr()); | ||
| + const void* actualVTablePointer = getVTablePointer(impl.ptr()); | ||
| #if PLATFORM(WIN) | ||
| void* expectedVTablePointer = ${vtableRefWin}; | ||
| #else |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| --- Source/WebCore/style/StyleResolver.cpp | ||
| +++ Source/WebCore/style/StyleResolver.cpp | ||
| @@ -107,7 +107,7 @@ Resolver::Resolver(Document& document) | ||
| if (view) | ||
| m_mediaQueryEvaluator = MediaQueryEvaluator { view->mediaType() }; | ||
| else | ||
| - m_mediaQueryEvaluator = MediaQueryEvaluator { "all" }; | ||
| + m_mediaQueryEvaluator = MediaQueryEvaluator { "all", false }; | ||
|
|
||
| if (root) { | ||
| m_rootDefaultStyle = styleForElement(*root, m_document.renderStyle(), nullptr, RuleMatchingBehavior::MatchOnlyUserAgentRules).renderStyle; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
www/webkit2-gtk-devel/files/patch-enable-plugin-architecture-unix.diff
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
22 changes: 22 additions & 0 deletions
22
www/webkit2-gtk-devel/files/patch-webkit2gtk-2282-os-log-availability.diff
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| diff --git Source/ThirdParty/ANGLE/src/common/debug.cpp Source/ThirdParty/ANGLE/src/common/debug.cpp | ||
| index c26815d3..b07914be 100644 | ||
| --- Source/ThirdParty/ANGLE/src/common/debug.cpp | ||
| +++ Source/ThirdParty/ANGLE/src/common/debug.cpp | ||
| @@ -21,7 +21,7 @@ | ||
| # include <android/log.h> | ||
| #endif | ||
|
|
||
| -#if defined(ANGLE_PLATFORM_APPLE) | ||
| +#if defined(ANGLE_PLATFORM_APPLE) && MAC_OS_X_VERSION_MAX_ALLOWED > 101200 | ||
| # include <os/log.h> | ||
| #endif | ||
|
|
||
| @@ -232,7 +232,7 @@ void Trace(LogSeverity severity, const char *message) | ||
| } | ||
| __android_log_print(android_priority, "ANGLE", "%s: %s\n", LogSeverityName(severity), | ||
| str.c_str()); | ||
| -#elif defined(ANGLE_PLATFORM_APPLE) | ||
| +#elif defined(ANGLE_PLATFORM_APPLE) && MAC_OS_X_VERSION_MAX_ALLOWED > 101200 | ||
| if (__builtin_available(macOS 10.12, iOS 10.0, *)) | ||
| { | ||
| os_log_type_t apple_log_type = OS_LOG_TYPE_DEFAULT; |
68 changes: 68 additions & 0 deletions
68
www/webkit2-gtk-devel/files/patch-webkit2gtk-2282-unprotected-egl-changes.diff
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,68 @@ | ||
| These changes were added in | ||
| <https://github.com/WebKit/webkit/commit/c7d6af038dcbfac95d0af4f43fbb945d73f6b1bb> | ||
|
|
||
| they don't compile, as they use EGL unprotected, but even when some of them were protected by USE(EGL) there were | ||
| errors when trying to play videos in the MiniBrowser. So I added protection to all the addition bits in | ||
| the commit that were not initially protected. | ||
|
|
||
|
|
||
| diff --git Source/WebCore/platform/graphics/gstreamer/GRefPtrGStreamer.cpp Source/WebCore/platform/graphics/gstreamer/GRefPtrGStreamer.cpp | ||
| index ad632205..29a9eace 100644 | ||
| --- Source/WebCore/platform/graphics/gstreamer/GRefPtrGStreamer.cpp | ||
| +++ Source/WebCore/platform/graphics/gstreamer/GRefPtrGStreamer.cpp | ||
| @@ -23,7 +23,7 @@ | ||
| #if USE(GSTREAMER) | ||
| #include <gst/gst.h> | ||
|
|
||
| -#if USE(GSTREAMER_GL) | ||
| +#if USE(WPE_VIDEO_PLANE_DISPLAY_DMABUF) | ||
| #include <gst/gl/egl/gsteglimage.h> | ||
| #endif | ||
|
|
||
| @@ -508,6 +508,7 @@ template<> void derefGPtr<GstGLContext>(GstGLContext* ptr) | ||
| gst_object_unref(GST_OBJECT(ptr)); | ||
| } | ||
|
|
||
| +#if USE(WPE_VIDEO_PLANE_DISPLAY_DMABUF) | ||
| template <> GRefPtr<GstEGLImage> adoptGRef(GstEGLImage* ptr) | ||
| { | ||
| return GRefPtr<GstEGLImage>(ptr, GRefPtrAdopt); | ||
| @@ -525,6 +526,7 @@ template <> void derefGPtr<GstEGLImage>(GstEGLImage* ptr) | ||
| if (ptr) | ||
| gst_egl_image_unref(ptr); | ||
| } | ||
| +#endif //USE(WPE_VIDEO_PLANE_DISPLAY_DMABUF) | ||
|
|
||
| #endif // USE(GSTREAMER_GL) | ||
|
|
||
| diff --git Source/WebCore/platform/graphics/gstreamer/GRefPtrGStreamer.h Source/WebCore/platform/graphics/gstreamer/GRefPtrGStreamer.h | ||
| index d940f8ca..bda2f024 100644 | ||
| --- Source/WebCore/platform/graphics/gstreamer/GRefPtrGStreamer.h | ||
| +++ Source/WebCore/platform/graphics/gstreamer/GRefPtrGStreamer.h | ||
| @@ -30,9 +30,13 @@ typedef struct _WebKitWebSrc WebKitWebSrc; | ||
| #if USE(GSTREAMER_GL) | ||
| typedef struct _GstGLDisplay GstGLDisplay; | ||
| typedef struct _GstGLContext GstGLContext; | ||
| + | ||
| +#if USE(WPE_VIDEO_PLANE_DISPLAY_DMABUF) | ||
| typedef struct _GstEGLImage GstEGLImage; | ||
| #endif | ||
|
|
||
| +#endif | ||
| + | ||
| namespace WTF { | ||
|
|
||
| template<> GRefPtr<GstPlugin> adoptGRef(GstPlugin* ptr); | ||
| @@ -133,9 +137,12 @@ template<> GRefPtr<GstGLContext> adoptGRef(GstGLContext* ptr); | ||
| template<> GstGLContext* refGPtr<GstGLContext>(GstGLContext* ptr); | ||
| template<> void derefGPtr<GstGLContext>(GstGLContext* ptr); | ||
|
|
||
| +#if USE(WPE_VIDEO_PLANE_DISPLAY_DMABUF) | ||
| template<> GRefPtr<GstEGLImage> adoptGRef(GstEGLImage* ptr); | ||
| template<> GstEGLImage* refGPtr<GstEGLImage>(GstEGLImage* ptr); | ||
| template<> void derefGPtr<GstEGLImage>(GstEGLImage* ptr); | ||
| +#endif // USE(WPE_VIDEO_PLANE_DISPLAY_DMABUF) | ||
| + | ||
| #endif | ||
|
|
||
| } // namespace WTF |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.