Changeset 195241 in webkit


Ignore:
Timestamp:
Jan 18, 2016 5:08:47 PM (8 years ago)
Author:
ryuan.choi@navercorp.com
Message:

[EFL] Remove wkView() from EwkView
​https://bugs.webkit.org/show_bug.cgi?id=152604

Reviewed by Gyuyoung Kim.

  • UIProcess/API/efl/EwkView.cpp:

(EwkViewEventHandler<EVAS_CALLBACK_SHOW>::handleEvent):
(EwkViewEventHandler<EVAS_CALLBACK_HIDE>::handleEvent):
(EwkView::EwkView):
(EwkView::create):
(EwkView::wkPage):
(EwkView::isVisible):
(EwkView::setVisible):
(EwkView::setDeviceScaleFactor):
(EwkView::deviceSize):
(EwkView::displayTimerFired):
(EwkView::setViewportPosition):
(EwkView::requestExitFullScreen):
(EwkView::contentsSize):
(EwkView::setThemePath):
(EwkView::feedTouchEvent):
(EwkView::createGLSurface):
(EwkView::showContextMenu):
(EwkView::requestPopupMenu):
(EwkView::webView):
(EwkView::handleEvasObjectCalculate):
(EwkView::handleEvasObjectColorSet):
(EwkView::handleEwkViewFocusIn):
(EwkView::handleEwkViewFocusOut):
(EwkView::feedTouchEvents):
(EwkView::takeSnapshot):
(EwkView::scrollBy):
(EwkView::setBackgroundColor):
(EwkView::backgroundColor):

  • UIProcess/API/efl/EwkView.h:

(EwkView::wkView): Deleted.

  • UIProcess/API/efl/GestureRecognizer.cpp:

(WebKit::GestureHandler::handleSingleTap):

  • UIProcess/API/efl/ewk_view.cpp:

(EWKViewCreate):
(EWKViewGetWKView):
(ewk_view_fullscreen_exit):
(ewk_view_layout_fixed_set):
(ewk_view_layout_fixed_get):
(ewk_view_layout_fixed_size_set):
(ewk_view_layout_fixed_size_get):
(ewk_view_bg_color_get):
(ewk_view_contents_size_get):

  • UIProcess/efl/PageViewportControllerClientEfl.cpp:

(WebKit::PageViewportControllerClientEfl::setPageScaleFactor):

  • UIProcess/efl/ViewClientEfl.cpp:

(WebKit::ViewClientEfl::webProcessDidRelaunch):
(WebKit::ViewClientEfl::ViewClientEfl):
(WebKit::ViewClientEfl::~ViewClientEfl):

