Title: [204175] trunk/Tools
- Revision
- 204175
- Author
- [email protected]
- Date
- 2016-08-05 09:57:34 -0700 (Fri, 05 Aug 2016)
Log Message
Build fix after 204053.
Unreviewed.
* TestWebKitAPI/Configurations/Base.xcconfig:
* TestWebKitAPI/Tests/WebKit2Cocoa/ContentFilteringPlugIn.mm:
(-[MockContentFilterEnabler initWithCoder:]):
(-[MockContentFilterEnabler dealloc]):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (204174 => 204175)
--- trunk/Tools/ChangeLog 2016-08-05 16:51:05 UTC (rev 204174)
+++ trunk/Tools/ChangeLog 2016-08-05 16:57:34 UTC (rev 204175)
@@ -1,3 +1,14 @@
+2016-08-05 Enrica Casucci <[email protected]>
+
+ Build fix after 204053.
+
+ Unreviewed.
+
+ * TestWebKitAPI/Configurations/Base.xcconfig:
+ * TestWebKitAPI/Tests/WebKit2Cocoa/ContentFilteringPlugIn.mm:
+ (-[MockContentFilterEnabler initWithCoder:]):
+ (-[MockContentFilterEnabler dealloc]):
+
2016-08-05 Konstantin Tokarev <[email protected]>
Print test name in "Last character read from DRT..." error message.
Modified: trunk/Tools/TestWebKitAPI/Configurations/Base.xcconfig (204174 => 204175)
--- trunk/Tools/TestWebKitAPI/Configurations/Base.xcconfig 2016-08-05 16:51:05 UTC (rev 204174)
+++ trunk/Tools/TestWebKitAPI/Configurations/Base.xcconfig 2016-08-05 16:57:34 UTC (rev 204175)
@@ -70,7 +70,7 @@
DEBUG_DEFINES_normal = NDEBUG;
DEBUG_DEFINES = $(DEBUG_DEFINES_$(CURRENT_VARIANT));
-SUPPORTED_PLATFORMS = iphoneos iphonesimulator macosx tvos tvsimulator watchos watchsimulator;
+SUPPORTED_PLATFORMS = iphoneos iphonesimulator macosx appletvos appletvsimulator watchos watchsimulator;
TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier));
TARGET_MAC_OS_X_VERSION_MAJOR_10 = 101000;
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/ContentFilteringPlugIn.mm (204174 => 204175)
--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/ContentFilteringPlugIn.mm 2016-08-05 16:51:05 UTC (rev 204174)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/ContentFilteringPlugIn.mm 2016-08-05 16:57:34 UTC (rev 204175)
@@ -59,17 +59,21 @@
if (!(self = [super init]))
return nil;
+#if ENABLE(CONTENT_FILTERING)
auto& settings = MockContentFilterSettings::singleton();
settings.setEnabled(true);
settings.setDecision(static_cast<Decision>([decoder decodeIntForKey:@"Decision"]));
settings.setDecisionPoint(static_cast<DecisionPoint>([decoder decodeIntForKey:@"DecisionPoint"]));
settings.setBlockedString(ASCIILiteral("blocked"));
+#endif
return self;
}
- (void)dealloc
{
+#if ENABLE(CONTENT_FILTERING)
MockContentFilterSettings::singleton().setEnabled(false);
+#endif
[super dealloc];
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
