[webkit-changes] [123866] trunk/Source/WebKit2

Fri, 27 Jul 2012 04:52:28 -0700

Title: [123866] trunk/Source/WebKit2
Revision
123866
Author
[email protected]
Date
2012-07-27 04:52:15 -0700 (Fri, 27 Jul 2012)

Log Message

[EFL][WK2] Stop using C API to interact with the page in Ewk_View
https://bugs.webkit.org/show_bug.cgi?id=92463

Patch by Christophe Dumez <[email protected]> on 2012-07-27
Reviewed by Simon Hausmann.

Stop using C API to interact with the PageProxy in Ewk_View
and use the PageProxy object directly. This avoids useless
converting to WK type using toAPI() all the time.

* UIProcess/API/efl/ewk_view.cpp:
(ewk_view_base_add):
(ewk_view_uri_update):
(ewk_view_uri_set):
(ewk_view_reload):
(ewk_view_reload_bypass_cache):
(ewk_view_stop):
(ewk_view_load_progress_get):
(ewk_view_device_pixel_ratio_set):
(ewk_view_theme_get):
(ewk_view_cursor_set):
(ewk_view_back):
(ewk_view_forward):
(ewk_view_intent_deliver):
(ewk_view_back_possible):
(ewk_view_forward_possible):
(ewk_view_setting_encoding_custom_get):
(ewk_view_setting_encoding_custom_set):

Modified Paths

Diff

Modified: trunk/Source/WebKit2/ChangeLog (123865 => 123866)


--- trunk/Source/WebKit2/ChangeLog	2012-07-27 11:42:32 UTC (rev 123865)
+++ trunk/Source/WebKit2/ChangeLog	2012-07-27 11:52:15 UTC (rev 123866)
@@ -1,3 +1,33 @@
+2012-07-27  Christophe Dumez  <[email protected]>
+
+        [EFL][WK2] Stop using C API to interact with the page in Ewk_View
+        https://bugs.webkit.org/show_bug.cgi?id=92463
+
+        Reviewed by Simon Hausmann.
+
+        Stop using C API to interact with the PageProxy in Ewk_View
+        and use the PageProxy object directly. This avoids useless
+        converting to WK type using toAPI() all the time.
+
+        * UIProcess/API/efl/ewk_view.cpp:
+        (ewk_view_base_add):
+        (ewk_view_uri_update):
+        (ewk_view_uri_set):
+        (ewk_view_reload):
+        (ewk_view_reload_bypass_cache):
+        (ewk_view_stop):
+        (ewk_view_load_progress_get):
+        (ewk_view_device_pixel_ratio_set):
+        (ewk_view_theme_get):
+        (ewk_view_cursor_set):
+        (ewk_view_back):
+        (ewk_view_forward):
+        (ewk_view_intent_deliver):
+        (ewk_view_back_possible):
+        (ewk_view_forward_possible):
+        (ewk_view_setting_encoding_custom_get):
+        (ewk_view_setting_encoding_custom_set):
+
 2012-07-27  Dominik Röttsches  <[email protected]>
 
         [Cairo] Add complex font drawing using HarfbuzzNG

Modified: trunk/Source/WebKit2/UIProcess/API/efl/ewk_view.cpp (123865 => 123866)


--- trunk/Source/WebKit2/UIProcess/API/efl/ewk_view.cpp	2012-07-27 11:42:32 UTC (rev 123865)
+++ trunk/Source/WebKit2/UIProcess/API/efl/ewk_view.cpp	2012-07-27 11:52:15 UTC (rev 123866)
@@ -548,11 +548,13 @@
     }
 
     priv->pageClient = PageClientImpl::create(toImpl(contextRef), toImpl(pageGroupRef), ewkView);
-    ewk_view_form_client_attach(toAPI(priv->pageClient->page()), ewkView);
-    ewk_view_loader_client_attach(toAPI(priv->pageClient->page()), ewkView);
-    ewk_view_policy_client_attach(toAPI(priv->pageClient->page()), ewkView);
-    ewk_view_resource_load_client_attach(toAPI(priv->pageClient->page()), ewkView);
 
