Title: [223661] branches/safari-604-branch/Source/WebCore
- Revision
- 223661
- Author
- [email protected]
- Date
- 2017-10-18 21:29:59 -0700 (Wed, 18 Oct 2017)
Log Message
Cherry-pick r223298. rdar://problem/34958928
Modified Paths
Diff
Modified: branches/safari-604-branch/Source/WebCore/ChangeLog (223660 => 223661)
--- branches/safari-604-branch/Source/WebCore/ChangeLog 2017-10-19 04:29:56 UTC (rev 223660)
+++ branches/safari-604-branch/Source/WebCore/ChangeLog 2017-10-19 04:29:59 UTC (rev 223661)
@@ -1,5 +1,16 @@
2017-10-18 Jason Marcell <[email protected]>
+ Cherry-pick r223298. rdar://problem/34958928
+
+ 2017-10-13 Jer Noble <[email protected]>
+
+ Unreviewed build fix; wrap more functions in USE(IOSURFACE) so that
+ they do not generate "unused function" errors.
+
+ * platform/graphics/cv/VideoTextureCopierCV.cpp:
+
+2017-10-18 Jason Marcell <[email protected]>
+
Cherry-pick r223297. rdar://problem/34958928
2017-10-13 Jer Noble <[email protected]>
Modified: branches/safari-604-branch/Source/WebCore/platform/graphics/cv/VideoTextureCopierCV.cpp (223660 => 223661)
--- branches/safari-604-branch/Source/WebCore/platform/graphics/cv/VideoTextureCopierCV.cpp 2017-10-19 04:29:56 UTC (rev 223660)
+++ branches/safari-604-branch/Source/WebCore/platform/graphics/cv/VideoTextureCopierCV.cpp 2017-10-19 04:29:59 UTC (rev 223661)
@@ -41,6 +41,7 @@
namespace WebCore {
+#if USE(IOSURFACE)
enum class PixelRange {
Unknown,
Video,
@@ -158,6 +159,7 @@
ASSERT(iterator != matrices.get().end());
return iterator->second;
}
+#endif // USE(IOSURFACE)
VideoTextureCopierCV::VideoTextureCopierCV(GraphicsContext3D& context)
: m_context(context)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
