Diff
Modified: branches/safari-601-branch/Source/_javascript_Core/ChangeLog (196528 => 196529)
--- branches/safari-601-branch/Source/_javascript_Core/ChangeLog 2016-02-13 00:24:28 UTC (rev 196528)
+++ branches/safari-601-branch/Source/_javascript_Core/ChangeLog 2016-02-13 00:30:59 UTC (rev 196529)
@@ -1,3 +1,33 @@
+2016-02-12 Babak Shafiei <[email protected]>
+
+ Merge patch for rdar://problem/24626412.
+
+ 2016-02-12 Brent Fulgham <[email protected]>
+
+ [Win] Correct internal branch build failure.
+ <rdar://problem/24626412>
+
+ Work around some C++11 compiler limitations in VS2013. The new code
+ brought into this branch from trunk included some things that the
+ older compiler used on this branch does not support.
+
+ * _javascript_Core.vcxproj/_javascript_Core.vcxproj.filters: Correct
+ project file.
+ * inspector/InspectorBackendDispatcher.cpp:
+ (Inspector::castToInteger): Restored to work around compiler bug.
+ (Inspector::castToNumber): Ditto.
+ (Inspector::asString): Ditto.
+ (Inspector::asBoolean): Ditto.
+ (Inspector::asObject): Ditto.
+ (Inspector::asArray): Ditto.
+ (Inspector::asValue): Ditto.
+ (Inspector::BackendDispatcher::getInteger): Add VS2013 workaround.
+ (Inspector::BackendDispatcher::getString): Ditto.
+ (Inspector::BackendDispatcher::getBoolean): Ditto.
+ (Inspector::BackendDispatcher::getObject): Ditto.
+ (Inspector::BackendDispatcher::getArray): Ditto.
+ (Inspector::BackendDispatcher::getValue): Ditto.
+
2016-02-10 Babak Shafiei <[email protected]>
Merge r196179.
Modified: branches/safari-601-branch/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_Core.vcxproj.filters (196528 => 196529)
--- branches/safari-601-branch/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_Core.vcxproj.filters 2016-02-13 00:24:28 UTC (rev 196528)
+++ branches/safari-601-branch/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_Core.vcxproj.filters 2016-02-13 00:30:59 UTC (rev 196529)
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="assembler">
<UniqueIdentifier>{429783a1-5d6a-4019-ad1a-ddb2c98f9b6c}</UniqueIdentifier>
@@ -1622,6 +1621,7 @@
</ClCompile>
<ClCompile Include="..\bytecode\PolymorphicGetByIdList.cpp">
<Filter>bytecode</Filter>
+ </ClCompile>
<ClCompile Include="..\inspector\PerGlobalObjectWrapperWorld.cpp">
<Filter>inspector</Filter>
</ClCompile>
Modified: branches/safari-601-branch/Source/_javascript_Core/inspector/InspectorBackendDispatcher.cpp (196528 => 196529)
--- branches/safari-601-branch/Source/_javascript_Core/inspector/InspectorBackendDispatcher.cpp 2016-02-13 00:24:28 UTC (rev 196528)
+++ branches/safari-601-branch/Source/_javascript_Core/inspector/InspectorBackendDispatcher.cpp 2016-02-13 00:30:59 UTC (rev 196529)
@@ -285,6 +285,14 @@
static bool castToInteger(InspectorValue& value, int& result) { return value.asInteger(result); }
static bool castToNumber(InspectorValue& value, double& result) { return value.asDouble(result); }
+#if defined(_MSC_VER) && _MSC_VER <= 1800
+static bool asString(InspectorValue& value, String& output) { return value.asString(output); }
+static bool asBoolean(InspectorValue& value, bool& output) { return value.asBoolean(output); }
+static bool asObject(InspectorValue& value, RefPtr<InspectorObject>& output) { return value.asObject(output); }
+static bool asArray(InspectorValue& value, RefPtr<InspectorArray>& output) { return value.asArray(output); }
+static bool asValue(InspectorValue& value, RefPtr<InspectorValue>& output) { return value.asValue(output); }
+#endif
+
int BackendDispatcher::getInteger(InspectorObject* object, const String& name, bool* valueFound)
{
return getPropertyValue<int>(object, name, valueFound, 0, &castToInteger, "Integer");
@@ -297,27 +305,47 @@
String BackendDispatcher::getString(InspectorObject* object, const String& name, bool* valueFound)
{
+#if !defined(_MSC_VER) || _MSC_VER > 1800
return getPropertyValue<String>(object, name, valueFound, "", &InspectorValue::asString, "String");
+#else
+ return getPropertyValue<String>(object, name, valueFound, "", &asString, "String");
+#endif
}
bool BackendDispatcher::getBoolean(InspectorObject* object, const String& name, bool* valueFound)
{
+#if !defined(_MSC_VER) || _MSC_VER > 1800
return getPropertyValue<bool>(object, name, valueFound, false, &InspectorValue::asBoolean, "Boolean");
+#else
+ return getPropertyValue<bool>(object, name, valueFound, false, &asBoolean, "Boolean");
+#endif
}
RefPtr<InspectorObject> BackendDispatcher::getObject(InspectorObject* object, const String& name, bool* valueFound)
{
+#if !defined(_MSC_VER) || _MSC_VER > 1800
return getPropertyValue<RefPtr<InspectorObject>>(object, name, valueFound, nullptr, &InspectorValue::asObject, "Object");
+#else
+ return getPropertyValue<RefPtr<InspectorObject>>(object, name, valueFound, nullptr, &asObject, "Object");
+#endif
}
RefPtr<InspectorArray> BackendDispatcher::getArray(InspectorObject* object, const String& name, bool* valueFound)
{
+#if !defined(_MSC_VER) || _MSC_VER > 1800
return getPropertyValue<RefPtr<InspectorArray>>(object, name, valueFound, nullptr, &InspectorValue::asArray, "Array");
+#else
+ return getPropertyValue<RefPtr<InspectorArray>>(object, name, valueFound, nullptr, &asArray, "Array");
+#endif
}
RefPtr<InspectorValue> BackendDispatcher::getValue(InspectorObject* object, const String& name, bool* valueFound)
{
+#if !defined(_MSC_VER) || _MSC_VER > 1800
return getPropertyValue<RefPtr<InspectorValue>>(object, name, valueFound, nullptr, &InspectorValue::asValue, "Value");
+#else
+ return getPropertyValue<RefPtr<InspectorValue>>(object, name, valueFound, nullptr, &asValue, "Value");
+#endif
}
} // namespace Inspector
Modified: branches/safari-601-branch/Source/WebCore/ChangeLog (196528 => 196529)
--- branches/safari-601-branch/Source/WebCore/ChangeLog 2016-02-13 00:24:28 UTC (rev 196528)
+++ branches/safari-601-branch/Source/WebCore/ChangeLog 2016-02-13 00:30:59 UTC (rev 196529)
@@ -1,3 +1,35 @@
+2016-02-12 Babak Shafiei <[email protected]>
+
+ Merge patch for rdar://problem/24626412.
+
+ 2016-02-12 Brent Fulgham <[email protected]>
+
+ [Win] Correct internal branch build failure.
+ <rdar://problem/24626412>
+
+ Work around some C++11 compiler limitations in VS2013. Fix the
+ Windows build for the new <picture> element code. Correct some
+ AVFoundationCF changes that were not properly updated in this
+ branch.
+
+ * DerivedSources.cpp: Add missing files.
+ * WebCore.vcxproj/WebCore.vcxproj: Ditto.
+ * WebCore.vcxproj/WebCore.vcxproj.filters: Ditto.
+ * css/CSSAllInOne.cpp: Ditto.
+ * html/HTMLElementsAllInOne.cpp: Ditto.
+ * platform/graphics/FontCache.h: Work around VS2013 bugs.
+ (WebCore::FontDescriptionFontDataCacheKey::FontDescriptionFontDataCacheKey):
+ * platform/graphics/avfoundation/cf/CDMSessionAVFoundationCF.cpp:
+ (WebCore::CDMSessionAVFoundationCF::CDMSessionAVFoundationCF): Correct
+ signature that was not fixed for Windows in this branch.
+ * platform/graphics/avfoundation/cf/CDMSessionAVFoundationCF.h:
+ (WebCore::CDMSessionAVFoundationCF::~CDMSessionAVFoundationCF):
+ * platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp:
+ (WebCore::MediaPlayerPrivateAVFoundationCF::takeRequestForKeyURI):
+ (WebCore::MediaPlayerPrivateAVFoundationCF::createSession):
+ * platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.h:
+ * platform/graphics/win/FontCustomPlatformData.cpp:
+
2016-02-12 Matthew Hanson <[email protected]>
Merge r196401. rdar://problem/24611749
Modified: branches/safari-601-branch/Source/WebCore/DerivedSources.cpp (196528 => 196529)
--- branches/safari-601-branch/Source/WebCore/DerivedSources.cpp 2016-02-13 00:24:28 UTC (rev 196528)
+++ branches/safari-601-branch/Source/WebCore/DerivedSources.cpp 2016-02-13 00:30:59 UTC (rev 196529)
@@ -224,6 +224,7 @@
#include "JSHTMLOutputElement.cpp"
#include "JSHTMLParagraphElement.cpp"
#include "JSHTMLParamElement.cpp"
+#include "JSHTMLPictureElement.cpp"
#include "JSHTMLPreElement.cpp"
#include "JSHTMLProgressElement.cpp"
#include "JSHTMLQuoteElement.cpp"
Modified: branches/safari-601-branch/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj (196528 => 196529)
--- branches/safari-601-branch/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2016-02-13 00:24:28 UTC (rev 196528)
+++ branches/safari-601-branch/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2016-02-13 00:30:59 UTC (rev 196529)
@@ -2867,6 +2867,20 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
</ClCompile>
+ <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSHTMLPictureElement.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
+ </ClCompile>
<ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSHTMLPreElement.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
@@ -6711,6 +6725,20 @@
<ClCompile Include="..\html\canvas\WebGLVertexArrayObject.cpp" />
<ClCompile Include="..\html\canvas\WebGLVertexArrayObjectBase.cpp" />
<ClCompile Include="..\html\canvas\WebGLVertexArrayObjectOES.cpp" />
+ <ClCompile Include="..\html\HTMLPictureElement.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
+ </ClCompile>
<ClCompile Include="..\html\track\AudioTrack.cpp" />
<ClCompile Include="..\html\track\AudioTrackList.cpp" />
<ClCompile Include="..\html\track\TextTrackCueGeneric.cpp" />
@@ -19641,6 +19669,7 @@
<ClInclude Include="..\html\canvas\WebGLVertexArrayObject.h" />
<ClInclude Include="..\html\canvas\WebGLVertexArrayObjectBase.h" />
<ClInclude Include="..\html\canvas\WebGLVertexArrayObjectOES.h" />
+ <ClInclude Include="..\html\HTMLPictureElement.h" />
<ClInclude Include="..\html\track\AudioTrack.h" />
<ClInclude Include="..\html\track\AudioTrackList.h" />
<ClInclude Include="..\html\track\TextTrackCueGeneric.h" />
Modified: branches/safari-601-branch/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters (196528 => 196529)
--- branches/safari-601-branch/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2016-02-13 00:24:28 UTC (rev 196528)
+++ branches/safari-601-branch/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2016-02-13 00:30:59 UTC (rev 196529)
@@ -7255,26 +7255,26 @@
<ClCompile Include="..\platform\win\MemoryPressureHandlerWin.cpp">
<Filter>platform\win</Filter>
</ClCompile>
- <ClCompile Include="..\dom\NodeOrString.cpp" />
- <ClCompile Include="..\bindings\js\JSCharacterDataCustom.cpp" />
- <ClCompile Include="..\bindings\js\JSDocumentFragmentCustom.cpp" />
- <ClCompile Include="..\bindings\js\JSDocumentTypeCustom.cpp" />
- <ClCompile Include="..\bindings\js\JSNodeOrString.cpp" />
<ClCompile Include="..\html\canvas\DOMPath.cpp">
<Filter>html\canvas</Filter>
</ClCompile>
<ClCompile Include="..\platform\graphics\PathUtilities.cpp">
<Filter>platform\graphics</Filter>
</ClCompile>
- <ClCompile Include="..\platform\network\DataURLDecoder.cpp" />
- <ClCompile Include="..\dom\ClassCollection.cpp" />
- <ClCompile Include="..\html\GenericCachedHTMLCollection.cpp" />
<ClCompile Include="..\platform\graphics\ca\win\WebTiledBackingLayerWin.cpp">
<Filter>platform\graphics\ca\win</Filter>
</ClCompile>
<ClCompile Include="..\platform\win\GDIUtilities.cpp">
<Filter>platform\graphics\win</Filter>
</ClCompile>
+ <ClCompile Include="..\dom\ClassNodeList.cpp" />
+ <ClCompile Include="..\dom\NodeFilter.cpp" />
+ <ClCompile Include="..\html\HTMLPictureElement.cpp">
+ <Filter>html</Filter>
+ </ClCompile>
+ <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSHTMLPictureElement.cpp">
+ <Filter>DerivedSources</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\Modules\geolocation\Coordinates.h">
@@ -15259,23 +15259,22 @@
<ClInclude Include="..\platform\VNodeTracker.h">
<Filter>platform</Filter>
</ClInclude>
- <ClInclude Include="..\dom\NodeOrString.h" />
- <ClInclude Include="..\bindings\js\JSNodeOrString.h" />
<ClInclude Include="..\html\canvas\DOMPath.h">
<Filter>html\canvas</Filter>
</ClInclude>
<ClInclude Include="..\platform\graphics\PathUtilities.h">
<Filter>platform\graphics</Filter>
</ClInclude>
- <ClInclude Include="..\ForwardingHeaders\inspector\InspectorFrontendRouter.h" />
- <ClInclude Include="..\platform\network\DataURLDecoder.h" />
- <ClInclude Include="..\dom\ClassCollection.h" />
<ClInclude Include="..\platform\graphics\ca\win\WebTiledBackingLayerWin.h">
<Filter>platform\graphics\ca\win</Filter>
</ClInclude>
<ClInclude Include="..\platform\win\GDIUtilities.h">
<Filter>platform\graphics\win</Filter>
</ClInclude>
+ <ClInclude Include="..\dom\ClassNodeList.h" />
+ <ClInclude Include="..\html\HTMLPictureElement.h">
+ <Filter>html</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="..\css\CSSGrammar.y.in">
Modified: branches/safari-601-branch/Source/WebCore/css/CSSAllInOne.cpp (196528 => 196529)
--- branches/safari-601-branch/Source/WebCore/css/CSSAllInOne.cpp 2016-02-13 00:24:28 UTC (rev 196528)
+++ branches/safari-601-branch/Source/WebCore/css/CSSAllInOne.cpp 2016-02-13 00:30:59 UTC (rev 196529)
@@ -64,6 +64,7 @@
#include "CSSParserValues.cpp"
#include "CSSPropertySourceData.cpp"
#include "CSSReflectValue.cpp"
+#include "CSSRevertValue.cpp"
#include "CSSRule.cpp"
#include "CSSRuleList.cpp"
#include "CSSSegmentedFontFace.cpp"
@@ -74,9 +75,12 @@
#include "CSSStyleSheet.cpp"
#include "CSSTimingFunctionValue.cpp"
#include "CSSUnicodeRangeValue.cpp"
+#include "CSSUnsetValue.cpp"
#include "CSSValue.cpp"
#include "CSSValueList.cpp"
#include "CSSValuePool.cpp"
+#include "CSSVariableDependentValue.cpp"
+#include "CSSVariableValue.cpp"
#include "DOMWindowCSS.cpp"
#include "DocumentRuleSets.cpp"
#include "ElementRuleCollector.cpp"
Modified: branches/safari-601-branch/Source/WebCore/html/HTMLElementsAllInOne.cpp (196528 => 196529)
--- branches/safari-601-branch/Source/WebCore/html/HTMLElementsAllInOne.cpp 2016-02-13 00:24:28 UTC (rev 196528)
+++ branches/safari-601-branch/Source/WebCore/html/HTMLElementsAllInOne.cpp 2016-02-13 00:30:59 UTC (rev 196529)
@@ -86,6 +86,7 @@
#include "HTMLOptionElement.cpp"
#include "HTMLParagraphElement.cpp"
#include "HTMLParamElement.cpp"
+#include "HTMLPictureElement.cpp"
#include "HTMLPlugInImageElement.cpp"
#include "HTMLPreElement.cpp"
#include "HTMLProgressElement.cpp"
Modified: branches/safari-601-branch/Source/WebCore/platform/graphics/FontCache.h (196528 => 196529)
--- branches/safari-601-branch/Source/WebCore/platform/graphics/FontCache.h 2016-02-13 00:24:28 UTC (rev 196528)
+++ branches/safari-601-branch/Source/WebCore/platform/graphics/FontCache.h 2016-02-13 00:30:59 UTC (rev 196529)
@@ -69,7 +69,15 @@
// This key contains the FontDescription fields other than family that matter when fetching FontDatas (platform fonts).
struct FontDescriptionFontDataCacheKey {
+#if !defined(_MSC_VER) || _MSC_VER > 1800
FontDescriptionFontDataCacheKey() = default;
+#else
+ FontDescriptionFontDataCacheKey()
+ {
+ m_flags[0] = 0;
+ m_flags[1] = 0;
+ }
+#endif
FontDescriptionFontDataCacheKey(const FontDescription& description)
: m_size(description.computedPixelSize())
@@ -134,7 +142,11 @@
unsigned m_size { 0 };
unsigned m_weight { 0 };
- std::array<unsigned, 2> m_flags {{ 0, 0 }};
+#if !defined(_MSC_VER) || _MSC_VER > 1800
+ std::array<unsigned, 2> m_flags{ { 0, 0 } };
+#else
+ std::array<unsigned, 2> m_flags;
+#endif
FontFeatureSettings m_featureSettings;
};
Modified: branches/safari-601-branch/Source/WebCore/platform/graphics/avfoundation/cf/CDMSessionAVFoundationCF.cpp (196528 => 196529)
--- branches/safari-601-branch/Source/WebCore/platform/graphics/avfoundation/cf/CDMSessionAVFoundationCF.cpp 2016-02-13 00:24:28 UTC (rev 196528)
+++ branches/safari-601-branch/Source/WebCore/platform/graphics/avfoundation/cf/CDMSessionAVFoundationCF.cpp 2016-02-13 00:30:59 UTC (rev 196529)
@@ -44,9 +44,9 @@
namespace WebCore {
-CDMSessionAVFoundationCF::CDMSessionAVFoundationCF(MediaPlayerPrivateAVFoundationCF* parent)
+CDMSessionAVFoundationCF::CDMSessionAVFoundationCF(MediaPlayerPrivateAVFoundationCF* parent, CDMSessionClient* client)
: m_parent(parent)
- , m_client(nullptr)
+ , m_client(client)
, m_sessionId(createCanonicalUUIDString())
{
}
Modified: branches/safari-601-branch/Source/WebCore/platform/graphics/avfoundation/cf/CDMSessionAVFoundationCF.h (196528 => 196529)
--- branches/safari-601-branch/Source/WebCore/platform/graphics/avfoundation/cf/CDMSessionAVFoundationCF.h 2016-02-13 00:24:28 UTC (rev 196528)
+++ branches/safari-601-branch/Source/WebCore/platform/graphics/avfoundation/cf/CDMSessionAVFoundationCF.h 2016-02-13 00:30:59 UTC (rev 196529)
@@ -39,7 +39,7 @@
class CDMSessionAVFoundationCF : public CDMSession {
public:
- CDMSessionAVFoundationCF(MediaPlayerPrivateAVFoundationCF* parent);
+ CDMSessionAVFoundationCF(MediaPlayerPrivateAVFoundationCF* parent, CDMSessionClient*);
virtual ~CDMSessionAVFoundationCF() { }
virtual void setClient(CDMSessionClient* client) override { m_client = client; }
Modified: branches/safari-601-branch/Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp (196528 => 196529)
--- branches/safari-601-branch/Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp 2016-02-13 00:24:28 UTC (rev 196528)
+++ branches/safari-601-branch/Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp 2016-02-13 00:30:59 UTC (rev 196529)
@@ -911,7 +911,7 @@
{
static NeverDestroyed<HashSet<String>> cache = []() {
HashSet<String> types;
- RetainPtr<CFArrayRef> avTypes = AVCFURLAssetCopyAudiovisualMIMETypes();
+ RetainPtr<CFArrayRef> avTypes = adoptCF(AVCFURLAssetCopyAudiovisualMIMETypes());
CFIndex typeCount = CFArrayGetCount(avTypes.get());
for (CFIndex i = 0; i < typeCount; ++i) {
@@ -1145,15 +1145,15 @@
return m_avfWrapper->takeRequestForKeyURI(keyURI);
}
-std::unique_ptr<CDMSession> MediaPlayerPrivateAVFoundationCF::createSession(const String& keySystem)
+std::unique_ptr<CDMSession> MediaPlayerPrivateAVFoundationCF::createSession(const String& keySystem, CDMSessionClient* client)
{
if (!keySystemIsSupported(keySystem))
return nullptr;
- return std::make_unique<CDMSessionAVFoundationCF>(this);
+ return std::make_unique<CDMSessionAVFoundationCF>(this, client);
}
#elif ENABLE(ENCRYPTED_MEDIA_V2)
-std::unique_ptr<CDMSession> MediaPlayerPrivateAVFoundationCF::createSession(const String& keySystem)
+std::unique_ptr<CDMSession> MediaPlayerPrivateAVFoundationCF::createSession(const String& keySystem, CDMSessionClient*)
{
return nullptr;
}
Modified: branches/safari-601-branch/Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.h (196528 => 196529)
--- branches/safari-601-branch/Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.h 2016-02-13 00:24:28 UTC (rev 196528)
+++ branches/safari-601-branch/Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.h 2016-02-13 00:30:59 UTC (rev 196529)
@@ -117,7 +117,7 @@
virtual void contentsNeedsDisplay();
#if ENABLE(ENCRYPTED_MEDIA_V2)
- virtual std::unique_ptr<CDMSession> createSession(const String&) override;
+ virtual std::unique_ptr<CDMSession> createSession(const String&, CDMSessionClient*) override;
#endif
virtual String languageOfPrimaryAudioTrack() const override;
Modified: branches/safari-601-branch/Source/WebCore/platform/graphics/win/FontCustomPlatformData.cpp (196528 => 196529)
--- branches/safari-601-branch/Source/WebCore/platform/graphics/win/FontCustomPlatformData.cpp 2016-02-13 00:24:28 UTC (rev 196528)
+++ branches/safari-601-branch/Source/WebCore/platform/graphics/win/FontCustomPlatformData.cpp 2016-02-13 00:30:59 UTC (rev 196529)
@@ -21,6 +21,7 @@
#include "config.h"
#include "FontCustomPlatformData.h"
+#include "FontDescription.h"
#include "FontPlatformData.h"
#include "OpenTypeUtilities.h"
#include "SharedBuffer.h"
