Bug 143559 - [Content Filtering] Add a HAVE(PARENTAL_CONTROLS) and use it
Summary: [Content Filtering] Add a HAVE(PARENTAL_CONTROLS) and use it
Status: RESOLVED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: New Bugs (show other bugs)
Version: 528+ (Nightly build)
Hardware: Unspecified Unspecified
: P2 Normal
Assignee: Andy Estes
URL:
Keywords: InRadar
Depends on:
Blocks:
 
Reported: 2015-04-09 00:06 PDT by Andy Estes
Modified: 2015-04-09 02:29 PDT (History)
7 users (show)

See Also:

Attachments
Patch (9.12 KB, patch)
2015-04-09 00:21 PDT, Andy Estes 		ddkilzer: review+
Details | Formatted Diff | Diff
View All Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
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