Title: [223655] branches/safari-604-branch/Source/WebCore
- Revision
- 223655
- Author
- [email protected]
- Date
- 2017-10-18 21:29:43 -0700 (Wed, 18 Oct 2017)
Log Message
Cherry-pick r223285. rdar://problem/34958928
Modified Paths
Diff
Modified: branches/safari-604-branch/Source/WebCore/ChangeLog (223654 => 223655)
--- branches/safari-604-branch/Source/WebCore/ChangeLog 2017-10-19 04:29:39 UTC (rev 223654)
+++ branches/safari-604-branch/Source/WebCore/ChangeLog 2017-10-19 04:29:43 UTC (rev 223655)
@@ -1,5 +1,16 @@
2017-10-18 Jason Marcell <[email protected]>
+ Cherry-pick r223285. rdar://problem/34958928
+
+ 2017-10-13 Jer Noble <[email protected]>
+
+ Unreviewed build fix; add UNUSED_PARAM macros.
+
+ * platform/graphics/cocoa/GraphicsContext3DCocoa.mm:
+ (WebCore::GraphicsContext3D::texImageIOSurface2D):
+
+2017-10-18 Jason Marcell <[email protected]>
+
Cherry-pick r223280. rdar://problem/34958928
2017-10-13 Jer Noble <[email protected]>
Modified: branches/safari-604-branch/Source/WebCore/platform/graphics/cocoa/GraphicsContext3DCocoa.mm (223654 => 223655)
--- branches/safari-604-branch/Source/WebCore/platform/graphics/cocoa/GraphicsContext3DCocoa.mm 2017-10-19 04:29:39 UTC (rev 223654)
+++ branches/safari-604-branch/Source/WebCore/platform/graphics/cocoa/GraphicsContext3DCocoa.mm 2017-10-19 04:29:43 UTC (rev 223655)
@@ -680,6 +680,14 @@
#elif PLATFORM(IOS) && !PLATFORM(IOS_SIMULATOR)
return [platformGraphicsContext3D() texImageIOSurface:surface target:target internalFormat:internalFormat width:width height:height format:format type:type plane:plane];
#else
+ UNUSED_PARAM(target);
+ UNUSED_PARAM(internalFormat);
+ UNUSED_PARAM(width);
+ UNUSED_PARAM(height);
+ UNUSED_PARAM(format);
+ UNUSED_PARAM(type);
+ UNUSED_PARAM(surface);
+ UNUSED_PARAM(plane);
return false;
#endif
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
