2011-04-20 Eric Carlson <eric.carlson@apple.com>

        Reviewed by Dan Bernstein.

        Adopt QTKit API for listing and deleting file in its media cache.
        <rdar://problem/9130029>
        https://bugs.webkit.org/show_bug.cgi?id=58795

        Not possible to test automatically, verified manually.

        * WebCore.exp.in: Export new media download cache functions.

        * platform/graphics/mac/MediaPlayerPrivateQTKit.h:
        * platform/graphics/mac/MediaPlayerPrivateQTKit.mm:
        (WebCore::MediaPlayerPrivateQTKit::registerMediaEngine): Register cache management functions.
        (WebCore::MediaPlayerPrivateQTKit::getSitesInMediaCache): New, return cache origins.
        (WebCore::MediaPlayerPrivateQTKit::clearMediaCache): New, empty the media cache.
        (WebCore::MediaPlayerPrivateQTKit::clearMediaCacheForSite): New, delete files in the media
            cache for one origin.

        * platform/mac/WebCoreSystemInterface.h: Add new WKSI functions.
        * platform/mac/WebCoreSystemInterface.mm: Ditto.

2011-04-20  Eric Carlson  <eric.carlson@apple.com>

        Reviewed by Dan Bernstein.

        Adopt QTKit API for listing and deleting file in its media cache.
        <rdar://problem/9130029>
        https://bugs.webkit.org/show_bug.cgi?id=58795

        * WebKitSystemInterface.h:
        * libWebKitSystemInterfaceLeopard.a:
        * libWebKitSystemInterfaceSnowLeopard.a:

2011-04-20  Eric Carlson  <eric.carlson@apple.com>

        Reviewed by Dan Bernstein.

        Adopt QTKit API for listing and deleting file in its media cache.
        <rdar://problem/9130029>

        * WebCoreSupport/WebSystemInterface.mm:
        (InitWebCoreSystemInterface): Initialize new functions.

2011-04-18  Eric Carlson  <eric.carlson@apple.com>

        Reviewed by Dan Bernstein.

        Adopt QTKit API for listing and deleting file in its media cache.
        <rdar://problem/9130029>

        * WebProcess/WebCoreSupport/mac/WebSystemInterface.mm:
        (InitWebCoreSystemInterface): Initialize new functions.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@84415 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index b33f32f3a92b159bebd99d7dd85cbb7114e21bc9..d49e1f563407d49605ed14224d0804c759d20b40 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,26 @@
+2011-04-20  Eric Carlson  <eric.carlson@apple.com>
+
+        Reviewed by Dan Bernstein.
+
+        Adopt QTKit API for listing and deleting file in its media cache.
+        <rdar://problem/9130029> 
+        https://bugs.webkit.org/show_bug.cgi?id=58795
+
+        Not possible to test automatically, verified manually.
+
+        * WebCore.exp.in: Export new media download cache functions.
+
+        * platform/graphics/mac/MediaPlayerPrivateQTKit.h:
+        * platform/graphics/mac/MediaPlayerPrivateQTKit.mm:
+        (WebCore::MediaPlayerPrivateQTKit::registerMediaEngine): Register cache management functions.
+        (WebCore::MediaPlayerPrivateQTKit::getSitesInMediaCache): New, return cache origins.
+        (WebCore::MediaPlayerPrivateQTKit::clearMediaCache): New, empty the media cache.
+        (WebCore::MediaPlayerPrivateQTKit::clearMediaCacheForSite): New, delete files in the media
+            cache for one origin.
+
+        * platform/mac/WebCoreSystemInterface.h: Add new WKSI functions.
+        * platform/mac/WebCoreSystemInterface.mm: Ditto.
+
 2011-04-20  Dirk Schulze  <krit@webkit.org>
 
         Reviewed by Simon Fraser.

diff --git a/Source/WebCore/WebCore.exp.in b/Source/WebCore/WebCore.exp.in
index d8ee526175b5cd5c481567f3761a5cf43b9a3bcb..718f77524ce816da6b559e790054ef8ee1af700f 100644 (file)
--- a/Source/WebCore/WebCore.exp.in
+++ b/Source/WebCore/WebCore.exp.in
@@ -1368,6 +1368,9 @@ _wkQTMovieMaxTimeSeekable
 _wkQTMovieSelectPreferredAlternates
 _wkQTMovieSetShowClosedCaptions
 _wkQTMovieViewSetDrawSynchronously
