Diff
Modified: tags/Safari-602.1.30/Source/WebCore/ChangeLog (200222 => 200223)
--- tags/Safari-602.1.30/Source/WebCore/ChangeLog 2016-04-29 01:30:34 UTC (rev 200222)
+++ tags/Safari-602.1.30/Source/WebCore/ChangeLog 2016-04-29 02:38:08 UTC (rev 200223)
@@ -1,3 +1,14 @@
+2016-04-28 Matthew Hanson <[email protected]>
+
+ Merge r200201. rdar://problem/25995376
+
+ 2016-04-28 Daniel Bates <[email protected]>
+
+ Fix the Apple Internal OS X build
+
+ * platform/graphics/mac/PDFDocumentImageMac.mm:
+ (WebCore::PDFDocumentImage::drawPDFPage): Ignore deprecation warning for -[PDFPage drawWithBox:].
+
2016-04-28 Babak Shafiei <[email protected]>
Merge r200205.
Modified: tags/Safari-602.1.30/Source/WebCore/platform/graphics/mac/PDFDocumentImageMac.mm (200222 => 200223)
--- tags/Safari-602.1.30/Source/WebCore/platform/graphics/mac/PDFDocumentImageMac.mm 2016-04-29 01:30:34 UTC (rev 200222)
+++ tags/Safari-602.1.30/Source/WebCore/platform/graphics/mac/PDFDocumentImageMac.mm 2016-04-29 02:38:08 UTC (rev 200223)
@@ -76,7 +76,10 @@
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 (200222 => 200223)
--- tags/Safari-602.1.30/Source/WebKit/mac/ChangeLog 2016-04-29 01:30:34 UTC (rev 200222)
+++ tags/Safari-602.1.30/Source/WebKit/mac/ChangeLog 2016-04-29 02:38:08 UTC (rev 200223)
@@ -1,3 +1,16 @@
+2016-04-28 Matthew Hanson <[email protected]>
+
+ Merge r200201. rdar://problem/25995376
+
+ 2016-04-28 Daniel Bates <[email protected]>
+
+ Fix the Apple Internal OS X build
+
+ * WebView/WebPDFView.h: Import PDFKit for definition of protocol PDFViewDelegate.
+ Forward declare protocol PDFViewDelegate as appropriate. Mark WebPDFView as implementing
+ protocol PDFViewDelegate.
+ * WebView/WebPDFView.mm: Move import of PDFKit from here to the header.
+
2016-04-26 Joseph Pecoraro <[email protected]>
Uncaught Exception: SecurityError: DOM Exception 18: An attempt was made to break through the security policy of the user agent.
Modified: tags/Safari-602.1.30/Source/WebKit/mac/WebView/WebPDFView.h (200222 => 200223)
--- tags/Safari-602.1.30/Source/WebKit/mac/WebView/WebPDFView.h 2016-04-29 01:30:34 UTC (rev 200222)
+++ tags/Safari-602.1.30/Source/WebKit/mac/WebView/WebPDFView.h 2016-04-29 02:38:08 UTC (rev 200223)
@@ -28,13 +28,17 @@
#if !PLATFORM(IOS)
+#import <PDFKit/PDFKit.h>
#import <WebKitLegacy/WebDocumentInternal.h>
-@class PDFDocument;
-@class PDFView;
@class WebDataSource;
-@interface WebPDFView : NSView <WebDocumentView, WebDocumentSearching, WebDocumentIncrementalSearching, WebMultipleTextMatches, WebDocumentSelection, WebDocumentElement, WebDocumentPDF, _WebDocumentViewState, _WebDocumentZooming>
+#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>
{
NSView *previewView;
PDFView *PDFSubview;
Modified: tags/Safari-602.1.30/Source/WebKit/mac/WebView/WebPDFView.mm (200222 => 200223)
--- tags/Safari-602.1.30/Source/WebKit/mac/WebView/WebPDFView.mm 2016-04-29 01:30:34 UTC (rev 200222)
+++ tags/Safari-602.1.30/Source/WebKit/mac/WebView/WebPDFView.mm 2016-04-29 02:38:08 UTC (rev 200223)
@@ -65,8 +65,6 @@
#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 (200222 => 200223)
--- tags/Safari-602.1.30/Source/WebKit2/ChangeLog 2016-04-29 01:30:34 UTC (rev 200222)
+++ tags/Safari-602.1.30/Source/WebKit2/ChangeLog 2016-04-29 02:38:08 UTC (rev 200223)
@@ -1,3 +1,16 @@
+2016-04-28 Matthew Hanson <[email protected]>
+
+ Merge r200201. rdar://problem/25995376
+
+ 2016-04-28 Daniel Bates <[email protected]>
+
+ Fix the Apple Internal OS X build
+
+ * UIProcess/mac/WKPrintingView.mm:
+ (-[WKPrintingView _drawPDFDocument:page:atPoint:]): Ignore deprecation warning for -[PDFPage drawWithBox:].
+ * WebProcess/WebPage/mac/WebPageMac.mm:
+ (WebKit::drawPDFPage): Ditto.
+
2016-04-26 Joseph Pecoraro <[email protected]>
Uncaught Exception: SecurityError: DOM Exception 18: An attempt was made to break through the security policy of the user agent.
Modified: tags/Safari-602.1.30/Source/WebKit2/UIProcess/mac/WKPrintingView.mm (200222 => 200223)
--- tags/Safari-602.1.30/Source/WebKit2/UIProcess/mac/WKPrintingView.mm 2016-04-29 01:30:34 UTC (rev 200222)
+++ tags/Safari-602.1.30/Source/WebKit2/UIProcess/mac/WKPrintingView.mm 2016-04-29 02:38:08 UTC (rev 200223)
@@ -449,7 +449,10 @@
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 (200222 => 200223)
--- tags/Safari-602.1.30/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm 2016-04-29 01:30:34 UTC (rev 200222)
+++ tags/Safari-602.1.30/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm 2016-04-29 02:38:08 UTC (rev 200223)
@@ -832,7 +832,10 @@
[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);
