diff options
author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-02-03 09:55:33 +0100 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-02-03 09:55:33 +0100 |
commit | cd44dc59cdfc39534aef4d417e9f3c412e3be139 (patch) | |
tree | 8d89889ba95ed6ec9322e733846cc9cce9d7dff1 /Source/WebKit2/UIProcess/API/efl/ewk_view.cpp | |
parent | d11f84f5b5cdc0d92a08af01b13472fdd5f9acb9 (diff) | |
download | qtwebkit-cd44dc59cdfc39534aef4d417e9f3c412e3be139.tar.gz |
Imported WebKit commit fce473cb4d55aa9fe9d0b0322a2fffecb731b961 (http://svn.webkit.org/repository/webkit/trunk@106560)
Diffstat (limited to 'Source/WebKit2/UIProcess/API/efl/ewk_view.cpp')
-rw-r--r-- | Source/WebKit2/UIProcess/API/efl/ewk_view.cpp | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/Source/WebKit2/UIProcess/API/efl/ewk_view.cpp b/Source/WebKit2/UIProcess/API/efl/ewk_view.cpp index 592f58034..269c072d6 100644 --- a/Source/WebKit2/UIProcess/API/efl/ewk_view.cpp +++ b/Source/WebKit2/UIProcess/API/efl/ewk_view.cpp @@ -479,7 +479,7 @@ Evas_Object* ewk_view_add(Evas* canvas, WKContextRef contextRef, WKPageGroupRef return 0; } - priv->pageClient = PageClientImpl::create(toImpl(contextRef), toImpl(pageGroupRef), smartData->image); + priv->pageClient = PageClientImpl::create(toImpl(contextRef), toImpl(pageGroupRef), ewkView); return ewkView; } @@ -491,3 +491,23 @@ WKPageRef ewk_view_page_get(Evas_Object* ewkView) return toAPI(priv->pageClient->page()); } + +void ewk_view_display(Evas_Object* ewkView, const IntRect& rect) +{ + EWK_VIEW_SD_GET_OR_RETURN(ewkView, smartData); + if (!smartData->image) + return; + + evas_object_image_data_update_add(smartData->image, rect.x(), rect.y(), rect.width(), rect.height()); +} + +void ewk_view_image_data_set(Evas_Object* ewkView, void* imageData, const IntSize& size) +{ + EWK_VIEW_SD_GET_OR_RETURN(ewkView, smartData); + if (!imageData || !smartData->image) + return; + + evas_object_resize(smartData->image, size.width(), size.height()); + evas_object_image_size_set(smartData->image, size.width(), size.height()); + evas_object_image_data_copy_set(smartData->image, imageData); +} |