[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
commit-queue at webkit.org
commit-queue at webkit.org
Wed Dec 22 12:50:59 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 023418630b59eac316632b707f38c5568fde73d9
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Aug 31 17:37:41 2010 +0000
2010-08-31 Patrick Gansterer <paroga at paroga.com>
Reviewed by Kenneth Rohde Christiansen.
Add ContextMenuClientWinCE
https://bugs.webkit.org/show_bug.cgi?id=44820
* WebCoreSupport/ContextMenuClientWinCE.cpp: Added.
(WebKit::ContextMenuClient::ContextMenuClient):
(WebKit::ContextMenuClient::contextMenuDestroyed):
(WebKit::ContextMenuClient::getCustomMenuFromDefaultItems):
(WebKit::ContextMenuClient::contextMenuItemSelected):
(WebKit::ContextMenuClient::downloadURL):
(WebKit::ContextMenuClient::copyImageToClipboard):
(WebKit::ContextMenuClient::searchWithGoogle):
(WebKit::ContextMenuClient::lookUpInDictionary):
(WebKit::ContextMenuClient::speak):
(WebKit::ContextMenuClient::stopSpeaking):
(WebKit::ContextMenuClient::isSpeaking):
* WebCoreSupport/ContextMenuClientWinCE.h: Added.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66503 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/wince/ChangeLog b/WebKit/wince/ChangeLog
index 80b9805..e80e75c 100644
--- a/WebKit/wince/ChangeLog
+++ b/WebKit/wince/ChangeLog
@@ -1,3 +1,24 @@
+2010-08-31 Patrick Gansterer <paroga at paroga.com>
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ Add ContextMenuClientWinCE
+ https://bugs.webkit.org/show_bug.cgi?id=44820
+
+ * WebCoreSupport/ContextMenuClientWinCE.cpp: Added.
+ (WebKit::ContextMenuClient::ContextMenuClient):
+ (WebKit::ContextMenuClient::contextMenuDestroyed):
+ (WebKit::ContextMenuClient::getCustomMenuFromDefaultItems):
+ (WebKit::ContextMenuClient::contextMenuItemSelected):
+ (WebKit::ContextMenuClient::downloadURL):
+ (WebKit::ContextMenuClient::copyImageToClipboard):
+ (WebKit::ContextMenuClient::searchWithGoogle):
+ (WebKit::ContextMenuClient::lookUpInDictionary):
+ (WebKit::ContextMenuClient::speak):
+ (WebKit::ContextMenuClient::stopSpeaking):
+ (WebKit::ContextMenuClient::isSpeaking):
+ * WebCoreSupport/ContextMenuClientWinCE.h: Added.
+
2010-08-28 Patrick Gansterer <paroga at paroga.com>
Reviewed by Adam Roben.
diff --git a/WebKit/wince/WebCoreSupport/ContextMenuClientWinCE.cpp b/WebKit/wince/WebCoreSupport/ContextMenuClientWinCE.cpp
new file mode 100644
index 0000000..011c2ea
--- /dev/null
+++ b/WebKit/wince/WebCoreSupport/ContextMenuClientWinCE.cpp
@@ -0,0 +1,91 @@
+/*
+ * Copyright (C) 2010 Patrick Gansterer <paroga at paroga.com>
+ *
+ * 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 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 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 "config.h"
+#include "ContextMenuClientWinCE.h"
+
+#include "ContextMenu.h"
+#include "NotImplemented.h"
+
+using namespace WebCore;
+
+namespace WebKit {
+
+ContextMenuClient::ContextMenuClient(WebView *webView)
+ : m_webView(webView)
+{
+}
+
+void ContextMenuClient::contextMenuDestroyed()
+{
+ delete this;
+}
+
+PlatformMenuDescription ContextMenuClient::getCustomMenuFromDefaultItems(ContextMenu* menu)
+{
+ return menu->releasePlatformDescription();
+}
+
+void ContextMenuClient::contextMenuItemSelected(ContextMenuItem*, const ContextMenu*)
+{
+ notImplemented();
+}
+
+void ContextMenuClient::downloadURL(const KURL& url)
+{
+ notImplemented();
+}
+
+void ContextMenuClient::copyImageToClipboard(const HitTestResult&)
+{
+ notImplemented();
+}
+
+void ContextMenuClient::searchWithGoogle(const Frame*)
+{
+ notImplemented();
+}
+
+void ContextMenuClient::lookUpInDictionary(Frame*)
+{
+ notImplemented();
+}
+
+void ContextMenuClient::speak(const String&)
+{
+ notImplemented();
+}
+
+void ContextMenuClient::stopSpeaking()
+{
+ notImplemented();
+}
+
+bool ContextMenuClient::isSpeaking()
+{
+ notImplemented();
+ return false;
+}
+
+} // namespace WebKit
diff --git a/WebKit/wince/WebCoreSupport/ContextMenuClientWinCE.h b/WebKit/wince/WebCoreSupport/ContextMenuClientWinCE.h
new file mode 100644
index 0000000..3d51f3c
--- /dev/null
+++ b/WebKit/wince/WebCoreSupport/ContextMenuClientWinCE.h
@@ -0,0 +1,57 @@
+/*
+ * Copyright (C) 2010 Patrick Gansterer <paroga at paroga.com>
+ *
+ * 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 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 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 ContextMenuClientWinCE_h
+#define ContextMenuClientWinCE_h
+
+#include "ContextMenuClient.h"
+
+class WebView;
+
+namespace WebKit {
+
+class ContextMenuClient : public WebCore::ContextMenuClient {
+public:
+ ContextMenuClient(WebView*);
+
+ virtual void contextMenuDestroyed();
+
+ virtual WebCore::PlatformMenuDescription getCustomMenuFromDefaultItems(WebCore::ContextMenu*);
+ virtual void contextMenuItemSelected(WebCore::ContextMenuItem*, const WebCore::ContextMenu*);
+
+ virtual void downloadURL(const WebCore::KURL&);
+ virtual void copyImageToClipboard(const WebCore::HitTestResult&);
+ virtual void searchWithGoogle(const WebCore::Frame*);
+ virtual void lookUpInDictionary(WebCore::Frame*);
+ virtual void speak(const WTF::String&);
+ virtual void stopSpeaking();
+ virtual bool isSpeaking();
+
+private:
+ WebView* m_webView;
+};
+
+} // namespace WebKit
+
+#endif // ContextMenuClientWinCE_h
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list