Diff
Modified: trunk/Source/WebCore/ChangeLog (151602 => 151603)
--- trunk/Source/WebCore/ChangeLog 2013-06-14 19:37:09 UTC (rev 151602)
+++ trunk/Source/WebCore/ChangeLog 2013-06-14 20:02:46 UTC (rev 151603)
@@ -1,3 +1,17 @@
+2013-06-14 Alberto Garcia <[email protected]>
+
+ [BlackBerry] Remove implementation of ContextMenu classes
+ https://bugs.webkit.org/show_bug.cgi?id=114860
+
+ Reviewed by Rob Buis.
+
+ This code is not being used so we can safely remove it.
+
+ * PlatformBlackBerry.cmake:
+ * platform/blackberry/ContextMenuBlackBerry.cpp: Removed.
+ * platform/blackberry/ContextMenuItemBlackBerry.cpp: Removed.
+ * platform/blackberry/LocalizedStringsBlackBerry.cpp:
+
2013-06-14 Brent Fulgham <[email protected]>
[Windows] Provide simple <meter> drawing logic for testing.
Modified: trunk/Source/WebCore/PlatformBlackBerry.cmake (151602 => 151603)
--- trunk/Source/WebCore/PlatformBlackBerry.cmake 2013-06-14 19:37:09 UTC (rev 151602)
+++ trunk/Source/WebCore/PlatformBlackBerry.cmake 2013-06-14 20:02:46 UTC (rev 151603)
@@ -93,8 +93,6 @@
page/blackberry/DragControllerBlackBerry.cpp
page/blackberry/EventHandlerBlackBerry.cpp
page/blackberry/SettingsBlackBerry.cpp
- platform/blackberry/ContextMenuBlackBerry.cpp
- platform/blackberry/ContextMenuItemBlackBerry.cpp
platform/blackberry/CursorBlackBerry.cpp
platform/blackberry/DragDataBlackBerry.cpp
platform/blackberry/DragImageBlackBerry.cpp
Deleted: trunk/Source/WebCore/platform/blackberry/ContextMenuBlackBerry.cpp (151602 => 151603)
--- trunk/Source/WebCore/platform/blackberry/ContextMenuBlackBerry.cpp 2013-06-14 19:37:09 UTC (rev 151602)
+++ trunk/Source/WebCore/platform/blackberry/ContextMenuBlackBerry.cpp 2013-06-14 20:02:46 UTC (rev 151603)
@@ -1,54 +0,0 @@
-/*
- * Copyright (C) 2009 Research In Motion Limited. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#include "config.h"
-#include "ContextMenu.h"
-
-#if ENABLE(CONTEXT_MENUS)
-#include "NotImplemented.h"
-
-namespace WebCore {
-
-ContextMenu::ContextMenu()
-{
- notImplemented();
-}
-
-ContextMenu::~ContextMenu()
-{
- notImplemented();
-}
-
-void ContextMenu::appendItem(ContextMenuItem&)
-{
- notImplemented();
-}
-
-void ContextMenu::setPlatformDescription(void*)
-{
- notImplemented();
-}
-
-unsigned ContextMenu::itemCount() const
-{
- notImplemented();
- return 0;
-}
-
-} // namespace WebCore
-#endif
Deleted: trunk/Source/WebCore/platform/blackberry/ContextMenuItemBlackBerry.cpp (151602 => 151603)
--- trunk/Source/WebCore/platform/blackberry/ContextMenuItemBlackBerry.cpp 2013-06-14 19:37:09 UTC (rev 151602)
+++ trunk/Source/WebCore/platform/blackberry/ContextMenuItemBlackBerry.cpp 2013-06-14 20:02:46 UTC (rev 151603)
@@ -1,77 +0,0 @@
-/*
- * Copyright (C) 2009 Research In Motion Limited. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#include "config.h"
-#include "ContextMenuItem.h"
-
-#if ENABLE(CONTEXT_MENUS)
-#include "ContextMenu.h"
-#include "NotImplemented.h"
-
-namespace WebCore {
-
-ContextMenuItem::ContextMenuItem(ContextMenuItemType, ContextMenuAction, String const&, ContextMenu*)
-{
- notImplemented();
-}
-
-ContextMenuItem::~ContextMenuItem()
-{
- notImplemented();
-}
-
-void ContextMenuItem::setChecked(bool)
-{
- notImplemented();
-}
-
-void ContextMenuItem::setEnabled(bool)
-{
- notImplemented();
-}
-
-void ContextMenuItem::setSubMenu(ContextMenu*)
-{
- notImplemented();
-}
-
-void ContextMenuItem::setTitle(String const&)
-{
- notImplemented();
-}
-
-ContextMenuAction ContextMenuItem::action() const
-{
- notImplemented();
- return ContextMenuItemTagNoAction;
-}
-
-ContextMenuItemType ContextMenuItem::type() const
-{
- notImplemented();
- return ActionType;
-}
-
-String ContextMenuItem::title() const
-{
- notImplemented();
- return String();
-}
-
-} // namespace WebCore
-#endif
Modified: trunk/Source/WebCore/platform/blackberry/LocalizedStringsBlackBerry.cpp (151602 => 151603)
--- trunk/Source/WebCore/platform/blackberry/LocalizedStringsBlackBerry.cpp 2013-06-14 19:37:09 UTC (rev 151602)
+++ trunk/Source/WebCore/platform/blackberry/LocalizedStringsBlackBerry.cpp 2013-06-14 20:02:46 UTC (rev 151603)
@@ -81,273 +81,6 @@
return userPreferredLanguages;
}
-#if ENABLE(CONTEXT_MENUS)
-String contextMenuItemTagBold()
-{
- notImplemented();
- return String();
-}
-
-String contextMenuItemTagCheckGrammarWithSpelling()
-{
- notImplemented();
- return String();
-}
-
-String contextMenuItemTagCheckSpelling()
-{
- notImplemented();
- return String();
-}
-
-String contextMenuItemTagCheckSpellingWhileTyping()
-{
- notImplemented();
- return String();
-}
-
-String contextMenuItemTagCopyImageToClipboard()
-{
- notImplemented();
- return String();
-}
-
-String contextMenuItemTagCopyLinkToClipboard()
-{
- notImplemented();
- return String();
-}
-
-String contextMenuItemTagDefaultDirection()
-{
- notImplemented();
- return String();
-}
-
-String contextMenuItemTagDownloadImageToDisk()
-{
- notImplemented();
- return String();
-}
-
-String contextMenuItemTagDownloadLinkToDisk()
-{
- notImplemented();
- return String();
-}
-
-String contextMenuItemTagFontMenu()
-{
- notImplemented();
- return String();
-}
-
-String contextMenuItemTagIgnoreGrammar()
-{
- notImplemented();
- return String();
-}
-
-String contextMenuItemTagIgnoreSpelling()
-{
- notImplemented();
- return String();
-}
-
-String contextMenuItemTagInspectElement()
-{
- notImplemented();
- return String();
-}
-
-String contextMenuItemTagItalic()
-{
- notImplemented();
- return String();
-}
-
-String contextMenuItemTagLearnSpelling()
-{
- notImplemented();
- return String();
-}
-
-String contextMenuItemTagLeftToRight()
-{
- notImplemented();
- return String();
-}
-
-String contextMenuItemTagNoGuessesFound()
-{
- notImplemented();
- return String();
-}
-
-String contextMenuItemTagOpenFrameInNewWindow()
-{
- notImplemented();
- return String();
-}
-
-String contextMenuItemTagOpenImageInNewWindow()
-{
- notImplemented();
- return String();
-}
-
-String contextMenuItemTagOpenLinkInNewWindow()
-{
- notImplemented();
- return String();
-}
-
-String contextMenuItemTagOpenLink()
-{
- notImplemented();
- return String();
-}
-
-String contextMenuItemTagOutline()
-{
- notImplemented();
- return String();
-}
-
-String contextMenuItemTagReload()
-{
- notImplemented();
- return String();
-}
-
-String contextMenuItemTagRightToLeft()
-{
- notImplemented();
- return String();
-}
-
-String contextMenuItemTagSearchWeb()
-{
- notImplemented();
- return String();
-}
-
-String contextMenuItemTagShowSpellingPanel(bool)
-{
- notImplemented();
- return String();
-}
-
-String contextMenuItemTagSpellingMenu()
-{
- notImplemented();
- return String();
-}
-
-String contextMenuItemTagTextDirectionMenu()
-{
- notImplemented();
- return String();
-}
-
-String contextMenuItemTagUnderline()
-{
- notImplemented();
- return String();
-}
-
-String contextMenuItemTagWritingDirectionMenu()
-{
- notImplemented();
- return String();
-}
-
-String contextMenuItemTagCopyVideoLinkToClipboard()
-{
- notImplemented();
- return String();
-}
-
-String contextMenuItemTagOpenVideoInNewWindow()
-{
- notImplemented();
- return String();
-}
-
-String contextMenuItemTagToggleMediaControls()
-{
- return String::fromUTF8(s_resource.getString(BlackBerry::Platform::CONTEXT_MEDIA_TOGGLE_CONTROLS));
-}
-
-String contextMenuItemTagToggleMediaLoop()
-{
- return String::fromUTF8(s_resource.getString(BlackBerry::Platform::CONTEXT_MEDIA_TOGGLE_LOOP));
-}
-
-String contextMenuItemTagEnterVideoFullscreen()
-{
- return String::fromUTF8(s_resource.getString(BlackBerry::Platform::CONTEXT_VIDEO_FULLSCREEN));
-}
-
-String contextMenuItemTagMediaPlay()
-{
- return String::fromUTF8(s_resource.getString(BlackBerry::Platform::CONTEXT_MEDIA_PLAY));
-}
-
-String contextMenuItemTagMediaPause()
-{
- return String::fromUTF8(s_resource.getString(BlackBerry::Platform::CONTEXT_MEDIA_PAUSE));
-}
-
-String contextMenuItemTagMediaMute()
-{
- return String::fromUTF8(s_resource.getString(BlackBerry::Platform::CONTEXT_MEDIA_MUTE));
-}
-
-String contextMenuItemTagCopyAudioLinkToClipboard()
-{
- notImplemented();
- return String();
-}
-
-String contextMenuItemTagOpenAudioInNewWindow()
-{
- notImplemented();
- return String();
-}
-
-String contextMenuItemTagGoBack()
-{
- return String::fromUTF8(s_resource.getString(BlackBerry::Platform::CONTEXT_GOBACK));
-}
-
-String contextMenuItemTagGoForward()
-{
- return String::fromUTF8(s_resource.getString(BlackBerry::Platform::CONTEXT_GOFORWARD));
-}
-
-String contextMenuItemTagStop()
-{
- return String::fromUTF8(s_resource.getString(BlackBerry::Platform::CONTEXT_STOP));
-}
-
-String contextMenuItemTagCopy()
-{
- return String::fromUTF8(s_resource.getString(BlackBerry::Platform::CONTEXT_COPY));
-}
-
-String contextMenuItemTagCut()
-{
- return String::fromUTF8(s_resource.getString(BlackBerry::Platform::CONTEXT_CUT));
-}
-
-String contextMenuItemTagPaste()
-{
- return String::fromUTF8(s_resource.getString(BlackBerry::Platform::CONTEXT_PASTE));
-}
-
-#endif
-
String searchableIndexIntroduction()
{
return String::fromUTF8(s_resource.getString(BlackBerry::Platform::SEARCHABLE_INDEX_INTRODUCTION));
Modified: trunk/Source/WebKit/ChangeLog (151602 => 151603)
--- trunk/Source/WebKit/ChangeLog 2013-06-14 19:37:09 UTC (rev 151602)
+++ trunk/Source/WebKit/ChangeLog 2013-06-14 20:02:46 UTC (rev 151603)
@@ -1,3 +1,14 @@
+2013-06-14 Alberto Garcia <[email protected]>
+
+ [BlackBerry] Remove implementation of ContextMenu classes
+ https://bugs.webkit.org/show_bug.cgi?id=114860
+
+ Reviewed by Rob Buis.
+
+ This code is not being used so we can safely remove it.
+
+ * PlatformBlackBerry.cmake:
+
2013-06-13 Christophe Dumez <[email protected]>
Unreviewed build fix after rr151563.
Modified: trunk/Source/WebKit/PlatformBlackBerry.cmake (151602 => 151603)
--- trunk/Source/WebKit/PlatformBlackBerry.cmake 2013-06-14 19:37:09 UTC (rev 151602)
+++ trunk/Source/WebKit/PlatformBlackBerry.cmake 2013-06-14 20:02:46 UTC (rev 151603)
@@ -86,7 +86,6 @@
blackberry/WebCoreSupport/BackForwardListBlackBerry.cpp
blackberry/WebCoreSupport/CacheClientBlackBerry.cpp
blackberry/WebCoreSupport/ChromeClientBlackBerry.cpp
- blackberry/WebCoreSupport/ContextMenuClientBlackBerry.cpp
blackberry/WebCoreSupport/CredentialManager.cpp
blackberry/WebCoreSupport/CredentialTransformData.cpp
blackberry/WebCoreSupport/DeviceMotionClientBlackBerry.cpp
Modified: trunk/Source/WebKit/blackberry/Api/WebPage.cpp (151602 => 151603)
--- trunk/Source/WebKit/blackberry/Api/WebPage.cpp 2013-06-14 19:37:09 UTC (rev 151602)
+++ trunk/Source/WebKit/blackberry/Api/WebPage.cpp 2013-06-14 20:02:46 UTC (rev 151603)
@@ -33,7 +33,6 @@
#include "CachedImage.h"
#include "Chrome.h"
#include "ChromeClientBlackBerry.h"
-#include "ContextMenuClientBlackBerry.h"
#include "CookieManager.h"
#include "CredentialManager.h"
#include "CredentialStorage.h"
@@ -520,10 +519,6 @@
m_webSettings->setUserAgentString(defaultUserAgent());
ChromeClientBlackBerry* chromeClient = new ChromeClientBlackBerry(this);
-#if ENABLE(CONTEXT_MENUS)
- ContextMenuClientBlackBerry* contextMenuClient = 0;
- contextMenuClient = new ContextMenuClientBlackBerry();
-#endif
EditorClientBlackBerry* editorClient = new EditorClientBlackBerry(this);
DragClientBlackBerry* dragClient = 0;
#if ENABLE(DRAG_SUPPORT)
@@ -537,9 +532,6 @@
Page::PageClients pageClients;
pageClients.chromeClient = chromeClient;
-#if ENABLE(CONTEXT_MENUS)
- pageClients.contextMenuClient = contextMenuClient;
-#endif
pageClients.editorClient = editorClient;
pageClients.dragClient = dragClient;
pageClients.inspectorClient = m_inspectorClient;
Modified: trunk/Source/WebKit/blackberry/ChangeLog (151602 => 151603)
--- trunk/Source/WebKit/blackberry/ChangeLog 2013-06-14 19:37:09 UTC (rev 151602)
+++ trunk/Source/WebKit/blackberry/ChangeLog 2013-06-14 20:02:46 UTC (rev 151603)
@@ -1,3 +1,17 @@
+2013-06-14 Alberto Garcia <[email protected]>
+
+ [BlackBerry] Remove implementation of ContextMenu classes
+ https://bugs.webkit.org/show_bug.cgi?id=114860
+
+ Reviewed by Rob Buis.
+
+ This code is not being used so we can safely remove it.
+
+ * Api/WebPage.cpp:
+ (BlackBerry::WebKit::WebPagePrivate::init):
+ * WebCoreSupport/ContextMenuClientBlackBerry.cpp: Removed.
+ * WebCoreSupport/ContextMenuClientBlackBerry.h: Removed.
+
2013-06-14 Arvid Nilsson <[email protected]>
[BlackBerry] LayerTiler fails to tile really big layers
Deleted: trunk/Source/WebKit/blackberry/WebCoreSupport/ContextMenuClientBlackBerry.cpp (151602 => 151603)
--- trunk/Source/WebKit/blackberry/WebCoreSupport/ContextMenuClientBlackBerry.cpp 2013-06-14 19:37:09 UTC (rev 151602)
+++ trunk/Source/WebKit/blackberry/WebCoreSupport/ContextMenuClientBlackBerry.cpp 2013-06-14 20:02:46 UTC (rev 151603)
@@ -1,76 +0,0 @@
-/*
- * Copyright (C) 2009 Torch Mobile Inc. http://www.torchmobile.com/
- * Copyright (C) 2011 Research In Motion Limited. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#include "config.h"
-#include "ContextMenuClientBlackBerry.h"
-
-#if ENABLE(CONTEXT_MENUS)
-#include "NotImplemented.h"
-
-namespace WebCore {
-
-void ContextMenuClientBlackBerry::contextMenuDestroyed()
-{
- delete this;
-}
-
-void* ContextMenuClientBlackBerry::getCustomMenuFromDefaultItems(ContextMenu*)
-{
- notImplemented();
- return 0;
-}
-
-void ContextMenuClientBlackBerry::contextMenuItemSelected(ContextMenuItem*, const ContextMenu*)
-{
- notImplemented();
-}
-
-void ContextMenuClientBlackBerry::downloadURL(const KURL&)
-{
- notImplemented();
-}
-
-void ContextMenuClientBlackBerry::searchWithGoogle(const Frame*)
-{
- notImplemented();
-}
-
-void ContextMenuClientBlackBerry::lookUpInDictionary(Frame*)
-{
- notImplemented();
-}
-
-bool ContextMenuClientBlackBerry::isSpeaking()
-{
- notImplemented();
- return false;
-}
-
-void ContextMenuClientBlackBerry::speak(const String&)
-{
- notImplemented();
-}
-
-void ContextMenuClientBlackBerry::stopSpeaking()
-{
- notImplemented();
-}
-
-} // namespace WebCore
-#endif
Deleted: trunk/Source/WebKit/blackberry/WebCoreSupport/ContextMenuClientBlackBerry.h (151602 => 151603)
--- trunk/Source/WebKit/blackberry/WebCoreSupport/ContextMenuClientBlackBerry.h 2013-06-14 19:37:09 UTC (rev 151602)
+++ trunk/Source/WebKit/blackberry/WebCoreSupport/ContextMenuClientBlackBerry.h 2013-06-14 20:02:46 UTC (rev 151603)
@@ -1,45 +0,0 @@
-/*
- * Copyright (C) 2009 Torch Mobile Inc. http://www.torchmobile.com/
- * Copyright (C) 2011 Research In Motion Limited. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef ContextMenuClientBlackBerry_h
-#define ContextMenuClientBlackBerry_h
-
-#if ENABLE(CONTEXT_MENUS)
-
-#include "ContextMenuClient.h"
-
-namespace WebCore {
-
-class ContextMenuClientBlackBerry : public ContextMenuClient {
-public:
- virtual void contextMenuDestroyed();
- virtual void* getCustomMenuFromDefaultItems(ContextMenu*);
- virtual void contextMenuItemSelected(ContextMenuItem*, const ContextMenu*);
- virtual void downloadURL(const KURL&);
- virtual void searchWithGoogle(const Frame*);
- virtual void lookUpInDictionary(Frame*);
- virtual bool isSpeaking();
- virtual void speak(const String&);
- virtual void stopSpeaking();
-};
-
-} // WebCore
-
-#endif // CONTEXT_MENUS
-#endif // ContextMenuClientBlackBerry_h