+    WKPageRef wkPage = toAPI(priv->pageClient->page());
+    ewk_view_form_client_attach(wkPage, ewkView);
+    ewk_view_loader_client_attach(wkPage, ewkView);
+    ewk_view_policy_client_attach(wkPage, ewkView);
+    ewk_view_resource_load_client_attach(wkPage, ewkView);
+
     ewk_view_theme_set(ewkView, DEFAULT_THEME_PATH"/default.edj");
 
     return ewkView;
@@ -579,12 +581,11 @@
     EWK_VIEW_SD_GET_OR_RETURN(ewkView, smartData);
     EWK_VIEW_PRIV_GET_OR_RETURN(smartData, priv);
 
-    WKRetainPtr<WKURLRef> wkURL(AdoptWK, WKPageCopyActiveURL(toAPI(priv->pageClient->page())));
-    if (!wkURL)
+    String activeURL = priv->pageClient->page()->activeURL();
+    if (activeURL.isEmpty())
         return;
 
-    CString activeURI = toImpl(wkURL.get())->string().utf8();
-    if (!eina_stringshare_replace(&priv->uri, activeURI.data()))
+    if (!eina_stringshare_replace(&priv->uri, activeURL.utf8().data()))
         return;
 
     evas_object_smart_callback_call(ewkView, "uri,changed", static_cast<void*>(const_cast<char*>(priv->uri)));
@@ -594,9 +595,9 @@
 {
     EWK_VIEW_SD_GET_OR_RETURN(ewkView, smartData, false);
     EWK_VIEW_PRIV_GET_OR_RETURN(smartData, priv, false);
+    EINA_SAFETY_ON_NULL_RETURN_VAL(uri, false);
 
-    WKRetainPtr<WKURLRef> url(AdoptWK, WKURLCreateWithUTF8CString(uri));
-    WKPageLoadURL(toAPI(priv->pageClient->page()), url.get());
+    priv->pageClient->page()->loadURL(uri);
     ewk_view_uri_update(ewkView);
 
     return true;
@@ -615,8 +616,9 @@
     EWK_VIEW_SD_GET_OR_RETURN(ewkView, smartData, false);
     EWK_VIEW_PRIV_GET_OR_RETURN(smartData, priv, false);
 
-    WKPageReload(toAPI(priv->pageClient->page()));
+    priv->pageClient->page()->reload(/*reloadFromOrigin*/ false);
     ewk_view_uri_update(ewkView);
+
     return true;
 }
 
@@ -625,8 +627,9 @@
     EWK_VIEW_SD_GET_OR_RETURN(ewkView, smartData, false);
     EWK_VIEW_PRIV_GET_OR_RETURN(smartData, priv, false);
 
-    WKPageReloadFromOrigin(toAPI(priv->pageClient->page()));
+    priv->pageClient->page()->reload(/*reloadFromOrigin*/ true);
     ewk_view_uri_update(ewkView);
+
     return true;
 }
 
@@ -635,7 +638,8 @@
     EWK_VIEW_SD_GET_OR_RETURN(ewkView, smartData, false);
     EWK_VIEW_PRIV_GET_OR_RETURN(smartData, priv, false);
 
-    WKPageStopLoading(toAPI(priv->pageClient->page()));
+    priv->pageClient->page()->stopLoading();
+
     return true;
 }
 
@@ -764,7 +768,7 @@
     EWK_VIEW_SD_GET_OR_RETURN(ewkView, smartData, -1.0);
     EWK_VIEW_PRIV_GET_OR_RETURN(smartData, priv, -1.0);
 
-    return WKPageGetEstimatedProgress(toAPI(priv->pageClient->page()));
+    return priv->pageClient->page()->estimatedProgress();
 }
 
 Eina_Bool ewk_view_device_pixel_ratio_set(Evas_Object* ewkView, float ratio)
@@ -773,6 +777,7 @@
     EWK_VIEW_PRIV_GET_OR_RETURN(smartData, priv, false);
 
     priv->pageClient->page()->setCustomDeviceScaleFactor(ratio);
+
     return true;
 }
 
@@ -823,6 +828,7 @@
 {
     EWK_VIEW_SD_GET_OR_RETURN(ewkView, smartData, 0);
     EWK_VIEW_PRIV_GET_OR_RETURN(smartData, priv, 0);
+
     return priv->theme;
 }
 
@@ -834,6 +840,7 @@
     const char* group = cursor.platformCursor();
     if (!group || group == priv->cursorGroup)
         return;
+
     priv->cursorGroup = group;
 
     if (priv->cursorObject)
