Add USE(LIBWPE) to WebCore
authordon.olmstead@sony.com <don.olmstead@sony.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 16 Nov 2018 16:38:53 +0000 (16:38 +0000)
committerdon.olmstead@sony.com <don.olmstead@sony.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 16 Nov 2018 16:38:53 +0000 (16:38 +0000)
https://bugs.webkit.org/show_bug.cgi?id=191401

Reviewed by Michael Catanzaro.

.:

Exposes USE_LIBWPE to the build.

* Source/cmake/OptionsWPE.cmake:

Source/WebCore:

No new tests. No change in behavior.

Migrates all PLATFORM(WPE) code that calls into wpe_* APIs to
USE(LIBWPE) instead.

Renames classes and files to use the suffix LibWPE.

* PlatformWPE.cmake:
* SourcesWPE.txt:
* platform/Pasteboard.h:
* platform/PasteboardStrategy.h:
* platform/PlatformKeyboardEvent.h:
* platform/PlatformPasteboard.h:
* platform/graphics/PlatformDisplay.cpp:
(WebCore::PlatformDisplay::createPlatformDisplay):
* platform/graphics/PlatformDisplay.h:
* platform/graphics/egl/GLContextEGL.h:
* platform/graphics/egl/GLContextEGLLibWPE.cpp: Renamed from Source/WebCore/platform/graphics/egl/GLContextEGLWPE.cpp.
(WebCore::GLContextEGL::createWPEContext):
* platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp:
(WebCore::MediaPlayerPrivateGStreamerBase::ensureGstGLContext):
* platform/graphics/libwpe/PlatformDisplayLibWPE.cpp: Renamed from Source/WebCore/platform/graphics/wpe/PlatformDisplayWPE.cpp.
(WebCore::PlatformDisplayLibWPE::create):
(WebCore::PlatformDisplayLibWPE::PlatformDisplayLibWPE):
(WebCore::PlatformDisplayLibWPE::~PlatformDisplayLibWPE):
(WebCore::PlatformDisplayLibWPE::initialize):
* platform/graphics/libwpe/PlatformDisplayLibWPE.h: Renamed from Source/WebCore/platform/graphics/wpe/PlatformDisplayWPE.h.
* platform/libwpe/PasteboardLibWPE.cpp: Renamed from Source/WebCore/platform/wpe/PasteboardWPE.cpp.
* platform/libwpe/PlatformKeyboardEventLibWPE.cpp: Renamed from Source/WebCore/platform/wpe/PlatformKeyboardEventWPE.cpp.
* platform/libwpe/PlatformPasteboardLibWPE.cpp: Renamed from Source/WebCore/platform/wpe/PlatformPasteboardWPE.cpp.

Source/WebKit:

Rename PlatformDisplayWPE to PlatformDisplayLibWPE.

* WebProcess/WebPage/wpe/AcceleratedSurfaceWPE.cpp:
(WebKit::AcceleratedSurfaceWPE::initialize):
* WebProcess/wpe/WebProcessMainWPE.cpp:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@238282 268f45cc-cd09-0410-ab3c-d52691b4dbfc

