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

Wed, 23 Jan 2013 14:51:31 -0800

Title: [140600] trunk/Source/WebKit2
Revision
140600
Author
kenn...@webkit.org
Date
2013-01-23 14:53:10 -0800 (Wed, 23 Jan 2013)

Log Message

[WK2] Replace some internal API usage in EwkView with C API
https://bugs.webkit.org/show_bug.cgi?id=107652

Reviewed by Benjamin Poulain.

* UIProcess/API/efl/ewk_view.cpp:
(ewk_view_url_set):
(ewk_view_reload):
(ewk_view_reload_bypass_cache):
(ewk_view_stop):
(ewk_view_load_progress_get):
(ewk_view_scale_set):
(ewk_view_scale_get):
(ewk_view_device_pixel_ratio_get):
(ewk_view_back):
(ewk_view_forward):
(ewk_view_back_possible):
(ewk_view_forward_possible):
(ewk_view_html_string_load):
(ewk_view_text_find):
(ewk_view_text_find_highlight_clear):
(ewk_view_text_matches_count):
(ewk_view_inspector_show):
(ewk_view_inspector_close):

Modified Paths

Diff

Modified: trunk/Source/WebKit2/ChangeLog (140599 => 140600)


--- trunk/Source/WebKit2/ChangeLog	2013-01-23 22:49:46 UTC (rev 140599)
+++ trunk/Source/WebKit2/ChangeLog	2013-01-23 22:53:10 UTC (rev 140600)
@@ -1,3 +1,30 @@
+2013-01-23  Kenneth Rohde Christiansen  <kenn...@webkit.org>
+
+        [WK2] Replace some internal API usage in EwkView with C API
+        https://bugs.webkit.org/show_bug.cgi?id=107652
+
+        Reviewed by Benjamin Poulain.
+
+        * UIProcess/API/efl/ewk_view.cpp:
+        (ewk_view_url_set):
+        (ewk_view_reload):
+        (ewk_view_reload_bypass_cache):
+        (ewk_view_stop):
+        (ewk_view_load_progress_get):
+        (ewk_view_scale_set):
+        (ewk_view_scale_get):
+        (ewk_view_device_pixel_ratio_get):
+        (ewk_view_back):
+        (ewk_view_forward):
+        (ewk_view_back_possible):
+        (ewk_view_forward_possible):
+        (ewk_view_html_string_load):
+        (ewk_view_text_find):
+        (ewk_view_text_find_highlight_clear):
+        (ewk_view_text_matches_count):
+        (ewk_view_inspector_show):
+        (ewk_view_inspector_close):
+
 2013-01-23  Alexey Proskuryakov  <a...@apple.com>
 
         Build fix.

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


--- trunk/Source/WebKit2/UIProcess/API/efl/ewk_view.cpp	2013-01-23 22:49:46 UTC (rev 140599)
+++ trunk/Source/WebKit2/UIProcess/API/efl/ewk_view.cpp	2013-01-23 22:53:10 UTC (rev 140600)
@@ -35,8 +35,10 @@
 #include "WKAPICast.h"
 #include "WKEinaSharedString.h"
 #include "WKFindOptions.h"
+#include "WKInspector.h"
 #include "WKRetainPtr.h"
 #include "WKString.h"
+#include "WKURL.h"
 #include "WebContext.h"
 #include "WebData.h"
 #include "WebFullScreenManagerProxy.h"
@@ -562,7 +564,8 @@
     EWK_VIEW_IMPL_GET_OR_RETURN(ewkView, impl, false);
     EINA_SAFETY_ON_NULL_RETURN_VAL(url, false);
 
-    impl->page()->loadURL(url);
+    WKRetainPtr<WKURLRef> wkUrl = adoptWK(WKURLCreateWithUTF8CString(url));
+    WKPageLoadURL(impl->wkPage(), wkUrl.get());
     impl->informURLChange();
 
     return true;
