Commit fd7c639f authored by charles.wei@torchmobile.com.cn's avatar charles.wei@torchmobile.com.cn
Browse files

[BlackBerry] Cleanup the CONTEXT_MENUS in BlackBerry porting

https://bugs.webkit.org/show_bug.cgi?id=113562

Reviewed by George Staikos.
Internally reviewed by Mike Fenton and Gen Mak.

.:

* Source/cmake/OptionsBlackBerry.cmake:
* Source/cmake/WebKitFeatures.cmake:
* Source/cmakeconfig.h.cmake:

Source/WebCore:

No new tests, just disable CONTEXT_MENUS for blackberry porting.

* platform/blackberry/ContextMenuBlackBerry.cpp:
* platform/blackberry/ContextMenuItemBlackBerry.cpp:

Source/WebKit/blackberry:

* Api/WebPage.cpp:
(BlackBerry::WebKit::WebPagePrivate::init):
* WebCoreSupport/ContextMenuClientBlackBerry.cpp:
* WebCoreSupport/ContextMenuClientBlackBerry.h:


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@147212 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent e0741c6b
2013-03-29 Charles Wei <charles.wei@torchmobile.com.cn>
[BlackBerry] Cleanup the CONTEXT_MENUS in BlackBerry porting
https://bugs.webkit.org/show_bug.cgi?id=113562
Reviewed by George Staikos.
Internally reviewed by Mike Fenton and Gen Mak.
* Source/cmake/OptionsBlackBerry.cmake:
* Source/cmake/WebKitFeatures.cmake:
* Source/cmakeconfig.h.cmake:
2013-03-28 Zan Dobersek <zdobersek@igalia.com>
[GTK] Build GTK-specific, non-layer-violating source code into WebCore-independent libPlatformGtk.la
......
2013-03-29 Charles Wei <charles.wei@torchmobile.com.cn>
[BlackBerry] Cleanup the CONTEXT_MENUS in BlackBerry porting
https://bugs.webkit.org/show_bug.cgi?id=113562
Reviewed by George Staikos.
Internally reviewed by Mike Fenton and Gen Mak.
No new tests, just disable CONTEXT_MENUS for blackberry porting.
* platform/blackberry/ContextMenuBlackBerry.cpp:
* platform/blackberry/ContextMenuItemBlackBerry.cpp:
2013-03-29 KwangYong Choi <ky0.choi@samsung.com>
 