22 files changed:
ChangeLog
Source/WebCore/ChangeLog
Source/WebCore/PlatformWPE.cmake
Source/WebCore/SourcesWPE.txt
Source/WebCore/platform/Pasteboard.h
Source/WebCore/platform/PasteboardStrategy.h
Source/WebCore/platform/PlatformKeyboardEvent.h
Source/WebCore/platform/PlatformPasteboard.h
Source/WebCore/platform/graphics/PlatformDisplay.cpp
Source/WebCore/platform/graphics/PlatformDisplay.h
Source/WebCore/platform/graphics/egl/GLContextEGL.h
Source/WebCore/platform/graphics/egl/GLContextEGLLibWPE.cpp [moved from Source/WebCore/platform/graphics/egl/GLContextEGLWPE.cpp with 93% similarity]
Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp
Source/WebCore/platform/graphics/libwpe/PlatformDisplayLibWPE.cpp [moved from Source/WebCore/platform/graphics/wpe/PlatformDisplayWPE.cpp with 78% similarity]
Source/WebCore/platform/graphics/libwpe/PlatformDisplayLibWPE.h [moved from Source/WebCore/platform/graphics/wpe/PlatformDisplayWPE.h with 85% similarity]
Source/WebCore/platform/libwpe/PasteboardLibWPE.cpp [moved from Source/WebCore/platform/wpe/PasteboardWPE.cpp with 99% similarity]
Source/WebCore/platform/libwpe/PlatformKeyboardEventLibWPE.cpp [moved from Source/WebCore/platform/wpe/PlatformKeyboardEventWPE.cpp with 99% similarity]
Source/WebCore/platform/libwpe/PlatformPasteboardLibWPE.cpp [moved from Source/WebCore/platform/wpe/PlatformPasteboardWPE.cpp with 99% similarity]
Source/WebKit/ChangeLog
Source/WebKit/WebProcess/WebPage/wpe/AcceleratedSurfaceWPE.cpp
Source/WebKit/WebProcess/wpe/WebProcessMainWPE.cpp
Source/cmake/OptionsWPE.cmake

index cf48d7e..00556bb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2018-11-16  Don Olmstead  <don.olmstead@sony.com>
+
+        Add USE(LIBWPE) to WebCore
+        https://bugs.webkit.org/show_bug.cgi?id=191401
+
+        Reviewed by Michael Catanzaro.
+
+        Exposes USE_LIBWPE to the build.
+
+        * Source/cmake/OptionsWPE.cmake:
+
 2018-11-12  Ryosuke Niwa  <rniwa@webkit.org>
 
         Add HTTPS git remote to ReadMe.md
index 8d60a73..88c58a2 100644 (file)
@@ -1,3 +1,41 @@
+2018-11-16  Don Olmstead  <don.olmstead@sony.com>
+
+        Add USE(LIBWPE) to WebCore
+        https://bugs.webkit.org/show_bug.cgi?id=191401
+
+        Reviewed by Michael Catanzaro.
+
+        No new tests. No change in behavior.
+
+        Migrates all PLATFORM(WPE) code that calls into wpe_* APIs to
+        USE(LIBWPE) instead.
+
+        Renames classes and files to use the suffix LibWPE.
+
+        * PlatformWPE.cmake:
+        * SourcesWPE.txt:
+        * platform/Pasteboard.h:
+        * platform/PasteboardStrategy.h:
+        * platform/PlatformKeyboardEvent.h:
+        * platform/PlatformPasteboard.h:
+        * platform/graphics/PlatformDisplay.cpp:
+        (WebCore::PlatformDisplay::createPlatformDisplay):
+        * platform/graphics/PlatformDisplay.h:
+        * platform/graphics/egl/GLContextEGL.h:
+        * platform/graphics/egl/GLContextEGLLibWPE.cpp: Renamed from Source/WebCore/platform/graphics/egl/GLContextEGLWPE.cpp.
+        (WebCore::GLContextEGL::createWPEContext):
+        * platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp:
+        (WebCore::MediaPlayerPrivateGStreamerBase::ensureGstGLContext):
+        * platform/graphics/libwpe/PlatformDisplayLibWPE.cpp: Renamed from Source/WebCore/platform/graphics/wpe/PlatformDisplayWPE.cpp.
+        (WebCore::PlatformDisplayLibWPE::create):
+        (WebCore::PlatformDisplayLibWPE::PlatformDisplayLibWPE):
+        (WebCore::PlatformDisplayLibWPE::~PlatformDisplayLibWPE):
+        (WebCore::PlatformDisplayLibWPE::initialize):
+        * platform/graphics/libwpe/PlatformDisplayLibWPE.h: Renamed from Source/WebCore/platform/graphics/wpe/PlatformDisplayWPE.h.
+        * platform/libwpe/PasteboardLibWPE.cpp: Renamed from Source/WebCore/platform/wpe/PasteboardWPE.cpp.
+        * platform/libwpe/PlatformKeyboardEventLibWPE.cpp: Renamed from Source/WebCore/platform/wpe/PlatformKeyboardEventWPE.cpp.
+        * platform/libwpe/PlatformPasteboardLibWPE.cpp: Renamed from Source/WebCore/platform/wpe/PlatformPasteboardWPE.cpp.
+
 2018-11-16  Zalan Bujtas  <zalan@apple.com>
 
         [iOS] 2 subsequent taps are required to trigger certain tasks on the desktop version of YouTube.com (hover vs click).
