Bug 125242 - Replace USE(SECURITY_FRAMEWORK) with finer-grained defines
Summary: Replace USE(SECURITY_FRAMEWORK) with finer-grained defines
Status: RESOLVED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: WebKit2 (show other bugs)
Version: 528+ (Nightly build)
Hardware: Unspecified Unspecified
: P2 Normal
Assignee: mitz
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2013-12-04 12:26 PST by mitz
Modified: 2013-12-04 13:01 PST (History)
3 users (show)

See Also:


Attachments
Remove USE(SECURITY_FRAMEWORK) and add HAVE(SEC_IDENTITY), HAVE(SEC_KEYCHAIN), and ENABLE(SEC_ITEM_SHIM) (21.80 KB, patch)
2013-12-04 12:33 PST, mitz
sam: review+
Details | Formatted Diff | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description mitz 2013-12-04 12:26:27 PST
Replace USE(SECURITY_FRAMEWORK) with finer-grained defines
Comment 1 mitz 2013-12-04 12:33:55 PST
Created attachment 218428 [details]
Remove USE(SECURITY_FRAMEWORK) and add HAVE(SEC_IDENTITY), HAVE(SEC_KEYCHAIN), and ENABLE(SEC_ITEM_SHIM)
Comment 2 Sam Weinig 2013-12-04 12:52:09 PST
Comment on attachment 218428 [details]
Remove USE(SECURITY_FRAMEWORK) and add HAVE(SEC_IDENTITY), HAVE(SEC_KEYCHAIN), and ENABLE(SEC_ITEM_SHIM)

View in context: https://bugs.webkit.org/attachment.cgi?id=218428&action=review

> Source/WebKit2/config.h:102
> +#ifndef HAVE_SEC_IDENTITY
> +#if PLATFORM(MAC) && !PLATFORM(IOS)
> +#define HAVE_SEC_IDENTITY 1
> +#endif
> +#endif
> +
> +#ifndef HAVE_SEC_KEYCHAIN
> +#if PLATFORM(MAC) && !PLATFORM(IOS)
> +#define HAVE_SEC_KEYCHAIN 1
> +#endif
> +#endif

I would move these to Platform.h, as they could apply to any of the projects.  The Shim is WebKit2 specific, so can stay here.
Comment 3 mitz 2013-12-04 12:54:07 PST
(In reply to comment #2)
> (From update of attachment 218428 [details])
> View in context: https://bugs.webkit.org/attachment.cgi?id=218428&action=review
> 
> > Source/WebKit2/config.h:102
> > +#ifndef HAVE_SEC_IDENTITY
> > +#if PLATFORM(MAC) && !PLATFORM(IOS)
> > +#define HAVE_SEC_IDENTITY 1
> > +#endif
> > +#endif
> > +
> > +#ifndef HAVE_SEC_KEYCHAIN
> > +#if PLATFORM(MAC) && !PLATFORM(IOS)
> > +#define HAVE_SEC_KEYCHAIN 1
> > +#endif
> > +#endif
> 
> I would move these to Platform.h, as they could apply to any of the projects.  The Shim is WebKit2 specific, so can stay here.

Will do. Thank you!
Comment 4 mitz 2013-12-04 13:01:52 PST
Committed <http://trac.webkit.org/r160117>.