Title: [188079] branches/safari-601.1-branch/Source/WebKit/mac
- Revision
- 188079
- Author
- dburk...@apple.com
- Date
- 2015-08-06 16:09:45 -0700 (Thu, 06 Aug 2015)
Log Message
Merge r187910. rdar://problem/15779101
Modified Paths
Diff
Modified: branches/safari-601.1-branch/Source/WebKit/mac/ChangeLog (188078 => 188079)
--- branches/safari-601.1-branch/Source/WebKit/mac/ChangeLog 2015-08-06 23:09:43 UTC (rev 188078)
+++ branches/safari-601.1-branch/Source/WebKit/mac/ChangeLog 2015-08-06 23:09:45 UTC (rev 188079)
@@ -1,5 +1,15 @@
2015-08-06 Dana Burkart <dburk...@apple.com>
+ Merge r187910. rdar://problem/15779101
+
+ 2015-08-04 Simon Fraser <simon.fra...@apple.com>
+
+ Fix the build.
+
+ * Plugins/WebNetscapePluginStream.h:
+
+2015-08-06 Dana Burkart <dburk...@apple.com>
+
Merge r187886. rdar://problem/15779101
2015-08-04 Alexey Proskuryakov <a...@apple.com>
Modified: branches/safari-601.1-branch/Source/WebKit/mac/Plugins/WebNetscapePluginStream.h (188078 => 188079)
--- branches/safari-601.1-branch/Source/WebKit/mac/Plugins/WebNetscapePluginStream.h 2015-08-06 23:09:43 UTC (rev 188078)
+++ branches/safari-601.1-branch/Source/WebKit/mac/Plugins/WebNetscapePluginStream.h 2015-08-06 23:09:45 UTC (rev 188079)
@@ -98,9 +98,9 @@
// NetscapePlugInStreamLoaderClient methods.
void willSendRequest(WebCore::NetscapePlugInStreamLoader*, WebCore::ResourceRequest&&, const WebCore::ResourceResponse& redirectResponse, std::function<void (WebCore::ResourceRequest&&)>&&) override;
- void didReceiveResponse(WebCore::NetscapePlugInStreamLoader*, const WebCore::ResourceResponse&);
- void didFail(WebCore::NetscapePlugInStreamLoader*, const WebCore::ResourceError&);
- bool wantsAllStreams() const;
+ void didReceiveResponse(WebCore::NetscapePlugInStreamLoader*, const WebCore::ResourceResponse&) override;
+ void didFail(WebCore::NetscapePlugInStreamLoader*, const WebCore::ResourceError&) override;
+ bool wantsAllStreams() const override;
RetainPtr<NSMutableData> m_deliveryData;
WebCore::URL m_requestURL;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
