Title: [175307] branches/safari-600.3-branch/Source/WebKit/mac
- Revision
- 175307
- Author
- [email protected]
- Date
- 2014-10-28 21:58:03 -0700 (Tue, 28 Oct 2014)
Log Message
Merged r175183. rdar://problem/18451638
Modified Paths
Diff
Modified: branches/safari-600.3-branch/Source/WebKit/mac/ChangeLog (175306 => 175307)
--- branches/safari-600.3-branch/Source/WebKit/mac/ChangeLog 2014-10-29 04:55:46 UTC (rev 175306)
+++ branches/safari-600.3-branch/Source/WebKit/mac/ChangeLog 2014-10-29 04:58:03 UTC (rev 175307)
@@ -1,5 +1,18 @@
2014-10-28 Lucas Forschler <[email protected]>
+ Merge r175183
+
+ 2014-10-24 Beth Dakin <[email protected]>
+
+ Build fix.
+
+ * WebView/WebActionMenuController.mm:
+ (-[WebActionMenuController _openURLFromActionMenu:]):
+ (-[WebActionMenuController _addToReadingListFromActionMenu:]):
+ (-[WebActionMenuController _quickLookURLFromActionMenu:]):
+
+2014-10-28 Lucas Forschler <[email protected]>
+
Merge r175182
2014-10-24 Beth Dakin <[email protected]>
Modified: branches/safari-600.3-branch/Source/WebKit/mac/WebView/WebActionMenuController.mm (175306 => 175307)
--- branches/safari-600.3-branch/Source/WebKit/mac/WebView/WebActionMenuController.mm 2014-10-29 04:55:46 UTC (rev 175306)
+++ branches/safari-600.3-branch/Source/WebKit/mac/WebView/WebActionMenuController.mm 2014-10-29 04:58:03 UTC (rev 175307)
@@ -93,7 +93,7 @@
if (!_webView)
return;
- NSURL *url = ""
+ NSURL *url = "" representedObject];
if (!url)
return;
@@ -107,7 +107,7 @@
if (!_webView)
return;
- NSURL *url = ""
+ NSURL *url = "" representedObject];
if (!url)
return;
@@ -139,7 +139,7 @@
if (!_webView)
return;
- NSDictionary *hitTestResult = sender.representedObject;
+ NSDictionary *hitTestResult = [sender representedObject];
if (!hitTestResult)
return;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
