Skip to content

Instantly share code, notes, and snippets.

@vitallium
Created June 6, 2016 17:27
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save vitallium/0b1dde194ec54dbcfc8b8d89852448c0 to your computer and use it in GitHub Desktop.
Save vitallium/0b1dde194ec54dbcfc8b8d89852448c0 to your computer and use it in GitHub Desktop.
diff --git a/Source/JavaScriptCore/parser/SourceProvider.h b/Source/JavaScriptCore/parser/SourceProvider.h
index 914251c..1a9a6bd 100644
--- a/Source/JavaScriptCore/parser/SourceProvider.h
+++ b/Source/JavaScriptCore/parser/SourceProvider.h
@@ -88,7 +88,7 @@ namespace JSC {
return adoptRef(*new StringSourceProvider(source, url, startPosition));
}
- ~StringSourceProvider() override;
+ JS_EXPORT_PRIVATE ~StringSourceProvider() override;
unsigned hash() const override
{
diff --git a/Source/WTF/wtf/DateMath.h b/Source/WTF/wtf/DateMath.h
index 73889a5..0e1f449 100644
--- a/Source/WTF/wtf/DateMath.h
+++ b/Source/WTF/wtf/DateMath.h
@@ -94,7 +94,7 @@ WTF_EXPORT_PRIVATE double parseDateFromNullTerminatedCharacters(const char* date
WTF_EXPORT_PRIVATE double parseDateFromNullTerminatedCharacters(const char* dateString, bool& haveTZ, int& offset);
WTF_EXPORT_PRIVATE double timeClip(double);
// dayOfWeek: [0, 6] 0 being Monday, day: [1, 31], month: [0, 11], year: ex: 2011, hours: [0, 23], minutes: [0, 59], seconds: [0, 59], utcOffset: [-720,720].
-String makeRFC2822DateString(unsigned dayOfWeek, unsigned day, unsigned month, unsigned year, unsigned hours, unsigned minutes, unsigned seconds, int utcOffset);
+WTF_EXPORT_PRIVATE String makeRFC2822DateString(unsigned dayOfWeek, unsigned day, unsigned month, unsigned year, unsigned hours, unsigned minutes, unsigned seconds, int utcOffset);
inline double jsCurrentTime()
{
diff --git a/Source/WebCore/bindings/js/JSDeviceMotionEventCustom.cpp b/Source/WebCore/bindings/js/JSDeviceMotionEventCustom.cpp
index e8399a5..1ff3e43 100644
--- a/Source/WebCore/bindings/js/JSDeviceMotionEventCustom.cpp
+++ b/Source/WebCore/bindings/js/JSDeviceMotionEventCustom.cpp
@@ -29,6 +29,8 @@
#include "JSDeviceMotionEvent.h"
+#include "JSDOMBinding.h"
+
#include "DeviceMotionData.h"
#include "DeviceMotionEvent.h"
#include <runtime/IdentifierInlines.h>
diff --git a/Source/cmake/OptionsQt.cmake b/Source/cmake/OptionsQt.cmake
index c30247c..49edaf7 100644
--- a/Source/cmake/OptionsQt.cmake
+++ b/Source/cmake/OptionsQt.cmake
@@ -19,6 +19,13 @@ else ()
set(USE_QT_MULTIMEDIA_DEFAULT OFF)
endif ()
+# custom WebKit options
+if (WIN32)
+ set(ENABLE_GAMEPAD_DEPRECATED_DEFAULT OFF)
+else ()
+ set(ENABLE_GAMEPAD_DEPRECATED_DEFAULT ON)
+endif ()
+
if (WTF_CPU_X86_64 AND NOT WIN32)
set(ENABLE_FTL_DEFAULT ON)
else ()
@@ -39,7 +46,7 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DATABASE_PROCESS PUBLIC OFF)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DATALIST_ELEMENT PUBLIC ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DEVICE_ORIENTATION PUBLIC ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FULLSCREEN_API PUBLIC OFF)
-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_GAMEPAD_DEPRECATED PUBLIC ON)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_GAMEPAD_DEPRECATED PUBLIC ${ENABLE_GAMEPAD_DEPRECATED_DEFAULT})
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INDEXED_DATABASE PUBLIC ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LEGACY_WEB_AUDIO PUBLIC ${USE_GSTREAMER_DEFAULT})
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LINK_PREFETCH PUBLIC ON)
@annulen
Copy link

annulen commented Jun 6, 2016

if (CMAKE_SYSTEM_NAME MATCHES "Linux")
    set(ENABLE_GAMEPAD_DEPRECATED_DEFAULT ON)
else ()
    set(ENABLE_GAMEPAD_DEPRECATED_DEFAULT OFF)
endif ()

@annulen
Copy link

annulen commented Jun 6, 2016

Also I think we should stop using exports in WTF, JSC, and WebCore. There is cmake option to export everything, it should be used for SHARED_CORE builds, and production builds should link all these libs statically

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment