Changeset 163367 in webkit


Ignore:
Timestamp:
Feb 4, 2014 12:20:15 AM (10 years ago)
Author:
jinwoo7.song@samsung.com
Message:

[EFL][WK2] Stop using COMPILE_ASSERT_MATCHING_ENUM macros in EFL WebKit2
​https://bugs.webkit.org/show_bug.cgi?id=128156

Reviewed by Anders Carlsson.

  • UIProcess/API/efl/EwkView.cpp:

(EwkView::requestPopupMenu):

  • UIProcess/API/efl/ewk_context.cpp:

(toWKCacheModel):
(EwkContext::setCacheModel):

  • UIProcess/API/efl/ewk_cookie_manager.cpp:

(ewk_cookie_manager_persistent_storage_set):
(ewk_cookie_manager_accept_policy_set):

  • UIProcess/API/efl/ewk_navigation_policy_decision.cpp:

(toEwkNavigationType):
(toEventMouseButton):
(toEventModifierKeys):
(EwkNavigationPolicyDecision::EwkNavigationPolicyDecision):
(EwkNavigationPolicyDecision::navigationType):
(EwkNavigationPolicyDecision::mouseButton):
(EwkNavigationPolicyDecision::modifiers):
(ewk_navigation_policy_decision_download):

  • UIProcess/API/efl/ewk_navigation_policy_decision_private.h:

(EwkNavigationPolicyDecision::create):

  • UIProcess/API/efl/ewk_popup_menu_item.cpp:

(EwkPopupMenuItem::type):
(EwkPopupMenuItem::textDirection):

  • UIProcess/API/efl/ewk_private.h:
  • UIProcess/API/efl/ewk_view.cpp:

(toWKFindOptions):
(ewk_view_text_find):
(toWKPaginationMode):
(toEwkPaginationMode):
(ewk_view_pagination_mode_set):
(ewk_view_pagination_mode_get):

