Title: [226284] trunk/Source/WebKitLegacy/mac
- Revision
- 226284
- Author
- [email protected]
- Date
- 2017-12-22 15:34:54 -0800 (Fri, 22 Dec 2017)
Log Message
Unreviewed, fix build failures due to using deprecated AppKit symbols when building 32-bit
Wrap some more code in -Wdeprecated-declarations to try and fix the 32-bit build using the newest SDK.
* Carbon/CarbonWindowAdapter.mm:
(-[CarbonWindowAdapter setViewsNeedDisplay:]):
* Plugins/WebNetscapePluginView.mm:
(-[WebNetscapePluginView saveAndSetNewPortStateForUpdate:]):
(-[WebNetscapePluginView sendDrawRectEvent:]):
(-[WebNetscapePluginView drawRect:]):
Modified Paths
Diff
Modified: trunk/Source/WebKitLegacy/mac/Carbon/CarbonWindowAdapter.mm (226283 => 226284)
--- trunk/Source/WebKitLegacy/mac/Carbon/CarbonWindowAdapter.mm 2017-12-22 23:33:15 UTC (rev 226283)
+++ trunk/Source/WebKitLegacy/mac/Carbon/CarbonWindowAdapter.mm 2017-12-22 23:34:54 UTC (rev 226284)
@@ -281,7 +281,10 @@
// flushes it.
if ([self windowNumber] != -1) {
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
CGContextRef cgContext = (CGContextRef)[[self _threadContext] graphicsPort];
+#pragma clang diagnostic pop
CGContextSynchronize(cgContext);
}
}
Modified: trunk/Source/WebKitLegacy/mac/ChangeLog (226283 => 226284)
--- trunk/Source/WebKitLegacy/mac/ChangeLog 2017-12-22 23:33:15 UTC (rev 226283)
+++ trunk/Source/WebKitLegacy/mac/ChangeLog 2017-12-22 23:34:54 UTC (rev 226284)
@@ -1,5 +1,18 @@
2017-12-22 Wenson Hsieh <[email protected]>
+ Unreviewed, fix build failures due to using deprecated AppKit symbols when building 32-bit
+
+ Wrap some more code in -Wdeprecated-declarations to try and fix the 32-bit build using the newest SDK.
+
+ * Carbon/CarbonWindowAdapter.mm:
+ (-[CarbonWindowAdapter setViewsNeedDisplay:]):
+ * Plugins/WebNetscapePluginView.mm:
+ (-[WebNetscapePluginView saveAndSetNewPortStateForUpdate:]):
+ (-[WebNetscapePluginView sendDrawRectEvent:]):
+ (-[WebNetscapePluginView drawRect:]):
+
+2017-12-22 Wenson Hsieh <[email protected]>
+
Fix build failures due to using deprecated AppKit symbols
https://bugs.webkit.org/show_bug.cgi?id=181110
<rdar://problem/36162865>
Modified: trunk/Source/WebKitLegacy/mac/Plugins/WebNetscapePluginView.mm (226283 => 226284)
--- trunk/Source/WebKitLegacy/mac/Plugins/WebNetscapePluginView.mm 2017-12-22 23:33:15 UTC (rev 226283)
+++ trunk/Source/WebKitLegacy/mac/Plugins/WebNetscapePluginView.mm 2017-12-22 23:34:54 UTC (rev 226284)
@@ -377,7 +377,10 @@
RgnHandle clipRegion = NewRgn();
qdPortState->clipRegion = clipRegion;
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
CGContextRef currentContext = (CGContextRef)[[NSGraphicsContext currentContext] graphicsPort];
+#pragma clang diagnostic pop
if (currentContext && CGContextGetType(currentContext) == kCGContextTypeBitmap) {
// We check for kCGContextTypeBitmap here, because if we just called CGBitmapContextGetData
// on any context, we'd log to the console every time. But even if currentContext is a
@@ -500,7 +503,10 @@
ASSERT([NSView focusView] == self);
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
CGContextRef context = static_cast<CGContextRef>([[NSGraphicsContext currentContext] graphicsPort]);
+#pragma clang diagnostic pop
PortState_CG *cgPortState = (PortState_CG *)malloc(sizeof(PortState_CG));
portState = (PortState)cgPortState;
@@ -689,7 +695,10 @@
{
ASSERT(_eventHandler);
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
CGContextRef context = static_cast<CGContextRef>([[NSGraphicsContext currentContext] graphicsPort]);
+#pragma clang diagnostic pop
_eventHandler->drawRect(context, rect);
}
@@ -1329,7 +1338,10 @@
if (printedPluginBitmap) {
// Flip the bitmap before drawing because the QuickDraw port is flipped relative
// to this view.
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
CGContextRef cgContext = (CGContextRef)[[NSGraphicsContext currentContext] graphicsPort];
+#pragma clang diagnostic pop
CGContextSaveGState(cgContext);
NSRect bounds = [self bounds];
CGContextTranslateCTM(cgContext, 0.0f, NSHeight(bounds));
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
