<!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>[160193] 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/160193">160193</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2013-12-05 14:30:40 -0800 (Thu, 05 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>"Use Selection for Find" doesn't work in PDF viewed in Safari
https://bugs.webkit.org/show_bug.cgi?id=125319
<rdar://problem/15486983>
Reviewed by Tim Horton.
* WebProcess/Plugins/PDF/PDFPlugin.h:
* WebProcess/Plugins/PDF/PDFPlugin.mm:
(-[WKPDFLayerControllerDelegate writeItemsToPasteboard:withTypes:]):
Pass NSGeneralPboard to writeItemsToPasteboard.
(WebKit::PDFPlugin::handleEditingCommand):
Handle takeFindStringFromSelection by getting the current selection string and writing it to the find pasteboard.
(WebKit::PDFPlugin::isEditingCommandEnabled):
Handle takeFindStringFromSelection.
(WebKit::PDFPlugin::writeItemsToPasteboard):
Update this to take a pasteboard name.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessPluginsPDFPDFPluginh">trunk/Source/WebKit2/WebProcess/Plugins/PDF/PDFPlugin.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessPluginsPDFPDFPluginmm">trunk/Source/WebKit2/WebProcess/Plugins/PDF/PDFPlugin.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (160192 => 160193)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2013-12-05 21:59:44 UTC (rev 160192)
+++ trunk/Source/WebKit2/ChangeLog 2013-12-05 22:30:40 UTC (rev 160193)
</span><span class="lines">@@ -1,5 +1,27 @@
</span><span class="cx"> 2013-12-05 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><ins>+ "Use Selection for Find" doesn't work in PDF viewed in Safari
+ https://bugs.webkit.org/show_bug.cgi?id=125319
+ <rdar://problem/15486983>
+
+ Reviewed by Tim Horton.
+
+ * WebProcess/Plugins/PDF/PDFPlugin.h:
+ * WebProcess/Plugins/PDF/PDFPlugin.mm:
+ (-[WKPDFLayerControllerDelegate writeItemsToPasteboard:withTypes:]):
+ Pass NSGeneralPboard to writeItemsToPasteboard.
+
+ (WebKit::PDFPlugin::handleEditingCommand):
+ Handle takeFindStringFromSelection by getting the current selection string and writing it to the find pasteboard.
+
+ (WebKit::PDFPlugin::isEditingCommandEnabled):
+ Handle takeFindStringFromSelection.
+
+ (WebKit::PDFPlugin::writeItemsToPasteboard):
+ Update this to take a pasteboard name.
+
+2013-12-05 Anders Carlsson <andersca@apple.com>
+
</ins><span class="cx"> WebKit2 API should use weak ownership for delegate properties rather than assign
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=125316
</span><span class="cx"> <rdar://problem/15560614>
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsPDFPDFPluginh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/PDF/PDFPlugin.h (160192 => 160193)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Plugins/PDF/PDFPlugin.h 2013-12-05 21:59:44 UTC (rev 160192)
+++ trunk/Source/WebKit2/WebProcess/Plugins/PDF/PDFPlugin.h 2013-12-05 22:30:40 UTC (rev 160193)
</span><span class="lines">@@ -88,7 +88,7 @@
</span><span class="cx"> void clickedLink(NSURL *);
</span><span class="cx"> void saveToPDF();
</span><span class="cx"> void openWithNativeApplication();
</span><del>- void writeItemsToPasteboard(NSArray *items, NSArray *types);
</del><ins>+ void writeItemsToPasteboard(NSString *pasteboardName, NSArray *items, NSArray *types);
</ins><span class="cx"> void showDefinitionForAttributedString(NSAttributedString *, CGPoint);
</span><span class="cx"> void performWebSearch(NSString *);
</span><span class="cx"> void performSpotlightSearch(NSString *);
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsPDFPDFPluginmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/PDF/PDFPlugin.mm (160192 => 160193)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Plugins/PDF/PDFPlugin.mm 2013-12-05 21:59:44 UTC (rev 160192)
+++ trunk/Source/WebKit2/WebProcess/Plugins/PDF/PDFPlugin.mm 2013-12-05 22:30:40 UTC (rev 160193)
</span><span class="lines">@@ -335,7 +335,7 @@
</span><span class="cx">
</span><span class="cx"> - (void)writeItemsToPasteboard:(NSArray *)items withTypes:(NSArray *)types
</span><span class="cx"> {
</span><del>- _pdfPlugin->writeItemsToPasteboard(items, types);
</del><ins>+ _pdfPlugin->writeItemsToPasteboard(NSGeneralPboard, items, types);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)showDefinitionForAttributedString:(NSAttributedString *)string atPoint:(CGPoint)point
</span><span class="lines">@@ -1480,17 +1480,22 @@
</span><span class="cx"> bool PDFPlugin::handleEditingCommand(const String& commandName, const String& argument)
</span><span class="cx"> {
</span><span class="cx"> if (commandName == "copy")
</span><del>- [m_pdfLayerController.get() copySelection];
</del><ins>+ [m_pdfLayerController copySelection];
</ins><span class="cx"> else if (commandName == "selectAll")
</span><del>- [m_pdfLayerController.get() selectAll];
-
</del><ins>+ [m_pdfLayerController selectAll];
+ else if (commandName == "takeFindStringFromSelection") {
+ NSString *string = [m_pdfLayerController currentSelection].string;
+ if (string.length)
+ writeItemsToPasteboard(NSFindPboard, @[ [string dataUsingEncoding:NSUTF8StringEncoding] ], @[ NSPasteboardTypeString ]);
+ }
+
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool PDFPlugin::isEditingCommandEnabled(const String& commandName)
</span><span class="cx"> {
</span><del>- if (commandName == "copy")
- return [m_pdfLayerController.get() currentSelection];
</del><ins>+ if (commandName == "copy" || commandName == "takeFindStringFromSelection")
+ return [m_pdfLayerController currentSelection];
</ins><span class="cx">
</span><span class="cx"> if (commandName == "selectAll")
</span><span class="cx"> return true;
</span><span class="lines">@@ -1630,7 +1635,7 @@
</span><span class="cx"> webFrame()->page()->send(Messages::WebPageProxy::OpenPDFFromTemporaryFolderWithNativeApplication(m_temporaryPDFUUID));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void PDFPlugin::writeItemsToPasteboard(NSArray *items, NSArray *types)
</del><ins>+void PDFPlugin::writeItemsToPasteboard(NSString *pasteboardName, NSArray *items, NSArray *types)
</ins><span class="cx"> {
</span><span class="cx"> Vector<String> pasteboardTypes;
</span><span class="cx">
</span><span class="lines">@@ -1638,7 +1643,7 @@
</span><span class="cx"> pasteboardTypes.append(type);
</span><span class="cx">
</span><span class="cx"> uint64_t newChangeCount;
</span><del>- WebProcess::shared().parentProcessConnection()->sendSync(Messages::WebContext::SetPasteboardTypes(NSGeneralPboard, pasteboardTypes),
</del><ins>+ WebProcess::shared().parentProcessConnection()->sendSync(Messages::WebContext::SetPasteboardTypes(pasteboardName, pasteboardTypes),
</ins><span class="cx"> Messages::WebContext::SetPasteboardTypes::Reply(newChangeCount), 0);
</span><span class="cx">
</span><span class="cx"> for (NSUInteger i = 0, count = items.count; i < count; ++i) {
</span><span class="lines">@@ -1653,7 +1658,7 @@
</span><span class="cx">
</span><span class="cx"> if ([type isEqualToString:NSStringPboardType] || [type isEqualToString:NSPasteboardTypeString]) {
</span><span class="cx"> RetainPtr<NSString> plainTextString = adoptNS([[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding]);
</span><del>- WebProcess::shared().parentProcessConnection()->sendSync(Messages::WebContext::SetPasteboardStringForType(NSGeneralPboard, type, plainTextString.get()),
</del><ins>+ WebProcess::shared().parentProcessConnection()->sendSync(Messages::WebContext::SetPasteboardStringForType(pasteboardName, type, plainTextString.get()),
</ins><span class="cx"> Messages::WebContext::SetPasteboardStringForType::Reply(newChangeCount), 0);
</span><span class="cx"> } else {
</span><span class="cx"> RefPtr<SharedBuffer> buffer = SharedBuffer::wrapNSData(data);
</span><span class="lines">@@ -1665,7 +1670,7 @@
</span><span class="cx"> RefPtr<SharedMemory> sharedMemory = SharedMemory::create(buffer->size());
</span><span class="cx"> memcpy(sharedMemory->data(), buffer->data(), buffer->size());
</span><span class="cx"> sharedMemory->createHandle(handle, SharedMemory::ReadOnly);
</span><del>- WebProcess::shared().parentProcessConnection()->sendSync(Messages::WebContext::SetPasteboardBufferForType(NSGeneralPboard, type, handle, buffer->size()),
</del><ins>+ WebProcess::shared().parentProcessConnection()->sendSync(Messages::WebContext::SetPasteboardBufferForType(pasteboardName, type, handle, buffer->size()),
</ins><span class="cx"> Messages::WebContext::SetPasteboardBufferForType::Reply(newChangeCount), 0);
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>