<!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>[176634] branches/safari-600.3-branch/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/176634">176634</a></dd>
<dt>Author</dt> <dd>dburkart@apple.com</dd>
<dt>Date</dt> <dd>2014-12-02 06:03:45 -0800 (Tue, 02 Dec 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/176412">r176412</a>. rdar://problem/18904600</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6003branchSourceWebCoreChangeLog">branches/safari-600.3-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari6003branchSourceWebCoreWebCoreexpin">branches/safari-600.3-branch/Source/WebCore/WebCore.exp.in</a></li>
<li><a href="#branchessafari6003branchSourceWebCoreeditingcocoaHTMLConverterh">branches/safari-600.3-branch/Source/WebCore/editing/cocoa/HTMLConverter.h</a></li>
<li><a href="#branchessafari6003branchSourceWebCoreeditingcocoaHTMLConvertermm">branches/safari-600.3-branch/Source/WebCore/editing/cocoa/HTMLConverter.mm</a></li>
<li><a href="#branchessafari6003branchSourceWebKitmacChangeLog">branches/safari-600.3-branch/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#branchessafari6003branchSourceWebKitmacWebViewWebActionMenuControllermm">branches/safari-600.3-branch/Source/WebKit/mac/WebView/WebActionMenuController.mm</a></li>
<li><a href="#branchessafari6003branchSourceWebKit2ChangeLog">branches/safari-600.3-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari6003branchSourceWebKit2WebProcessWebPagemacWebPageMacmm">branches/safari-600.3-branch/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6003branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebCore/ChangeLog (176633 => 176634)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebCore/ChangeLog        2014-12-02 13:33:55 UTC (rev 176633)
+++ branches/safari-600.3-branch/Source/WebCore/ChangeLog        2014-12-02 14:03:45 UTC (rev 176634)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2014-12-02 Dana Burkart <dburkart@apple.com>
+
+ Merge r176412. rdar://problem/18904600
+
+ 2014-11-20 Beth Dakin <bdakin@apple.com>
+
+ Invalid message WebPageProxy.DidPerformDictionaryLookup on Google stocks result
+ https://bugs.webkit.org/show_bug.cgi?id=138568
+ -and corresponding-
+ rdar://problem/18904600
+
+ Reviewed by Tim Horton.
+
+ Add an optional parameter indicating whether or not to include images.
+ * WebCore.exp.in:
+ * editing/cocoa/HTMLConverter.h:
+ * editing/cocoa/HTMLConverter.mm:
+ (WebCore::editingAttributedStringFromRange):
+
</ins><span class="cx"> 2014-11-19 Dana Burkart <dburkart@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r176363. rdar://problem/18840128
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebCoreWebCoreexpin"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebCore/WebCore.exp.in (176633 => 176634)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebCore/WebCore.exp.in        2014-12-02 13:33:55 UTC (rev 176633)
+++ branches/safari-600.3-branch/Source/WebCore/WebCore.exp.in        2014-12-02 14:03:45 UTC (rev 176634)
</span><span class="lines">@@ -2343,7 +2343,7 @@
</span><span class="cx"> __ZN7WebCore32applicationIsAOLInstantMessengerEv
</span><span class="cx"> __ZN7WebCore32contextMenuItemTagInspectElementEv
</span><span class="cx"> __ZN7WebCore32contextMenuItemTagSmartCopyPasteEv
</span><del>-__ZN7WebCore32editingAttributedStringFromRangeERNS_5RangeE
</del><ins>+__ZN7WebCore32editingAttributedStringFromRangeERNS_5RangeENS_31IncludeImagesInAttributedStringE
</ins><span class="cx"> __ZN7WebCore32useBlockedPlugInContextMenuTitleEv
</span><span class="cx"> __ZN7WebCore33contextMenuItemTagTextReplacementEv
</span><span class="cx"> __ZN7WebCore33postScriptDocumentTypeDescriptionEv
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebCoreeditingcocoaHTMLConverterh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebCore/editing/cocoa/HTMLConverter.h (176633 => 176634)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebCore/editing/cocoa/HTMLConverter.h        2014-12-02 13:33:55 UTC (rev 176633)
+++ branches/safari-600.3-branch/Source/WebCore/editing/cocoa/HTMLConverter.h        2014-12-02 14:03:45 UTC (rev 176634)
</span><span class="lines">@@ -31,10 +31,12 @@
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> class Range;
</span><ins>+
+enum class IncludeImagesInAttributedString { Yes, No };
</ins><span class="cx">
</span><span class="cx"> NSAttributedString *attributedStringFromRange(Range&);
</span><span class="cx"> #if !PLATFORM(IOS)
</span><del>-NSAttributedString *editingAttributedStringFromRange(Range&);
</del><ins>+NSAttributedString *editingAttributedStringFromRange(Range&, IncludeImagesInAttributedString = IncludeImagesInAttributedString::Yes);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebCoreeditingcocoaHTMLConvertermm"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebCore/editing/cocoa/HTMLConverter.mm (176633 => 176634)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebCore/editing/cocoa/HTMLConverter.mm        2014-12-02 13:33:55 UTC (rev 176633)
+++ branches/safari-600.3-branch/Source/WebCore/editing/cocoa/HTMLConverter.mm        2014-12-02 14:03:45 UTC (rev 176634)
</span><span class="lines">@@ -2552,7 +2552,7 @@
</span><span class="cx">
</span><span class="cx"> #if !PLATFORM(IOS)
</span><span class="cx"> // This function uses TextIterator, which makes offsets in its result compatible with HTML editing.
</span><del>-NSAttributedString *editingAttributedStringFromRange(Range& range)
</del><ins>+NSAttributedString *editingAttributedStringFromRange(Range& range, IncludeImagesInAttributedString includeOrSkipImages)
</ins><span class="cx"> {
</span><span class="cx"> NSFontManager *fontManager = [NSFontManager sharedFontManager];
</span><span class="cx"> NSMutableAttributedString *string = [[NSMutableAttributedString alloc] init];
</span><span class="lines">@@ -2565,14 +2565,16 @@
</span><span class="cx"> Node* endContainer = currentTextRange->endContainer();
</span><span class="cx"> int startOffset = currentTextRange->startOffset();
</span><span class="cx"> int endOffset = currentTextRange->endOffset();
</span><del>-
- if (startContainer == endContainer && (startOffset == endOffset - 1)) {
- Node* node = startContainer->childNode(startOffset);
- if (node && node->hasTagName(imgTag)) {
- NSFileWrapper* fileWrapper = fileWrapperForElement(toElement(node));
- NSTextAttachment* attachment = [[NSTextAttachment alloc] initWithFileWrapper:fileWrapper];
- [string appendAttributedString:[NSAttributedString attributedStringWithAttachment:attachment]];
- [attachment release];
</del><ins>+
+ if (includeOrSkipImages == IncludeImagesInAttributedString::Yes) {
+ if (startContainer == endContainer && (startOffset == endOffset - 1)) {
+ Node* node = startContainer->childNode(startOffset);
+ if (node && node->hasTagName(imgTag)) {
+ NSFileWrapper* fileWrapper = fileWrapperForElement(toElement(node));
+ NSTextAttachment* attachment = [[NSTextAttachment alloc] initWithFileWrapper:fileWrapper];
+ [string appendAttributedString:[NSAttributedString attributedStringWithAttachment:attachment]];
+ [attachment release];
+ }
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebKit/mac/ChangeLog (176633 => 176634)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebKit/mac/ChangeLog        2014-12-02 13:33:55 UTC (rev 176633)
+++ branches/safari-600.3-branch/Source/WebKit/mac/ChangeLog        2014-12-02 14:03:45 UTC (rev 176634)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2014-12-02 Dana Burkart <dburkart@apple.com>
+
+ Merge r176412. rdar://problem/18904600
+
+ 2014-11-20 Beth Dakin <bdakin@apple.com>
+
+ Invalid message WebPageProxy.DidPerformDictionaryLookup on Google stocks result
+ https://bugs.webkit.org/show_bug.cgi?id=138568
+ -and corresponding-
+ rdar://problem/18904600
+
+ Reviewed by Tim Horton.
+
+ Skip images for lookup.
+ * WebView/WebActionMenuController.mm:
+ (performDictionaryLookupForRange):
+
</ins><span class="cx"> 2014-11-19 Dana Burkart <dburkart@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r176356. rdar://problem/18996776
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebKitmacWebViewWebActionMenuControllermm"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebKit/mac/WebView/WebActionMenuController.mm (176633 => 176634)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebKit/mac/WebView/WebActionMenuController.mm        2014-12-02 13:33:55 UTC (rev 176633)
+++ branches/safari-600.3-branch/Source/WebKit/mac/WebView/WebActionMenuController.mm        2014-12-02 14:03:45 UTC (rev 176634)
</span><span class="lines">@@ -665,7 +665,7 @@
</span><span class="cx"> popupInfo.origin = NSMakePoint(rangeRect.x(), rangeRect.y() + (style.fontMetrics().descent() * frame->page()->pageScaleFactor()));
</span><span class="cx"> popupInfo.options = options;
</span><span class="cx">
</span><del>- NSAttributedString *nsAttributedString = editingAttributedStringFromRange(range);
</del><ins>+ NSAttributedString *nsAttributedString = editingAttributedStringFromRange(range, IncludeImagesInAttributedString::No);
</ins><span class="cx"> RetainPtr<NSMutableAttributedString> scaledNSAttributedString = adoptNS([[NSMutableAttributedString alloc] initWithString:[nsAttributedString string]]);
</span><span class="cx"> NSFontManager *fontManager = [NSFontManager sharedFontManager];
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebKit2/ChangeLog (176633 => 176634)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebKit2/ChangeLog        2014-12-02 13:33:55 UTC (rev 176633)
+++ branches/safari-600.3-branch/Source/WebKit2/ChangeLog        2014-12-02 14:03:45 UTC (rev 176634)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2014-12-02 Dana Burkart <dburkart@apple.com>
+
+ Merge r176412. rdar://problem/18904600
+
+ 2014-11-20 Beth Dakin <bdakin@apple.com>
+
+ Invalid message WebPageProxy.DidPerformDictionaryLookup on Google stocks result
+ https://bugs.webkit.org/show_bug.cgi?id=138568
+ -and corresponding-
+ rdar://problem/18904600
+
+ Reviewed by Tim Horton.
+
+ Skip images for lookup.
+ * WebProcess/WebPage/mac/WebPageMac.mm:
+ (WebKit::WebPage::performDictionaryLookupForRange):
+
</ins><span class="cx"> 2014-11-19 Dana Burkart <dburkart@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r176374. rdar://problem/18840128
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebKit2WebProcessWebPagemacWebPageMacmm"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm (176633 => 176634)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm        2014-12-02 13:33:55 UTC (rev 176633)
+++ branches/safari-600.3-branch/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm        2014-12-02 14:03:45 UTC (rev 176634)
</span><span class="lines">@@ -525,7 +525,7 @@
</span><span class="cx"> dictionaryPopupInfo.origin = FloatPoint(rangeRect.x(), rangeRect.y() + (style.fontMetrics().ascent() * pageScaleFactor()));
</span><span class="cx"> dictionaryPopupInfo.options = (CFDictionaryRef)options;
</span><span class="cx">
</span><del>- NSAttributedString *nsAttributedString = editingAttributedStringFromRange(range);
</del><ins>+ NSAttributedString *nsAttributedString = editingAttributedStringFromRange(range, IncludeImagesInAttributedString::No);
</ins><span class="cx">
</span><span class="cx"> RetainPtr<NSMutableAttributedString> scaledNSAttributedString = adoptNS([[NSMutableAttributedString alloc] initWithString:[nsAttributedString string]]);
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>