index 467ac3d..54b12e9 100644 (file)
@@ -24,7 +24,7 @@ list(APPEND WebCore_INCLUDE_DIRECTORIES
     "${WEBCORE_DIR}/platform/graphics/gstreamer"
     "${WEBCORE_DIR}/platform/graphics/opengl"
     "${WEBCORE_DIR}/platform/graphics/opentype"
-    "${WEBCORE_DIR}/platform/graphics/wpe"
+    "${WEBCORE_DIR}/platform/graphics/libwpe"
     "${WEBCORE_DIR}/platform/graphics/wayland"
     "${WEBCORE_DIR}/platform/mock/mediasource"
     "${WEBCORE_DIR}/platform/mediacapabilities"
index 0c790ae..87d2869 100644 (file)
@@ -50,7 +50,9 @@ platform/graphics/GraphicsContext3DPrivate.cpp
 platform/graphics/PlatformDisplay.cpp
 
 platform/graphics/egl/GLContextEGL.cpp
-platform/graphics/egl/GLContextEGLWPE.cpp
+platform/graphics/egl/GLContextEGLLibWPE.cpp
+
+platform/graphics/libwpe/PlatformDisplayLibWPE.cpp
 
 platform/graphics/opengl/Extensions3DOpenGLCommon.cpp
 platform/graphics/opengl/Extensions3DOpenGLES.cpp @no-unify
@@ -62,7 +64,10 @@ platform/graphics/opentype/OpenTypeVerticalData.cpp
 
 platform/graphics/wpe/IconWPE.cpp
 platform/graphics/wpe/ImageWPE.cpp
-platform/graphics/wpe/PlatformDisplayWPE.cpp
+
+platform/libwpe/PasteboardLibWPE.cpp
+platform/libwpe/PlatformKeyboardEventLibWPE.cpp
+platform/libwpe/PlatformPasteboardLibWPE.cpp
 
 platform/text/Hyphenation.cpp
 platform/text/LocaleICU.cpp
@@ -71,9 +76,6 @@ platform/unix/LoggingUnix.cpp
 
 platform/wpe/CursorWPE.cpp
 platform/wpe/LocalizedStringsWPE.cpp
-platform/wpe/PasteboardWPE.cpp
-platform/wpe/PlatformKeyboardEventWPE.cpp
-platform/wpe/PlatformPasteboardWPE.cpp
 platform/wpe/PlatformScreenWPE.cpp
 platform/wpe/RenderThemeWPE.cpp
 platform/wpe/ScrollbarThemeWPE.cpp
index 080679c..0d3e73e 100644 (file)
@@ -89,7 +89,7 @@ struct PasteboardWebContent {
     String text;
     String markup;
 #endif
-#if PLATFORM(WPE)
+#if USE(LIBWPE)
     String text;
     String markup;
 #endif
index dcdb509..b14d54a 100644 (file)
@@ -84,7 +84,7 @@ public:
     virtual Ref<SelectionData> readFromClipboard(const String& pasteboardName) = 0;
 #endif // PLATFORM(GTK)
 
-#if PLATFORM(WPE)
+#if USE(LIBWPE)
     virtual void getTypes(Vector<String>& types) = 0;
     virtual String readStringFromPasteboard(int index, const String& pasteboardType) = 0;
     virtual void writeToPasteboard(const PasteboardWebContent&) = 0;
index f7d4d8e..dc994f6 100644 (file)
@@ -166,7 +166,7 @@ namespace WebCore {
         static bool modifiersContainCapsLock(unsigned);
 #endif
 
-#if PLATFORM(WPE)
+#if USE(LIBWPE)
         static String keyValueForWPEKeyCode(unsigned);
         static String keyCodeForHardwareKeyCode(unsigned);
         static String keyIdentifierForWPEKeyCode(unsigned);
index 1d3eef0..7e0b76c 100644 (file)
@@ -39,7 +39,7 @@ OBJC_CLASS NSPasteboard;
 OBJC_CLASS UIPasteboard;
 #endif
 
-#if PLATFORM(WPE)
+#if USE(LIBWPE)
 struct wpe_pasteboard;
 #endif
 
@@ -58,7 +58,7 @@ struct PasteboardWebContent;
 class PlatformPasteboard {
 public:
     WEBCORE_EXPORT explicit PlatformPasteboard(const String& pasteboardName);
-#if PLATFORM(IOS_FAMILY) || PLATFORM(WPE)
+#if PLATFORM(IOS_FAMILY) || USE(LIBWPE)
     WEBCORE_EXPORT PlatformPasteboard();
     WEBCORE_EXPORT Vector<PasteboardItemInfo> allPasteboardItemInfo();
     WEBCORE_EXPORT PasteboardItemInfo informationForItemAtIndex(int index);
@@ -120,7 +120,7 @@ private:
 #if PLATFORM(GTK)
     GtkClipboard* m_clipboard;
 #endif
-#if PLATFORM(WPE)
+#if USE(LIBWPE)
     struct wpe_pasteboard* m_pasteboard;
 #endif
 };
index dadb259..b1ac40c 100644 (file)
@@ -42,8 +42,8 @@
 #include "PlatformDisplayWin.h"
 #endif
 
-#if PLATFORM(WPE)
-#include "PlatformDisplayWPE.h"
+#if USE(LIBWPE)
+#include "PlatformDisplayLibWPE.h"
 #endif
 
 #if PLATFORM(GTK)
@@ -89,8 +89,8 @@ std::unique_ptr<PlatformDisplay> PlatformDisplay::createPlatformDisplay()
 #endif
 #endif // PLATFORM(GTK)
 
-#if PLATFORM(WPE)
-    return PlatformDisplayWPE::create();
+#if USE(LIBWPE)
+    return PlatformDisplayLibWPE::create();
 #elif PLATFORM(WIN)
     return PlatformDisplayWin::create();
 #endif
index dbf669e..4f2929a 100644 (file)
@@ -54,7 +54,7 @@ public:
 #if PLATFORM(WIN)
         Windows,
 #endif
-#if PLATFORM(WPE)
+#if USE(LIBWPE)
         WPE,
 #endif
     };
index 360156e..cbd6341 100644 (file)
@@ -32,7 +32,7 @@
 struct wl_egl_window;
 #endif
 
-#if PLATFORM(WPE)
+#if USE(LIBWPE)
 struct wpe_renderer_backend_egl_offscreen_target;
 #endif
 
@@ -82,7 +82,7 @@ private:
     GLContextEGL(PlatformDisplay&, EGLContext, EGLSurface, WlUniquePtr<struct wl_surface>&&, struct wl_egl_window*);
     void destroyWaylandWindow();
 #endif
-#if PLATFORM(WPE)
+#if USE(LIBWPE)
     GLContextEGL(PlatformDisplay&, EGLContext, EGLSurface, struct wpe_renderer_backend_egl_offscreen_target*);
     void destroyWPETarget();
 #endif
@@ -98,7 +98,7 @@ private:
     static std::unique_ptr<GLContextEGL> createWaylandContext(PlatformDisplay&, EGLContext sharingContext = nullptr);
     static EGLSurface createWindowSurfaceWayland(EGLDisplay, EGLConfig, GLNativeWindowType);
 #endif
-#if PLATFORM(WPE)
+#if USE(LIBWPE)
     static std::unique_ptr<GLContextEGL> createWPEContext(PlatformDisplay&, EGLContext sharingContext = nullptr);
     static EGLSurface createWindowSurfaceWPE(EGLDisplay, EGLConfig, GLNativeWindowType);
 #endif
@@ -115,7 +115,7 @@ private:
     WlUniquePtr<struct wl_surface> m_wlSurface;
     struct wl_egl_window* m_wlWindow { nullptr };
 #endif
-#if PLATFORM(WPE)
+#if USE(LIBWPE)
     struct wpe_renderer_backend_egl_offscreen_target* m_wpeTarget { nullptr };
 #endif
 #if USE(CAIRO)
 #include "config.h"
 #include "GLContextEGL.h"
 
-#if USE(EGL) && PLATFORM(WPE)
+#if USE(EGL) && USE(LIBWPE)
 
-#include "PlatformDisplayWPE.h"
+#include "PlatformDisplayLibWPE.h"
+
+#if USE(LIBEPOXY)
 // FIXME: For now default to the GBM EGL platform, but this should really be
 // somehow deducible from the build configuration.
 #define __GBM__ 1
 #include "EpoxyEGL.h"
+#else
+#include <EGL/egl.h>
+#endif
+
 #include <wpe/wpe-egl.h>
 
 namespace WebCore {
@@ -60,7 +66,7 @@ std::unique_ptr<GLContextEGL> GLContextEGL::createWPEContext(PlatformDisplay& pl
     }
 
     auto* target = wpe_renderer_backend_egl_offscreen_target_create();
-    wpe_renderer_backend_egl_offscreen_target_initialize(target, downcast<PlatformDisplayWPE>(platformDisplay).backend());
+    wpe_renderer_backend_egl_offscreen_target_initialize(target, downcast<PlatformDisplayLibWPE>(platformDisplay).backend());
     EGLNativeWindowType window = wpe_renderer_backend_egl_offscreen_target_get_native_window(target);
     if (!window) {
         WTFLogAlways("Cannot create EGL WPE context: %s\n", lastErrorString());
@@ -87,4 +93,4 @@ void GLContextEGL::destroyWPETarget()
 
 } // namespace WebCore
 
-#endif // USE(EGL) && PLATFORM(WPE)
+#endif // USE(EGL) && USE(LIBWPE)
index c994ea6..471b933 100644 (file)
 #if PLATFORM(WAYLAND)
 #include "PlatformDisplayWayland.h"
 #elif PLATFORM(WPE)
-#include "PlatformDisplayWPE.h"
+#include "PlatformDisplayLibWPE.h"
 #endif
 
 // gstglapi.h may include eglplatform.h and it includes X.h, which
@@ -448,12 +448,12 @@ bool MediaPlayerPrivateGStreamerBase::ensureGstGLContext()
 #endif
 
 #if PLATFORM(WPE)
-        ASSERT(is<PlatformDisplayWPE>(sharedDisplay));
+        ASSERT(is<PlatformDisplayLibWPE>(sharedDisplay));
         GST_DEBUG_OBJECT(pipeline(), "Creating WPE shared EGL display");
         if (shouldAdoptRef)
-            m_glDisplay = adoptGRef(GST_GL_DISPLAY(gst_gl_display_egl_new_with_egl_display(downcast<PlatformDisplayWPE>(sharedDisplay).eglDisplay())));
+            m_glDisplay = adoptGRef(GST_GL_DISPLAY(gst_gl_display_egl_new_with_egl_display(downcast<PlatformDisplayLibWPE>(sharedDisplay).eglDisplay())));
         else
-            m_glDisplay = GST_GL_DISPLAY(gst_gl_display_egl_new_with_egl_display(downcast<PlatformDisplayWPE>(sharedDisplay).eglDisplay()));
+            m_glDisplay = GST_GL_DISPLAY(gst_gl_display_egl_new_with_egl_display(downcast<PlatformDisplayLibWPE>(sharedDisplay).eglDisplay()));
 #endif
 
         ASSERT(m_glDisplay);
  */
 
 #include "config.h"
-#include "PlatformDisplayWPE.h"
+#include "PlatformDisplayLibWPE.h"
 
-#if PLATFORM(WPE)
+#if USE(LIBWPE)
 
 #include "GLContextEGL.h"
+
+#if USE(LIBEPOXY)
 // FIXME: For now default to the GBM EGL platform, but this should really be
 // somehow deducible from the build configuration.
 #define __GBM__ 1
 #include "EpoxyEGL.h"
+#else
+#include <EGL/egl.h>
+#endif
+
 #include <wpe/wpe-egl.h>
 
 namespace WebCore {
 
-std::unique_ptr<PlatformDisplayWPE> PlatformDisplayWPE::create()
+std::unique_ptr<PlatformDisplayLibWPE> PlatformDisplayLibWPE::create()
 {
-    return std::unique_ptr<PlatformDisplayWPE>(new PlatformDisplayWPE());
+    return std::unique_ptr<PlatformDisplayLibWPE>(new PlatformDisplayLibWPE());
 }
 
-PlatformDisplayWPE::PlatformDisplayWPE()
+PlatformDisplayLibWPE::PlatformDisplayLibWPE()
     : PlatformDisplay(NativeDisplayOwned::No)
 {
 }
 
-PlatformDisplayWPE::~PlatformDisplayWPE()
+PlatformDisplayLibWPE::~PlatformDisplayLibWPE()
 {
     wpe_renderer_backend_egl_destroy(m_backend);
 }
 
-void PlatformDisplayWPE::initialize(int hostFd)
+void PlatformDisplayLibWPE::initialize(int hostFd)
 {
     m_backend = wpe_renderer_backend_egl_create(hostFd);
 
     m_eglDisplay = eglGetDisplay(wpe_renderer_backend_egl_get_native_display(m_backend));
     if (m_eglDisplay == EGL_NO_DISPLAY) {
-        WTFLogAlways("PlatformDisplayWPE: could not create the EGL display: %s.", GLContextEGL::lastErrorString());
+        WTFLogAlways("PlatformDisplayLibWPE: could not create the EGL display: %s.", GLContextEGL::lastErrorString());
         return;
     }
 
@@ -67,4 +73,4 @@ void PlatformDisplayWPE::initialize(int hostFd)
 
 } // namespace WebCore
 
-#endif // PLATFORM(WPE)
+#endif // USE(LIBWPE)
@@ -25,7 +25,7 @@
 
 #pragma once
 
-#if PLATFORM(WPE)
+#if USE(LIBWPE)
 
 #include "PlatformDisplay.h"
 
@@ -33,18 +33,18 @@ struct wpe_renderer_backend_egl;
 
 namespace WebCore {
 
-class PlatformDisplayWPE final : public PlatformDisplay {
+class PlatformDisplayLibWPE final : public PlatformDisplay {
 public:
-    static std::unique_ptr<PlatformDisplayWPE> create();
+    static std::unique_ptr<PlatformDisplayLibWPE> create();
 
-    virtual ~PlatformDisplayWPE();
+    virtual ~PlatformDisplayLibWPE();
 
     void initialize(int);
 
     struct wpe_renderer_backend_egl* backend() const { return m_backend; }
 
 private:
-    PlatformDisplayWPE();
+    PlatformDisplayLibWPE();
 
     Type type() const override { return PlatformDisplay::Type::WPE; }
 
@@ -53,6 +53,6 @@ private:
 
 } // namespace WebCore
 
-SPECIALIZE_TYPE_TRAITS_PLATFORM_DISPLAY(PlatformDisplayWPE, WPE)
+SPECIALIZE_TYPE_TRAITS_PLATFORM_DISPLAY(PlatformDisplayLibWPE, WPE)
 
-#endif // PLATFORM(WPE)
+#endif // USE(LIBWPE)
@@ -26,6 +26,8 @@
 #include "config.h"
 #include "Pasteboard.h"
 
+#if USE(LIBWPE)
+
 #include "NotImplemented.h"
 #include "PasteboardStrategy.h"
 #include "PlatformStrategies.h"
@@ -154,3 +156,5 @@ void Pasteboard::write(const Color&)
 }
 
 } // namespace WebCore
+
+#endif // USE(LIBWPE)
@@ -26,6 +26,8 @@
 #include "config.h"
 #include "PlatformKeyboardEvent.h"
 
+#if USE(LIBWPE)
+
 #include "WindowsKeyboardCodes.h"
 #include <wpe/wpe.h>
 #include <wtf/text/StringBuilder.h>
@@ -1339,3 +1341,5 @@ void PlatformKeyboardEvent::getCurrentModifierState(bool&, bool&, bool&, bool&)
 }
 
 } // namespace WebCore
+
+#endif // USE(LIBWPE)
@@ -26,6 +26,8 @@
 #include "config.h"
 #include "PlatformPasteboard.h"
 
+#if USE(LIBWPE)
+
 #include "Pasteboard.h"
 #include <wpe/wpe.h>
 #include <wtf/Assertions.h>
@@ -126,3 +128,5 @@ long PlatformPasteboard::write(const PasteboardCustomData&)
 }
 
 } // namespace WebCore
