Diff
Modified: trunk/Source/WebCore/ChangeLog (181206 => 181207)
--- trunk/Source/WebCore/ChangeLog 2015-03-07 06:12:57 UTC (rev 181206)
+++ trunk/Source/WebCore/ChangeLog 2015-03-07 17:34:38 UTC (rev 181207)
@@ -1,3 +1,18 @@
+2015-03-07 David Kilzer <ddkil...@apple.com>
+
+ Rename SOFT_LINK_FRAMEWORK_{HEADER,SOURCE} to SOFT_LINK_FRAMEWORK_FOR_{HEADER,SOURCE}
+ <http://webkit.org/b/142434>
+
+ Reviewed by Darin Adler.
+
+ * platform/cf/CoreMediaSoftLink.cpp:
+ * platform/cf/CoreMediaSoftLink.h:
+ * platform/cf/MediaAccessibilitySoftLink.cpp:
+ * platform/cf/MediaAccessibilitySoftLink.h:
+ * platform/mac/SoftLinking.h:
+ * platform/win/SoftLinking.h:
+ - Do the rename.
+
2015-03-06 Sam Weinig <s...@webkit.org>
[Content Extensions] Move compiling of content extensions to the UIProcess
Modified: trunk/Source/WebCore/platform/cf/CoreMediaSoftLink.cpp (181206 => 181207)
--- trunk/Source/WebCore/platform/cf/CoreMediaSoftLink.cpp 2015-03-07 06:12:57 UTC (rev 181206)
+++ trunk/Source/WebCore/platform/cf/CoreMediaSoftLink.cpp 2015-03-07 17:34:38 UTC (rev 181207)
@@ -30,7 +30,7 @@
#include "CoreMediaSPI.h"
#include "SoftLinking.h"
-SOFT_LINK_FRAMEWORK_SOURCE(WebCore, CoreMedia)
+SOFT_LINK_FRAMEWORK_FOR_SOURCE(WebCore, CoreMedia)
SOFT_LINK_FUNCTION_FOR_SOURCE(WebCore, CoreMedia, CMBlockBufferCopyDataBytes, OSStatus, (CMBlockBufferRef theSourceBuffer, size_t offsetToData, size_t dataLength, void* destination), (theSourceBuffer, offsetToData, dataLength, destination))
SOFT_LINK_FUNCTION_FOR_SOURCE(WebCore, CoreMedia, CMBlockBufferGetDataLength, size_t, (CMBlockBufferRef theBuffer), (theBuffer))
Modified: trunk/Source/WebCore/platform/cf/CoreMediaSoftLink.h (181206 => 181207)
--- trunk/Source/WebCore/platform/cf/CoreMediaSoftLink.h 2015-03-07 06:12:57 UTC (rev 181206)
+++ trunk/Source/WebCore/platform/cf/CoreMediaSoftLink.h 2015-03-07 17:34:38 UTC (rev 181207)
@@ -31,7 +31,7 @@
#include "CoreMediaSPI.h"
#include "SoftLinking.h"
-SOFT_LINK_FRAMEWORK_HEADER(WebCore, CoreMedia)
+SOFT_LINK_FRAMEWORK_FOR_HEADER(WebCore, CoreMedia)
SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, CoreMedia, CMBlockBufferCopyDataBytes, OSStatus, (CMBlockBufferRef theSourceBuffer, size_t offsetToData, size_t dataLength, void* destination), (theSourceBuffer, offsetToData, dataLength, destination))
#define CMBlockBufferCopyDataBytes softLink_CoreMedia_CMBlockBufferCopyDataBytes
Modified: trunk/Source/WebCore/platform/cf/MediaAccessibilitySoftLink.cpp (181206 => 181207)
--- trunk/Source/WebCore/platform/cf/MediaAccessibilitySoftLink.cpp 2015-03-07 06:12:57 UTC (rev 181206)
+++ trunk/Source/WebCore/platform/cf/MediaAccessibilitySoftLink.cpp 2015-03-07 17:34:38 UTC (rev 181207)
@@ -30,7 +30,7 @@
#include <CoreText/CoreText.h>
#include <MediaAccessibility/MediaAccessibility.h>
-SOFT_LINK_FRAMEWORK_SOURCE(WebCore, MediaAccessibility)
+SOFT_LINK_FRAMEWORK_FOR_SOURCE(WebCore, MediaAccessibility)
SOFT_LINK_FUNCTION_FOR_SOURCE(WebCore, MediaAccessibility, MACaptionAppearanceGetDisplayType, MACaptionAppearanceDisplayType, (MACaptionAppearanceDomain domain), (domain))
SOFT_LINK_FUNCTION_FOR_SOURCE(WebCore, MediaAccessibility, MACaptionAppearanceSetDisplayType, void, (MACaptionAppearanceDomain domain, MACaptionAppearanceDisplayType displayType), (domain, displayType))
Modified: trunk/Source/WebCore/platform/cf/MediaAccessibilitySoftLink.h (181206 => 181207)
--- trunk/Source/WebCore/platform/cf/MediaAccessibilitySoftLink.h 2015-03-07 06:12:57 UTC (rev 181206)
+++ trunk/Source/WebCore/platform/cf/MediaAccessibilitySoftLink.h 2015-03-07 17:34:38 UTC (rev 181207)
@@ -31,7 +31,7 @@
#include <CoreText/CoreText.h>
#include <MediaAccessibility/MediaAccessibility.h>
-SOFT_LINK_FRAMEWORK_HEADER(WebCore, MediaAccessibility)
+SOFT_LINK_FRAMEWORK_FOR_HEADER(WebCore, MediaAccessibility)
SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, MediaAccessibility, MACaptionAppearanceGetDisplayType, MACaptionAppearanceDisplayType, (MACaptionAppearanceDomain domain), (domain))
#define MACaptionAppearanceGetDisplayType softLink_MediaAccessibility_MACaptionAppearanceGetDisplayType
Modified: trunk/Source/WebCore/platform/mac/SoftLinking.h (181206 => 181207)
--- trunk/Source/WebCore/platform/mac/SoftLinking.h 2015-03-07 06:12:57 UTC (rev 181206)
+++ trunk/Source/WebCore/platform/mac/SoftLinking.h 2015-03-07 17:34:38 UTC (rev 181207)
@@ -293,7 +293,7 @@
// See Source/WebCore/platform/cf/CoreMediaSoftLink.{cpp,h} for an example implementation.
-#define SOFT_LINK_FRAMEWORK_HEADER(functionNamespace, framework) \
+#define SOFT_LINK_FRAMEWORK_FOR_HEADER(functionNamespace, framework) \
namespace functionNamespace { \
extern void* framework##Library(bool isOptional = false); \
bool is##framework##FrameworkAvailable(); \
@@ -302,7 +302,7 @@
} \
}
-#define SOFT_LINK_FRAMEWORK_SOURCE(functionNamespace, framework) \
+#define SOFT_LINK_FRAMEWORK_FOR_SOURCE(functionNamespace, framework) \
namespace functionNamespace { \
void* framework##Library(bool isOptional = false); \
void* framework##Library(bool isOptional) \
Modified: trunk/Source/WebCore/platform/win/SoftLinking.h (181206 => 181207)
--- trunk/Source/WebCore/platform/win/SoftLinking.h 2015-03-07 06:12:57 UTC (rev 181206)
+++ trunk/Source/WebCore/platform/win/SoftLinking.h 2015-03-07 17:34:38 UTC (rev 181207)
@@ -175,7 +175,7 @@
// See Source/WebCore/platform/cf/CoreMediaSoftLink.{cpp,h} for an example implementation.
-#define SOFT_LINK_FRAMEWORK_HEADER(functionNamespace, framework) \
+#define SOFT_LINK_FRAMEWORK_FOR_HEADER(functionNamespace, framework) \
namespace functionNamespace { \
extern HMODULE framework##Library(bool isOptional = false); \
bool is##framework##FrameworkAvailable(); \
@@ -199,9 +199,9 @@
#define SOFT_LINK_DEBUG_FRAMEWORK(functionNamespace, framework) SOFT_LINK_FRAMEWORK_HELPER(functionNamespace, framework, L"_debug.dll")
#ifdef DEBUG_ALL
-#define SOFT_LINK_FRAMEWORK_SOURCE(functionNamespace, framework) SOFT_LINK_DEBUG_FRAMEWORK(functionNamespace, framework)
+#define SOFT_LINK_FRAMEWORK_FOR_SOURCE(functionNamespace, framework) SOFT_LINK_DEBUG_FRAMEWORK(functionNamespace, framework)
#else
-#define SOFT_LINK_FRAMEWORK_SOURCE(functionNamespace, framework) SOFT_LINK_FRAMEWORK(functionNamespace, framework)
+#define SOFT_LINK_FRAMEWORK_FOR_SOURCE(functionNamespace, framework) SOFT_LINK_FRAMEWORK(functionNamespace, framework)
#endif
#define SOFT_LINK_CONSTANT_FOR_HEADER(functionNamespace, framework, variableName, variableType) \
