2007-12-16 Rodney Dawes <dobey@wayofthemonkey.com>
authormrowe@apple.com <mrowe@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 17 Dec 2007 01:50:18 +0000 (01:50 +0000)
committermrowe@apple.com <mrowe@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 17 Dec 2007 01:50:18 +0000 (01:50 +0000)
        Reviewed by Maciej Stachowiak.

        http://bugs.webkit.org/show_bug.cgi?id=16389
        Bug 16389: Common Implementation of NetscapePlugInStreamLoader

        * WebCore.vcproj/WebCore.vcproj: Remove NetscapePlugInStreamLoaderWin.cpp.
        * loader/NetscapePlugInStreamLoader.cpp: Copy method implementations from NetscapePlugInStreamLoaderWin.cpp.
        * loader/win/NetscapePlugInStreamLoaderWin.cpp: Removed.

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

WebCore/ChangeLog
WebCore/WebCore.vcproj/WebCore.vcproj
WebCore/loader/NetscapePlugInStreamLoader.cpp
WebCore/loader/win/NetscapePlugInStreamLoaderWin.cpp [deleted file]

index ee0aa61..39e2109 100644 (file)
@@ -1,3 +1,14 @@
+2007-12-16  Rodney Dawes  <dobey@wayofthemonkey.com>
+
+        Reviewed by Maciej Stachowiak.
+
+        http://bugs.webkit.org/show_bug.cgi?id=16389
+        Bug 16389: Common Implementation of NetscapePlugInStreamLoader
+
+        * WebCore.vcproj/WebCore.vcproj: Remove NetscapePlugInStreamLoaderWin.cpp.
+        * loader/NetscapePlugInStreamLoader.cpp: Copy method implementations from NetscapePlugInStreamLoaderWin.cpp.
+        * loader/win/NetscapePlugInStreamLoaderWin.cpp: Removed.
+
 2007-12-16  Grace Kloba  <klobag@gmail.com>
 
         Reviewed by Darin Adler.
index ccdbedc..9b3a32d 100644 (file)
                                        >\r
                                </File>\r
                        </Filter>\r
-                       <Filter\r
-                               Name="win"\r
-                               >\r
-                               <File\r
-                                       RelativePath="..\loader\win\NetscapePlugInStreamLoaderWin.cpp"\r
-                                       >\r
-                               </File>\r
-                       </Filter>\r
                </Filter>\r
                <Filter\r
                        Name="platform"\r
index 0798cfe..47c9599 100644 (file)
 #include "config.h"
 #include "NetscapePlugInStreamLoader.h"
 
+#include "FrameLoader.h"
 #include "DocumentLoader.h"
 
 namespace WebCore {
 
+NetscapePlugInStreamLoader::NetscapePlugInStreamLoader(Frame* frame, NetscapePlugInStreamLoaderClient* client)
+    : ResourceLoader(frame, true, true)
+    , m_client(client)
+{
+}
+
+NetscapePlugInStreamLoader::~NetscapePlugInStreamLoader()
+{
+}
+
+PassRefPtr<NetscapePlugInStreamLoader> NetscapePlugInStreamLoader::create(Frame* frame, NetscapePlugInStreamLoaderClient* client)
+{
+    return new NetscapePlugInStreamLoader(frame, client);
+}
+
+bool NetscapePlugInStreamLoader::isDone() const
+{
+    return !m_client;
+}
+
+void NetscapePlugInStreamLoader::releaseResources()
+{
+    m_client = 0;
+    ResourceLoader::releaseResources();
+}
+
+void NetscapePlugInStreamLoader::didReceiveResponse(const ResourceResponse& response)
+{
+    RefPtr<NetscapePlugInStreamLoader> protect(this);
+
+    m_client->didReceiveResponse(this, response);
+
+    // Don't continue if the stream is cancelled
+    if (!m_client)
+        return;
+
+    ResourceLoader::didReceiveResponse(response);
+
+    // Don't continue if the stream is cancelled
+    if (!m_client)
+        return;
+
+    if (response.isHTTP() && (response.httpStatusCode() < 100 || response.httpStatusCode() >= 400))
+        didCancel(frameLoader()->fileDoesNotExistError(response));
+}
+
+void NetscapePlugInStreamLoader::didReceiveData(const char* data, int length, long long lengthReceived, bool allAtOnce)
+{
+    RefPtr<NetscapePlugInStreamLoader> protect(this);
+
+    m_client->didReceiveData(this, data, length);
+    
+    ResourceLoader::didReceiveData(data, length, lengthReceived, allAtOnce);
+}
+
+void NetscapePlugInStreamLoader::didFinishLoading()
+{
+    RefPtr<NetscapePlugInStreamLoader> protect(this);
+
+    m_documentLoader->removePlugInStreamLoader(this);
+    m_client->didFinishLoading(this);
+    ResourceLoader::didFinishLoading();
+}
+
+void NetscapePlugInStreamLoader::didFail(const ResourceError& error)
+{
+    RefPtr<NetscapePlugInStreamLoader> protect(this);
+
+    m_documentLoader->removePlugInStreamLoader(this);
+    m_client->didFail(this, error);
+    ResourceLoader::didFail(error);
+}
+
+void NetscapePlugInStreamLoader::didCancel(const ResourceError& error)
+{
+    RefPtr<NetscapePlugInStreamLoader> protect(this);
+
+    m_documentLoader->removePlugInStreamLoader(this);
+    m_client->didFail(this, error);
+    ResourceLoader::didCancel(error);
+}
+
 }