+
+#endif // USE(LIBWPE)
index c08a631..d549371 100644 (file)
@@ -1,3 +1,16 @@
+2018-11-16  Don Olmstead  <don.olmstead@sony.com>
+
+        Add USE(LIBWPE) to WebCore
+        https://bugs.webkit.org/show_bug.cgi?id=191401
+
+        Reviewed by Michael Catanzaro.
+
+        Rename PlatformDisplayWPE to PlatformDisplayLibWPE.
+
+        * WebProcess/WebPage/wpe/AcceleratedSurfaceWPE.cpp:
+        (WebKit::AcceleratedSurfaceWPE::initialize):
+        * WebProcess/wpe/WebProcessMainWPE.cpp:
+
 2018-11-16  Thibault Saunier  <tsaunier@igalia.com>
 
         [GStreamer][WebRTC] Add API to enable/disable device mocks
index 6fda698..e953bc3 100644 (file)
@@ -27,7 +27,7 @@
 #include "AcceleratedSurfaceWPE.h"
 
 #include "WebPage.h"
-#include <WebCore/PlatformDisplayWPE.h>
+#include <WebCore/PlatformDisplayLibWPE.h>
 #include <wpe/wpe-egl.h>
 
 namespace WebKit {
@@ -66,7 +66,7 @@ void AcceleratedSurfaceWPE::initialize()
         nullptr
     };
     wpe_renderer_backend_egl_target_set_client(m_backend, &s_client, this);
