Title: [226231] trunk/Source/WebKit
Revision
226231
Author
[email protected]
Date
2017-12-21 10:52:33 -0800 (Thu, 21 Dec 2017)

Log Message

Second Build fix after r226223
https://bugs.webkit.org/show_bug.cgi?id=181089

Unreviewed.

Patch by Jeremy Jones <[email protected]> on 2017-12-21

* UIProcess/Cocoa/VideoFullscreenManagerProxy.mm:
(WebKit::VideoFullscreenManagerProxy::setInlineRect):
(WebKit::VideoFullscreenManagerProxy::setHasVideoContentLayer):

Modified Paths

Diff

Modified: trunk/Source/WebKit/ChangeLog (226230 => 226231)


--- trunk/Source/WebKit/ChangeLog	2017-12-21 18:40:14 UTC (rev 226230)
+++ trunk/Source/WebKit/ChangeLog	2017-12-21 18:52:33 UTC (rev 226231)
@@ -1,3 +1,14 @@
+2017-12-21  Jeremy Jones  <[email protected]>
+
+        Second Build fix after r226223
+        https://bugs.webkit.org/show_bug.cgi?id=181089
+
+        Unreviewed.
+
+        * UIProcess/Cocoa/VideoFullscreenManagerProxy.mm:
+        (WebKit::VideoFullscreenManagerProxy::setInlineRect):
+        (WebKit::VideoFullscreenManagerProxy::setHasVideoContentLayer):
+
 2017-12-21  Jer Noble  <[email protected]>
 
         Add initial DOM support for Media Capabilities

Modified: trunk/Source/WebKit/UIProcess/Cocoa/VideoFullscreenManagerProxy.mm (226230 => 226231)


--- trunk/Source/WebKit/UIProcess/Cocoa/VideoFullscreenManagerProxy.mm	2017-12-21 18:40:14 UTC (rev 226230)
+++ trunk/Source/WebKit/UIProcess/Cocoa/VideoFullscreenManagerProxy.mm	2017-12-21 18:52:33 UTC (rev 226231)
@@ -436,30 +436,32 @@
 }
 #endif
 
-#if !PLATFORM(IOS) || !ENABLE(FULLSCREEN_API)
-NO_RETURN_DUE_TO_ASSERT
-#endif
+#if PLATFORM(IOS) && ENABLE(FULLSCREEN_API)
+
 void VideoFullscreenManagerProxy::setInlineRect(uint64_t contextId, const WebCore::IntRect& inlineRect, bool visible)
 {
-#if PLATFORM(IOS) && ENABLE(FULLSCREEN_API)
     ensureInterface(contextId).setInlineRect(inlineRect, visible);
-#else
-    ASSERT_NOT_REACHED();
-#endif
 }
 
-#if !PLATFORM(IOS) || !ENABLE(FULLSCREEN_API)
-NO_RETURN_DUE_TO_ASSERT
-#endif
 void VideoFullscreenManagerProxy::setHasVideoContentLayer(uint64_t contextId, bool value)
 {
-#if PLATFORM(IOS) && ENABLE(FULLSCREEN_API)
     ensureInterface(contextId).setHasVideoContentLayer(value);
+}
+
 #else
+
+NO_RETURN_DUE_TO_ASSERT void VideoFullscreenManagerProxy::setInlineRect(uint64_t, const WebCore::IntRect&, bool)
+{
     ASSERT_NOT_REACHED();
-#endif
 }
 
+NO_RETURN_DUE_TO_ASSERT void VideoFullscreenManagerProxy::setHasVideoContentLayer(uint64_t, bool)
+{
+    ASSERT_NOT_REACHED();
+}
+
+#endif
+
 void VideoFullscreenManagerProxy::cleanupFullscreen(uint64_t contextId)
 {
     ensureInterface(contextId).cleanupFullscreen();
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to