@@ -891,11 +898,12 @@
     EWK_VIEW_SD_GET_OR_RETURN(ewkView, smartData, false);
     EWK_VIEW_PRIV_GET_OR_RETURN(smartData, priv, false);
 
-    WKPageRef pageRef = toAPI(priv->pageClient->page());
-    if (WKPageCanGoBack(pageRef)) {
-        WKPageGoBack(pageRef);
+    WebPageProxy* page = priv->pageClient->page();
+    if (page->canGoBack()) {
+        page->goBack();
         return true;
     }
+
     return false;
 }
 
@@ -904,11 +912,12 @@
     EWK_VIEW_SD_GET_OR_RETURN(ewkView, smartData, false);
     EWK_VIEW_PRIV_GET_OR_RETURN(smartData, priv, false);
 
-    WKPageRef pageRef = toAPI(priv->pageClient->page());
-    if (WKPageCanGoForward(pageRef)) {
-        WKPageGoForward(pageRef);
+    WebPageProxy* page = priv->pageClient->page();
+    if (page->canGoForward()) {
+        page->goForward();
         return true;
     }
+
     return false;
 }
 
@@ -919,8 +928,9 @@
     EWK_VIEW_PRIV_GET_OR_RETURN(smartData, priv, false);
     EINA_SAFETY_ON_NULL_RETURN_VAL(intent, false);
 
-    WKPageRef wkPage = toAPI(priv->pageClient->page());
-    WKPageDeliverIntentToFrame(wkPage, WKPageGetMainFrame(wkPage), ewk_intent_WKIntentDataRef_get(intent));
+    WebPageProxy* page = priv->pageClient->page();
+    page->deliverIntentToFrame(page->mainFrame(), toImpl(ewk_intent_WKIntentDataRef_get(intent)));
+
     return true;
 #else
     return false;
@@ -932,7 +942,7 @@
     EWK_VIEW_SD_GET_OR_RETURN(ewkView, smartData, false);
     EWK_VIEW_PRIV_GET_OR_RETURN(smartData, priv, false);
 
-    return WKPageCanGoBack(toAPI(priv->pageClient->page()));
+    return priv->pageClient->page()->canGoBack();
 }
 
 Eina_Bool ewk_view_forward_possible(Evas_Object* ewkView)
@@ -940,7 +950,7 @@
     EWK_VIEW_SD_GET_OR_RETURN(ewkView, smartData, false);
     EWK_VIEW_PRIV_GET_OR_RETURN(smartData, priv, false);
 
-    return WKPageCanGoForward(toAPI(priv->pageClient->page()));
+    return priv->pageClient->page()->canGoForward();
 }
 
 void ewk_view_image_data_set(Evas_Object* ewkView, void* imageData, const IntSize& size)
@@ -1093,11 +1103,12 @@
     EWK_VIEW_SD_GET_OR_RETURN(ewkView, smartData, 0);
     EWK_VIEW_PRIV_GET_OR_RETURN(smartData, priv, 0);
 
-    WKRetainPtr<WKStringRef> wkEncodingName(AdoptWK, WKPageCopyCustomTextEncodingName(toAPI(priv->pageClient->page())));
-    if (WKStringIsEmpty(wkEncodingName.get()))
+    String customEncoding = priv->pageClient->page()->customTextEncodingName();
+    if (customEncoding.isEmpty())
         return 0;
 
-    eina_stringshare_replace(&priv->customEncoding, toImpl(wkEncodingName.get())->string().utf8().data());
+    eina_stringshare_replace(&priv->customEncoding, customEncoding.utf8().data());
+
     return priv->customEncoding;
 }
 
@@ -1106,9 +1117,8 @@
     EWK_VIEW_SD_GET_OR_RETURN(ewkView, smartData, false);
     EWK_VIEW_PRIV_GET_OR_RETURN(smartData, priv, false);
 
-    WKRetainPtr<WKStringRef> wkEncodingName = encoding ? adoptWK(WKStringCreateWithUTF8CString(encoding)) : 0;
     if (eina_stringshare_replace(&priv->customEncoding, encoding))
-        WKPageSetCustomTextEncodingName(toAPI(priv->pageClient->page()), wkEncodingName.get());
+        priv->pageClient->page()->setCustomTextEncodingName(encoding ? encoding : String());
 
     return true;
 }

_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to