+_wkQTGetSitesInMediaDownloadCache
+_wkQTClearMediaDownloadCacheForSite
+_wkQTClearMediaDownloadCache
 _wkSetCFURLResponseMIMEType
 _wkSetCGFontRenderingMode
 _wkSetCONNECTProxyAuthorizationForStream

diff --git a/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.h b/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.h
index 7bdc06421a02b948fd1bd98e2bcb8fe93038fba8..d2767202ef052968fad8b13040154e39bb12cead 100644 (file)
--- a/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.h
+++ b/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.h
@@ -76,6 +76,9 @@ private:
     static MediaPlayerPrivateInterface* create(MediaPlayer* player);
     static void getSupportedTypes(HashSet<String>& types);
     static MediaPlayer::SupportsType supportsType(const String& type, const String& codecs);
+    static void getSitesInMediaCache(Vector<String>&);
+    static void clearMediaCache();
+    static void clearMediaCacheForSite(const String&);
     static bool isAvailable();
 
     PlatformMedia platformMedia() const;

diff --git a/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm b/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm
index 400fdfb534c25dab065c0122fa2a047e315d0c0d..a9ebc1a3a19f96e2ef659ad4466ea08bee757c59 100644 (file)
--- a/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm
+++ b/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm
@@ -209,7 +209,7 @@ MediaPlayerPrivateInterface* MediaPlayerPrivateQTKit::create(MediaPlayer* player
 void MediaPlayerPrivateQTKit::registerMediaEngine(MediaEngineRegistrar registrar)
 {
     if (isAvailable())
-        registrar(create, getSupportedTypes, supportsType, 0, 0, 0);
+        registrar(create, getSupportedTypes, supportsType, getSitesInMediaCache, clearMediaCache, clearMediaCacheForSite);
 }
 
 MediaPlayerPrivateQTKit::MediaPlayerPrivateQTKit(MediaPlayer* player)
@@ -1490,7 +1490,24 @@ bool MediaPlayerPrivateQTKit::isAvailable()
     return QTKitLibrary();
 #endif
 }
-    
+
+void MediaPlayerPrivateQTKit::getSitesInMediaCache(Vector<String>& sites) 
+{
+    NSArray *mediaSites = wkQTGetSitesInMediaDownloadCache();
+    for (NSString *site in mediaSites)
+        sites.append(site);
+}
+
+void MediaPlayerPrivateQTKit::clearMediaCache()
+{
+    wkQTClearMediaDownloadCache();
+}
+
+void MediaPlayerPrivateQTKit::clearMediaCacheForSite(const String& site)
+{
+    wkQTClearMediaDownloadCacheForSite(site);
+}
+
 void MediaPlayerPrivateQTKit::disableUnsupportedTracks()
 {
     if (!m_qtMovie) {
@@ -1645,7 +1662,6 @@ void MediaPlayerPrivateQTKit::setPrivateBrowsingMode(bool privateBrowsing)
     [m_qtMovie.get() setAttribute:[NSNumber numberWithBool:!privateBrowsing] forKey:@"QTMovieAllowPersistentCacheAttribute"];
 }
 
-
 } // namespace WebCore
 
 @implementation WebCoreMovieObserver

diff --git a/Source/WebCore/platform/mac/WebCoreSystemInterface.h b/Source/WebCore/platform/mac/WebCoreSystemInterface.h
index 3c9850bf72f02127f34db6885abe2cd6d6878f20..a49a455567674529aab09b05ba509f51165d1f1b 100644 (file)
--- a/Source/WebCore/platform/mac/WebCoreSystemInterface.h
+++ b/Source/WebCore/platform/mac/WebCoreSystemInterface.h
@@ -141,6 +141,9 @@ extern BOOL (*wkQTMovieHasClosedCaptions)(QTMovie*);
 extern void (*wkQTMovieSetShowClosedCaptions)(QTMovie*, BOOL);
 extern void (*wkQTMovieSelectPreferredAlternates)(QTMovie*);
 extern void (*wkQTMovieViewSetDrawSynchronously)(QTMovieView*, BOOL);
