<!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>[184301] branches/safari-601.1.32-branch</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/184301">184301</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2015-05-13 13:10:18 -0700 (Wed, 13 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/183976">r183976</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari601132branchSourceWebCoreChangeLog">branches/safari-601.1.32-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari601132branchSourceWebCoreaccessibilitymacWebAccessibilityObjectWrapperMacmm">branches/safari-601.1.32-branch/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm</a></li>
<li><a href="#branchessafari601132branchSourceWebCoreeditingcocoaHTMLConvertermm">branches/safari-601.1.32-branch/Source/WebCore/editing/cocoa/HTMLConverter.mm</a></li>
<li><a href="#branchessafari601132branchSourceWebCoreplatformmacPasteboardMacmm">branches/safari-601.1.32-branch/Source/WebCore/platform/mac/PasteboardMac.mm</a></li>
<li><a href="#branchessafari601132branchSourceWebCoreplatformmacPlatformPasteboardMacmm">branches/safari-601.1.32-branch/Source/WebCore/platform/mac/PlatformPasteboardMac.mm</a></li>
<li><a href="#branchessafari601132branchSourceWebCorerenderingRenderThemeMacmm">branches/safari-601.1.32-branch/Source/WebCore/rendering/RenderThemeMac.mm</a></li>
<li><a href="#branchessafari601132branchSourceWebKitmacChangeLog">branches/safari-601.1.32-branch/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#branchessafari601132branchSourceWebKitmacMiscWebNSPasteboardExtrasmm">branches/safari-601.1.32-branch/Source/WebKit/mac/Misc/WebNSPasteboardExtras.mm</a></li>
<li><a href="#branchessafari601132branchSourceWebKitmacWebViewWebHTMLViewmm">branches/safari-601.1.32-branch/Source/WebKit/mac/WebView/WebHTMLView.mm</a></li>
<li><a href="#branchessafari601132branchSourceWebKitmacWebViewWebPDFViewmm">branches/safari-601.1.32-branch/Source/WebKit/mac/WebView/WebPDFView.mm</a></li>
<li><a href="#branchessafari601132branchSourceWebKitmacWebViewWebViewmm">branches/safari-601.1.32-branch/Source/WebKit/mac/WebView/WebView.mm</a></li>
<li><a href="#branchessafari601132branchSourceWebKit2ChangeLog">branches/safari-601.1.32-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari601132branchSourceWebKit2UIProcessAPImacWKViewmm">branches/safari-601.1.32-branch/Source/WebKit2/UIProcess/API/mac/WKView.mm</a></li>
<li><a href="#branchessafari601132branchSourceWebKit2UIProcessmacWKSharingServicePickerDelegatemm">branches/safari-601.1.32-branch/Source/WebKit2/UIProcess/mac/WKSharingServicePickerDelegate.mm</a></li>
<li><a href="#branchessafari601132branchSourceWebKit2WebProcessWebPagemacWebPageMacmm">branches/safari-601.1.32-branch/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm</a></li>
<li><a href="#branchessafari601132branchToolsChangeLog">branches/safari-601.1.32-branch/Tools/ChangeLog</a></li>
<li><a href="#branchessafari601132branchToolsTestWebKitAPITestsmacHTMLCollectionNamedItemmm">branches/safari-601.1.32-branch/Tools/TestWebKitAPI/Tests/mac/HTMLCollectionNamedItem.mm</a></li>
<li><a href="#branchessafari601132branchToolsTestWebKitAPITestsmacHTMLFormCollectionNamedItemmm">branches/safari-601.1.32-branch/Tools/TestWebKitAPI/Tests/mac/HTMLFormCollectionNamedItem.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari601132branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/Source/WebCore/ChangeLog (184300 => 184301)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/Source/WebCore/ChangeLog 2015-05-13 20:08:35 UTC (rev 184300)
+++ branches/safari-601.1.32-branch/Source/WebCore/ChangeLog 2015-05-13 20:10:18 UTC (rev 184301)
</span><span class="lines">@@ -1,5 +1,27 @@
</span><span class="cx"> 2015-05-13 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><ins>+ Merge r183976.
+
+ 2015-05-07 Anders Carlsson <andersca@apple.com>
+
+ Build fixes.
+
+ * accessibility/mac/WebAccessibilityObjectWrapperMac.mm:
+ (-[WebAccessibilityObjectWrapper doAXRTFForRange:]):
+ * editing/cocoa/HTMLConverter.mm:
+ (HTMLConverter::_addMarkersToList):
+ * platform/mac/PasteboardMac.mm:
+ (WebCore::writeFileWrapperAsRTFDAttachment):
+ * platform/mac/PlatformPasteboardMac.mm:
+ (WebCore::PlatformPasteboard::setTypes):
+ Pass empty arrays and dictionaries instead of nil.
+
+ * rendering/RenderThemeMac.mm:
+ (WebCore::RenderThemeMac::paintSliderThumb):
+ Pass the document view to the AppKit paint method.
+
+2015-05-13 Babak Shafiei <bshafiei@apple.com>
+
</ins><span class="cx"> Merge r183958.
</span><span class="cx">
</span><span class="cx"> 2015-05-07 Anders Carlsson <andersca@apple.com>
</span></span></pre></div>
<a id="branchessafari601132branchSourceWebCoreaccessibilitymacWebAccessibilityObjectWrapperMacmm"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm (184300 => 184301)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm 2015-05-13 20:08:35 UTC (rev 184300)
+++ branches/safari-601.1.32-branch/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm 2015-05-13 20:10:18 UTC (rev 184301)
</span><span class="lines">@@ -3481,7 +3481,7 @@
</span><span class="cx"> - (NSData*)doAXRTFForRange:(NSRange)range
</span><span class="cx"> {
</span><span class="cx"> NSAttributedString* attrString = [self doAXAttributedStringForRange:range];
</span><del>- return [attrString RTFFromRange: NSMakeRange(0, [attrString length]) documentAttributes: nil];
</del><ins>+ return [attrString RTFFromRange: NSMakeRange(0, [attrString length]) documentAttributes:@{ }];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (id)accessibilityAttributeValue:(NSString*)attribute forParameter:(id)parameter
</span></span></pre></div>
<a id="branchessafari601132branchSourceWebCoreeditingcocoaHTMLConvertermm"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/Source/WebCore/editing/cocoa/HTMLConverter.mm (184300 => 184301)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/Source/WebCore/editing/cocoa/HTMLConverter.mm 2015-05-13 20:08:35 UTC (rev 184300)
+++ branches/safari-601.1.32-branch/Source/WebCore/editing/cocoa/HTMLConverter.mm 2015-05-13 20:10:18 UTC (rev 184301)
</span><span class="lines">@@ -2144,9 +2144,9 @@
</span><span class="cx"> [newStyle addTabStop:tab];
</span><span class="cx"> [tab release];
</span><span class="cx"> #if PLATFORM(IOS)
</span><del>- tab = [[PlatformNSTextTab alloc] initWithTextAlignment:NSTextAlignmentNatural location:listLocation options:nil];
</del><ins>+ tab = [[PlatformNSTextTab alloc] initWithTextAlignment:NSTextAlignmentNatural location:listLocation options:@{ }];
</ins><span class="cx"> #else
</span><del>- tab = [[PlatformNSTextTab alloc] initWithTextAlignment:NSNaturalTextAlignment location:listLocation options:nil];
</del><ins>+ tab = [[PlatformNSTextTab alloc] initWithTextAlignment:NSNaturalTextAlignment location:listLocation options:@{ }];
</ins><span class="cx"> #endif
</span><span class="cx"> [newStyle addTabStop:tab];
</span><span class="cx"> [tab release];
</span></span></pre></div>
<a id="branchessafari601132branchSourceWebCoreplatformmacPasteboardMacmm"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/Source/WebCore/platform/mac/PasteboardMac.mm (184300 => 184301)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/Source/WebCore/platform/mac/PasteboardMac.mm 2015-05-13 20:08:35 UTC (rev 184300)
+++ branches/safari-601.1.32-branch/Source/WebCore/platform/mac/PasteboardMac.mm 2015-05-13 20:10:18 UTC (rev 184301)
</span><span class="lines">@@ -246,7 +246,7 @@
</span><span class="cx"> NSAttributedString *string = [NSAttributedString attributedStringWithAttachment:attachment];
</span><span class="cx"> [attachment release];
</span><span class="cx">
</span><del>- NSData *RTFDData = [string RTFDFromRange:NSMakeRange(0, [string length]) documentAttributes:nil];
</del><ins>+ NSData *RTFDData = [string RTFDFromRange:NSMakeRange(0, [string length]) documentAttributes:@{ }];
</ins><span class="cx"> if (!RTFDData)
</span><span class="cx"> return;
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari601132branchSourceWebCoreplatformmacPlatformPasteboardMacmm"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/Source/WebCore/platform/mac/PlatformPasteboardMac.mm (184300 => 184301)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/Source/WebCore/platform/mac/PlatformPasteboardMac.mm 2015-05-13 20:08:35 UTC (rev 184300)
+++ branches/safari-601.1.32-branch/Source/WebCore/platform/mac/PlatformPasteboardMac.mm 2015-05-13 20:10:18 UTC (rev 184301)
</span><span class="lines">@@ -126,7 +126,7 @@
</span><span class="cx"> long PlatformPasteboard::setTypes(const Vector<String>& pasteboardTypes)
</span><span class="cx"> {
</span><span class="cx"> if (pasteboardTypes.isEmpty())
</span><del>- return [m_pasteboard.get() declareTypes:nil owner:nil];
</del><ins>+ return [m_pasteboard declareTypes:@[] owner:nil];
</ins><span class="cx">
</span><span class="cx"> RetainPtr<NSMutableArray> types = adoptNS([[NSMutableArray alloc] init]);
</span><span class="cx"> for (size_t i = 0; i < pasteboardTypes.size(); ++i)
</span></span></pre></div>
<a id="branchessafari601132branchSourceWebCorerenderingRenderThemeMacmm"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/Source/WebCore/rendering/RenderThemeMac.mm (184300 => 184301)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/Source/WebCore/rendering/RenderThemeMac.mm 2015-05-13 20:08:35 UTC (rev 184300)
+++ branches/safari-601.1.32-branch/Source/WebCore/rendering/RenderThemeMac.mm 2015-05-13 20:10:18 UTC (rev 184301)
</span><span class="lines">@@ -1542,11 +1542,13 @@
</span><span class="cx"> else
</span><span class="cx"> m_isSliderThumbHorizontalPressed = pressed;
</span><span class="cx">
</span><ins>+ NSView *view = documentViewFor(o);
+
</ins><span class="cx"> if (pressed != oldPressed) {
</span><span class="cx"> if (pressed)
</span><del>- [sliderThumbCell startTrackingAt:NSPoint() inView:nil];
</del><ins>+ [sliderThumbCell startTrackingAt:NSPoint() inView:view];
</ins><span class="cx"> else
</span><del>- [sliderThumbCell stopTracking:NSPoint() at:NSPoint() inView:nil mouseIsUp:YES];
</del><ins>+ [sliderThumbCell stopTracking:NSPoint() at:NSPoint() inView:view mouseIsUp:YES];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> FloatRect bounds = r;
</span><span class="lines">@@ -1566,7 +1568,7 @@
</span><span class="cx"> paintInfo.context->translate(-unzoomedRect.x(), -unzoomedRect.y());
</span><span class="cx"> }
</span><span class="cx">
</span><del>- [sliderThumbCell drawInteriorWithFrame:unzoomedRect inView:documentViewFor(o)];
</del><ins>+ [sliderThumbCell drawInteriorWithFrame:unzoomedRect inView:view];
</ins><span class="cx"> [sliderThumbCell setControlView:nil];
</span><span class="cx">
</span><span class="cx"> return false;
</span></span></pre></div>
<a id="branchessafari601132branchSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/Source/WebKit/mac/ChangeLog (184300 => 184301)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/Source/WebKit/mac/ChangeLog 2015-05-13 20:08:35 UTC (rev 184300)
+++ branches/safari-601.1.32-branch/Source/WebKit/mac/ChangeLog 2015-05-13 20:10:18 UTC (rev 184301)
</span><span class="lines">@@ -1,5 +1,26 @@
</span><span class="cx"> 2015-05-13 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><ins>+ Merge r183976.
+
+ 2015-05-07 Anders Carlsson <andersca@apple.com>
+
+ Build fixes.
+
+ * Misc/WebNSPasteboardExtras.mm:
+ (-[NSPasteboard _web_writeFileWrapperAsRTFDAttachment:]):
+ * WebView/WebHTMLView.mm:
+ (-[WebHTMLView _writeSelectionWithPasteboardTypes:toPasteboard:cachedAttributedString:]):
+ (-[WebHTMLView _selectionStartFontAttributesAsRTF]):
+ * WebView/WebPDFView.mm:
+ (-[WebPDFView writeSelectionWithPasteboardTypes:toPasteboard:]):
+ Pass empty arrays and dictionaries instead of nil.
+
+ * WebView/WebView.mm:
+ (-[WebView _commonInitializationWithFrameName:groupName:]):
+ Use the regular init method.
+
+2015-05-13 Babak Shafiei <bshafiei@apple.com>
+
</ins><span class="cx"> Merge r184231.
</span><span class="cx">
</span><span class="cx"> 2015-05-12 Simon Fraser <simon.fraser@apple.com>
</span></span></pre></div>
<a id="branchessafari601132branchSourceWebKitmacMiscWebNSPasteboardExtrasmm"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/Source/WebKit/mac/Misc/WebNSPasteboardExtras.mm (184300 => 184301)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/Source/WebKit/mac/Misc/WebNSPasteboardExtras.mm 2015-05-13 20:08:35 UTC (rev 184300)
+++ branches/safari-601.1.32-branch/Source/WebKit/mac/Misc/WebNSPasteboardExtras.mm 2015-05-13 20:10:18 UTC (rev 184301)
</span><span class="lines">@@ -194,7 +194,7 @@
</span><span class="cx"> NSAttributedString *string = [NSAttributedString attributedStringWithAttachment:attachment];
</span><span class="cx"> [attachment release];
</span><span class="cx">
</span><del>- NSData *RTFDData = [string RTFDFromRange:NSMakeRange(0, [string length]) documentAttributes:nil];
</del><ins>+ NSData *RTFDData = [string RTFDFromRange:NSMakeRange(0, [string length]) documentAttributes:@{ }];
</ins><span class="cx"> [self setData:RTFDData forType:NSRTFDPboardType];
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari601132branchSourceWebKitmacWebViewWebHTMLViewmm"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/Source/WebKit/mac/WebView/WebHTMLView.mm (184300 => 184301)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/Source/WebKit/mac/WebView/WebHTMLView.mm 2015-05-13 20:08:35 UTC (rev 184300)
+++ branches/safari-601.1.32-branch/Source/WebKit/mac/WebView/WebHTMLView.mm 2015-05-13 20:10:18 UTC (rev 184301)
</span><span class="lines">@@ -1118,7 +1118,7 @@
</span><span class="cx"> if (attributedString == nil) {
</span><span class="cx"> attributedString = [self selectedAttributedString];
</span><span class="cx"> }
</span><del>- NSData *RTFDData = [attributedString RTFDFromRange:NSMakeRange(0, [attributedString length]) documentAttributes:nil];
</del><ins>+ NSData *RTFDData = [attributedString RTFDFromRange:NSMakeRange(0, [attributedString length]) documentAttributes:@{ }];
</ins><span class="cx"> [pasteboard setData:RTFDData forType:NSRTFDPboardType];
</span><span class="cx"> }
</span><span class="cx"> if ([types containsObject:NSRTFPboardType]) {
</span><span class="lines">@@ -1126,7 +1126,7 @@
</span><span class="cx"> attributedString = [self selectedAttributedString];
</span><span class="cx"> if ([attributedString containsAttachments])
</span><span class="cx"> attributedString = attributedStringByStrippingAttachmentCharacters(attributedString);
</span><del>- NSData *RTFData = [attributedString RTFFromRange:NSMakeRange(0, [attributedString length]) documentAttributes:nil];
</del><ins>+ NSData *RTFData = [attributedString RTFFromRange:NSMakeRange(0, [attributedString length]) documentAttributes:@{ }];
</ins><span class="cx"> [pasteboard setData:RTFData forType:NSRTFPboardType];
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -4680,7 +4680,7 @@
</span><span class="cx"> Frame* coreFrame = core([self _frame]);
</span><span class="cx"> NSAttributedString *string = [[NSAttributedString alloc] initWithString:@"x"
</span><span class="cx"> attributes:coreFrame ? coreFrame->editor().fontAttributesForSelectionStart() : nil];
</span><del>- NSData *data = [string RTFFromRange:NSMakeRange(0, [string length]) documentAttributes:nil];
</del><ins>+ NSData *data = [string RTFFromRange:NSMakeRange(0, [string length]) documentAttributes:@{ }];
</ins><span class="cx"> [string release];
</span><span class="cx"> return data;
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari601132branchSourceWebKitmacWebViewWebPDFViewmm"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/Source/WebKit/mac/WebView/WebPDFView.mm (184300 => 184301)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/Source/WebKit/mac/WebView/WebPDFView.mm 2015-05-13 20:08:35 UTC (rev 184300)
+++ branches/safari-601.1.32-branch/Source/WebKit/mac/WebView/WebPDFView.mm 2015-05-13 20:10:18 UTC (rev 184301)
</span><span class="lines">@@ -976,7 +976,7 @@
</span><span class="cx"> NSAttributedString *attributedString = [self selectedAttributedString];
</span><span class="cx">
</span><span class="cx"> if ([types containsObject:NSRTFDPboardType]) {
</span><del>- NSData *RTFDData = [attributedString RTFDFromRange:NSMakeRange(0, [attributedString length]) documentAttributes:nil];
</del><ins>+ NSData *RTFDData = [attributedString RTFDFromRange:NSMakeRange(0, [attributedString length]) documentAttributes:@{ }];
</ins><span class="cx"> [pasteboard setData:RTFDData forType:NSRTFDPboardType];
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -984,7 +984,7 @@
</span><span class="cx"> if ([attributedString containsAttachments])
</span><span class="cx"> attributedString = attributedStringByStrippingAttachmentCharacters(attributedString);
</span><span class="cx">
</span><del>- NSData *RTFData = [attributedString RTFFromRange:NSMakeRange(0, [attributedString length]) documentAttributes:nil];
</del><ins>+ NSData *RTFData = [attributedString RTFFromRange:NSMakeRange(0, [attributedString length]) documentAttributes:@{ }];
</ins><span class="cx"> [pasteboard setData:RTFData forType:NSRTFPboardType];
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari601132branchSourceWebKitmacWebViewWebViewmm"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/Source/WebKit/mac/WebView/WebView.mm (184300 => 184301)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/Source/WebKit/mac/WebView/WebView.mm 2015-05-13 20:08:35 UTC (rev 184300)
+++ branches/safari-601.1.32-branch/Source/WebKit/mac/WebView/WebView.mm 2015-05-13 20:10:18 UTC (rev 184301)
</span><span class="lines">@@ -907,7 +907,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (Class gestureClass = NSClassFromString(@"NSImmediateActionGestureRecognizer")) {
</span><del>- RetainPtr<NSImmediateActionGestureRecognizer> recognizer = adoptNS([(NSImmediateActionGestureRecognizer *)[gestureClass alloc] initWithTarget:nil action:NULL]);
</del><ins>+ RetainPtr<NSImmediateActionGestureRecognizer> recognizer = adoptNS([(NSImmediateActionGestureRecognizer *)[gestureClass alloc] init]);
</ins><span class="cx"> _private->immediateActionController = [[WebImmediateActionController alloc] initWithWebView:self recognizer:recognizer.get()];
</span><span class="cx"> [recognizer setDelegate:_private->immediateActionController];
</span><span class="cx"> [recognizer setDelaysPrimaryMouseButtonEvents:NO];
</span></span></pre></div>
<a id="branchessafari601132branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/Source/WebKit2/ChangeLog (184300 => 184301)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/Source/WebKit2/ChangeLog 2015-05-13 20:08:35 UTC (rev 184300)
+++ branches/safari-601.1.32-branch/Source/WebKit2/ChangeLog 2015-05-13 20:10:18 UTC (rev 184301)
</span><span class="lines">@@ -1,5 +1,23 @@
</span><span class="cx"> 2015-05-13 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><ins>+ Merge r183976.
+
+ 2015-05-07 Anders Carlsson <andersca@apple.com>
+
+ Build fixes.
+
+ * UIProcess/API/mac/WKView.mm:
+ (-[WKView initWithFrame:processPool:configuration:webView:]):
+ Use the regular init method.
+
+ * UIProcess/mac/WKSharingServicePickerDelegate.mm:
+ (-[WKSharingServicePickerDelegate sharingService:didShareItems:]):
+ * WebProcess/WebPage/mac/WebPageMac.mm:
+ (WebKit::WebPage::handleSelectionServiceClick):
+ Pass empty dictionaries instead of nil.
+
+2015-05-13 Babak Shafiei <bshafiei@apple.com>
+
</ins><span class="cx"> Merge r184028.
</span><span class="cx">
</span><span class="cx"> 2015-05-08 Beth Dakin <bdakin@apple.com>
</span></span></pre></div>
<a id="branchessafari601132branchSourceWebKit2UIProcessAPImacWKViewmm"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/Source/WebKit2/UIProcess/API/mac/WKView.mm (184300 => 184301)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/Source/WebKit2/UIProcess/API/mac/WKView.mm 2015-05-13 20:08:35 UTC (rev 184300)
+++ branches/safari-601.1.32-branch/Source/WebKit2/UIProcess/API/mac/WKView.mm 2015-05-13 20:10:18 UTC (rev 184301)
</span><span class="lines">@@ -3845,7 +3845,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (Class gestureClass = NSClassFromString(@"NSImmediateActionGestureRecognizer")) {
</span><del>- _data->_immediateActionGestureRecognizer = adoptNS([(NSImmediateActionGestureRecognizer *)[gestureClass alloc] initWithTarget:nil action:NULL]);
</del><ins>+ _data->_immediateActionGestureRecognizer = adoptNS([(NSImmediateActionGestureRecognizer *)[gestureClass alloc] init]);
</ins><span class="cx"> _data->_immediateActionController = adoptNS([[WKImmediateActionController alloc] initWithPage:*_data->_page view:self recognizer:_data->_immediateActionGestureRecognizer.get()]);
</span><span class="cx"> [_data->_immediateActionGestureRecognizer setDelegate:_data->_immediateActionController.get()];
</span><span class="cx"> [_data->_immediateActionGestureRecognizer setDelaysPrimaryMouseButtonEvents:NO];
</span></span></pre></div>
<a id="branchessafari601132branchSourceWebKit2UIProcessmacWKSharingServicePickerDelegatemm"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/Source/WebKit2/UIProcess/mac/WKSharingServicePickerDelegate.mm (184300 => 184301)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/Source/WebKit2/UIProcess/mac/WKSharingServicePickerDelegate.mm 2015-05-13 20:08:35 UTC (rev 184300)
+++ branches/safari-601.1.32-branch/Source/WebKit2/UIProcess/mac/WKSharingServicePickerDelegate.mm 2015-05-13 20:10:18 UTC (rev 184301)
</span><span class="lines">@@ -107,7 +107,7 @@
</span><span class="cx"> id item = [items objectAtIndex:0];
</span><span class="cx">
</span><span class="cx"> if ([item isKindOfClass:[NSAttributedString class]]) {
</span><del>- NSData *data = [item RTFDFromRange:NSMakeRange(0, [item length]) documentAttributes:nil];
</del><ins>+ NSData *data = [item RTFDFromRange:NSMakeRange(0, [item length]) documentAttributes:@{ }];
</ins><span class="cx"> dataReference = IPC::DataReference(static_cast<const uint8_t*>([data bytes]), [data length]);
</span><span class="cx">
</span><span class="cx"> types.append(NSPasteboardTypeRTFD);
</span></span></pre></div>
<a id="branchessafari601132branchSourceWebKit2WebProcessWebPagemacWebPageMacmm"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm (184300 => 184301)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm 2015-05-13 20:08:35 UTC (rev 184300)
+++ branches/safari-601.1.32-branch/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm 2015-05-13 20:10:18 UTC (rev 184301)
</span><span class="lines">@@ -1050,7 +1050,7 @@
</span><span class="cx"> if (!attributedSelection)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- NSData *selectionData = [attributedSelection RTFDFromRange:NSMakeRange(0, [attributedSelection length]) documentAttributes:nil];
</del><ins>+ NSData *selectionData = [attributedSelection RTFDFromRange:NSMakeRange(0, [attributedSelection length]) documentAttributes:@{ }];
</ins><span class="cx"> IPC::DataReference data = IPC::DataReference(reinterpret_cast<const uint8_t*>([selectionData bytes]), [selectionData length]);
</span><span class="cx"> bool isEditable = selection.selection().isContentEditable();
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari601132branchToolsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/Tools/ChangeLog (184300 => 184301)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/Tools/ChangeLog 2015-05-13 20:08:35 UTC (rev 184300)
+++ branches/safari-601.1.32-branch/Tools/ChangeLog 2015-05-13 20:10:18 UTC (rev 184301)
</span><span class="lines">@@ -1,5 +1,19 @@
</span><span class="cx"> 2015-05-13 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><ins>+ Merge r183976.
+
+ 2015-05-07 Anders Carlsson <andersca@apple.com>
+
+ Build fixes.
+
+ * TestWebKitAPI/Tests/mac/HTMLCollectionNamedItem.mm:
+ (TestWebKitAPI::TEST):
+ * TestWebKitAPI/Tests/mac/HTMLFormCollectionNamedItem.mm:
+ (TestWebKitAPI::TEST):
+ Add casts.
+
+2015-05-13 Babak Shafiei <bshafiei@apple.com>
+
</ins><span class="cx"> Merge r184018.
</span><span class="cx">
</span><span class="cx"> 2015-05-08 Alexey Proskuryakov <ap@apple.com>
</span></span></pre></div>
<a id="branchessafari601132branchToolsTestWebKitAPITestsmacHTMLCollectionNamedItemmm"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/Tools/TestWebKitAPI/Tests/mac/HTMLCollectionNamedItem.mm (184300 => 184301)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/Tools/TestWebKitAPI/Tests/mac/HTMLCollectionNamedItem.mm 2015-05-13 20:08:35 UTC (rev 184300)
+++ branches/safari-601.1.32-branch/Tools/TestWebKitAPI/Tests/mac/HTMLCollectionNamedItem.mm 2015-05-13 20:10:18 UTC (rev 184301)
</span><span class="lines">@@ -63,18 +63,18 @@
</span><span class="cx"> DOMDocument *document = webView.get().mainFrameDocument;
</span><span class="cx"> RetainPtr<DOMHTMLCollection> collection = [[document body] children];
</span><span class="cx">
</span><del>- EXPECT_EQ([collection.get() length], (unsigned)4);
- EXPECT_WK_STREQ([[collection.get() item:0] value], @"firstItem");
- EXPECT_WK_STREQ([[collection.get() item:1] value], @"secondItem");
- EXPECT_WK_STREQ([[collection.get() namedItem:@"idForTwoTextFields"] value], @"firstItem");
- EXPECT_WK_STREQ([[collection.get() item:1] value], @"secondItem");
- EXPECT_WK_STREQ([[collection.get() item:0] value], @"firstItem");
</del><ins>+ EXPECT_EQ([collection length], (unsigned)4);
+ EXPECT_WK_STREQ([(DOMHTMLInputElement *)[collection item:0] value], @"firstItem");
+ EXPECT_WK_STREQ([(DOMHTMLInputElement *)[collection item:1] value], @"secondItem");
+ EXPECT_WK_STREQ([(DOMHTMLInputElement *)[collection namedItem:@"idForTwoTextFields"] value], @"firstItem");
+ EXPECT_WK_STREQ([(DOMHTMLInputElement *)[collection item:1] value], @"secondItem");
+ EXPECT_WK_STREQ([(DOMHTMLInputElement *)[collection item:0] value], @"firstItem");
</ins><span class="cx">
</span><del>- EXPECT_WK_STREQ([(DOMHTMLElement*)[collection.get() item:2] title], @"thirdItem");
- EXPECT_WK_STREQ([(DOMHTMLElement*)[collection.get() item:3] title], @"fourthItem");
- EXPECT_WK_STREQ([(DOMHTMLElement*)[collection.get() namedItem:@"nameForTwoImages"] title], @"thirdItem");
- EXPECT_WK_STREQ([(DOMHTMLElement*)[collection.get() item:3] title], @"fourthItem");
- EXPECT_WK_STREQ([(DOMHTMLElement*)[collection.get() item:2] title], @"thirdItem");
</del><ins>+ EXPECT_WK_STREQ([(DOMHTMLElement *)[collection item:2] title], @"thirdItem");
+ EXPECT_WK_STREQ([(DOMHTMLElement *)[collection item:3] title], @"fourthItem");
+ EXPECT_WK_STREQ([(DOMHTMLElement *)[collection namedItem:@"nameForTwoImages"] title], @"thirdItem");
+ EXPECT_WK_STREQ([(DOMHTMLElement *)[collection item:3] title], @"fourthItem");
+ EXPECT_WK_STREQ([(DOMHTMLElement *)[collection item:2] title], @"thirdItem");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace TestWebKitAPI
</span></span></pre></div>
<a id="branchessafari601132branchToolsTestWebKitAPITestsmacHTMLFormCollectionNamedItemmm"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/Tools/TestWebKitAPI/Tests/mac/HTMLFormCollectionNamedItem.mm (184300 => 184301)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/Tools/TestWebKitAPI/Tests/mac/HTMLFormCollectionNamedItem.mm 2015-05-13 20:08:35 UTC (rev 184300)
+++ branches/safari-601.1.32-branch/Tools/TestWebKitAPI/Tests/mac/HTMLFormCollectionNamedItem.mm 2015-05-13 20:10:18 UTC (rev 184301)
</span><span class="lines">@@ -65,11 +65,11 @@
</span><span class="cx"> RetainPtr<DOMHTMLCollection> collection = [form elements];
</span><span class="cx">
</span><span class="cx"> EXPECT_EQ([collection.get() length], (unsigned)2);
</span><del>- EXPECT_WK_STREQ([[collection.get() item:0] value], @"firstItem");
- EXPECT_WK_STREQ([[collection.get() item:1] value], @"secondItem");
- EXPECT_WK_STREQ([[collection.get() namedItem:@"nameForTwoTextFields"] value], @"firstItem");
- EXPECT_WK_STREQ([[collection.get() item:1] value], @"secondItem");
- EXPECT_WK_STREQ([[collection.get() item:0] value], @"firstItem");
</del><ins>+ EXPECT_WK_STREQ([(DOMHTMLInputElement *)[collection item:0] value], @"firstItem");
+ EXPECT_WK_STREQ([(DOMHTMLInputElement *)[collection item:1] value], @"secondItem");
+ EXPECT_WK_STREQ([(DOMHTMLInputElement *)[collection namedItem:@"nameForTwoTextFields"] value], @"firstItem");
+ EXPECT_WK_STREQ([(DOMHTMLInputElement *)[collection item:1] value], @"secondItem");
+ EXPECT_WK_STREQ([(DOMHTMLInputElement *)[collection item:0] value], @"firstItem");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace TestWebKitAPI
</span></span></pre>
</div>
</div>
</body>
</html>