Fix build warning after r147022
......@@ -19,6 +19,7 @@
#include "config.h"
#include "ContextMenu.h"
#if ENABLE(CONTEXT_MENUS)
#include "NotImplemented.h"
namespace WebCore {
......@@ -50,3 +51,4 @@ unsigned ContextMenu::itemCount() const
}
} // namespace WebCore
#endif
......@@ -19,6 +19,7 @@
#include "config.h"
#include "ContextMenuItem.h"
#if ENABLE(CONTEXT_MENUS)
#include "ContextMenu.h"
#include "NotImplemented.h"
......@@ -73,3 +74,4 @@ String ContextMenuItem::title() const
}
} // namespace WebCore
#endif
......@@ -514,8 +514,8 @@ Page* WebPagePrivate::core(const WebPage* webPage)
void WebPagePrivate::init(const BlackBerry::Platform::String& pageGroupName)
{
ChromeClientBlackBerry* chromeClient = new ChromeClientBlackBerry(this);
ContextMenuClientBlackBerry* contextMenuClient = 0;
#if ENABLE(CONTEXT_MENUS)
ContextMenuClientBlackBerry* contextMenuClient = 0;
contextMenuClient = new ContextMenuClientBlackBerry();
#endif
EditorClientBlackBerry* editorClient = new EditorClientBlackBerry(this);
......@@ -531,7 +531,9 @@ void WebPagePrivate::init(const BlackBerry::Platform::String& pageGroupName)
Page::PageClients pageClients;
pageClients.chromeClient = chromeClient;
#if ENABLE(CONTEXT_MENUS)
pageClients.contextMenuClient = contextMenuClient;
#endif
pageClients.editorClient = editorClient;
pageClients.dragClient = dragClient;
pageClients.inspectorClient = m_inspectorClient;
......
2013-03-29 Charles Wei <charles.wei@torchmobile.com.cn>
[BlackBerry] Cleanup the CONTEXT_MENUS in BlackBerry porting
https://bugs.webkit.org/show_bug.cgi?id=113562
Reviewed by George Staikos.
Internally reviewed by Mike Fenton and Gen Mak.
* Api/WebPage.cpp:
(BlackBerry::WebKit::WebPagePrivate::init):
* WebCoreSupport/ContextMenuClientBlackBerry.cpp:
* WebCoreSupport/ContextMenuClientBlackBerry.h:
2013-03-29 Charles Wei <charles.wei@torchmobile.com.cn>
 
[BlackBerry] Context menu doesn't showup anymore after rebase.
......
......@@ -20,6 +20,7 @@
#include "config.h"
#include "ContextMenuClientBlackBerry.h"
#if ENABLE(CONTEXT_MENUS)
#include "NotImplemented.h"
namespace WebCore {
......@@ -72,3 +73,4 @@ void ContextMenuClientBlackBerry::stopSpeaking()
}
} // namespace WebCore
#endif
......@@ -20,6 +20,8 @@
#ifndef ContextMenuClientBlackBerry_h
#define ContextMenuClientBlackBerry_h
#if ENABLE(CONTEXT_MENUS)
#include "ContextMenuClient.h"
namespace WebCore {
......@@ -39,4 +41,5 @@ public:
} // WebCore
#endif // CONTEXT_MENUS
#endif // ContextMenuClientBlackBerry_h
......@@ -160,6 +160,7 @@ WEBKIT_OPTION_DEFINE(ENABLE_VIEWPORT_REFLOW "Enable viewport reflow" ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_BATTERY_STATUS ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_BLOB ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CONTEXT_MENUS OFF)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_IMAGE_RESOLUTION ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CUSTOM_SCHEME_HANDLER ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DEVICE_ORIENTATION ON)
......
......@@ -21,6 +21,7 @@ macro(WEBKIT_OPTION_BEGIN)
WEBKIT_OPTION_DEFINE(ENABLE_CANVAS_PATH "Toggle Canvas Path support" ON)
WEBKIT_OPTION_DEFINE(ENABLE_CANVAS_PROXY "Toggle CanvasProxy support" OFF)
WEBKIT_OPTION_DEFINE(ENABLE_CHANNEL_MESSAGING "Toggle MessageChannel and MessagePort support" ON)
WEBKIT_OPTION_DEFINE(ENABLE_CONTEXT_MENUS "Toggle Context Menu support" ON)
WEBKIT_OPTION_DEFINE(ENABLE_CSP_NEXT "Toggle Content Security Policy 1.1 support" OFF)
WEBKIT_OPTION_DEFINE(ENABLE_CSS3_CONDITIONAL_RULES "Toggle CSS3 Conditional Rules support" OFF)
WEBKIT_OPTION_DEFINE(ENABLE_CSS3_TEXT "Toggle CSS3 Text support" OFF)
......
......@@ -13,6 +13,7 @@
#cmakedefine01 ENABLE_CANVAS_PROXY
#cmakedefine01 ENABLE_CHANNEL_MESSAGING
#cmakedefine01 ENABLE_CLIENT_BASED_GEOLOCATION
#cmakedefine01 ENABLE_CONTEXT_MENUS
#cmakedefine01 ENABLE_CSP_NEXT
#cmakedefine01 ENABLE_CSS3_TEXT
#cmakedefine01 ENABLE_CSS3_TEXT_LINE_BREAK
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment