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+

Andy Estes
Reported 2015-04-09 00:06:35 PDT
[Content Filtering] Add a HAVE(PARENTAL_CONTROLS) and use it
Attachments
Patch (9.12 KB, patch)
2015-04-09 00:21 PDT, Andy Estes 		ddkilzer: review+
DetailsFormatted DiffDiff
View All Add attachment proposed patch, testcase, etc.
Andy Estes
Comment 1 2015-04-09 00:18:05 PDT
rdar://problem/20344609
Andy Estes
Comment 2 2015-04-09 00:21:12 PDT
Created attachment 250422 [details] Patch
David Kilzer (:ddkilzer)
Comment 3 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
Andy Estes
Comment 4 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.
Andy Estes
Comment 5 2015-04-09 01:55:41 PDT
Committed r182596: <http://trac.webkit.org/changeset/182596>
Csaba Osztrogonác
Comment 6 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.
Csaba Osztrogonác
Comment 7 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.
Andy Estes
Comment 8 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
Note You need to log in before you can comment on or make changes to this bug.