Title: [199931] tags/Safari-602.1.29/Source/WebKit2
- Revision
- 199931
- Author
- bshaf...@apple.com
- Date
- 2016-04-22 16:09:21 -0700 (Fri, 22 Apr 2016)
Log Message
Merged r199917.
Modified Paths
Diff
Modified: tags/Safari-602.1.29/Source/WebKit2/ChangeLog (199930 => 199931)
--- tags/Safari-602.1.29/Source/WebKit2/ChangeLog 2016-04-22 23:08:15 UTC (rev 199930)
+++ tags/Safari-602.1.29/Source/WebKit2/ChangeLog 2016-04-22 23:09:21 UTC (rev 199931)
@@ -1,5 +1,18 @@
2016-04-22 Babak Shafiei <bshaf...@apple.com>
+ Merge r199917.
+
+ 2016-04-22 Ryan Haddad <ryanhad...@apple.com>
+
+ Missed some macros to fix builds that do not support AVKit.
+
+ Unreviewed build fix.
+
+ * UIProcess/Cocoa/WebVideoFullscreenManagerProxy.messages.in:
+ * WebProcess/cocoa/WebVideoFullscreenManager.messages.in:
+
+2016-04-22 Babak Shafiei <bshaf...@apple.com>
+
Merge r199914.
2016-04-22 Ryan Haddad <ryanhad...@apple.com>
Modified: tags/Safari-602.1.29/Source/WebKit2/UIProcess/Cocoa/WebVideoFullscreenManagerProxy.messages.in (199930 => 199931)
--- tags/Safari-602.1.29/Source/WebKit2/UIProcess/Cocoa/WebVideoFullscreenManagerProxy.messages.in 2016-04-22 23:08:15 UTC (rev 199930)
+++ tags/Safari-602.1.29/Source/WebKit2/UIProcess/Cocoa/WebVideoFullscreenManagerProxy.messages.in 2016-04-22 23:09:21 UTC (rev 199931)
@@ -20,7 +20,7 @@
# 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.
-#if PLATFORM(IOS) || (PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE))
+#if (PLATFORM(IOS) HAVE(AVKIT)) || (PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE))
messages -> WebVideoFullscreenManagerProxy {
SetVideoDimensions(uint64_t contextId, bool hasVideo, unsigned width, unsigned height)
SetupFullscreenWithID(uint64_t contextId, uint32_t videoLayerID, WebCore::IntRect initialRect, float hostingScaleFactor, WebCore::HTMLMediaElementEnums::VideoFullscreenMode videoFullscreenMode, bool allowsPictureInPicture)
Modified: tags/Safari-602.1.29/Source/WebKit2/WebProcess/cocoa/WebVideoFullscreenManager.messages.in (199930 => 199931)
--- tags/Safari-602.1.29/Source/WebKit2/WebProcess/cocoa/WebVideoFullscreenManager.messages.in 2016-04-22 23:08:15 UTC (rev 199930)
+++ tags/Safari-602.1.29/Source/WebKit2/WebProcess/cocoa/WebVideoFullscreenManager.messages.in 2016-04-22 23:09:21 UTC (rev 199931)
@@ -20,7 +20,7 @@
# 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.
-#if PLATFORM(IOS) || (PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE))
+#if (PLATFORM(IOS) HAVE(AVKIT)) || (PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE))
messages -> WebVideoFullscreenManager {
RequestFullscreenMode(uint64_t contextId, WebCore::HTMLMediaElementEnums::VideoFullscreenMode videoFullscreenMode)
DidSetupFullscreen(uint64_t contextId)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
