Title: [225669] trunk/Source/WebKitLegacy/mac
- Revision
- 225669
- Author
- [email protected]
- Date
- 2017-12-07 20:22:47 -0800 (Thu, 07 Dec 2017)
Log Message
Ignore deprecation warnings.
* WebView/WebHTMLView.mm:
(-[NSWindow _web_borderView]):
(-[WebHTMLView _setAsideSubviews]):
* WebView/WebView.mm:
(-[WebView encodeWithCoder:]):
Modified Paths
Diff
Modified: trunk/Source/WebKitLegacy/mac/ChangeLog (225668 => 225669)
--- trunk/Source/WebKitLegacy/mac/ChangeLog 2017-12-08 03:03:19 UTC (rev 225668)
+++ trunk/Source/WebKitLegacy/mac/ChangeLog 2017-12-08 04:22:47 UTC (rev 225669)
@@ -1,3 +1,13 @@
+2017-12-07 Jessie Berlin <[email protected]>
+
+ Ignore deprecation warnings.
+
+ * WebView/WebHTMLView.mm:
+ (-[NSWindow _web_borderView]):
+ (-[WebHTMLView _setAsideSubviews]):
+ * WebView/WebView.mm:
+ (-[WebView encodeWithCoder:]):
+
2017-12-02 Darin Adler <[email protected]>
Modernize some aspects of text codecs, eliminate WebKit use of strcasecmp
Modified: trunk/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm (225668 => 225669)
--- trunk/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm 2017-12-08 03:03:19 UTC (rev 225668)
+++ trunk/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm 2017-12-08 04:22:47 UTC (rev 225669)
@@ -623,7 +623,10 @@
- (NSView *)_web_borderView
{
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
return _borderView;
+#pragma clang diagnostic pop
}
@end
@@ -1564,13 +1567,19 @@
#if PLATFORM(MAC)
ASSERT(!_private->subviewsSetAside);
ASSERT(_private->savedSubviews == nil);
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
_private->savedSubviews = _subviews;
+#pragma clang diagnostic pop
// We need to keep the layer-hosting view in the subviews, otherwise the layers flash.
if (_private->layerHostingView) {
NSArray* newSubviews = [[NSArray alloc] initWithObjects:_private->layerHostingView, nil];
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
_subviews = newSubviews;
} else
_subviews = nil;
+#pragma clang diagnostic pop
_private->subviewsSetAside = YES;
#endif
}
@@ -1580,11 +1589,14 @@
#if PLATFORM(MAC)
ASSERT(_private->subviewsSetAside);
if (_private->layerHostingView) {
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
[_subviews release];
_subviews = _private->savedSubviews;
} else {
ASSERT(_subviews == nil);
_subviews = _private->savedSubviews;
+#pragma clang diagnostic pop
}
_private->savedSubviews = nil;
_private->subviewsSetAside = NO;
Modified: trunk/Source/WebKitLegacy/mac/WebView/WebView.mm (225668 => 225669)
--- trunk/Source/WebKitLegacy/mac/WebView/WebView.mm 2017-12-08 03:03:19 UTC (rev 225668)
+++ trunk/Source/WebKitLegacy/mac/WebView/WebView.mm 2017-12-08 04:22:47 UTC (rev 225669)
@@ -5774,15 +5774,21 @@
- (void)encodeWithCoder:(NSCoder *)encoder
{
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
// Set asside the subviews before we archive. We don't want to archive any subviews.
// The subviews will always be created in _commonInitializationFrameName:groupName:.
id originalSubviews = _subviews;
_subviews = nil;
+#pragma clang diagnostic pop
[super encodeWithCoder:encoder];
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
// Restore the subviews we set aside.
_subviews = originalSubviews;
+#pragma clang diagnostic pop
BOOL useBackForwardList = _private->page && static_cast<BackForwardList*>(_private->page->backForward().client())->enabled();
if ([encoder allowsKeyedCoding]) {
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
