Title: [213975] trunk/Source/WebCore
- Revision
- 213975
- Author
- zandober...@gmail.com
- Date
- 2017-03-15 00:47:11 -0700 (Wed, 15 Mar 2017)
Log Message
Unreviewed GTK+ build fix. Sprinkle ENABLE(MEDIA_STREAM) build guards
in the Internals class to avoid compilation failures when building
with this feature disabled.
* testing/Internals.cpp:
(WebCore::Internals::~Internals):
* testing/Internals.h:
* testing/Internals.idl:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (213974 => 213975)
--- trunk/Source/WebCore/ChangeLog 2017-03-15 06:18:35 UTC (rev 213974)
+++ trunk/Source/WebCore/ChangeLog 2017-03-15 07:47:11 UTC (rev 213975)
@@ -1,3 +1,14 @@
+2017-03-15 Zan Dobersek <zdober...@igalia.com>
+
+ Unreviewed GTK+ build fix. Sprinkle ENABLE(MEDIA_STREAM) build guards
+ in the Internals class to avoid compilation failures when building
+ with this feature disabled.
+
+ * testing/Internals.cpp:
+ (WebCore::Internals::~Internals):
+ * testing/Internals.h:
+ * testing/Internals.idl:
+
2017-03-14 Youenn Fablet <you...@apple.com>
CanvasCapture should not generate a frame per each canvas draw command
Modified: trunk/Source/WebCore/testing/Internals.cpp (213974 => 213975)
--- trunk/Source/WebCore/testing/Internals.cpp 2017-03-15 06:18:35 UTC (rev 213974)
+++ trunk/Source/WebCore/testing/Internals.cpp 2017-03-15 07:47:11 UTC (rev 213975)
@@ -377,8 +377,10 @@
Internals::~Internals()
{
+#if ENABLE(MEDIA_STREAM)
if (m_track)
m_track->source().removeObserver(*this);
+#endif
}
void Internals::resetToConsistentState(Page& page)
@@ -3828,10 +3830,12 @@
#endif
+#if ENABLE(MEDIA_STREAM)
void Internals::observeMediaStreamTrack(MediaStreamTrack& track)
{
m_track = &track;
m_track->source().addObserver(*this);
}
+#endif
} // namespace WebCore
Modified: trunk/Source/WebCore/testing/Internals.h (213974 => 213975)
--- trunk/Source/WebCore/testing/Internals.h 2017-03-15 06:18:35 UTC (rev 213974)
+++ trunk/Source/WebCore/testing/Internals.h 2017-03-15 07:47:11 UTC (rev 213975)
@@ -77,7 +77,11 @@
class WebGLRenderingContextBase;
class XMLHttpRequest;
-class Internals final : public RefCounted<Internals>, private ContextDestructionObserver, private RealtimeMediaSource::Observer {
+class Internals final : public RefCounted<Internals>, private ContextDestructionObserver
+#if ENABLE(MEDIA_STREAM)
+ , private RealtimeMediaSource::Observer
+#endif
+ {
public:
static Ref<Internals> create(Document&);
virtual ~Internals();
@@ -546,9 +550,11 @@
void simulateWebGLContextChanged(WebGLRenderingContextBase&);
#endif
+#if ENABLE(MEDIA_STREAM)
unsigned long trackAudioSampleCount() const { return m_trackAudioSampleCount; }
unsigned long trackVideoSampleCount() const { return m_trackVideoSampleCount; }
void observeMediaStreamTrack(MediaStreamTrack&);
+#endif
private:
explicit Internals(Document&);
@@ -558,14 +564,16 @@
ExceptionOr<RenderedDocumentMarker*> markerAt(Node&, const String& markerType, unsigned index);
// RealtimeMediaSource::Observer API
+#if ENABLE(MEDIA_STREAM)
void videoSampleAvailable(MediaSample&) final { m_trackVideoSampleCount++; }
void audioSamplesAvailable(const MediaTime&, const PlatformAudioData&, const AudioStreamDescription&, size_t) final { m_trackAudioSampleCount++; }
- std::unique_ptr<InspectorStubFrontend> m_inspectorFrontend;
-
unsigned long m_trackVideoSampleCount { 0 };
unsigned long m_trackAudioSampleCount { 0 };
RefPtr<MediaStreamTrack> m_track;
+#endif
+
+ std::unique_ptr<InspectorStubFrontend> m_inspectorFrontend;
};
} // namespace WebCore
Modified: trunk/Source/WebCore/testing/Internals.idl (213974 => 213975)
--- trunk/Source/WebCore/testing/Internals.idl 2017-03-15 06:18:35 UTC (rev 213974)
+++ trunk/Source/WebCore/testing/Internals.idl 2017-03-15 07:47:11 UTC (rev 213975)
@@ -517,7 +517,7 @@
[Conditional=WEBGL] void simulateWebGLContextChanged(WebGLRenderingContextBase context);
- void observeMediaStreamTrack(MediaStreamTrack track);
- readonly attribute unsigned long trackAudioSampleCount;
- readonly attribute unsigned long trackVideoSampleCount;
+ [Conditional=MEDIA_STREAM] void observeMediaStreamTrack(MediaStreamTrack track);
+ [Conditional=MEDIA_STREAM] readonly attribute unsigned long trackAudioSampleCount;
+ [Conditional=MEDIA_STREAM] readonly attribute unsigned long trackVideoSampleCount;
};
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
