Diff
Modified: tags/Safari-602.1.30/Source/WebCore/ChangeLog (200227 => 200228)
--- tags/Safari-602.1.30/Source/WebCore/ChangeLog 2016-04-29 02:48:54 UTC (rev 200227)
+++ tags/Safari-602.1.30/Source/WebCore/ChangeLog 2016-04-29 03:01:53 UTC (rev 200228)
@@ -1,5 +1,9 @@
2016-04-28 Matthew Hanson <matthew_han...@apple.com>
+ Rollout r200201. rdar://problem/25995376
+
+2016-04-28 Matthew Hanson <matthew_han...@apple.com>
+
Merge r200201. rdar://problem/25995376
2016-04-28 Daniel Bates <daba...@apple.com>
Modified: tags/Safari-602.1.30/Source/WebCore/platform/graphics/mac/PDFDocumentImageMac.mm (200227 => 200228)
--- tags/Safari-602.1.30/Source/WebCore/platform/graphics/mac/PDFDocumentImageMac.mm 2016-04-29 02:48:54 UTC (rev 200227)
+++ tags/Safari-602.1.30/Source/WebCore/platform/graphics/mac/PDFDocumentImageMac.mm 2016-04-29 03:01:53 UTC (rev 200228)
@@ -76,10 +76,7 @@
bool allowsSmoothing = CGContextGetAllowsFontSmoothing(context.platformContext());
bool allowsSubpixelQuantization = CGContextGetAllowsFontSubpixelQuantization(context.platformContext());
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
[[m_document pageAtIndex:0] drawWithBox:kPDFDisplayBoxCropBox];
-#pragma clang diagnostic pop
CGContextSetAllowsFontSmoothing(context.platformContext(), allowsSmoothing);
CGContextSetAllowsFontSubpixelQuantization(context.platformContext(), allowsSubpixelQuantization);
Modified: tags/Safari-602.1.30/Source/WebKit/mac/ChangeLog (200227 => 200228)
--- tags/Safari-602.1.30/Source/WebKit/mac/ChangeLog 2016-04-29 02:48:54 UTC (rev 200227)
+++ tags/Safari-602.1.30/Source/WebKit/mac/ChangeLog 2016-04-29 03:01:53 UTC (rev 200228)
@@ -1,5 +1,9 @@
2016-04-28 Matthew Hanson <matthew_han...@apple.com>
+ Rollout r200201. rdar://problem/25995376
+
+2016-04-28 Matthew Hanson <matthew_han...@apple.com>
+
Merge r200201. rdar://problem/25995376
2016-04-28 Daniel Bates <daba...@apple.com>
Modified: tags/Safari-602.1.30/Source/WebKit/mac/WebView/WebPDFView.h (200227 => 200228)
--- tags/Safari-602.1.30/Source/WebKit/mac/WebView/WebPDFView.h 2016-04-29 02:48:54 UTC (rev 200227)
+++ tags/Safari-602.1.30/Source/WebKit/mac/WebView/WebPDFView.h 2016-04-29 03:01:53 UTC (rev 200228)
@@ -28,17 +28,13 @@
#if !PLATFORM(IOS)
-#import <PDFKit/PDFKit.h>
#import <WebKitLegacy/WebDocumentInternal.h>
+@class PDFDocument;
+@class PDFView;
@class WebDataSource;
-#if __MAC_OS_X_VERSION_MAX_ALLOWED < 101200
-@protocol PDFViewDelegate <NSObject>
-@end
-#endif
-
-@interface WebPDFView : NSView <PDFViewDelegate, WebDocumentView, WebDocumentSearching, WebDocumentIncrementalSearching, WebMultipleTextMatches, WebDocumentSelection, WebDocumentElement, WebDocumentPDF, _WebDocumentViewState, _WebDocumentZooming>
+@interface WebPDFView : NSView <WebDocumentView, WebDocumentSearching, WebDocumentIncrementalSearching, WebMultipleTextMatches, WebDocumentSelection, WebDocumentElement, WebDocumentPDF, _WebDocumentViewState, _WebDocumentZooming>
{
NSView *previewView;
PDFView *PDFSubview;
Modified: tags/Safari-602.1.30/Source/WebKit/mac/WebView/WebPDFView.mm (200227 => 200228)
--- tags/Safari-602.1.30/Source/WebKit/mac/WebView/WebPDFView.mm 2016-04-29 02:48:54 UTC (rev 200227)
+++ tags/Safari-602.1.30/Source/WebKit/mac/WebView/WebPDFView.mm 2016-04-29 03:01:53 UTC (rev 200228)
@@ -65,6 +65,8 @@
#import <wtf/Assertions.h>
#import <wtf/CurrentTime.h>
+#import <PDFKit/PDFKit.h>
+
#if USE(APPLE_INTERNAL_SDK)
#import <ApplicationServices/ApplicationServicesPriv.h>
#endif
Modified: tags/Safari-602.1.30/Source/WebKit2/ChangeLog (200227 => 200228)
--- tags/Safari-602.1.30/Source/WebKit2/ChangeLog 2016-04-29 02:48:54 UTC (rev 200227)
+++ tags/Safari-602.1.30/Source/WebKit2/ChangeLog 2016-04-29 03:01:53 UTC (rev 200228)
@@ -1,5 +1,9 @@
2016-04-28 Matthew Hanson <matthew_han...@apple.com>
+ Rollout r200201. rdar://problem/25995376
+
+2016-04-28 Matthew Hanson <matthew_han...@apple.com>
+
Merge r200201. rdar://problem/25995376
2016-04-28 Daniel Bates <daba...@apple.com>
Modified: tags/Safari-602.1.30/Source/WebKit2/UIProcess/mac/WKPrintingView.mm (200227 => 200228)
--- tags/Safari-602.1.30/Source/WebKit2/UIProcess/mac/WKPrintingView.mm 2016-04-29 02:48:54 UTC (rev 200227)
+++ tags/Safari-602.1.30/Source/WebKit2/UIProcess/mac/WKPrintingView.mm 2016-04-29 03:01:53 UTC (rev 200228)
@@ -449,10 +449,7 @@
CGContextTranslateCTM(context, point.x, point.y);
CGContextScaleCTM(context, _totalScaleFactorForPrinting, -_totalScaleFactorForPrinting);
CGContextTranslateCTM(context, 0, -[pdfPage boundsForBox:kPDFDisplayBoxMediaBox].size.height);
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
[pdfPage drawWithBox:kPDFDisplayBoxMediaBox];
-#pragma clang diagnostic pop
CGAffineTransform transform = CGContextGetCTM(context);
Modified: tags/Safari-602.1.30/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm (200227 => 200228)
--- tags/Safari-602.1.30/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm 2016-04-29 02:48:54 UTC (rev 200227)
+++ tags/Safari-602.1.30/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm 2016-04-29 03:01:53 UTC (rev 200228)
@@ -832,10 +832,7 @@
[NSGraphicsContext saveGraphicsState];
[NSGraphicsContext setCurrentContext:[NSGraphicsContext graphicsContextWithGraphicsPort:context flipped:NO]];
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
[pdfPage drawWithBox:kPDFDisplayBoxCropBox];
-#pragma clang diagnostic pop
[NSGraphicsContext restoreGraphicsState];
CGAffineTransform transform = CGContextGetCTM(context);
