Title: [175133] branches/safari-600.3-branch/Source/WebKit2
- Revision
- 175133
- Author
- [email protected]
- Date
- 2014-10-23 12:17:09 -0700 (Thu, 23 Oct 2014)
Log Message
Correcting the merge for r175075. <rdar://problem/18717767>
Modified Paths
Diff
Modified: branches/safari-600.3-branch/Source/WebKit2/ChangeLog (175132 => 175133)
--- branches/safari-600.3-branch/Source/WebKit2/ChangeLog 2014-10-23 19:03:38 UTC (rev 175132)
+++ branches/safari-600.3-branch/Source/WebKit2/ChangeLog 2014-10-23 19:17:09 UTC (rev 175133)
@@ -1,5 +1,13 @@
2014-10-23 Matthew Hanson <[email protected]>
+ Correcting the merge for r175075. <rdar://problem/18717767>
+
+ Rubber-stamped by Tim Horton.
+
+ * UIProcess/WebPageProxy.messages.in:
+
+2014-10-23 Matthew Hanson <[email protected]>
+
Merge r175127. <rdar://problem/18717767>
2014-10-23 Tim Horton <[email protected]>
Modified: branches/safari-600.3-branch/Source/WebKit2/UIProcess/WebPageProxy.messages.in (175132 => 175133)
--- branches/safari-600.3-branch/Source/WebKit2/UIProcess/WebPageProxy.messages.in 2014-10-23 19:03:38 UTC (rev 175132)
+++ branches/safari-600.3-branch/Source/WebKit2/UIProcess/WebPageProxy.messages.in 2014-10-23 19:17:09 UTC (rev 175133)
@@ -410,7 +410,5 @@
ContentFilterDidBlockLoadForFrame(WebCore::ContentFilter contentFilter, uint64_t frameID)
#endif
- IsPlayingAudioDidChange(bool newIsPlayingAudio)
-
DidPerformActionMenuHitTest(WebKit::ActionMenuHitTestResult result)
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