@@ -586,7 +589,7 @@
 {
     EWK_VIEW_IMPL_GET_OR_RETURN(ewkView, impl, false);
 
-    impl->page()->reload(/*reloadFromOrigin*/ false);
+    WKPageReload(impl->wkPage());
     impl->informURLChange();
 
     return true;
@@ -596,7 +599,7 @@
 {
     EWK_VIEW_IMPL_GET_OR_RETURN(ewkView, impl, false);
 
-    impl->page()->reload(/*reloadFromOrigin*/ true);
+    WKPageReloadFromOrigin(impl->wkPage());
     impl->informURLChange();
 
     return true;
@@ -606,7 +609,7 @@
 {
     EWK_VIEW_IMPL_GET_OR_RETURN(ewkView, impl, false);
 
-    impl->page()->stopLoading();
+    WKPageStopLoading(impl->wkPage());
 
     return true;
 }
@@ -629,14 +632,14 @@
 {
     EWK_VIEW_IMPL_GET_OR_RETURN(ewkView, impl, -1.0);
 
-    return impl->page()->estimatedProgress();
+    return WKPageGetEstimatedProgress(impl->wkPage());
 }
 
 Eina_Bool ewk_view_scale_set(Evas_Object* ewkView, double scaleFactor, int x, int y)
 {
     EWK_VIEW_IMPL_GET_OR_RETURN(ewkView, impl, false);
 
-    impl->page()->scalePage(scaleFactor, IntPoint(x, y));
+    WKPageSetScaleFactor(impl->wkPage(), scaleFactor, WKPointMake(x, y));
     return true;
 }
 
@@ -644,7 +647,7 @@
 {
     EWK_VIEW_IMPL_GET_OR_RETURN(ewkView, impl, -1);
 
-    return impl->page()->pageScaleFactor();
+    return WKPageGetScaleFactor(impl->wkPage());
 }
 
 Eina_Bool ewk_view_device_pixel_ratio_set(Evas_Object* ewkView, float ratio)
@@ -660,7 +663,7 @@
 {
     EWK_VIEW_IMPL_GET_OR_RETURN(ewkView, impl, -1.0);
 
-    return impl->page()->deviceScaleFactor();
+    return WKPageGetBackingScaleFactor(impl->wkPage());
 }
 
 void ewk_view_theme_set(Evas_Object* ewkView, const char* path)
@@ -681,9 +684,9 @@
 {
     EWK_VIEW_IMPL_GET_OR_RETURN(ewkView, impl, false);
 
-    WebPageProxy* page = impl->page();
-    if (page->canGoBack()) {
-        page->goBack();
+    WKPageRef page = impl->wkPage();
+    if (WKPageCanGoBack(page)) {
+        WKPageGoBack(page);
         return true;
     }
 
@@ -694,9 +697,9 @@
 {
     EWK_VIEW_IMPL_GET_OR_RETURN(ewkView, impl, false);
 
-    WebPageProxy* page = impl->page();
-    if (page->canGoForward()) {
-        page->goForward();
+    WKPageRef page = impl->wkPage();
+    if (WKPageCanGoForward(page)) {
+        WKPageGoForward(page);
         return true;
     }
 
@@ -724,15 +727,13 @@
 Eina_Bool ewk_view_back_possible(Evas_Object* ewkView)
 {
     EWK_VIEW_IMPL_GET_OR_RETURN(ewkView, impl, false);
-
-    return impl->page()->canGoBack();
+    return WKPageCanGoBack(impl->wkPage());
 }
 
 Eina_Bool ewk_view_forward_possible(Evas_Object* ewkView)
 {
     EWK_VIEW_IMPL_GET_OR_RETURN(ewkView, impl, false);
-
-    return impl->page()->canGoForward();
+    return WKPageCanGoForward(impl->wkPage());
 }
 
 Ewk_Back_Forward_List* ewk_view_back_forward_list_get(const Evas_Object* ewkView)
@@ -747,11 +748,15 @@
     EWK_VIEW_IMPL_GET_OR_RETURN(ewkView, impl, false);
     EINA_SAFETY_ON_NULL_RETURN_VAL(html, false);
 
-    if (unreachableUrl && *unreachableUrl)
-        impl->page()->loadAlternateHTMLString(String::fromUTF8(html), baseUrl ? String::fromUTF8(baseUrl) : "", String::fromUTF8(unreachableUrl));
-    else
-        impl->page()->loadHTMLString(String::fromUTF8(html), baseUrl ? String::fromUTF8(baseUrl) : "");
+    WKRetainPtr<WKStringRef> wkHTMLString = adoptWK(WKStringCreateWithUTF8CString(html));
+    WKRetainPtr<WKURLRef> wkBaseURL = adoptWK(WKURLCreateWithUTF8CString(baseUrl));
 
+    if (unreachableUrl && *unreachableUrl) {
+        WKRetainPtr<WKURLRef> wkUnreachableURL = adoptWK(WKURLCreateWithUTF8CString(unreachableUrl));
+        WKPageLoadAlternateHTMLString(impl->wkPage(), wkHTMLString.get(), wkBaseURL.get(), wkUnreachableURL.get());
+    } else
+        WKPageLoadHTMLString(impl->wkPage(), wkHTMLString.get(), wkBaseURL.get());
+
     impl->informURLChange();
 
     return true;
@@ -788,7 +793,8 @@
     EWK_VIEW_IMPL_GET_OR_RETURN(ewkView, impl, false);
     EINA_SAFETY_ON_NULL_RETURN_VAL(text, false);
 
-    impl->page()->findString(String::fromUTF8(text), static_cast<WebKit::FindOptions>(options), maxMatchCount);
+    WKRetainPtr<WKStringRef> wkText = adoptWK(WKStringCreateWithUTF8CString(text));
+    WKPageFindString(impl->wkPage(), wkText.get(), static_cast<WebKit::FindOptions>(options), maxMatchCount);
 
     return true;
 }
@@ -797,7 +803,7 @@
 {
     EWK_VIEW_IMPL_GET_OR_RETURN(ewkView, impl, false);
 
-    impl->page()->hideFindUI();
+    WKPageHideFindUI(impl->wkPage());
 
     return true;
 }
@@ -807,7 +813,8 @@
     EWK_VIEW_IMPL_GET_OR_RETURN(ewkView, impl, false);
     EINA_SAFETY_ON_NULL_RETURN_VAL(text, false);
 
-    impl->page()->countStringMatches(String::fromUTF8(text), static_cast<WebKit::FindOptions>(options), maxMatchCount);
+    WKRetainPtr<WKStringRef> wkText = adoptWK(WKStringCreateWithUTF8CString(text));
+    WKPageCountStringMatches(impl->wkPage(), wkText.get(), static_cast<WebKit::FindOptions>(options), maxMatchCount);
 
     return true;
 }
@@ -879,9 +886,9 @@
 #if ENABLE(INSPECTOR)
     EWK_VIEW_IMPL_GET_OR_RETURN(ewkView, impl, false);
 
-    WebInspectorProxy* inspector = impl->page()->inspector();
-    if (inspector)
-        inspector->show();
+    WKInspectorRef wkInspector = WKPageGetInspector(impl->wkPage());
+    if (wkInspector)
+        WKInspectorShow(wkInspector);
 
     return true;
 #else
@@ -895,9 +902,9 @@
 #if ENABLE(INSPECTOR)
     EWK_VIEW_IMPL_GET_OR_RETURN(ewkView, impl, false);
 
-    WebInspectorProxy* inspector = impl->page()->inspector();
-    if (inspector)
-        inspector->close();
+    WKInspectorRef wkInspector = WKPageGetInspector(impl->wkPage());
+    if (wkInspector)
+        WKInspectorClose(wkInspector);
 
     return true;
 #else

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to