Diff
Modified: branches/safari-537.73-branch/Source/WebCore/ChangeLog (158617 => 158618)
--- branches/safari-537.73-branch/Source/WebCore/ChangeLog 2013-11-05 00:47:32 UTC (rev 158617)
+++ branches/safari-537.73-branch/Source/WebCore/ChangeLog 2013-11-05 01:12:48 UTC (rev 158618)
@@ -1,3 +1,20 @@
+2013-11-04 Lucas Forschler <[email protected]>
+
+ Merge r155130
+
+ 2013-09-05 Brent Fulgham <[email protected]>
+
+ [Windows] Unreviewed build/link improvement after r155127 to be
+ consistent about using debug-build support libraries.
+
+ Now that <rdar://problem/9898937> is resolved, we should be linking
+ to debug AVFoundationCF as well.
+
+ * page/CaptionUserPreferencesMediaAF.cpp: Link to AVFoundationCF_debug
+ when building with the DEBUG_ALL target.
+ * platform/graphics/avfoundation/InbandTextTrackPrivateAVF.cpp: Ditto.
+ * platform/graphics/avfoundation/cf/AVFoundationCFSoftLinking.h: Ditto.
+
2013-11-04 Brent Fulgham <[email protected]>
Merge r157773
Modified: branches/safari-537.73-branch/Source/WebCore/page/CaptionUserPreferencesMediaAF.cpp (158617 => 158618)
--- branches/safari-537.73-branch/Source/WebCore/page/CaptionUserPreferencesMediaAF.cpp 2013-11-05 00:47:32 UTC (rev 158617)
+++ branches/safari-537.73-branch/Source/WebCore/page/CaptionUserPreferencesMediaAF.cpp 2013-11-05 01:12:48 UTC (rev 158618)
@@ -63,7 +63,13 @@
#define SOFT_LINK_AVF_POINTER(Lib, Name, Type) SOFT_LINK_POINTER_OPTIONAL(Lib, Name, Type)
#define SOFT_LINK_AVF_FRAMEWORK_IMPORT(Lib, Fun, ReturnType, Arguments, Signature) SOFT_LINK(Lib, Fun, ReturnType, Arguments, Signature)
#else
+
+#ifdef DEBUG_ALL
+#define SOFT_LINK_AVF_FRAMEWORK(Lib) SOFT_LINK_DEBUG_LIBRARY(Lib)
+#else
#define SOFT_LINK_AVF_FRAMEWORK(Lib) SOFT_LINK_LIBRARY(Lib)
+#endif
+
#define SOFT_LINK_AVF(Lib, Name, Type) SOFT_LINK_DLL_IMPORT(Lib, Name, Type)
#define SOFT_LINK_AVF_POINTER(Lib, Name, Type) SOFT_LINK_VARIABLE_DLL_IMPORT_OPTIONAL(Lib, Name, Type)
#define SOFT_LINK_AVF_FRAMEWORK_IMPORT(Lib, Fun, ReturnType, Arguments, Signature) SOFT_LINK_DLL_IMPORT(Lib, Fun, ReturnType, __cdecl, Arguments, Signature)
Modified: branches/safari-537.73-branch/Source/WebCore/platform/graphics/avfoundation/InbandTextTrackPrivateAVF.cpp (158617 => 158618)
--- branches/safari-537.73-branch/Source/WebCore/platform/graphics/avfoundation/InbandTextTrackPrivateAVF.cpp 2013-11-05 00:47:32 UTC (rev 158617)
+++ branches/safari-537.73-branch/Source/WebCore/platform/graphics/avfoundation/InbandTextTrackPrivateAVF.cpp 2013-11-05 01:12:48 UTC (rev 158618)
@@ -42,7 +42,12 @@
#define SOFT_LINK_AVF_FRAMEWORK(Lib) SOFT_LINK_FRAMEWORK_OPTIONAL(Lib)
#define SOFT_LINK_AVF_POINTER(Lib, Name, Type) SOFT_LINK_POINTER_OPTIONAL(Lib, Name, Type)
#else
+#ifdef DEBUG_ALL
+#define SOFT_LINK_AVF_FRAMEWORK(Lib) SOFT_LINK_DEBUG_LIBRARY(Lib)
+#else
#define SOFT_LINK_AVF_FRAMEWORK(Lib) SOFT_LINK_LIBRARY(Lib)
+#endif
+
#define SOFT_LINK_AVF_POINTER(Lib, Name, Type) SOFT_LINK_VARIABLE_DLL_IMPORT_OPTIONAL(Lib, Name, Type)
#endif
Modified: branches/safari-537.73-branch/Source/WebCore/platform/graphics/avfoundation/cf/AVFoundationCFSoftLinking.h (158617 => 158618)
--- branches/safari-537.73-branch/Source/WebCore/platform/graphics/avfoundation/cf/AVFoundationCFSoftLinking.h 2013-11-05 00:47:32 UTC (rev 158617)
+++ branches/safari-537.73-branch/Source/WebCore/platform/graphics/avfoundation/cf/AVFoundationCFSoftLinking.h 2013-11-05 01:12:48 UTC (rev 158618)
@@ -28,8 +28,7 @@
// Soft-link against AVFoundationCF functions and variables required by MediaPlayerPrivateAVFoundationCF.cpp.
#ifdef DEBUG_ALL
-// FIXME: <rdar://problem/9898937> AVFoundationCF doesn't currently deliver a debug library.
-SOFT_LINK_LIBRARY(AVFoundationCF)
+SOFT_LINK_DEBUG_LIBRARY(AVFoundationCF)
#else
SOFT_LINK_LIBRARY(AVFoundationCF)
#endif
Modified: branches/safari-537.73-branch/Source/WebCore/platform/graphics/win/MediaPlayerPrivateQuickTimeVisualContext.cpp (158617 => 158618)
--- branches/safari-537.73-branch/Source/WebCore/platform/graphics/win/MediaPlayerPrivateQuickTimeVisualContext.cpp 2013-11-05 00:47:32 UTC (rev 158617)
+++ branches/safari-537.73-branch/Source/WebCore/platform/graphics/win/MediaPlayerPrivateQuickTimeVisualContext.cpp 2013-11-05 01:12:48 UTC (rev 158618)
@@ -1009,7 +1009,11 @@
bool MediaPlayerPrivateQuickTimeVisualContext::isAvailable()
{
+#ifdef DEBUG_ALL
+ return false;
+#else
return QTMovie::initializeQuickTime();
+#endif
}
MediaPlayer::SupportsType MediaPlayerPrivateQuickTimeVisualContext::supportsType(const String& type, const String& codecs, const KURL&)