Location:
trunk/Source/WebKit2
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit2/ChangeLog

    r163365 r163367  
     12014-02-04  Jinwoo Song  <jinwoo7.song@samsung.com>
     2
     3        [EFL][WK2] Stop using COMPILE_ASSERT_MATCHING_ENUM macros in EFL WebKit2
     4        https://bugs.webkit.org/show_bug.cgi?id=128156
     5
     6        Reviewed by Anders Carlsson.
     7
     8        * UIProcess/API/efl/EwkView.cpp:
     9        (EwkView::requestPopupMenu):
     10        * UIProcess/API/efl/ewk_context.cpp:
     11        (toWKCacheModel):
     12        (EwkContext::setCacheModel):
     13        * UIProcess/API/efl/ewk_cookie_manager.cpp:
     14        (ewk_cookie_manager_persistent_storage_set):
     15        (ewk_cookie_manager_accept_policy_set):
     16        * UIProcess/API/efl/ewk_navigation_policy_decision.cpp:
     17        (toEwkNavigationType):
     18        (toEventMouseButton):
     19        (toEventModifierKeys):
     20        (EwkNavigationPolicyDecision::EwkNavigationPolicyDecision):
     21        (EwkNavigationPolicyDecision::navigationType):
     22        (EwkNavigationPolicyDecision::mouseButton):
     23        (EwkNavigationPolicyDecision::modifiers):
     24        (ewk_navigation_policy_decision_download):
     25        * UIProcess/API/efl/ewk_navigation_policy_decision_private.h:
     26        (EwkNavigationPolicyDecision::create):
     27        * UIProcess/API/efl/ewk_popup_menu_item.cpp:
     28        (EwkPopupMenuItem::type):
     29        (EwkPopupMenuItem::textDirection):
     30        * UIProcess/API/efl/ewk_private.h:
     31        * UIProcess/API/efl/ewk_view.cpp:
     32        (toWKFindOptions):
     33        (ewk_view_text_find):
     34        (toWKPaginationMode):
     35        (toEwkPaginationMode):
     36        (ewk_view_pagination_mode_set):
     37        (ewk_view_pagination_mode_get):
     38
    1392014-02-03  Brady Eidson  <beidson@apple.com>
    240

  • trunk/Source/WebKit2/UIProcess/API/efl/EwkView.cpp

    r163079 r163367  
    877877#endif
    878878
    879 COMPILE_ASSERT_MATCHING_ENUM(EWK_TEXT_DIRECTION_RIGHT_TO_LEFT, RTL);
    880 COMPILE_ASSERT_MATCHING_ENUM(EWK_TEXT_DIRECTION_LEFT_TO_RIGHT, LTR);
    881 
    882879void EwkView::customContextMenuItemSelected(WKContextMenuItemRef contextMenuItem)
    883880{
    … …  
    925922}
    926923
    927 COMPILE_ASSERT_MATCHING_ENUM(EWK_TEXT_DIRECTION_RIGHT_TO_LEFT, kWKPopupItemTextDirectionRTL);
    928 COMPILE_ASSERT_MATCHING_ENUM(EWK_TEXT_DIRECTION_LEFT_TO_RIGHT, kWKPopupItemTextDirectionLTR);
    929 
    930924void EwkView::requestPopupMenu(WKPopupMenuListenerRef popupMenuListener, const WKRect& rect, WKPopupItemTextDirection textDirection, double pageScaleFactor, WKArrayRef items, int32_t selectedIndex)
    931925{
    … …  
    948942    EINA_RECTANGLE_SET(&einaRect, popupMenuPosition.x, popupMenuPosition.y, rect.size.width, rect.size.height);
    949943
    950     sd->api->popup_menu_show(sd, einaRect, static_cast<Ewk_Text_Direction>(textDirection), pageScaleFactor, m_popupMenu.get());
     944    switch (textDirection) {
     945    case kWKPopupItemTextDirectionRTL:
     946        sd->api->popup_menu_show(sd, einaRect, EWK_TEXT_DIRECTION_RIGHT_TO_LEFT, pageScaleFactor, m_popupMenu.get());
     947        break;
     948    case EWK_TEXT_DIRECTION_LEFT_TO_RIGHT:
     949        sd->api->popup_menu_show(sd, einaRect, EWK_TEXT_DIRECTION_LEFT_TO_RIGHT, pageScaleFactor, m_popupMenu.get());
     950        break;
     951    }
    951952}
    952953

  • trunk/Source/WebKit2/UIProcess/API/efl/ewk_context.cpp

    r161915 r163367  
    199199}
    200200
     201// Ewk_Cache_Model enum validation
     202inline WKCacheModel toWKCacheModel(Ewk_Cache_Model cacheModel)
     203{
     204    switch (cacheModel) {
     205    case EWK_CACHE_MODEL_DOCUMENT_VIEWER:
     206        return kWKCacheModelDocumentViewer;
     207    case EWK_CACHE_MODEL_DOCUMENT_BROWSER:
     208        return kWKCacheModelDocumentBrowser;
     209    case EWK_CACHE_MODEL_PRIMARY_WEBBROWSER:
     210        return kWKCacheModelPrimaryWebBrowser;
     211    }
     212    ASSERT_NOT_REACHED();
     213
     214    return kWKCacheModelDocumentViewer;
     215}
     216
    201217void EwkContext::setCacheModel(Ewk_Cache_Model cacheModel)
    202218{
    203     WKContextSetCacheModel(m_context.get(), static_cast<WebKit::CacheModel>(cacheModel));
     219    WKContextSetCacheModel(m_context.get(), toWKCacheModel(cacheModel));
    204220}
    205221
    … …  
    318334    impl->addVisitedLink(visitedURL);
    319335}
    320 
    321 // Ewk_Cache_Model enum validation
    322 COMPILE_ASSERT_MATCHING_ENUM(EWK_CACHE_MODEL_DOCUMENT_VIEWER, kWKCacheModelDocumentViewer);
    323 COMPILE_ASSERT_MATCHING_ENUM(EWK_CACHE_MODEL_DOCUMENT_BROWSER, kWKCacheModelDocumentBrowser);
    324 COMPILE_ASSERT_MATCHING_ENUM(EWK_CACHE_MODEL_PRIMARY_WEBBROWSER, kWKCacheModelPrimaryWebBrowser);
    325336
    326337Eina_Bool ewk_context_cache_model_set(Ewk_Context* ewkContext, Ewk_Cache_Model cacheModel)

  • trunk/Source/WebKit2/UIProcess/API/efl/ewk_cookie_manager.cpp

    r160107 r163367  
    3434#include "ewk_error_private.h"
    3535#include "ewk_private.h"
     36#include <wtf/Assertions.h>
    3637#include <wtf/OwnPtr.h>
    3738
    … …  
    121122}
    122123
    123 // Ewk_Cookie_Persistent_Storage enum validation.
    124 COMPILE_ASSERT_MATCHING_ENUM(EWK_COOKIE_PERSISTENT_STORAGE_TEXT, kWKCookieStorageTypeText);
    125 COMPILE_ASSERT_MATCHING_ENUM(EWK_COOKIE_PERSISTENT_STORAGE_SQLITE, kWKCookieStorageTypeSQLite);
    126 
    127124void ewk_cookie_manager_persistent_storage_set(Ewk_Cookie_Manager* manager, const char* filename, Ewk_Cookie_Persistent_Storage storage)
    128125{
    … …  
    130127    EINA_SAFETY_ON_NULL_RETURN(filename);
    131128
    132     manager->setPersistentStorage(filename, static_cast<WKCookieStorageType>(storage));
    133 }
    134 
    135 // Ewk_Cookie_Accept_Policy enum validation.
    136 COMPILE_ASSERT_MATCHING_ENUM(EWK_COOKIE_ACCEPT_POLICY_ALWAYS, kWKHTTPCookieAcceptPolicyAlways);
    137 COMPILE_ASSERT_MATCHING_ENUM(EWK_COOKIE_ACCEPT_POLICY_NEVER, kWKHTTPCookieAcceptPolicyNever);
    138 COMPILE_ASSERT_MATCHING_ENUM(EWK_COOKIE_ACCEPT_POLICY_NO_THIRD_PARTY, kWKHTTPCookieAcceptPolicyOnlyFromMainDocumentDomain);
     129    WKCookieStorageType wkCookieStorageType = kWKCookieStorageTypeText;
     130
     131    switch (storage) {
     132    case EWK_COOKIE_PERSISTENT_STORAGE_TEXT:
     133        wkCookieStorageType = kWKCookieStorageTypeText;
     134        break;
     135    case EWK_COOKIE_PERSISTENT_STORAGE_SQLITE:
     136        wkCookieStorageType = kWKCookieStorageTypeSQLite;
     137        break;
     138    default:
     139        ASSERT_NOT_REACHED();
     140    }
     141
     142    manager->setPersistentStorage(filename, wkCookieStorageType);
     143}
    139144
    140145void ewk_cookie_manager_accept_policy_set(Ewk_Cookie_Manager* manager, Ewk_Cookie_Accept_Policy policy)
    … …  
    142147    EINA_SAFETY_ON_NULL_RETURN(manager);
    143148
    144     manager->setHTTPAcceptPolicy(static_cast<WKHTTPCookieAcceptPolicy>(policy));
     149    WKHTTPCookieAcceptPolicy wkPolicy = kWKHTTPCookieAcceptPolicyAlways;
     150
     151    switch (policy) {
     152    case EWK_COOKIE_ACCEPT_POLICY_ALWAYS:
     153        wkPolicy = kWKHTTPCookieAcceptPolicyAlways;
     154        break;
     155    case EWK_COOKIE_ACCEPT_POLICY_NEVER:
     156        wkPolicy = kWKHTTPCookieAcceptPolicyNever;
     157        break;
     158    case EWK_COOKIE_ACCEPT_POLICY_NO_THIRD_PARTY:
     159        wkPolicy = kWKHTTPCookieAcceptPolicyOnlyFromMainDocumentDomain;
     160        break;
     161    default:
     162        ASSERT_NOT_REACHED();
     163    }
     164
     165    manager->setHTTPAcceptPolicy(wkPolicy);
    145166}
    146167

  • trunk/Source/WebKit2/UIProcess/API/efl/ewk_navigation_policy_decision.cpp

    r161758 r163367  
    3333using namespace WebKit;
    3434
    35 EwkNavigationPolicyDecision::EwkNavigationPolicyDecision(WKFramePolicyListenerRef listener, Ewk_Navigation_Type navigationType, Event_Mouse_Button mouseButton, Event_Modifier_Keys modifiers, PassRefPtr<EwkUrlRequest> request, const char* frameName)
     35inline static Ewk_Navigation_Type toEwkNavigationType(WKFrameNavigationType navigationType)
     36{
     37    switch (navigationType) {
     38    case kWKFrameNavigationTypeLinkClicked:
     39        return EWK_NAVIGATION_TYPE_LINK_ACTIVATED;
     40    case kWKFrameNavigationTypeFormSubmitted:
     41        return EWK_NAVIGATION_TYPE_FORM_SUBMITTED;
     42    case kWKFrameNavigationTypeBackForward:
     43        return EWK_NAVIGATION_TYPE_BACK_FORWARD;
     44    case kWKFrameNavigationTypeReload:
     45        return EWK_NAVIGATION_TYPE_RELOAD;
     46    case kWKFrameNavigationTypeFormResubmitted:
     47        return EWK_NAVIGATION_TYPE_FORM_RESUBMITTED;
     48    case kWKFrameNavigationTypeOther:
     49        return EWK_NAVIGATION_TYPE_OTHER;
     50    }
     51    ASSERT_NOT_REACHED();
     52
     53    return EWK_NAVIGATION_TYPE_LINK_ACTIVATED;
     54}
     55
     56inline static Event_Mouse_Button toEventMouseButton(WKEventMouseButton mouseButton)
     57{
     58    switch (mouseButton) {
     59    case kWKEventMouseButtonNoButton:
     60        return EVENT_MOUSE_BUTTON_NONE;
     61    case kWKEventMouseButtonLeftButton:
     62        return EVENT_MOUSE_BUTTON_LEFT;
     63    case kWKEventMouseButtonMiddleButton:
     64        return EVENT_MOUSE_BUTTON_MIDDLE;
     65    case kWKEventMouseButtonRightButton:
     66        return EVENT_MOUSE_BUTTON_RIGHT;
     67    }
     68    ASSERT_NOT_REACHED();
     69
     70    return EVENT_MOUSE_BUTTON_NONE;
     71}
     72
     73inline static Event_Modifier_Keys toEventModifierKeys(WKEventModifiers modifiers)
     74{
     75    unsigned keys = 0;
     76    if (modifiers & kWKEventModifiersShiftKey)
     77        keys |= EVENT_MODIFIER_KEY_SHIFT;
     78    if (modifiers & kWKEventModifiersControlKey)
     79        keys |= kWKEventModifiersControlKey;
     80    if (modifiers & kWKEventModifiersAltKey)
     81        keys |= EVENT_MODIFIER_KEY_ALT;
     82    if (modifiers & kWKEventModifiersMetaKey)
     83        keys |= EVENT_MODIFIER_KEY_META;
     84    return static_cast<Event_Modifier_Keys>(keys);
     85}
     86
     87EwkNavigationPolicyDecision::EwkNavigationPolicyDecision(WKFramePolicyListenerRef listener, WKFrameNavigationType navigationType, WKEventMouseButton mouseButton, WKEventModifiers modifiers, PassRefPtr<EwkUrlRequest> request, const char* frameName)
    3688    : m_listener(listener)
    3789    , m_actedUponByClient(false)
    … …  
    52104Ewk_Navigation_Type EwkNavigationPolicyDecision::navigationType() const
    53105{
    54     return m_navigationType;
     106    return toEwkNavigationType(m_navigationType);
    55107}
    56108
    57109Event_Mouse_Button EwkNavigationPolicyDecision::mouseButton() const
    58110{
    59     return m_mouseButton;
     111    return toEventMouseButton(m_mouseButton);
    60112}
    61113
    62114Event_Modifier_Keys EwkNavigationPolicyDecision::modifiers() const
    63115{
    64     return m_modifiers;
     116    return toEventModifierKeys(m_modifiers);
    65117}
    66118
    … …  
    148200    impl->download();
    149201}
    150 
    151 // Ewk_Navigation_Type enum validation
    152 COMPILE_ASSERT_MATCHING_ENUM(EWK_NAVIGATION_TYPE_LINK_ACTIVATED, kWKFrameNavigationTypeLinkClicked);
    153 COMPILE_ASSERT_MATCHING_ENUM(EWK_NAVIGATION_TYPE_FORM_SUBMITTED, kWKFrameNavigationTypeFormSubmitted);
    154 COMPILE_ASSERT_MATCHING_ENUM(EWK_NAVIGATION_TYPE_BACK_FORWARD, kWKFrameNavigationTypeBackForward);
    155 COMPILE_ASSERT_MATCHING_ENUM(EWK_NAVIGATION_TYPE_RELOAD, kWKFrameNavigationTypeReload);
    156 COMPILE_ASSERT_MATCHING_ENUM(EWK_NAVIGATION_TYPE_FORM_RESUBMITTED, kWKFrameNavigationTypeFormResubmitted);
    157 COMPILE_ASSERT_MATCHING_ENUM(EWK_NAVIGATION_TYPE_OTHER, kWKFrameNavigationTypeOther);
    158 
    159 // Event_Mouse_Button enum validation
    160 COMPILE_ASSERT_MATCHING_ENUM(EVENT_MOUSE_BUTTON_NONE, kWKEventMouseButtonNoButton);
    161 COMPILE_ASSERT_MATCHING_ENUM(EVENT_MOUSE_BUTTON_LEFT, kWKEventMouseButtonLeftButton);
    162 COMPILE_ASSERT_MATCHING_ENUM(EVENT_MOUSE_BUTTON_MIDDLE, kWKEventMouseButtonMiddleButton);
    163 COMPILE_ASSERT_MATCHING_ENUM(EVENT_MOUSE_BUTTON_RIGHT, kWKEventMouseButtonRightButton);
    164 
    165 // Event_Modifier_Keys validation
    166 COMPILE_ASSERT_MATCHING_ENUM(EVENT_MODIFIER_KEY_SHIFT, kWKEventModifiersShiftKey);
    167 COMPILE_ASSERT_MATCHING_ENUM(EVENT_MODIFIER_KEY_CTRL, kWKEventModifiersControlKey);
    168 COMPILE_ASSERT_MATCHING_ENUM(EVENT_MODIFIER_KEY_ALT, kWKEventModifiersAltKey);
    169 COMPILE_ASSERT_MATCHING_ENUM(EVENT_MODIFIER_KEY_META, kWKEventModifiersMetaKey);

  • trunk/Source/WebKit2/UIProcess/API/efl/ewk_navigation_policy_decision_private.h

    r135117 r163367  
    4949    static PassRefPtr<EwkNavigationPolicyDecision> create(WKFrameNavigationType navigationType, WKEventMouseButton mouseButton, WKEventModifiers modifiers, WKURLRequestRef requestRef, const char* frameName, WKFramePolicyListenerRef listener)
    5050    {
    51         return adoptRef(new EwkNavigationPolicyDecision(listener, static_cast<Ewk_Navigation_Type>(navigationType), static_cast<Event_Mouse_Button>(mouseButton), static_cast<Event_Modifier_Keys>(modifiers), EwkUrlRequest::create(requestRef), frameName));
     51        return adoptRef(new EwkNavigationPolicyDecision(listener, navigationType, mouseButton, modifiers, EwkUrlRequest::create(requestRef), frameName));
    5252    }
    5353
    … …  
    6363
    6464private:
    65     EwkNavigationPolicyDecision(WKFramePolicyListenerRef listener, Ewk_Navigation_Type navigationType, Event_Mouse_Button mouseButton, Event_Modifier_Keys modifiers, PassRefPtr<EwkUrlRequest> request, const char* frameName);
     65    EwkNavigationPolicyDecision(WKFramePolicyListenerRef listener, WKFrameNavigationType navigationType, WKEventMouseButton mouseButton, WKEventModifiers modifiers, PassRefPtr<EwkUrlRequest> request, const char* frameName);
    6666
    6767    WKRetainPtr<WKFramePolicyListenerRef> m_listener;
    6868    bool m_actedUponByClient;
    69     Ewk_Navigation_Type m_navigationType;
    70     Event_Mouse_Button m_mouseButton;
    71     Event_Modifier_Keys m_modifiers;
     69    WKFrameNavigationType m_navigationType;
     70    WKEventMouseButton m_mouseButton;
     71    WKEventModifiers m_modifiers;
    7272    RefPtr<EwkUrlRequest> m_request;
    7373    WKEinaSharedString m_frameName;

  • trunk/Source/WebKit2/UIProcess/API/efl/ewk_popup_menu_item.cpp

    r161758 r163367  
    3535{ }
    3636
    37 COMPILE_ASSERT_MATCHING_ENUM(EWK_POPUP_MENU_SEPARATOR, kWKPopupItemTypeSeparator);
    38 COMPILE_ASSERT_MATCHING_ENUM(EWK_POPUP_MENU_ITEM, kWKPopupItemTypeItem);
    39 
    4037Ewk_Popup_Menu_Item_Type EwkPopupMenuItem::type() const
    4138{
    42     return static_cast<Ewk_Popup_Menu_Item_Type>(WKPopupItemGetType(m_wkItem.get()));
     39    switch (WKPopupItemGetType(m_wkItem.get())) {
     40    case kWKPopupItemTypeSeparator:
     41        return EWK_POPUP_MENU_SEPARATOR;
     42    case kWKPopupItemTypeItem:
     43        return EWK_POPUP_MENU_ITEM;
     44    }
     45    ASSERT_NOT_REACHED();
     46
     47    return EWK_POPUP_MENU_UNKNOWN;
    4348}
    4449
    4550Ewk_Text_Direction EwkPopupMenuItem::textDirection() const
    4651{
    47     return static_cast<Ewk_Text_Direction>(WKPopupItemGetTextDirection(m_wkItem.get()));
     52    switch (WKPopupItemGetTextDirection(m_wkItem.get())) {
     53    case kWKPopupItemTextDirectionRTL:
     54        return EWK_TEXT_DIRECTION_RIGHT_TO_LEFT;
     55    case kWKPopupItemTextDirectionLTR:
     56        return EWK_TEXT_DIRECTION_LEFT_TO_RIGHT;
     57    }
     58    ASSERT_NOT_REACHED();
     59
     60    return EWK_TEXT_DIRECTION_LEFT_TO_RIGHT;
    4861}
    4962

  • trunk/Source/WebKit2/UIProcess/API/efl/ewk_private.h

    r129101 r163367  
    2727#define ewk_private_h
    2828
    29 #include <wtf/Assertions.h>
    30 
    31 #define COMPILE_ASSERT_MATCHING_ENUM(ewkName, webcoreName) \
    32         COMPILE_ASSERT(int(ewkName) == int(webcoreName), mismatchingEnums)
    33 
    3429extern int _ewk_log_dom;
    3530

  • trunk/Source/WebKit2/UIProcess/API/efl/ewk_view.cpp

    r162426 r163367  
    375375}
    376376
    377 // EwkFindOptions should be matched up orders with WkFindOptions.
    378 COMPILE_ASSERT_MATCHING_ENUM(EWK_FIND_OPTIONS_CASE_INSENSITIVE, kWKFindOptionsCaseInsensitive);
    379 COMPILE_ASSERT_MATCHING_ENUM(EWK_FIND_OPTIONS_AT_WORD_STARTS, kWKFindOptionsAtWordStarts);
    380 COMPILE_ASSERT_MATCHING_ENUM(EWK_FIND_OPTIONS_TREAT_MEDIAL_CAPITAL_AS_WORD_START, kWKFindOptionsTreatMedialCapitalAsWordStart);
    381 COMPILE_ASSERT_MATCHING_ENUM(EWK_FIND_OPTIONS_BACKWARDS, kWKFindOptionsBackwards);
    382 COMPILE_ASSERT_MATCHING_ENUM(EWK_FIND_OPTIONS_WRAP_AROUND, kWKFindOptionsWrapAround);
    383 COMPILE_ASSERT_MATCHING_ENUM(EWK_FIND_OPTIONS_SHOW_OVERLAY, kWKFindOptionsShowOverlay);
    384 COMPILE_ASSERT_MATCHING_ENUM(EWK_FIND_OPTIONS_SHOW_FIND_INDICATOR, kWKFindOptionsShowFindIndicator);
    385 COMPILE_ASSERT_MATCHING_ENUM(EWK_FIND_OPTIONS_SHOW_HIGHLIGHT, kWKFindOptionsShowHighlight);
     377inline WKFindOptions toWKFindOptions(Ewk_Find_Options options)
     378{
     379    unsigned wkFindOptions = 0;
     380
     381    if (options & EWK_FIND_OPTIONS_CASE_INSENSITIVE)
     382        wkFindOptions |= kWKFindOptionsCaseInsensitive;
     383    if (options & EWK_FIND_OPTIONS_AT_WORD_STARTS)
     384        wkFindOptions |= kWKFindOptionsAtWordStarts;
     385    if (options & EWK_FIND_OPTIONS_TREAT_MEDIAL_CAPITAL_AS_WORD_START)
     386        wkFindOptions |= kWKFindOptionsTreatMedialCapitalAsWordStart;
     387    if (options & EWK_FIND_OPTIONS_BACKWARDS)
     388        wkFindOptions |= kWKFindOptionsBackwards;
     389    if (options & EWK_FIND_OPTIONS_WRAP_AROUND)
     390        wkFindOptions |= kWKFindOptionsWrapAround;
     391    if (options & EWK_FIND_OPTIONS_SHOW_OVERLAY)
     392        wkFindOptions |= kWKFindOptionsShowOverlay;
     393    if (options & EWK_FIND_OPTIONS_SHOW_FIND_INDICATOR)
     394        wkFindOptions |= kWKFindOptionsShowFindIndicator;
     395    if (options & EWK_FIND_OPTIONS_SHOW_HIGHLIGHT)
     396        wkFindOptions |= kWKFindOptionsShowHighlight;
     397
     398    return static_cast<WKFindOptions>(wkFindOptions);
     399}
    386400
    387401Eina_Bool ewk_view_text_find(Evas_Object* ewkView, const char* text, Ewk_Find_Options options, unsigned maxMatchCount)
    … …  
    391405
    392406    WKRetainPtr<WKStringRef> wkText = adoptWK(WKStringCreateWithUTF8CString(text));
    393     WKPageFindString(impl->wkPage(), wkText.get(), static_cast<WebKit::FindOptions>(options), maxMatchCount);
     407    WKPageFindString(impl->wkPage(), wkText.get(), toWKFindOptions(options), maxMatchCount);
    394408
    395409    return true;
    … …  
    509523}
    510524
    511 // Ewk_Pagination_Mode should be matched up orders with WKPaginationMode.
    512 COMPILE_ASSERT_MATCHING_ENUM(EWK_PAGINATION_MODE_UNPAGINATED, kWKPaginationModeUnpaginated);
    513 COMPILE_ASSERT_MATCHING_ENUM(EWK_PAGINATION_MODE_LEFT_TO_RIGHT, kWKPaginationModeLeftToRight);
    514 COMPILE_ASSERT_MATCHING_ENUM(EWK_PAGINATION_MODE_RIGHT_TO_LEFT, kWKPaginationModeRightToLeft);
    515 COMPILE_ASSERT_MATCHING_ENUM(EWK_PAGINATION_MODE_TOP_TO_BOTTOM, kWKPaginationModeTopToBottom);
    516 COMPILE_ASSERT_MATCHING_ENUM(EWK_PAGINATION_MODE_BOTTOM_TO_TOP, kWKPaginationModeBottomToTop);
     525inline WKPaginationMode toWKPaginationMode(Ewk_Pagination_Mode mode)
     526{
     527    switch (mode) {
     528    case EWK_PAGINATION_MODE_INVALID:
     529        break;
     530    case EWK_PAGINATION_MODE_UNPAGINATED:
     531        return kWKPaginationModeUnpaginated;
     532    case EWK_PAGINATION_MODE_LEFT_TO_RIGHT:
     533        return kWKPaginationModeLeftToRight;
     534    case EWK_PAGINATION_MODE_RIGHT_TO_LEFT:
     535        return kWKPaginationModeRightToLeft;
     536    case EWK_PAGINATION_MODE_TOP_TO_BOTTOM:
     537        return kWKPaginationModeTopToBottom;
     538    case EWK_PAGINATION_MODE_BOTTOM_TO_TOP:
     539        return kWKPaginationModeBottomToTop;
     540    }
     541    ASSERT_NOT_REACHED();
     542
     543    return kWKPaginationModeUnpaginated;
     544}
     545
     546inline Ewk_Pagination_Mode toEwkPaginationMode(WKPaginationMode mode)
     547{
     548    switch (mode) {
     549    case kWKPaginationModeUnpaginated:
     550        return EWK_PAGINATION_MODE_UNPAGINATED;
     551    case kWKPaginationModeLeftToRight:
     552        return EWK_PAGINATION_MODE_LEFT_TO_RIGHT;
     553    case kWKPaginationModeRightToLeft:
     554        return EWK_PAGINATION_MODE_RIGHT_TO_LEFT;
     555    case kWKPaginationModeTopToBottom:
     556        return EWK_PAGINATION_MODE_TOP_TO_BOTTOM;
     557    case kWKPaginationModeBottomToTop:
     558        return EWK_PAGINATION_MODE_BOTTOM_TO_TOP;
     559    }
     560    ASSERT_NOT_REACHED();
     561
     562    return EWK_PAGINATION_MODE_UNPAGINATED;
     563}
    517564
    518565Eina_Bool ewk_view_pagination_mode_set(Evas_Object* ewkView, Ewk_Pagination_Mode mode)
    … …  
    520567    EWK_VIEW_IMPL_GET_OR_RETURN(ewkView, impl, false);
    521568
    522     WKPageSetPaginationMode(impl->wkPage(), static_cast<WKPaginationMode>(mode));
     569    WKPageSetPaginationMode(impl->wkPage(), toWKPaginationMode(mode));
    523570
    524571    return true;
    … …  
    529576    EWK_VIEW_IMPL_GET_OR_RETURN(ewkView, impl, EWK_PAGINATION_MODE_INVALID);
    530577   
    531     return static_cast<Ewk_Pagination_Mode>(WKPageGetPaginationMode(impl->wkPage()));
     578    return toEwkPaginationMode(WKPageGetPaginationMode(impl->wkPage()));
    532579}
    533580
Note: See TracChangeset for help on using the changeset viewer.