Changeset 132706 in webkit


Ignore:
Timestamp:
Oct 26, 2012, 3:45:26 PM (12 years ago)
Author:
commit-queue@webkit.org
Message:

[EFL][WK2][AC] Build fix after r132647.
​https://bugs.webkit.org/show_bug.cgi?id=100540

Patch by Yael Aharon <​yael.aharon@intel.com> on 2012-10-26
Reviewed by Kenneth Rohde Christiansen.

AC enabled build is broken after the latest refactoring of EFL WK2.

  • UIProcess/API/efl/EwkViewImpl.cpp:

(EwkViewImpl::EwkViewImpl):
(EwkViewImpl::displayTimerFired):
(EwkViewImpl::informLoadCommitted):
(EwkViewImpl::createGLSurface):
(EwkViewImpl::enterAcceleratedCompositingMode):
(EwkViewImpl::exitAcceleratedCompositingMode):
(EwkViewImpl::informContentsSizeChange):

  • UIProcess/API/efl/EwkViewImpl.h:

(EwkViewImpl):
(EwkViewImpl::pageViewportControllerClient):
(EwkViewImpl::pageViewportController):
(EwkViewImpl::evasGl):
(EwkViewImpl::evasGlContext):
(EwkViewImpl::evasGlSurface):
(EwkViewImpl::resetEvasGlSurface):

  • UIProcess/API/efl/ewk_view.cpp:

(mapToWebContent):
(_ewk_view_smart_calculate):

