Attachment #370782 for bug #198093

View Details Raw Unified Return to Bug 198093

| Differences between



#include "JSContextRef.h"
#include <wtf/glib/GRefPtr.h>

JS_EXPORT_PRIVATE GRefPtr<JSCContext> jscContextGetOrCreate(JSGlobalContextRef);
JS_EXPORT_PRIVATE JSGlobalContextRef jscContextGetJSContext(JSCContext*);
JS_EXPORT_PRIVATE GRefPtr<JSCValue> jscContextGetOrCreateValue(JSCContext*, JSValueRef);
JS_EXPORT_PRIVATE void jscContextValueDestroyed(JSCContext*, JSValueRef);
JS_EXPORT_PRIVATE JSC::JSObject* jscContextGetJSWrapper(JSCContext*, gpointer); JSC::JSObject* jscContextGetOrCreateJSWrapper(JSCContext*, JSClassRef, JSValueRef prototype = nullptr, gpointer = nullptr, GDestroyNotify = nullptr);
JS_EXPORT_PRIVATE JSGlobalContextRef jscContextCreateContextWithJSWrapper(JSCContext*, JSClassRef, JSValueRef prototype = nullptr, gpointer = nullptr, GDestroyNotify = nullptr);
JS_EXPORT_PRIVATE gpointer jscContextWrappedObject(JSCContext*, JSObjectRef);
JS_EXPORT_PRIVATE JSCClass* jscContextGetRegisteredClass(JSCContext*, JSClassRef);
JSCClass* jscContextGetRegisteredClass(JSCContext*, JSClassRef);

struct CallbackData {
    GRefPtr<JSCContext> context;

Lines 21-25 a/Source/JavaScriptCore/API/glib/JSCValuePrivate.h_sec1
- a/Source/JavaScriptCore/API/glib/JSCValuePrivate.h -2 / +2 lines
21		21
22	#include "JSCValue.h"	22	#include "JSCValue.h"
23		23
24	JSValueRef jscValueGetJSValue(JSCValue*);	24	JS_EXPORT_PRIVATE JSValueRef jscValueGetJSValue(JSCValue*);
25	JSCValue* jscValueCreate(JSCContext*, JSValueRef);	25	JS_EXPORT_PRIVATE JSCValue* jscValueCreate(JSCContext*, JSValueRef);




class RemoteInspectorServer {
public:
    JS_EXPORT_PRIVATE static RemoteInspectorServer& singleton();
    JS_EXPORT_PRIVATE ~RemoteInspectorServer();