-    wpe_renderer_backend_egl_target_initialize(m_backend, downcast<PlatformDisplayWPE>(PlatformDisplay::sharedDisplay()).backend(),
+    wpe_renderer_backend_egl_target_initialize(m_backend, downcast<PlatformDisplayLibWPE>(PlatformDisplay::sharedDisplay()).backend(),
         std::max(0, m_size.width()), std::max(0, m_size.height()));
 }
 
index 8c30c1d..6c12143 100644 (file)
@@ -29,7 +29,7 @@
 
 #include "ChildProcessMain.h"
 #include "WebProcess.h"
-#include <WebCore/PlatformDisplayWPE.h>
+#include <WebCore/PlatformDisplayLibWPE.h>
 #include <glib.h>
 #include <iostream>
 #include <libsoup/soup.h>
@@ -70,8 +70,8 @@ public:
         int wpeFd = atoi(argv[4]);
         RunLoop::main().dispatch(
             [wpeFd] {
-                RELEASE_ASSERT(is<PlatformDisplayWPE>(PlatformDisplay::sharedDisplay()));
-                downcast<PlatformDisplayWPE>(PlatformDisplay::sharedDisplay()).initialize(wpeFd);
+                RELEASE_ASSERT(is<PlatformDisplayLibWPE>(PlatformDisplay::sharedDisplay()));
+                downcast<PlatformDisplayLibWPE>(PlatformDisplay::sharedDisplay()).initialize(wpeFd);
             });
         return true;
     }
index fb0b60e..9dba49b 100644 (file)
@@ -120,6 +120,7 @@ SET_AND_EXPOSE_TO_BUILD(USE_CAIRO TRUE)
 SET_AND_EXPOSE_TO_BUILD(USE_EGL TRUE)
 SET_AND_EXPOSE_TO_BUILD(USE_GCRYPT TRUE)
 SET_AND_EXPOSE_TO_BUILD(USE_LIBEPOXY TRUE)
+SET_AND_EXPOSE_TO_BUILD(USE_LIBWPE TRUE)
 SET_AND_EXPOSE_TO_BUILD(USE_OPENGL_ES TRUE)
 SET_AND_EXPOSE_TO_BUILD(USE_XDGMIME TRUE)