Location:
trunk/Source/WebKit2
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit2/ChangeLog

    r132657 r132706  
     12012-10-26  Yael Aharon  <yael.aharon@intel.com>
     2
     3        [EFL][WK2][AC] Build fix after r132647.
     4        https://bugs.webkit.org/show_bug.cgi?id=100540
     5
     6        Reviewed by Kenneth Rohde Christiansen.
     7
     8        AC enabled build is broken after the latest refactoring of EFL WK2.
     9
     10        * UIProcess/API/efl/EwkViewImpl.cpp:
     11        (EwkViewImpl::EwkViewImpl):
     12        (EwkViewImpl::displayTimerFired):
     13        (EwkViewImpl::informLoadCommitted):
     14        (EwkViewImpl::createGLSurface):
     15        (EwkViewImpl::enterAcceleratedCompositingMode):
     16        (EwkViewImpl::exitAcceleratedCompositingMode):
     17        (EwkViewImpl::informContentsSizeChange):
     18        * UIProcess/API/efl/EwkViewImpl.h:
     19        (EwkViewImpl):
     20        (EwkViewImpl::pageViewportControllerClient):
     21        (EwkViewImpl::pageViewportController):
     22        (EwkViewImpl::evasGl):
     23        (EwkViewImpl::evasGlContext):
     24        (EwkViewImpl::evasGlSurface):
     25        (EwkViewImpl::resetEvasGlSurface):
     26        * UIProcess/API/efl/ewk_view.cpp:
     27        (mapToWebContent):
     28        (_ewk_view_smart_calculate):
     29
    1302012-10-26  Christophe Dumez  <christophe.dumez@intel.com>
    231

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

    r132647 r132706  
    132132
    133133#if USE(TILED_BACKING_STORE)
    134     pageClient->setPageViewportController(pageViewportController.get());
     134    m_pageClient->setPageViewportController(m_pageViewportController.get());
    135135#endif
    136136
    … …  
    256256        IntRect rect = *it;
    257257#if USE(COORDINATED_GRAPHICS)
    258         evas_gl_make_current(viewImpl->evasGl, viewImpl->evasGlSurface, viewImpl->evasGlContext);
    259         viewImpl->pageViewportControllerClient->display(rect, IntPoint(sd->view.x, sd->view.y));
     258        evas_gl_make_current(viewImpl->m_evasGl, viewImpl->m_evasGlSurface, viewImpl->m_evasGlContext);
     259        viewImpl->m_pageViewportControllerClient->display(rect, IntPoint(sd->view.x, sd->view.y));
    260260#endif
    261261
    … …  
    416416void EwkViewImpl::informLoadCommitted()
    417417{
    418     pageViewportController->didCommitLoad();
     418    m_pageViewportController->didCommitLoad();
    419419}
    420420#endif
    … …  
    729729    };
    730730
    731     ASSERT(!evasGlSurface);
    732     evasGlSurface = evas_gl_surface_create(evasGl, &evasGlConfig, viewSize.width(), viewSize.height());
    733     if (!evasGlSurface)
     731    ASSERT(!m_evasGlSurface);
     732    m_evasGlSurface = evas_gl_surface_create(m_evasGl, &evasGlConfig, viewSize.width(), viewSize.height());
     733    if (!m_evasGlSurface)
    734734        return false;
    735735
    736736    Evas_Native_Surface nativeSurface;
    737     evas_gl_native_surface_get(evasGl, evasGlSurface, &nativeSurface);
     737    evas_gl_native_surface_get(m_evasGl, m_evasGlSurface, &nativeSurface);
    738738    evas_object_image_native_surface_set(sd->image, &nativeSurface);
    739739
    … …  
    743743bool EwkViewImpl::enterAcceleratedCompositingMode()
    744744{
    745     if (evasGl) {
     745    if (m_evasGl) {
    746746        EINA_LOG_DOM_WARN(_ewk_log_dom, "Accelerated compositing mode already entered.");
    747747        return false;
    … …  
    749749
    750750    Evas* evas = evas_object_evas_get(m_view);
    751     evasGl = evas_gl_new(evas);
    752     if (!evasGl)
     751    m_evasGl = evas_gl_new(evas);
     752    if (!m_evasGl)
    753753        return false;
    754754
    755     evasGlContext = evas_gl_context_create(evasGl, 0);
    756     if (!evasGlContext) {
    757         evas_gl_free(evasGl);
    758         evasGl = 0;
     755    m_evasGlContext = evas_gl_context_create(m_evasGl, 0);
     756    if (!m_evasGlContext) {
     757        evas_gl_free(m_evasGl);
     758        m_evasGl = 0;
    759759        return false;
    760760    }
    761761
    762762    if (!createGLSurface(size())) {
    763         evas_gl_context_destroy(evasGl, evasGlContext);
    764         evasGlContext = 0;
    765 
    766         evas_gl_free(evasGl);
    767         evasGl = 0;
     763        evas_gl_context_destroy(m_evasGl, m_evasGlContext);
     764        m_evasGlContext = 0;
     765
     766        evas_gl_free(m_evasGl);
     767        m_evasGl = 0;
    768768        return false;
    769769    }
    770770
    771     pageViewportControllerClient->setRendererActive(true);
     771    m_pageViewportControllerClient->setRendererActive(true);
    772772    return true;
    773773}
    … …  
    775775bool EwkViewImpl::exitAcceleratedCompositingMode()
    776776{
    777     EINA_SAFETY_ON_NULL_RETURN_VAL(evasGl, false);
    778 
    779     if (evasGlSurface) {
    780         evas_gl_surface_destroy(evasGl, evasGlSurface);
    781         evasGlSurface = 0;
    782     }
    783 
    784     if (evasGlContext) {
    785         evas_gl_context_destroy(evasGl, evasGlContext);
    786         evasGlContext = 0;
    787     }
    788 
    789     evas_gl_free(evasGl);
    790     evasGl = 0;
     777    EINA_SAFETY_ON_NULL_RETURN_VAL(m_evasGl, false);
     778
     779    if (m_evasGlSurface) {
     780        evas_gl_surface_destroy(m_evasGl, m_evasGlSurface);
     781        m_evasGlSurface = 0;
     782    }
     783
     784    if (m_evasGlContext) {
     785        evas_gl_context_destroy(m_evasGl, m_evasGlContext);
     786        m_evasGlContext = 0;
     787    }
     788
     789    evas_gl_free(m_evasGl);
     790    m_evasGl = 0;
    791791
    792792    return true;
    … …  
    868868{
    869869#if USE(COORDINATED_GRAPHICS)
    870     pageViewportControllerClient->didChangeContentsSize(size);
     870    m_pageViewportControllerClient->didChangeContentsSize(size);
    871871#else
    872872    UNUSED_PARAM(size);

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

    r132647 r132706  
    212212    void informIntentServiceRegistration(Ewk_Intent_Service* ewkIntentService);
    213213#endif
     214#if USE(TILED_BACKING_STORE)
     215    WebKit::PageViewportControllerClientEfl* pageViewportControllerClient() { return m_pageViewportControllerClient.get(); }
     216    WebKit::PageViewportController* pageViewportController() { return m_pageViewportController.get(); }
     217#endif
     218#if USE(ACCELERATED_COMPOSITING)
     219    Evas_GL* evasGl() { return m_evasGl; }
     220    Evas_GL_Context* evasGlContext() { return m_evasGlContext; }
     221    Evas_GL_Surface* evasGlSurface() { return m_evasGlSurface; }
     222    void resetEvasGlSurface() { m_evasGlSurface = 0; }
     223#endif
    214224
    215225private:

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

    r132647 r132706  
    149149    EWK_VIEW_IMPL_GET_OR_RETURN(smartData, impl, result);
    150150
    151     result.x = (point.x  - smartData->view.x) / impl->pageViewportControllerClient->scaleFactor() + smartData->view.x + impl->pageViewportControllerClient->scrollPosition().x();
    152     result.y = (point.y - smartData->view.y) / impl->pageViewportControllerClient->scaleFactor() + smartData->view.y + impl->pageViewportControllerClient->scrollPosition().y();
     151    result.x = (point.x  - smartData->view.x) / impl->pageViewportControllerClient()->scaleFactor() + smartData->view.x + impl->pageViewportControllerClient()->scrollPosition().x();
     152    result.y = (point.y - smartData->view.y) / impl->pageViewportControllerClient()->scaleFactor() + smartData->view.y + impl->pageViewportControllerClient()->scrollPosition().y();
    153153    return result;
    154154}
    … …  
    391391    if (smartData->changed.size) {
    392392#if USE(COORDINATED_GRAPHICS)
    393         impl->pageViewportControllerClient->updateViewportSize(IntSize(width, height));
     393        impl->pageViewportControllerClient()->updateViewportSize(IntSize(width, height));
    394394#endif
    395395#if USE(ACCELERATED_COMPOSITING)
    396         needsNewSurface = impl->evasGlSurface;
     396        needsNewSurface = impl->evasGlSurface();
    397397#endif
    398398
    … …  
    414414#if USE(ACCELERATED_COMPOSITING)
    415415    if (needsNewSurface) {
    416         evas_gl_surface_destroy(impl->evasGl, impl->evasGlSurface);
    417         impl->evasGlSurface = 0;
     416        evas_gl_surface_destroy(impl->evasGl(), impl->evasGlSurface());
     417        impl->resetEvasGlSurface();
    418418        impl->createGLSurface(IntSize(width, height));
    419419        impl->redrawRegion(IntRect(IntPoint(), IntSize(width, height)));
Note: See TracChangeset for help on using the changeset viewer.