Attachment 334810 Details for Bug 183244 – ROLLOUT of r229130

[patch] ROLLOUT of r229130

bug-183244-20180301085351.patch (text/plain), 6.86 KB, created by WebKit Commit Bot on 2018-03-01 05:53:52 PST

(hide)

Description:

Filename:

MIME Type:

Creator: WebKit Commit Bot

Created: 2018-03-01 05:53:52 PST

Size: 6.86 KB

patch

obsolete

>Subversion Revision: 229130
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 0d3a65283c32b2f767c6f69e055786d940250ae3..a5dbd53b46020e6fd4fab07983200680509d87c6 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,17 @@
>+2018-03-01  Commit Queue  <commit-queue@webkit.org>
>+
>+        Unreviewed, rolling out r229130.
>+        https://bugs.webkit.org/show_bug.cgi?id=183244
>+
>+        It breaks AppleWin compilation (Requested by alexg__ on
>+        #webkit).
>+
>+        Reverted changeset:
>+
>+        "Make LibWebRTCProvider port agnostic again after r215424"
>+        https://bugs.webkit.org/show_bug.cgi?id=183080
>+        https://trac.webkit.org/changeset/229130
>+
> 2018-03-01  Alejandro G. Castro  <alex@igalia.com>
> 
>         Make LibWebRTCProvider port agnostic again after r215424
>diff --git a/Source/WebCore/SourcesGTK.txt b/Source/WebCore/SourcesGTK.txt
>index 67e5083b160fd38a962d6a3eeb3688e1aa5acce0..2fdb6c4fd33aff95ac991ddad2ed77a5d9947b00 100644
>--- a/Source/WebCore/SourcesGTK.txt
>+++ b/Source/WebCore/SourcesGTK.txt
>@@ -81,8 +81,6 @@ platform/gtk/PasteboardGtk.cpp
> platform/gtk/ScrollAnimatorGtk.cpp
> platform/gtk/SelectionData.cpp
> 
>-platform/mediastream/libwebrtc/LibWebRTCProviderGlib.cpp
>-
> platform/text/Hyphenation.cpp
> platform/text/LocaleICU.cpp
> 
>diff --git a/Source/WebCore/SourcesWPE.txt b/Source/WebCore/SourcesWPE.txt
>index 4c479b0b4b26b56c7c02d2870c1b49da9f4cf1d5..604675cc1dc23db7623527114d825a5e932ca9fc 100644
>--- a/Source/WebCore/SourcesWPE.txt
>+++ b/Source/WebCore/SourcesWPE.txt
>@@ -56,8 +56,6 @@ platform/graphics/wpe/IconWPE.cpp
> platform/graphics/wpe/ImageWPE.cpp
> platform/graphics/wpe/PlatformDisplayWPE.cpp
> 
>-platform/mediastream/libwebrtc/LibWebRTCProviderGlib.cpp
>-
> platform/text/Hyphenation.cpp
> platform/text/LocaleICU.cpp
> 
>diff --git a/Source/WebCore/platform/mediastream/libwebrtc/LibWebRTCProvider.cpp b/Source/WebCore/platform/mediastream/libwebrtc/LibWebRTCProvider.cpp
>index efbd666587773f3bb271ab31eac2942903610d49..e8b9600600031505ea99c4fd8f20609ed7220093 100644
>--- a/Source/WebCore/platform/mediastream/libwebrtc/LibWebRTCProvider.cpp
>+++ b/Source/WebCore/platform/mediastream/libwebrtc/LibWebRTCProvider.cpp
>@@ -26,9 +26,15 @@
> #include "config.h"
> #include "LibWebRTCProvider.h"
> 
>+#if PLATFORM(COCOA)
>+#include "LibWebRTCProviderCocoa.h"
>+#endif
>+
> #if USE(LIBWEBRTC)
> #include "LibWebRTCAudioModule.h"
> #include "Logging.h"
>+#include "VideoToolBoxDecoderFactory.h"
>+#include "VideoToolBoxEncoderFactory.h"
> #include <dlfcn.h>
> #include <webrtc/api/peerconnectionfactoryproxy.h>
> #include <webrtc/base/physicalsocketserver.h>
>@@ -36,10 +42,20 @@
> #include <webrtc/pc/peerconnectionfactory.h>
> #include <wtf/Function.h>
> #include <wtf/NeverDestroyed.h>
>+#include <wtf/darwin/WeakLinking.h>
> #endif
> 
> namespace WebCore {
> 
>+UniqueRef<LibWebRTCProvider> LibWebRTCProvider::create()
>+{
>+#if USE(LIBWEBRTC) && PLATFORM(COCOA)
>+    return makeUniqueRef<LibWebRTCProviderCocoa>();
>+#else
>+    return makeUniqueRef<LibWebRTCProvider>();
>+#endif
>+}
>+
> #if USE(LIBWEBRTC)
> struct PeerConnectionFactoryAndThreads : public rtc::MessageHandler {
>     std::unique_ptr<rtc::Thread> networkThread;
>@@ -184,4 +200,13 @@ rtc::scoped_refptr<webrtc::PeerConnectionInterface> LibWebRTCProvider::createPee
> 
> #endif // USE(LIBWEBRTC)
> 
>+bool LibWebRTCProvider::webRTCAvailable()
>+{
>+#if USE(LIBWEBRTC)
>+    return !isNullFunctionPointer(rtc::LogMessage::LogToDebug);
>+#else
>+    return true;
>+#endif
>+}
>+
> } // namespace WebCore
>diff --git a/Source/WebCore/platform/mediastream/libwebrtc/LibWebRTCProviderCocoa.cpp b/Source/WebCore/platform/mediastream/libwebrtc/LibWebRTCProviderCocoa.cpp
>index cbb3d8fdfd8341c397c00ae325e554f6c9ab3a17..6795a30d70f0861bee991bd95c525b69d181cd3a 100644
>--- a/Source/WebCore/platform/mediastream/libwebrtc/LibWebRTCProviderCocoa.cpp
>+++ b/Source/WebCore/platform/mediastream/libwebrtc/LibWebRTCProviderCocoa.cpp
>@@ -27,24 +27,12 @@
> #include "LibWebRTCProviderCocoa.h"
> 
> #if USE(LIBWEBRTC)
>+
> #include "VideoToolBoxDecoderFactory.h"
> #include "VideoToolBoxEncoderFactory.h"
>-#include <wtf/darwin/WeakLinking.h>
>-#endif
> 
> namespace WebCore {
> 
>-UniqueRef<LibWebRTCProvider> LibWebRTCProvider::create()
>-{
>-#if USE(LIBWEBRTC) && PLATFORM(COCOA)
>-    return makeUniqueRef<LibWebRTCProviderCocoa>();
>-#else
>-    return makeUniqueRef<LibWebRTCProvider>();
>-#endif
>-}
>-
>-#if USE(LIBWEBRTC)
>-
> std::unique_ptr<cricket::WebRtcVideoDecoderFactory> LibWebRTCProviderCocoa::createDecoderFactory()
> {
>     ASSERT(!m_decoderFactory);
>@@ -71,15 +59,6 @@ void LibWebRTCProviderCocoa::setActive(bool value)
>         m_encoderFactory->setActive(value);
> }
> 
>-#endif // USE(LIBWEBRTC)
>+} // namespace WebCore
> 
>-bool LibWebRTCProvider::webRTCAvailable()
>-{
>-#if USE(LIBWEBRTC)
>-    return !isNullFunctionPointer(rtc::LogMessage::LogToDebug);
>-#else
>-    return true;
> #endif
>-}
>-
>-} // namespace WebCore
>diff --git a/Source/WebCore/platform/mediastream/libwebrtc/LibWebRTCProviderGlib.cpp b/Source/WebCore/platform/mediastream/libwebrtc/LibWebRTCProviderGlib.cpp
>deleted file mode 100644
>index 8b3ee9109cf8dd528396b76416b1d1a74169fb56..0000000000000000000000000000000000000000
>--- a/Source/WebCore/platform/mediastream/libwebrtc/LibWebRTCProviderGlib.cpp
>+++ /dev/null
>@@ -1,42 +0,0 @@
>-/*
>- * Copyright (C) 2017 Igalia S.L. All rights reserved.
>- *
>- * 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.
>- */
>-
>-namespace WebCore {
>-
>-UniqueRef<LibWebRTCProvider> LibWebRTCProvider::create()
>-{
>-#if USE(LIBWEBRTC) && (PLATFORM(GTK) || PLATFORM(WPE))
>-    return makeUniqueRef<LibWebRTCProviderGlib>();
>-#else
>-    return makeUniqueRef<LibWebRTCProvider>();
>-#endif
>-}
>-
>-bool LibWebRTCProvider::webRTCAvailable()
>-{
>-    return true;
>-}
>-
>-} // namespace WebCore

Actions: View | Formatted Diff | Diff

Attachments on bug 183244: 334810