Changeset 140600 in webkit


Ignore:
Timestamp:
Jan 23, 2013 2:53:10 PM (11 years ago)
Author:
kenneth@webkit.org
Message:

[WK2] Replace some internal API usage in EwkView with C API
​https://bugs.webkit.org/show_bug.cgi?id=107652

Reviewed by Benjamin Poulain.

  • UIProcess/API/efl/ewk_view.cpp:

(ewk_view_url_set):
(ewk_view_reload):
(ewk_view_reload_bypass_cache):
(ewk_view_stop):
(ewk_view_load_progress_get):
(ewk_view_scale_set):
(ewk_view_scale_get):
(ewk_view_device_pixel_ratio_get):
(ewk_view_back):
(ewk_view_forward):
(ewk_view_back_possible):
(ewk_view_forward_possible):
(ewk_view_html_string_load):
(ewk_view_text_find):
(ewk_view_text_find_highlight_clear):
(ewk_view_text_matches_count):
(ewk_view_inspector_show):
(ewk_view_inspector_close):

Location:
trunk/Source/WebKit2
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit2/ChangeLog

    r140591 r140600  
     12013-01-23  Kenneth Rohde Christiansen  <kenneth@webkit.org>
     2
     3        [WK2] Replace some internal API usage in EwkView with C API
     4        https://bugs.webkit.org/show_bug.cgi?id=107652
     5
     6        Reviewed by Benjamin Poulain.
     7
     8        * UIProcess/API/efl/ewk_view.cpp:
     9        (ewk_view_url_set):
     10        (ewk_view_reload):
     11        (ewk_view_reload_bypass_cache):
     12        (ewk_view_stop):
     13        (ewk_view_load_progress_get):
     14        (ewk_view_scale_set):
     15        (ewk_view_scale_get):
     16        (ewk_view_device_pixel_ratio_get):
     17        (ewk_view_back):
     18        (ewk_view_forward):
     19        (ewk_view_back_possible):
     20        (ewk_view_forward_possible):
     21        (ewk_view_html_string_load):
     22        (ewk_view_text_find):
     23        (ewk_view_text_find_highlight_clear):
     24        (ewk_view_text_matches_count):
     25        (ewk_view_inspector_show):
     26        (ewk_view_inspector_close):
     27
    1282013-01-23  Alexey Proskuryakov  <ap@apple.com>
    229

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

    r140376 r140600  
    3636#include "WKEinaSharedString.h"
    3737#include "WKFindOptions.h"
     38#include "WKInspector.h"
    3839#include "WKRetainPtr.h"
    3940#include "WKString.h"
     41#include "WKURL.h"
    4042#include "WebContext.h"
    4143#include "WebData.h"
    … …  
    563565    EINA_SAFETY_ON_NULL_RETURN_VAL(url, false);
    564566
    565     impl->page()->loadURL(url);
     567    WKRetainPtr<WKURLRef> wkUrl = adoptWK(WKURLCreateWithUTF8CString(url));
     568    WKPageLoadURL(impl->wkPage(), wkUrl.get());
    566569    impl->informURLChange();
    567570
    … …  
    587590    EWK_VIEW_IMPL_GET_OR_RETURN(ewkView, impl, false);
    588591
    589     impl->page()->reload(/*reloadFromOrigin*/ false);
     592    WKPageReload(impl->wkPage());
    590593    impl->informURLChange();
    591594
    … …  
    597600    EWK_VIEW_IMPL_GET_OR_RETURN(ewkView, impl, false);
    598601
    599     impl->page()->reload(/*reloadFromOrigin*/ true);
     602    WKPageReloadFromOrigin(impl->wkPage());
    600603    impl->informURLChange();
    601604
    … …  
    607610    EWK_VIEW_IMPL_GET_OR_RETURN(ewkView, impl, false);
    608611
    609     impl->page()->stopLoading();
     612    WKPageStopLoading(impl->wkPage());
    610613
    611614    return true;
    … …  
    630633    EWK_VIEW_IMPL_GET_OR_RETURN(ewkView, impl, -1.0);
    631634
    632     return impl->page()->estimatedProgress();
     635    return WKPageGetEstimatedProgress(impl->wkPage());
    633636}
    634637
    … …  
    637640    EWK_VIEW_IMPL_GET_OR_RETURN(ewkView, impl, false);
    638641
    639     impl->page()->scalePage(scaleFactor, IntPoint(x, y));
     642    WKPageSetScaleFactor(impl->wkPage(), scaleFactor, WKPointMake(x, y));
    640643    return true;
    641644}
    … …  
    645648    EWK_VIEW_IMPL_GET_OR_RETURN(ewkView, impl, -1);
    646649
    647     return impl->page()->pageScaleFactor();
     650    return WKPageGetScaleFactor(impl->wkPage());
    648651}
    649652
    … …  
    661664    EWK_VIEW_IMPL_GET_OR_RETURN(ewkView, impl, -1.0);
    662665
    663     return impl->page()->deviceScaleFactor();
     666    return WKPageGetBackingScaleFactor(impl->wkPage());
    664667}
    665668
    … …  
    682685    EWK_VIEW_IMPL_GET_OR_RETURN(ewkView, impl, false);
    683686
    684     WebPageProxy* page = impl->page();
    685     if (page->canGoBack()) {
    686         page->goBack();
     687    WKPageRef page = impl->wkPage();
     688    if (WKPageCanGoBack(page)) {
     689        WKPageGoBack(page);
    687690        return true;
    688691    }
    … …  
    695698    EWK_VIEW_IMPL_GET_OR_RETURN(ewkView, impl, false);
    696699
    697     WebPageProxy* page = impl->page();
    698     if (page->canGoForward()) {
    699         page->goForward();
     700    WKPageRef page = impl->wkPage();
     701    if (WKPageCanGoForward(page)) {
     702        WKPageGoForward(page);
    700703        return true;
    701704    }
    … …  
    725728{
    726729    EWK_VIEW_IMPL_GET_OR_RETURN(ewkView, impl, false);
    727 
    728     return impl->page()->canGoBack();
     730    return WKPageCanGoBack(impl->wkPage());
    729731}
    730732
    … …  
    732734{
    733735    EWK_VIEW_IMPL_GET_OR_RETURN(ewkView, impl, false);
    734 
    735     return impl->page()->canGoForward();
     736    return WKPageCanGoForward(impl->wkPage());
    736737}
    737738
    … …  
    748749    EINA_SAFETY_ON_NULL_RETURN_VAL(html, false);
    749750
    750     if (unreachableUrl && *unreachableUrl)
    751         impl->page()->loadAlternateHTMLString(String::fromUTF8(html), baseUrl ? String::fromUTF8(baseUrl) : "", String::fromUTF8(unreachableUrl));
    752     else
    753         impl->page()->loadHTMLString(String::fromUTF8(html), baseUrl ? String::fromUTF8(baseUrl) : "");
     751    WKRetainPtr<WKStringRef> wkHTMLString = adoptWK(WKStringCreateWithUTF8CString(html));
     752    WKRetainPtr<WKURLRef> wkBaseURL = adoptWK(WKURLCreateWithUTF8CString(baseUrl));
     753
     754    if (unreachableUrl && *unreachableUrl) {
     755        WKRetainPtr<WKURLRef> wkUnreachableURL = adoptWK(WKURLCreateWithUTF8CString(unreachableUrl));
     756        WKPageLoadAlternateHTMLString(impl->wkPage(), wkHTMLString.get(), wkBaseURL.get(), wkUnreachableURL.get());
     757    } else
     758        WKPageLoadHTMLString(impl->wkPage(), wkHTMLString.get(), wkBaseURL.get());
    754759
    755760    impl->informURLChange();
    … …  
    789794    EINA_SAFETY_ON_NULL_RETURN_VAL(text, false);
    790795
    791     impl->page()->findString(String::fromUTF8(text), static_cast<WebKit::FindOptions>(options), maxMatchCount);
     796    WKRetainPtr<WKStringRef> wkText = adoptWK(WKStringCreateWithUTF8CString(text));
     797    WKPageFindString(impl->wkPage(), wkText.get(), static_cast<WebKit::FindOptions>(options), maxMatchCount);
    792798
    793799    return true;
    … …  
    798804    EWK_VIEW_IMPL_GET_OR_RETURN(ewkView, impl, false);
    799805
    800     impl->page()->hideFindUI();
     806    WKPageHideFindUI(impl->wkPage());
    801807
    802808    return true;
    … …  
    808814    EINA_SAFETY_ON_NULL_RETURN_VAL(text, false);
    809815
    810     impl->page()->countStringMatches(String::fromUTF8(text), static_cast<WebKit::FindOptions>(options), maxMatchCount);
     816    WKRetainPtr<WKStringRef> wkText = adoptWK(WKStringCreateWithUTF8CString(text));
     817    WKPageCountStringMatches(impl->wkPage(), wkText.get(), static_cast<WebKit::FindOptions>(options), maxMatchCount);
    811818
    812819    return true;
    … …  
    880887    EWK_VIEW_IMPL_GET_OR_RETURN(ewkView, impl, false);
    881888
    882     WebInspectorProxy* inspector = impl->page()->inspector();
    883     if (inspector)
    884         inspector->show();
     889    WKInspectorRef wkInspector = WKPageGetInspector(impl->wkPage());
     890    if (wkInspector)
     891        WKInspectorShow(wkInspector);
    885892
    886893    return true;
    … …  
    896903    EWK_VIEW_IMPL_GET_OR_RETURN(ewkView, impl, false);
    897904
    898     WebInspectorProxy* inspector = impl->page()->inspector();
    899     if (inspector)
    900         inspector->close();
     905    WKInspectorRef wkInspector = WKPageGetInspector(impl->wkPage());
     906    if (wkInspector)
     907        WKInspectorClose(wkInspector);
    901908
    902909    return true;
Note: See TracChangeset for help on using the changeset viewer.