Changeset 147212 in webkit


Ignore:
Timestamp:
Mar 29, 2013 6:18:39 AM (11 years ago)
Author:
charles.wei@torchmobile.com.cn
Message:

[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:
Location:
trunk
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • trunk/ChangeLog

    r147137 r147212  
     12013-03-29  Charles Wei  <charles.wei@torchmobile.com.cn>
     2
     3        [BlackBerry] Cleanup the CONTEXT_MENUS in BlackBerry porting
     4        https://bugs.webkit.org/show_bug.cgi?id=113562
     5
     6        Reviewed by George Staikos.
     7        Internally reviewed by Mike Fenton and Gen Mak.
     8
     9        * Source/cmake/OptionsBlackBerry.cmake:
     10        * Source/cmake/WebKitFeatures.cmake:
     11        * Source/cmakeconfig.h.cmake:
     12
    1132013-03-28  Zan Dobersek  <zdobersek@igalia.com>
    214

  • trunk/Source/WebCore/ChangeLog

    r147210 r147212  
     12013-03-29  Charles Wei  <charles.wei@torchmobile.com.cn>
     2
     3        [BlackBerry] Cleanup the CONTEXT_MENUS in BlackBerry porting
     4        https://bugs.webkit.org/show_bug.cgi?id=113562
     5
     6        Reviewed by George Staikos.
     7        Internally reviewed by Mike Fenton and Gen Mak.
     8
     9        No new tests, just disable CONTEXT_MENUS for blackberry porting.
     10
     11        * platform/blackberry/ContextMenuBlackBerry.cpp:
     12        * platform/blackberry/ContextMenuItemBlackBerry.cpp:
     13
    1142013-03-29  KwangYong Choi  <ky0.choi@samsung.com>
    215

  • trunk/Source/WebCore/platform/blackberry/ContextMenuBlackBerry.cpp

    r117494 r147212  
    2020#include "ContextMenu.h"
    2121
     22#if ENABLE(CONTEXT_MENUS)
    2223#include "NotImplemented.h"
    2324
    … …  
    5152
    5253} // namespace WebCore
     54#endif

  • trunk/Source/WebCore/platform/blackberry/ContextMenuItemBlackBerry.cpp

    r102590 r147212  
    2020#include "ContextMenuItem.h"
    2121
     22#if ENABLE(CONTEXT_MENUS)
    2223#include "ContextMenu.h"
    2324#include "NotImplemented.h"
    … …  
    7475
    7576} // namespace WebCore
     77#endif

  • trunk/Source/WebKit/blackberry/Api/WebPage.cpp

    r147211 r147212  
    515515{
    516516    ChromeClientBlackBerry* chromeClient = new ChromeClientBlackBerry(this);
     517#if ENABLE(CONTEXT_MENUS)
    517518    ContextMenuClientBlackBerry* contextMenuClient = 0;
    518 #if ENABLE(CONTEXT_MENUS)
    519519    contextMenuClient = new ContextMenuClientBlackBerry();
    520520#endif
    … …  
    532532    Page::PageClients pageClients;
    533533    pageClients.chromeClient = chromeClient;
     534#if ENABLE(CONTEXT_MENUS)
    534535    pageClients.contextMenuClient = contextMenuClient;
     536#endif
    535537    pageClients.editorClient = editorClient;
    536538    pageClients.dragClient = dragClient;

  • trunk/Source/WebKit/blackberry/ChangeLog

    r147211 r147212  
     12013-03-29  Charles Wei  <charles.wei@torchmobile.com.cn>
     2
     3        [BlackBerry] Cleanup the CONTEXT_MENUS in BlackBerry porting
     4        https://bugs.webkit.org/show_bug.cgi?id=113562
     5
     6        Reviewed by George Staikos.
     7        Internally reviewed by Mike Fenton and Gen Mak.
     8
     9        * Api/WebPage.cpp:
     10        (BlackBerry::WebKit::WebPagePrivate::init):
     11        * WebCoreSupport/ContextMenuClientBlackBerry.cpp:
     12        * WebCoreSupport/ContextMenuClientBlackBerry.h:
     13
    1142013-03-29  Charles Wei  <charles.wei@torchmobile.com.cn>
    215

  • trunk/Source/WebKit/blackberry/WebCoreSupport/ContextMenuClientBlackBerry.cpp

    r103022 r147212  
    2121#include "ContextMenuClientBlackBerry.h"
    2222
     23#if ENABLE(CONTEXT_MENUS)
    2324#include "NotImplemented.h"
    2425
    … …  
    7374
    7475} // namespace WebCore
     76#endif

  • trunk/Source/WebKit/blackberry/WebCoreSupport/ContextMenuClientBlackBerry.h

    r103022 r147212  
    2121#define ContextMenuClientBlackBerry_h
    2222
     23#if ENABLE(CONTEXT_MENUS)
     24
    2325#include "ContextMenuClient.h"
    2426
    … …  
    4042} // WebCore
    4143
     44#endif // CONTEXT_MENUS
    4245#endif // ContextMenuClientBlackBerry_h

  • trunk/Source/cmake/OptionsBlackBerry.cmake

    r145373 r147212  
    161161WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_BATTERY_STATUS ON)
    162162WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_BLOB ON)
     163WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CONTEXT_MENUS OFF)
    163164WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_IMAGE_RESOLUTION ON)
    164165WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CUSTOM_SCHEME_HANDLER ON)

  • trunk/Source/cmake/WebKitFeatures.cmake

    r146847 r147212  
    2222    WEBKIT_OPTION_DEFINE(ENABLE_CANVAS_PROXY "Toggle CanvasProxy support" OFF)
    2323    WEBKIT_OPTION_DEFINE(ENABLE_CHANNEL_MESSAGING "Toggle MessageChannel and MessagePort support" ON)
     24    WEBKIT_OPTION_DEFINE(ENABLE_CONTEXT_MENUS "Toggle Context Menu support" ON)
    2425    WEBKIT_OPTION_DEFINE(ENABLE_CSP_NEXT "Toggle Content Security Policy 1.1 support" OFF)
    2526    WEBKIT_OPTION_DEFINE(ENABLE_CSS3_CONDITIONAL_RULES "Toggle CSS3 Conditional Rules support" OFF)

  • trunk/Source/cmakeconfig.h.cmake

    r146847 r147212  
    1414#cmakedefine01 ENABLE_CHANNEL_MESSAGING
    1515#cmakedefine01 ENABLE_CLIENT_BASED_GEOLOCATION
     16#cmakedefine01 ENABLE_CONTEXT_MENUS
    1617#cmakedefine01 ENABLE_CSP_NEXT
    1718#cmakedefine01 ENABLE_CSS3_TEXT
Note: See TracChangeset for help on using the changeset viewer.