Modified: trunk/Source/WebKit2/ChangeLog (132705 => 132706)
--- trunk/Source/WebKit2/ChangeLog 2012-10-26 22:42:16 UTC (rev 132705)
+++ trunk/Source/WebKit2/ChangeLog 2012-10-26 22:45:26 UTC (rev 132706)
@@ -1,3 +1,32 @@
+2012-10-26 Yael Aharon <yael.aha...@intel.com>
+
+ [EFL][WK2][AC] Build fix after r132647.
+ https://bugs.webkit.org/show_bug.cgi?id=100540
+
+ 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):
+
2012-10-26 Christophe Dumez <christophe.du...@intel.com>
[EFL][WK2] Get rid of C'ism in text checker API
Modified: trunk/Source/WebKit2/UIProcess/API/efl/EwkViewImpl.cpp (132705 => 132706)
--- trunk/Source/WebKit2/UIProcess/API/efl/EwkViewImpl.cpp 2012-10-26 22:42:16 UTC (rev 132705)
+++ trunk/Source/WebKit2/UIProcess/API/efl/EwkViewImpl.cpp 2012-10-26 22:45:26 UTC (rev 132706)
@@ -131,7 +131,7 @@
m_pageProxy->initializeWebPage();
#if USE(TILED_BACKING_STORE)
- pageClient->setPageViewportController(pageViewportController.get());
+ m_pageClient->setPageViewportController(m_pageViewportController.get());
#endif
#if ENABLE(FULLSCREEN_API)
@@ -255,8 +255,8 @@
for (Vector<IntRect>::iterator it = rects.begin(); it != end; ++it) {
IntRect rect = *it;
#if USE(COORDINATED_GRAPHICS)
- evas_gl_make_current(viewImpl->evasGl, viewImpl->evasGlSurface, viewImpl->evasGlContext);
- viewImpl->pageViewportControllerClient->display(rect, IntPoint(sd->view.x, sd->view.y));
+ evas_gl_make_current(viewImpl->m_evasGl, viewImpl->m_evasGlSurface, viewImpl->m_evasGlContext);
+ viewImpl->m_pageViewportControllerClient->display(rect, IntPoint(sd->view.x, sd->view.y));
#endif
evas_object_image_data_update_add(sd->image, rect.x(), rect.y(), rect.width(), rect.height());
@@ -415,7 +415,7 @@
#if USE(TILED_BACKING_STORE)
void EwkViewImpl::informLoadCommitted()
{
- pageViewportController->didCommitLoad();
+ m_pageViewportController->didCommitLoad();
}
#endif
@@ -728,13 +728,13 @@
EVAS_GL_MULTISAMPLE_NONE
};
- ASSERT(!evasGlSurface);
- evasGlSurface = evas_gl_surface_create(evasGl, &evasGlConfig, viewSize.width(), viewSize.height());
- if (!evasGlSurface)
+ ASSERT(!m_evasGlSurface);
+ m_evasGlSurface = evas_gl_surface_create(m_evasGl, &evasGlConfig, viewSize.width(), viewSize.height());
+ if (!m_evasGlSurface)
return false;
Evas_Native_Surface nativeSurface;
- evas_gl_native_surface_get(evasGl, evasGlSurface, &nativeSurface);
+ evas_gl_native_surface_get(m_evasGl, m_evasGlSurface, &nativeSurface);
evas_object_image_native_surface_set(sd->image, &nativeSurface);
return true;
@@ -742,52 +742,52 @@
bool EwkViewImpl::enterAcceleratedCompositingMode()
{
- if (evasGl) {
+ if (m_evasGl) {
EINA_LOG_DOM_WARN(_ewk_log_dom, "Accelerated compositing mode already entered.");
return false;
}
Evas* evas = evas_object_evas_get(m_view);
- evasGl = evas_gl_new(evas);
- if (!evasGl)
+ m_evasGl = evas_gl_new(evas);
+ if (!m_evasGl)
return false;
- evasGlContext = evas_gl_context_create(evasGl, 0);
- if (!evasGlContext) {
- evas_gl_free(evasGl);
- evasGl = 0;
+ m_evasGlContext = evas_gl_context_create(m_evasGl, 0);
+ if (!m_evasGlContext) {
+ evas_gl_free(m_evasGl);
+ m_evasGl = 0;
return false;
}
if (!createGLSurface(size())) {
- evas_gl_context_destroy(evasGl, evasGlContext);
- evasGlContext = 0;
+ evas_gl_context_destroy(m_evasGl, m_evasGlContext);
+ m_evasGlContext = 0;
- evas_gl_free(evasGl);
- evasGl = 0;
+ evas_gl_free(m_evasGl);
+ m_evasGl = 0;
return false;
}
- pageViewportControllerClient->setRendererActive(true);
+ m_pageViewportControllerClient->setRendererActive(true);
return true;
}
bool EwkViewImpl::exitAcceleratedCompositingMode()
{
- EINA_SAFETY_ON_NULL_RETURN_VAL(evasGl, false);
+ EINA_SAFETY_ON_NULL_RETURN_VAL(m_evasGl, false);
- if (evasGlSurface) {
- evas_gl_surface_destroy(evasGl, evasGlSurface);
- evasGlSurface = 0;
+ if (m_evasGlSurface) {
+ evas_gl_surface_destroy(m_evasGl, m_evasGlSurface);
+ m_evasGlSurface = 0;
}
- if (evasGlContext) {
- evas_gl_context_destroy(evasGl, evasGlContext);
- evasGlContext = 0;
+ if (m_evasGlContext) {
+ evas_gl_context_destroy(m_evasGl, m_evasGlContext);
+ m_evasGlContext = 0;
}
- evas_gl_free(evasGl);
- evasGl = 0;
+ evas_gl_free(m_evasGl);
+ m_evasGl = 0;
return true;
}
@@ -867,7 +867,7 @@
void EwkViewImpl::informContentsSizeChange(const IntSize& size)
{
#if USE(COORDINATED_GRAPHICS)
- pageViewportControllerClient->didChangeContentsSize(size);
+ m_pageViewportControllerClient->didChangeContentsSize(size);
#else
UNUSED_PARAM(size);
#endif
Modified: trunk/Source/WebKit2/UIProcess/API/efl/EwkViewImpl.h (132705 => 132706)
--- trunk/Source/WebKit2/UIProcess/API/efl/EwkViewImpl.h 2012-10-26 22:42:16 UTC (rev 132705)
+++ trunk/Source/WebKit2/UIProcess/API/efl/EwkViewImpl.h 2012-10-26 22:45:26 UTC (rev 132706)
@@ -211,6 +211,16 @@
#if ENABLE(WEB_INTENTS_TAG)
void informIntentServiceRegistration(Ewk_Intent_Service* ewkIntentService);
#endif
+#if USE(TILED_BACKING_STORE)
+ WebKit::PageViewportControllerClientEfl* pageViewportControllerClient() { return m_pageViewportControllerClient.get(); }
+ WebKit::PageViewportController* pageViewportController() { return m_pageViewportController.get(); }
+#endif
+#if USE(ACCELERATED_COMPOSITING)
+ Evas_GL* evasGl() { return m_evasGl; }
+ Evas_GL_Context* evasGlContext() { return m_evasGlContext; }
+ Evas_GL_Surface* evasGlSurface() { return m_evasGlSurface; }
+ void resetEvasGlSurface() { m_evasGlSurface = 0; }
+#endif
private:
inline Ewk_View_Smart_Data* smartData();
Modified: trunk/Source/WebKit2/UIProcess/API/efl/ewk_view.cpp (132705 => 132706)
--- trunk/Source/WebKit2/UIProcess/API/efl/ewk_view.cpp 2012-10-26 22:42:16 UTC (rev 132705)
+++ trunk/Source/WebKit2/UIProcess/API/efl/ewk_view.cpp 2012-10-26 22:45:26 UTC (rev 132706)
@@ -148,8 +148,8 @@
Evas_Coord_Point result;
EWK_VIEW_IMPL_GET_OR_RETURN(smartData, impl, result);
- result.x = (point.x - smartData->view.x) / impl->pageViewportControllerClient->scaleFactor() + smartData->view.x + impl->pageViewportControllerClient->scrollPosition().x();
- result.y = (point.y - smartData->view.y) / impl->pageViewportControllerClient->scaleFactor() + smartData->view.y + impl->pageViewportControllerClient->scrollPosition().y();
+ result.x = (point.x - smartData->view.x) / impl->pageViewportControllerClient()->scaleFactor() + smartData->view.x + impl->pageViewportControllerClient()->scrollPosition().x();
+ result.y = (point.y - smartData->view.y) / impl->pageViewportControllerClient()->scaleFactor() + smartData->view.y + impl->pageViewportControllerClient()->scrollPosition().y();
return result;
}
#endif
@@ -390,10 +390,10 @@
if (smartData->changed.size) {
#if USE(COORDINATED_GRAPHICS)
- impl->pageViewportControllerClient->updateViewportSize(IntSize(width, height));
+ impl->pageViewportControllerClient()->updateViewportSize(IntSize(width, height));
#endif
#if USE(ACCELERATED_COMPOSITING)
- needsNewSurface = impl->evasGlSurface;
+ needsNewSurface = impl->evasGlSurface();
#endif
if (impl->page()->drawingArea())
@@ -413,8 +413,8 @@
#if USE(ACCELERATED_COMPOSITING)
if (needsNewSurface) {
- evas_gl_surface_destroy(impl->evasGl, impl->evasGlSurface);
- impl->evasGlSurface = 0;
+ evas_gl_surface_destroy(impl->evasGl(), impl->evasGlSurface());
+ impl->resetEvasGlSurface();
impl->createGLSurface(IntSize(width, height));
impl->redrawRegion(IntRect(IntPoint(), IntSize(width, height)));
}
