diff options
| author | Alexis Menard <alexis.menard@nokia.com> | 2011-06-03 20:53:43 (GMT) |
|---|---|---|
| committer | Alexis Menard <alexis.menard@nokia.com> | 2011-06-03 20:53:43 (GMT) |
| commit | e62f24018fee11831cbf66e9608d0ab82917c8ee (patch) | |
| tree | 0f511f62be65e2f9c9f2aa3bebaefa7a4835be63 /src/3rdparty/webkit/WebKitLibraries | |
| parent | b1c3521316566b54184d097e9ee020350426850f (diff) | |
| download | Qt-e62f24018fee11831cbf66e9608d0ab82917c8ee.zip Qt-e62f24018fee11831cbf66e9608d0ab82917c8ee.tar.gz Qt-e62f24018fee11831cbf66e9608d0ab82917c8ee.tar.bz2 | |
Updated WebKit to 4e7dfbab30278b0427e699baaadbf3e5aab88203
Reviewed-by: Andreas Kling
Diffstat (limited to 'src/3rdparty/webkit/WebKitLibraries')
| -rw-r--r-- | src/3rdparty/webkit/WebKitLibraries/ChangeLog | 15 | ||||
| -rw-r--r-- | src/3rdparty/webkit/WebKitLibraries/WebKitSystemInterface.h | 3 |
2 files changed, 18 insertions, 0 deletions
diff --git a/src/3rdparty/webkit/WebKitLibraries/ChangeLog b/src/3rdparty/webkit/WebKitLibraries/ChangeLog index 7fd8370..9b61400 100644 --- a/src/3rdparty/webkit/WebKitLibraries/ChangeLog +++ b/src/3rdparty/webkit/WebKitLibraries/ChangeLog @@ -1,3 +1,18 @@ +2011-05-25 Jer Noble <jer.noble@apple.com> + + Reviewed by Darin Adler. + + Video fails to play on Vimeo + https://bugs.webkit.org/show_bug.cgi?id=61403 + + Added functions to retrieve the resolved URL for media types supported on + mac. + + * WebKitSystemInterface.h: + * WebKitSystemInterface.m: + (WKAVAssetResolvedURL): Added. + (WKQTMovieResolvedURL): Added. + 2011-04-29 Jer Noble <jer.noble@apple.com> Reviewed by Eric Seidel. diff --git a/src/3rdparty/webkit/WebKitLibraries/WebKitSystemInterface.h b/src/3rdparty/webkit/WebKitLibraries/WebKitSystemInterface.h index 64c387a..5ca5a8c 100644 --- a/src/3rdparty/webkit/WebKitLibraries/WebKitSystemInterface.h +++ b/src/3rdparty/webkit/WebKitLibraries/WebKitSystemInterface.h @@ -10,6 +10,7 @@ @class QTMovie; @class QTMovieView; +@class AVAsset; #ifdef __cplusplus extern "C" { @@ -206,6 +207,7 @@ float WKQTMovieMaxTimeSeekable(QTMovie* movie); NSString *WKQTMovieMaxTimeLoadedChangeNotification(void); void WKQTMovieViewSetDrawSynchronously(QTMovieView* view, BOOL sync); void WKQTMovieDisableComponent(uint32_t[5]); +NSURL *WKQTMovieResolvedURL(QTMovie* movie); CFStringRef WKCopyFoundationCacheDirectory(void); @@ -452,6 +454,7 @@ NSRange WKExtractWordDefinitionTokenRangeFromContextualString(NSString *contextS void WKShowWordDefinitionWindow(NSAttributedString *term, NSPoint screenPoint, NSDictionary *options); void WKHideWordDefinitionWindow(void); +NSURL* WKAVAssetResolvedURL(AVAsset*); #endif #ifdef __cplusplus |