Diff
Modified: trunk/Source/WebKit2/ChangeLog (200956 => 200957)
--- 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)
@@ -1,3 +1,21 @@
+2016-05-16 Conrad Shultz <conrad_shu...@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):
+
2016-04-06 Jer Noble <jer.no...@apple.com>
[WK2] Add API to WKWebViewConfiguration to control autoplay policy.
Modified: trunk/Source/WebKit2/UIProcess/mac/WKPrintingView.mm (200956 => 200957)
--- 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)
@@ -460,7 +460,10 @@
if (![annotation isKindOfClass:pdfAnnotationLinkClass()])
continue;
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
PDFAnnotationLink *linkAnnotation = (PDFAnnotationLink *)annotation;
+#pragma clang diagnostic pop
NSURL *url = "" URL];
if (!url)
continue;
Modified: trunk/Source/WebKit2/WebProcess/Plugins/PDF/DeprecatedPDFPlugin.mm (200956 => 200957)
--- 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)
@@ -1617,10 +1617,13 @@
m_activeAnnotation->commit();
if (annotation) {
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
if ([annotation isKindOfClass:pdfAnnotationTextWidgetClass()] && static_cast<PDFAnnotationTextWidget *>(annotation).isReadOnly) {
m_activeAnnotation = nullptr;
return;
}
+#pragma clang diagnostic pop
m_activeAnnotation = PDFPluginAnnotation::create(annotation, m_pdfLayerController.get(), this);
m_activeAnnotation->attach(m_annotationContainer.get());
@@ -1941,8 +1944,11 @@
NSRect bounds = annotation.bounds;
if (!NSPointInRect(pointInPageSpace, bounds))
continue;
-
+
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
PDFAnnotationLink *linkAnnotation = (PDFAnnotationLink *)annotation;
+#pragma clang diagnostic pop
NSURL *url = ""
if (!url)
continue;
Modified: trunk/Source/WebKit2/WebProcess/Plugins/PDF/PDFPluginChoiceAnnotation.h (200956 => 200957)
--- 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)
@@ -53,7 +53,10 @@
PassRefPtr<WebCore::Element> createAnnotationElement() override;
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
PDFAnnotationChoiceWidget *choiceAnnotation() { return static_cast<PDFAnnotationChoiceWidget *>(annotation()); }
+#pragma clang diagnostic pop
};
} // namespace WebKit
Modified: trunk/Source/WebKit2/WebProcess/Plugins/PDF/PDFPluginChoiceAnnotation.mm (200956 => 200957)
--- 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)
@@ -69,7 +69,10 @@
PassRefPtr<Element> PDFPluginChoiceAnnotation::createAnnotationElement()
{
Document& document = parent()->document();
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
PDFAnnotationChoiceWidget *choiceAnnotation = this->choiceAnnotation();
+#pragma clang diagnostic pop
RefPtr<Element> element = document.createElement(selectTag, false);
Modified: trunk/Source/WebKit2/WebProcess/Plugins/PDF/PDFPluginTextAnnotation.h (200956 => 200957)
--- 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)
@@ -60,7 +60,10 @@
private:
bool handleEvent(WebCore::Event*) override;
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
PDFAnnotationTextWidget *textAnnotation() const { return static_cast<PDFAnnotationTextWidget *>(annotation()); }
+#pragma clang diagnostic pop
};
} // namespace WebKit
Modified: trunk/Source/WebKit2/WebProcess/Plugins/PDF/PDFPluginTextAnnotation.mm (200956 => 200957)
--- 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)
@@ -86,7 +86,10 @@
RefPtr<Element> element;
Document& document = parent()->document();
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
PDFAnnotationTextWidget *textAnnotation = this->textAnnotation();
+#pragma clang diagnostic pop
bool isMultiline = textAnnotation.isMultiline;
if (isMultiline)
Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm (200956 => 200957)
--- 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)
@@ -844,7 +844,10 @@
if (![annotation isKindOfClass:pdfAnnotationLinkClass()])
continue;
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
PDFAnnotationLink *linkAnnotation = (PDFAnnotationLink *)annotation;
+#pragma clang diagnostic pop
NSURL *url = "" URL];
if (!url)
continue;
