Title: [219771] branches/safari-604-branch/Tools
Revision
219771
Author
[email protected]
Date
2017-07-22 23:50:47 -0700 (Sat, 22 Jul 2017)

Log Message

Cherry-pick r219590. rdar://problem/33465177

Modified Paths

Diff

Modified: branches/safari-604-branch/Tools/ChangeLog (219770 => 219771)


--- branches/safari-604-branch/Tools/ChangeLog	2017-07-23 06:50:45 UTC (rev 219770)
+++ branches/safari-604-branch/Tools/ChangeLog	2017-07-23 06:50:47 UTC (rev 219771)
@@ -1,5 +1,18 @@
 2017-07-22  Jason Marcell  <[email protected]>
 
+        Cherry-pick r219590. rdar://problem/33465177
+
+    2017-07-17  Wenson Hsieh  <[email protected]>
+
+            Unreviewed, fix the iOS build.
+
+            I missed a spot when renaming -synchronouslyLoadHTML: to -synchronouslyLoadHTMLString:.
+
+            * TestWebKitAPI/Tests/ios/DataInteractionTests.mm:
+            (TestWebKitAPI::TEST):
+
+2017-07-22  Jason Marcell  <[email protected]>
+
         Cherry-pick r219585. rdar://problem/33465177
 
     2017-07-17  Wenson Hsieh  <[email protected]>

Modified: branches/safari-604-branch/Tools/TestWebKitAPI/Tests/ios/DataInteractionTests.mm (219770 => 219771)


--- branches/safari-604-branch/Tools/TestWebKitAPI/Tests/ios/DataInteractionTests.mm	2017-07-23 06:50:45 UTC (rev 219770)
+++ branches/safari-604-branch/Tools/TestWebKitAPI/Tests/ios/DataInteractionTests.mm	2017-07-23 06:50:47 UTC (rev 219771)
@@ -173,7 +173,7 @@
 TEST(DataInteractionTests, CanStartDragOnEnormousImage)
 {
     auto webView = adoptNS([[TestWKWebView alloc] initWithFrame:CGRectMake(0, 0, 320, 500)]);
-    [webView synchronouslyLoadHTML:@"<img src=''></img>"];
+    [webView synchronouslyLoadHTMLString:@"<img src=''></img>"];
 
     auto dataInteractionSimulator = adoptNS([[DataInteractionSimulator alloc] initWithWebView:webView.get()]);
     [dataInteractionSimulator runFrom:CGPointMake(100, 100) to:CGPointMake(100, 100)];
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to