<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[200223] tags/Safari-602.1.30/Source</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/200223">200223</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2016-04-28 19:38:08 -0700 (Thu, 28 Apr 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/200201">r200201</a>. rdar://problem/25995376</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#tagsSafari602130SourceWebCoreChangeLog">tags/Safari-602.1.30/Source/WebCore/ChangeLog</a></li>
<li><a href="#tagsSafari602130SourceWebCoreplatformgraphicsmacPDFDocumentImageMacmm">tags/Safari-602.1.30/Source/WebCore/platform/graphics/mac/PDFDocumentImageMac.mm</a></li>
<li><a href="#tagsSafari602130SourceWebKitmacChangeLog">tags/Safari-602.1.30/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#tagsSafari602130SourceWebKitmacWebViewWebPDFViewh">tags/Safari-602.1.30/Source/WebKit/mac/WebView/WebPDFView.h</a></li>
<li><a href="#tagsSafari602130SourceWebKitmacWebViewWebPDFViewmm">tags/Safari-602.1.30/Source/WebKit/mac/WebView/WebPDFView.mm</a></li>
<li><a href="#tagsSafari602130SourceWebKit2ChangeLog">tags/Safari-602.1.30/Source/WebKit2/ChangeLog</a></li>
<li><a href="#tagsSafari602130SourceWebKit2UIProcessmacWKPrintingViewmm">tags/Safari-602.1.30/Source/WebKit2/UIProcess/mac/WKPrintingView.mm</a></li>
<li><a href="#tagsSafari602130SourceWebKit2WebProcessWebPagemacWebPageMacmm">tags/Safari-602.1.30/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="tagsSafari602130SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: tags/Safari-602.1.30/Source/WebCore/ChangeLog (200222 => 200223)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-04-28 Matthew Hanson <matthew_hanson@apple.com>
+
+ Merge r200201. rdar://problem/25995376
+
+ 2016-04-28 Daniel Bates <dabates@apple.com>
+
+ Fix the Apple Internal OS X build
+
+ * platform/graphics/mac/PDFDocumentImageMac.mm:
+ (WebCore::PDFDocumentImage::drawPDFPage): Ignore deprecation warning for -[PDFPage drawWithBox:].
+
</ins><span class="cx"> 2016-04-28 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r200205.
</span></span></pre></div>
<a id="tagsSafari602130SourceWebCoreplatformgraphicsmacPDFDocumentImageMacmm"></a>
<div class="modfile"><h4>Modified: tags/Safari-602.1.30/Source/WebCore/platform/graphics/mac/PDFDocumentImageMac.mm (200222 => 200223)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -76,7 +76,10 @@
</span><span class="cx"> bool allowsSmoothing = CGContextGetAllowsFontSmoothing(context.platformContext());
</span><span class="cx"> bool allowsSubpixelQuantization = CGContextGetAllowsFontSubpixelQuantization(context.platformContext());
</span><span class="cx">
</span><ins>+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
</ins><span class="cx"> [[m_document pageAtIndex:0] drawWithBox:kPDFDisplayBoxCropBox];
</span><ins>+#pragma clang diagnostic pop
</ins><span class="cx">
</span><span class="cx"> CGContextSetAllowsFontSmoothing(context.platformContext(), allowsSmoothing);
</span><span class="cx"> CGContextSetAllowsFontSubpixelQuantization(context.platformContext(), allowsSubpixelQuantization);
</span></span></pre></div>
<a id="tagsSafari602130SourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: tags/Safari-602.1.30/Source/WebKit/mac/ChangeLog (200222 => 200223)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-04-28 Matthew Hanson <matthew_hanson@apple.com>
+
+ Merge r200201. rdar://problem/25995376
+
+ 2016-04-28 Daniel Bates <dabates@apple.com>
+
+ 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.
+
</ins><span class="cx"> 2016-04-26 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Uncaught Exception: SecurityError: DOM Exception 18: An attempt was made to break through the security policy of the user agent.
</span></span></pre></div>
<a id="tagsSafari602130SourceWebKitmacWebViewWebPDFViewh"></a>
<div class="modfile"><h4>Modified: tags/Safari-602.1.30/Source/WebKit/mac/WebView/WebPDFView.h (200222 => 200223)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -28,13 +28,17 @@
</span><span class="cx">
</span><span class="cx"> #if !PLATFORM(IOS)
</span><span class="cx">
</span><ins>+#import <PDFKit/PDFKit.h>
</ins><span class="cx"> #import <WebKitLegacy/WebDocumentInternal.h>
</span><span class="cx">
</span><del>-@class PDFDocument;
-@class PDFView;
</del><span class="cx"> @class WebDataSource;
</span><span class="cx">
</span><del>-@interface WebPDFView : NSView <WebDocumentView, WebDocumentSearching, WebDocumentIncrementalSearching, WebMultipleTextMatches, WebDocumentSelection, WebDocumentElement, WebDocumentPDF, _WebDocumentViewState, _WebDocumentZooming>
</del><ins>+#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>
</ins><span class="cx"> {
</span><span class="cx"> NSView *previewView;
</span><span class="cx"> PDFView *PDFSubview;
</span></span></pre></div>
<a id="tagsSafari602130SourceWebKitmacWebViewWebPDFViewmm"></a>
<div class="modfile"><h4>Modified: tags/Safari-602.1.30/Source/WebKit/mac/WebView/WebPDFView.mm (200222 => 200223)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -65,8 +65,6 @@
</span><span class="cx"> #import <wtf/Assertions.h>
</span><span class="cx"> #import <wtf/CurrentTime.h>
</span><span class="cx">
</span><del>-#import <PDFKit/PDFKit.h>
-
</del><span class="cx"> #if USE(APPLE_INTERNAL_SDK)
</span><span class="cx"> #import <ApplicationServices/ApplicationServicesPriv.h>
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="tagsSafari602130SourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: tags/Safari-602.1.30/Source/WebKit2/ChangeLog (200222 => 200223)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-04-28 Matthew Hanson <matthew_hanson@apple.com>
+
+ Merge r200201. rdar://problem/25995376
+
+ 2016-04-28 Daniel Bates <dabates@apple.com>
+
+ 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.
+
</ins><span class="cx"> 2016-04-26 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Uncaught Exception: SecurityError: DOM Exception 18: An attempt was made to break through the security policy of the user agent.
</span></span></pre></div>
<a id="tagsSafari602130SourceWebKit2UIProcessmacWKPrintingViewmm"></a>
<div class="modfile"><h4>Modified: tags/Safari-602.1.30/Source/WebKit2/UIProcess/mac/WKPrintingView.mm (200222 => 200223)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -449,7 +449,10 @@
</span><span class="cx"> CGContextTranslateCTM(context, point.x, point.y);
</span><span class="cx"> CGContextScaleCTM(context, _totalScaleFactorForPrinting, -_totalScaleFactorForPrinting);
</span><span class="cx"> CGContextTranslateCTM(context, 0, -[pdfPage boundsForBox:kPDFDisplayBoxMediaBox].size.height);
</span><ins>+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
</ins><span class="cx"> [pdfPage drawWithBox:kPDFDisplayBoxMediaBox];
</span><ins>+#pragma clang diagnostic pop
</ins><span class="cx">
</span><span class="cx"> CGAffineTransform transform = CGContextGetCTM(context);
</span><span class="cx">
</span></span></pre></div>
<a id="tagsSafari602130SourceWebKit2WebProcessWebPagemacWebPageMacmm"></a>
<div class="modfile"><h4>Modified: tags/Safari-602.1.30/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm (200222 => 200223)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -832,7 +832,10 @@
</span><span class="cx">
</span><span class="cx"> [NSGraphicsContext saveGraphicsState];
</span><span class="cx"> [NSGraphicsContext setCurrentContext:[NSGraphicsContext graphicsContextWithGraphicsPort:context flipped:NO]];
</span><ins>+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
</ins><span class="cx"> [pdfPage drawWithBox:kPDFDisplayBoxCropBox];
</span><ins>+#pragma clang diagnostic pop
</ins><span class="cx"> [NSGraphicsContext restoreGraphicsState];
</span><span class="cx">
</span><span class="cx"> CGAffineTransform transform = CGContextGetCTM(context);
</span></span></pre>
</div>
</div>
</body>
</html>