⚠ Archived content — this site is no longer maintained.   Current WebKit documentation is at docs.webkit.org.

Changeset 183976 in webkit


Ignore:
Timestamp:
May 7, 2015, 7:59:37 PM (11 years ago)
Author:
andersca@apple.com
Message:

Build fixes.

Source/WebCore:

  • 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.

Source/WebKit/mac:

  • 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.

Source/WebKit2:

  • 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.

Tools:

  • TestWebKitAPI/Tests/mac/HTMLCollectionNamedItem.mm:

(TestWebKitAPI::TEST):

  • TestWebKitAPI/Tests/mac/HTMLFormCollectionNamedItem.mm:

(TestWebKitAPI::TEST):
Add casts.

Location:
trunk
Files:
18 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r183975 r183976  
     12015-05-07  Anders Carlsson  <andersca@apple.com>
     2
     3        Build fixes.
     4
     5        * accessibility/mac/WebAccessibilityObjectWrapperMac.mm:
     6        (-[WebAccessibilityObjectWrapper doAXRTFForRange:]):
     7        * editing/cocoa/HTMLConverter.mm:
     8        (HTMLConverter::_addMarkersToList):
     9        * platform/mac/PasteboardMac.mm:
     10        (WebCore::writeFileWrapperAsRTFDAttachment):
     11        * platform/mac/PlatformPasteboardMac.mm:
     12        (WebCore::PlatformPasteboard::setTypes):
     13        Pass empty arrays and dictionaries instead of nil.
     14
     15        * rendering/RenderThemeMac.mm:
     16        (WebCore::RenderThemeMac::paintSliderThumb):
     17        Pass the document view to the AppKit paint method.
     18
    1192015-05-07  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
    220

  • trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm

    r183932 r183976  
    34833483{
    34843484    NSAttributedString* attrString = [self doAXAttributedStringForRange:range];
    3485     return [attrString RTFFromRange: NSMakeRange(0, [attrString length]) documentAttributes: nil];
     3485    return [attrString RTFFromRange: NSMakeRange(0, [attrString length]) documentAttributes:@{ }];
    34863486}
    34873487

  • trunk/Source/WebCore/editing/cocoa/HTMLConverter.mm

    r181686 r183976  
    21452145                    [tab release];
    21462146#if PLATFORM(IOS)
    2147                     tab = [[PlatformNSTextTab alloc] initWithTextAlignment:NSTextAlignmentNatural location:listLocation options:nil];
     2147                    tab = [[PlatformNSTextTab alloc] initWithTextAlignment:NSTextAlignmentNatural location:listLocation options:@{ }];
    21482148#else
    2149                     tab = [[PlatformNSTextTab alloc] initWithTextAlignment:NSNaturalTextAlignment location:listLocation options:nil];
     2149                    tab = [[PlatformNSTextTab alloc] initWithTextAlignment:NSNaturalTextAlignment location:listLocation options:@{ }];
    21502150#endif
    21512151                    [newStyle addTabStop:tab];

  • trunk/Source/WebCore/platform/mac/PasteboardMac.mm

    r181601 r183976  
    247247    [attachment release];
    248248
    249     NSData *RTFDData = [string RTFDFromRange:NSMakeRange(0, [string length]) documentAttributes:nil];
     249    NSData *RTFDData = [string RTFDFromRange:NSMakeRange(0, [string length]) documentAttributes:@{ }];
    250250    if (!RTFDData)
    251251        return;

  • trunk/Source/WebCore/platform/mac/PlatformPasteboardMac.mm

    r165676 r183976  
    127127{
    128128    if (pasteboardTypes.isEmpty())
    129         return [m_pasteboard.get() declareTypes:nil owner:nil];
     129        return [m_pasteboard declareTypes:@[] owner:nil];
    130130
    131131    RetainPtr<NSMutableArray> types = adoptNS([[NSMutableArray alloc] init]);

  • trunk/Source/WebCore/rendering/RenderThemeMac.mm

    r183778 r183976  
    15431543        m_isSliderThumbHorizontalPressed = pressed;
    15441544
     1545    NSView *view = documentViewFor(o);
     1546
    15451547    if (pressed != oldPressed) {
    15461548        if (pressed)
    1547             [sliderThumbCell startTrackingAt:NSPoint() inView:nil];
     1549            [sliderThumbCell startTrackingAt:NSPoint() inView:view];
    15481550        else
    1549             [sliderThumbCell stopTracking:NSPoint() at:NSPoint() inView:nil mouseIsUp:YES];
     1551            [sliderThumbCell stopTracking:NSPoint() at:NSPoint() inView:view mouseIsUp:YES];
    15501552    }
    15511553
    … …  
    15671569    }
    15681570
    1569     [sliderThumbCell drawInteriorWithFrame:unzoomedRect inView:documentViewFor(o)];
     1571    [sliderThumbCell drawInteriorWithFrame:unzoomedRect inView:view];
    15701572    [sliderThumbCell setControlView:nil];
    15711573

  • trunk/Source/WebKit/mac/ChangeLog

    r183968 r183976  
     12015-05-07  Anders Carlsson  <andersca@apple.com>
     2
     3        Build fixes.
     4
     5        * Misc/WebNSPasteboardExtras.mm:
     6        (-[NSPasteboard _web_writeFileWrapperAsRTFDAttachment:]):
     7        * WebView/WebHTMLView.mm:
     8        (-[WebHTMLView _writeSelectionWithPasteboardTypes:toPasteboard:cachedAttributedString:]):
     9        (-[WebHTMLView _selectionStartFontAttributesAsRTF]):
     10        * WebView/WebPDFView.mm:
     11        (-[WebPDFView writeSelectionWithPasteboardTypes:toPasteboard:]):
     12        Pass empty arrays and dictionaries instead of nil.
     13
     14        * WebView/WebView.mm:
     15        (-[WebView _commonInitializationWithFrameName:groupName:]):
     16        Use the regular init method.
     17
    1182015-05-07  Said Abou-Hallawa  <sabouhallawa@apple.com>
    219

  • trunk/Source/WebKit/mac/Misc/WebNSPasteboardExtras.mm

    r181760 r183976  
    195195    [attachment release];
    196196   
    197     NSData *RTFDData = [string RTFDFromRange:NSMakeRange(0, [string length]) documentAttributes:nil];
     197    NSData *RTFDData = [string RTFDFromRange:NSMakeRange(0, [string length]) documentAttributes:@{ }];
    198198    [self setData:RTFDData forType:NSRTFDPboardType];
    199199}

  • trunk/Source/WebKit/mac/WebView/WebHTMLView.mm

    r183968 r183976  
    11191119            attributedString = [self selectedAttributedString];
    11201120        }       
    1121         NSData *RTFDData = [attributedString RTFDFromRange:NSMakeRange(0, [attributedString length]) documentAttributes:nil];
     1121        NSData *RTFDData = [attributedString RTFDFromRange:NSMakeRange(0, [attributedString length]) documentAttributes:@{ }];
    11221122        [pasteboard setData:RTFDData forType:NSRTFDPboardType];
    11231123    }       
    … …  
    11271127        if ([attributedString containsAttachments])
    11281128            attributedString = attributedStringByStrippingAttachmentCharacters(attributedString);
    1129         NSData *RTFData = [attributedString RTFFromRange:NSMakeRange(0, [attributedString length]) documentAttributes:nil];
     1129        NSData *RTFData = [attributedString RTFFromRange:NSMakeRange(0, [attributedString length]) documentAttributes:@{ }];
    11301130        [pasteboard setData:RTFData forType:NSRTFPboardType];
    11311131    }
    … …  
    46814681    NSAttributedString *string = [[NSAttributedString alloc] initWithString:@"x"
    46824682        attributes:coreFrame ? coreFrame->editor().fontAttributesForSelectionStart() : nil];
    4683     NSData *data = [string RTFFromRange:NSMakeRange(0, [string length]) documentAttributes:nil];
     4683    NSData *data = [string RTFFromRange:NSMakeRange(0, [string length]) documentAttributes:@{ }];
    46844684    [string release];
    46854685    return data;

  • trunk/Source/WebKit/mac/WebView/WebPDFView.mm

    r183498 r183976  
    977977   
    978978    if ([types containsObject:NSRTFDPboardType]) {
    979         NSData *RTFDData = [attributedString RTFDFromRange:NSMakeRange(0, [attributedString length]) documentAttributes:nil];
     979        NSData *RTFDData = [attributedString RTFDFromRange:NSMakeRange(0, [attributedString length]) documentAttributes:@{ }];
    980980        [pasteboard setData:RTFDData forType:NSRTFDPboardType];
    981981    }       
    … …  
    985985            attributedString = attributedStringByStrippingAttachmentCharacters(attributedString);
    986986
    987         NSData *RTFData = [attributedString RTFFromRange:NSMakeRange(0, [attributedString length]) documentAttributes:nil];
     987        NSData *RTFData = [attributedString RTFFromRange:NSMakeRange(0, [attributedString length]) documentAttributes:@{ }];
    988988        [pasteboard setData:RTFData forType:NSRTFPboardType];
    989989    }

  • trunk/Source/WebKit/mac/WebView/WebView.mm

    r183954 r183976  
    908908
    909909    if (Class gestureClass = NSClassFromString(@"NSImmediateActionGestureRecognizer")) {
    910         RetainPtr<NSImmediateActionGestureRecognizer> recognizer = adoptNS([(NSImmediateActionGestureRecognizer *)[gestureClass alloc] initWithTarget:nil action:NULL]);
     910        RetainPtr<NSImmediateActionGestureRecognizer> recognizer = adoptNS([(NSImmediateActionGestureRecognizer *)[gestureClass alloc] init]);
    911911        _private->immediateActionController = [[WebImmediateActionController alloc] initWithWebView:self recognizer:recognizer.get()];
    912912        [recognizer setDelegate:_private->immediateActionController];

  • trunk/Source/WebKit2/ChangeLog

    r183969 r183976  
     12015-05-07  Anders Carlsson  <andersca@apple.com>
     2
     3        Build fixes.
     4
     5        * UIProcess/API/mac/WKView.mm:
     6        (-[WKView initWithFrame:processPool:configuration:webView:]):
     7        Use the regular init method.
     8
     9        * UIProcess/mac/WKSharingServicePickerDelegate.mm:
     10        (-[WKSharingServicePickerDelegate sharingService:didShareItems:]):
     11        * WebProcess/WebPage/mac/WebPageMac.mm:
     12        (WebKit::WebPage::handleSelectionServiceClick):
     13        Pass empty dictionaries instead of nil.
     14
    1152015-05-07  Chris Dumez  <cdumez@apple.com>
    216

  • trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm

    r183841 r183976  
    38463846
    38473847    if (Class gestureClass = NSClassFromString(@"NSImmediateActionGestureRecognizer")) {
    3848         _data->_immediateActionGestureRecognizer = adoptNS([(NSImmediateActionGestureRecognizer *)[gestureClass alloc] initWithTarget:nil action:NULL]);
     3848        _data->_immediateActionGestureRecognizer = adoptNS([(NSImmediateActionGestureRecognizer *)[gestureClass alloc] init]);
    38493849        _data->_immediateActionController = adoptNS([[WKImmediateActionController alloc] initWithPage:*_data->_page view:self recognizer:_data->_immediateActionGestureRecognizer.get()]);
    38503850        [_data->_immediateActionGestureRecognizer setDelegate:_data->_immediateActionController.get()];

  • trunk/Source/WebKit2/UIProcess/mac/WKSharingServicePickerDelegate.mm

    r182756 r183976  
    108108
    109109    if ([item isKindOfClass:[NSAttributedString class]]) {
    110         NSData *data = [item RTFDFromRange:NSMakeRange(0, [item length]) documentAttributes:nil];
     110        NSData *data = [item RTFDFromRange:NSMakeRange(0, [item length]) documentAttributes:@{ }];
    111111        dataReference = IPC::DataReference(static_cast<const uint8_t*>([data bytes]), [data length]);
    112112

  • trunk/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm

    r183447 r183976  
    10511051        return;
    10521052
    1053     NSData *selectionData = [attributedSelection RTFDFromRange:NSMakeRange(0, [attributedSelection length]) documentAttributes:nil];
     1053    NSData *selectionData = [attributedSelection RTFDFromRange:NSMakeRange(0, [attributedSelection length]) documentAttributes:@{ }];
    10541054    IPC::DataReference data = IPC::DataReference(reinterpret_cast<const uint8_t*>([selectionData bytes]), [selectionData length]);
    10551055    bool isEditable = selection.selection().isContentEditable();

  • trunk/Tools/ChangeLog

    r183974 r183976  
     12015-05-07  Anders Carlsson  <andersca@apple.com>
     2
     3        Build fixes.
     4
     5        * TestWebKitAPI/Tests/mac/HTMLCollectionNamedItem.mm:
     6        (TestWebKitAPI::TEST):
     7        * TestWebKitAPI/Tests/mac/HTMLFormCollectionNamedItem.mm:
     8        (TestWebKitAPI::TEST):
     9        Add casts.
     10
    1112015-05-07  Filip Pizlo  <fpizlo@apple.com>
    212

  • trunk/Tools/TestWebKitAPI/Tests/mac/HTMLCollectionNamedItem.mm

    r178293 r183976  
    6464    RetainPtr<DOMHTMLCollection> collection = [[document body] children];
    6565
    66     EXPECT_EQ([collection.get() length], (unsigned)4);
    67     EXPECT_WK_STREQ([[collection.get() item:0] value], @"firstItem");
    68     EXPECT_WK_STREQ([[collection.get() item:1] value], @"secondItem");
    69     EXPECT_WK_STREQ([[collection.get() namedItem:@"idForTwoTextFields"] value], @"firstItem");
    70     EXPECT_WK_STREQ([[collection.get() item:1] value], @"secondItem");
    71     EXPECT_WK_STREQ([[collection.get() item:0] value], @"firstItem");
     66    EXPECT_EQ([collection length], (unsigned)4);
     67    EXPECT_WK_STREQ([(DOMHTMLInputElement *)[collection item:0] value], @"firstItem");
     68    EXPECT_WK_STREQ([(DOMHTMLInputElement *)[collection item:1] value], @"secondItem");
     69    EXPECT_WK_STREQ([(DOMHTMLInputElement *)[collection namedItem:@"idForTwoTextFields"] value], @"firstItem");
     70    EXPECT_WK_STREQ([(DOMHTMLInputElement *)[collection item:1] value], @"secondItem");
     71    EXPECT_WK_STREQ([(DOMHTMLInputElement *)[collection item:0] value], @"firstItem");
    7272
    73     EXPECT_WK_STREQ([(DOMHTMLElement*)[collection.get() item:2] title], @"thirdItem");
    74     EXPECT_WK_STREQ([(DOMHTMLElement*)[collection.get() item:3] title], @"fourthItem");
    75     EXPECT_WK_STREQ([(DOMHTMLElement*)[collection.get() namedItem:@"nameForTwoImages"] title], @"thirdItem");
    76     EXPECT_WK_STREQ([(DOMHTMLElement*)[collection.get() item:3] title], @"fourthItem");
    77     EXPECT_WK_STREQ([(DOMHTMLElement*)[collection.get() item:2] title], @"thirdItem");
     73    EXPECT_WK_STREQ([(DOMHTMLElement *)[collection item:2] title], @"thirdItem");
     74    EXPECT_WK_STREQ([(DOMHTMLElement *)[collection item:3] title], @"fourthItem");
     75    EXPECT_WK_STREQ([(DOMHTMLElement *)[collection namedItem:@"nameForTwoImages"] title], @"thirdItem");
     76    EXPECT_WK_STREQ([(DOMHTMLElement *)[collection item:3] title], @"fourthItem");
     77    EXPECT_WK_STREQ([(DOMHTMLElement *)[collection item:2] title], @"thirdItem");
    7878}
    7979

  • trunk/Tools/TestWebKitAPI/Tests/mac/HTMLFormCollectionNamedItem.mm

    r178293 r183976  
    6666
    6767    EXPECT_EQ([collection.get() length], (unsigned)2);
    68     EXPECT_WK_STREQ([[collection.get() item:0] value], @"firstItem");
    69     EXPECT_WK_STREQ([[collection.get() item:1] value], @"secondItem");
    70     EXPECT_WK_STREQ([[collection.get() namedItem:@"nameForTwoTextFields"] value], @"firstItem");
    71     EXPECT_WK_STREQ([[collection.get() item:1] value], @"secondItem");
    72     EXPECT_WK_STREQ([[collection.get() item:0] value], @"firstItem");
     68    EXPECT_WK_STREQ([(DOMHTMLInputElement *)[collection item:0] value], @"firstItem");
     69    EXPECT_WK_STREQ([(DOMHTMLInputElement *)[collection item:1] value], @"secondItem");
     70    EXPECT_WK_STREQ([(DOMHTMLInputElement *)[collection namedItem:@"nameForTwoTextFields"] value], @"firstItem");
     71    EXPECT_WK_STREQ([(DOMHTMLInputElement *)[collection item:1] value], @"secondItem");
     72    EXPECT_WK_STREQ([(DOMHTMLInputElement *)[collection item:0] value], @"firstItem");
    7373}
    7474
Note: See TracChangeset for help on using the changeset viewer.