2007-11-25 Rodney Dawes <dobey@wayofthemonkey.com>

        Reviewed by Maciej Stachowiak.

        Remove the unneeded CFNETWORK #ifdefs.

        * loader/NetscapePlugInStreamLoader.h:

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

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 66b6b819a61fef474b8d1bd53f25bfe6eef260e7..a9af4d763339f29dfcc0e8848b19ce8c28caeff4 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,11 @@
+2007-11-25  Rodney Dawes  <dobey@wayofthemonkey.com>
+
+        Reviewed by Maciej Stachowiak.
+
+        Remove the unneeded CFNETWORK #ifdefs.
+
+        * loader/NetscapePlugInStreamLoader.h:
+
 2007-11-24  Laszlo Gombos  <laszlo.gombos@gmail.com>
 
         Reviewed by Sam Weinig.

diff --git a/WebCore/loader/NetscapePlugInStreamLoader.h b/WebCore/loader/NetscapePlugInStreamLoader.h
index 60db3cc4ca40e9cb2f133301f343a9e53ea73909..e5fcb694af5a01d11ff20a7a28fc80b08312ed3b 100644 (file)
--- a/WebCore/loader/NetscapePlugInStreamLoader.h
+++ b/WebCore/loader/NetscapePlugInStreamLoader.h
@@ -34,17 +34,16 @@
 #endif
 
 namespace WebCore {
-#if USE(CFNETWORK)
     class NetscapePlugInStreamLoader;
 
     class NetscapePlugInStreamLoaderClient {
     public:
+        virtual ~NetscapePlugInStreamLoaderClient() { }
         virtual void didReceiveResponse(NetscapePlugInStreamLoader*, const ResourceResponse&) = 0;
         virtual void didReceiveData(NetscapePlugInStreamLoader*, const char*, int) = 0;
         virtual void didFail(NetscapePlugInStreamLoader*, const ResourceError&) = 0;
         virtual void didFinishLoading(NetscapePlugInStreamLoader*) { }
     };
-#endif
 
 #ifdef __OBJC__
         typedef id <WebPlugInStreamLoaderDelegate> PlugInStreamLoaderDelegate;
@@ -60,25 +59,21 @@ namespace WebCore {
 
         bool isDone() const;
 
-#if PLATFORM(MAC) || USE(CFNETWORK)
         virtual void didReceiveResponse(const ResourceResponse&);
-        virtual void didReceiveData(const char *, int, long long lengthReceived, bool allAtOnce);
+        virtual void didReceiveData(const char*, int, long long lengthReceived, bool allAtOnce);
         virtual void didFinishLoading();
         virtual void didFail(const ResourceError&);
 
         virtual void releaseResources();
-#endif
 
     private:
         NetscapePlugInStreamLoader(Frame*, PlugInStreamLoaderDelegate);
 
-#if PLATFORM(MAC) || USE(CFNETWORK)
         virtual void didCancel(const ResourceError& error);
-#endif
 
 #if PLATFORM(MAC)
-        RetainPtr<PlugInStreamLoaderDelegate > m_stream;
-#elif USE(CFNETWORK)
+        RetainPtr<PlugInStreamLoaderDelegate> m_stream;
+#else
         NetscapePlugInStreamLoaderClient* m_client;
 #endif
     };