1 files changed, 11 insertions, 10 deletions

diff --git a/Source/WebKit2/UIProcess/API/efl/ewk_view.cpp b/Source/WebKit2/UIProcess/API/efl/ewk_view.cpp
index ee4507c9f..d8608aa48 100644
--- a/Source/WebKit2/UIProcess/API/efl/ewk_view.cpp
+++ b/Source/WebKit2/UIProcess/API/efl/ewk_view.cpp
@@ -41,6 +41,7 @@
 #include "ewk_back_forward_list_private.h"
 #include "ewk_context.h"
 #include "ewk_context_private.h"
+#include "ewk_favicon_database_private.h"
 #include "ewk_intent_private.h"
 #include "ewk_popup_menu_item.h"
 #include "ewk_popup_menu_item_private.h"
@@ -75,7 +76,7 @@
 #endif
 
 #if USE(COORDINATED_GRAPHICS)
-#include "EflViewportHandler.h"
+#include "PageViewportControllerClientEfl.h"
 #endif
 
 using namespace WebKit;
@@ -115,7 +116,7 @@ static inline void removeFromPageViewMap(const Evas_Object* ewkView)
 struct Ewk_View_Private_Data {
     OwnPtr<PageClientImpl> pageClient;
 #if USE(COORDINATED_GRAPHICS)
-    OwnPtr<EflViewportHandler> viewportHandler;
+    OwnPtr<PageViewportControllerClientEfl> pageViewportControllerClient;
 #endif
     RefPtr<WebPageProxy> pageProxy;
 
@@ -171,7 +172,7 @@ struct Ewk_View_Private_Data {
     {
         /* Unregister icon change callback */
         Ewk_Favicon_Database* iconDatabase = ewk_context_favicon_database_get(context);
-        ewk_favicon_database_icon_change_callback_del(iconDatabase, _ewk_view_on_favicon_changed);
+        iconDatabase->unwatchChanges(_ewk_view_on_favicon_changed);
 
         void* item;
         EINA_LIST_FREE(popupMenuItems, item)
@@ -623,7 +624,7 @@ bool ewk_view_accelerated_compositing_mode_enter(const Evas_Object* ewkView)
         return false;
     }
 
-    priv->viewportHandler->setRendererActive(true);
+    priv->pageViewportControllerClient->setRendererActive(true);
     return true;
 }
 
@@ -667,7 +668,7 @@ static void _ewk_view_smart_calculate(Evas_Object* ewkView)
 
     if (smartData->changed.size) {
 #if USE(COORDINATED_GRAPHICS)
-        priv->viewportHandler->updateViewportSize(IntSize(width, height));
+        priv->pageViewportControllerClient->updateViewportSize(IntSize(width, height));
 #endif
 #if USE(ACCELERATED_COMPOSITING)
         needsNewSurface = priv->evasGlSurface;
@@ -824,7 +825,7 @@ static void _ewk_view_initialize(Evas_Object* ewkView, Ewk_Context* context, WKP
     priv->context = ewk_context_ref(context);
 
 #if USE(COORDINATED_GRAPHICS)
-    priv->viewportHandler = EflViewportHandler::create(ewkView);
+    priv->pageViewportControllerClient = PageViewportControllerClientEfl::create(ewkView);
 #endif
 
     WKPageRef wkPage = toAPI(priv->pageProxy.get());
@@ -841,7 +842,7 @@ static void _ewk_view_initialize(Evas_Object* ewkView, Ewk_Context* context, WKP
 
     /* Listen for favicon changes */
     Ewk_Favicon_Database* iconDatabase = ewk_context_favicon_database_get(priv->context);
-    ewk_favicon_database_icon_change_callback_add(iconDatabase, _ewk_view_on_favicon_changed, ewkView);
+    iconDatabase->watchChanges(IconChangeCallbackData(_ewk_view_on_favicon_changed, ewkView));
 }
 
 static Evas_Object* _ewk_view_add_with_smart(Evas* canvas, Evas_Smart* smart)
@@ -1295,7 +1296,7 @@ void ewk_view_display(Evas_Object* ewkView, const IntRect& rect)
     EWK_VIEW_PRIV_GET_OR_RETURN(smartData, priv);
 
     evas_gl_make_current(priv->evasGl, priv->evasGlSurface, priv->evasGlContext);
-    priv->viewportHandler->display(rect, IntPoint(smartData->view.x, smartData->view.y));
+    priv->pageViewportControllerClient->display(rect, IntPoint(smartData->view.x, smartData->view.y));
 #endif
 
     evas_object_image_data_update_add(smartData->image, rect.x(), rect.y(), rect.width(), rect.height());
@@ -1429,7 +1430,7 @@ Eina_Bool ewk_view_intent_deliver(Evas_Object* ewkView, Ewk_Intent* intent)
     EINA_SAFETY_ON_NULL_RETURN_VAL(intent, false);
 
     WebPageProxy* page = priv->pageProxy.get();
-    page->deliverIntentToFrame(page->mainFrame(), toImpl(intent->wkIntent.get()));
+    page->deliverIntentToFrame(page->mainFrame(), intent->webIntentData());
 
     return true;
 #else
@@ -1733,7 +1734,7 @@ void ewk_view_contents_size_changed(const Evas_Object* ewkView, const IntSize& s
     EWK_VIEW_SD_GET_OR_RETURN(ewkView, smartData);
     EWK_VIEW_PRIV_GET_OR_RETURN(smartData, priv);
 
-    priv->viewportHandler->didChangeContentsSize(size);
+    priv->pageViewportControllerClient->didChangeContentsSize(size);
 #else
     UNUSED_PARAM(ewkView);
     UNUSED_PARAM(size);