Title: [178558] branches/safari-600.5-branch
- Revision
- 178558
- Author
- matthew_han...@apple.com
- Date
- 2015-01-15 17:58:25 -0800 (Thu, 15 Jan 2015)
Log Message
Merged r174698. rdar://problem/19451946
Modified Paths
Diff
Modified: branches/safari-600.5-branch/Source/WebCore/ChangeLog (178557 => 178558)
--- branches/safari-600.5-branch/Source/WebCore/ChangeLog 2015-01-16 01:58:20 UTC (rev 178557)
+++ branches/safari-600.5-branch/Source/WebCore/ChangeLog 2015-01-16 01:58:25 UTC (rev 178558)
@@ -1,5 +1,28 @@
2015-01-15 Matthew Hanson <matthew_han...@apple.com>
+ Merge r174698. rdar://problem/19451946
+
+ 2014-10-14 Brent Fulgham <bfulg...@apple.com>
+
+ [Win] Enable Encrypted Media Support
+ https://bugs.webkit.org/show_bug.cgi?id=137710
+ <rdar://problem/18652699>
+
+ Reviewed by Jer Noble.
+
+ This feature is covered by existing media tests.
+
+ * platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp:
+ (WebCore::destroyAVFWrapper): Remove redundant ASSERT.
+ * platform/graphics/ca/win/PlatformCALayerWinInternal.cpp:
+ (displayOnMainThreadContext::displayOnMainThreadContext): Added.
+ (redispatchOnMainQueue): Added.
+ (PlatformCALayerWinInternal::displayCallback): Check if a display
+ call is happening on a background queue, and re-dispatch on the
+ main thread if necessary.
+
+2015-01-15 Matthew Hanson <matthew_han...@apple.com>
+
Merge r174106. rdar://problem/19451946
2014-09-30 Eric Carlson <eric.carl...@apple.com>
Modified: branches/safari-600.5-branch/Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp (178557 => 178558)
--- branches/safari-600.5-branch/Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp 2015-01-16 01:58:20 UTC (rev 178557)
+++ branches/safari-600.5-branch/Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp 2015-01-16 01:58:25 UTC (rev 178558)
@@ -1407,7 +1407,6 @@
static void destroyAVFWrapper(void* context)
{
ASSERT(isMainThread());
- ASSERT(dispatch_get_main_queue() == dispatch_get_current_queue());
AVFWrapper* avfWrapper = static_cast<AVFWrapper*>(context);
if (!avfWrapper)
return;
Modified: branches/safari-600.5-branch/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWinInternal.cpp (178557 => 178558)
--- branches/safari-600.5-branch/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWinInternal.cpp 2015-01-16 01:58:20 UTC (rev 178557)
+++ branches/safari-600.5-branch/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWinInternal.cpp 2015-01-16 01:58:25 UTC (rev 178558)
@@ -69,9 +69,35 @@
{
}
+struct DisplayOnMainThreadContext {
+ RetainPtr<CACFLayerRef> layer;
+ RetainPtr<CGContextRef> context;
+
+ DisplayOnMainThreadContext(CACFLayerRef caLayer, CGContextRef caContext)
+ : layer(caLayer)
+ , context(caContext)
+ {
+ }
+};
+
+static void redispatchOnMainQueue(void* context)
+{
+ ASSERT(isMainThread());
+ std::unique_ptr<DisplayOnMainThreadContext> retainedContext(reinterpret_cast<DisplayOnMainThreadContext*>(context));
+ if (!retainedContext)
+ return;
+
+ PlatformCALayerWinInternal* self = static_cast<PlatformCALayerWinInternal*>(CACFLayerGetUserData(retainedContext->layer.get()));
+
+ self->displayCallback(retainedContext->layer.get(), retainedContext->context.get());
+}
+
void PlatformCALayerWinInternal::displayCallback(CACFLayerRef caLayer, CGContextRef context)
{
- ASSERT(isMainThread());
+ if (!isMainThread()) {
+ dispatch_async_f(dispatch_get_main_queue(), new DisplayOnMainThreadContext(caLayer, context), redispatchOnMainQueue);
+ return;
+ }
if (!owner() || !owner()->owner())
return;
Modified: branches/safari-600.5-branch/WebKitLibraries/ChangeLog (178557 => 178558)
--- branches/safari-600.5-branch/WebKitLibraries/ChangeLog 2015-01-16 01:58:20 UTC (rev 178557)
+++ branches/safari-600.5-branch/WebKitLibraries/ChangeLog 2015-01-16 01:58:25 UTC (rev 178558)
@@ -1,5 +1,20 @@
2015-01-15 Matthew Hanson <matthew_han...@apple.com>
+ Merge r174698. rdar://problem/19451946
+
+ 2014-10-14 Brent Fulgham <bfulg...@apple.com>
+
+ [Win] Enable Encrypted Media Support
+ https://bugs.webkit.org/show_bug.cgi?id=137710
+ <rdar://problem/18652699>
+
+ Reviewed by Jer Noble.
+
+ * win/tools/vsprops/FeatureDefines.props: Activate the
+ ENCRYPTED_MEDIA_V2 flag on Windows.
+
+2015-01-15 Matthew Hanson <matthew_han...@apple.com>
+
Merge r173768. rdar://problem/19451961
2014-09-19 Brent Fulgham <bfulg...@apple.com>
Modified: branches/safari-600.5-branch/WebKitLibraries/win/tools/vsprops/FeatureDefines.props (178557 => 178558)
--- branches/safari-600.5-branch/WebKitLibraries/win/tools/vsprops/FeatureDefines.props 2015-01-16 01:58:20 UTC (rev 178557)
+++ branches/safari-600.5-branch/WebKitLibraries/win/tools/vsprops/FeatureDefines.props 2015-01-16 01:58:25 UTC (rev 178558)
@@ -28,6 +28,7 @@
<ENABLE_DETAILS_ELEMENT>ENABLE_DETAILS_ELEMENT</ENABLE_DETAILS_ELEMENT>
<ENABLE_DEVICE_ORIENTATION />
<ENABLE_DIRECTORY_UPLOAD />
+ <ENABLE_ENCRYPTED_MEDIA_V2>ENABLE_ENCRYPTED_MEDIA_V2</ENABLE_ENCRYPTED_MEDIA_V2>
<ENABLE_FILE_SYSTEM />
<ENABLE_FILTERS>ENABLE_FILTERS</ENABLE_FILTERS>
<ENABLE_FULLSCREEN_API>ENABLE_FULLSCREEN_API</ENABLE_FULLSCREEN_API>
@@ -90,7 +91,7 @@
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
-<PreprocessorDefinitions>$(ENABLE_CSP_NEXT);$(ENABLE_PROMISES);$(ENABLE_REQUEST_ANIMATION_FRAME);$(ENABLE_3D_RENDERING);$(ENABLE_ACCELERATED_2D_CANVAS);$(ENABLE_ACCELERATED_OVERFLOW_SCROLLING);$(ENABLE_CANVAS_PATH);$(ENABLE_CANVAS_PROXY);$(ENABLE_CHANNEL_MESSAGING);$(ENABLE_CSS3_CONDITIONAL_RULES);$(ENABLE_CSS_IMAGE_SET);$(ENABLE_CSS3_TEXT);$(ENABLE_CSS_BOX_DECORATION_BREAK);$(ENABLE_CSS_FILTERS);$(ENABLE_CSS_GRID_LAYOUT);$(ENABLE_CSS_SHADERS);$(ENABLE_CSS_COMPOSITING);$(ENABLE_CSS_REGIONS);$(ENABLE_CSS_SHAPES);$(ENABLE_CSS_SHAPE_INSIDE);$(ENABLE_CSS_TRANSFORMS_ANIMATIONS_TRANSITIONS_UNPREFIXED);$(ENABLE_CUSTOM_SCHEME_HANDLER);$(ENABLE_DATAGRID);$(ENABLE_DATALIST_ELEMENT);$(ENABLE_DATA_TRANSFER_ITEMS);$(ENABLE_DETAILS_ELEMENT);$(ENABLE_DEVICE_ORIENTATION);$(ENABLE_DIRECTORY_UPLOAD);$(ENABLE_FILTERS);$(ENABLE_FILE_SYSTEM);$(ENABLE_FULLSCREEN_API);$(ENABLE_GAMEPAD);$(ENABLE_GEOLOCATION);$(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING);$(ENABLE_HIGH_DPI_CANVAS);$(EN
ABLE_ICONDATABASE);$(ENABLE_INDEXED_DATABASE);$(ENABLE_INPUT_TYPE_COLOR);$(ENABLE_INPUT_SPEECH);$(ENABLE_INPUT_TYPE_DATE);$(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE);$(ENABLE_INPUT_TYPE_DATETIMELOCAL);$(ENABLE_INPUT_TYPE_MONTH);$(ENABLE_INPUT_TYPE_TIME);$(ENABLE_INPUT_TYPE_WEEK);$(ENABLE_LEGACY_CSS_VENDOR_PREFIXES);$(ENABLE_LEGACY_NOTIFICATIONS);$(ENABLE_LINK_PREFETCH);$(ENABLE_LINK_PRERENDER);$(ENABLE_MATHML);$(ENABLE_METER_ELEMENT);$(ENABLE_MICRODATA);$(ENABLE_MOUSE_CURSOR_SCALE);$(ENABLE_NOTIFICATIONS);$(ENABLE_PROXIMITY_EVENTS);$(ENABLE_QUOTA);$(ENABLE_NAVIGATOR_CONTENT_UTILS);$(ENABLE_SCRIPTED_SPEECH);$(ENABLE_SHADOW_DOM);$(ENABLE_SHARED_WORKERS);$(ENABLE_MEDIA_CONTROLS_SCRIPT);$(ENABLE_MEDIA_SOURCE);$(ENABLE_MEDIA_STATISTICS);$(ENABLE_SQL_DATABASE);$(ENABLE_STYLE_SCOPED);$(ENABLE_SUBPIXEL_LAYOUT);$(ENABLE_SVG);$(ENABLE_SVG_DOM_OBJC_BINDINGS);$(ENABLE_SVG_FONTS);$(ENABLE_TEMPLATE_ELEMENT);$(ENABLE_TEXT_AUTOSIZING);$(ENABLE_VIDEO);$(ENABLE_VIDEO_TRACK);$(ENABLE_VIEW_MODE_CS
S_MEDIA);$(ENABLE_WEB_AUDIO);$(ENABLE_WEB_SOCKETS);$(ENABLE_WEB_TIMING);$(ENABLE_WEBGL);$(ENABLE_WEBVTT_REGIONS);$(ENABLE_XHR_TIMEOUT);$(ENABLE_XSLT);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+<PreprocessorDefinitions>$(ENABLE_CSP_NEXT);$(ENABLE_PROMISES);$(ENABLE_REQUEST_ANIMATION_FRAME);$(ENABLE_3D_RENDERING);$(ENABLE_ACCELERATED_2D_CANVAS);$(ENABLE_ACCELERATED_OVERFLOW_SCROLLING);$(ENABLE_CANVAS_PATH);$(ENABLE_CANVAS_PROXY);$(ENABLE_CHANNEL_MESSAGING);$(ENABLE_CSS3_CONDITIONAL_RULES);$(ENABLE_CSS_IMAGE_SET);$(ENABLE_CSS3_TEXT);$(ENABLE_CSS_BOX_DECORATION_BREAK);$(ENABLE_CSS_FILTERS);$(ENABLE_CSS_GRID_LAYOUT);$(ENABLE_CSS_SHADERS);$(ENABLE_CSS_COMPOSITING);$(ENABLE_CSS_REGIONS);$(ENABLE_CSS_SHAPES);$(ENABLE_CSS_SHAPE_INSIDE);$(ENABLE_CSS_TRANSFORMS_ANIMATIONS_TRANSITIONS_UNPREFIXED);$(ENABLE_CUSTOM_SCHEME_HANDLER);$(ENABLE_DATAGRID);$(ENABLE_DATALIST_ELEMENT);$(ENABLE_DATA_TRANSFER_ITEMS);$(ENABLE_DETAILS_ELEMENT);$(ENABLE_DEVICE_ORIENTATION);$(ENABLE_DIRECTORY_UPLOAD);$(ENABLE_ENCRYPTED_MEDIA_V2);$(ENABLE_FILTERS);$(ENABLE_FILE_SYSTEM);$(ENABLE_FULLSCREEN_API);$(ENABLE_GAMEPAD);$(ENABLE_GEOLOCATION);$(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING);$(
ENABLE_HIGH_DPI_CANVAS);$(ENABLE_ICONDATABASE);$(ENABLE_INDEXED_DATABASE);$(ENABLE_INPUT_TYPE_COLOR);$(ENABLE_INPUT_SPEECH);$(ENABLE_INPUT_TYPE_DATE);$(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE);$(ENABLE_INPUT_TYPE_DATETIMELOCAL);$(ENABLE_INPUT_TYPE_MONTH);$(ENABLE_INPUT_TYPE_TIME);$(ENABLE_INPUT_TYPE_WEEK);$(ENABLE_LEGACY_CSS_VENDOR_PREFIXES);$(ENABLE_LEGACY_NOTIFICATIONS);$(ENABLE_LINK_PREFETCH);$(ENABLE_LINK_PRERENDER);$(ENABLE_MATHML);$(ENABLE_METER_ELEMENT);$(ENABLE_MICRODATA);$(ENABLE_MOUSE_CURSOR_SCALE);$(ENABLE_NOTIFICATIONS);$(ENABLE_PROXIMITY_EVENTS);$(ENABLE_QUOTA);$(ENABLE_NAVIGATOR_CONTENT_UTILS);$(ENABLE_SCRIPTED_SPEECH);$(ENABLE_SHADOW_DOM);$(ENABLE_SHARED_WORKERS);$(ENABLE_MEDIA_CONTROLS_SCRIPT);$(ENABLE_MEDIA_SOURCE);$(ENABLE_MEDIA_STATISTICS);$(ENABLE_SQL_DATABASE);$(ENABLE_STYLE_SCOPED);$(ENABLE_SUBPIXEL_LAYOUT);$(ENABLE_SVG);$(ENABLE_SVG_DOM_OBJC_BINDINGS);$(ENABLE_SVG_FONTS);$(ENABLE_TEMPLATE_ELEMENT);$(ENABLE_TEXT_AUTOSIZING);$(ENABLE_VIDEO);$(ENABLE_VIDEO_
TRACK);$(ENABLE_VIEW_MODE_CSS_MEDIA);$(ENABLE_WEB_AUDIO);$(ENABLE_WEB_SOCKETS);$(ENABLE_WEB_TIMING);$(ENABLE_WEBGL);$(ENABLE_WEBVTT_REGIONS);$(ENABLE_XHR_TIMEOUT);$(ENABLE_XSLT);%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
</ItemDefinitionGroup>
<ItemGroup>
@@ -202,6 +203,10 @@
<Value>$(ENABLE_DIRECTORY_UPLOAD)</Value>
<EnvironmentVariable>true</EnvironmentVariable>
</BuildMacro>
+ <BuildMacro Include="ENABLE_ENCRYPTED_MEDIA_V2">
+ <Value>$(ENABLE_ENCRYPTED_MEDIA_V2)</Value>
+ <EnvironmentVariable>true</EnvironmentVariable>
+ </BuildMacro>
<BuildMacro Include="ENABLE_FILE_SYSTEM">
<Value>$(ENABLE_FILE_SYSTEM)</Value>
<EnvironmentVariable>true</EnvironmentVariable>
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
