Attachment 361660 Details for Bug 194216 – Patch for landing

[patch] Patch for landing

wpe-renderer-host-fd.diff (text/plain), 23.95 KB, created by Carlos Garcia Campos on 2019-02-10 23:05:44 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Carlos Garcia Campos

Created: 2019-02-10 23:05:44 PST

Size: 23.95 KB

patch

obsolete

>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 78f38eb76b2..9c42a56dff6 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,42 @@
>+2019-02-10  Carlos Garcia Campos  <cgarcia@igalia.com>
>+
>+        [WPE] Do not use a sync IPC message to send the host FD to the web process
>+        https://bugs.webkit.org/show_bug.cgi?id=194216
>+
>+        Reviewed by Darin Adler.
>+
>+        It can be sent as a web page creation parameter instead.
>+
>+        * PlatformWPE.cmake:
>+        * Shared/WebPageCreationParameters.cpp:
>+        (WebKit::WebPageCreationParameters::encode const):
>+        (WebKit::WebPageCreationParameters::decode):
>+        * Shared/WebPageCreationParameters.h:
>+        * SourcesWPE.txt:
>+        * UIProcess/API/wpe/CompositingManagerProxy.cpp: Removed.
>+        * UIProcess/API/wpe/CompositingManagerProxy.h: Removed.
>+        * UIProcess/API/wpe/CompositingManagerProxy.messages.in: Removed.
>+        * UIProcess/API/wpe/PageClientImpl.cpp:
>+        (WebKit::PageClientImpl::hostFileDescriptor):
>+        * UIProcess/API/wpe/PageClientImpl.h:
>+        * UIProcess/API/wpe/WPEView.cpp:
>+        (WKWPE::m_backend):
>+        * UIProcess/API/wpe/WPEView.h:
>+        (WKWPE::View::create):
>+        * UIProcess/PageClient.h:
>+        * UIProcess/WebPageProxy.cpp:
>+        (WebKit::WebPageProxy::creationParameters):
>+        * WebProcess/WebPage/WebPage.cpp:
>+        (WebKit::m_hostFileDescriptor):
>+        * WebProcess/WebPage/WebPage.h:
>+        (WebKit::WebPage::releaseHostFileDescriptor):
>+        * WebProcess/WebPage/wpe/AcceleratedSurfaceWPE.cpp:
>+        (WebKit::AcceleratedSurfaceWPE::AcceleratedSurfaceWPE):
>+        (WebKit::AcceleratedSurfaceWPE::initialize):
>+        * WebProcess/WebPage/wpe/AcceleratedSurfaceWPE.h:
>+        * WebProcess/WebPage/wpe/CompositingManager.cpp: Removed.
>+        * WebProcess/WebPage/wpe/CompositingManager.h: Removed.
>+
> 2019-01-18  Philippe Normand <pnormand@igalia.com> and Carlos Garcia Campos  <cgarcia@igalia.com>
> 
>         [WPE] Add API for webview background color configuration
>diff --git a/Source/WebKit/PlatformWPE.cmake b/Source/WebKit/PlatformWPE.cmake
>index 2583a0bdb34..d3ba9bc4bc9 100644
>--- a/Source/WebKit/PlatformWPE.cmake
>+++ b/Source/WebKit/PlatformWPE.cmake
>@@ -77,8 +77,6 @@ list(APPEND WebKit_UNIFIED_SOURCE_LIST_FILES
> list(APPEND WebKit_MESSAGES_IN_FILES
>     NetworkProcess/CustomProtocols/LegacyCustomProtocolManager.messages.in
> 
>-    UIProcess/API/wpe/CompositingManagerProxy.messages.in
>-
>     UIProcess/Network/CustomProtocols/LegacyCustomProtocolManagerProxy.messages.in
> )
> 
>diff --git a/Source/WebKit/Shared/WebPageCreationParameters.cpp b/Source/WebKit/Shared/WebPageCreationParameters.cpp
>index 1b22d954bf2..6ba0aa75708 100644
>--- a/Source/WebKit/Shared/WebPageCreationParameters.cpp
>+++ b/Source/WebKit/Shared/WebPageCreationParameters.cpp
>@@ -96,6 +96,9 @@ void WebPageCreationParameters::encode(IPC::Encoder& encoder) const
> #if PLATFORM(COCOA)
>     encoder << smartInsertDeleteEnabled;
>     encoder << additionalSupportedImageTypes;
>+#endif
>+#if PLATFORM(WPE)
>+    encoder << hostFileDescriptor;
> #endif
>     encoder << appleMailPaginationQuirkEnabled;
>     encoder << appleMailLinesClampEnabled;
>@@ -273,6 +276,11 @@ Optional<WebPageCreationParameters> WebPageCreationParameters::decode(IPC::Decod
>         return WTF::nullopt;
> #endif
> 
>+#if PLATFORM(WPE)
>+    if (!decoder.decode(parameters.hostFileDescriptor))
>+        return WTF::nullopt;
>+#endif
>+
>     if (!decoder.decode(parameters.appleMailPaginationQuirkEnabled))
>         return WTF::nullopt;
> 
>diff --git a/Source/WebKit/Shared/WebPageCreationParameters.h b/Source/WebKit/Shared/WebPageCreationParameters.h
>index 6fae37e8427..204fdee1e52 100644
>--- a/Source/WebKit/Shared/WebPageCreationParameters.h
>+++ b/Source/WebKit/Shared/WebPageCreationParameters.h
>@@ -154,6 +154,9 @@ struct WebPageCreationParameters {
> #if PLATFORM(COCOA)
>     bool smartInsertDeleteEnabled;
>     Vector<String> additionalSupportedImageTypes;
>+#endif
>+#if PLATFORM(WPE)
>+    IPC::Attachment hostFileDescriptor;
> #endif
>     bool appleMailPaginationQuirkEnabled;
>     bool appleMailLinesClampEnabled;
>diff --git a/Source/WebKit/SourcesWPE.txt b/Source/WebKit/SourcesWPE.txt
>index 41bc6148feb..c1db3eaf322 100644
>--- a/Source/WebKit/SourcesWPE.txt
>+++ b/Source/WebKit/SourcesWPE.txt
>@@ -167,7 +167,6 @@ UIProcess/API/glib/WebKitWebsiteData.cpp @no-unify
> UIProcess/API/glib/WebKitWebsiteDataManager.cpp @no-unify
> UIProcess/API/glib/WebKitWindowProperties.cpp @no-unify
> 
>-UIProcess/API/wpe/CompositingManagerProxy.cpp @no-unify
> UIProcess/API/wpe/PageClientImpl.cpp @no-unify
> UIProcess/API/wpe/ScrollGestureController.cpp @no-unify
> UIProcess/API/wpe/WebKitColor.cpp @no-unify
>@@ -250,7 +249,6 @@ WebProcess/WebPage/CoordinatedGraphics/ThreadedCoordinatedLayerTreeHost.cpp
> WebProcess/WebPage/gstreamer/WebPageGStreamer.cpp
> 
> WebProcess/WebPage/wpe/AcceleratedSurfaceWPE.cpp @no-unify
>-WebProcess/WebPage/wpe/CompositingManager.cpp
> WebProcess/WebPage/wpe/WebInspectorUIWPE.cpp
> WebProcess/WebPage/wpe/WebPageWPE.cpp
> 
>diff --git a/Source/WebKit/UIProcess/API/wpe/CompositingManagerProxy.cpp b/Source/WebKit/UIProcess/API/wpe/CompositingManagerProxy.cpp
>deleted file mode 100644
>index f15547dd8c0..00000000000
>--- a/Source/WebKit/UIProcess/API/wpe/CompositingManagerProxy.cpp
>+++ /dev/null
>@@ -1,60 +0,0 @@
>-/*
>- * Copyright (C) 2015 Igalia S.L.
>- *
>- * Redistribution and use in source and binary forms, with or without
>- * modification, are permitted provided that the following conditions
>- * are met:
>- * 1. Redistributions of source code must retain the above copyright
>- *    notice, this list of conditions and the following disclaimer.
>- * 2. Redistributions in binary form must reproduce the above copyright
>- *    notice, this list of conditions and the following disclaimer in the
>- *    documentation and/or other materials provided with the distribution.
>- *
>- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
>- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
>- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
>- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
>- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
>- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
>- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
>- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
>- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
>- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
>- * THE POSSIBILITY OF SUCH DAMAGE.
>- */
>-
>-#include "config.h"
>-#include "CompositingManagerProxy.h"
>-
>-#include "Attachment.h"
>-#include "CompositingManagerProxyMessages.h"
>-#include "WPEView.h"
>-#include "WebProcessPool.h"
>-#include "WebProcessProxy.h"
>-#include <wpe/wpe.h>
>-
>-namespace WebKit {
>-
>-CompositingManagerProxy::CompositingManagerProxy(WKWPE::View& view)
>-    : m_view(view)
>-{
>-}
>-
>-CompositingManagerProxy::~CompositingManagerProxy() = default;
>-
>-void CompositingManagerProxy::initialize()
>-{
>-    m_view.page().process().processPool().addMessageReceiver(Messages::CompositingManagerProxy::messageReceiverName(), m_view.page().pageID(), *this);
>-}
>-
>-void CompositingManagerProxy::finalize()
>-{
>-    m_view.page().process().processPool().removeMessageReceiver(Messages::CompositingManagerProxy::messageReceiverName(), m_view.page().pageID());
>-}
>-
>-void CompositingManagerProxy::establishConnection(IPC::Attachment& connectionHandle)
>-{
>-    connectionHandle = IPC::Attachment(wpe_view_backend_get_renderer_host_fd(m_view.backend()));
>-}
>-
>-} // namespace WebKit
>diff --git a/Source/WebKit/UIProcess/API/wpe/CompositingManagerProxy.h b/Source/WebKit/UIProcess/API/wpe/CompositingManagerProxy.h
>deleted file mode 100644
>index 22c2dfc62ee..00000000000
>--- a/Source/WebKit/UIProcess/API/wpe/CompositingManagerProxy.h
>+++ /dev/null
>@@ -1,60 +0,0 @@
>-/*
>- * Copyright (C) 2015 Igalia S.L.
>- *
>- * Redistribution and use in source and binary forms, with or without
>- * modification, are permitted provided that the following conditions
>- * are met:
>- * 1. Redistributions of source code must retain the above copyright
>- *    notice, this list of conditions and the following disclaimer.
>- * 2. Redistributions in binary form must reproduce the above copyright
>- *    notice, this list of conditions and the following disclaimer in the
>- *    documentation and/or other materials provided with the distribution.
>- *
>- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
>- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
>- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
>- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
>- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
>- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
>- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
>- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
>- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
>- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
>- * THE POSSIBILITY OF SUCH DAMAGE.
>- */
>-
>-#pragma once
>-
>-#include "MessageReceiver.h"
>-#include <wtf/Noncopyable.h>
>-
>-namespace IPC {
>-class Attachment;
>-}
>-
>-namespace WKWPE {
>-class View;
>-}
>-
>-namespace WebKit {
>-
>-class CompositingManagerProxy final : public IPC::MessageReceiver {
>-    WTF_MAKE_NONCOPYABLE(CompositingManagerProxy);
>-public:
>-    CompositingManagerProxy(WKWPE::View&);
>-    virtual ~CompositingManagerProxy();
>-
>-    void initialize();
>-    void finalize();
>-
>-private:
>-    // IPC::MessageReceiver
>-    void didReceiveMessage(IPC::Connection&, IPC::Decoder&) override { }
>-    void didReceiveSyncMessage(IPC::Connection&, IPC::Decoder&, std::unique_ptr<IPC::Encoder>& replyEncoder) override;
>-
>-    void establishConnection(IPC::Attachment&);
>-
>-    WKWPE::View& m_view;
>-};
>-
>-} // namespace WebKit
>diff --git a/Source/WebKit/UIProcess/API/wpe/CompositingManagerProxy.messages.in b/Source/WebKit/UIProcess/API/wpe/CompositingManagerProxy.messages.in
>deleted file mode 100644
>index b30ef91f808..00000000000
>--- a/Source/WebKit/UIProcess/API/wpe/CompositingManagerProxy.messages.in
>+++ /dev/null
>@@ -1,25 +0,0 @@
>-# Copyright (C) 2015 Igalia S.L.
>-#
>-# Redistribution and use in source and binary forms, with or without
>-# modification, are permitted provided that the following conditions
>-# are met:
>-# 1.  Redistributions of source code must retain the above copyright
>-#     notice, this list of conditions and the following disclaimer.
>-# 2.  Redistributions in binary form must reproduce the above copyright
>-#     notice, this list of conditions and the following disclaimer in the
>-#     documentation and/or other materials provided with the distribution.
>-#
>-# THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND
>-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
>-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
>-# DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR
>-# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
>-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
>-# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
>-# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
>-# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>-
>-messages -> CompositingManagerProxy {
>-    EstablishConnection() -> (IPC::Attachment connectionHandle) LegacySync
>-}
>diff --git a/Source/WebKit/UIProcess/API/wpe/PageClientImpl.cpp b/Source/WebKit/UIProcess/API/wpe/PageClientImpl.cpp
>index 22336150fea..c34810ec876 100644
>--- a/Source/WebKit/UIProcess/API/wpe/PageClientImpl.cpp
>+++ b/Source/WebKit/UIProcess/API/wpe/PageClientImpl.cpp
>@@ -51,6 +51,11 @@ struct wpe_view_backend* PageClientImpl::viewBackend()
>     return m_view.backend();
> }
> 
>+IPC::Attachment PageClientImpl::hostFileDescriptor()
>+{
>+    return wpe_view_backend_get_renderer_host_fd(m_view.backend());
>+}
>+
> std::unique_ptr<DrawingAreaProxy> PageClientImpl::createDrawingAreaProxy(WebProcessProxy& process)
> {
>     return std::make_unique<AcceleratedDrawingAreaProxy>(m_view.page(), process);
>diff --git a/Source/WebKit/UIProcess/API/wpe/PageClientImpl.h b/Source/WebKit/UIProcess/API/wpe/PageClientImpl.h
>index b699f29f9b2..f9e25b79a8c 100644
>--- a/Source/WebKit/UIProcess/API/wpe/PageClientImpl.h
>+++ b/Source/WebKit/UIProcess/API/wpe/PageClientImpl.h
>@@ -143,6 +143,8 @@ private:
> 
>     void didFinishProcessingAllPendingMouseEvents() final { }
> 
>+    IPC::Attachment hostFileDescriptor() final;
>+
>     WebCore::UserInterfaceLayoutDirection userInterfaceLayoutDirection() override;
> 
>     WKWPE::View& m_view;
>diff --git a/Source/WebKit/UIProcess/API/wpe/WPEView.cpp b/Source/WebKit/UIProcess/API/wpe/WPEView.cpp
>index afdbd07dfb6..eb13b43eb02 100644
>--- a/Source/WebKit/UIProcess/API/wpe/WPEView.cpp
>+++ b/Source/WebKit/UIProcess/API/wpe/WPEView.cpp
>@@ -48,7 +48,6 @@ View::View(struct wpe_view_backend* backend, const API::PageConfiguration& baseC
> #if !defined(WPE_BACKEND_CHECK_VERSION) || !WPE_BACKEND_CHECK_VERSION(1, 1, 0)
>     , m_viewStateFlags { WebCore::ActivityState::WindowIsActive, WebCore::ActivityState::IsFocused, WebCore::ActivityState::IsVisible, WebCore::ActivityState::IsInWindow }
> #endif
>-    , m_compositingManagerProxy(*this)
>     , m_backend(backend)
> {
>     ASSERT(m_backend);
>@@ -75,8 +74,6 @@ View::View(struct wpe_view_backend* backend, const API::PageConfiguration& baseC
>         pool->startMemorySampler(0);
> #endif
> 
>-    m_compositingManagerProxy.initialize();
>-
>     static struct wpe_view_backend_client s_backendClient = {
>         // set_size
>         [](void* data, uint32_t width, uint32_t height)
>@@ -162,11 +159,6 @@ View::View(struct wpe_view_backend* backend, const API::PageConfiguration& baseC
>     m_pageProxy->initializeWebPage();
> }
> 
>-View::~View()
>-{
>-    m_compositingManagerProxy.finalize();
>-}
>-
> void View::setClient(std::unique_ptr<API::ViewClient>&& client)
> {
>     if (!client)
>diff --git a/Source/WebKit/UIProcess/API/wpe/WPEView.h b/Source/WebKit/UIProcess/API/wpe/WPEView.h
>index 99bf278975d..0dfc42ff60d 100644
>--- a/Source/WebKit/UIProcess/API/wpe/WPEView.h
>+++ b/Source/WebKit/UIProcess/API/wpe/WPEView.h
>@@ -26,7 +26,6 @@
> #pragma once
> 
> #include "APIObject.h"
>-#include "CompositingManagerProxy.h"
> #include "PageClientImpl.h"
> #include "WebPageProxy.h"
> #include <WebCore/ActivityState.h>
>@@ -55,7 +54,6 @@ public:
>     {
>         return new View(backend, configuration);
>     }
>-    virtual ~View();
> 
>     // Client methods
>     void setClient(std::unique_ptr<API::ViewClient>&&);
>@@ -90,7 +88,6 @@ private:
>     WebCore::IntSize m_size;
>     OptionSet<WebCore::ActivityState::Flag> m_viewStateFlags;
> 
>-    WebKit::CompositingManagerProxy m_compositingManagerProxy;
>     struct wpe_view_backend* m_backend;
> 
> #if ENABLE(FULLSCREEN_API)
>diff --git a/Source/WebKit/UIProcess/PageClient.h b/Source/WebKit/UIProcess/PageClient.h
>index 3961ed4512a..3c2dc0198cc 100644
>--- a/Source/WebKit/UIProcess/PageClient.h
>+++ b/Source/WebKit/UIProcess/PageClient.h
>@@ -483,6 +483,9 @@ public:
>     virtual void cancelPointersForGestureRecognizer(UIGestureRecognizer*) { }
> #endif
> 
>+#if PLATFORM(WPE)
>+    virtual IPC::Attachment hostFileDescriptor() = 0;
>+#endif
> };
> 
> } // namespace WebKit
>diff --git a/Source/WebKit/UIProcess/WebPageProxy.cpp b/Source/WebKit/UIProcess/WebPageProxy.cpp
>index 8a9c21bfaf8..d5c6e61938c 100644
>--- a/Source/WebKit/UIProcess/WebPageProxy.cpp
>+++ b/Source/WebKit/UIProcess/WebPageProxy.cpp
>@@ -6877,6 +6877,10 @@ WebPageCreationParameters WebPageProxy::creationParameters(WebProcessProxy& proc
>     parameters.overrideContentSecurityPolicy = m_overrideContentSecurityPolicy;
>     parameters.cpuLimit = m_cpuLimit;
> 
>+#if PLATFORM(WPE)
>+    parameters.hostFileDescriptor = pageClient().hostFileDescriptor();
>+#endif
>+
>     for (auto& iterator : m_urlSchemeHandlersByScheme)
>         parameters.urlSchemeHandlers.set(iterator.key, iterator.value->identifier());
> 
>diff --git a/Source/WebKit/WebProcess/WebPage/WebPage.cpp b/Source/WebKit/WebProcess/WebPage/WebPage.cpp
>index 3f60e41c0a3..eebfb36f11e 100644
>--- a/Source/WebKit/WebProcess/WebPage/WebPage.cpp
>+++ b/Source/WebKit/WebProcess/WebPage/WebPage.cpp
>@@ -404,6 +404,9 @@ WebPage::WebPage(uint64_t pageID, WebPageCreationParameters&& parameters)
>     , m_userInterfaceLayoutDirection(parameters.userInterfaceLayoutDirection)
>     , m_overrideContentSecurityPolicy { parameters.overrideContentSecurityPolicy }
>     , m_cpuLimit(parameters.cpuLimit)
>+#if PLATFORM(WPE)
>+    , m_hostFileDescriptor(WTFMove(parameters.hostFileDescriptor))
>+#endif
> {
>     ASSERT(m_pageID);
> 
>diff --git a/Source/WebKit/WebProcess/WebPage/WebPage.h b/Source/WebKit/WebProcess/WebPage/WebPage.h
>index b17d0c21b76..9afe7345dd7 100644
>--- a/Source/WebKit/WebProcess/WebPage/WebPage.h
>+++ b/Source/WebKit/WebProcess/WebPage/WebPage.h
>@@ -1127,6 +1127,10 @@ public:
>     void didFinishLoadingApplicationManifest(uint64_t, const Optional<WebCore::ApplicationManifest>&);
> #endif
> 
>+#if PLATFORM(WPE)
>+    int releaseHostFileDescriptor() { return m_hostFileDescriptor.releaseFileDescriptor(); }
>+#endif
>+
>     void updateCurrentModifierState(OptionSet<WebCore::PlatformEvent::Modifier> modifiers);
> 
>     UserContentControllerIdentifier userContentControllerIdentifier() const { return m_userContentController->identifier(); }
>@@ -1821,6 +1825,10 @@ private:
>     const String m_overrideContentSecurityPolicy;
>     const Optional<double> m_cpuLimit;
> 
>+#if PLATFORM(WPE)
>+    IPC::Attachment m_hostFileDescriptor;
>+#endif
>+
>     HashMap<String, RefPtr<WebURLSchemeHandlerProxy>> m_schemeToURLSchemeHandlerProxyMap;
>     HashMap<uint64_t, WebURLSchemeHandlerProxy*> m_identifierToURLSchemeHandlerProxyMap;
> 
>diff --git a/Source/WebKit/WebProcess/WebPage/wpe/AcceleratedSurfaceWPE.cpp b/Source/WebKit/WebProcess/WebPage/wpe/AcceleratedSurfaceWPE.cpp
>index e953bc3466d..9b8ccbcb5cd 100644
>--- a/Source/WebKit/WebProcess/WebPage/wpe/AcceleratedSurfaceWPE.cpp
>+++ b/Source/WebKit/WebProcess/WebPage/wpe/AcceleratedSurfaceWPE.cpp
>@@ -41,7 +41,6 @@ std::unique_ptr<AcceleratedSurfaceWPE> AcceleratedSurfaceWPE::create(WebPage& we
> AcceleratedSurfaceWPE::AcceleratedSurfaceWPE(WebPage& webPage, Client& client)
>     : AcceleratedSurface(webPage, client)
> {
>-    m_compositingManager.establishConnection(webPage);
> }
> 
> AcceleratedSurfaceWPE::~AcceleratedSurfaceWPE()
>@@ -51,7 +50,7 @@ AcceleratedSurfaceWPE::~AcceleratedSurfaceWPE()
> 
> void AcceleratedSurfaceWPE::initialize()
> {
>-    m_backend = wpe_renderer_backend_egl_target_create(m_compositingManager.releaseConnectionFd());
>+    m_backend = wpe_renderer_backend_egl_target_create(m_webPage.releaseHostFileDescriptor());
>     static struct wpe_renderer_backend_egl_target_client s_client = {
>         // frame_complete
>         [](void* data)
>diff --git a/Source/WebKit/WebProcess/WebPage/wpe/AcceleratedSurfaceWPE.h b/Source/WebKit/WebProcess/WebPage/wpe/AcceleratedSurfaceWPE.h
>index 69e5c262764..18fc9d5b6ef 100644
>--- a/Source/WebKit/WebProcess/WebPage/wpe/AcceleratedSurfaceWPE.h
>+++ b/Source/WebKit/WebProcess/WebPage/wpe/AcceleratedSurfaceWPE.h
>@@ -28,7 +28,6 @@
> #if PLATFORM(WPE)
> 
> #include "AcceleratedSurface.h"
>-#include "CompositingManager.h"
> 
> struct wpe_renderer_backend_egl_target;
> 
>@@ -55,7 +54,6 @@ public:
> private:
>     AcceleratedSurfaceWPE(WebPage&, Client&);
> 
>-    CompositingManager m_compositingManager;
>     struct wpe_renderer_backend_egl_target* m_backend { nullptr };
> };
> 
>diff --git a/Source/WebKit/WebProcess/WebPage/wpe/CompositingManager.cpp b/Source/WebKit/WebProcess/WebPage/wpe/CompositingManager.cpp
>deleted file mode 100644
>index d515a0b58eb..00000000000
>--- a/Source/WebKit/WebProcess/WebPage/wpe/CompositingManager.cpp
>+++ /dev/null
>@@ -1,55 +0,0 @@
>-/*
>- * Copyright (C) 2015 Igalia S.L.
>- *
>- * Redistribution and use in source and binary forms, with or without
>- * modification, are permitted provided that the following conditions
>- * are met:
>- * 1. Redistributions of source code must retain the above copyright
>- *    notice, this list of conditions and the following disclaimer.
>- * 2. Redistributions in binary form must reproduce the above copyright
>- *    notice, this list of conditions and the following disclaimer in the
>- *    documentation and/or other materials provided with the distribution.
>- *
>- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
>- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
>- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
>- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
>- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
>- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
>- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
>- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
>- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
>- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
>- * THE POSSIBILITY OF SUCH DAMAGE.
>- */
>-
>-#include "config.h"
>-#include "CompositingManager.h"
>-
>-#include "CompositingManagerProxyMessages.h"
>-#include "WebPage.h"
>-
>-namespace WebKit {
>-
>-CompositingManager::~CompositingManager()
>-{
>-    ASSERT(!m_connectionFd);
>-}
>-
>-void CompositingManager::establishConnection(WebPage& webPage)
>-{
>-    IPC::Attachment connectionHandle;
>-    webPage.sendSync(Messages::CompositingManagerProxy::EstablishConnection(),
>-        Messages::CompositingManagerProxy::EstablishConnection::Reply(connectionHandle));
>-
>-    m_connectionFd = connectionHandle.releaseFileDescriptor();
>-}
>-
>-int CompositingManager::releaseConnectionFd()
>-{
>-    int fd = m_connectionFd.valueOr(-1);
>-    m_connectionFd = WTF::nullopt;
>-    return fd;
>-}
>-
>-} // namespace WebKit
>diff --git a/Source/WebKit/WebProcess/WebPage/wpe/CompositingManager.h b/Source/WebKit/WebProcess/WebPage/wpe/CompositingManager.h
>deleted file mode 100644
>index d6adf2c756c..00000000000
>--- a/Source/WebKit/WebProcess/WebPage/wpe/CompositingManager.h
>+++ /dev/null
>@@ -1,48 +0,0 @@
>-/*
>- * Copyright (C) 2015 Igalia S.L.
>- *
>- * Redistribution and use in source and binary forms, with or without
>- * modification, are permitted provided that the following conditions
>- * are met:
>- * 1. Redistributions of source code must retain the above copyright
>- *    notice, this list of conditions and the following disclaimer.
>- * 2. Redistributions in binary form must reproduce the above copyright
>- *    notice, this list of conditions and the following disclaimer in the
>- *    documentation and/or other materials provided with the distribution.
>- *
>- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
>- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
>- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
>- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
>- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
>- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
>- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
>- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
>- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
>- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
>- * THE POSSIBILITY OF SUCH DAMAGE.
>- */
>-
>-#pragma once
>-
>-#include <wtf/Noncopyable.h>
>-#include <wtf/Optional.h>
>-
>-namespace WebKit {
>-
>-class WebPage;
>-
>-class CompositingManager final {
>-    WTF_MAKE_NONCOPYABLE(CompositingManager);
>-public:
>-    CompositingManager() = default;
>-    ~CompositingManager();
>-
>-    void establishConnection(WebPage&);
>-    int releaseConnectionFd();
>-
>-private:
>-    Optional<int> m_connectionFd;
>-};
>-
>-} // namespace WebKit

Actions: View | Formatted Diff | Diff

Attachments on bug 194216: 361049 | 361660