    JS_EXPORT_PRIVATE bool start(const char* address, unsigned port);
    bool isRunning() const { return !!m_dbusServer; }

private:

Lines 35-41 typedef struct _GBytes GBytes; a/Source/JavaScriptCore/inspector/remote/glib/RemoteInspectorUtils.h_sec1
- a/Source/JavaScriptCore/inspector/remote/glib/RemoteInspectorUtils.h -1 / +1 lines
35	namespace Inspector {	35	namespace Inspector {
36		36
37	GRefPtr<GBytes> backendCommands();	37	GRefPtr<GBytes> backendCommands();
38	const CString& backendCommandsHash();	38	JS_EXPORT_PRIVATE const CString& backendCommandsHash();
39		39
40	} // namespace Inspector	40	} // namespace Inspector
41		41



    explicit ContentType(const String& type);
    ContentType() = default;

    WEBCORE_EXPORT static const String& codecsParameter();
    static const String& profilesParameter();

    WEBCORE_EXPORT String parameter(const String& parameterName) const;
    WEBCORE_EXPORT String containerType() const;
    Vector<String> codecs() const;
    Vector<String> profiles() const;
    const String& raw() const { return m_type; }



    Preload preload() const;
    void setPreload(Preload);

    WEBCORE_EXPORT void networkStateChanged();
    WEBCORE_EXPORT void readyStateChanged();
    void volumeChanged(double);
    void muteChanged(bool);
    WEBCORE_EXPORT void timeChanged();
    void sizeChanged();
    void rateChanged();
    void playbackStateChanged();
    WEBCORE_EXPORT void durationChanged();
    void firstVideoFrameAvailable();
    void characteristicChanged();




    WTF_MAKE_FAST_ALLOCATED;
public:
    explicit PlatformTimeRanges() { }
    WEBCORE_EXPORT PlatformTimeRanges(const MediaTime& start, const MediaTime& end);

    WEBCORE_EXPORT MediaTime start(unsigned index) const;
    MediaTime start(unsigned index, bool& valid) const;
    WEBCORE_EXPORT MediaTime end(unsigned index) const;
    WEBCORE_EXPORT MediaTime end(unsigned index, bool& valid) const;
    MediaTime duration(unsigned index) const;
    MediaTime maximumBufferedTime() const;


    
    bool contain(const MediaTime&) const;

    WEBCORE_EXPORT size_t find(const MediaTime&) const;
    
    MediaTime nearest(const MediaTime&) const;

    WEBCORE_EXPORT MediaTime totalDuration() const;

    void dump(WTF::PrintStream&) const;


Lines 36-42 namespace WTF { a/Source/WebCore/platform/graphics/cairo/RefPtrCairo.h_sec1
- a/Source/WebCore/platform/graphics/cairo/RefPtrCairo.h -1 / +1 lines
36	template<> void refIfNotNull(cairo_t* ptr);	36	template<> void refIfNotNull(cairo_t* ptr);
37	template<> WEBCORE_EXPORT void derefIfNotNull(cairo_t* ptr);	37	template<> WEBCORE_EXPORT void derefIfNotNull(cairo_t* ptr);
38		38
39	template<> void refIfNotNull(cairo_surface_t* ptr);	39	template<> WEBCORE_EXPORT void refIfNotNull(cairo_surface_t* ptr);
40	template<> WEBCORE_EXPORT void derefIfNotNull(cairo_surface_t* ptr);	40	template<> WEBCORE_EXPORT void derefIfNotNull(cairo_surface_t* ptr);
41		41
42	template<> void refIfNotNull(cairo_font_face_t* ptr);	42	template<> void refIfNotNull(cairo_font_face_t* ptr);

Lines 34-39 a/Source/WebCore/platform/graphics/freetype/FontCacheFreeType.cpp_sec1
- a/Source/WebCore/platform/graphics/freetype/FontCacheFreeType.cpp +1 lines
34	#include "UTF16UChar32Iterator.h"	34	#include "UTF16UChar32Iterator.h"
35	#include <cairo-ft.h>	35	#include <cairo-ft.h>
36	#include <cairo.h>	36	#include <cairo.h>
		37	#include <fontconfig/fontconfig.h>
37	#include <fontconfig/fcfreetype.h>	38	#include <fontconfig/fcfreetype.h>
38	#include <wtf/Assertions.h>	39	#include <wtf/Assertions.h>
39	#include <wtf/text/CString.h>	40	#include <wtf/text/CString.h>

Lines 40-46 namespace WebCore { a/Source/WebCore/platform/network/soup/CertificateInfo.h_sec1
- a/Source/WebCore/platform/network/soup/CertificateInfo.h -1 / +1 lines
40	class ResourceError;	40	class ResourceError;
41	class ResourceResponse;	41	class ResourceResponse;
42		42
43	class CertificateInfo : public CertificateInfoBase {	43	class WEBCORE_EXPORT CertificateInfo : public CertificateInfoBase {
44	public:	44	public:
45	CertificateInfo();	45	CertificateInfo();
46	explicit CertificateInfo(const WebCore::ResourceResponse&);	46	explicit CertificateInfo(const WebCore::ResourceResponse&);

Lines 65-71 public: a/Source/WebCore/platform/network/soup/SoupNetworkSession.h_sec1
- a/Source/WebCore/platform/network/soup/SoupNetworkSession.h -1 / +1 lines
65	static void setInitialAcceptLanguages(const CString&);	65	static void setInitialAcceptLanguages(const CString&);
66	void setAcceptLanguages(const CString&);	66	void setAcceptLanguages(const CString&);
67		67
68	static void setShouldIgnoreTLSErrors(bool);	68	WEBCORE_EXPORT static void setShouldIgnoreTLSErrors(bool);
69	static Optional<ResourceError> checkTLSErrors(const URL&, GTlsCertificate*, GTlsCertificateFlags);	69	static Optional<ResourceError> checkTLSErrors(const URL&, GTlsCertificate*, GTlsCertificateFlags);
70	static void allowSpecificHTTPSCertificateForHost(const CertificateInfo&, const String& host);	70	static void allowSpecificHTTPSCertificateForHost(const CertificateInfo&, const String& host);
71		71



#ifndef InputMethodFilter_h
#define InputMethodFilter_h

#include "WKDeclarationSpecifiers.h"
#include <WebCore/IntPoint.h>
#include <wtf/Function.h>
#include <wtf/Noncopyable.h>

        EventNotFaked
    };

    WK_EXPORT InputMethodFilter();
    WK_EXPORT ~InputMethodFilter();

    GtkIMContext* context() const { return m_context.get(); }

    void setPage(WebPageProxy* page) { m_page = page; }

    WK_EXPORT void setEnabled(bool);
    void setCursorRect(const WebCore::IntRect&);

    using FilterKeyEventCompletionHandler = Function<void(const WebCore::CompositionResults&, InputMethodFilter::EventFakedForComposition)>;
    WK_EXPORT void filterKeyEvent(GdkEventKey*, FilterKeyEventCompletionHandler&& = nullptr);
    WK_EXPORT void notifyFocusedIn();
    WK_EXPORT void notifyFocusedOut();
    WK_EXPORT void notifyMouseButtonPress();

#if ENABLE(API_TESTS)
    void setTestingMode(bool enable) { m_testingMode = enable; }

Lines 194-199 set(GDK_INCLUDE_DIRS ${GDK3_INCLUDE_DIRS}) a/Source/cmake/OptionsGTK.cmake_sec1
- a/Source/cmake/OptionsGTK.cmake +2 lines
194	SET_AND_EXPOSE_TO_BUILD(HAVE_GTK_GESTURES ${GTK3_SUPPORTS_GESTURES})	194	SET_AND_EXPOSE_TO_BUILD(HAVE_GTK_GESTURES ${GTK3_SUPPORTS_GESTURES})
195	SET_AND_EXPOSE_TO_BUILD(HAVE_GTK_UNIX_PRINTING ${GTKUnixPrint_FOUND})	195	SET_AND_EXPOSE_TO_BUILD(HAVE_GTK_UNIX_PRINTING ${GTKUnixPrint_FOUND})
196	SET_AND_EXPOSE_TO_BUILD(HAVE_OS_DARK_MODE_SUPPORT 1)	196	SET_AND_EXPOSE_TO_BUILD(HAVE_OS_DARK_MODE_SUPPORT 1)
		197	SET_AND_EXPOSE_TO_BUILD(USE_EXPORT_MACROS ON)
		198	SET_AND_EXPOSE_TO_BUILD(BUSE_EXPORT_MACROS ON)
197		199
198	set(glib_components gio gio-unix gobject gthread gmodule)	200	set(glib_components gio gio-unix gobject gthread gmodule)
199	find_package(GLIB 2.36 REQUIRED COMPONENTS ${glib_components})	201	find_package(GLIB 2.36 REQUIRED COMPONENTS ${glib_components})

Lines 103-108 if (COMPILER_IS_GCC_OR_CLANG) a/Source/cmake/WebKitCompilerFlags.cmake_sec1
- a/Source/cmake/WebKitCompilerFlags.cmake +1 lines
103	else ()	103	else ()
104	WEBKIT_APPEND_GLOBAL_COMPILER_FLAGS(-fno-exceptions)	104	WEBKIT_APPEND_GLOBAL_COMPILER_FLAGS(-fno-exceptions)
105	WEBKIT_APPEND_GLOBAL_CXX_FLAGS(-fno-rtti)	105	WEBKIT_APPEND_GLOBAL_CXX_FLAGS(-fno-rtti)
		106	WEBKIT_APPEND_GLOBAL_COMPILER_FLAGS(-fvisibility=hidden)
106		107
107	check_cxx_compiler_flag("-std=c++17" CXX_COMPILER_SUPPORTS_CXX17)	108	check_cxx_compiler_flag("-std=c++17" CXX_COMPILER_SUPPORTS_CXX17)
108	if (CXX_COMPILER_SUPPORTS_CXX17)	109	if (CXX_COMPILER_SUPPORTS_CXX17)

Lines 32-37 a/Tools/TestWebKitAPI/InjectedBundleMain.cpp_sec1
- a/Tools/TestWebKitAPI/InjectedBundleMain.cpp +2 lines
32		32
33	#if defined(WIN32) \|\| defined(_WIN32)	33	#if defined(WIN32) \|\| defined(_WIN32)
34	extern "C" __declspec(dllexport)	34	extern "C" __declspec(dllexport)
		35	#elif defined(unix) \|\| defined(__unix) // TODO Not sure how this was also working before
		36	extern "C" __attribute__((visibility("default")))
35	#else	37	#else
36	extern "C"	38	extern "C"
37	#endif	39	#endif

Lines 30-35 a/Tools/WebKitTestRunner/InjectedBundle/InjectedBundleMain.cpp_sec1
- a/Tools/WebKitTestRunner/InjectedBundle/InjectedBundleMain.cpp +2 lines
30		30
31	#if defined(WIN32)	31	#if defined(WIN32)
32	extern "C" __declspec(dllexport)	32	extern "C" __declspec(dllexport)
		33	#elif defined(unix) \|\| defined(__unix) // TODO Not sure how these worked before
		34	extern "C" __attribute__((visibility("default")))
33	#else	35	#else
34	extern "C"	36	extern "C"
35	#endif	37	#endif

Return to Bug 198093

Lines 402-416 public: a/Source/WebCore/platform/graphics/MediaPlayer.h_sec1
- a/Source/WebCore/platform/graphics/MediaPlayer.h -4 / +4 lines
402	Preload preload() const;	402	Preload preload() const;
403	void setPreload(Preload);	403	void setPreload(Preload);
404		404
405	void networkStateChanged();	405	WEBCORE_EXPORT void networkStateChanged();
406	void readyStateChanged();	406	WEBCORE_EXPORT void readyStateChanged();
407	void volumeChanged(double);	407	void volumeChanged(double);
408	void muteChanged(bool);	408	void muteChanged(bool);
409	void timeChanged();	409	WEBCORE_EXPORT void timeChanged();
410	void sizeChanged();	410	void sizeChanged();
411	void rateChanged();	411	void rateChanged();
412	void playbackStateChanged();	412	void playbackStateChanged();
413	void durationChanged();	413	WEBCORE_EXPORT void durationChanged();
414	void firstVideoFrameAvailable();	414	void firstVideoFrameAvailable();
415	void characteristicChanged();	415	void characteristicChanged();
416		416

Lines 25-39 a/Source/JavaScriptCore/API/glib/JSCContextPrivate.h_sec1
- a/Source/JavaScriptCore/API/glib/JSCContextPrivate.h -9 / +8 lines
25	#include "JSContextRef.h"	25	#include "JSContextRef.h"
26	#include <wtf/glib/GRefPtr.h>	26	#include <wtf/glib/GRefPtr.h>
27		27
28	GRefPtr<JSCContext> jscContextGetOrCreate(JSGlobalContextRef);	28	JS_EXPORT_PRIVATE GRefPtr<JSCContext> jscContextGetOrCreate(JSGlobalContextRef);
29	JSGlobalContextRef jscContextGetJSContext(JSCContext*);	29	JS_EXPORT_PRIVATE JSGlobalContextRef jscContextGetJSContext(JSCContext*);
30	GRefPtr<JSCValue> jscContextGetOrCreateValue(JSCContext*, JSValueRef);	30	JS_EXPORT_PRIVATE GRefPtr<JSCValue> jscContextGetOrCreateValue(JSCContext*, JSValueRef);
31	void jscContextValueDestroyed(JSCContext*, JSValueRef);	31	JS_EXPORT_PRIVATE void jscContextValueDestroyed(JSCContext*, JSValueRef);
32	JSC::JSObject* jscContextGetJSWrapper(JSCContext*, gpointer);	32	JS_EXPORT_PRIVATE JSC::JSObject* jscContextGetJSWrapper(JSCContext, gpointer); JSC::JSObject jscContextGetOrCreateJSWrapper(JSCContext*, JSClassRef, JSValueRef prototype = nullptr, gpointer = nullptr, GDestroyNotify = nullptr);
33	JSC::JSObject* jscContextGetOrCreateJSWrapper(JSCContext*, JSClassRef, JSValueRef prototype = nullptr, gpointer = nullptr, GDestroyNotify = nullptr);	33	JS_EXPORT_PRIVATE JSGlobalContextRef jscContextCreateContextWithJSWrapper(JSCContext*, JSClassRef, JSValueRef prototype = nullptr, gpointer = nullptr, GDestroyNotify = nullptr);
34	JSGlobalContextRef jscContextCreateContextWithJSWrapper(JSCContext*, JSClassRef, JSValueRef prototype = nullptr, gpointer = nullptr, GDestroyNotify = nullptr);	34	JS_EXPORT_PRIVATE gpointer jscContextWrappedObject(JSCContext*, JSObjectRef);
35	gpointer jscContextWrappedObject(JSCContext*, JSObjectRef);	35	JS_EXPORT_PRIVATE JSCClass* jscContextGetRegisteredClass(JSCContext*, JSClassRef);
36	JSCClass* jscContextGetRegisteredClass(JSCContext*, JSClassRef);
37		36
38	struct CallbackData {	37	struct CallbackData {
39	GRefPtr<JSCContext> context;	38	GRefPtr<JSCContext> context;

Lines 44-53 namespace Inspector { a/Source/JavaScriptCore/inspector/remote/glib/RemoteInspectorServer.h_sec1
- a/Source/JavaScriptCore/inspector/remote/glib/RemoteInspectorServer.h -3 / +3 lines
44		44
45	class RemoteInspectorServer {	45	class RemoteInspectorServer {
46	public:	46	public:
47	static RemoteInspectorServer& singleton();	47	JS_EXPORT_PRIVATE static RemoteInspectorServer& singleton();
48	~RemoteInspectorServer();	48	JS_EXPORT_PRIVATE ~RemoteInspectorServer();
49		49
50	bool start(const char* address, unsigned port);	50	JS_EXPORT_PRIVATE bool start(const char* address, unsigned port);
51	bool isRunning() const { return !!m_dbusServer; }	51	bool isRunning() const { return !!m_dbusServer; }
52		52
53	private:	53	private:

Lines 37-47 public: a/Source/WebCore/platform/ContentType.h_sec1
- a/Source/WebCore/platform/ContentType.h -3 / +3 lines
37	explicit ContentType(const String& type);	37	explicit ContentType(const String& type);
38	ContentType() = default;	38	ContentType() = default;
39		39
40	static const String& codecsParameter();	40	WEBCORE_EXPORT static const String& codecsParameter();
41	static const String& profilesParameter();	41	static const String& profilesParameter();
42		42
43	String parameter(const String& parameterName) const;	43	WEBCORE_EXPORT String parameter(const String& parameterName) const;
44	String containerType() const;	44	WEBCORE_EXPORT String containerType() const;
45	Vector<String> codecs() const;	45	Vector<String> codecs() const;
46	Vector<String> profiles() const;	46	Vector<String> profiles() const;
47	const String& raw() const { return m_type; }	47	const String& raw() const { return m_type; }

Lines 40-51 class PlatformTimeRanges { a/Source/WebCore/platform/graphics/PlatformTimeRanges.h_sec1
- a/Source/WebCore/platform/graphics/PlatformTimeRanges.h -4 / +4 lines
40	WTF_MAKE_FAST_ALLOCATED;	40	WTF_MAKE_FAST_ALLOCATED;
41	public:	41	public:
42	explicit PlatformTimeRanges() { }	42	explicit PlatformTimeRanges() { }
43	PlatformTimeRanges(const MediaTime& start, const MediaTime& end);	43	WEBCORE_EXPORT PlatformTimeRanges(const MediaTime& start, const MediaTime& end);
44		44
45	WEBCORE_EXPORT MediaTime start(unsigned index) const;	45	WEBCORE_EXPORT MediaTime start(unsigned index) const;
46	MediaTime start(unsigned index, bool& valid) const;	46	MediaTime start(unsigned index, bool& valid) const;
47	WEBCORE_EXPORT MediaTime end(unsigned index) const;	47	WEBCORE_EXPORT MediaTime end(unsigned index) const;
48	MediaTime end(unsigned index, bool& valid) const;	48	WEBCORE_EXPORT MediaTime end(unsigned index, bool& valid) const;
49	MediaTime duration(unsigned index) const;	49	MediaTime duration(unsigned index) const;
50	MediaTime maximumBufferedTime() const;	50	MediaTime maximumBufferedTime() const;
51		51
Lines 59-69 public: a/Source/WebCore/platform/graphics/PlatformTimeRanges.h_sec2
59		59
60	bool contain(const MediaTime&) const;	60	bool contain(const MediaTime&) const;
61		61
62	size_t find(const MediaTime&) const;	62	WEBCORE_EXPORT size_t find(const MediaTime&) const;
63		63
64	MediaTime nearest(const MediaTime&) const;	64	MediaTime nearest(const MediaTime&) const;
65		65
66	MediaTime totalDuration() const;	66	WEBCORE_EXPORT MediaTime totalDuration() const;
67		67
68	void dump(WTF::PrintStream&) const;	68	void dump(WTF::PrintStream&) const;
69		69

Lines 20-25 a/Source/WebKit/UIProcess/gtk/InputMethodFilter.h_sec1
- a/Source/WebKit/UIProcess/gtk/InputMethodFilter.h -7 / +8 lines
20	#ifndef InputMethodFilter_h	20	#ifndef InputMethodFilter_h
21	#define InputMethodFilter_h	21	#define InputMethodFilter_h
22		22
		23	#include "WKDeclarationSpecifiers.h"
23	#include <WebCore/IntPoint.h>	24	#include <WebCore/IntPoint.h>
24	#include <wtf/Function.h>	25	#include <wtf/Function.h>
25	#include <wtf/Noncopyable.h>	26	#include <wtf/Noncopyable.h>
Lines 46-66 public: a/Source/WebKit/UIProcess/gtk/InputMethodFilter.h_sec2
46	EventNotFaked	47	EventNotFaked
47	};	48	};
48		49
49	InputMethodFilter();	50	WK_EXPORT InputMethodFilter();
50	~InputMethodFilter();	51	WK_EXPORT ~InputMethodFilter();
51		52
52	GtkIMContext* context() const { return m_context.get(); }	53	GtkIMContext* context() const { return m_context.get(); }
53		54
54	void setPage(WebPageProxy* page) { m_page = page; }	55	void setPage(WebPageProxy* page) { m_page = page; }
55		56
56	void setEnabled(bool);	57	WK_EXPORT void setEnabled(bool);
57	void setCursorRect(const WebCore::IntRect&);	58	void setCursorRect(const WebCore::IntRect&);
58		59
59	using FilterKeyEventCompletionHandler = Function<void(const WebCore::CompositionResults&, InputMethodFilter::EventFakedForComposition)>;	60	using FilterKeyEventCompletionHandler = Function<void(const WebCore::CompositionResults&, InputMethodFilter::EventFakedForComposition)>;
60	void filterKeyEvent(GdkEventKey*, FilterKeyEventCompletionHandler&& = nullptr);	61	WK_EXPORT void filterKeyEvent(GdkEventKey*, FilterKeyEventCompletionHandler&& = nullptr);
61	void notifyFocusedIn();	62	WK_EXPORT void notifyFocusedIn();
62	void notifyFocusedOut();	63	WK_EXPORT void notifyFocusedOut();
63	void notifyMouseButtonPress();	64	WK_EXPORT void notifyMouseButtonPress();
64		65
65	#if ENABLE(API_TESTS)	66	#if ENABLE(API_TESTS)
66	void setTestingMode(bool enable) { m_testingMode = enable; }	67	void setTestingMode(bool enable) { m_testingMode = enable; }