Title: [223658] branches/safari-604-branch/Source/WebCore
- Revision
- 223658
- Author
- jmarc...@apple.com
- Date
- 2017-10-18 21:29:51 -0700 (Wed, 18 Oct 2017)
Log Message
Cherry-pick r223294. rdar://problem/34958928
Modified Paths
Diff
Modified: branches/safari-604-branch/Source/WebCore/ChangeLog (223657 => 223658)
--- branches/safari-604-branch/Source/WebCore/ChangeLog 2017-10-19 04:29:48 UTC (rev 223657)
+++ branches/safari-604-branch/Source/WebCore/ChangeLog 2017-10-19 04:29:51 UTC (rev 223658)
@@ -1,5 +1,15 @@
2017-10-18 Jason Marcell <jmarc...@apple.com>
+ Cherry-pick r223294. rdar://problem/34958928
+
+ 2017-10-13 Jer Noble <jer.no...@apple.com>
+
+ Unreviewed build fix; add definitions for IOSurface methods missing on some platforms.
+
+ * platform/graphics/cv/VideoTextureCopierCV.cpp:
+
+2017-10-18 Jason Marcell <jmarc...@apple.com>
+
Cherry-pick r223289. rdar://problem/34958928
2017-10-13 Jer Noble <jer.no...@apple.com>
Modified: branches/safari-604-branch/Source/WebCore/PAL/ChangeLog (223657 => 223658)
--- branches/safari-604-branch/Source/WebCore/PAL/ChangeLog 2017-10-19 04:29:48 UTC (rev 223657)
+++ branches/safari-604-branch/Source/WebCore/PAL/ChangeLog 2017-10-19 04:29:51 UTC (rev 223658)
@@ -1,3 +1,13 @@
+2017-10-18 Jason Marcell <jmarc...@apple.com>
+
+ Cherry-pick r223294. rdar://problem/34958928
+
+ 2017-10-13 Jer Noble <jer.no...@apple.com>
+
+ Unreviewed build fix; add definitions for IOSurface methods missing on some platforms.
+
+ * pal/spi/cocoa/IOSurfaceSPI.h:
+
2017-08-09 Jason Marcell <jmarc...@apple.com>
Cherry-pick r220473. rdar://problem/33810961
Modified: branches/safari-604-branch/Source/WebCore/platform/graphics/cv/VideoTextureCopierCV.cpp (223657 => 223658)
--- branches/safari-604-branch/Source/WebCore/platform/graphics/cv/VideoTextureCopierCV.cpp 2017-10-19 04:29:48 UTC (rev 223657)
+++ branches/safari-604-branch/Source/WebCore/platform/graphics/cv/VideoTextureCopierCV.cpp 2017-10-19 04:29:51 UTC (rev 223658)
@@ -27,6 +27,7 @@
#include "VideoTextureCopierCV.h"
#include "FourCC.h"
+#include "IOSurfaceSPI.h"
#include "Logging.h"
#include "TextureCacheCV.h"
#include <wtf/NeverDestroyed.h>
Modified: branches/safari-604-branch/Source/WebCore/platform/spi/cocoa/IOSurfaceSPI.h (223657 => 223658)
--- branches/safari-604-branch/Source/WebCore/platform/spi/cocoa/IOSurfaceSPI.h 2017-10-19 04:29:48 UTC (rev 223657)
+++ branches/safari-604-branch/Source/WebCore/platform/spi/cocoa/IOSurfaceSPI.h 2017-10-19 04:29:51 UTC (rev 223658)
@@ -81,6 +81,8 @@
IOReturn IOSurfaceLock(IOSurfaceRef buffer, uint32_t options, uint32_t *seed);
IOSurfaceRef IOSurfaceLookupFromMachPort(mach_port_t);
IOReturn IOSurfaceUnlock(IOSurfaceRef buffer, uint32_t options, uint32_t *seed);
+size_t IOSurfaceGetWidthOfPlane(IOSurfaceRef buffer, size_t planeIndex);
+size_t IOSurfaceGetHeightOfPlane(IOSurfaceRef buffer, size_t planeIndex);
WTF_EXTERN_C_END
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
