Diff
Modified: branches/safari-601.1.32-branch/Source/WebCore/ChangeLog (184300 => 184301)
--- 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)
@@ -1,5 +1,27 @@
2015-05-13 Babak Shafiei <[email protected]>
+ Merge r183976.
+
+ 2015-05-07 Anders Carlsson <[email protected]>
+
+ 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 <[email protected]>
+
Merge r183958.
2015-05-07 Anders Carlsson <[email protected]>
Modified: branches/safari-601.1.32-branch/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm (184300 => 184301)
--- 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)
@@ -3481,7 +3481,7 @@
- (NSData*)doAXRTFForRange:(NSRange)range
{
NSAttributedString* attrString = [self doAXAttributedStringForRange:range];
- return [attrString RTFFromRange: NSMakeRange(0, [attrString length]) documentAttributes: nil];
+ return [attrString RTFFromRange: NSMakeRange(0, [attrString length]) documentAttributes:@{ }];
}
- (id)accessibilityAttributeValue:(NSString*)attribute forParameter:(id)parameter
Modified: branches/safari-601.1.32-branch/Source/WebCore/editing/cocoa/HTMLConverter.mm (184300 => 184301)
--- 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)
@@ -2144,9 +2144,9 @@
[newStyle addTabStop:tab];
[tab release];
#if PLATFORM(IOS)
- tab = [[PlatformNSTextTab alloc] initWithTextAlignment:NSTextAlignmentNatural location:listLocation options:nil];
+ tab = [[PlatformNSTextTab alloc] initWithTextAlignment:NSTextAlignmentNatural location:listLocation options:@{ }];
#else
- tab = [[PlatformNSTextTab alloc] initWithTextAlignment:NSNaturalTextAlignment location:listLocation options:nil];
+ tab = [[PlatformNSTextTab alloc] initWithTextAlignment:NSNaturalTextAlignment location:listLocation options:@{ }];
#endif
[newStyle addTabStop:tab];
[tab release];
Modified: branches/safari-601.1.32-branch/Source/WebCore/platform/mac/PasteboardMac.mm (184300 => 184301)
--- 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)
@@ -246,7 +246,7 @@
NSAttributedString *string = [NSAttributedString attributedStringWithAttachment:attachment];
[attachment release];
- NSData *RTFDData = [string RTFDFromRange:NSMakeRange(0, [string length]) documentAttributes:nil];
+ NSData *RTFDData = [string RTFDFromRange:NSMakeRange(0, [string length]) documentAttributes:@{ }];
if (!RTFDData)
return;
Modified: branches/safari-601.1.32-branch/Source/WebCore/platform/mac/PlatformPasteboardMac.mm (184300 => 184301)
--- 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)
@@ -126,7 +126,7 @@
long PlatformPasteboard::setTypes(const Vector<String>& pasteboardTypes)
{
if (pasteboardTypes.isEmpty())
- return [m_pasteboard.get() declareTypes:nil owner:nil];
+ return [m_pasteboard declareTypes:@[] owner:nil];
RetainPtr<NSMutableArray> types = adoptNS([[NSMutableArray alloc] init]);
for (size_t i = 0; i < pasteboardTypes.size(); ++i)
Modified: branches/safari-601.1.32-branch/Source/WebCore/rendering/RenderThemeMac.mm (184300 => 184301)
--- 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)
@@ -1542,11 +1542,13 @@
else
m_isSliderThumbHorizontalPressed = pressed;
+ NSView *view = documentViewFor(o);
+
if (pressed != oldPressed) {
if (pressed)
- [sliderThumbCell startTrackingAt:NSPoint() inView:nil];
+ [sliderThumbCell startTrackingAt:NSPoint() inView:view];
else
- [sliderThumbCell stopTracking:NSPoint() at:NSPoint() inView:nil mouseIsUp:YES];
+ [sliderThumbCell stopTracking:NSPoint() at:NSPoint() inView:view mouseIsUp:YES];
}
FloatRect bounds = r;
@@ -1566,7 +1568,7 @@
paintInfo.context->translate(-unzoomedRect.x(), -unzoomedRect.y());
}
- [sliderThumbCell drawInteriorWithFrame:unzoomedRect inView:documentViewFor(o)];
+ [sliderThumbCell drawInteriorWithFrame:unzoomedRect inView:view];
[sliderThumbCell setControlView:nil];
return false;
Modified: branches/safari-601.1.32-branch/Source/WebKit/mac/ChangeLog (184300 => 184301)
--- 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)
@@ -1,5 +1,26 @@
2015-05-13 Babak Shafiei <[email protected]>
+ Merge r183976.
+
+ 2015-05-07 Anders Carlsson <[email protected]>
+
+ 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 <[email protected]>
+
Merge r184231.
2015-05-12 Simon Fraser <[email protected]>
Modified: branches/safari-601.1.32-branch/Source/WebKit/mac/Misc/WebNSPasteboardExtras.mm (184300 => 184301)
--- 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)
@@ -194,7 +194,7 @@
NSAttributedString *string = [NSAttributedString attributedStringWithAttachment:attachment];
[attachment release];
- NSData *RTFDData = [string RTFDFromRange:NSMakeRange(0, [string length]) documentAttributes:nil];
+ NSData *RTFDData = [string RTFDFromRange:NSMakeRange(0, [string length]) documentAttributes:@{ }];
[self setData:RTFDData forType:NSRTFDPboardType];
}
Modified: branches/safari-601.1.32-branch/Source/WebKit/mac/WebView/WebHTMLView.mm (184300 => 184301)
--- 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)
@@ -1118,7 +1118,7 @@
if (attributedString == nil) {
attributedString = [self selectedAttributedString];
}
- NSData *RTFDData = [attributedString RTFDFromRange:NSMakeRange(0, [attributedString length]) documentAttributes:nil];
+ NSData *RTFDData = [attributedString RTFDFromRange:NSMakeRange(0, [attributedString length]) documentAttributes:@{ }];
[pasteboard setData:RTFDData forType:NSRTFDPboardType];
}
if ([types containsObject:NSRTFPboardType]) {
@@ -1126,7 +1126,7 @@
attributedString = [self selectedAttributedString];
if ([attributedString containsAttachments])
attributedString = attributedStringByStrippingAttachmentCharacters(attributedString);
- NSData *RTFData = [attributedString RTFFromRange:NSMakeRange(0, [attributedString length]) documentAttributes:nil];
+ NSData *RTFData = [attributedString RTFFromRange:NSMakeRange(0, [attributedString length]) documentAttributes:@{ }];
[pasteboard setData:RTFData forType:NSRTFPboardType];
}
@@ -4680,7 +4680,7 @@
Frame* coreFrame = core([self _frame]);
NSAttributedString *string = [[NSAttributedString alloc] initWithString:@"x"
attributes:coreFrame ? coreFrame->editor().fontAttributesForSelectionStart() : nil];
- NSData *data = "" RTFFromRange:NSMakeRange(0, [string length]) documentAttributes:nil];
+ NSData *data = "" RTFFromRange:NSMakeRange(0, [string length]) documentAttributes:@{ }];
[string release];
return data;
}
Modified: branches/safari-601.1.32-branch/Source/WebKit/mac/WebView/WebPDFView.mm (184300 => 184301)
--- 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)
@@ -976,7 +976,7 @@
NSAttributedString *attributedString = [self selectedAttributedString];
if ([types containsObject:NSRTFDPboardType]) {
- NSData *RTFDData = [attributedString RTFDFromRange:NSMakeRange(0, [attributedString length]) documentAttributes:nil];
+ NSData *RTFDData = [attributedString RTFDFromRange:NSMakeRange(0, [attributedString length]) documentAttributes:@{ }];
[pasteboard setData:RTFDData forType:NSRTFDPboardType];
}
@@ -984,7 +984,7 @@
if ([attributedString containsAttachments])
attributedString = attributedStringByStrippingAttachmentCharacters(attributedString);
- NSData *RTFData = [attributedString RTFFromRange:NSMakeRange(0, [attributedString length]) documentAttributes:nil];
+ NSData *RTFData = [attributedString RTFFromRange:NSMakeRange(0, [attributedString length]) documentAttributes:@{ }];
[pasteboard setData:RTFData forType:NSRTFPboardType];
}
Modified: branches/safari-601.1.32-branch/Source/WebKit/mac/WebView/WebView.mm (184300 => 184301)
--- 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)
@@ -907,7 +907,7 @@
}
if (Class gestureClass = NSClassFromString(@"NSImmediateActionGestureRecognizer")) {
- RetainPtr<NSImmediateActionGestureRecognizer> recognizer = adoptNS([(NSImmediateActionGestureRecognizer *)[gestureClass alloc] initWithTarget:nil action:NULL]);
+ RetainPtr<NSImmediateActionGestureRecognizer> recognizer = adoptNS([(NSImmediateActionGestureRecognizer *)[gestureClass alloc] init]);
_private->immediateActionController = [[WebImmediateActionController alloc] initWithWebView:self recognizer:recognizer.get()];
[recognizer setDelegate:_private->immediateActionController];
[recognizer setDelaysPrimaryMouseButtonEvents:NO];
Modified: branches/safari-601.1.32-branch/Source/WebKit2/ChangeLog (184300 => 184301)
--- 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)
@@ -1,5 +1,23 @@
2015-05-13 Babak Shafiei <[email protected]>
+ Merge r183976.
+
+ 2015-05-07 Anders Carlsson <[email protected]>
+
+ 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 <[email protected]>
+
Merge r184028.
2015-05-08 Beth Dakin <[email protected]>
Modified: branches/safari-601.1.32-branch/Source/WebKit2/UIProcess/API/mac/WKView.mm (184300 => 184301)
--- 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)
@@ -3845,7 +3845,7 @@
}
if (Class gestureClass = NSClassFromString(@"NSImmediateActionGestureRecognizer")) {
- _data->_immediateActionGestureRecognizer = adoptNS([(NSImmediateActionGestureRecognizer *)[gestureClass alloc] initWithTarget:nil action:NULL]);
+ _data->_immediateActionGestureRecognizer = adoptNS([(NSImmediateActionGestureRecognizer *)[gestureClass alloc] init]);
_data->_immediateActionController = adoptNS([[WKImmediateActionController alloc] initWithPage:*_data->_page view:self recognizer:_data->_immediateActionGestureRecognizer.get()]);
[_data->_immediateActionGestureRecognizer setDelegate:_data->_immediateActionController.get()];
[_data->_immediateActionGestureRecognizer setDelaysPrimaryMouseButtonEvents:NO];
Modified: branches/safari-601.1.32-branch/Source/WebKit2/UIProcess/mac/WKSharingServicePickerDelegate.mm (184300 => 184301)
--- 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)
@@ -107,7 +107,7 @@
id item = [items objectAtIndex:0];
if ([item isKindOfClass:[NSAttributedString class]]) {
- NSData *data = "" RTFDFromRange:NSMakeRange(0, [item length]) documentAttributes:nil];
+ NSData *data = "" RTFDFromRange:NSMakeRange(0, [item length]) documentAttributes:@{ }];
dataReference = IPC::DataReference(static_cast<const uint8_t*>([data bytes]), [data length]);
types.append(NSPasteboardTypeRTFD);
Modified: branches/safari-601.1.32-branch/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm (184300 => 184301)
--- 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)
@@ -1050,7 +1050,7 @@
if (!attributedSelection)
return;
- NSData *selectionData = [attributedSelection RTFDFromRange:NSMakeRange(0, [attributedSelection length]) documentAttributes:nil];
+ NSData *selectionData = [attributedSelection RTFDFromRange:NSMakeRange(0, [attributedSelection length]) documentAttributes:@{ }];
IPC::DataReference data = "" uint8_t*>([selectionData bytes]), [selectionData length]);
bool isEditable = selection.selection().isContentEditable();
Modified: branches/safari-601.1.32-branch/Tools/ChangeLog (184300 => 184301)
--- 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)
@@ -1,5 +1,19 @@
2015-05-13 Babak Shafiei <[email protected]>
+ Merge r183976.
+
+ 2015-05-07 Anders Carlsson <[email protected]>
+
+ Build fixes.
+
+ * TestWebKitAPI/Tests/mac/HTMLCollectionNamedItem.mm:
+ (TestWebKitAPI::TEST):
+ * TestWebKitAPI/Tests/mac/HTMLFormCollectionNamedItem.mm:
+ (TestWebKitAPI::TEST):
+ Add casts.
+
+2015-05-13 Babak Shafiei <[email protected]>
+
Merge r184018.
2015-05-08 Alexey Proskuryakov <[email protected]>
Modified: branches/safari-601.1.32-branch/Tools/TestWebKitAPI/Tests/mac/HTMLCollectionNamedItem.mm (184300 => 184301)
--- 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)
@@ -63,18 +63,18 @@
DOMDocument *document = webView.get().mainFrameDocument;
RetainPtr<DOMHTMLCollection> collection = [[document body] children];
- 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");
+ 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");
- 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");
+ 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");
}
} // namespace TestWebKitAPI
Modified: branches/safari-601.1.32-branch/Tools/TestWebKitAPI/Tests/mac/HTMLFormCollectionNamedItem.mm (184300 => 184301)
--- 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)
@@ -65,11 +65,11 @@
RetainPtr<DOMHTMLCollection> collection = [form elements];
EXPECT_EQ([collection.get() length], (unsigned)2);
- 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");
+ 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");
}
} // namespace TestWebKitAPI
