Attachment 356701 Details for Bug 191998 – Patch

[patch] Patch

bug-191998-20181206044059.patch (text/plain), 4.57 KB, created by Carlos Bentzen on 2018-12-05 19:41:00 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Carlos Bentzen

Created: 2018-12-05 19:41:00 PST

Size: 4.57 KB

patch

obsolete

>Subversion Revision: 238917
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index afb02d7db945bb2672f6e42137d711e97a659297..8556920d41b97f0fd5dbbc19e195985fd28e0628 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,5 +1,19 @@
> 2018-12-05  Carlos Eduardo Ramalho  <cadubentzen@gmail.com>
> 
>+        [GStreamer] -DENABLE_VIDEO=ON -DENABLE_OPENGL=OFF still tries to build GstreamerGL
>+        https://bugs.webkit.org/show_bug.cgi?id=191998
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Fix compilation with -DENABLE_VIDEO=ON and -DENABLE_OPENGL=OFF due to GStreamerGL.
>+
>+        No new tests required. Only fixing the build with certain flags.
>+
>+        * Modules/mediastream/CanvasCaptureMediaStreamTrack.cpp:
>+        (WebCore::CanvasCaptureMediaStreamTrack::Source::canvasChanged): add required #if ENABLE(WEBGL).
>+
>+2018-12-05  Carlos Eduardo Ramalho  <cadubentzen@gmail.com>
>+
>         REGRESSION(r231043): [GTK] Undefined references to WebCore::LayerRepresentation::* with -DENABLE_OPENGL=OFF builds
>         https://bugs.webkit.org/show_bug.cgi?id=191997
> 
>diff --git a/Source/WebCore/Modules/mediastream/CanvasCaptureMediaStreamTrack.cpp b/Source/WebCore/Modules/mediastream/CanvasCaptureMediaStreamTrack.cpp
>index 56df8a66dead3e049c625c7ac4191c4a628f61bc..426c5d16cb014f78d8d88cf4291e1c1ecb49ab75 100644
>--- a/Source/WebCore/Modules/mediastream/CanvasCaptureMediaStreamTrack.cpp
>+++ b/Source/WebCore/Modules/mediastream/CanvasCaptureMediaStreamTrack.cpp
>@@ -143,6 +143,7 @@ void CanvasCaptureMediaStreamTrack::Source::canvasChanged(CanvasBase& canvas, co
> {
>     ASSERT_UNUSED(canvas, m_canvas == &canvas);
> 
>+#if ENABLE(WEBGL)
>     // FIXME: We need to preserve drawing buffer as we are currently grabbing frames asynchronously.
>     // We should instead add an anchor point for both 2d and 3d contexts where canvas will actually paint.
>     // And call canvas observers from that point.
>@@ -153,6 +154,7 @@ void CanvasCaptureMediaStreamTrack::Source::canvasChanged(CanvasBase& canvas, co
>             context.setPreserveDrawingBuffer(true);
>         }
>     }
>+#endif
> 
>     // FIXME: We should try to generate the frame at the time the screen is being updated.
>     if (m_canvasChangedTimer.isActive())
>diff --git a/Source/cmake/GStreamerDependencies.cmake b/Source/cmake/GStreamerDependencies.cmake
>index e141dda4a51e183302f233a0007a3d356e622cf0..61ee72358391ec94bcd1457ec45c61b446698195 100644
>--- a/Source/cmake/GStreamerDependencies.cmake
>+++ b/Source/cmake/GStreamerDependencies.cmake
>@@ -1,4 +1,4 @@
>-if (DEFINED ENABLE_OPENGL)
>+if (PORT STREQUAL "GTK")
>   WEBKIT_OPTION_DEPEND(USE_GSTREAMER_GL ENABLE_OPENGL)
> endif ()
> WEBKIT_OPTION_DEPEND(USE_GSTREAMER_GL ENABLE_VIDEO)
>diff --git a/Source/cmake/OptionsGTK.cmake b/Source/cmake/OptionsGTK.cmake
>index eefe02e31b1395957f010a4661478f6239e53b3a..58d00a05881018192872db33837ee0520bd9804f 100644
>--- a/Source/cmake/OptionsGTK.cmake
>+++ b/Source/cmake/OptionsGTK.cmake
>@@ -150,7 +150,7 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEDIA_STREAM PRIVATE ${ENABLE_EXPERIMENT
> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SERVICE_WORKER PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES})
> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_RTC PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES})
> 
>-include(GStreamerDefinitions)
>+include(GStreamerDependencies)
> 
> # Finalize the value for all options. Do not attempt to use an option before
> # this point, and do not attempt to change any option after this point.
>diff --git a/ChangeLog b/ChangeLog
>index fb8f4c4b4fe788d988e49b7305683a74f19e41c6..5811c7adb96d712b3def1b075317575a3a27cad5 100644
>--- a/ChangeLog
>+++ b/ChangeLog
>@@ -1,5 +1,19 @@
> 2018-12-05  Carlos Eduardo Ramalho  <cadubentzen@gmail.com>
> 
>+        [GStreamer] -DENABLE_VIDEO=ON -DENABLE_OPENGL=OFF still tries to build GstreamerGL
>+        https://bugs.webkit.org/show_bug.cgi?id=191998
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Fix compilation with -DENABLE_VIDEO=ON and -DENABLE_OPENGL=OFF due to GStreamerGL.
>+
>+        * Source/cmake/GStreamerDependencies.cmake: "DEFINED ENABLE_OPENGL" is always false because ENABLE_OPENGL
>+        is not a CMake variable (WEBKIT_OPTION_DEFINE macro does not define ENABLE_OPENGL variable per se, but other
>+        variables and appends it to a list).
>+        * Source/cmake/OptionsGTK.cmake: GStreamerDefinitions.cmake was included twice by mistake. Second should be GStreamerDependencies.cmake.
>+
>+2018-12-05  Carlos Eduardo Ramalho  <cadubentzen@gmail.com>
>+
>         REGRESSION(r231043): [GTK] Undefined references to WebCore::LayerRepresentation::* with -DENABLE_OPENGL=OFF builds
>         https://bugs.webkit.org/show_bug.cgi?id=191997
>

Actions: View | Formatted Diff | Diff

Attachments on bug 191998: 356701 | 356719