[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
aroben at apple.com
aroben at apple.com
Wed Dec 22 15:28:41 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 5c60a034da2256de3612c41e2933df61b7e453f8
Author: aroben at apple.com <aroben at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Nov 4 14:31:24 2010 +0000
Add a do-nothing WebContextMenuProxy implementation on Windows
Fixes <http://webkit.org/b/48992> REGRESSION (r71041): Crash in
WebPageProxy::showContextMenu when right-clicking in WebKit2 on
Windows
Reviewed by Dan Bernstein.
* UIProcess/win/WebContextMenuProxyWin.cpp: Added.
(WebKit::WebContextMenuProxyWin::WebContextMenuProxyWin):
(WebKit::WebContextMenuProxyWin::create):
(WebKit::WebContextMenuProxyWin::showContextMenu):
(WebKit::WebContextMenuProxyWin::hideContextMenu):
* UIProcess/win/WebContextMenuProxyWin.h: Added.
Just stubbed-out this class.
* UIProcess/win/WebView.cpp:
(WebKit::WebView::createContextMenuProxy): Create a new
WebContextMenuProxyWin and return it. Returning 0 results in a crash.
* win/WebKit2.vcproj: Added WebContextMenuProxyWin.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71333 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 359ca50..2d5509e 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,27 @@
+2010-11-04 Adam Roben <aroben at apple.com>
+
+ Add a do-nothing WebContextMenuProxy implementation on Windows
+
+ Fixes <http://webkit.org/b/48992> REGRESSION (r71041): Crash in
+ WebPageProxy::showContextMenu when right-clicking in WebKit2 on
+ Windows
+
+ Reviewed by Dan Bernstein.
+
+ * UIProcess/win/WebContextMenuProxyWin.cpp: Added.
+ (WebKit::WebContextMenuProxyWin::WebContextMenuProxyWin):
+ (WebKit::WebContextMenuProxyWin::create):
+ (WebKit::WebContextMenuProxyWin::showContextMenu):
+ (WebKit::WebContextMenuProxyWin::hideContextMenu):
+ * UIProcess/win/WebContextMenuProxyWin.h: Added.
+ Just stubbed-out this class.
+
+ * UIProcess/win/WebView.cpp:
+ (WebKit::WebView::createContextMenuProxy): Create a new
+ WebContextMenuProxyWin and return it. Returning 0 results in a crash.
+
+ * win/WebKit2.vcproj: Added WebContextMenuProxyWin.
+
2010-11-04 Tor Arne Vestbø <tor.arne.vestbo at nokia.com>
Reviewed by Andreas Kling..
diff --git a/WebKit2/UIProcess/win/WebContextMenuProxyWin.cpp b/WebKit2/UIProcess/win/WebContextMenuProxyWin.cpp
new file mode 100644
index 0000000..512fbed
--- /dev/null
+++ b/WebKit2/UIProcess/win/WebContextMenuProxyWin.cpp
@@ -0,0 +1,53 @@
+/*
+ * 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 "WebContextMenuProxyWin.h"
+
+#include "NotImplemented.h"
+
+using namespace WebCore;
+
+namespace WebKit {
+
+inline WebContextMenuProxyWin::WebContextMenuProxyWin()
+{
+}
+
+PassRefPtr<WebContextMenuProxyWin> WebContextMenuProxyWin::create()
+{
+ return adoptRef(new WebContextMenuProxyWin);
+}
+
+void WebContextMenuProxyWin::showContextMenu(const IntPoint&, const Vector<WebContextMenuItem>&)
+{
+ notImplemented();
+}
+
+void WebContextMenuProxyWin::hideContextMenu()
+{
+ notImplemented();
+}
+
+} // namespace WebKit
diff --git a/WebKit2/UIProcess/win/WebContextMenuProxyWin.h b/WebKit2/UIProcess/win/WebContextMenuProxyWin.h
new file mode 100644
index 0000000..b196c24
--- /dev/null
+++ b/WebKit2/UIProcess/win/WebContextMenuProxyWin.h
@@ -0,0 +1,46 @@
+/*
+ * 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 WebContextMenuProxyWin_h
+#define WebContextMenuProxyWin_h
+
+#include "WebContextMenuProxy.h"
+
+namespace WebKit {
+
+class WebContextMenuProxyWin : public WebContextMenuProxy {
+public:
+ static PassRefPtr<WebContextMenuProxyWin> create();
+
+private:
+ WebContextMenuProxyWin();
+
+ virtual void showContextMenu(const WebCore::IntPoint&, const Vector<WebContextMenuItem>&);
+ virtual void hideContextMenu();
+};
+
+} // namespace WebKit
+
+#endif // WebContextMenuProxyWin_h
diff --git a/WebKit2/UIProcess/win/WebView.cpp b/WebKit2/UIProcess/win/WebView.cpp
index f4fe95d..18890ca 100644
--- a/WebKit2/UIProcess/win/WebView.cpp
+++ b/WebKit2/UIProcess/win/WebView.cpp
@@ -29,7 +29,7 @@
#include "FindIndicator.h"
#include "RunLoop.h"
#include "NativeWebKeyboardEvent.h"
-#include "WebContextMenuProxy.h"
+#include "WebContextMenuProxyWin.h"
#include "WebEditCommandProxy.h"
#include "WebEventFactory.h"
#include "WebPageNamespace.h"
@@ -628,8 +628,7 @@ PassRefPtr<WebPopupMenuProxy> WebView::createPopupMenuProxy()
PassRefPtr<WebContextMenuProxy> WebView::createContextMenuProxy(WebPageProxy*)
{
- // FIXME: Implement.
- return 0;
+ return WebContextMenuProxyWin::create();
}
void WebView::setFindIndicator(PassRefPtr<FindIndicator>, bool fadeOut)
diff --git a/WebKit2/win/WebKit2.vcproj b/WebKit2/win/WebKit2.vcproj
index d621bec..b5676cc 100755
--- a/WebKit2/win/WebKit2.vcproj
+++ b/WebKit2/win/WebKit2.vcproj
@@ -2084,6 +2084,14 @@
>
</File>
<File
+ RelativePath="..\UIProcess\win\WebContextMenuProxyWin.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\UIProcess\win\WebContextMenuProxyWin.h"
+ >
+ </File>
+ <File
RelativePath="..\UIProcess\win\WebContextWin.cpp"
>
</File>
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list