[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 08217cf6324b254c876a24a56c1b95823e7d8934
Author: aroben at apple.com <aroben at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Aug 19 21:21:54 2010 +0000

    Add NetscapePluginWin.cpp
    
    Fixes <http://webkit.org/b/44269> <rdar://problem/8330391>
    NetscapePlugin.h contains functions that should be in
    NetscapePluginWin.cpp
    
    Reviewed by Sam Weinig.
    
    * WebProcess/Plugins/Netscape/NetscapePlugin.h: Moved functions from
    here...
    * WebProcess/Plugins/Netscape/win/NetscapePluginWin.cpp: ...to here.
    
    * win/WebKit2.vcproj: Added NetscapePluginWin.cpp and let VS reorder
    the file list.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65702 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 27ff1e7..ee3d5e5 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,20 @@
+2010-08-19  Adam Roben  <aroben at apple.com>
+
+        Add NetscapePluginWin.cpp
+
+        Fixes <http://webkit.org/b/44269> <rdar://problem/8330391>
+        NetscapePlugin.h contains functions that should be in
+        NetscapePluginWin.cpp
+
+        Reviewed by Sam Weinig.
+
+        * WebProcess/Plugins/Netscape/NetscapePlugin.h: Moved functions from
+        here...
+        * WebProcess/Plugins/Netscape/win/NetscapePluginWin.cpp: ...to here.
+
+        * win/WebKit2.vcproj: Added NetscapePluginWin.cpp and let VS reorder
+        the file list.
+
 2010-08-19  Sam Weinig  <sam at webkit.org>
 
         Reviewed by Adam Roben.
diff --git a/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h b/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h
index cb4d12d..008d876 100644
--- a/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h
+++ b/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h
@@ -167,43 +167,6 @@ private:
 #endif
 };
 
-// Move these functions to NetscapePluginWin.cpp
-#if !PLATFORM(MAC)
-inline bool NetscapePlugin::platformPostInitialize()
-{
-    return true;
-}
-
-inline void NetscapePlugin::platformPaint(WebCore::GraphicsContext*, const WebCore::IntRect&)
-{
-}
-
-inline bool NetscapePlugin::platformHandleMouseEvent(const WebMouseEvent&)
-{
-    return false;
-}
-
-inline bool NetscapePlugin::platformHandleWheelEvent(const WebWheelEvent&)
-{
-    return false;
-}
-
-inline void NetscapePlugin::platformSetFocus(bool)
-{
-}
-
-inline bool NetscapePlugin::platformHandleMouseEnterEvent(const WebMouseEvent&)
-{
-    return false;
-}
-
-inline bool NetscapePlugin::platformHandleMouseLeaveEvent(const WebMouseEvent&)
-{
-    return false;
-}
-
-#endif
-
 } // namespace WebKit
 
 #endif // NetscapePlugin_h
diff --git a/WebKit2/WebProcess/Plugins/Netscape/win/NetscapePluginWin.cpp b/WebKit2/WebProcess/Plugins/Netscape/win/NetscapePluginWin.cpp
new file mode 100644
index 0000000..db86db6
--- /dev/null
+++ b/WebKit2/WebProcess/Plugins/Netscape/win/NetscapePluginWin.cpp
@@ -0,0 +1,74 @@
+/*
+ * 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 "NetscapePlugin.h"
+
+#include "NotImplemented.h"
+
+using namespace WebCore;
+
+namespace WebKit {
+
+bool NetscapePlugin::platformPostInitialize()
+{
+    notImplemented();
+    return true;
+}
+
+void NetscapePlugin::platformPaint(GraphicsContext*, const IntRect&)
+{
+    notImplemented();
+}
+
+bool NetscapePlugin::platformHandleMouseEvent(const WebMouseEvent&)
+{
+    notImplemented();
+    return false;
+}
+
+bool NetscapePlugin::platformHandleWheelEvent(const WebWheelEvent&)
+{
+    notImplemented();
+    return false;
+}
+
+void NetscapePlugin::platformSetFocus(bool)
+{
+    notImplemented();
+}
+
+bool NetscapePlugin::platformHandleMouseEnterEvent(const WebMouseEvent&)
+{
+    notImplemented();
+    return false;
+}
+
+bool NetscapePlugin::platformHandleMouseLeaveEvent(const WebMouseEvent&)
+{
+    notImplemented();
+    return false;
+}
+
+} // namespace WebKit
diff --git a/WebKit2/win/WebKit2.vcproj b/WebKit2/win/WebKit2.vcproj
index 0b8b9e9..7bf541d 100755
--- a/WebKit2/win/WebKit2.vcproj
+++ b/WebKit2/win/WebKit2.vcproj
@@ -966,6 +966,14 @@
 						RelativePath="..\WebProcess\Plugins\Netscape\NetscapePluginStream.h"
 						>
 					</File>
+					<Filter
+						Name="win"
+						>
+						<File
+							RelativePath="..\WebProcess\Plugins\Netscape\win\NetscapePluginWin.cpp"
+							>
+						</File>
+					</Filter>
 				</Filter>
 			</Filter>
 		</Filter>
@@ -1073,19 +1081,19 @@
 				>
 			</File>
 			<File
-				RelativePath="..\UIProcess\WebFramePolicyListenerProxy.cpp"
+				RelativePath="..\UIProcess\WebFrameListenerProxy.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\UIProcess\WebFramePolicyListenerProxy.h"
+				RelativePath="..\UIProcess\WebFrameListenerProxy.h"
 				>
 			</File>
 			<File
-				RelativePath="..\UIProcess\WebFrameListenerProxy.cpp"
+				RelativePath="..\UIProcess\WebFramePolicyListenerProxy.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\UIProcess\WebFrameListenerProxy.h"
+				RelativePath="..\UIProcess\WebFramePolicyListenerProxy.h"
 				>
 			</File>
 			<File

-- 
WebKit Debian packaging