Title: [199850] trunk/Source/WebKit/mac
- Revision
- 199850
- Author
- timothy_hor...@apple.com
- Date
- 2016-04-21 17:27:25 -0700 (Thu, 21 Apr 2016)
Log Message
Fix the iOS build: WAKView may not respond to drawLayer:inContext:
https://bugs.webkit.org/show_bug.cgi?id=156879
<rdar://problem/25772661>
Reviewed by Beth Dakin.
* WebView/WebHTMLView.mm:
WebHTMLView on iOS never uses drawLayer:inContext:, and WAKView
doesn't implement it, so this would have thrown an exception
if called, anyway. Fix the build with stricter CA protocols.
Modified Paths
Diff
Modified: trunk/Source/WebKit/mac/ChangeLog (199849 => 199850)
--- trunk/Source/WebKit/mac/ChangeLog 2016-04-22 00:18:48 UTC (rev 199849)
+++ trunk/Source/WebKit/mac/ChangeLog 2016-04-22 00:27:25 UTC (rev 199850)
@@ -1,3 +1,16 @@
+2016-04-21 Tim Horton <timothy_hor...@apple.com>
+
+ Fix the iOS build: WAKView may not respond to drawLayer:inContext:
+ https://bugs.webkit.org/show_bug.cgi?id=156879
+ <rdar://problem/25772661>
+
+ Reviewed by Beth Dakin.
+
+ * WebView/WebHTMLView.mm:
+ WebHTMLView on iOS never uses drawLayer:inContext:, and WAKView
+ doesn't implement it, so this would have thrown an exception
+ if called, anyway. Fix the build with stricter CA protocols.
+
2016-04-21 Jer Noble <jer.no...@apple.com>
[WK1] Add WebPlaybackSession support to WebKit
Modified: trunk/Source/WebKit/mac/WebView/WebHTMLView.mm (199849 => 199850)
--- trunk/Source/WebKit/mac/WebView/WebHTMLView.mm 2016-04-22 00:18:48 UTC (rev 199849)
+++ trunk/Source/WebKit/mac/WebView/WebHTMLView.mm 2016-04-22 00:27:25 UTC (rev 199850)
@@ -6702,6 +6702,7 @@
#endif
}
+#if PLATFORM(MAC)
- (void)drawLayer:(CALayer *)layer inContext:(CGContextRef)ctx
{
if (_private) {
@@ -6714,6 +6715,7 @@
if (_private)
_private->drawingIntoLayer = NO;
}
+#endif
- (BOOL)_web_isDrawingIntoLayer
{
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
