[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
andreas.kling at nokia.com
andreas.kling at nokia.com
Wed Dec 22 15:28:59 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 97959332b0733dbdbd4c80ca715cfa7a9ba7bbcf
Author: andreas.kling at nokia.com <andreas.kling at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Nov 4 17:17:41 2010 +0000
2010-11-04 Andreas Kling <kling at webkit.org>
Reviewed by Tor Arne Vestbø.
[Qt] Add a stub WebContextMenuProxy
This is the Qt equivalent of r71333.
* UIProcess/API/qt/qwkpage.cpp:
(QWKPagePrivate::createContextMenuProxy):
* UIProcess/qt/WebContextMenuProxyQt.cpp: Added.
(WebKit::WebContextMenuProxyQt::WebContextMenuProxyQt):
(WebKit::WebContextMenuProxyQt::create):
(WebKit::WebContextMenuProxyQt::showContextMenu):
(WebKit::WebContextMenuProxyQt::hideContextMenu):
* UIProcess/qt/WebContextMenuProxyQt.h: Added.
* WebKit2.pro:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71343 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 2d5509e..619f9a9 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,21 @@
+2010-11-04 Andreas Kling <kling at webkit.org>
+
+ Reviewed by Tor Arne Vestbø.
+
+ [Qt] Add a stub WebContextMenuProxy
+
+ This is the Qt equivalent of r71333.
+
+ * UIProcess/API/qt/qwkpage.cpp:
+ (QWKPagePrivate::createContextMenuProxy):
+ * UIProcess/qt/WebContextMenuProxyQt.cpp: Added.
+ (WebKit::WebContextMenuProxyQt::WebContextMenuProxyQt):
+ (WebKit::WebContextMenuProxyQt::create):
+ (WebKit::WebContextMenuProxyQt::showContextMenu):
+ (WebKit::WebContextMenuProxyQt::hideContextMenu):
+ * UIProcess/qt/WebContextMenuProxyQt.h: Added.
+ * WebKit2.pro:
+
2010-11-04 Adam Roben <aroben at apple.com>
Add a do-nothing WebContextMenuProxy implementation on Windows
diff --git a/WebKit2/UIProcess/API/qt/qwkpage.cpp b/WebKit2/UIProcess/API/qt/qwkpage.cpp
index 6cefcc2..6f5d9fb 100644
--- a/WebKit2/UIProcess/API/qt/qwkpage.cpp
+++ b/WebKit2/UIProcess/API/qt/qwkpage.cpp
@@ -30,7 +30,7 @@
#include "LocalizedStrings.h"
#include "NativeWebKeyboardEvent.h"
#include "WebContext.h"
-#include "WebContextMenuProxy.h"
+#include "WebContextMenuProxyQt.h"
#include "WebEventFactoryQt.h"
#include "WebPlatformStrategies.h"
#include "WebPopupMenuProxyQt.h"
@@ -137,8 +137,7 @@ PassRefPtr<WebPopupMenuProxy> QWKPagePrivate::createPopupMenuProxy()
PassRefPtr<WebContextMenuProxy> QWKPagePrivate::createContextMenuProxy(WebPageProxy*)
{
- // FIXME: Implement;
- return 0;
+ return WebContextMenuProxyQt::create();
}
void QWKPagePrivate::setFindIndicator(PassRefPtr<FindIndicator>, bool fadeOut)
diff --git a/WebKit2/UIProcess/qt/WebContextMenuProxyQt.cpp b/WebKit2/UIProcess/qt/WebContextMenuProxyQt.cpp
new file mode 100644
index 0000000..f569192
--- /dev/null
+++ b/WebKit2/UIProcess/qt/WebContextMenuProxyQt.cpp
@@ -0,0 +1,54 @@
+/*
+ * Copyright (C) 2010 Apple Inc. All rights reserved.
+ * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
+ *
+ * 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 "WebContextMenuProxyQt.h"
+
+#include "NotImplemented.h"
+
+using namespace WebCore;
+
+namespace WebKit {
+
+inline WebContextMenuProxyQt::WebContextMenuProxyQt()
+{
+}
+
+PassRefPtr<WebContextMenuProxyQt> WebContextMenuProxyQt::create()
+{
+ return adoptRef(new WebContextMenuProxyQt);
+}
+
+void WebContextMenuProxyQt::showContextMenu(const IntPoint&, const Vector<WebContextMenuItem>&)
+{
+ notImplemented();
+}
+
+void WebContextMenuProxyQt::hideContextMenu()
+{
+ notImplemented();
+}
+
+} // namespace WebKit
diff --git a/WebKit2/UIProcess/qt/WebContextMenuProxyQt.h b/WebKit2/UIProcess/qt/WebContextMenuProxyQt.h
new file mode 100644
index 0000000..f5a496f
--- /dev/null
+++ b/WebKit2/UIProcess/qt/WebContextMenuProxyQt.h
@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2010 Apple Inc. All rights reserved.
+ * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
+ *
+ * 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 WebContextMenuProxyQt_h
+#define WebContextMenuProxyQt_h
+
+#include "WebContextMenuProxy.h"
+
+namespace WebKit {
+
+class WebContextMenuProxyQt : public WebContextMenuProxy {
+public:
+ static PassRefPtr<WebContextMenuProxyQt> create();
+
+private:
+ WebContextMenuProxyQt();
+
+ virtual void showContextMenu(const WebCore::IntPoint&, const Vector<WebContextMenuItem>&);
+ virtual void hideContextMenu();
+};
+
+} // namespace WebKit
+
+#endif // WebContextMenuProxyQt_h
diff --git a/WebKit2/WebKit2.pro b/WebKit2/WebKit2.pro
index 5799cd7..a13256b 100644
--- a/WebKit2/WebKit2.pro
+++ b/WebKit2/WebKit2.pro
@@ -291,6 +291,7 @@ HEADERS += \
UIProcess/WebProcessManager.h \
UIProcess/WebProcessProxy.h \
UIProcess/WebUIClient.h \
+ UIProcess/qt/WebContextMenuProxyQt.h \
UIProcess/qt/WebPopupMenuProxyQt.h \
WebProcess/Downloads/Download.h \
WebProcess/Downloads/DownloadManager.h \
@@ -515,6 +516,7 @@ SOURCES += \
WebProcess/WebProcess.cpp \
UIProcess/qt/ChunkedUpdateDrawingAreaProxyQt.cpp \
UIProcess/qt/WebContextQt.cpp \
+ UIProcess/qt/WebContextMenuProxyQt.cpp \
UIProcess/qt/WebPopupMenuProxyQt.cpp \
WebProcess/qt/WebProcessMainQt.cpp \
WebProcess/qt/WebProcessQt.cpp \
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list