No subject
Wed Aug 1 07:28:53 PDT 2012
locally.
* UIProcess/API/efl/PageClientImpl.cpp:
(WebKit::PageClientImpl::PageClientImpl):
(WebKit::PageClientImpl::createDrawingAreaProxy):
* UIProcess/API/efl/PageClientImpl.h:
(WebKit::PageClientImpl::create):
(PageClientImpl):
* UIProcess/API/efl/ewk_view.cpp:
(_Ewk_View_Private_Data):
(_ewk_view_smart_focus_in):
(_ewk_view_smart_focus_out):
(_ewk_view_smart_mouse_wheel):
(_ewk_view_smart_mouse_down):
(_ewk_view_smart_mouse_up):
(_ewk_view_smart_mouse_move):
(_ewk_view_smart_key_down):
(_ewk_view_smart_key_up):
(_ewk_view_smart_calculate):
(_ewk_view_smart_color_set):
(_ewk_view_initialize):
(ewk_view_uri_update):
(ewk_view_uri_set):
(ewk_view_reload):
(ewk_view_reload_bypass_cache):
(ewk_view_stop):
(ewk_view_title_get):
(ewk_view_load_progress_get):
(ewk_view_scale_set):
(ewk_view_scale_get):
(ewk_view_device_pixel_ratio_set):
(ewk_view_device_pixel_ratio_get):
(ewk_view_theme_set):
(ewk_view_back):
(ewk_view_forward):
(ewk_view_intent_deliver):
(ewk_view_back_possible):
(ewk_view_forward_possible):
(ewk_view_html_string_load):
(ewk_view_page_get):
(ewk_view_setting_encoding_custom_get):
(ewk_view_setting_encoding_custom_set):
(ewk_view_text_find):
(ewk_view_text_find_highlight_clear):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href=3D"#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeL=
og</a></li>
<li><a href=3D"#trunkSourceWebKit2UIProcessAPIeflPageClientImplcpp">trunk=
/Source/WebKit2/UIProcess/API/efl/PageClientImpl.cpp</a></li>
<li><a href=3D"#trunkSourceWebKit2UIProcessAPIeflPageClientImplh">trunk/S=
ource/WebKit2/UIProcess/API/efl/PageClientImpl.h</a></li>
<li><a href=3D"#trunkSourceWebKit2UIProcessAPIeflewk_viewcpp">trunk/Sourc=
e/WebKit2/UIProcess/API/efl/ewk_view.cpp</a></li>
</ul>
</div>
<div id=3D"patch">
<h3>Diff</h3>
<a id=3D"trunkSourceWebKit2ChangeLog"></a>
<div class=3D"modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (1268=
43 =3D> 126844)</h4>
<pre class=3D"diff"><span>
<span class=3D"info">--- trunk/Source/WebKit2/ChangeLog 2012-08-28 06:13:=
03 UTC (rev 126843)
+++ trunk/Source/WebKit2/ChangeLog 2012-08-28 06:28:28 UTC (rev 126844)
</span><span class=3D"lines">@@ -1,3 +1,60 @@
</span><ins>+2012-08-27 Kangil Han <kangil.han at samsung.com>
+
+ [EFL][WK2] Fix PageClientImpl layer violation
+ https://bugs.webkit.org/show_bug.cgi?id=3D94906
+
+ Reviewed by Gyuyoung Kim.
+
+ Given WK2 hierarchy, current PageClientImpl has violated API lay=
er by having WebPageProxy.
+ Subsequently, it has been given WebContext, static singleton obj=
ect, in its argument unnecessarily.
+ Therefore, this patch moved WebPageProxy from PageClientImpl to =
Ewk_View_Private_Data.
+ Plus, WebContext was removed from PageClientImpl since it is not=
needed anymore.
+ As a result, EFL has same form of PageClientImpl with other port=
s, i.e. gtk+ and mac.
+ From API point of view, nothing has been changed because all thi=
ngs done locally.
+
+ * UIProcess/API/efl/PageClientImpl.cpp:
+ (WebKit::PageClientImpl::PageClientImpl):
+ (WebKit::PageClientImpl::createDrawingAreaProxy):
+ * UIProcess/API/efl/PageClientImpl.h:
+ (WebKit::PageClientImpl::create):
+ (PageClientImpl):
+ * UIProcess/API/efl/ewk_view.cpp:
+ (_Ewk_View_Private_Data):
+ (_ewk_view_smart_focus_in):
+ (_ewk_view_smart_focus_out):
+ (_ewk_view_smart_mouse_wheel):
+ (_ewk_view_smart_mouse_down):
+ (_ewk_view_smart_mouse_up):
+ (_ewk_view_smart_mouse_move):
+ (_ewk_view_smart_key_down):
+ (_ewk_view_smart_key_up):
+ (_ewk_view_smart_calculate):
+ (_ewk_view_smart_color_set):
+ (_ewk_view_initialize):
+ (ewk_view_uri_update):
+ (ewk_view_uri_set):
+ (ewk_view_reload):
+ (ewk_view_reload_bypass_cache):
+ (ewk_view_stop):
+ (ewk_view_title_get):
+ (ewk_view_load_progress_get):
+ (ewk_view_scale_set):
+ (ewk_view_scale_get):
+ (ewk_view_device_pixel_ratio_set):
+ (ewk_view_device_pixel_ratio_get):
+ (ewk_view_theme_set):
+ (ewk_view_back):
+ (ewk_view_forward):
+ (ewk_view_intent_deliver):
+ (ewk_view_back_possible):
+ (ewk_view_forward_possible):
+ (ewk_view_html_string_load):
+ (ewk_view_page_get):
+ (ewk_view_setting_encoding_custom_get):
+ (ewk_view_setting_encoding_custom_set):
+ (ewk_view_text_find):
+ (ewk_view_text_find_highlight_clear):
+
</ins><span class=3D"cx"> 2012-08-27 Sheriff Bot <webkit.review.bot@=
gmail.com>
</span><span class=3D"cx">=20
</span><span class=3D"cx"> Unreviewed, rolling out r126836.
</span></span></pre></div>
<a id=3D"trunkSourceWebKit2UIProcessAPIeflPageClientImplcpp"></a>
<div class=3D"modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/e=
fl/PageClientImpl.cpp (126843 =3D> 126844)</h4>
<pre class=3D"diff"><span>
<span class=3D"info">--- trunk/Source/WebKit2/UIProcess/API/efl/PageClien=
tImpl.cpp 2012-08-28 06:13:03 UTC (rev 126843)
+++ trunk/Source/WebKit2/UIProcess/API/efl/PageClientImpl.cpp 2012-08-28 =
06:28:28 UTC (rev 126844)
</span><span class=3D"lines">@@ -44,18 +44,9 @@
</span><span class=3D"cx">=20
</span><span class=3D"cx"> namespace WebKit {
</span><span class=3D"cx">=20
</span><del>-PageClientImpl::PageClientImpl(WebContext* context, WebPageG=
roup* pageGroup, Evas_Object* viewWidget)
</del><ins>+PageClientImpl::PageClientImpl(Evas_Object* viewWidget)
</ins><span class=3D"cx"> : m_viewWidget(viewWidget)
</span><span class=3D"cx"> {
</span><del>- m_page =3D context->createWebPage(this, pageGroup);
-
-#if USE(COORDINATED_GRAPHICS)
- m_page->pageGroup()->preferences()->setAcceleratedCompositi=
ngEnabled(true);
- m_page->pageGroup()->preferences()->setForceCompositingMode=
(true);
- m_page->setUseFixedLayout(true);
-#endif
-
- m_page->initializeWebPage();
</del><span class=3D"cx"> }
</span><span class=3D"cx">=20
</span><span class=3D"cx"> PageClientImpl::~PageClientImpl()
</span><span class=3D"lines">@@ -65,7 +56,7 @@
</span><span class=3D"cx"> // PageClient
</span><span class=3D"cx"> PassOwnPtr<DrawingAreaProxy> PageClientI=
mpl::createDrawingAreaProxy()
</span><span class=3D"cx"> {
</span><del>- return DrawingAreaProxyImpl::create(m_page.get());
</del><ins>+ return DrawingAreaProxyImpl::create(ewk_view_page_get(m_v=
iewWidget));
</ins><span class=3D"cx"> }
</span><span class=3D"cx">=20
</span><span class=3D"cx"> void PageClientImpl::setViewNeedsDisplay(const=
WebCore::IntRect& rect)
</span></span></pre></div>
<a id=3D"trunkSourceWebKit2UIProcessAPIeflPageClientImplh"></a>
<div class=3D"modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/e=
fl/PageClientImpl.h (126843 =3D> 126844)</h4>
<pre class=3D"diff"><span>
<span class=3D"info">--- trunk/Source/WebKit2/UIProcess/API/efl/PageClien=
tImpl.h 2012-08-28 06:13:03 UTC (rev 126843)
+++ trunk/Source/WebKit2/UIProcess/API/efl/PageClientImpl.h 2012-08-28 06=
:28:28 UTC (rev 126844)
</span><span class=3D"lines">@@ -33,18 +33,17 @@
</span><span class=3D"cx">=20
</span><span class=3D"cx"> class PageClientImpl : public PageClient {
</span><span class=3D"cx"> public:
</span><del>- static PassOwnPtr<PageClientImpl> create(WebContex=
t* context, WebPageGroup* pageGroup, Evas_Object* viewWidget)
</del><ins>+ static PassOwnPtr<PageClientImpl> create(Evas_Objec=
t* viewWidget)
</ins><span class=3D"cx"> {
</span><del>- return adoptPtr(new PageClientImpl(context, pageGrou=
p, viewWidget));
</del><ins>+ return adoptPtr(new PageClientImpl(viewWidget));
</ins><span class=3D"cx"> }
</span><span class=3D"cx"> ~PageClientImpl();
</span><span class=3D"cx">=20
</span><span class=3D"cx"> Evas_Object* viewWidget() const { return m=
_viewWidget; }
</span><span class=3D"cx">=20
</span><del>- WebPageProxy* page() const { return m_page.get(); }
</del><span class=3D"cx">=20
</span><span class=3D"cx"> private:
</span><del>- PageClientImpl(WebContext*, WebPageGroup*, Evas_Object*)=
;
</del><ins>+ explicit PageClientImpl(Evas_Object*);
</ins><span class=3D"cx">=20
</span><span class=3D"cx"> // PageClient
</span><span class=3D"cx"> virtual PassOwnPtr<DrawingAreaProxy>=
createDrawingAreaProxy();
</span><span class=3D"lines">@@ -115,7 +114,6 @@
</span><span class=3D"cx"> virtual void didChangeContentsSize(const W=
ebCore::IntSize&);
</span><span class=3D"cx">=20
</span><span class=3D"cx"> private:
</span><del>- RefPtr<WebPageProxy> m_page;
</del><span class=3D"cx"> Evas_Object* m_viewWidget;
</span><span class=3D"cx"> };
</span><span class=3D"cx">=20
</span></span></pre></div>
<a id=3D"trunkSourceWebKit2UIProcessAPIeflewk_viewcpp"></a>
<div class=3D"modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/e=
fl/ewk_view.cpp (126843 =3D> 126844)</h4>
<pre class=3D"diff"><span>
<span class=3D"info">--- trunk/Source/WebKit2/UIProcess/API/efl/ewk_view.=
cpp 2012-08-28 06:13:03 UTC (rev 126843)
+++ trunk/Source/WebKit2/UIProcess/API/efl/ewk_view.cpp 2012-08-28 06:28:=
28 UTC (rev 126844)
</span><span class=3D"lines">@@ -31,6 +31,7 @@
</span><span class=3D"cx"> #include "WKRetainPtr.h"
</span><span class=3D"cx"> #include "WKString.h"
</span><span class=3D"cx"> #include "WKURL.h"
</span><ins>+#include "WebContext.h"
</ins><span class=3D"cx"> #include "ewk_back_forward_list_private.h&=
quot;
</span><span class=3D"cx"> #include "ewk_context.h"
</span><span class=3D"cx"> #include "ewk_context_private.h"
</span><span class=3D"lines">@@ -73,6 +74,7 @@
</span><span class=3D"cx"> #if USE(COORDINATED_GRAPHICS)
</span><span class=3D"cx"> OwnPtr<EflViewportHandler> viewportH=
andler;
</span><span class=3D"cx"> #endif
</span><ins>+ RefPtr<WebPageProxy> pageProxy;
</ins><span class=3D"cx">=20
</span><span class=3D"cx"> WKEinaSharedString uri;
</span><span class=3D"cx"> WKEinaSharedString title;
</span><span class=3D"lines">@@ -186,7 +188,7 @@
</span><span class=3D"cx"> {
</span><span class=3D"cx"> EWK_VIEW_PRIV_GET_OR_RETURN(smartData, pri=
v, false)
</span><span class=3D"cx">=20
</span><del>- priv->pageClient->page()->viewStateDidChange(We=
bPageProxy::ViewIsFocused | WebPageProxy::ViewWindowIsActive);
</del><ins>+ priv->pageProxy->viewStateDidChange(WebPageProxy::V=
iewIsFocused | WebPageProxy::ViewWindowIsActive);
</ins><span class=3D"cx"> return true;
</span><span class=3D"cx"> }
</span><span class=3D"cx">=20
</span><span class=3D"lines">@@ -194,7 +196,7 @@
</span><span class=3D"cx"> {
</span><span class=3D"cx"> EWK_VIEW_PRIV_GET_OR_RETURN(smartData, pri=
v, false)
</span><span class=3D"cx">=20
</span><del>- priv->pageClient->page()->viewStateDidChange(We=
bPageProxy::ViewIsFocused | WebPageProxy::ViewWindowIsActive);
</del><ins>+ priv->pageProxy->viewStateDidChange(WebPageProxy::V=
iewIsFocused | WebPageProxy::ViewWindowIsActive);
</ins><span class=3D"cx"> return true;
</span><span class=3D"cx"> }
</span><span class=3D"cx">=20
</span><span class=3D"lines">@@ -203,7 +205,7 @@
</span><span class=3D"cx"> EWK_VIEW_PRIV_GET_OR_RETURN(smartData, pri=
v, false)
</span><span class=3D"cx">=20
</span><span class=3D"cx"> Evas_Point position =3D {smartData->vie=
w.x, smartData->view.y};
</span><del>- priv->pageClient->page()->handleWheelEvent(Nati=
veWebWheelEvent(wheelEvent, &position));
</del><ins>+ priv->pageProxy->handleWheelEvent(NativeWebWheelEve=
nt(wheelEvent, &position));
</ins><span class=3D"cx"> return true;
</span><span class=3D"cx"> }
</span><span class=3D"cx">=20
</span><span class=3D"lines">@@ -212,7 +214,7 @@
</span><span class=3D"cx"> EWK_VIEW_PRIV_GET_OR_RETURN(smartData, pri=
v, false)
</span><span class=3D"cx">=20
</span><span class=3D"cx"> Evas_Point position =3D {smartData->vie=
w.x, smartData->view.y};
</span><del>- priv->pageClient->page()->handleMouseEvent(Nati=
veWebMouseEvent(downEvent, &position));
</del><ins>+ priv->pageProxy->handleMouseEvent(NativeWebMouseEve=
nt(downEvent, &position));
</ins><span class=3D"cx"> return true;
</span><span class=3D"cx"> }
</span><span class=3D"cx">=20
</span><span class=3D"lines">@@ -221,7 +223,7 @@
</span><span class=3D"cx"> EWK_VIEW_PRIV_GET_OR_RETURN(smartData, pri=
v, false)
</span><span class=3D"cx">=20
</span><span class=3D"cx"> Evas_Point position =3D {smartData->vie=
w.x, smartData->view.y};
</span><del>- priv->pageClient->page()->handleMouseEvent(Nati=
veWebMouseEvent(upEvent, &position));
</del><ins>+ priv->pageProxy->handleMouseEvent(NativeWebMouseEve=
nt(upEvent, &position));
</ins><span class=3D"cx"> return true;
</span><span class=3D"cx"> }
</span><span class=3D"cx">=20
</span><span class=3D"lines">@@ -230,7 +232,7 @@
</span><span class=3D"cx"> EWK_VIEW_PRIV_GET_OR_RETURN(smartData, pri=
v, false)
</span><span class=3D"cx">=20
</span><span class=3D"cx"> Evas_Point position =3D {smartData->vie=
w.x, smartData->view.y};
</span><del>- priv->pageClient->page()->handleMouseEvent(Nati=
veWebMouseEvent(moveEvent, &position));
</del><ins>+ priv->pageProxy->handleMouseEvent(NativeWebMouseEve=
nt(moveEvent, &position));
</ins><span class=3D"cx"> return true;
</span><span class=3D"cx"> }
</span><span class=3D"cx">=20
</span><span class=3D"lines">@@ -238,7 +240,7 @@
</span><span class=3D"cx"> {
</span><span class=3D"cx"> EWK_VIEW_PRIV_GET_OR_RETURN(smartData, pri=
v, false)
</span><span class=3D"cx">=20
</span><del>- priv->pageClient->page()->handleKeyboardEvent(N=
ativeWebKeyboardEvent(downEvent));
</del><ins>+ priv->pageProxy->handleKeyboardEvent(NativeWebKeybo=
ardEvent(downEvent));
</ins><span class=3D"cx"> return true;
</span><span class=3D"cx"> }
</span><span class=3D"cx">=20
</span><span class=3D"lines">@@ -246,7 +248,7 @@
</span><span class=3D"cx"> {
</span><span class=3D"cx"> EWK_VIEW_PRIV_GET_OR_RETURN(smartData, pri=
v, false)
</span><span class=3D"cx">=20
</span><del>- priv->pageClient->page()->handleKeyboardEvent(N=
ativeWebKeyboardEvent(upEvent));
</del><ins>+ priv->pageProxy->handleKeyboardEvent(NativeWebKeybo=
ardEvent(upEvent));
</ins><span class=3D"cx"> return true;
</span><span class=3D"cx"> }
</span><span class=3D"cx">=20
</span><span class=3D"lines">@@ -534,8 +536,8 @@
</span><span class=3D"cx"> priv->viewportHandler->updateVie=
wportSize(IntSize(width, height));
</span><span class=3D"cx"> #endif
</span><span class=3D"cx">=20
</span><del>- if (priv->pageClient->page()->drawingArea()=
)
- priv->pageClient->page()->drawingArea()->setSize=
(IntSize(width, height), IntSize());
</del><ins>+ if (priv->pageProxy->drawingArea())
+ priv->pageProxy->drawingArea()->setSize(IntSize(wid=
th, height), IntSize());
</ins><span class=3D"cx">=20
</span><span class=3D"cx"> #if USE(ACCELERATED_COMPOSITING)
</span><span class=3D"cx"> if (!priv->evasGlSurface)
</span><span class=3D"lines">@@ -597,8 +599,8 @@
</span><span class=3D"cx"> #undef CHECK_COLOR
</span><span class=3D"cx">=20
</span><span class=3D"cx"> evas_object_image_alpha_set(smartData->=
image, alpha < 255);
</span><del>- priv->pageClient->page()->setDrawsBackground(re=
d || green || blue);
- priv->pageClient->page()->setDrawsTransparentBackground(alp=
ha < 255);
</del><ins>+ priv->pageProxy->setDrawsBackground(red || green ||=
blue);
+ priv->pageProxy->setDrawsTransparentBackground(alpha < 255)=
;
</ins><span class=3D"cx">=20
</span><span class=3D"cx"> g_parentSmartClass.color_set(ewkView, red,=
green, blue, alpha);
</span><span class=3D"cx"> }
</span><span class=3D"lines">@@ -664,14 +666,23 @@
</span><span class=3D"cx"> if (priv->pageClient)
</span><span class=3D"cx"> return;
</span><span class=3D"cx">=20
</span><del>- priv->pageClient =3D PageClientImpl::create(toImpl(ew=
k_context_WKContext_get(context)), toImpl(pageGroupRef), ewkView);
- priv->backForwardList =3D ewk_back_forward_list_new(toAPI(priv-&g=
t;pageClient->page()->backForwardList()));
</del><ins>+ priv->pageClient =3D PageClientImpl::create(ewkView);
</ins><span class=3D"cx">=20
</span><ins>+ priv->pageProxy =3D toImpl(ewk_context_WKContext_get(=
context))->createWebPage(priv->pageClient.get(), toImpl(pageGroupRe=
f));
</ins><span class=3D"cx"> #if USE(COORDINATED_GRAPHICS)
</span><ins>+ priv->pageProxy->pageGroup()->preferences()->=
;setAcceleratedCompositingEnabled(true);
+ priv->pageProxy->pageGroup()->preferences()->setForceCom=
positingMode(true);
+ priv->pageProxy->setUseFixedLayout(true);
+#endif
+ priv->pageProxy->initializeWebPage();
+
+ priv->backForwardList =3D ewk_back_forward_list_new(toAPI(priv-&g=
t;pageProxy->backForwardList()));
+
+#if USE(COORDINATED_GRAPHICS)
</ins><span class=3D"cx"> priv->viewportHandler =3D EflViewportHan=
dler::create(priv->pageClient.get());
</span><span class=3D"cx"> #endif
</span><span class=3D"cx">=20
</span><del>- WKPageRef wkPage =3D toAPI(priv->pageClient->page(=
));
</del><ins>+ WKPageRef wkPage =3D toAPI(priv->pageProxy.get());
</ins><span class=3D"cx"> ewk_view_find_client_attach(wkPage, ewkView=
);
</span><span class=3D"cx"> ewk_view_form_client_attach(wkPage, ewkVie=
w);
</span><span class=3D"cx"> ewk_view_loader_client_attach(wkPage, ewkV=
iew);
</span><span class=3D"lines">@@ -759,7 +770,7 @@
</span><span class=3D"cx"> EWK_VIEW_SD_GET_OR_RETURN(ewkView, smartDa=
ta);
</span><span class=3D"cx"> EWK_VIEW_PRIV_GET_OR_RETURN(smartData, pri=
v);
</span><span class=3D"cx">=20
</span><del>- String activeURL =3D priv->pageClient->page()->=
activeURL();
</del><ins>+ String activeURL =3D priv->pageProxy->activeURL();
</ins><span class=3D"cx"> if (activeURL.isEmpty())
</span><span class=3D"cx"> return;
</span><span class=3D"cx">=20
</span><span class=3D"lines">@@ -777,7 +788,7 @@
</span><span class=3D"cx"> EWK_VIEW_PRIV_GET_OR_RETURN(smartData, pri=
v, false);
</span><span class=3D"cx"> EINA_SAFETY_ON_NULL_RETURN_VAL(uri, false)=
;
</span><span class=3D"cx">=20
</span><del>- priv->pageClient->page()->loadURL(uri);
</del><ins>+ priv->pageProxy->loadURL(uri);
</ins><span class=3D"cx"> ewk_view_uri_update(ewkView);
</span><span class=3D"cx">=20
</span><span class=3D"cx"> return true;
</span><span class=3D"lines">@@ -796,7 +807,7 @@
</span><span class=3D"cx"> EWK_VIEW_SD_GET_OR_RETURN(ewkView, smartDa=
ta, false);
</span><span class=3D"cx"> EWK_VIEW_PRIV_GET_OR_RETURN(smartData, pri=
v, false);
</span><span class=3D"cx">=20
</span><del>- priv->pageClient->page()->reload(/*reloadFromOr=
igin*/ false);
</del><ins>+ priv->pageProxy->reload(/*reloadFromOrigin*/ false)=
;
</ins><span class=3D"cx"> ewk_view_uri_update(ewkView);
</span><span class=3D"cx">=20
</span><span class=3D"cx"> return true;
</span><span class=3D"lines">@@ -807,7 +818,7 @@
</span><span class=3D"cx"> EWK_VIEW_SD_GET_OR_RETURN(ewkView, smartDa=
ta, false);
</span><span class=3D"cx"> EWK_VIEW_PRIV_GET_OR_RETURN(smartData, pri=
v, false);
</span><span class=3D"cx">=20
</span><del>- priv->pageClient->page()->reload(/*reloadFromOr=
igin*/ true);
</del><ins>+ priv->pageProxy->reload(/*reloadFromOrigin*/ true);
</ins><span class=3D"cx"> ewk_view_uri_update(ewkView);
</span><span class=3D"cx">=20
</span><span class=3D"cx"> return true;
</span><span class=3D"lines">@@ -818,7 +829,7 @@
</span><span class=3D"cx"> EWK_VIEW_SD_GET_OR_RETURN(ewkView, smartDa=
ta, false);
</span><span class=3D"cx"> EWK_VIEW_PRIV_GET_OR_RETURN(smartData, pri=
v, false);
</span><span class=3D"cx">=20
</span><del>- priv->pageClient->page()->stopLoading();
</del><ins>+ priv->pageProxy->stopLoading();
</ins><span class=3D"cx">=20
</span><span class=3D"cx"> return true;
</span><span class=3D"cx"> }
</span><span class=3D"lines">@@ -926,7 +937,7 @@
</span><span class=3D"cx"> EWK_VIEW_SD_GET_OR_RETURN(ewkView, smartDa=
ta, 0);
</span><span class=3D"cx"> EWK_VIEW_PRIV_GET_OR_RETURN(smartData, pri=
v, 0);
</span><span class=3D"cx">=20
</span><del>- CString title =3D priv->pageClient->page()->pag=
eTitle().utf8();
</del><ins>+ CString title =3D priv->pageProxy->pageTitle().utf8=
();
</ins><span class=3D"cx"> priv->title =3D title.data();
</span><span class=3D"cx">=20
</span><span class=3D"cx"> return priv->title;
</span><span class=3D"lines">@@ -959,7 +970,7 @@
</span><span class=3D"cx"> EWK_VIEW_SD_GET_OR_RETURN(ewkView, smartDa=
ta, -1.0);
</span><span class=3D"cx"> EWK_VIEW_PRIV_GET_OR_RETURN(smartData, pri=
v, -1.0);
</span><span class=3D"cx">=20
</span><del>- return priv->pageClient->page()->estimatedProgr=
ess();
</del><ins>+ return priv->pageProxy->estimatedProgress();
</ins><span class=3D"cx"> }
</span><span class=3D"cx">=20
</span><span class=3D"cx"> Eina_Bool ewk_view_scale_set(Evas_Object* ewkV=
iew, double scaleFactor, int x, int y)
</span><span class=3D"lines">@@ -967,7 +978,7 @@
</span><span class=3D"cx"> EWK_VIEW_SD_GET_OR_RETURN(ewkView, smartDa=
ta, false);
</span><span class=3D"cx"> EWK_VIEW_PRIV_GET_OR_RETURN(smartData, pri=
v, false);
</span><span class=3D"cx">=20
</span><del>- priv->pageClient->page()->scalePage(scaleFactor=
, IntPoint(x, y));
</del><ins>+ priv->pageProxy->scalePage(scaleFactor, IntPoint(x,=
y));
</ins><span class=3D"cx"> return true;
</span><span class=3D"cx"> }
</span><span class=3D"cx">=20
</span><span class=3D"lines">@@ -976,7 +987,7 @@
</span><span class=3D"cx"> EWK_VIEW_SD_GET_OR_RETURN(ewkView, smartDa=
ta, -1);
</span><span class=3D"cx"> EWK_VIEW_PRIV_GET_OR_RETURN(smartData, pri=
v, -1);
</span><span class=3D"cx">=20
</span><del>- return priv->pageClient->page()->pageScaleFacto=
r();
</del><ins>+ return priv->pageProxy->pageScaleFactor();
</ins><span class=3D"cx"> }
</span><span class=3D"cx">=20
</span><span class=3D"cx"> Eina_Bool ewk_view_device_pixel_ratio_set(Evas=
_Object* ewkView, float ratio)
</span><span class=3D"lines">@@ -984,7 +995,7 @@
</span><span class=3D"cx"> EWK_VIEW_SD_GET_OR_RETURN(ewkView, smartDa=
ta, false);
</span><span class=3D"cx"> EWK_VIEW_PRIV_GET_OR_RETURN(smartData, pri=
v, false);
</span><span class=3D"cx">=20
</span><del>- priv->pageClient->page()->setCustomDeviceScaleF=
actor(ratio);
</del><ins>+ priv->pageProxy->setCustomDeviceScaleFactor(ratio);
</ins><span class=3D"cx">=20
</span><span class=3D"cx"> return true;
</span><span class=3D"cx"> }
</span><span class=3D"lines">@@ -994,7 +1005,7 @@
</span><span class=3D"cx"> EWK_VIEW_SD_GET_OR_RETURN(ewkView, smartDa=
ta, -1.0);
</span><span class=3D"cx"> EWK_VIEW_PRIV_GET_OR_RETURN(smartData, pri=
v, -1.0);
</span><span class=3D"cx">=20
</span><del>- return priv->pageClient->page()->deviceScaleFac=
tor();
</del><ins>+ return priv->pageProxy->deviceScaleFactor();
</ins><span class=3D"cx"> }
</span><span class=3D"cx">=20
</span><span class=3D"cx"> /**
</span><span class=3D"lines">@@ -1028,7 +1039,7 @@
</span><span class=3D"cx">=20
</span><span class=3D"cx"> if (priv->theme !=3D path) {
</span><span class=3D"cx"> priv->theme =3D path;
</span><del>- priv->pageClient->page()->setThemePath(path=
);
</del><ins>+ priv->pageProxy->setThemePath(path);
</ins><span class=3D"cx"> }
</span><span class=3D"cx"> }
</span><span class=3D"cx">=20
</span><span class=3D"lines">@@ -1158,7 +1169,7 @@
</span><span class=3D"cx"> EWK_VIEW_SD_GET_OR_RETURN(ewkView, smartDa=
ta, false);
</span><span class=3D"cx"> EWK_VIEW_PRIV_GET_OR_RETURN(smartData, pri=
v, false);
</span><span class=3D"cx">=20
</span><del>- WebPageProxy* page =3D priv->pageClient->page();
</del><ins>+ WebPageProxy* page =3D priv->pageProxy.get();
</ins><span class=3D"cx"> if (page->canGoBack()) {
</span><span class=3D"cx"> page->goBack();
</span><span class=3D"cx"> return true;
</span><span class=3D"lines">@@ -1172,7 +1183,7 @@
</span><span class=3D"cx"> EWK_VIEW_SD_GET_OR_RETURN(ewkView, smartDa=
ta, false);
</span><span class=3D"cx"> EWK_VIEW_PRIV_GET_OR_RETURN(smartData, pri=
v, false);
</span><span class=3D"cx">=20
</span><del>- WebPageProxy* page =3D priv->pageClient->page();
</del><ins>+ WebPageProxy* page =3D priv->pageProxy.get();
</ins><span class=3D"cx"> if (page->canGoForward()) {
</span><span class=3D"cx"> page->goForward();
</span><span class=3D"cx"> return true;
</span><span class=3D"lines">@@ -1188,7 +1199,7 @@
</span><span class=3D"cx"> EWK_VIEW_PRIV_GET_OR_RETURN(smartData, pri=
v, false);
</span><span class=3D"cx"> EINA_SAFETY_ON_NULL_RETURN_VAL(intent, fal=
se);
</span><span class=3D"cx">=20
</span><del>- WebPageProxy* page =3D priv->pageClient->page();
</del><ins>+ WebPageProxy* page =3D priv->pageProxy.get();
</ins><span class=3D"cx"> page->deliverIntentToFrame(page->main=
Frame(), toImpl(ewk_intent_WKIntentDataRef_get(intent)));
</span><span class=3D"cx">=20
</span><span class=3D"cx"> return true;
</span><span class=3D"lines">@@ -1202,7 +1213,7 @@
</span><span class=3D"cx"> EWK_VIEW_SD_GET_OR_RETURN(ewkView, smartDa=
ta, false);
</span><span class=3D"cx"> EWK_VIEW_PRIV_GET_OR_RETURN(smartData, pri=
v, false);
</span><span class=3D"cx">=20
</span><del>- return priv->pageClient->page()->canGoBack();
</del><ins>+ return priv->pageProxy->canGoBack();
</ins><span class=3D"cx"> }
</span><span class=3D"cx">=20
</span><span class=3D"cx"> Eina_Bool ewk_view_forward_possible(Evas_Objec=
t* ewkView)
</span><span class=3D"lines">@@ -1210,7 +1221,7 @@
</span><span class=3D"cx"> EWK_VIEW_SD_GET_OR_RETURN(ewkView, smartDa=
ta, false);
</span><span class=3D"cx"> EWK_VIEW_PRIV_GET_OR_RETURN(smartData, pri=
v, false);
</span><span class=3D"cx">=20
</span><del>- return priv->pageClient->page()->canGoForward()=
;
</del><ins>+ return priv->pageProxy->canGoForward();
</ins><span class=3D"cx"> }
</span><span class=3D"cx">=20
</span><span class=3D"cx"> Ewk_Back_Forward_List* ewk_view_back_forward_l=
ist_get(const Evas_Object* ewkView)
</span><span class=3D"lines">@@ -1337,9 +1348,9 @@
</span><span class=3D"cx"> EINA_SAFETY_ON_NULL_RETURN_VAL(html, false=
);
</span><span class=3D"cx">=20
</span><span class=3D"cx"> if (unreachableUrl && *unreachable=
Url)
</span><del>- priv->pageClient->page()->loadAlternateHTML=
String(String::fromUTF8(html), baseUrl ? String::fromUTF8(baseUrl) : &quo=
t;", String::fromUTF8(unreachableUrl));
</del><ins>+ priv->pageProxy->loadAlternateHTMLString(String=
::fromUTF8(html), baseUrl ? String::fromUTF8(baseUrl) : "", Str=
ing::fromUTF8(unreachableUrl));
</ins><span class=3D"cx"> else
</span><del>- priv->pageClient->page()->loadHTMLString(St=
ring::fromUTF8(html), baseUrl ? String::fromUTF8(baseUrl) : "")=
;
</del><ins>+ priv->pageProxy->loadHTMLString(String::fromUTF=
8(html), baseUrl ? String::fromUTF8(baseUrl) : "");
</ins><span class=3D"cx"> ewk_view_uri_update(ewkView);
</span><span class=3D"cx">=20
</span><span class=3D"cx"> return true;
</span><span class=3D"lines">@@ -1363,7 +1374,7 @@
</span><span class=3D"cx"> EWK_VIEW_SD_GET_OR_RETURN(ewkView, smartDa=
ta, 0);
</span><span class=3D"cx"> EWK_VIEW_PRIV_GET_OR_RETURN(smartData, pri=
v, 0);
</span><span class=3D"cx">=20
</span><del>- return priv->pageClient->page();
</del><ins>+ return priv->pageProxy.get();
</ins><span class=3D"cx"> }
</span><span class=3D"cx">=20
</span><span class=3D"cx"> const char* ewk_view_setting_encoding_custom_g=
et(const Evas_Object* ewkView)
</span><span class=3D"lines">@@ -1371,7 +1382,7 @@
</span><span class=3D"cx"> EWK_VIEW_SD_GET_OR_RETURN(ewkView, smartDa=
ta, 0);
</span><span class=3D"cx"> EWK_VIEW_PRIV_GET_OR_RETURN(smartData, pri=
v, 0);
</span><span class=3D"cx">=20
</span><del>- String customEncoding =3D priv->pageClient->page()=
->customTextEncodingName();
</del><ins>+ String customEncoding =3D priv->pageProxy->customTe=
xtEncodingName();
</ins><span class=3D"cx"> if (customEncoding.isEmpty())
</span><span class=3D"cx"> return 0;
</span><span class=3D"cx">=20
</span><span class=3D"lines">@@ -1386,7 +1397,7 @@
</span><span class=3D"cx"> EWK_VIEW_PRIV_GET_OR_RETURN(smartData, pri=
v, false);
</span><span class=3D"cx">=20
</span><span class=3D"cx"> priv->customEncoding =3D encoding;
</span><del>- priv->pageClient->page()->setCustomTextEncoding=
Name(encoding ? encoding : String());
</del><ins>+ priv->pageProxy->setCustomTextEncodingName(encoding=
? encoding : String());
</ins><span class=3D"cx">=20
</span><span class=3D"cx"> return true;
</span><span class=3D"cx"> }
</span><span class=3D"lines">@@ -1424,7 +1435,7 @@
</span><span class=3D"cx"> EINA_SAFETY_ON_NULL_RETURN_VAL(text, false=
);
</span><span class=3D"cx">=20
</span><span class=3D"cx"> WKRetainPtr<WKStringRef> findText(Ad=
optWK, WKStringCreateWithUTF8CString(text));
</span><del>- WKPageFindString(toAPI(priv->pageClient->page()), =
findText.get(), static_cast<WKFindOptions>(options), maxMatchCount)=
;
</del><ins>+ WKPageFindString(toAPI(priv->pageProxy.get()), findTex=
t.get(), static_cast<WKFindOptions>(options), maxMatchCount);
</ins><span class=3D"cx">=20
</span><span class=3D"cx"> return true;
</span><span class=3D"cx"> }
</span><span class=3D"lines">@@ -1434,7 +1445,7 @@
</span><span class=3D"cx"> EWK_VIEW_SD_GET_OR_RETURN(ewkView, smartDa=
ta, false);
</span><span class=3D"cx"> EWK_VIEW_PRIV_GET_OR_RETURN(smartData, pri=
v, false);
</span><span class=3D"cx">=20
</span><del>- WKPageHideFindUI(toAPI(priv->pageClient->page()));
</del><ins>+ WKPageHideFindUI(toAPI(priv->pageProxy.get()));
</ins><span class=3D"cx">=20
</span><span class=3D"cx"> return true;
</span><span class=3D"cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>
More information about the webkit-changes
mailing list