⚠ Archived content — this site is no longer maintained.   Current WebKit documentation is at docs.webkit.org.

Changeset 139937 in webkit


Ignore:
Timestamp:
Jan 16, 2013, 5:11:15 PM (14 years ago)
Author:
commit-queue@webkit.org
Message:

[EFL][WK2] PageUIClientEfl should keep in sync with WKPageUIClient
​https://bugs.webkit.org/show_bug.cgi?id=107060

Patch by Jaehun Lim <​ljaehun.lim@samsung.com> on 2013-01-16
Reviewed by Benjamin Poulain.

Rearrange the order of functions in PageUIClientEfl.
Rename closePage() to close().

  • UIProcess/API/efl/EwkViewImpl.cpp:

(EwkViewImpl::close):

  • UIProcess/API/efl/EwkViewImpl.h:

(EwkViewImpl):

  • UIProcess/efl/PageUIClientEfl.cpp:

(WebKit::PageUIClientEfl::PageUIClientEfl):
(WebKit::PageUIClientEfl::close):
(WebKit::PageUIClientEfl::takeFocus):
(WebKit::PageUIClientEfl::focus):
(WebKit::PageUIClientEfl::unfocus):
(WebKit::PageUIClientEfl::getWindowFrame):
(WebKit::PageUIClientEfl::setWindowFrame):
(WebKit::PageUIClientEfl::createNewPage):
(WebKit::PageUIClientEfl::showColorPicker):
(WebKit::PageUIClientEfl::hideColorPicker):

  • UIProcess/efl/PageUIClientEfl.h:

(PageUIClientEfl):

