diff options
| author | Martin Stransky <stransky@redhat.com> | 2018-03-06 15:00:42 +0100 |
|---|---|---|
| committer | Martin Stransky <stransky@redhat.com> | 2018-03-06 15:00:42 +0100 |
| commit | bee8e7456aef10b3298647cb20f73f7b5803c852 (patch) | |
| tree | cbfc930f57395b21dcbc6b1cfe3fa562e165ee97 /mozilla-1433081.patch | |
| parent | Fix prefs because of rpm (diff) | |
| parent | Fix crash when e10s is disabled and default wl_queue is processed. (diff) | |
| download | librewolf-fedora-ff-bee8e7456aef10b3298647cb20f73f7b5803c852.tar.gz librewolf-fedora-ff-bee8e7456aef10b3298647cb20f73f7b5803c852.tar.bz2 librewolf-fedora-ff-bee8e7456aef10b3298647cb20f73f7b5803c852.zip | |
Merged with firefox-59
Diffstat (limited to 'mozilla-1433081.patch')
| -rw-r--r-- | mozilla-1433081.patch | 51 |
1 files changed, 51 insertions, 0 deletions
diff --git a/mozilla-1433081.patch b/mozilla-1433081.patch new file mode 100644 index 0000000..6677ff0 --- /dev/null +++ b/mozilla-1433081.patch @@ -0,0 +1,51 @@ +diff --git a/gfx/gl/GLContextProvider.h b/gfx/gl/GLContextProvider.h +--- a/gfx/gl/GLContextProvider.h ++++ b/gfx/gl/GLContextProvider.h +@@ -21,16 +21,18 @@ namespace gl { + + #define IN_GL_CONTEXT_PROVIDER_H + + // Null is always there + #define GL_CONTEXT_PROVIDER_NAME GLContextProviderNull + #include "GLContextProviderImpl.h" + #undef GL_CONTEXT_PROVIDER_NAME + ++#if !defined(MOZ_GL_PROVIDER) ++ + #ifdef XP_WIN + #define GL_CONTEXT_PROVIDER_NAME GLContextProviderWGL + #include "GLContextProviderImpl.h" + #undef GL_CONTEXT_PROVIDER_NAME + #define GL_CONTEXT_PROVIDER_DEFAULT GLContextProviderWGL + #define DEFAULT_IMPL WGL + #endif + +@@ -59,23 +61,27 @@ namespace gl { + #define GL_CONTEXT_PROVIDER_NAME GLContextProviderEAGL + #include "GLContextProviderImpl.h" + #undef GL_CONTEXT_PROVIDER_NAME + #ifndef GL_CONTEXT_PROVIDER_DEFAULT + #define GL_CONTEXT_PROVIDER_DEFAULT GLContextProviderEAGL + #endif + #endif + ++#else //defined(MOZ_GL_PROVIDER) ++ + #ifdef MOZ_GL_PROVIDER + #define GL_CONTEXT_PROVIDER_NAME MOZ_GL_PROVIDER + #include "GLContextProviderImpl.h" + #undef GL_CONTEXT_PROVIDER_NAME + #define GL_CONTEXT_PROVIDER_DEFAULT MOZ_GL_PROVIDER + #endif + ++#endif ++ + #ifdef GL_CONTEXT_PROVIDER_DEFAULT + typedef GL_CONTEXT_PROVIDER_DEFAULT GLContextProvider; + #else + typedef GLContextProviderNull GLContextProvider; + #endif + + #undef IN_GL_CONTEXT_PROVIDER_H + + |