[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[aroben at apple.com]

The following commit has been merged in the debian/experimental branch:
commit b8d5ee1359f588cddbb0cc5c400f3dfbe257ee76
Author: aroben at apple.com <aroben at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Aug 4 19:29:03 2010 +0000

    Windows build fix
    
    The functions in NetscapePluginModuleWin.cpp have been moved to
    NetscapePluginModule.cpp.
    
    * WebProcess/Plugins/Netscape/win/NetscapePluginModuleWin.cpp: Removed.
    * win/WebKit2.vcproj: Removed NetscapePluginModuleWin.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64664 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index bc98eb5..06bf027 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,5 +1,15 @@
 2010-08-04  Adam Roben  <aroben at apple.com>
 
+        Windows build fix
+
+        The functions in NetscapePluginModuleWin.cpp have been moved to
+        NetscapePluginModule.cpp.
+
+        * WebProcess/Plugins/Netscape/win/NetscapePluginModuleWin.cpp: Removed.
+        * win/WebKit2.vcproj: Removed NetscapePluginModuleWin.
+
+2010-08-04  Adam Roben  <aroben at apple.com>
+
         Move bundle-loading code from NetscapePluginModule to a new Module
         class
 
diff --git a/WebKit2/WebProcess/Plugins/Netscape/win/NetscapePluginModuleWin.cpp b/WebKit2/WebProcess/Plugins/Netscape/win/NetscapePluginModuleWin.cpp
deleted file mode 100644
index d6d25df..0000000
--- a/WebKit2/WebProcess/Plugins/Netscape/win/NetscapePluginModuleWin.cpp
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (C) 2010 Apple 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.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. 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 INC. 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 "NetscapePluginModule.h"
-
-#include "NotImplemented.h"
-
-namespace WebKit {
-
-bool NetscapePluginModule::tryLoad()
-{
-    notImplemented();
-    return false;
-}
-
-void NetscapePluginModule::unload()
-{
-    notImplemented();
-}
-
-} // namespace WebKit
diff --git a/WebKit2/win/WebKit2.vcproj b/WebKit2/win/WebKit2.vcproj
index eb0eac5..15cb028 100755
--- a/WebKit2/win/WebKit2.vcproj
+++ b/WebKit2/win/WebKit2.vcproj
@@ -887,10 +887,6 @@
 						>
 					</File>
 					<File
-						RelativePath="..\WebProcess\Plugins\Netscape\win\NetscapePluginModuleWin.cpp"
-						>
-					</File>
-					<File
 						RelativePath="..\WebProcess\Plugins\Netscape\NetscapePluginStream.cpp"
 						>
 					</File>

-- 
WebKit Debian packaging