Location:
trunk/Source/WebKit2
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit2/ChangeLog

    r139935 r139937  
     12013-01-16  Jaehun Lim  <ljaehun.lim@samsung.com>
     2
     3        [EFL][WK2] PageUIClientEfl should keep in sync with WKPageUIClient
     4        https://bugs.webkit.org/show_bug.cgi?id=107060
     5
     6        Reviewed by Benjamin Poulain.
     7
     8        Rearrange the order of functions in PageUIClientEfl.
     9        Rename closePage() to close().
     10
     11        * UIProcess/API/efl/EwkViewImpl.cpp:
     12        (EwkViewImpl::close):
     13        * UIProcess/API/efl/EwkViewImpl.h:
     14        (EwkViewImpl):
     15        * UIProcess/efl/PageUIClientEfl.cpp:
     16        (WebKit::PageUIClientEfl::PageUIClientEfl):
     17        (WebKit::PageUIClientEfl::close):
     18        (WebKit::PageUIClientEfl::takeFocus):
     19        (WebKit::PageUIClientEfl::focus):
     20        (WebKit::PageUIClientEfl::unfocus):
     21        (WebKit::PageUIClientEfl::getWindowFrame):
     22        (WebKit::PageUIClientEfl::setWindowFrame):
     23        (WebKit::PageUIClientEfl::createNewPage):
     24        (WebKit::PageUIClientEfl::showColorPicker):
     25        (WebKit::PageUIClientEfl::hideColorPicker):
     26        * UIProcess/efl/PageUIClientEfl.h:
     27        (PageUIClientEfl):
     28
    1292013-01-16  Brady Eidson  <beidson@apple.com>
    230

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

    r139675 r139937  
    938938}
    939939
    940 void EwkViewImpl::closePage()
     940void EwkViewImpl::close()
    941941{
    942942    Ewk_View_Smart_Data* sd = smartData();

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

    r139675 r139937  
    176176
    177177    WKPageRef createNewPage(PassRefPtr<EwkUrlRequest>, WebKit::ImmutableDictionary* windowFeatures);
    178     void closePage();
     178    void close();
    179179
    180180    void requestPopupMenu(WebKit::WebPopupMenuProxyEfl*, const WebCore::IntRect&, WebCore::TextDirection, double pageScaleFactor, const Vector<WebKit::WebPopupItem>& items, int32_t selectedIndex);

  • trunk/Source/WebKit2/UIProcess/efl/PageUIClientEfl.cpp

    r137916 r139937  
    4646}
    4747
    48 void PageUIClientEfl::closePage(WKPageRef, const void* clientInfo)
    49 {
    50     toPageUIClientEfl(clientInfo)->m_viewImpl->closePage();
    51 }
    52 
    53 WKPageRef PageUIClientEfl::createNewPage(WKPageRef, WKURLRequestRef wkRequest, WKDictionaryRef wkWindowFeatures, WKEventModifiers, WKEventMouseButton, const void* clientInfo)
    54 {
    55     RefPtr<EwkUrlRequest> request = EwkUrlRequest::create(wkRequest);
    56     return toPageUIClientEfl(clientInfo)->m_viewImpl->createNewPage(request, toImpl(wkWindowFeatures));
    57 }
    58 
    59 void PageUIClientEfl::runJavaScriptAlert(WKPageRef, WKStringRef alertText, WKFrameRef, const void* clientInfo)
    60 {
    61     toPageUIClientEfl(clientInfo)->m_viewImpl->requestJSAlertPopup(WKEinaSharedString(alertText));
    62 }
    63 
    64 bool PageUIClientEfl::runJavaScriptConfirm(WKPageRef, WKStringRef message, WKFrameRef, const void* clientInfo)
    65 {
    66     return toPageUIClientEfl(clientInfo)->m_viewImpl->requestJSConfirmPopup(WKEinaSharedString(message));
    67 }
    68 
    69 WKStringRef PageUIClientEfl::runJavaScriptPrompt(WKPageRef, WKStringRef message, WKStringRef defaultValue, WKFrameRef, const void* clientInfo)
    70 {
    71     WKEinaSharedString value = toPageUIClientEfl(clientInfo)->m_viewImpl->requestJSPromptPopup(WKEinaSharedString(message), WKEinaSharedString(defaultValue));
    72     return value ? WKStringCreateWithUTF8CString(value) : 0;
    73 }
    74 
    75 bool PageUIClientEfl::toolbarsAreVisible(WKPageRef, const void* clientInfo)
    76 {
    77     EwkWindowFeatures* features = toPageUIClientEfl(clientInfo)->m_viewImpl->windowFeatures();
    78     ASSERT(features);
    79     return features->toolbarVisible();
    80 }
    81 
    82 void PageUIClientEfl::setToolbarsAreVisible(WKPageRef, bool toolbarVisible, const void* clientInfo)
    83 {
    84     EwkWindowFeatures* features = toPageUIClientEfl(clientInfo)->m_viewImpl->windowFeatures();
    85     ASSERT(features);
    86     features->setToolbarVisible(toolbarVisible);
    87 }
    88 
    89 bool PageUIClientEfl::menuBarIsVisible(WKPageRef, const void* clientInfo)
    90 {
    91     EwkWindowFeatures* features = toPageUIClientEfl(clientInfo)->m_viewImpl->windowFeatures();
    92     ASSERT(features);
    93     return features->menuBarVisible();
    94 }
    95 
    96 void PageUIClientEfl::setMenuBarIsVisible(WKPageRef, bool menuBarVisible, const void* clientInfo)
    97 {
    98     EwkWindowFeatures* features = toPageUIClientEfl(clientInfo)->m_viewImpl->windowFeatures();
    99     ASSERT(features);
    100     features->setMenuBarVisible(menuBarVisible);
    101 }
    102 
    103 bool PageUIClientEfl::statusBarIsVisible(WKPageRef, const void* clientInfo)
    104 {
    105     EwkWindowFeatures* features = toPageUIClientEfl(clientInfo)->m_viewImpl->windowFeatures();
    106     ASSERT(features);
    107     return features->statusBarVisible();
    108 }
    109 
    110 void PageUIClientEfl::setStatusBarIsVisible(WKPageRef, bool statusBarVisible, const void* clientInfo)
    111 {
    112     EwkWindowFeatures* features = toPageUIClientEfl(clientInfo)->m_viewImpl->windowFeatures();
    113     ASSERT(features);
    114     features->setStatusBarVisible(statusBarVisible);
    115 }
    116 
    117 bool PageUIClientEfl::isResizable(WKPageRef, const void* clientInfo)
    118 {
    119     EwkWindowFeatures* features = toPageUIClientEfl(clientInfo)->m_viewImpl->windowFeatures();
    120     ASSERT(features);
    121     return features->resizable();
    122 }
    123 
    124 void PageUIClientEfl::setIsResizable(WKPageRef, bool resizable, const void* clientInfo)
    125 {
    126     EwkWindowFeatures* features = toPageUIClientEfl(clientInfo)->m_viewImpl->windowFeatures();
    127     ASSERT(features);
    128     features->setResizable(resizable);
    129 }
    130 
    131 #if ENABLE(INPUT_TYPE_COLOR)
    132 void PageUIClientEfl::showColorPicker(WKPageRef, WKStringRef initialColor, WKColorPickerResultListenerRef listener, const void* clientInfo)
    133 {
    134     PageUIClientEfl* pageUIClient = toPageUIClientEfl(clientInfo);
    135     WebCore::Color color = WebCore::Color(WebKit::toWTFString(initialColor));
    136     pageUIClient->m_viewImpl->requestColorPicker(listener, color);
    137 }
    138 
    139 void PageUIClientEfl::hideColorPicker(WKPageRef, const void* clientInfo)
    140 {
    141     PageUIClientEfl* pageUIClient = toPageUIClientEfl(clientInfo);
    142     pageUIClient->m_viewImpl->dismissColorPicker();
    143 }
    144 #endif
    145 
    146 #if ENABLE(SQL_DATABASE)
    147 unsigned long long PageUIClientEfl::exceededDatabaseQuota(WKPageRef, WKFrameRef, WKSecurityOriginRef, WKStringRef databaseName, WKStringRef displayName, unsigned long long currentQuota, unsigned long long currentOriginUsage, unsigned long long currentDatabaseUsage, unsigned long long expectedUsage, const void* clientInfo)
    148 {
    149     EwkViewImpl* viewImpl = toPageUIClientEfl(clientInfo)->m_viewImpl;
    150     return viewImpl->informDatabaseQuotaReached(toImpl(databaseName)->string(), toImpl(displayName)->string(), currentQuota, currentOriginUsage, currentDatabaseUsage, expectedUsage);
    151 }
    152 #endif
    153 
    154 void PageUIClientEfl::focus(WKPageRef, const void* clientInfo)
    155 {
    156     evas_object_focus_set(toPageUIClientEfl(clientInfo)->m_viewImpl->view(), true);
    157 }
    158 
    159 void PageUIClientEfl::unfocus(WKPageRef, const void* clientInfo)
    160 {
    161     evas_object_focus_set(toPageUIClientEfl(clientInfo)->m_viewImpl->view(), false);
    162 }
    163 
    164 void PageUIClientEfl::takeFocus(WKPageRef, WKFocusDirection, const void* clientInfo)
    165 {
    166     // FIXME: this is only a partial implementation.
    167     evas_object_focus_set(toPageUIClientEfl(clientInfo)->m_viewImpl->view(), false);
    168 }
    169 
    170 WKRect PageUIClientEfl::getWindowFrame(WKPageRef, const void* clientInfo)
    171 {
    172     return toPageUIClientEfl(clientInfo)->m_viewImpl->windowGeometry();
    173 }
    174 
    175 void PageUIClientEfl::setWindowFrame(WKPageRef, WKRect frame, const void* clientInfo)
    176 {
    177     toPageUIClientEfl(clientInfo)->m_viewImpl->setWindowGeometry(frame);
    178 }
    179 
    180 void PageUIClientEfl::runOpenPanel(WKPageRef, WKFrameRef, WKOpenPanelParametersRef parameters, WKOpenPanelResultListenerRef listener, const void* clientInfo)
    181 {
    182     EwkViewImpl* viewImpl = toPageUIClientEfl(clientInfo)->m_viewImpl;
    183     RefPtr<EwkFileChooserRequest> fileChooserRequest = EwkFileChooserRequest::create(toImpl(parameters), toImpl(listener));
    184     viewImpl->smartCallback<FileChooserRequest>().call(fileChooserRequest.get());
    185 }
    186 
    18748PageUIClientEfl::PageUIClientEfl(EwkViewImpl* viewImpl)
    18849    : m_viewImpl(viewImpl)
    … …  
    19556    uiClient.version = kWKPageUIClientCurrentVersion;
    19657    uiClient.clientInfo = this;
    197     uiClient.close = closePage;
    198     uiClient.createNewPage = createNewPage;
     58    uiClient.close = close;
     59    uiClient.takeFocus = takeFocus;
     60    uiClient.focus = focus;
     61    uiClient.unfocus = unfocus;
    19962    uiClient.runJavaScriptAlert = runJavaScriptAlert;
    20063    uiClient.runJavaScriptConfirm = runJavaScriptConfirm;
    … …  
    20871    uiClient.isResizable = isResizable;
    20972    uiClient.setIsResizable = setIsResizable;
    210     uiClient.takeFocus = takeFocus;
    211     uiClient.focus = focus;
    212     uiClient.unfocus = unfocus;
    21373    uiClient.getWindowFrame = getWindowFrame;
    21474    uiClient.setWindowFrame = setWindowFrame;
    215     uiClient.runOpenPanel = runOpenPanel;
    21675#if ENABLE(SQL_DATABASE)
    21776    uiClient.exceededDatabaseQuota = exceededDatabaseQuota;
    21877#endif
    219 
     78    uiClient.runOpenPanel = runOpenPanel;
     79    uiClient.createNewPage = createNewPage;
    22080#if ENABLE(INPUT_TYPE_COLOR)
    22181    uiClient.showColorPicker = showColorPicker;
    … …  
    22686}
    22787
     88
     89void PageUIClientEfl::close(WKPageRef, const void* clientInfo)
     90{
     91    toPageUIClientEfl(clientInfo)->m_viewImpl->close();
     92}
     93
     94void PageUIClientEfl::takeFocus(WKPageRef, WKFocusDirection, const void* clientInfo)
     95{
     96    // FIXME: this is only a partial implementation.
     97    evas_object_focus_set(toPageUIClientEfl(clientInfo)->m_viewImpl->view(), false);
     98}
     99
     100void PageUIClientEfl::focus(WKPageRef, const void* clientInfo)
     101{
     102    evas_object_focus_set(toPageUIClientEfl(clientInfo)->m_viewImpl->view(), true);
     103}
     104
     105void PageUIClientEfl::unfocus(WKPageRef, const void* clientInfo)
     106{
     107    evas_object_focus_set(toPageUIClientEfl(clientInfo)->m_viewImpl->view(), false);
     108}
     109
     110void PageUIClientEfl::runJavaScriptAlert(WKPageRef, WKStringRef alertText, WKFrameRef, const void* clientInfo)
     111{
     112    toPageUIClientEfl(clientInfo)->m_viewImpl->requestJSAlertPopup(WKEinaSharedString(alertText));
     113}
     114
     115bool PageUIClientEfl::runJavaScriptConfirm(WKPageRef, WKStringRef message, WKFrameRef, const void* clientInfo)
     116{
     117    return toPageUIClientEfl(clientInfo)->m_viewImpl->requestJSConfirmPopup(WKEinaSharedString(message));
     118}
     119
     120WKStringRef PageUIClientEfl::runJavaScriptPrompt(WKPageRef, WKStringRef message, WKStringRef defaultValue, WKFrameRef, const void* clientInfo)
     121{
     122    WKEinaSharedString value = toPageUIClientEfl(clientInfo)->m_viewImpl->requestJSPromptPopup(WKEinaSharedString(message), WKEinaSharedString(defaultValue));
     123    return value ? WKStringCreateWithUTF8CString(value) : 0;
     124}
     125
     126bool PageUIClientEfl::toolbarsAreVisible(WKPageRef, const void* clientInfo)
     127{
     128    EwkWindowFeatures* features = toPageUIClientEfl(clientInfo)->m_viewImpl->windowFeatures();
     129    ASSERT(features);
     130    return features->toolbarVisible();
     131}
     132
     133void PageUIClientEfl::setToolbarsAreVisible(WKPageRef, bool toolbarVisible, const void* clientInfo)
     134{
     135    EwkWindowFeatures* features = toPageUIClientEfl(clientInfo)->m_viewImpl->windowFeatures();
     136    ASSERT(features);
     137    features->setToolbarVisible(toolbarVisible);
     138}
     139
     140bool PageUIClientEfl::menuBarIsVisible(WKPageRef, const void* clientInfo)
     141{
     142    EwkWindowFeatures* features = toPageUIClientEfl(clientInfo)->m_viewImpl->windowFeatures();
     143    ASSERT(features);
     144    return features->menuBarVisible();
     145}
     146
     147void PageUIClientEfl::setMenuBarIsVisible(WKPageRef, bool menuBarVisible, const void* clientInfo)
     148{
     149    EwkWindowFeatures* features = toPageUIClientEfl(clientInfo)->m_viewImpl->windowFeatures();
     150    ASSERT(features);
     151    features->setMenuBarVisible(menuBarVisible);
     152}
     153
     154bool PageUIClientEfl::statusBarIsVisible(WKPageRef, const void* clientInfo)
     155{
     156    EwkWindowFeatures* features = toPageUIClientEfl(clientInfo)->m_viewImpl->windowFeatures();
     157    ASSERT(features);
     158    return features->statusBarVisible();
     159}
     160
     161void PageUIClientEfl::setStatusBarIsVisible(WKPageRef, bool statusBarVisible, const void* clientInfo)
     162{
     163    EwkWindowFeatures* features = toPageUIClientEfl(clientInfo)->m_viewImpl->windowFeatures();
     164    ASSERT(features);
     165    features->setStatusBarVisible(statusBarVisible);
     166}
     167
     168bool PageUIClientEfl::isResizable(WKPageRef, const void* clientInfo)
     169{
     170    EwkWindowFeatures* features = toPageUIClientEfl(clientInfo)->m_viewImpl->windowFeatures();
     171    ASSERT(features);
     172    return features->resizable();
     173}
     174
     175void PageUIClientEfl::setIsResizable(WKPageRef, bool resizable, const void* clientInfo)
     176{
     177    EwkWindowFeatures* features = toPageUIClientEfl(clientInfo)->m_viewImpl->windowFeatures();
     178    ASSERT(features);
     179    features->setResizable(resizable);
     180}
     181
     182WKRect PageUIClientEfl::getWindowFrame(WKPageRef, const void* clientInfo)
     183{
     184    return toPageUIClientEfl(clientInfo)->m_viewImpl->windowGeometry();
     185}
     186
     187void PageUIClientEfl::setWindowFrame(WKPageRef, WKRect frame, const void* clientInfo)
     188{
     189    toPageUIClientEfl(clientInfo)->m_viewImpl->setWindowGeometry(frame);
     190}
     191
     192#if ENABLE(SQL_DATABASE)
     193unsigned long long PageUIClientEfl::exceededDatabaseQuota(WKPageRef, WKFrameRef, WKSecurityOriginRef, WKStringRef databaseName, WKStringRef displayName, unsigned long long currentQuota, unsigned long long currentOriginUsage, unsigned long long currentDatabaseUsage, unsigned long long expectedUsage, const void* clientInfo)
     194{
     195    EwkViewImpl* viewImpl = toPageUIClientEfl(clientInfo)->m_viewImpl;
     196    return viewImpl->informDatabaseQuotaReached(toImpl(databaseName)->string(), toImpl(displayName)->string(), currentQuota, currentOriginUsage, currentDatabaseUsage, expectedUsage);
     197}
     198#endif
     199
     200void PageUIClientEfl::runOpenPanel(WKPageRef, WKFrameRef, WKOpenPanelParametersRef parameters, WKOpenPanelResultListenerRef listener, const void* clientInfo)
     201{
     202    EwkViewImpl* viewImpl = toPageUIClientEfl(clientInfo)->m_viewImpl;
     203    RefPtr<EwkFileChooserRequest> fileChooserRequest = EwkFileChooserRequest::create(toImpl(parameters), toImpl(listener));
     204    viewImpl->smartCallback<FileChooserRequest>().call(fileChooserRequest.get());
     205}
     206
     207WKPageRef PageUIClientEfl::createNewPage(WKPageRef, WKURLRequestRef wkRequest, WKDictionaryRef wkWindowFeatures, WKEventModifiers, WKEventMouseButton, const void* clientInfo)
     208{
     209    RefPtr<EwkUrlRequest> request = EwkUrlRequest::create(wkRequest);
     210    return toPageUIClientEfl(clientInfo)->m_viewImpl->createNewPage(request, toImpl(wkWindowFeatures));
     211}
     212
     213#if ENABLE(INPUT_TYPE_COLOR)
     214void PageUIClientEfl::showColorPicker(WKPageRef, WKStringRef initialColor, WKColorPickerResultListenerRef listener, const void* clientInfo)
     215{
     216    PageUIClientEfl* pageUIClient = toPageUIClientEfl(clientInfo);
     217    WebCore::Color color = WebCore::Color(WebKit::toWTFString(initialColor));
     218    pageUIClient->m_viewImpl->requestColorPicker(listener, color);
     219}
     220
     221void PageUIClientEfl::hideColorPicker(WKPageRef, const void* clientInfo)
     222{
     223    PageUIClientEfl* pageUIClient = toPageUIClientEfl(clientInfo);
     224    pageUIClient->m_viewImpl->dismissColorPicker();
     225}
     226#endif
     227
    228228} // namespace WebKit

  • trunk/Source/WebKit2/UIProcess/efl/PageUIClientEfl.h

    r135343 r139937  
    4646    explicit PageUIClientEfl(EwkViewImpl*);
    4747
    48     static void closePage(WKPageRef, const void*);
    49     static WKPageRef createNewPage(WKPageRef, WKURLRequestRef, WKDictionaryRef, WKEventModifiers, WKEventMouseButton, const void*);
     48    static void close(WKPageRef, const void*);
     49    static void takeFocus(WKPageRef, WKFocusDirection, const void*);
     50    static void focus(WKPageRef, const void*);
     51    static void unfocus(WKPageRef, const void*);
    5052    static void runJavaScriptAlert(WKPageRef, WKStringRef, WKFrameRef, const void*);
    5153    static bool runJavaScriptConfirm(WKPageRef, WKStringRef, WKFrameRef, const void*);
    … …  
    5961    static bool isResizable(WKPageRef, const void* clientInfo);
    6062    static void setIsResizable(WKPageRef, bool, const void* clientInfo);
     63    static WKRect getWindowFrame(WKPageRef, const void*);
     64    static void setWindowFrame(WKPageRef, WKRect, const void*);
     65#if ENABLE(SQL_DATABASE)
     66    static unsigned long long exceededDatabaseQuota(WKPageRef, WKFrameRef, WKSecurityOriginRef, WKStringRef, WKStringRef, unsigned long long currentQuota, unsigned long long, unsigned long long, unsigned long long, const void*);
     67#endif
     68    static void runOpenPanel(WKPageRef, WKFrameRef, WKOpenPanelParametersRef, WKOpenPanelResultListenerRef, const void*);
     69    static WKPageRef createNewPage(WKPageRef, WKURLRequestRef, WKDictionaryRef, WKEventModifiers, WKEventMouseButton, const void*);
    6170#if ENABLE(INPUT_TYPE_COLOR)
    6271    static void showColorPicker(WKPageRef, WKStringRef initialColor, WKColorPickerResultListenerRef, const void*);
    6372    static void hideColorPicker(WKPageRef, const void*);
    6473#endif
    65 #if ENABLE(SQL_DATABASE)
    66     static unsigned long long exceededDatabaseQuota(WKPageRef, WKFrameRef, WKSecurityOriginRef, WKStringRef, WKStringRef, unsigned long long currentQuota, unsigned long long, unsigned long long, unsigned long long, const void*);
    67 #endif
    68     static void focus(WKPageRef, const void*);
    69     static void unfocus(WKPageRef, const void*);
    70     static void takeFocus(WKPageRef, WKFocusDirection, const void*);
    71     static WKRect getWindowFrame(WKPageRef, const void*);
    72     static void setWindowFrame(WKPageRef, WKRect, const void*);
    73     static void runOpenPanel(WKPageRef, WKFrameRef, WKOpenPanelParametersRef, WKOpenPanelResultListenerRef, const void*);
    7474
    7575    EwkViewImpl* m_viewImpl;
Note: See TracChangeset for help on using the changeset viewer.