Location:
trunk/Source/WebKit2
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit2/ChangeLog

    r195235 r195241  
     12016-01-18  Ryuan Choi  <ryuan.choi@navercorp.com>
     2
     3        [EFL] Remove wkView() from EwkView
     4        https://bugs.webkit.org/show_bug.cgi?id=152604
     5
     6        Reviewed by Gyuyoung Kim.
     7
     8        * UIProcess/API/efl/EwkView.cpp:
     9        (EwkViewEventHandler<EVAS_CALLBACK_SHOW>::handleEvent):
     10        (EwkViewEventHandler<EVAS_CALLBACK_HIDE>::handleEvent):
     11        (EwkView::EwkView):
     12        (EwkView::create):
     13        (EwkView::wkPage):
     14        (EwkView::isVisible):
     15        (EwkView::setVisible):
     16        (EwkView::setDeviceScaleFactor):
     17        (EwkView::deviceSize):
     18        (EwkView::displayTimerFired):
     19        (EwkView::setViewportPosition):
     20        (EwkView::requestExitFullScreen):
     21        (EwkView::contentsSize):
     22        (EwkView::setThemePath):
     23        (EwkView::feedTouchEvent):
     24        (EwkView::createGLSurface):
     25        (EwkView::showContextMenu):
     26        (EwkView::requestPopupMenu):
     27        (EwkView::webView):
     28        (EwkView::handleEvasObjectCalculate):
     29        (EwkView::handleEvasObjectColorSet):
     30        (EwkView::handleEwkViewFocusIn):
     31        (EwkView::handleEwkViewFocusOut):
     32        (EwkView::feedTouchEvents):
     33        (EwkView::takeSnapshot):
     34        (EwkView::scrollBy):
     35        (EwkView::setBackgroundColor):
     36        (EwkView::backgroundColor):
     37        * UIProcess/API/efl/EwkView.h:
     38        (EwkView::wkView): Deleted.
     39        * UIProcess/API/efl/GestureRecognizer.cpp:
     40        (WebKit::GestureHandler::handleSingleTap):
     41        * UIProcess/API/efl/ewk_view.cpp:
     42        (EWKViewCreate):
     43        (EWKViewGetWKView):
     44        (ewk_view_fullscreen_exit):
     45        (ewk_view_layout_fixed_set):
     46        (ewk_view_layout_fixed_get):
     47        (ewk_view_layout_fixed_size_set):
     48        (ewk_view_layout_fixed_size_get):
     49        (ewk_view_bg_color_get):
     50        (ewk_view_contents_size_get):
     51        * UIProcess/efl/PageViewportControllerClientEfl.cpp:
     52        (WebKit::PageViewportControllerClientEfl::setPageScaleFactor):
     53        * UIProcess/efl/ViewClientEfl.cpp:
     54        (WebKit::ViewClientEfl::webProcessDidRelaunch):
     55        (WebKit::ViewClientEfl::ViewClientEfl):
     56        (WebKit::ViewClientEfl::~ViewClientEfl):
     57
    1582016-01-18  Zan Dobersek  <zdobersek@igalia.com>
    259

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

    r193827 r195241  
    253253{
    254254    Ewk_View_Smart_Data* smartData = static_cast<Ewk_View_Smart_Data*>(data);
    255     WKViewSetIsVisible(toEwkView(smartData)->wkView(), true);
     255    toEwkView(smartData)->setVisible(true);
    256256}
    257257
    … …  
    260260{
    261261    Ewk_View_Smart_Data* smartData = static_cast<Ewk_View_Smart_Data*>(data);
    262     WKViewSetIsVisible(toEwkView(smartData)->wkView(), false);
     262    toEwkView(smartData)->setVisible(false);
    263263}
    264264
    … …  
    273273// EwkView implementation.
    274274
    275 EwkView::EwkView(WKViewRef view, Evas_Object* evasObject)
     275EwkView::EwkView(WebView* view, Evas_Object* evasObject)
    276276    : m_webView(view)
    277277    , m_evasObject(evasObject)
    … …  
    312312
    313313    // FIXME: Remove when possible.
    314     static_cast<WebViewEfl*>(webView())->setEwkView(this);
     314    static_cast<WebViewEfl*>(m_webView.get())->setEwkView(this);
    315315
    316316    // FIXME: Consider it to move into EvasGLContext.
    … …  
    334334
    335335    // FIXME: It should be moved to some better place to create an inactive ewk_view.
    336     WKViewSetIsActive(wkView(), true);
     336    m_webView->setActive(true);
    337337
    338338    m_pageUIClient = std::make_unique<PageUIClientEfl>(this);
    … …  
    359359}
    360360
    361 EwkView* EwkView::create(WKViewRef webView, Evas* canvas, Evas_Smart* smart)
     361EwkView* EwkView::create(WebView* webView, Evas* canvas, Evas_Smart* smart)
    362362{
    363363    EINA_SAFETY_ON_NULL_RETURN_VAL(canvas, nullptr);
    … …  
    424424WKPageRef EwkView::wkPage() const
    425425{
    426     return WKViewGetPage(wkView());
     426    return m_webView->pageRef();
    427427}
    428428
    … …  
    485485}
    486486
     487bool EwkView::isVisible() const
     488{
     489    return m_webView->isVisible();
     490}
     491
     492void EwkView::setVisible(bool visible)
     493{
     494    m_webView->setVisible(visible);
     495}
     496
    487497void EwkView::setDeviceScaleFactor(float scale)
    488498{
    489     const WKSize& deviceSize = WKViewGetSize(wkView());
     499    const IntSize& size = deviceSize();
    490500    WKPageSetCustomBackingScaleFactor(wkPage(), scale);
    491501
    492502    // Update internal viewport size after device-scale change.
    493     WKViewSetSize(wkView(), deviceSize);
     503    m_webView->setSize(size);
    494504}
    495505
    … …  
    543553inline IntSize EwkView::deviceSize() const
    544554{
    545     return toIntSize(WKViewGetSize(wkView()));
     555    return m_webView->size();
    546556}
    547557
    … …  
    565575            return;
    566576
    567         WKViewPaintToCairoSurface(wkView(), surface.get());
     577        static_cast<WebViewEfl*>(m_webView.get())->paintToCairoSurface(surface.get());
     578
    568579        evas_object_image_data_update_add(sd->image, 0, 0, sd->view.w, sd->view.h);
    569580        return;
    … …  
    572583    evas_gl_make_current(m_evasGL, m_evasGLSurface->surface(), m_evasGLContext->context());
    573584
    574     WKViewPaintToCurrentGLContext(wkView());
     585    m_webView->paintToCurrentGLContext();
    575586
    576587    // sd->image should be updated from (0,0) when using the evasGL for graphics backend.
    … …  
    589600void EwkView::setViewportPosition(const FloatPoint& contentsPosition)
    590601{
    591     WKViewSetContentPosition(wkView(), WKPointMake(contentsPosition.x(), contentsPosition.y()));
     602    m_webView->setContentPosition(contentsPosition);
    592603    m_pageViewportController.didChangeContentsVisibility(contentsPosition, m_pageViewportController.currentScale());
    593604}
    … …  
    623634    }
    624635}
     636
     637bool EwkView::requestExitFullScreen()
     638{
     639    return m_webView->requestExitFullScreen();
     640}
    625641#endif
    626642
    … …  
    646662        ecore_evas_move_resize(ee, rect.origin.x, rect.origin.y, rect.size.width, rect.size.height);
    647663    }
     664}
     665
     666IntSize EwkView::contentsSize() const
     667{
     668    return m_webView->contentsSize();
    648669}
    649670
    … …  
    671692void EwkView::setThemePath(const char* theme)
    672693{
    673     if (m_theme != theme) {
    674         m_theme = theme;
    675         WKRetainPtr<WKStringRef> wkTheme = adoptWK(WKStringCreateWithUTF8CString(theme));
    676         WKViewSetThemePath(wkView(), wkTheme.get());
    677     }
     694    m_theme = theme;
     695    static_cast<WebViewEfl*>(m_webView.get())->setThemePath(String::fromUTF8(m_theme, m_theme.length()));
    678696}
    679697
    … …  
    777795    WKRetainPtr<WKArrayRef> wkTouchPoints(AdoptWK, WKArrayCreateAdoptingValues(touchPoints.get(), length));
    778796
    779     WKViewSendTouchEvent(wkView(), adoptWK(WKTouchEventCreate(static_cast<WKEventType>(type), wkTouchPoints.get(), toWKEventModifiers(modifiers), ecore_time_get())).get());
     797    static_cast<WebViewEfl*>(m_webView.get())->sendTouchEvent(EwkTouchEvent::create(static_cast<WKEventType>(type), wkTouchPoints.get(), toWKEventModifiers(modifiers), ecore_time_get()).get());
    780798}
    781799
    … …  
    838856
    839857    // Recreate to current size: Replaces if non-null, and frees existing surface after (OwnPtr).
    840     if (deviceSize().width() && deviceSize().height()) {
     858    IntSize size= deviceSize();
     859    if (size.width() && size.height()) {
    841860        Evas_GL_Surface* surface = nullptr;
    842         surface = evas_gl_surface_create(m_evasGL, &evasGLConfig, deviceSize().width(), deviceSize().height());
     861        surface = evas_gl_surface_create(m_evasGL, &evasGLConfig, size.width(), size.height());
    843862        if (!surface)
    844863            return false;
    … …  
    858877    Evas_GL_API* gl = evas_gl_api_get(m_evasGL);
    859878
    860     WKPoint boundsEnd = WKViewUserViewportToScene(wkView(), WKPointMake(deviceSize().width(), deviceSize().height()));
    861     gl->glViewport(0, 0, boundsEnd.x, boundsEnd.y);
     879    IntPoint boundsEnd = m_webView->userViewportToScene(IntPoint(size.width(), size.height()));
     880    gl->glViewport(0, 0, boundsEnd.x(), boundsEnd.y());
    862881    gl->glClearColor(1.0, 1.0, 1.0, 0);
    863882    gl->glClear(GL_COLOR_BUFFER_BIT);
    … …  
    932951    m_contextMenu = EwkContextMenu::create(this, items);
    933952
    934     position = WKViewContentsToUserViewport(wkView(), position);
    935 
    936     sd->api->context_menu_show(sd, position.x, position.y, m_contextMenu.get());
     953    IntPoint result = m_webView->contentsToUserViewport(toIntPoint(position));
     954
     955    sd->api->context_menu_show(sd, result.x(), result.y(), m_contextMenu.get());
    937956}
    938957
    … …  
    966985    m_popupMenu = std::make_unique<EwkPopupMenu>(this, popupMenuListener, items, selectedIndex);
    967986
    968     WKPoint popupMenuPosition = WKViewContentsToUserViewport(wkView(), rect.origin);
     987    IntPoint popupMenuPosition = m_webView->contentsToUserViewport(toIntPoint(rect.origin));
    969988
    970989    Eina_Rectangle einaRect;
    971     EINA_RECTANGLE_SET(&einaRect, popupMenuPosition.x, popupMenuPosition.y, rect.size.width, rect.size.height);
     990    EINA_RECTANGLE_SET(&einaRect, popupMenuPosition.x(), popupMenuPosition.y(), rect.size.width, rect.size.height);
    972991
    973992    switch (textDirection) {
    … …  
    10731092WebView* EwkView::webView()
    10741093{
    1075     return toImpl(m_webView.get());
     1094    return m_webView.get();
    10761095}
    10771096
    … …  
    12421261        smartData->view.y = y;
    12431262        evas_object_move(smartData->image, x, y);
    1244         WKViewSetUserViewportTranslation(self->wkView(), x, y);
     1263        self->webView()->setUserViewportTranslation(x, y);
    12451264    }
    12461265
    … …  
    12501269        smartData->view.h = height;
    12511270
    1252         WKViewSetSize(self->wkView(), WKSizeMake(width, height));
     1271        self->webView()->setSize(IntSize(width, height));
    12531272        if (WKPageUseFixedLayout(self->wkPage()))
    12541273            self->pageViewportController().didChangeViewportSize(self->size());
    … …  
    12811300    ASSERT(smartData);
    12821301
    1283     int backgroundAlpha;
    1284     WKViewGetBackgroundColor(toEwkView(smartData)->wkView(), nullptr, nullptr, nullptr, &backgroundAlpha);
    1285     evas_object_image_alpha_set(smartData->image, alpha < 255 || backgroundAlpha < 255);
     1302    Color backgroundColor = static_cast<WebViewEfl*>(toEwkView(smartData)->webView())->viewBackgroundColor();
     1303
     1304    evas_object_image_alpha_set(smartData->image, alpha < 255 || backgroundColor.alpha() < 255);
    12861305    parentSmartClass.color_set(evasObject, red, green, blue, alpha);
    12871306}
    … …  
    12891308Eina_Bool EwkView::handleEwkViewFocusIn(Ewk_View_Smart_Data* smartData)
    12901309{
    1291     WKViewSetIsFocused(toEwkView(smartData)->wkView(), true);
     1310    toEwkView(smartData)->webView()->setFocused(true);
    12921311    return true;
    12931312}
    … …  
    12951314Eina_Bool EwkView::handleEwkViewFocusOut(Ewk_View_Smart_Data* smartData)
    12961315{
    1297     WKViewSetIsFocused(toEwkView(smartData)->wkView(), false);
     1316    toEwkView(smartData)->webView()->setFocused(true);
    12981317    return true;
    12991318}
    … …  
    13681387    WKRetainPtr<WKArrayRef> wkTouchPoints(AdoptWK, WKArrayCreateAdoptingValues(touchPoints.get(), length));
    13691388
    1370     WKViewSendTouchEvent(wkView(), adoptWK(WKTouchEventCreate(static_cast<WKEventType>(type), wkTouchPoints.get(), toWKEventModifiers(evas_key_modifier_get(sd->base.evas)), timestamp)).get());
     1389    static_cast<WebViewEfl*>(m_webView.get())->sendTouchEvent(EwkTouchEvent::create(static_cast<WKEventType>(type), wkTouchPoints.get(), toWKEventModifiers(evas_key_modifier_get(sd->base.evas)), timestamp).get());
    13711390}
    13721391
    … …  
    14131432{
    14141433    // Suspend all animations before taking the snapshot.
    1415     WKViewSuspendActiveDOMObjectsAndAnimations(wkView());
     1434    m_webView->suspendActiveDOMObjectsAndAnimations();
    14161435
    14171436    // Wait for the pending repaint events to be processed.
    … …  
    14231442        RefPtr<cairo_surface_t> snapshot = getImageSurfaceFromFrameBuffer(0, 0, sd->view.w, sd->view.h);
    14241443        // Resume all animations.
    1425         WKViewResumeActiveDOMObjectsAndAnimations(wkView());
     1444        m_webView->resumeActiveDOMObjectsAndAnimations();
    14261445
    14271446        return snapshot.release();
    … …  
    14301449    RefPtr<cairo_surface_t> snapshot = createSurfaceForImage(sd->image);
    14311450    // Resume all animations.
    1432     WKViewResumeActiveDOMObjectsAndAnimations(wkView());
     1451    m_webView->resumeActiveDOMObjectsAndAnimations();
    14331452
    14341453    return snapshot.release();
    … …  
    14441463bool EwkView::scrollBy(const IntSize& offset)
    14451464{
    1446     WKPoint oldPosition = WKViewGetContentPosition(wkView());
    1447     float contentScale = WKViewGetContentScaleFactor(wkView());
     1465    const FloatPoint oldPosition = m_webView->contentPosition();
     1466    float contentScale = m_webView->contentScaleFactor();
    14481467
    14491468    float effectiveScale = contentScale * deviceScaleFactor();
    1450     FloatPoint newPosition(oldPosition.x + offset.width() / effectiveScale, oldPosition.y + offset.height() / effectiveScale);
     1469    FloatPoint newPosition(oldPosition.x() + offset.width() / effectiveScale, oldPosition.y() + offset.height() / effectiveScale);
    14511470
    14521471    // Update new position to the PageViewportController.
    … …  
    14551474
    14561475    // Update new position to the WKView.
    1457     WKPoint position = WKPointMake(newPosition.x(), newPosition.y());
    1458     WKViewSetContentPosition(wkView(), position);
     1476    m_webView->setContentPosition(newPosition);
    14591477
    14601478    // If the page position has not changed, notify the caller using the return value.
    1461     return !(oldPosition == position);
     1479    return !(oldPosition == newPosition);
    14621480}
    14631481
    … …  
    14651483{
    14661484    if (red == 255 && green == 255 && blue == 255 && alpha == 255) {
    1467         WKViewSetDrawsBackground(wkView(), true);
     1485        m_webView->setDrawsBackground(true);
    14681486        WKPageSetBackgroundExtendsBeyondPage(wkPage(), true);
    14691487    } else {
    1470         WKViewSetDrawsBackground(wkView(), false);
     1488        m_webView->setDrawsBackground(false);
    14711489        WKPageSetBackgroundExtendsBeyondPage(wkPage(), false);
    14721490    }
    … …  
    14771495    evas_object_image_alpha_set(image, alpha < 255 || objectAlpha < 255);
    14781496
    1479     WKViewSetBackgroundColor(wkView(), red, green, blue, alpha);
     1497    static_cast<WebViewEfl*>(m_webView.get())->setViewBackgroundColor(WebCore::Color(red, green, blue, alpha));
     1498}
     1499
     1500Color EwkView::backgroundColor()
     1501{
     1502    return static_cast<WebViewEfl*>(m_webView.get())->viewBackgroundColor();
    14801503}
    14811504

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

    r192091 r195241  
    9494class EwkView {
    9595public:
    96     static EwkView* create(WKViewRef, Evas* canvas, Evas_Smart* smart = 0);
     96    static EwkView* create(WebKit::WebView*, Evas* canvas, Evas_Smart* smart = 0);
    9797
    9898    static bool initSmartClassInterface(Ewk_View_Smart_Class&);
    … …  
    102102    Evas_Object* evasObject() { return m_evasObject; }
    103103
    104     WKViewRef wkView() const { return m_webView.get(); }
    105104    WKPageRef wkPage() const;
    106105
    … …  
    113112    WebKit::PageViewportController& pageViewportController() { return m_pageViewportController; }
    114113
     114    bool isVisible() const;
     115    void setVisible(bool);
     116
    115117    void setDeviceScaleFactor(float scale);
    116118    float deviceScaleFactor() const;
    117119
    118120    WebCore::AffineTransform transformToScreen() const;
     121
     122    WebCore::IntSize contentsSize() const;
    119123
    120124    const char* url() const { return m_url; }
    … …  
    151155    void enterFullScreen();
    152156    void exitFullScreen();
     157    bool requestExitFullScreen();
    153158#endif
    154159
    … …  
    201206
    202207    void setBackgroundColor(int red, int green, int blue, int alpha);
     208    WebCore::Color backgroundColor();
    203209
    204210    void didFindZoomableArea(const WKPoint&, const WKRect&);
    … …  
    211217
    212218private:
    213     EwkView(WKViewRef, Evas_Object*);
     219    EwkView(WebKit::WebView*, Evas_Object*);
    214220    ~EwkView();
    215221
    … …  
    255261private:
    256262    // Note, initialization order matters.
    257     WKRetainPtr<WKViewRef> m_webView;
     263    RefPtr<WebKit::WebView> m_webView;
    258264    Evas_Object* m_evasObject;
    259265    RefPtr<EwkContext> m_context;

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

    r179867 r195241  
    136136    mouseMove.event_flags = EVAS_EVENT_FLAG_NONE;
    137137    mouseMove.dev = 0;
    138     WKViewSendMouseMoveEvent(m_ewkView->wkView(), &mouseMove);
     138    static_cast<WebViewEfl*>(m_ewkView->webView())->sendMouseEvent(&mouseMove);
    139139
    140140    Evas_Event_Mouse_Down mouseDown;
    … …  
    149149    mouseDown.event_flags = EVAS_EVENT_FLAG_NONE;
    150150    mouseDown.dev = 0;
    151     WKViewSendMouseDownEvent(m_ewkView->wkView(), &mouseDown);
     151    static_cast<WebViewEfl*>(m_ewkView->webView())->sendMouseEvent(&mouseDown);
    152152
    153153    Evas_Event_Mouse_Up mouseUp;
    … …  
    162162    mouseUp.event_flags = EVAS_EVENT_FLAG_NONE;
    163163    mouseUp.dev = 0;
    164     WKViewSendMouseUpEvent(m_ewkView->wkView(), &mouseUp);
     164    static_cast<WebViewEfl*>(m_ewkView->webView())->sendMouseEvent(&mouseUp);
    165165}
    166166

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

    r193619 r195241  
    8888
    8989    WKRetainPtr<WKViewRef> wkView = adoptWK(WKViewCreate(context, pageConfiguration));
    90     if (EwkView* ewkView = EwkView::create(wkView.get(), canvas, smart))
     90    if (EwkView* ewkView = EwkView::create(toImpl(wkView.get()), canvas, smart))
    9191        return ewkView->evasObject();
    9292
    … …  
    9898    EWK_VIEW_IMPL_GET_OR_RETURN(ewkView, impl, nullptr);
    9999
    100     return impl->wkView();
     100    return toAPI(impl->webView());
    101101}
    102102
    … …  
    619619    EWK_VIEW_IMPL_GET_OR_RETURN(ewkView, impl, false);
    620620
    621     return WKViewExitFullScreen(impl->wkView());
     621    return impl->requestExitFullScreen();
    622622#else
    623623    UNUSED_PARAM(ewkView);
    … …  
    744744    EWK_VIEW_IMPL_GET_OR_RETURN(ewkView, impl, false);
    745745
    746     WKPageSetUseFixedLayout(WKViewGetPage(impl->wkView()), enabled);
     746    WKPageSetUseFixedLayout(impl->wkPage(), enabled);
    747747
    748748    return true;
    … …  
    753753    EWK_VIEW_IMPL_GET_OR_RETURN(ewkView, impl, false);
    754754
    755     return WKPageUseFixedLayout(WKViewGetPage(impl->wkView()));
     755    return WKPageUseFixedLayout(impl->wkPage());
    756756}
    757757
    … …  
    760760    EWK_VIEW_IMPL_GET_OR_RETURN(ewkView, impl);
    761761
    762     WKPageSetFixedLayoutSize(WKViewGetPage(impl->wkView()), WKSizeMake(width, height));
     762    WKPageSetFixedLayoutSize(impl->wkPage(), WKSizeMake(width, height));
    763763}
    764764
    … …  
    767767    EWK_VIEW_IMPL_GET_OR_RETURN(ewkView, impl);
    768768
    769     WKSize size = WKPageFixedLayoutSize(WKViewGetPage(impl->wkView()));
     769    WKSize size = WKPageFixedLayoutSize(impl->wkPage());
    770770
    771771    if (width)
    … …  
    791791    EWK_VIEW_IMPL_GET_OR_RETURN(ewkView, impl);
    792792
    793     WKViewGetBackgroundColor(impl->wkView(), red, green, blue, alpha);
     793    WebCore::Color backgroundColor = impl->backgroundColor();
     794
     795    if (red)
     796        *red = backgroundColor.red();
     797    if (green)
     798        *green = backgroundColor.green();
     799    if (blue)
     800        *blue = backgroundColor.blue();
     801    if (alpha)
     802        *alpha = backgroundColor.alpha();
    794803}
    795804
    … …  
    807816    }
    808817
    809     WKSize contentsSize = WKViewGetContentsSize(impl->wkView());
     818    WebCore::IntSize size = impl->contentsSize();
    810819    if (width)
    811         *width = contentsSize.width;
     820        *width = size.width();
    812821    if (height)
    813         *height = contentsSize.height;
     822        *height = size.height();
    814823
    815824    return true;

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

    r175669 r195241  
    5353void PageViewportControllerClientEfl::setPageScaleFactor(float newScale)
    5454{
    55     WKViewSetContentScaleFactor(m_view->wkView(), newScale);
     55    m_view->webView()->setContentScaleFactor(newScale);
    5656}
    5757

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

    r183864 r195241  
    8787}
    8888
    89 void ViewClientEfl::webProcessDidRelaunch(WKViewRef viewRef, const void* clientInfo)
     89void ViewClientEfl::webProcessDidRelaunch(WKViewRef, const void* clientInfo)
    9090{
    9191    // WebProcess just relaunched and the underlying scene from the view is not set to active by default, which
    9292    // means from that point on we would only get a blank screen, hence we set it to active here to avoid that.
    93     WKViewSetIsActive(viewRef, true);
    94 
    95     if (const char* themePath = toEwkView(clientInfo)->themePath())
    96         WKViewSetThemePath(viewRef, adoptWK(WKStringCreateWithUTF8CString(themePath)).get());
     93    EwkView* ewkView = toEwkView(clientInfo);
     94    ewkView->setVisible(true);
     95
     96    if (const char* themePath = ewkView->themePath())
     97        ewkView->setThemePath(themePath);
    9798}
    9899
    … …  
    189190#endif
    190191
    191     WKViewSetViewClient(m_view->wkView(), &viewClient.base);
     192    m_view->webView()->initializeClient(&viewClient.base);
    192193
    193194#if ENABLE(INPUT_TYPE_COLOR)
    … …  
    198199    colorPickerClient.showColorPicker = showColorPicker;
    199200    colorPickerClient.endColorPicker = endColorPicker;
    200     WKViewSetColorPickerClient(m_view->wkView(), &colorPickerClient.base);
     201    static_cast<WebViewEfl*>(m_view->webView())->initializeColorPickerClient(&colorPickerClient.base);
    201202#endif
    202203}
    … …  
    204205ViewClientEfl::~ViewClientEfl()
    205206{
    206     WKViewSetViewClient(m_view->wkView(), 0);
     207    m_view->webView()->initializeClient(nullptr);
    207208
    208209#if ENABLE(INPUT_TYPE_COLOR)
    209     WKViewSetColorPickerClient(m_view->wkView(), 0);
     210    static_cast<WebViewEfl*>(m_view->webView())->initializeColorPickerClient(nullptr);
    210211#endif
    211212}
Note: See TracChangeset for help on using the changeset viewer.