diff --git a/WebCore/loader/win/NetscapePlugInStreamLoaderWin.cpp b/WebCore/loader/win/NetscapePlugInStreamLoaderWin.cpp
deleted file mode 100644 (file)
index 47c9599..0000000
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * Copyright (C) 2006 Apple Computer, Inc.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1.  Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer. 
- * 2.  Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution. 
- * 3.  Neither the name of Apple Computer, Inc. ("Apple") nor the names of
- *     its contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission. 
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "NetscapePlugInStreamLoader.h"
-
-#include "FrameLoader.h"
-#include "DocumentLoader.h"
-
-namespace WebCore {
-
-NetscapePlugInStreamLoader::NetscapePlugInStreamLoader(Frame* frame, NetscapePlugInStreamLoaderClient* client)
-    : ResourceLoader(frame, true, true)
-    , m_client(client)
-{
-}
-
-NetscapePlugInStreamLoader::~NetscapePlugInStreamLoader()
-{
-}
-
-PassRefPtr<NetscapePlugInStreamLoader> NetscapePlugInStreamLoader::create(Frame* frame, NetscapePlugInStreamLoaderClient* client)
-{
-    return new NetscapePlugInStreamLoader(frame, client);
-}
-
-bool NetscapePlugInStreamLoader::isDone() const
-{
-    return !m_client;
-}
-
-void NetscapePlugInStreamLoader::releaseResources()
-{
-    m_client = 0;
-    ResourceLoader::releaseResources();
-}
-
-void NetscapePlugInStreamLoader::didReceiveResponse(const ResourceResponse& response)
-{
-    RefPtr<NetscapePlugInStreamLoader> protect(this);
-
-    m_client->didReceiveResponse(this, response);
-
-    // Don't continue if the stream is cancelled
-    if (!m_client)
-        return;
-
-    ResourceLoader::didReceiveResponse(response);
-
-    // Don't continue if the stream is cancelled
-    if (!m_client)
-        return;
-
-    if (response.isHTTP() && (response.httpStatusCode() < 100 || response.httpStatusCode() >= 400))
-        didCancel(frameLoader()->fileDoesNotExistError(response));
-}
-
-void NetscapePlugInStreamLoader::didReceiveData(const char* data, int length, long long lengthReceived, bool allAtOnce)
-{
-    RefPtr<NetscapePlugInStreamLoader> protect(this);
-
-    m_client->didReceiveData(this, data, length);
-    
-    ResourceLoader::didReceiveData(data, length, lengthReceived, allAtOnce);
-}
-
-void NetscapePlugInStreamLoader::didFinishLoading()
-{
-    RefPtr<NetscapePlugInStreamLoader> protect(this);
-
-    m_documentLoader->removePlugInStreamLoader(this);
-    m_client->didFinishLoading(this);
-    ResourceLoader::didFinishLoading();
-}
-
-void NetscapePlugInStreamLoader::didFail(const ResourceError& error)
-{
-    RefPtr<NetscapePlugInStreamLoader> protect(this);
-
-    m_documentLoader->removePlugInStreamLoader(this);
-    m_client->didFail(this, error);
-    ResourceLoader::didFail(error);
-}
-
-void NetscapePlugInStreamLoader::didCancel(const ResourceError& error)
-{
-    RefPtr<NetscapePlugInStreamLoader> protect(this);
-
-    m_documentLoader->removePlugInStreamLoader(this);
-    m_client->didFail(this, error);
-    ResourceLoader::didCancel(error);
-}
-
-}