<!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>[198149] trunk/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/198149">198149</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2016-03-14 13:06:54 -0700 (Mon, 14 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix build.
Source/WebKit/mac:
Ignore nullability warnings, create an empty PDF selection.
* WebView/WebPDFView.mm:
(-[WebPDFView centerSelectionInVisibleArea:]):
(-[WebPDFView searchFor:direction:caseSensitive:wrap:startInSelection:]):
(+[WebPDFView _PDFSelectionClass]):
(-[WebPDFView _nextMatchFor:direction:caseSensitive:wrap:fromSelection:startInSelection:]):
Source/WebKit2:
Create an empty PDF selection.
* Shared/mac/PDFKitImports.h:
* Shared/mac/PDFKitImports.mm:
(WebKit::pdfSelectionClass):
* WebProcess/Plugins/PDF/DeprecatedPDFPlugin.mm:
(WebKit::PDFPlugin::nextMatchForString):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebPDFViewmm">trunk/Source/WebKit/mac/WebView/WebPDFView.mm</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedmacPDFKitImportsh">trunk/Source/WebKit2/Shared/mac/PDFKitImports.h</a></li>
<li><a href="#trunkSourceWebKit2SharedmacPDFKitImportsmm">trunk/Source/WebKit2/Shared/mac/PDFKitImports.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessPluginsPDFDeprecatedPDFPluginmm">trunk/Source/WebKit2/WebProcess/Plugins/PDF/DeprecatedPDFPlugin.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (198148 => 198149)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2016-03-14 19:40:01 UTC (rev 198148)
+++ trunk/Source/WebKit/mac/ChangeLog 2016-03-14 20:06:54 UTC (rev 198149)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2016-03-14 Anders Carlsson <andersca@apple.com>
+
+ Fix build.
+
+ Ignore nullability warnings, create an empty PDF selection.
+
+ * WebView/WebPDFView.mm:
+ (-[WebPDFView centerSelectionInVisibleArea:]):
+ (-[WebPDFView searchFor:direction:caseSensitive:wrap:startInSelection:]):
+ (+[WebPDFView _PDFSelectionClass]):
+ (-[WebPDFView _nextMatchFor:direction:caseSensitive:wrap:fromSelection:startInSelection:]):
+
</ins><span class="cx"> 2016-03-13 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove ENABLE(ES6_TEMPLATE_LITERAL_SYNTAX) guards
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebPDFViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebPDFView.mm (198148 => 198149)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebPDFView.mm 2016-03-14 19:40:01 UTC (rev 198148)
+++ trunk/Source/WebKit/mac/WebView/WebPDFView.mm 2016-03-14 20:06:54 UTC (rev 198149)
</span><span class="lines">@@ -230,7 +230,11 @@
</span><span class="cx">
</span><span class="cx"> - (void)centerSelectionInVisibleArea:(id)sender
</span><span class="cx"> {
</span><ins>+ // FIXME: Get rid of this once <rdar://problem/25149294> has been fixed.
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wnonnull"
</ins><span class="cx"> [PDFSubview scrollSelectionToVisible:nil];
</span><ins>+#pragma clang diagnostic pop
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)scrollPageDown:(id)sender
</span><span class="lines">@@ -662,7 +666,12 @@
</span><span class="cx"> return NO;
</span><span class="cx">
</span><span class="cx"> [PDFSubview setCurrentSelection:selection];
</span><ins>+
+ // FIXME: Get rid of this once <rdar://problem/25149294> has been fixed.
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wnonnull"
</ins><span class="cx"> [PDFSubview scrollSelectionToVisible:nil];
</span><ins>+#pragma clang diagnostic pop
</ins><span class="cx"> return YES;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1095,6 +1104,17 @@
</span><span class="cx"> return PDFViewClass;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>++ (Class)_PDFSelectionClass
+{
+ static Class PDFSelectionClass = nil;
+ if (PDFSelectionClass == nil) {
+ PDFSelectionClass = [[WebPDFView PDFKitBundle] classNamed:@"PDFSelection"];
+ if (!PDFSelectionClass)
+ LOG_ERROR("Couldn't find PDFSelectionClass class in PDFKit.framework");
+ }
+ return PDFSelectionClass;
+}
+
</ins><span class="cx"> - (void)_applyPDFDefaults
</span><span class="cx"> {
</span><span class="cx"> // Set up default viewing params
</span><span class="lines">@@ -1293,10 +1313,12 @@
</span><span class="cx"> // If we first searched in the selection, and we found the selection, search again from just past the selection
</span><span class="cx"> if (startInSelection && _PDFSelectionsAreEqual(foundSelection, initialSelection))
</span><span class="cx"> foundSelection = [document findString:string fromSelection:initialSelection withOptions:options];
</span><ins>+
+ if (!foundSelection && wrapFlag) {
+ auto emptySelection = adoptNS([[[[self class] _PDFViewClass] alloc] initWithDocument:document]);
+ foundSelection = [document findString:string fromSelection:emptySelection.get() withOptions:options];
+ }
</ins><span class="cx">
</span><del>- if (!foundSelection && wrapFlag)
- foundSelection = [document findString:string fromSelection:nil withOptions:options];
-
</del><span class="cx"> return foundSelection;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (198148 => 198149)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-03-14 19:40:01 UTC (rev 198148)
+++ trunk/Source/WebKit2/ChangeLog 2016-03-14 20:06:54 UTC (rev 198149)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2016-03-14 Anders Carlsson <andersca@apple.com>
+
+ Fix build.
+
+ Create an empty PDF selection.
+
+ * Shared/mac/PDFKitImports.h:
+ * Shared/mac/PDFKitImports.mm:
+ (WebKit::pdfSelectionClass):
+ * WebProcess/Plugins/PDF/DeprecatedPDFPlugin.mm:
+ (WebKit::PDFPlugin::nextMatchForString):
+
</ins><span class="cx"> 2016-03-14 Beth Dakin <bdakin@apple.com>
</span><span class="cx">
</span><span class="cx"> Unable to commit previews in Mobile Safari
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedmacPDFKitImportsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/mac/PDFKitImports.h (198148 => 198149)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/mac/PDFKitImports.h 2016-03-14 19:40:01 UTC (rev 198148)
+++ trunk/Source/WebKit2/Shared/mac/PDFKitImports.h 2016-03-14 20:06:54 UTC (rev 198149)
</span><span class="lines">@@ -45,6 +45,7 @@
</span><span class="cx"> Class pdfLayerControllerClass();
</span><span class="cx"> Class pdfAnnotationTextWidgetClass();
</span><span class="cx"> Class pdfAnnotationChoiceWidgetClass();
</span><ins>+Class pdfSelectionClass();
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedmacPDFKitImportsmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/mac/PDFKitImports.mm (198148 => 198149)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/mac/PDFKitImports.mm 2016-03-14 19:40:01 UTC (rev 198148)
+++ trunk/Source/WebKit2/Shared/mac/PDFKitImports.mm 2016-03-14 20:06:54 UTC (rev 198149)
</span><span class="lines">@@ -78,6 +78,14 @@
</span><span class="cx"> ASSERT(pdfAnnotationChoiceWidgetClass);
</span><span class="cx"> return pdfAnnotationChoiceWidgetClass;
</span><span class="cx"> }
</span><ins>+
+Class pdfSelectionClass()
+{
+ static Class pdfSelectionClass = classFromPDFKit(@"PDFSelection");
+ ASSERT(pdfSelectionClass);
+ return pdfSelectionClass;
+}
+
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsPDFDeprecatedPDFPluginmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/PDF/DeprecatedPDFPlugin.mm (198148 => 198149)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Plugins/PDF/DeprecatedPDFPlugin.mm 2016-03-14 19:40:01 UTC (rev 198148)
+++ trunk/Source/WebKit2/WebProcess/Plugins/PDF/DeprecatedPDFPlugin.mm 2016-03-14 20:06:54 UTC (rev 198149)
</span><span class="lines">@@ -1784,8 +1784,10 @@
</span><span class="cx"> if (startInSelection && [foundSelection isEqual:initialSelection])
</span><span class="cx"> foundSelection = [document findString:target fromSelection:initialSelection withOptions:options];
</span><span class="cx">
</span><del>- if (!foundSelection && wrapSearch)
- foundSelection = [document findString:target fromSelection:nil withOptions:options];
</del><ins>+ if (!foundSelection && wrapSearch) {
+ auto emptySelection = adoptNS([[pdfSelectionClass() alloc] initWithDocument:document]);
+ foundSelection = [document findString:target fromSelection:emptySelection.get() withOptions:options];
+ }
</ins><span class="cx">
</span><span class="cx"> return foundSelection;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>