diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2012-09-20 21:53:03 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2012-09-20 21:53:03 +0200 |
| commit | 171053e5e2efcdc6854d8b3a0d06934fb309e53d (patch) | |
| tree | c85f2b00cea9c5b648ad9945be3155d29d96395f /Source/WebKit2/UIProcess/API/efl/ewk_view.cpp | |
| parent | 0b3dc81d9701aea106543b49bde511a5697cdd6e (diff) | |
| download | qtwebkit-171053e5e2efcdc6854d8b3a0d06934fb309e53d.tar.gz | |
Imported WebKit commit f35955d976484e57fd83612794aefd58fdaa6337 (http://svn.webkit.org/repository/webkit/trunk@129155)
New snapshot with prospective build fix
Diffstat (limited to 'Source/WebKit2/UIProcess/API/efl/ewk_view.cpp')
| -rw-r--r-- | Source/WebKit2/UIProcess/API/efl/ewk_view.cpp | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/Source/WebKit2/UIProcess/API/efl/ewk_view.cpp b/Source/WebKit2/UIProcess/API/efl/ewk_view.cpp index bbbfc18c1..0eab8b540 100644 --- a/Source/WebKit2/UIProcess/API/efl/ewk_view.cpp +++ b/Source/WebKit2/UIProcess/API/efl/ewk_view.cpp @@ -100,6 +100,7 @@ struct _Ewk_View_Private_Data { OwnPtr<Ewk_Settings> settings; bool areMouseEventsEnabled; WKColorPickerResultListenerRef colorPickerResultListener; + Ewk_Context* context; WebPopupMenuProxyEfl* popupMenuProxy; Eina_List* popupMenuItems; @@ -119,6 +120,7 @@ struct _Ewk_View_Private_Data { , backForwardList(0) , areMouseEventsEnabled(false) , colorPickerResultListener(0) + , context(0) , popupMenuProxy(0) , popupMenuItems(0) #ifdef HAVE_ECORE_X @@ -384,6 +386,7 @@ static void _ewk_view_priv_loading_resources_clear(LoadingResourcesMap& loadingR static void _ewk_view_priv_del(Ewk_View_Private_Data* priv) { + ewk_context_unref(priv->context); delete priv; } @@ -714,6 +717,7 @@ static void _ewk_view_initialize(Evas_Object* ewkView, Ewk_Context* context, WKP priv->backForwardList = ewk_back_forward_list_new(toAPI(priv->pageProxy->backForwardList())); priv->settings = adoptPtr(new Ewk_Settings(WKPageGroupGetPreferences(WKPageGetPageGroup(toAPI(priv->pageProxy.get()))))); + priv->context = ewk_context_ref(context); #if USE(COORDINATED_GRAPHICS) priv->viewportHandler = EflViewportHandler::create(ewkView); @@ -798,6 +802,14 @@ Evas_Object* ewk_view_add(Evas* canvas) return ewk_view_add_with_context(canvas, ewk_context_default_get()); } +Ewk_Context* ewk_view_context_get(const Evas_Object* ewkView) +{ + EWK_VIEW_SD_GET_OR_RETURN(ewkView, smartData, 0); + EWK_VIEW_PRIV_GET_OR_RETURN(smartData, priv, 0); + + return priv->context; +} + /** * @internal * The uri of view was changed by the frame loader. |