Title: [258132] releases/WebKitGTK/webkit-2.28/Source
Revision
258132
Author
[email protected]
Date
2020-03-09 02:50:12 -0700 (Mon, 09 Mar 2020)

Log Message

Merge r258103 - [GTK] Fix compilation with disabled OpenGL
https://bugs.webkit.org/show_bug.cgi?id=208773

Reviewed by Yusuke Suzuki.

Source/WebCore:

* html/OffscreenCanvas.h:

Source/WebKit:

* UIProcess/API/glib/WebKitProtocolHandler.cpp:
(WebKit::WebKitProtocolHandler::handleGPU):

Modified Paths

Diff

Modified: releases/WebKitGTK/webkit-2.28/Source/WebCore/ChangeLog (258131 => 258132)


--- releases/WebKitGTK/webkit-2.28/Source/WebCore/ChangeLog	2020-03-09 08:39:44 UTC (rev 258131)
+++ releases/WebKitGTK/webkit-2.28/Source/WebCore/ChangeLog	2020-03-09 09:50:12 UTC (rev 258132)
@@ -1,3 +1,12 @@
+2020-03-08  Konstantin Tokarev  <[email protected]>
+
+        [GTK] Fix compilation with disabled OpenGL
+        https://bugs.webkit.org/show_bug.cgi?id=208773
+
+        Reviewed by Yusuke Suzuki.
+
+        * html/OffscreenCanvas.h:
+
 2020-03-06  Enrique Ocaña González  <[email protected]>
 
         [GStreamer] Streaming aac/mp3 audio doesn't always work

Modified: releases/WebKitGTK/webkit-2.28/Source/WebCore/html/OffscreenCanvas.h (258131 => 258132)


--- releases/WebKitGTK/webkit-2.28/Source/WebCore/html/OffscreenCanvas.h	2020-03-09 08:39:44 UTC (rev 258131)
+++ releases/WebKitGTK/webkit-2.28/Source/WebCore/html/OffscreenCanvas.h	2020-03-09 09:50:12 UTC (rev 258132)
@@ -95,9 +95,7 @@
 
     CanvasRenderingContext* renderingContext() const final { return m_context.get(); }
 
-#if ENABLE(WEBGL)
     ExceptionOr<OffscreenRenderingContext> getContext(JSC::JSGlobalObject&, RenderingContextType, Vector<JSC::Strong<JSC::Unknown>>&& arguments);
-#endif
     ExceptionOr<RefPtr<ImageBitmap>> transferToImageBitmap();
     void convertToBlob(ImageEncodeOptions&&, Ref<DeferredPromise>&&);
 

Modified: releases/WebKitGTK/webkit-2.28/Source/WebKit/ChangeLog (258131 => 258132)


--- releases/WebKitGTK/webkit-2.28/Source/WebKit/ChangeLog	2020-03-09 08:39:44 UTC (rev 258131)
+++ releases/WebKitGTK/webkit-2.28/Source/WebKit/ChangeLog	2020-03-09 09:50:12 UTC (rev 258132)
@@ -1,3 +1,13 @@
+2020-03-08  Konstantin Tokarev  <[email protected]>
+
+        [GTK] Fix compilation with disabled OpenGL
+        https://bugs.webkit.org/show_bug.cgi?id=208773
+
+        Reviewed by Yusuke Suzuki.
+
+        * UIProcess/API/glib/WebKitProtocolHandler.cpp:
+        (WebKit::WebKitProtocolHandler::handleGPU):
+
 2020-03-05  Sihui Liu  <[email protected]>
 
         Assertion failed: shouldBeActive() in BackgroundProcessResponsivenessTimer::responsivenessCheckTimerFired()

Modified: releases/WebKitGTK/webkit-2.28/Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp (258131 => 258132)


--- releases/WebKitGTK/webkit-2.28/Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp	2020-03-09 08:39:44 UTC (rev 258131)
+++ releases/WebKitGTK/webkit-2.28/Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp	2020-03-09 09:50:12 UTC (rev 258132)
@@ -346,6 +346,7 @@
         " </tbody></tr>",
         hardwareAccelerationPolicy(request));
 
+#if ENABLE(OPENGL)
     g_string_append_printf(html,
         " <tbody><tr>"
         "  <td><div class=\"titlename\">WebGL enabled</div></td>"
@@ -479,6 +480,7 @@
             eglQueryString(eglDisplay, EGL_EXTENSIONS));
     }
 #endif
+#endif // ENABLE(OPENGL)
 
     g_string_append(html, "<table>");
 
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to