Diff
Modified: branches/safari-534.51-branch/Source/WebCore/ChangeLog (92489 => 92490)
--- branches/safari-534.51-branch/Source/WebCore/ChangeLog 2011-08-05 18:14:21 UTC (rev 92489)
+++ branches/safari-534.51-branch/Source/WebCore/ChangeLog 2011-08-05 18:18:49 UTC (rev 92490)
@@ -1,5 +1,9 @@
-2011-08-03 Lucas Forschler <[email protected]>
+2011-08-05 Lucas Forschler <[email protected]>
+ Merged 92035.
+
+2011-08-05 Lucas Forschler <[email protected]>
+
Merged 92034.
2011-07-29 Jeff Miller <[email protected]>
Modified: branches/safari-534.51-branch/Source/WebCore/WebCore.vcproj/WebCore.vcproj (92489 => 92490)
--- branches/safari-534.51-branch/Source/WebCore/WebCore.vcproj/WebCore.vcproj 2011-08-05 18:14:21 UTC (rev 92489)
+++ branches/safari-534.51-branch/Source/WebCore/WebCore.vcproj/WebCore.vcproj 2011-08-05 18:18:49 UTC (rev 92490)
@@ -29308,6 +29308,26 @@
</File>
</Filter>
</Filter>
+ <Filter
+ Name="avfoundation"
+ >
+ <File
+ RelativePath="..\platform\graphics\avfoundation\MediaPlayerPrivateAVFoundation.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\platform\graphics\avfoundation\MediaPlayerPrivateAVFoundation.h"
+ >
+ </File>
+ <File
+ RelativePath="..\platform\graphics\avfoundation\MediaPlayerPrivateAVFoundationCF.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\platform\graphics\avfoundation\MediaPlayerPrivateAVFoundationCF.h"
+ >
+ </File>
+ </Filter>
</Filter>
<Filter
Name="network"
Modified: branches/safari-534.51-branch/Source/WebCore/WebCore.vcproj/WebCoreMediaQT.vsprops (92489 => 92490)
--- branches/safari-534.51-branch/Source/WebCore/WebCore.vcproj/WebCoreMediaQT.vsprops 2011-08-05 18:14:21 UTC (rev 92489)
+++ branches/safari-534.51-branch/Source/WebCore/WebCore.vcproj/WebCoreMediaQT.vsprops 2011-08-05 18:18:49 UTC (rev 92490)
@@ -4,4 +4,12 @@
Version="8.00"
Name="WebCoreMediaQT"
>
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""$(WebKitLibrariesDir)\include\CoreAudio";"$(WebKitLibrariesDir)\include\AVFoundation";"$(ProjectDir)..\platform\graphics\avfoundation""
+ />
+ <Tool
+ Name="VCLinkerTool"
+ DelayLoadDLLs="AVFoundationCF.dll;CoreVideo$(WebKitConfigSuffix).dll;MediaToolbox$(WebKitConfigSuffix).dll"
+ />
</VisualStudioPropertySheet>
Copied: branches/safari-534.51-branch/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundationCF.cpp (from rev 92035, trunk/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundationCF.cpp) (0 => 92490)
--- branches/safari-534.51-branch/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundationCF.cpp (rev 0)
+++ branches/safari-534.51-branch/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundationCF.cpp 2011-08-05 18:18:49 UTC (rev 92490)
@@ -0,0 +1,24 @@
+/*
+ * Copyright (C) 2011 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
Copied: branches/safari-534.51-branch/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundationCF.h (from rev 92035, trunk/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundationCF.h) (0 => 92490)
--- branches/safari-534.51-branch/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundationCF.h (rev 0)
+++ branches/safari-534.51-branch/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundationCF.h 2011-08-05 18:18:49 UTC (rev 92490)
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C) 2011 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef MediaPlayerPrivateAVFoundationCF_h
+#define MediaPlayerPrivateAVFoundationCF_h
+
+#endif // MediaPlayerPrivateAVFoundationCF_h
