From: dino@apple.com Date: Wed, 25 Mar 2015 06:06:15 +0000 (+0000) Subject: Source/WebCore/rendering/RenderThemeMac.mm:2181:118: error: null passed to a callee... X-Git-Url: http://git.webkit.org/?p=WebKit-https.git;a=commitdiff_plain;h=3a1774315e1d6c8fd78ee68ee5f4a8137dbadccc Source/WebCore/rendering/RenderThemeMac.mm:2181:118: error: null passed to a callee that requires a non-null argument [-Werror,-Wnonnull] https://bugs.webkit.org/show_bug.cgi?id=143039 Unreviewed build fix for newer versions of OS X. * rendering/RenderThemeMac.mm: Define a null language parameter. This seemed better than turning the clang warning off for just that function. (WebCore::AttachmentLayout::layOutTitle): (WebCore::AttachmentLayout::layOutSubtitle): git-svn-id: https://svn.webkit.org/repository/webkit/trunk@181934 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog index 9a74dd8..beb4747 100644 --- a/Source/WebCore/ChangeLog +++ b/Source/WebCore/ChangeLog @@ -1,3 +1,16 @@ +2015-03-24 Dean Jackson + + Source/WebCore/rendering/RenderThemeMac.mm:2181:118: error: null passed to a callee that requires a non-null argument [-Werror,-Wnonnull] + https://bugs.webkit.org/show_bug.cgi?id=143039 + + Unreviewed build fix for newer versions of OS X. + + * rendering/RenderThemeMac.mm: Define a null language parameter. This + seemed better than turning the clang warning off for just that + function. + (WebCore::AttachmentLayout::layOutTitle): + (WebCore::AttachmentLayout::layOutSubtitle): + 2015-03-24 Dan Bernstein Another attempt to fix the build. diff --git a/Source/WebCore/rendering/RenderThemeMac.mm b/Source/WebCore/rendering/RenderThemeMac.mm index 81df763..3b607e0 100644 --- a/Source/WebCore/rendering/RenderThemeMac.mm +++ b/Source/WebCore/rendering/RenderThemeMac.mm @@ -2178,7 +2178,8 @@ void AttachmentLayout::addTitleLine(CTLineRef line, CGFloat& yOffset, Vector font = adoptCF(CTFontCreateUIFontForLanguage(kCTFontUIFontSystem, attachmentTitleFontSize, nullptr)); + CFStringRef language = 0; // By not specifying a language we use the system language. + RetainPtr font = adoptCF(CTFontCreateUIFontForLanguage(kCTFontUIFontSystem, attachmentTitleFontSize, language)); baseline = CGRound(attachmentIconBackgroundSize + attachmentIconToTitleMargin + CTFontGetAscent(font.get())); String title = attachment.attachmentElement().attachmentTitle(); @@ -2241,7 +2242,8 @@ void AttachmentLayout::layOutSubtitle(const RenderAttachment& attachment) if (subtitleText.isEmpty()) return; - RetainPtr font = adoptCF(CTFontCreateUIFontForLanguage(kCTFontUIFontSystem, attachmentSubtitleFontSize, nullptr)); + CFStringRef language = 0; // By not specifying a language we use the system language. + RetainPtr font = adoptCF(CTFontCreateUIFontForLanguage(kCTFontUIFontSystem, attachmentSubtitleFontSize, language)); NSDictionary *textAttributes = @{ (id)kCTFontAttributeName: (id)font.get(), (id)kCTForegroundColorAttributeName: (NSColor *)cachedCGColor(attachmentSubtitleTextColor(), ColorSpaceDeviceRGB)