<!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>[200957] trunk/Source/WebKit2</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/200957">200957</a></dd>
<dt>Author</dt> <dd>conrad_shultz@apple.com</dd>
<dt>Date</dt> <dd>2016-05-16 12:20:40 -0700 (Mon, 16 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix some deprecation warnings.
* UIProcess/mac/WKPrintingView.mm:
(-[WKPrintingView _drawPDFDocument:page:atPoint:]):
* WebProcess/Plugins/PDF/DeprecatedPDFPlugin.mm:
(WebKit::PDFPlugin::setActiveAnnotation):
(WebKit::PDFPlugin::lookupTextAtLocation):
* WebProcess/Plugins/PDF/PDFPluginChoiceAnnotation.h:
* WebProcess/Plugins/PDF/PDFPluginChoiceAnnotation.mm:
(WebKit::PDFPluginChoiceAnnotation::createAnnotationElement):
* WebProcess/Plugins/PDF/PDFPluginTextAnnotation.h:
* WebProcess/Plugins/PDF/PDFPluginTextAnnotation.mm:
(WebKit::PDFPluginTextAnnotation::createAnnotationElement):
* WebProcess/WebPage/mac/WebPageMac.mm:
(WebKit::drawPDFPage):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacWKPrintingViewmm">trunk/Source/WebKit2/UIProcess/mac/WKPrintingView.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessPluginsPDFDeprecatedPDFPluginmm">trunk/Source/WebKit2/WebProcess/Plugins/PDF/DeprecatedPDFPlugin.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessPluginsPDFPDFPluginChoiceAnnotationh">trunk/Source/WebKit2/WebProcess/Plugins/PDF/PDFPluginChoiceAnnotation.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessPluginsPDFPDFPluginChoiceAnnotationmm">trunk/Source/WebKit2/WebProcess/Plugins/PDF/PDFPluginChoiceAnnotation.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessPluginsPDFPDFPluginTextAnnotationh">trunk/Source/WebKit2/WebProcess/Plugins/PDF/PDFPluginTextAnnotation.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessPluginsPDFPDFPluginTextAnnotationmm">trunk/Source/WebKit2/WebProcess/Plugins/PDF/PDFPluginTextAnnotation.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPagemacWebPageMacmm">trunk/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (200956 => 200957)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-05-16 18:57:28 UTC (rev 200956)
+++ trunk/Source/WebKit2/ChangeLog 2016-05-16 19:20:40 UTC (rev 200957)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2016-05-16 Conrad Shultz <conrad_shultz@apple.com>
+
+ Fix some deprecation warnings.
+
+ * UIProcess/mac/WKPrintingView.mm:
+ (-[WKPrintingView _drawPDFDocument:page:atPoint:]):
+ * WebProcess/Plugins/PDF/DeprecatedPDFPlugin.mm:
+ (WebKit::PDFPlugin::setActiveAnnotation):
+ (WebKit::PDFPlugin::lookupTextAtLocation):
+ * WebProcess/Plugins/PDF/PDFPluginChoiceAnnotation.h:
+ * WebProcess/Plugins/PDF/PDFPluginChoiceAnnotation.mm:
+ (WebKit::PDFPluginChoiceAnnotation::createAnnotationElement):
+ * WebProcess/Plugins/PDF/PDFPluginTextAnnotation.h:
+ * WebProcess/Plugins/PDF/PDFPluginTextAnnotation.mm:
+ (WebKit::PDFPluginTextAnnotation::createAnnotationElement):
+ * WebProcess/WebPage/mac/WebPageMac.mm:
+ (WebKit::drawPDFPage):
+
</ins><span class="cx"> 2016-04-06 Jer Noble <jer.noble@apple.com>
</span><span class="cx">
</span><span class="cx"> [WK2] Add API to WKWebViewConfiguration to control autoplay policy.
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacWKPrintingViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/WKPrintingView.mm (200956 => 200957)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/WKPrintingView.mm 2016-05-16 18:57:28 UTC (rev 200956)
+++ trunk/Source/WebKit2/UIProcess/mac/WKPrintingView.mm 2016-05-16 19:20:40 UTC (rev 200957)
</span><span class="lines">@@ -460,7 +460,10 @@
</span><span class="cx"> if (![annotation isKindOfClass:pdfAnnotationLinkClass()])
</span><span class="cx"> continue;
</span><span class="cx">
</span><ins>+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
</ins><span class="cx"> PDFAnnotationLink *linkAnnotation = (PDFAnnotationLink *)annotation;
</span><ins>+#pragma clang diagnostic pop
</ins><span class="cx"> NSURL *url = [linkAnnotation URL];
</span><span class="cx"> if (!url)
</span><span class="cx"> continue;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsPDFDeprecatedPDFPluginmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/PDF/DeprecatedPDFPlugin.mm (200956 => 200957)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Plugins/PDF/DeprecatedPDFPlugin.mm 2016-05-16 18:57:28 UTC (rev 200956)
+++ trunk/Source/WebKit2/WebProcess/Plugins/PDF/DeprecatedPDFPlugin.mm 2016-05-16 19:20:40 UTC (rev 200957)
</span><span class="lines">@@ -1617,10 +1617,13 @@
</span><span class="cx"> m_activeAnnotation->commit();
</span><span class="cx">
</span><span class="cx"> if (annotation) {
</span><ins>+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
</ins><span class="cx"> if ([annotation isKindOfClass:pdfAnnotationTextWidgetClass()] && static_cast<PDFAnnotationTextWidget *>(annotation).isReadOnly) {
</span><span class="cx"> m_activeAnnotation = nullptr;
</span><span class="cx"> return;
</span><span class="cx"> }
</span><ins>+#pragma clang diagnostic pop
</ins><span class="cx">
</span><span class="cx"> m_activeAnnotation = PDFPluginAnnotation::create(annotation, m_pdfLayerController.get(), this);
</span><span class="cx"> m_activeAnnotation->attach(m_annotationContainer.get());
</span><span class="lines">@@ -1941,8 +1944,11 @@
</span><span class="cx"> NSRect bounds = annotation.bounds;
</span><span class="cx"> if (!NSPointInRect(pointInPageSpace, bounds))
</span><span class="cx"> continue;
</span><del>-
</del><ins>+
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
</ins><span class="cx"> PDFAnnotationLink *linkAnnotation = (PDFAnnotationLink *)annotation;
</span><ins>+#pragma clang diagnostic pop
</ins><span class="cx"> NSURL *url = linkAnnotation.URL;
</span><span class="cx"> if (!url)
</span><span class="cx"> continue;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsPDFPDFPluginChoiceAnnotationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/PDF/PDFPluginChoiceAnnotation.h (200956 => 200957)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Plugins/PDF/PDFPluginChoiceAnnotation.h 2016-05-16 18:57:28 UTC (rev 200956)
+++ trunk/Source/WebKit2/WebProcess/Plugins/PDF/PDFPluginChoiceAnnotation.h 2016-05-16 19:20:40 UTC (rev 200957)
</span><span class="lines">@@ -53,7 +53,10 @@
</span><span class="cx">
</span><span class="cx"> PassRefPtr<WebCore::Element> createAnnotationElement() override;
</span><span class="cx">
</span><ins>+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
</ins><span class="cx"> PDFAnnotationChoiceWidget *choiceAnnotation() { return static_cast<PDFAnnotationChoiceWidget *>(annotation()); }
</span><ins>+#pragma clang diagnostic pop
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsPDFPDFPluginChoiceAnnotationmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/PDF/PDFPluginChoiceAnnotation.mm (200956 => 200957)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Plugins/PDF/PDFPluginChoiceAnnotation.mm 2016-05-16 18:57:28 UTC (rev 200956)
+++ trunk/Source/WebKit2/WebProcess/Plugins/PDF/PDFPluginChoiceAnnotation.mm 2016-05-16 19:20:40 UTC (rev 200957)
</span><span class="lines">@@ -69,7 +69,10 @@
</span><span class="cx"> PassRefPtr<Element> PDFPluginChoiceAnnotation::createAnnotationElement()
</span><span class="cx"> {
</span><span class="cx"> Document& document = parent()->document();
</span><ins>+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
</ins><span class="cx"> PDFAnnotationChoiceWidget *choiceAnnotation = this->choiceAnnotation();
</span><ins>+#pragma clang diagnostic pop
</ins><span class="cx">
</span><span class="cx"> RefPtr<Element> element = document.createElement(selectTag, false);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsPDFPDFPluginTextAnnotationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/PDF/PDFPluginTextAnnotation.h (200956 => 200957)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Plugins/PDF/PDFPluginTextAnnotation.h 2016-05-16 18:57:28 UTC (rev 200956)
+++ trunk/Source/WebKit2/WebProcess/Plugins/PDF/PDFPluginTextAnnotation.h 2016-05-16 19:20:40 UTC (rev 200957)
</span><span class="lines">@@ -60,7 +60,10 @@
</span><span class="cx"> private:
</span><span class="cx"> bool handleEvent(WebCore::Event*) override;
</span><span class="cx">
</span><ins>+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
</ins><span class="cx"> PDFAnnotationTextWidget *textAnnotation() const { return static_cast<PDFAnnotationTextWidget *>(annotation()); }
</span><ins>+#pragma clang diagnostic pop
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsPDFPDFPluginTextAnnotationmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/PDF/PDFPluginTextAnnotation.mm (200956 => 200957)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Plugins/PDF/PDFPluginTextAnnotation.mm 2016-05-16 18:57:28 UTC (rev 200956)
+++ trunk/Source/WebKit2/WebProcess/Plugins/PDF/PDFPluginTextAnnotation.mm 2016-05-16 19:20:40 UTC (rev 200957)
</span><span class="lines">@@ -86,7 +86,10 @@
</span><span class="cx"> RefPtr<Element> element;
</span><span class="cx">
</span><span class="cx"> Document& document = parent()->document();
</span><ins>+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
</ins><span class="cx"> PDFAnnotationTextWidget *textAnnotation = this->textAnnotation();
</span><ins>+#pragma clang diagnostic pop
</ins><span class="cx"> bool isMultiline = textAnnotation.isMultiline;
</span><span class="cx">
</span><span class="cx"> if (isMultiline)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagemacWebPageMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm (200956 => 200957)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm 2016-05-16 18:57:28 UTC (rev 200956)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm 2016-05-16 19:20:40 UTC (rev 200957)
</span><span class="lines">@@ -844,7 +844,10 @@
</span><span class="cx"> if (![annotation isKindOfClass:pdfAnnotationLinkClass()])
</span><span class="cx"> continue;
</span><span class="cx">
</span><ins>+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
</ins><span class="cx"> PDFAnnotationLink *linkAnnotation = (PDFAnnotationLink *)annotation;
</span><ins>+#pragma clang diagnostic pop
</ins><span class="cx"> NSURL *url = [linkAnnotation URL];
</span><span class="cx"> if (!url)
</span><span class="cx"> continue;
</span></span></pre>
</div>
</div>
</body>
</html>