Bug 143559

Summary: [Content Filtering] Add a HAVE(PARENTAL_CONTROLS) and use it
Product: WebKit Reporter: Andy Estes <aestes>
Component: New BugsAssignee: Andy Estes <aestes>
Status: RESOLVED FIXED    
Severity: Normal CC: benjamin, cmarcelo, commit-queue, ddkilzer, japhet, mjs, ossy
Priority: P2 Keywords: InRadar
Version: 528+ (Nightly build)   
Hardware: Unspecified   
OS: Unspecified   
Attachments:
Description Flags
Patch ddkilzer: review+

Description Andy Estes 2015-04-09 00:06:35 PDT 
[Content Filtering] Add a HAVE(PARENTAL_CONTROLS) and use it
Comment 1 Andy Estes 2015-04-09 00:18:05 PDT 
rdar://problem/20344609
Comment 2 Andy Estes 2015-04-09 00:21:12 PDT 
Created attachment 250422 [details]
Patch
Comment 3 David Kilzer (:ddkilzer) 2015-04-09 00:48:15 PDT 
Comment on attachment 250422 [details]
Patch

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

r=me

> Source/WebCore/platform/cocoa/ParentalControlsContentFilter.h:33
> +#define HAVE_PARENTAL_CONTROLS PLATFORM(COCOA) && !PLATFORM(WATCHOS)

I think we normally surround this with the following to prevent macro re-definition warnings:

#ifndef HAVE_PARENTAL_CONTROLS
...
#endif
Comment 4 Andy Estes 2015-04-09 00:49:07 PDT 
(In reply to comment #3)
> Comment on attachment 250422 [details]
> Patch
> 
> View in context:
> https://bugs.webkit.org/attachment.cgi?id=250422&action=review
> 
> r=me

Thanks!

> 
> > Source/WebCore/platform/cocoa/ParentalControlsContentFilter.h:33
> > +#define HAVE_PARENTAL_CONTROLS PLATFORM(COCOA) && !PLATFORM(WATCHOS)
> 
> I think we normally surround this with the following to prevent macro
> re-definition warnings:
> 
> #ifndef HAVE_PARENTAL_CONTROLS
> ...
> #endif

Yes, you're right. Will do.
Comment 5 Andy Estes 2015-04-09 01:55:41 PDT 
Committed r182596: <http://trac.webkit.org/changeset/182596>
Comment 6 Csaba Osztrogonác 2015-04-09 02:18:31 PDT 
(In reply to comment #5)
> Committed r182596: <http://trac.webkit.org/changeset/182596>

It broke the build on the Apple Mac bots.
Comment 7 Csaba Osztrogonác 2015-04-09 02:19:54 PDT 
/Volumes/Data/slave/yosemite-release/build/Source/WebCore/platform/ContentFilterUnblockHandler.h:54:66: error: use of undeclared identifier 'WebFilterEvaluator'
    ContentFilterUnblockHandler(String unblockURLHost, RetainPtr<WebFilterEvaluator>);
                                                                 ^
/Volumes/Data/slave/yosemite-release/build/Source/WebCore/platform/ContentFilterUnblockHandler.h:73:15: error: use of undeclared identifier 'WebFilterEvaluator'
    RetainPtr<WebFilterEvaluator> m_webFilterEvaluator;
              ^
2 errors generated.
Comment 8 Andy Estes 2015-04-09 02:29:59 PDT 
(In reply to comment #7)
> /Volumes/Data/slave/yosemite-release/build/Source/WebCore/platform/
> ContentFilterUnblockHandler.h:54:66: error: use of undeclared identifier
> 'WebFilterEvaluator'
>     ContentFilterUnblockHandler(String unblockURLHost,
> RetainPtr<WebFilterEvaluator>);
>                                                                  ^
> /Volumes/Data/slave/yosemite-release/build/Source/WebCore/platform/
> ContentFilterUnblockHandler.h:73:15: error: use of undeclared identifier
> 'WebFilterEvaluator'
>     RetainPtr<WebFilterEvaluator> m_webFilterEvaluator;
>               ^
> 2 errors generated.

This should be fixed in http://trac.webkit.org/changeset/182597