+extern NSArray *(*wkQTGetSitesInMediaDownloadCache)();
+extern void (*wkQTClearMediaDownloadCacheForSite)(NSString *site);
+extern void (*wkQTClearMediaDownloadCache)();
 extern void (*wkSetCGFontRenderingMode)(CGContextRef, NSFont*);
 extern void (*wkSetCookieStoragePrivateBrowsingEnabled)(BOOL);
 extern void (*wkSetDragImage)(NSImage*, NSPoint offset);

diff --git a/Source/WebCore/platform/mac/WebCoreSystemInterface.mm b/Source/WebCore/platform/mac/WebCoreSystemInterface.mm
index 6a78ff64d8a2631baab8405fed377cd78e44a435..65ea1305231c9a2b4f6189729bf3ea07bdb996aa 100644 (file)
--- a/Source/WebCore/platform/mac/WebCoreSystemInterface.mm
+++ b/Source/WebCore/platform/mac/WebCoreSystemInterface.mm
@@ -67,6 +67,10 @@ BOOL (*wkQTMovieHasClosedCaptions)(QTMovie*);
 void (*wkQTMovieSetShowClosedCaptions)(QTMovie*, BOOL);
 void (*wkQTMovieSelectPreferredAlternates)(QTMovie*);
 void (*wkQTMovieViewSetDrawSynchronously)(QTMovieView*, BOOL);
+NSArray *(*wkQTGetSitesInMediaDownloadCache)();
+void (*wkQTClearMediaDownloadCacheForSite)(NSString *site);
+void (*wkQTClearMediaDownloadCache)();
+
 void (*wkSetCGFontRenderingMode)(CGContextRef, NSFont*);
 void (*wkSetCookieStoragePrivateBrowsingEnabled)(BOOL);
 void (*wkSetDragImage)(NSImage*, NSPoint offset);

diff --git a/Source/WebKit/mac/ChangeLog b/Source/WebKit/mac/ChangeLog
index 513973483733b2c3f00cb7f7408630dbb7c3a86d..d52dead6d8de93b8ab3b641c56ea575e84930ad8 100644 (file)
--- a/Source/WebKit/mac/ChangeLog
+++ b/Source/WebKit/mac/ChangeLog
@@ -1,3 +1,13 @@
+2011-04-20  Eric Carlson  <eric.carlson@apple.com>
+
+        Reviewed by Dan Bernstein.
+
+        Adopt QTKit API for listing and deleting file in its media cache.
+        <rdar://problem/9130029> 
+
+        * WebCoreSupport/WebSystemInterface.mm:
+        (InitWebCoreSystemInterface): Initialize new functions.
+
 2011-04-19  Matthew Delaney  <mdelaney@apple.com>
 
         Reviewed by Simon Fraser.

diff --git a/Source/WebKit/mac/WebCoreSupport/WebSystemInterface.mm b/Source/WebKit/mac/WebCoreSupport/WebSystemInterface.mm
index de2a1f4b93fc84d688ae95ecfbec6d7320aae434..8bac25ade72be8f7f18ba3cd90d2e385949df91a 100644 (file)
--- a/Source/WebKit/mac/WebCoreSupport/WebSystemInterface.mm
+++ b/Source/WebKit/mac/WebCoreSupport/WebSystemInterface.mm
@@ -99,6 +99,9 @@ void InitWebCoreSystemInterface(void)
     INIT(QTMovieSetShowClosedCaptions);
     INIT(QTMovieSelectPreferredAlternates);
     INIT(QTMovieViewSetDrawSynchronously);
+    INIT(QTGetSitesInMediaDownloadCache);
+    INIT(QTClearMediaDownloadCacheForSite);
+    INIT(QTClearMediaDownloadCache);
 
 #ifndef BUILDING_ON_TIGER
     INIT(GetGlyphsForCharacters);

diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index 743a4edc87d0098faa46005a21d4d7e94882851c..0cd0167d021e259ebdd9fda72bf07fd8324773ca 100644 (file)
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,3 +1,13 @@
+2011-04-18  Eric Carlson  <eric.carlson@apple.com>
+
+        Reviewed by Dan Bernstein.
+
+        Adopt QTKit API for listing and deleting file in its media cache.
+        <rdar://problem/9130029> 
+
+        * WebProcess/WebCoreSupport/mac/WebSystemInterface.mm:
+        (InitWebCoreSystemInterface): Initialize new functions.
+
 2011-04-20  Alejandro G. Castro  <alex@igalia.com>
 
         Fixed GTK+ compilation after r84206.

