Title: [170295] trunk/Source/WebCore
- Revision
- 170295
- Author
- [email protected]
- Date
- 2014-06-23 09:39:13 -0700 (Mon, 23 Jun 2014)
Log Message
[iOS] Fix video in WebGL.
https://bugs.webkit.org/show_bug.cgi?id=133511
Reviewed by Jer Noble.
* WebCore.exp.in:
* platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
(WebCore::MediaPlayerPrivateAVFoundationObjC::hasSingleSecurityOrigin):
(WebCore::wkAVAssetResolvedURL): Deleted.
* platform/mac/WebCoreSystemInterface.h:
* platform/mac/WebCoreSystemInterface.mm:
Declare and use resolvedURL on AVURLAsset instead of using wkAVAssetResolvedURL through WebKitSystemInterface.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (170294 => 170295)
--- trunk/Source/WebCore/ChangeLog 2014-06-23 15:25:49 UTC (rev 170294)
+++ trunk/Source/WebCore/ChangeLog 2014-06-23 16:39:13 UTC (rev 170295)
@@ -1,3 +1,18 @@
+2014-06-23 Alex Christensen <[email protected]>
+
+ [iOS] Fix video in WebGL.
+ https://bugs.webkit.org/show_bug.cgi?id=133511
+
+ Reviewed by Jer Noble.
+
+ * WebCore.exp.in:
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::hasSingleSecurityOrigin):
+ (WebCore::wkAVAssetResolvedURL): Deleted.
+ * platform/mac/WebCoreSystemInterface.h:
+ * platform/mac/WebCoreSystemInterface.mm:
+ Declare and use resolvedURL on AVURLAsset instead of using wkAVAssetResolvedURL through WebKitSystemInterface.
+
2014-06-23 Radu Stavila <[email protected]>
REGRESSION (r168046): Incorrect handling of object information in WebCore::RenderFlowThread::removeLineRegionInfo
Modified: trunk/Source/WebCore/WebCore.exp.in (170294 => 170295)
--- trunk/Source/WebCore/WebCore.exp.in 2014-06-23 15:25:49 UTC (rev 170294)
+++ trunk/Source/WebCore/WebCore.exp.in 2014-06-23 16:39:13 UTC (rev 170295)
@@ -2332,7 +2332,6 @@
__ZNK7WebCore8IntPointcv8_NSPointEv
__ZNK7WebCore9FloatRectcv7_NSRectEv
_stringEncodingForResource
-_wkAVAssetResolvedURL
_wkAccessibilityHandleFocusChanged
_wkAdvanceDefaultButtonPulseAnimation
_wkCopyAXTextMarkerRangeEnd
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm (170294 => 170295)
--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2014-06-23 15:25:49 UTC (rev 170294)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2014-06-23 16:39:13 UTC (rev 170295)
@@ -102,6 +102,10 @@
@end
#endif
+@interface AVURLAsset (WebKitExtensions)
+@property (nonatomic, readonly) NSURL *resolvedURL;
+@end
+
typedef AVPlayerItem AVPlayerItemType;
typedef AVMetadataItem AVMetadataItemType;
@@ -1717,21 +1721,13 @@
setNaturalSize(roundedIntSize(m_cachedPresentationSize));
}
-
-#if PLATFORM(IOS)
-// FIXME: Implement for iOS in WebKit System Interface.
-static inline NSURL *wkAVAssetResolvedURL(AVAsset*)
-{
- return nil;
-}
-#endif
-
+
bool MediaPlayerPrivateAVFoundationObjC::hasSingleSecurityOrigin() const
{
if (!m_avAsset)
return false;
- RefPtr<SecurityOrigin> resolvedOrigin = SecurityOrigin::create(URL(wkAVAssetResolvedURL(m_avAsset.get())));
+ RefPtr<SecurityOrigin> resolvedOrigin = SecurityOrigin::create(URL([m_avAsset resolvedURL]));
RefPtr<SecurityOrigin> requestedOrigin = SecurityOrigin::createFromString(assetURL());
return resolvedOrigin->isSameSchemeHostPort(requestedOrigin.get());
}
Modified: trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.h (170294 => 170295)
--- trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.h 2014-06-23 15:25:49 UTC (rev 170294)
+++ trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.h 2014-06-23 16:39:13 UTC (rev 170295)
@@ -288,8 +288,6 @@
extern CFStringRef (*wkCopyDefaultSearchProviderDisplayName)(void);
-extern NSURL *(*wkAVAssetResolvedURL)(AVAsset*);
-
extern NSCursor *(*wkCursor)(const char*);
#endif // !PLATFORM(IOS)
Modified: trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.mm (170294 => 170295)
--- trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.mm 2014-06-23 15:25:49 UTC (rev 170294)
+++ trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.mm 2014-06-23 16:39:13 UTC (rev 170295)
@@ -148,8 +148,6 @@
CFStringRef (*wkCopyDefaultSearchProviderDisplayName)(void);
void (*wkSetCrashReportApplicationSpecificInformation)(CFStringRef);
-NSURL *(*wkAVAssetResolvedURL)(AVAsset*);
-
NSCursor *(*wkCursor)(const char*);
NSArray *(*wkSpeechSynthesisGetVoiceIdentifiers)(void);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
