Bug 143559 – [Content Filtering] Add a HAVE(PARENTAL_CONTROLS) and use it

• Status: RESOLVED
• Resolution: FIXED
• Component: New Bugs

[Andy Estes]

[Content Filtering] Add a HAVE(PARENTAL_CONTROLS) and use it

[Andy Estes]

rdar://problem/20344609

[Andy Estes]

Created attachment 250422 [details]
Patch

[David Kilzer (:ddkilzer)]

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

[Andy Estes]

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

[Andy Estes]

Committed r182596: <http://trac.webkit.org/changeset/182596>

[Csaba Osztrogonác]

(In reply to comment #5)
> Committed r182596: <http://trac.webkit.org/changeset/182596>

It broke the build on the Apple Mac bots.

[Csaba Osztrogonác]

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

[Andy Estes]

(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