diff --git a/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm b/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm
index a4fbc09cc03c7a4bd16d7934df87ece72465be98..78f7e90912b3e49a3375b92f043e4632d4d14b54 100644 (file)
--- a/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm
+++ b/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm
@@ -79,6 +79,9 @@ void InitWebCoreSystemInterface(void)
         INIT(QTMovieSelectPreferredAlternates);
         INIT(QTMovieSetShowClosedCaptions);
         INIT(QTMovieViewSetDrawSynchronously);
+        INIT(QTGetSitesInMediaDownloadCache);
+        INIT(QTClearMediaDownloadCacheForSite);
+        INIT(QTClearMediaDownloadCache);
         INIT(SetCGFontRenderingMode);
         INIT(SetCONNECTProxyAuthorizationForStream);
         INIT(SetCONNECTProxyForStream);

diff --git a/WebKitLibraries/ChangeLog b/WebKitLibraries/ChangeLog
index 0fe280035d7436e735918f7a7fbdf4bde2e00f67..d480b699df22bfde4f3158d01be283042d20f271 100644 (file)
--- a/WebKitLibraries/ChangeLog
+++ b/WebKitLibraries/ChangeLog
@@ -1,3 +1,15 @@
+2011-04-20  Eric Carlson  <eric.carlson@apple.com>
+
+        Reviewed by Dan Bernstein.
+
+        Adopt QTKit API for listing and deleting file in its media cache.
+        <rdar://problem/9130029> 
+        https://bugs.webkit.org/show_bug.cgi?id=58795
+
+        * WebKitSystemInterface.h:
+        * libWebKitSystemInterfaceLeopard.a:
+        * libWebKitSystemInterfaceSnowLeopard.a:
+
 2011-04-19  Jessie Berlin  <jberlin@apple.com>
 
         Reviewed by Sam Weinig.

diff --git a/WebKitLibraries/WebKitSystemInterface.h b/WebKitLibraries/WebKitSystemInterface.h
index 9079919ffc2645a2ca24f26d299859b7e80e0105..b6457f957cf5a1f91f4cd3a5e8abbbbd95688e55 100644 (file)
--- a/WebKitLibraries/WebKitSystemInterface.h
+++ b/WebKitLibraries/WebKitSystemInterface.h
@@ -306,6 +306,10 @@ typedef enum {
     
 NSControl *WKCreateMediaUIControl(int controlType);
 
+NSArray *WKQTGetSitesInMediaDownloadCache();
+void WKQTClearMediaDownloadCacheForSite(NSString *site);
+void WKQTClearMediaDownloadCache();
+    
 #if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
 mach_port_t WKInitializeRenderServer(void);
     
@@ -456,6 +460,8 @@ void WKContentAreaResized(WKScrollbarPainterControllerRef);
 void WKWillEndLiveResize(WKScrollbarPainterControllerRef);
 void WKContentAreaDidShow(WKScrollbarPainterControllerRef);
 void WKContentAreaDidHide(WKScrollbarPainterControllerRef);
+void WKDidBeginScrollGesture(WKScrollbarPainterControllerRef);
+void WKDidEndScrollGesture(WKScrollbarPainterControllerRef);
 
 bool WKScrollbarPainterUsesOverlayScrollers(void);
 

diff --git a/WebKitLibraries/libWebKitSystemInterfaceLeopard.a b/WebKitLibraries/libWebKitSystemInterfaceLeopard.a
index 6cd6976bd1680c4cb7eccc7b2ec557d8919e6f9a..8ceab7749d9d5153242fcb138404eea50cda490a 100644 (file)
Binary files a/WebKitLibraries/libWebKitSystemInterfaceLeopard.a and b/WebKitLibraries/libWebKitSystemInterfaceLeopard.a differ

diff --git a/WebKitLibraries/libWebKitSystemInterfaceSnowLeopard.a b/WebKitLibraries/libWebKitSystemInterfaceSnowLeopard.a
index e7e387258725d9f16ddc5d07e5d6baa7953d41c3..9ff6e8e46c1faa8abf5a0dea832abc193678f64e 100644 (file)
Binary files a/WebKitLibraries/libWebKitSystemInterfaceSnowLeopard.a and b/WebKitLibraries/libWebKitSystemInterfaceSnowLeopard.a differ