[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
andersca at apple.com
andersca at apple.com
Wed Dec 22 11:28:20 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 6f29b7aae59d82cb8018c81729046bfca0b708a7
Author: andersca at apple.com <andersca at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Jul 26 20:16:09 2010 +0000
Get rid of the dummy plug-in.
Reviewed by Adam Roben.
* WebKit2.xcodeproj/project.pbxproj:
* WebProcess/Plugins/DummyPlugin.cpp: Removed.
* WebProcess/Plugins/DummyPlugin.h: Removed.
* win/WebKit2.vcproj:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64068 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index ddeba75..57dd8f2 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,14 @@
+2010-07-26 Anders Carlsson <andersca at apple.com>
+
+ Reviewed by Adam Roben.
+
+ Get rid of the dummy plug-in.
+
+ * WebKit2.xcodeproj/project.pbxproj:
+ * WebProcess/Plugins/DummyPlugin.cpp: Removed.
+ * WebProcess/Plugins/DummyPlugin.h: Removed.
+ * win/WebKit2.vcproj:
+
2010-07-26 Sam Weinig <sam at webkit.org>
Reviewed by Anders Carlsson.
diff --git a/WebKit2/WebKit2.xcodeproj/project.pbxproj b/WebKit2/WebKit2.xcodeproj/project.pbxproj
index f5311e8..683f70b 100644
--- a/WebKit2/WebKit2.xcodeproj/project.pbxproj
+++ b/WebKit2/WebKit2.xcodeproj/project.pbxproj
@@ -57,8 +57,6 @@
1A6FB7AF11E64B6800DB1371 /* PluginView.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A6FB7AD11E64B6800DB1371 /* PluginView.h */; };
1A6FB7D211E651E200DB1371 /* Plugin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A6FB7D011E651E200DB1371 /* Plugin.cpp */; };
1A6FB7D311E651E200DB1371 /* Plugin.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A6FB7D111E651E200DB1371 /* Plugin.h */; };
- 1A6FB7E611E6530500DB1371 /* DummyPlugin.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A6FB7E411E6530500DB1371 /* DummyPlugin.h */; };
- 1A6FB7E711E6530500DB1371 /* DummyPlugin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A6FB7E511E6530500DB1371 /* DummyPlugin.cpp */; };
1A6FB90B11E66FBC00DB1371 /* NetscapePluginModule.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A6FB90911E66FBC00DB1371 /* NetscapePluginModule.h */; };
1A6FB90C11E66FBC00DB1371 /* NetscapePluginModule.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A6FB90A11E66FBC00DB1371 /* NetscapePluginModule.cpp */; };
1A6FBA0311E6813E00DB1371 /* NetscapePluginModuleMac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A6FBA0211E6813E00DB1371 /* NetscapePluginModuleMac.cpp */; };
@@ -342,8 +340,6 @@
1A6FB7AD11E64B6800DB1371 /* PluginView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PluginView.h; sourceTree = "<group>"; };
1A6FB7D011E651E200DB1371 /* Plugin.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Plugin.cpp; sourceTree = "<group>"; };
1A6FB7D111E651E200DB1371 /* Plugin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Plugin.h; sourceTree = "<group>"; };
- 1A6FB7E411E6530500DB1371 /* DummyPlugin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DummyPlugin.h; sourceTree = "<group>"; };
- 1A6FB7E511E6530500DB1371 /* DummyPlugin.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DummyPlugin.cpp; sourceTree = "<group>"; };
1A6FB90911E66FBC00DB1371 /* NetscapePluginModule.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NetscapePluginModule.h; sourceTree = "<group>"; };
1A6FB90A11E66FBC00DB1371 /* NetscapePluginModule.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NetscapePluginModule.cpp; sourceTree = "<group>"; };
1A6FBA0211E6813E00DB1371 /* NetscapePluginModuleMac.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NetscapePluginModuleMac.cpp; sourceTree = "<group>"; };
@@ -677,8 +673,6 @@
isa = PBXGroup;
children = (
1A6FB90811E66FB100DB1371 /* Netscape */,
- 1A6FB7E511E6530500DB1371 /* DummyPlugin.cpp */,
- 1A6FB7E411E6530500DB1371 /* DummyPlugin.h */,
1A2161AF11F37664008AD0F5 /* NPJSObjectMap.cpp */,
1A2161AE11F37664008AD0F5 /* NPJSObjectMap.h */,
1A2162AE11F38971008AD0F5 /* NPRuntimeUtilities.cpp */,
@@ -1181,7 +1175,6 @@
BC9E969C11457F3F00870E71 /* DrawingAreaMessageKinds.h in Headers */,
BC2652171182608100243E12 /* DrawingAreaProxy.h in Headers */,
BC9E969A11457EDE00870E71 /* DrawingAreaProxyMessageKinds.h in Headers */,
- 1A6FB7E611E6530500DB1371 /* DummyPlugin.h in Headers */,
BC17753F118BABF0007D9E9A /* GenericCallback.h in Headers */,
BC64697011DBE603006455B0 /* ImmutableArray.h in Headers */,
BC204EE311C83E98008F3375 /* InjectedBundle.h in Headers */,
@@ -1395,7 +1388,6 @@
1A30EAC6115D7DA30053E937 /* ConnectionMac.cpp in Sources */,
BC8452A71162C80900CAB9B5 /* DrawingArea.cpp in Sources */,
BC2652161182608100243E12 /* DrawingAreaProxy.cpp in Sources */,
- 1A6FB7E711E6530500DB1371 /* DummyPlugin.cpp in Sources */,
BC64696F11DBE603006455B0 /* ImmutableArray.cpp in Sources */,
BC204EE211C83E98008F3375 /* InjectedBundle.cpp in Sources */,
BC204EE611C83EA9008F3375 /* InjectedBundleMac.cpp in Sources */,
diff --git a/WebKit2/WebProcess/Plugins/DummyPlugin.cpp b/WebKit2/WebProcess/Plugins/DummyPlugin.cpp
deleted file mode 100644
index d9d663a..0000000
--- a/WebKit2/WebProcess/Plugins/DummyPlugin.cpp
+++ /dev/null
@@ -1,108 +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 "DummyPlugin.h"
-
-#include <WebCore/GraphicsContext.h>
-
-using namespace WebCore;
-
-namespace WebKit {
-
-DummyPlugin::DummyPlugin()
-{
-}
-
-bool DummyPlugin::initialize(PluginController*, const Parameters&)
-{
- return true;
-}
-
-void DummyPlugin::destroy()
-{
-}
-
-void DummyPlugin::paint(GraphicsContext* context, const IntRect& dirtyRect)
-{
-#if PLATFORM(MAC)
- CGContextRef cgContext = context->platformContext();
- CGContextSaveGState(cgContext);
-
- CGColorRef redColor = CGColorCreateGenericRGB(1, 0, 0, 1);
- CGContextSetFillColorWithColor(cgContext, redColor);
- CGContextFillRect(cgContext, dirtyRect);
- CGColorRelease(redColor);
-#endif
-}
-
-void DummyPlugin::geometryDidChange(const IntRect& frameRect, const IntRect& clipRect)
-{
-}
-
-void DummyPlugin::frameDidFinishLoading(uint64_t requestID)
-{
-}
-
-void DummyPlugin::frameDidFail(uint64_t requestID, bool wasCancelled)
-{
-}
-
-PluginController* DummyPlugin::controller()
-{
- return 0;
-}
-
-void DummyPlugin::didEvaluateJavaScript(uint64_t requestID, const WebCore::String& requestURLString, const WebCore::String& result)
-{
-}
-
-void DummyPlugin::streamDidReceiveResponse(uint64_t streamID, const WebCore::KURL& responseURL, uint32_t streamLength,
- uint32_t lastModifiedTime, const WebCore::String& mimeType, const WebCore::String& headers)
-{
-}
-
-void DummyPlugin::streamDidReceiveData(uint64_t streamID, const char* bytes, int length)
-{
-}
-
-void DummyPlugin::streamDidFinishLoading(uint64_t streamID)
-{
-}
-
-void DummyPlugin::streamDidFail(uint64_t streamID, bool wasCancelled)
-{
-}
-
-bool DummyPlugin::handleMouseEvent(const WebMouseEvent&)
-{
- return false;
-}
-
-bool DummyPlugin::handleWheelEvent(const WebWheelEvent&)
-{
- return false;
-}
-
-} // namespace WebKit
diff --git a/WebKit2/WebProcess/Plugins/DummyPlugin.h b/WebKit2/WebProcess/Plugins/DummyPlugin.h
deleted file mode 100644
index fb60057..0000000
--- a/WebKit2/WebProcess/Plugins/DummyPlugin.h
+++ /dev/null
@@ -1,65 +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.
- */
-
-#ifndef DummyPlugin_h
-#define DummyPlugin_h
-
-#include "Plugin.h"
-#include <wtf/PassRefPtr.h>
-
-namespace WebKit {
-
-class DummyPlugin : public Plugin {
-public:
- static PassRefPtr<DummyPlugin> create()
- {
- return adoptRef(new DummyPlugin);
- }
-
-private:
- DummyPlugin();
-
- // Plugin
- virtual bool initialize(PluginController*, const Parameters&);
- virtual void destroy();
- virtual void paint(WebCore::GraphicsContext*, const WebCore::IntRect& dirtyRect);
- virtual void geometryDidChange(const WebCore::IntRect& frameRect, const WebCore::IntRect& clipRect);
- virtual void frameDidFinishLoading(uint64_t requestID);
- virtual void frameDidFail(uint64_t requestID, bool wasCancelled);
- virtual void didEvaluateJavaScript(uint64_t requestID, const WebCore::String& requestURLString, const WebCore::String& result);
- virtual void streamDidReceiveResponse(uint64_t streamID, const WebCore::KURL& responseURL, uint32_t streamLength,
- uint32_t lastModifiedTime, const WebCore::String& mimeType, const WebCore::String& headers);
- virtual void streamDidReceiveData(uint64_t streamID, const char* bytes, int length);
- virtual void streamDidFinishLoading(uint64_t streamID);
- virtual void streamDidFail(uint64_t streamID, bool wasCancelled);
- virtual bool handleMouseEvent(const WebMouseEvent&);
- virtual bool handleWheelEvent(const WebWheelEvent&);
-
- virtual PluginController* controller();
-};
-
-} // namespace WebKit
-
-#endif // DummyPlugin_h
diff --git a/WebKit2/win/WebKit2.vcproj b/WebKit2/win/WebKit2.vcproj
index b706231..a74cc26 100755
--- a/WebKit2/win/WebKit2.vcproj
+++ b/WebKit2/win/WebKit2.vcproj
@@ -752,14 +752,6 @@
Name="Plugins"
>
<File
- RelativePath="..\WebProcess\Plugins\DummyPlugin.cpp"
- >
- </File>
- <File
- RelativePath="..\WebProcess\Plugins\DummyPlugin.h"
- >
- </File>
- <File
RelativePath="..\WebProcess\Plugins\NPJSObjectMap.cpp"
>
</File>
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list