Title: [158052] branches/safari-537.73-branch/Source/WebCore
- Revision
- 158052
- Author
- [email protected]
- Date
- 2013-10-25 14:32:27 -0700 (Fri, 25 Oct 2013)
Log Message
Merged r155127. <rdar://problem/15109454>
Modified Paths
Diff
Modified: branches/safari-537.73-branch/Source/WebCore/ChangeLog (158051 => 158052)
--- branches/safari-537.73-branch/Source/WebCore/ChangeLog 2013-10-25 21:31:36 UTC (rev 158051)
+++ branches/safari-537.73-branch/Source/WebCore/ChangeLog 2013-10-25 21:32:27 UTC (rev 158052)
@@ -1,5 +1,23 @@
2013-10-25 Lucas Forschler <[email protected]>
+ Merge r155127
+
+ 2013-09-04 Anders Carlsson <[email protected]>
+
+ Vector::releaseBuffer should return an OwnPtr
+ https://bugs.webkit.org/show_bug.cgi?id=120718
+
+ Reviewed by Andreas Kling.
+
+ Change FormStreamFields::currentData to an OwnPtr.
+
+ * platform/network/cf/FormDataStreamCFNet.cpp:
+ (WebCore::closeCurrentStream):
+ (WebCore::advanceCurrentStream):
+ (WebCore::formCreate):
+
+2013-10-25 Lucas Forschler <[email protected]>
+
Merge r154915
2013-08-30 Brent Fulgham <[email protected]>
Modified: branches/safari-537.73-branch/Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp (158051 => 158052)
--- branches/safari-537.73-branch/Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp 2013-10-25 21:31:36 UTC (rev 158051)
+++ branches/safari-537.73-branch/Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp 2013-10-25 21:32:27 UTC (rev 158052)
@@ -60,7 +60,11 @@
#include "CoreMediaSoftLinking.h"
// We don't bother softlinking against libdispatch since it's already been loaded by AAS.
+#ifdef DEBUG_ALL
+#pragma comment(lib, "libdispatch_debug.lib")
+#else
#pragma comment(lib, "libdispatch.lib")
+#endif
using namespace std;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
