Title: [201026] branches/safari-602.1.32-branch/Tools
Diff
Modified: branches/safari-602.1.32-branch/Tools/ChangeLog (201025 => 201026)
--- branches/safari-602.1.32-branch/Tools/ChangeLog 2016-05-17 18:48:55 UTC (rev 201025)
+++ branches/safari-602.1.32-branch/Tools/ChangeLog 2016-05-17 18:48:57 UTC (rev 201026)
@@ -1,5 +1,18 @@
2016-05-17 Babak Shafiei <[email protected]>
+ Merge r200670.
+
+ 2016-05-10 Ryan Haddad <[email protected]>
+
+ Another attempt to fix the build after r200668.
+
+ Unreviewed build fix.
+
+ * TestWebKitAPI/Tests/WebKit2Cocoa/Coding.mm:
+ (TEST):
+
+2016-05-17 Babak Shafiei <[email protected]>
+
Merge r200669.
2016-05-10 Dan Bernstein <[email protected]>
Modified: branches/safari-602.1.32-branch/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/Coding.mm (201025 => 201026)
--- branches/safari-602.1.32-branch/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/Coding.mm 2016-05-17 18:48:55 UTC (rev 201025)
+++ branches/safari-602.1.32-branch/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/Coding.mm 2016-05-17 18:48:57 UTC (rev 201026)
@@ -97,9 +97,9 @@
[a setSuppressesIncrementalRendering:YES];
[a setApplicationNameForUserAgent:@"Application Name"];
[a setAllowsAirPlayForMediaPlayback:NO];
- [a setDataDetectorTypes:WKDataDetectorTypeAll];
#if PLATFORM(IOS)
+ [a setDataDetectorTypes:WKDataDetectorTypeAll];
[a setAllowsInlineMediaPlayback:YES];
[a setRequiresUserActionForMediaPlayback:NO];
[a setSelectionGranularity:WKSelectionGranularityCharacter];
@@ -111,9 +111,9 @@
EXPECT_EQ([a suppressesIncrementalRendering], [b suppressesIncrementalRendering]);
EXPECT_TRUE([[a applicationNameForUserAgent] isEqualToString:[b applicationNameForUserAgent]]);
EXPECT_EQ([a allowsAirPlayForMediaPlayback], [b allowsAirPlayForMediaPlayback]);
- EXPECT_EQ([a dataDetectorTypes], [b dataDetectorTypes]);
#if PLATFORM(IOS)
+ EXPECT_EQ([a dataDetectorTypes], [b dataDetectorTypes]);
EXPECT_EQ([a allowsInlineMediaPlayback], [b allowsInlineMediaPlayback]);
EXPECT_EQ([a requiresUserActionForMediaPlayback], [b requiresUserActionForMediaPlayback]);
EXPECT_EQ([a selectionGranularity], [b selectionGranularity]);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
